diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 18:35:48 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 18:35:48 -0400 |
| commit | 1875962377574b4edb7b164001e3e341c25290d5 (patch) | |
| tree | 374a5299403ec21e2d9a66a6548ce876a388b589 /arch/alpha/oprofile/common.c | |
| parent | 5cbee140a28c2746449ae31e85738043ae4da927 (diff) | |
| parent | c88a79a7789b2909ad1cf69ea2c9142030bbd6f4 (diff) | |
Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs'
+ sync to 3.6-rc3
Diffstat (limited to 'arch/alpha/oprofile/common.c')
| -rw-r--r-- | arch/alpha/oprofile/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c index a0a5d27aa215..b8ce18f485d3 100644 --- a/arch/alpha/oprofile/common.c +++ b/arch/alpha/oprofile/common.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/smp.h> | 12 | #include <linux/smp.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
| 15 | #include <asm/special_insns.h> | ||
| 15 | 16 | ||
| 16 | #include "op_impl.h" | 17 | #include "op_impl.h" |
| 17 | 18 | ||