diff --git a/[refs] b/[refs]
index 895e4c8c5718..0315b58eb7f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e41d0d60a534d2a5dc9772600a58f44c8d12506
+refs/heads/master: fa890d586cc127ce72597ba0a909bfecf784e10c
diff --git a/trunk/include/linux/isa.h b/trunk/include/linux/isa.h
index 1b855335cb11..b0270e3814c8 100644
--- a/trunk/include/linux/isa.h
+++ b/trunk/include/linux/isa.h
@@ -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 */