Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-sa1100 / debug-macro.S

diff --git a/include/asm-arm/arch-sa1100/debug-macro.S b/include/asm-arm/arch-sa1100/debug-macro.S
index 755fa3453862d9d012ea8d329a0598faf99ad915..267c317a7408a55d1adebd1d8f803af5d7c2d402 100644 (file)
--- a/include/asm-arm/arch-sa1100/debug-macro.S
+++ b/include/asm-arm/arch-sa1100/debug-macro.S
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  *
 */
+#include <asm/hardware.h>
 
                .macro  addruart,rx
                mrc     p15, 0, \rx, c1, c0