[PATCH 1/8] Revert "[PATCH] aty: remove unnecessary CONFIG_PCI"

[Al Viro]

Date: 1137633692 -0500

This reverts 8416131ded5e491ecc2947d1ffaedf64725bb7a3 commit.

The hell it was unnecessary - atyfb_driver is undefined if we don't
have CONFIG_PCI and pci_register_driver() is always an inline, so
it cares for arguments being sane.

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

---

 drivers/video/aty/atyfb_base.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

f2dba384a7e37d0770256e5e947fc0292c339013
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 485be38..c02a0f4 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3719,7 +3719,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
@@ -3728,7 +3730,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);
-- 
0.99.9.GIT

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/