diff options
| author |   Adrian Bunk <bunk@kernel.org> | 2007-12-11 19:23:43 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 22:22:58 -0200 |
| commit | 7d44e8921851f460bcacb3ade432a4f5ada20fb6 (patch) | |
| tree | 610d87349eb7538b1b74daef618c0e1b0cad24a4 /drivers/media | |
| parent | V4L/DVB (6796): ivtv/ section fix (diff) | |
| download | linux-dev-7d44e8921851f460bcacb3ade432a4f5ada20fb6.tar.xz linux-dev-7d44e8921851f460bcacb3ade432a4f5ada20fb6.zip | |
V4L/DVB (6797): bt8xx/ section fixes
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 3abd9fa54d2c..585d1ef95afd 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c @@ -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; diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 2182ef089ebf..c02d92deacd2 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c @@ -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); |