diff options
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index aa01dd78f..c01d5eed1 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -195,7 +195,7 @@ static void interrupt_hw(int irq, void *dev_id, struct pt_regs *regs) /* configuration-functions */ static -int __devinit saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent) +int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent) { unsigned long adr = 0, len = 0; struct saa7146_dev* dev = kmalloc (sizeof(struct saa7146_dev),GFP_KERNEL); @@ -355,7 +355,7 @@ out: } static -void __devexit saa7146_remove_one(struct pci_dev *pdev) +void saa7146_remove_one(struct pci_dev *pdev) { struct saa7146_dev* dev = (struct saa7146_dev*) pci_get_drvdata(pdev); DEB_EE(("dev:%p\n",dev)); @@ -400,7 +400,7 @@ int saa7146_register_extension(struct saa7146_extension* ext) ext->driver.name = ext->name; ext->driver.id_table = ext->pci_tbl; ext->driver.probe = saa7146_init_one; - ext->driver.remove = __devexit_p(saa7146_remove_one); + ext->driver.remove = saa7146_remove_one; printk("saa7146: register extension '%s'.\n",ext->name); return pci_module_init(&ext->driver); |