diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:44 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:44 -0400 |
| commit | 94314a40bcc537c396012e37cf887572f0d82aef (patch) | |
| tree | 489b42e181317730713f8800ac2889039b0faae3 /arch/arm/mach-davinci/cpuidle.c | |
| parent | 929f58aeeb46f964d9468ce1addd993f5d92b11d (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-davinci/cpuidle.c')
| -rw-r--r-- | arch/arm/mach-davinci/cpuidle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index bd59f31b8a95..0b314bf16f7f 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <asm/proc-fns.h> | 19 | #include <asm/proc-fns.h> |
| 20 | 20 | ||
| 21 | #include <mach/cpuidle.h> | 21 | #include <mach/cpuidle.h> |
| 22 | #include <mach/memory.h> | 22 | #include <mach/ddr2.h> |
| 23 | 23 | ||
| 24 | #define DAVINCI_CPUIDLE_MAX_STATES 2 | 24 | #define DAVINCI_CPUIDLE_MAX_STATES 2 |
| 25 | 25 | ||