diff options
author | Russell King | 2010-07-31 15:19:22 +0200 |
---|---|---|
committer | Russell King | 2010-07-31 15:19:22 +0200 |
commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
tree | 44419bd03c33e662302dd003f57d36e133144f91 /arch/arm/mach-clps711x | |
parent | Merge branch 'l7200' into devel (diff) | |
parent | ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128 (diff) | |
download | kernel-qcow2-linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.gz kernel-qcow2-linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.xz kernel-qcow2-linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.zip |
Merge branch 'shmobile' into devel
Diffstat (limited to 'arch/arm/mach-clps711x')
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/debug-macro.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S index fedd8076a689..072cc6b61ba3 100644 --- a/arch/arm/mach-clps711x/include/mach/debug-macro.S +++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S @@ -11,6 +11,7 @@ * */ +#include <mach/hardware.h> #include <asm/hardware/clps7111.h> .macro addruart, rx, tmp |