diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /arch/h8300 | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'arch/h8300')
-rw-r--r-- | arch/h8300/platform/h8s/ints.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c index 551fd5f30d82..ac10b9783850 100644 --- a/arch/h8300/platform/h8s/ints.c +++ b/arch/h8300/platform/h8s/ints.c | |||
@@ -121,7 +121,7 @@ void __init init_IRQ(void) | |||
121 | printk("virtual vector at 0x%08lx\n",(unsigned long)ramvec); | 121 | printk("virtual vector at 0x%08lx\n",(unsigned long)ramvec); |
122 | 122 | ||
123 | #if defined(CONFIG_GDB_DEBUG) | 123 | #if defined(CONFIG_GDB_DEBUG) |
124 | /* save orignal break vector */ | 124 | /* save original break vector */ |
125 | break_vec = ramvec[TRAP3_VEC]; | 125 | break_vec = ramvec[TRAP3_VEC]; |
126 | #else | 126 | #else |
127 | break_vec = VECTOR(trace_break); | 127 | break_vec = VECTOR(trace_break); |