diff --git a/[refs] b/[refs]
index 562f6b62effd..01cb37ba1a1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6673cd0bdbc802f2b05453a51fbcf2cf7d8be315
+refs/heads/master: 87890f92278dc0c2da4ecdaa196006a3c2cf3687
diff --git a/trunk/arch/s390/include/asm/dma.h b/trunk/arch/s390/include/asm/dma.h
index de015d85e3e5..bb9bdcd20864 100644
--- a/trunk/arch/s390/include/asm/dma.h
+++ b/trunk/arch/s390/include/asm/dma.h
@@ -10,4 +10,10 @@
  */
 #define MAX_DMA_ADDRESS         0x80000000
 
+#ifdef CONFIG_PCI
+extern int isa_dma_bridge_buggy;
+#else
+#define isa_dma_bridge_buggy	(0)
+#endif
+
 #endif /* _ASM_S390_DMA_H */