summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJimmy Rubin <jimmy.rubin@stericsson.com>2011-09-01 12:17:53 +0200
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 09:00:06 +0100
commit49d3e2af9b90971679c320c635378ffdc7268343 (patch)
tree75882b70c68d4c024bf686d9a2b3a14576e5198e /arch/arm
parent3ae24cab1790653364050e710032b298733a4ba3 (diff)
mach-ux500: mcde: Check cpu instead of machine
Cpu can be used to distinguish between different mcde instead of machine. ST-Ericsson ID: - ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I2ebb292fc787548578c34ed9a0110d98a3864034 Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29947 Reviewed-by: Robert FEKETE <robert.fekete@stericsson.com> Tested-by: Robert FEKETE <robert.fekete@stericsson.com> Reviewed-by: Ushit KUMAR <ushit.kumar@stericsson.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/board-mop500-mcde.c2
-rw-r--r--arch/arm/mach-ux500/board-u5500-mcde.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c
index 9ee3e3c4ff5..b4a6147291f 100644
--- a/arch/arm/mach-ux500/board-mop500-mcde.c
+++ b/arch/arm/mach-ux500/board-mop500-mcde.c
@@ -699,7 +699,7 @@ int __init init_display_devices(void)
struct i2c_adapter *i2c0;
#endif
- if (!(machine_is_u8500() || machine_is_snowball()))
+ if (!cpu_is_u8500())
return ret;
ret = fb_register_client(&framebuffer_nb);
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c
index 9d3f5d82d4d..63580694939 100644
--- a/arch/arm/mach-ux500/board-u5500-mcde.c
+++ b/arch/arm/mach-ux500/board-u5500-mcde.c
@@ -484,7 +484,7 @@ int __init init_display_devices(void)
{
int ret = 0;
- if (!machine_is_u5500())
+ if (!cpu_is_u5500())
return ret;
ret = fb_register_client(&framebuffer_nb);