diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-16 05:08:07 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-16 05:08:07 +0400 |
| commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
| tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /arch/arm/mach-orion5x/include/mach/system.h | |
| parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
| download | linux-7eef4091a653c243a87e5375c54504cc03bec4d8.tar.xz | |
Merge commit 'v2.6.30' into for-2.6.31
Diffstat (limited to 'arch/arm/mach-orion5x/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/system.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/system.h b/arch/arm/mach-orion5x/include/mach/system.h index 9b8db1dcfa83..e912490fff23 100644 --- a/arch/arm/mach-orion5x/include/mach/system.h +++ b/arch/arm/mach-orion5x/include/mach/system.h @@ -11,8 +11,7 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H -#include <mach/hardware.h> -#include <mach/orion5x.h> +#include <mach/bridge-regs.h> static inline void arch_idle(void) { |