From 34d892958281b09b80b6db8f1e47f963993375b2 Mon Sep 17 00:00:00 2001 From: xbw Date: Thu, 27 Dec 2012 19:50:02 +0800 Subject: [PATCH] MT6620 4in1: does not modify other. Just eliminate compiler warning when certain macro is not defined --- arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c b/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c index ed23e88ce69f..fdae0fb89ee6 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c +++ b/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c @@ -1379,7 +1379,7 @@ struct rksdmmc_gpio_wifi_moudle rk_platform_wifi_gpio = { }, #endif -#if COMBO_MODULE_MT6620_CDT +#if defined(COMBO_MODULE_MT6620_CDT) && COMBO_MODULE_MT6620_CDT #ifdef RK30SDK_WIFI_GPIO_ANTSEL2 .ANTSEL2 = { .io = RK30SDK_WIFI_GPIO_ANTSEL2, @@ -1724,7 +1724,7 @@ static int rk29sdk_wifi_combo_module_gpio_init(void) gpio_request(rk_platform_wifi_gpio.power_n.io, "combo-PMUEN"); gpio_direction_output(rk_platform_wifi_gpio.power_n.io, !(rk_platform_wifi_gpio.power_n.enable)); - #if COMBO_MODULE_MT6620_CDT + #if defined(COMBO_MODULE_MT6620_CDT) && COMBO_MODULE_MT6620_CDT //ANTSEL2 #ifdef RK30SDK_WIFI_GPIO_ANTSEL2 #ifdef RK30SDK_WIFI_GPIO_ANTSEL2_PIN_NAME -- 2.34.1