diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /arch/arm/oprofile/op_arm_model.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'arch/arm/oprofile/op_arm_model.h')
| -rw-r--r-- | arch/arm/oprofile/op_arm_model.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/oprofile/op_arm_model.h b/arch/arm/oprofile/op_arm_model.h index 4899c629aa03..8c4e4f6a1de3 100644 --- a/arch/arm/oprofile/op_arm_model.h +++ b/arch/arm/oprofile/op_arm_model.h | |||
| @@ -26,6 +26,7 @@ extern struct op_arm_model_spec op_xscale_spec; | |||
| 26 | 26 | ||
| 27 | extern struct op_arm_model_spec op_armv6_spec; | 27 | extern struct op_arm_model_spec op_armv6_spec; |
| 28 | extern struct op_arm_model_spec op_mpcore_spec; | 28 | extern struct op_arm_model_spec op_mpcore_spec; |
| 29 | extern struct op_arm_model_spec op_armv7_spec; | ||
| 29 | 30 | ||
| 30 | extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth); | 31 | extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth); |
| 31 | 32 | ||