aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordipen <dpatel@marvell.com>2012-08-17 18:20:23 -0400
committerLubomir Rintel <lkundrak@v3.sk>2019-07-22 19:40:00 +0200
commit5c39a957c76c1730df06e76a885c3ebeef0aee44 (patch)
treeacaf01b03d6302aefc20cf1a7322ce2fca20f46f
parentc94de883dddcd8282d4155d11e94564fe4a0be44 (diff)
downloadlinux-mmp3-dell-ariel-5c39a957c76c1730df06e76a885c3ebeef0aee44.tar.gz
MMP3: QSEVEN removing some of the compilation errors caused while deselecting other platforms
Signed-off-by: dipen <dpatel@marvell.com>
-rw-r--r--arch/arm/mach-mmp/onboard/Makefile2
-rw-r--r--arch/arm/mach-mmp/onboard/lcd_mipi.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/onboard/Makefile b/arch/arm/mach-mmp/onboard/Makefile
index 7ffbe4cbed0b6..150889a406431 100644
--- a/arch/arm/mach-mmp/onboard/Makefile
+++ b/arch/arm/mach-mmp/onboard/Makefile
@@ -8,4 +8,4 @@ obj-$(CONFIG_MACH_BROWNSTONE) += lcd_mipi.o
obj-$(CONFIG_MACH_EMEIDKB) += lcd_tpo_emei.o
obj-$(CONFIG_MACH_EMEIDKB) += lcd_mipi.o
obj-$(CONFIG_MACH_THUNDERSTONEM) += lcd_mipi.o
-obj-$(CONFIG_MACH_MMP3_QSEVEN) += lcd_mipi.o
+obj-$(CONFIG_MACH_QSEVEN) += lcd_mipi.o
diff --git a/arch/arm/mach-mmp/onboard/lcd_mipi.c b/arch/arm/mach-mmp/onboard/lcd_mipi.c
index da24b1f2ce23b..cc7b79c7e0ef6 100644
--- a/arch/arm/mach-mmp/onboard/lcd_mipi.c
+++ b/arch/arm/mach-mmp/onboard/lcd_mipi.c
@@ -568,11 +568,15 @@ static void lvds_hook(struct pxa168fb_mach_info *mi)
mi->modes->refresh = 60;
if (machine_is_yellowstone()) {
+#ifdef CONFIG_MACH_YELLOWSTONE
mi->phy_info = (void *)&lvdsinfo;
mi->pxa168fb_lcd_power = yellowstone_lvds_power;
+#endif
} else if (machine_is_abilene()) {
+#ifdef CONFIG_MACH_ABILENE
mi->phy_info = (void *)&lvdsinfo;
mi->pxa168fb_lcd_power = abilene_lvds_power;
+#endif
} else if (machine_is_thunderstonem()) {
#if defined(CONFIG_MACH_THUNDERSTONEM)
mi->pxa168fb_lcd_power = thunderstonem_lvds_power;