summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/rbtx4939/setup.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-06-08 13:21:27 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-06-08 13:21:27 +0200
commite635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch)
treec7153e7dee5caf6ac90d85694ff27e4d0b606290 /arch/mips/txx9/rbtx4939/setup.c
parentmtd: physmap_of: Add multiple regions and concatenation support (diff)
parent[MTD] [NAND] S3C2410: Use DIV_ROUND_UP (diff)
downloadlinux-e635a01ea0a16cf7cd31ecd2305870385dca9be6.tar.xz
linux-e635a01ea0a16cf7cd31ecd2305870385dca9be6.zip
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.c2
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)
}
struct txx9_board_vec rbtx4939_vec __initdata = {
- .system = "Tothiba RBTX4939",
+ .system = "Toshiba RBTX4939",
.prom_init = rbtx4939_prom_init,
.mem_setup = rbtx4939_setup,
.irq_setup = rbtx4939_irq_setup,