aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-23 02:04:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 07:43:00 -0700
commit078517e4118dc60a97c4eda127b849383eb26f8e (patch)
tree894d17bb1979dc894f12cb22d95507db1330536c
parent[PATCH] m68k: completely initialize hw_regs_t in ide_setup_ports (diff)
downloadlinux-dev-078517e4118dc60a97c4eda127b849383eb26f8e.tar.xz
linux-dev-078517e4118dc60a97c4eda127b849383eb26f8e.zip
[PATCH] m68k: atyfb_base compile fix for CONFIG_PCI=n
The atyfb_driver structure is only available if CONFIG_PCI is set. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/aty/atyfb_base.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index d9d7d3c4cae2..eb6aa42be60e 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3722,7 +3722,9 @@ static int __init atyfb_init(void)
atyfb_setup(option);
#endif
+#ifdef CONFIG_PCI
pci_register_driver(&atyfb_driver);
+#endif
#ifdef CONFIG_ATARI
atyfb_atari_probe();
#endif
@@ -3731,7 +3733,9 @@ static int __init atyfb_init(void)
static void __exit atyfb_exit(void)
{
+#ifdef CONFIG_PCI
pci_unregister_driver(&atyfb_driver);
+#endif
}
module_init(atyfb_init);