diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-09-28 09:53:58 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 10:11:45 +0000 |
| commit | f7cec43c89146ddd1c67bb491e1952e3dd4b7b61 (patch) | |
| tree | 7ed5685b376fb82b1bb3bd05c5d28860ebc36fa7 /arch/arm/mach-ux500/board-mop500.c | |
| parent | 1c552f0b8c896070a77ba49ca8db32d1b47d2c75 (diff) | |
mach-ux500: Change device names for ux500
Fix the device names to they dont collide for u5500
and u8500. This way they can be built in the same build.
Change-Id: I4e109532c7ff58fc6d75792378ec782a8ac52f26
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 4dab38fdc1e..12be8738e67 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -818,9 +818,9 @@ static struct platform_device *mop500_platform_devs[] __initdata = { &ux500_mmio_device, #endif &ux500_hwmem_device, - &ux500_mcde_device, - &ux500_b2r2_device, - &ux500_thsens_device, + &u8500_mcde_device, + &u8500_b2r2_device, + &u8500_thsens_device, #ifdef CONFIG_STE_TRACE_MODEM &u8500_trace_modem, #endif @@ -1052,8 +1052,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, &snowball_sbnet_dev, - &ux500_mcde_device, - &ux500_b2r2_device, + &u8500_mcde_device, + &u8500_b2r2_device, }; /* |