diff options
author | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
commit | 15a6affec4449b54afba15ab7edbad0cac2736d3 (patch) | |
tree | f2fa815f74be0b56acd05e62113600a7113d48a9 /arch/mips/powertv/memory.c | |
parent | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff) | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/mips/powertv/memory.c')
-rw-r--r-- | arch/mips/powertv/memory.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/powertv/memory.c b/arch/mips/powertv/memory.c index 6e5f1bdc59b5..bc2f3ca22b41 100644 --- a/arch/mips/powertv/memory.c +++ b/arch/mips/powertv/memory.c @@ -29,7 +29,6 @@ #include <asm/page.h> #include <asm/sections.h> -#include <asm/mips-boards/prom.h> #include <asm/mach-powertv/asic.h> #include <asm/mach-powertv/ioremap.h> |