summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/include/mach
diff options
context:
space:
mode:
authorRajagopala V <rajagopala.v@stericsson.com>2011-08-29 19:12:33 +0530
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:05:51 +0200
commit87d18a161b1683b02219ead802e380b0c6b9a033 (patch)
tree1bd862957507dc61c0347ad1956e144a96f978d7 /arch/arm/mach-ux500/include/mach
parent8a16c6e28c27cbd899abb9df89fbdcdbaff102cf (diff)
mcde: mach-ux500: Migrate to kernel 3.0
rename the mcde and b2r2 platform data to generic names ST-Ericsson ID: 352334 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Rajagopala V <rajagopala.v@stericsson.com> Change-Id: I84bebd98006808639390f47a97ad0a35eadfc74d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29660
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
-rw-r--r--arch/arm/mach-ux500/include/mach/devices.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index fab51fccd41..9ea4cfea099 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -13,11 +13,11 @@ struct amba_device;
extern struct platform_device u5500_gpio_devs[];
extern struct platform_device u8500_gpio_devs[];
-extern struct platform_device u8500_mcde_device;
-extern struct platform_device u5500_mcde_device;
+extern struct platform_device ux500_mcde_device;
+extern struct platform_device ux500_mcde_device;
extern struct platform_device u8500_shrm_device;
-extern struct platform_device u8500_b2r2_device;
-extern struct platform_device u5500_b2r2_device;
+extern struct platform_device ux500_b2r2_device;
+extern struct platform_device ux500_b2r2_device;
extern struct platform_device u8500_trace_modem;
extern struct platform_device ux500_hwmem_device;
extern struct platform_device ux500_stm_device;