diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /arch/cris/arch-v32/kernel/signal.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/cris/arch-v32/kernel/signal.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index b3a05ae56214..ce4ab1a5552c 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
| @@ -610,7 +610,7 @@ ugdb_trap_user(struct thread_info *ti, int sig) | |||
| 610 | user_regs(ti)->spc = 0; | 610 | user_regs(ti)->spc = 0; |
| 611 | } | 611 | } |
| 612 | /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA | 612 | /* FIXME: Filter out false h/w breakpoint hits (i.e. EDA |
| 613 | not withing any configured h/w breakpoint range). Synchronize with | 613 | not within any configured h/w breakpoint range). Synchronize with |
| 614 | what already exists for kernel debugging. */ | 614 | what already exists for kernel debugging. */ |
| 615 | if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) { | 615 | if (((user_regs(ti)->exs & 0xff00) >> 8) == BREAK_8_INTR_VECT) { |
| 616 | /* Break 8: subtract 2 from ERP unless in a delay slot. */ | 616 | /* Break 8: subtract 2 from ERP unless in a delay slot. */ |