From 664343c8c622d40aa69afcb4844f48827bfd65c6 Mon Sep 17 00:00:00 2001 From: Timothy Meade Date: Thu, 24 Sep 2009 04:30:27 -0400 Subject: [PATCH 04/11] add support for building board-htcraphael-panel with only CONFIG_HTCRAPHAEL_CDMA500 enabled --- arch/arm/mach-msm/board-htcraphael-cdma500.c | 2 ++ arch/arm/mach-msm/board-htcraphael-panel.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-msm/board-htcraphael-cdma500.c b/arch/arm/mach-msm/board-htcraphael-cdma500.c index 3a08995..bb68e89 100644 --- a/arch/arm/mach-msm/board-htcraphael-cdma500.c +++ b/arch/arm/mach-msm/board-htcraphael-cdma500.c @@ -345,10 +345,12 @@ static struct platform_device *devices[] __initdata = { */ &msm_device_hsusb, &raphael_keypad_device, +/* &android_pmem_device, &android_pmem_adsp_device, &android_pmem_gpu0_device, &android_pmem_gpu1_device, +*/ &raphael_rfkill, &msm_device_smd, &msm_device_nand, diff --git a/arch/arm/mach-msm/board-htcraphael-panel.c b/arch/arm/mach-msm/board-htcraphael-panel.c index dbbcd9f..629a691 100644 --- a/arch/arm/mach-msm/board-htcraphael-panel.c +++ b/arch/arm/mach-msm/board-htcraphael-panel.c @@ -669,7 +669,7 @@ int __init htcraphael_init_panel(void) printk(KERN_INFO "%s: Initializing panel\n", __func__); - if (!machine_is_htcraphael() && !machine_is_htcraphael_cdma() /*&& !machine_is_htcdiamond()*/ && !machine_is_htcdiamond_cdma()) { + if (!machine_is_htcraphael() && !machine_is_htcraphael_cdma() && !machine_is_htcraphael_cdma500() /*&& !machine_is_htcdiamond()*/ && !machine_is_htcdiamond_cdma()) { printk(KERN_INFO "%s: disabling raphael panel\n", __func__); return 0; } -- 1.6.3.3