Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / include / asm-arm / arch-versatile / entry-macro.S

diff --git a/include/asm-arm/arch-versatile/entry-macro.S b/include/asm-arm/arch-versatile/entry-macro.S
index 90e4e970d25304613ca8d2f3e34424ec9ad42882..feff771c0a0a950630cbef18d231da9c5d665d47 100644 (file)
--- a/include/asm-arm/arch-versatile/entry-macro.S
+++ b/include/asm-arm/arch-versatile/entry-macro.S
@@ -7,7 +7,10 @@
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
-                       .macro  disable_fiq
+#include <asm/hardware.h>
+#include <asm/hardware/vic.h>
+
+               .macro  disable_fiq
                .endm
 
                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp