diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:54:28 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:54:28 +0400 |
commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /arch/sh/boards/renesas/systemh/setup.c | |
parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
download | linux-6ebfc0e20b409f13e62bbb84ce70102b49945cfd.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'arch/sh/boards/renesas/systemh/setup.c')
-rw-r--r-- | arch/sh/boards/renesas/systemh/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c index a8467bf90c25..bab7d3cdc87b 100644 --- a/arch/sh/boards/renesas/systemh/setup.c +++ b/arch/sh/boards/renesas/systemh/setup.c @@ -53,6 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = { .mv_outsw = sh7751systemh_outsw, .mv_outsl = sh7751systemh_outsl, - .mv_init_irq = sh7751system_init_irq, + .mv_init_irq = sh7751systemh_init_irq, }; ALIAS_MV(7751systemh) |