V4L/DVB (6797): bt8xx/ section fixes
authorAdrian Bunk <bunk@kernel.org>
Tue, 11 Dec 2007 22:23:43 +0000 (19:23 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 12 Dec 2007 00:22:58 +0000 (22:22 -0200)
This patch fixes the following section mismatch with CONFIG_HOTPLUG=n:

<--  snip  -->

...
...

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/bt8xx/bttv-cards.c
drivers/media/video/bt8xx/bttv-driver.c

index 3abd9fa54d2cd5a856f8b0d2af24b57e88dec493..585d1ef95afdd6956d5dca05b50c524f4e5511d7 100644 (file)
@@ -5080,7 +5080,7 @@ static void PXC200_muxsel(struct bttv *btv, unsigned int input)
 /* ----------------------------------------------------------------------- */
 /* motherboard chipset specific stuff                                      */
 
-void __devinit bttv_check_chipset(void)
+void __init bttv_check_chipset(void)
 {
        int pcipci_fail = 0;
        struct pci_dev *dev = NULL;
index 2182ef089ebf1bad2480c1a841e983a0eee9b71c..c02d92deacd2aab2b1009ca573183c898b818d42 100644 (file)
@@ -4985,7 +4985,7 @@ static struct pci_driver bttv_pci_driver = {
 #endif
 };
 
-static int bttv_init_module(void)
+static int __init bttv_init_module(void)
 {
        int ret;
 
@@ -5018,7 +5018,7 @@ static int bttv_init_module(void)
        return pci_register_driver(&bttv_pci_driver);
 }
 
-static void bttv_cleanup_module(void)
+static void __exit bttv_cleanup_module(void)
 {
        pci_unregister_driver(&bttv_pci_driver);
        bus_unregister(&bttv_sub_bus_type);