patch-2.3.46 linux/drivers/sound/sonicvibes.c
Next file: linux/drivers/sound/sound_core.c
Previous file: linux/drivers/sound/esssolo1.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Tue Feb 15 11:45:28 2000
- Orig file:
v2.3.45/linux/drivers/sound/sonicvibes.c
- Orig date:
Thu Feb 10 17:11:14 2000
diff -u --recursive --new-file v2.3.45/linux/drivers/sound/sonicvibes.c linux/drivers/sound/sonicvibes.c
@@ -2430,7 +2430,7 @@
((dev)->resource[(num)].flags & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO)
#define RSRCADDRESS(dev,num) ((dev)->resource[(num)].start)
-static int sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
+static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
{
static const char __initlocaldata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
struct sv_state *s;
@@ -2598,7 +2598,7 @@
return -1;
}
-static void sv_remove(struct pci_dev *dev)
+static void __devinit sv_remove(struct pci_dev *dev)
{
struct sv_state *s = (struct sv_state *)dev->driver_data;
@@ -2625,7 +2625,7 @@
dev->driver_data = NULL;
}
-static const struct pci_device_id id_table[] = {
+static const struct pci_device_id id_table[] __devinitdata = {
{ PCI_VENDOR_ID_S3, PCI_DEVICE_ID_S3_SONICVIBES, PCI_ANY_ID, PCI_ANY_ID, 0, 0 },
{ 0, 0, 0, 0, 0, 0 }
};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)