From 60adb56b67ae4e61500e67080b6fadfff554b22f Mon Sep 17 00:00:00 2001 From: Joseph Wu Date: Mon, 4 Feb 2013 20:55:20 +0800 Subject: [PATCH] Sensors: Fix the riva initial function. - Fix the conditional definition to avoid riva initial fail. Change-Id: Ia030519610ca964cb93a6ccf344df995e0f1ca85 Reviewed-on: http://mcrd1-5.corpnet.asus/code-review/master/68383 Tested-by: Sam Chen Reviewed-by: Sam Chen Reviewed-by: Joseph Wu Tested-by: Joseph Wu Tested-by: Jive Hwang Reviewed-by: Jive Hwang --- arch/arm/mach-msm/asustek/flo/board-flo.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-msm/asustek/flo/board-flo.c b/arch/arm/mach-msm/asustek/flo/board-flo.c index 1ec8d795dfa..9ee930efac9 100755 --- a/arch/arm/mach-msm/asustek/flo/board-flo.c +++ b/arch/arm/mach-msm/asustek/flo/board-flo.c @@ -3529,16 +3529,15 @@ static void __init apq8064_common_init(void) ARRAY_SIZE(apq8064_slim_devices)); // +++ sensors initial porting +++ -#if QCOM_DSPS if (!PLATFORM_IS_MPQ8064()) { +#if QCOM_DSPS apq8064_init_dsps(); +#else + register_sensor_devices(); + apq8064_mpuirq_init(); +#endif platform_device_register(&msm_8960_riva); } -#else - register_sensor_devices(); - apq8064_mpuirq_init(); -#endif - // --- sensors initial porting --- msm_spm_init(msm_spm_data, ARRAY_SIZE(msm_spm_data)); msm_spm_l2_init(msm_spm_l2_data);