diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
| commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
| tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/mach-mmp/gplugd.c | |
| parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
| parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) | |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/mach-mmp/gplugd.c')
| -rw-r--r-- | arch/arm/mach-mmp/gplugd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index 98e25d9aaab..2d2c0ad60d8 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -188,7 +188,7 @@ static void __init gplugd_init(void) pxa168_add_eth(&gplugd_eth_platform_data); } -MACHINE_START(SHEEVAD, "PXA168-based GuruPlug Display (gplugD) Platform") +MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform") .map_io = mmp_map_io, .nr_irqs = IRQ_BOARD_START, .init_irq = pxa168_init_irq, |