diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /arch/mips/txx9/rbtx4939/setup.c | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
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, |