Fix non-ISA link error in drivers/scsi/advansys.c
authorMatthew Wilcox <matthew@wil.cx>
Sun, 16 Sep 2007 23:01:26 +0000 (17:01 -0600)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Sep 2007 04:13:58 +0000 (21:13 -0700)
When CONFIG_ISA is disabled, the isa_driver support will not be compiled
in.  Define stubs so that we don't get link-time errors.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/isa.h

index 1b855335cb11f7e19e196030d205d5958ebcceda..b0270e3814c8570e22bd06fb23fc4c16a0ae161f 100644 (file)
@@ -22,7 +22,18 @@ struct isa_driver {
 
 #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
 
+#ifdef CONFIG_ISA
 int isa_register_driver(struct isa_driver *, unsigned int);
 void isa_unregister_driver(struct isa_driver *);
+#else
+static inline int isa_register_driver(struct isa_driver *d, unsigned int i)
+{
+       return 0;
+}
+
+static inline void isa_unregister_driver(struct isa_driver *d)
+{
+}
+#endif
 
 #endif /* __LINUX_ISA_H */