diff --git a/[refs] b/[refs]
index 9c52b31fe2d7..5b6f3a490a94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2d32db3443157e8f50c7c86b8ff1477c27d6e3e
+refs/heads/master: 56a4c6e31a25a218c066d8da27558a86310bbfd7
diff --git a/trunk/include/asm-powerpc/vio.h b/trunk/include/asm-powerpc/vio.h
index 0117b544ecbc..3a0975e2adad 100644
--- a/trunk/include/asm-powerpc/vio.h
+++ b/trunk/include/asm-powerpc/vio.h
@@ -80,6 +80,11 @@ extern const void *vio_get_attribute(struct vio_dev *vdev, char *which,
 extern struct vio_dev *vio_find_node(struct device_node *vnode);
 extern int vio_enable_interrupts(struct vio_dev *dev);
 extern int vio_disable_interrupts(struct vio_dev *dev);
+#else
+static inline int vio_enable_interrupts(struct vio_dev *dev)
+{
+	return 0;
+}
 #endif
 
 static inline struct vio_driver *to_vio_driver(struct device_driver *drv)