diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 15:23:59 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 15:23:59 +1000 |
| commit | 6da49a292534d31ca391928ea97f8225774dc1e0 (patch) | |
| tree | 060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /arch/arm/plat-iop/cp6.c | |
| parent | 17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff) | |
| parent | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff) | |
| download | kernel_goldelico_gta04-6da49a292534d31ca391928ea97f8225774dc1e0.zip kernel_goldelico_gta04-6da49a292534d31ca391928ea97f8225774dc1e0.tar.gz kernel_goldelico_gta04-6da49a292534d31ca391928ea97f8225774dc1e0.tar.bz2 | |
Merge remote branch 'origin/master' into next
Diffstat (limited to 'arch/arm/plat-iop/cp6.c')
| -rw-r--r-- | arch/arm/plat-iop/cp6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-iop/cp6.c b/arch/arm/plat-iop/cp6.c index 9612a87..bab73e2 100644 --- a/arch/arm/plat-iop/cp6.c +++ b/arch/arm/plat-iop/cp6.c @@ -18,6 +18,7 @@ */ #include <linux/init.h> #include <asm/traps.h> +#include <asm/ptrace.h> static int cp6_trap(struct pt_regs *regs, unsigned int instr) { |