patch-2.3.99-pre7 linux/drivers/sound/emu10k1/main.c

Next file: linux/drivers/sound/es1370.c
Previous file: linux/drivers/sound/dmasound/awacs_defs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/sound/emu10k1/main.c linux/drivers/sound/emu10k1/main.c
@@ -80,7 +80,7 @@
 	"EMU10K1",
 };
 
-static struct pci_device_id emu10k1_pci_tbl[] __initdata = {
+static struct pci_device_id emu10k1_pci_tbl[] = {
 	{PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_EMU10K1,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, EMU10K1},
 	{0,}
@@ -616,7 +616,6 @@
 	}
 
 	if (pci_enable_device(pci_dev)) {
-		printk(KERN_ERR "emu10k1: couldn't enable device\n");
 		kfree(card);
 		return -ENODEV;
 	}
@@ -764,7 +763,7 @@
 MODULE_AUTHOR("Bertrand Lee, Cai Ying. (Email to: emu10k1-devel@opensource.creative.com)");
 MODULE_DESCRIPTION("Creative EMU10K1 PCI Audio Driver v" DRIVER_VERSION "\nCopyright (C) 1999 Creative Technology Ltd.");
 
-static struct pci_driver emu10k1_pci_driver __initdata = {
+static struct pci_driver emu10k1_pci_driver = {
 	name:"emu10k1",
 	id_table:emu10k1_pci_tbl,
 	probe:emu10k1_probe,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)