From: xbw <xbw@rock-chips.com>
Date: Fri, 10 Aug 2012 04:31:57 +0000 (+0800)
Subject: revert the mach-rk30-Makefie. commit error in b479d89814a79dc655f82642edb76af2a2236e6f
X-Git-Tag: firefly_0821_release~8922^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4644fe5e5b3b638dace97adddec4f3673710254f;p=firefly-linux-kernel-4.4.55.git

revert the mach-rk30-Makefie. commit error in b479d89814a79dc655f82642edb76af2a2236e6f
---

diff --git a/arch/arm/mach-rk30/Makefile b/arch/arm/mach-rk30/Makefile
index c9be090a0d2f..2167eef284c7 100755
--- a/arch/arm/mach-rk30/Makefile
+++ b/arch/arm/mach-rk30/Makefile
@@ -22,12 +22,7 @@ obj-$(CONFIG_DDR_FREQ) += ddr_freq.o
 obj-$(CONFIG_RK30_I2C_INSRAM) += i2c_sram.o
 
 obj-$(CONFIG_MACH_RK3066_SDK) += board-rk30-sdk.o board-rk30-sdk-key.o
-
-ifeq ($(CONFIG_WIFI_COMBO_MODULE_CONTROL_FUNC),y)
 obj-$(CONFIG_MACH_RK30_SDK) += board-rk30-sdk.o board-rk30-sdk-key.o
-else
-obj-$(CONFIG_MACH_RK30_SDK) += board-rk30-sdk.o board-rk30-sdk-key.o board-rk30-sdk-rfkill.o
-endif
 obj-$(CONFIG_MACH_RK30_PHONE) += board-rk30-phone.o board-rk30-phone-key.o
 obj-$(CONFIG_MACH_RK30_PHONE_PAD) += board-rk30-phonepad.o board-rk30-phonepad-key.o board-rk30-phonepad-rfkill.o
 obj-$(CONFIG_MACH_RK30_PHONE_LOQUAT) += board-rk30-phone-loquat.o board-rk30-phone-loquat-key.o