--- zzzz-none-000/linux-2.4.17/drivers/media/video/bttv-driver.c	2001-12-21 17:41:54.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/media/video/bttv-driver.c	2004-11-24 13:22:41.000000000 +0000
@@ -2820,7 +2820,7 @@
  *	Scan for a Bt848 card, request the irq and map the io memory 
  */
 
-static void __devexit bttv_remove(struct pci_dev *pci_dev)
+static void bttv_remove(struct pci_dev *pci_dev)
 {
         u8 command;
         int j;
@@ -3025,7 +3025,7 @@
         name:     "bttv",
         id_table: bttv_pci_tbl,
         probe:    bttv_probe,
-        remove:   __devexit_p(bttv_remove),
+        remove:   bttv_remove,
 };
 
 int bttv_init_module(void)