diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-12-11 17:23:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 19:22:58 -0500 |
commit | 7d44e8921851f460bcacb3ade432a4f5ada20fb6 (patch) | |
tree | 610d87349eb7538b1b74daef618c0e1b0cad24a4 /drivers/media | |
parent | 056827a49ce65a8d10197d35468500b501d1eec1 (diff) |
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) | |||
5080 | /* ----------------------------------------------------------------------- */ | 5080 | /* ----------------------------------------------------------------------- */ |
5081 | /* motherboard chipset specific stuff */ | 5081 | /* motherboard chipset specific stuff */ |
5082 | 5082 | ||
5083 | void __devinit bttv_check_chipset(void) | 5083 | void __init bttv_check_chipset(void) |
5084 | { | 5084 | { |
5085 | int pcipci_fail = 0; | 5085 | int pcipci_fail = 0; |
5086 | struct pci_dev *dev = NULL; | 5086 | 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 = { | |||
4985 | #endif | 4985 | #endif |
4986 | }; | 4986 | }; |
4987 | 4987 | ||
4988 | static int bttv_init_module(void) | 4988 | static int __init bttv_init_module(void) |
4989 | { | 4989 | { |
4990 | int ret; | 4990 | int ret; |
4991 | 4991 | ||
@@ -5018,7 +5018,7 @@ static int bttv_init_module(void) | |||
5018 | return pci_register_driver(&bttv_pci_driver); | 5018 | return pci_register_driver(&bttv_pci_driver); |
5019 | } | 5019 | } |
5020 | 5020 | ||
5021 | static void bttv_cleanup_module(void) | 5021 | static void __exit bttv_cleanup_module(void) |
5022 | { | 5022 | { |
5023 | pci_unregister_driver(&bttv_pci_driver); | 5023 | pci_unregister_driver(&bttv_pci_driver); |
5024 | bus_unregister(&bttv_sub_bus_type); | 5024 | bus_unregister(&bttv_sub_bus_type); |