summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-11 23:23:43 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-11 23:23:43 +0100
commite2b3b766697ca509f1281178161156ab8df5b0d5 (patch)
tree892b1bca5ce5dd98c1ebbe3895d3d60b9f122880
parentfe0835e4b4a5ddf9ba99da7d13d443b164c327f6 (diff)
downloadmediapointer-dvb-s2-e2b3b766697ca509f1281178161156ab8df5b0d5.tar.gz
mediapointer-dvb-s2-e2b3b766697ca509f1281178161156ab8df5b0d5.tar.bz2
bt8xx/ section fixes
From: Adrian Bunk <bunk@kernel.org> 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>
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-cards.c2
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-driver.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c
index a2424738f..98270aaaf 100644
--- a/linux/drivers/media/video/bt8xx/bttv-cards.c
+++ b/linux/drivers/media/video/bt8xx/bttv-cards.c
@@ -4793,7 +4793,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/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c
index 06695c09c..3efc9465b 100644
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c
@@ -4449,7 +4449,7 @@ static struct pci_driver bttv_pci_driver = {
#endif
};
-static int bttv_init_module(void)
+static int __init bttv_init_module(void)
{
int ret;
@@ -4484,7 +4484,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);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)