diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 01:37:49 -0400 |
| commit | dc3f81b129b5439ba7bac265bbc6a51a39275dae (patch) | |
| tree | 216030731d911249496d2e97206cd61431e31c89 /arch/mips/txx9/rbtx4939/setup.c | |
| parent | d2517a49d55536b38c7a87e5289550cfedaa4dcc (diff) | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
Merge commit 'v2.6.30-rc6' into perfcounters/core
Merge reason: this branch was on an -rc4 base, merge it up to -rc6
to get the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/txx9/rbtx4939/setup.c')
| -rw-r--r-- | arch/mips/txx9/rbtx4939/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c index 011e1e332f47..4199c6fd4d1d 100644 --- a/arch/mips/txx9/rbtx4939/setup.c +++ b/arch/mips/txx9/rbtx4939/setup.c | |||
| @@ -536,7 +536,7 @@ static void __init rbtx4939_setup(void) | |||
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | struct txx9_board_vec rbtx4939_vec __initdata = { | 538 | struct txx9_board_vec rbtx4939_vec __initdata = { |
| 539 | .system = "Tothiba RBTX4939", | 539 | .system = "Toshiba RBTX4939", |
| 540 | .prom_init = rbtx4939_prom_init, | 540 | .prom_init = rbtx4939_prom_init, |
| 541 | .mem_setup = rbtx4939_setup, | 541 | .mem_setup = rbtx4939_setup, |
| 542 | .irq_setup = rbtx4939_irq_setup, | 542 | .irq_setup = rbtx4939_irq_setup, |