diff options
| -rwxr-xr-x | arch/arm/configs/Android_defconfig | 14 | ||||
| -rw-r--r-- | drivers/net/wireless/Makefile | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/configs/Android_defconfig b/arch/arm/configs/Android_defconfig index aaebcbba..f7ea5d2c 100755 --- a/arch/arm/configs/Android_defconfig +++ b/arch/arm/configs/Android_defconfig @@ -1549,7 +1549,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_SYNAPTICS_USB is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set -CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set @@ -1598,7 +1598,7 @@ CONFIG_TOUCHSCREEN_GT9XX=y CONFIG_TOUCHSCREEN_ICN83XX=y CONFIG_INPUT_RMTCTL=y CONFIG_RMTCTL_WonderMedia=m -CONFIG_INPUT_PKEY=y +# CONFIG_INPUT_PKEY is not set CONFIG_PKEY_WonderMedia=m CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set @@ -1621,7 +1621,7 @@ CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_CMA3000 is not set -CONFIG_INPUT_SENSOR=y +# CONFIG_INPUT_SENSOR is not set # CONFIG_WMT_SENSOR_KXTE9 is not set CONFIG_WMT_SENSOR_KIONIX=m CONFIG_WMT_SENSOR_MC3230=m @@ -1994,7 +1994,7 @@ CONFIG_MEDIA_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_COMMON=y -CONFIG_DVB_CORE=y +# CONFIG_DVB_CORE is not set CONFIG_DVB_NET=y CONFIG_VIDEO_MEDIA=y @@ -3119,7 +3119,7 @@ CONFIG_COMMON_CLK=y # # MediaTek Connectivity Combo Chip Config # -CONFIG_MTK_COMBO=y +# CONFIG_MTK_COMBO is not set CONFIG_MTK_COMBO_CHIP_MT6620=y CONFIG_MTK_COMBO_PLAT_PATH="wmt" CONFIG_MTK_COMBO_COMM=m @@ -3148,7 +3148,7 @@ CONFIG_IOMMU_SUPPORT=y # # MediaTek Connectivity MT5931 Config # -CONFIG_MTK_MT5931=y +# CONFIG_MTK_MT5931 is not set CONFIG_MTK_MT5931_WIFI=m # CONFIG_MTK_MT5931_DEBUG is not set # CONFIG_MTK_MT5931_WLAN_PROC is not set @@ -3160,7 +3160,7 @@ CONFIG_MTK_MT5931_WIFI=m # MediaTek Bluetooth Chip Config # CONFIG_MTK_DISCRETE_BT=m -CONFIG_MTK_DISCRETE_BT_HW_CTL=m +# CONFIG_MTK_DISCRETE_BT_HW_CTL is noi set # # File systems diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 20769ca6..8b8b9705 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -86,6 +86,6 @@ obj-$(CONFIG_BCMDHD) += bcmdhd.1.28.23.x.cn/ obj-$(CONFIG_NMC1XXX_WIFI_MODULE) += nmi/ obj-m += nmi_android4.4_driver/src/nmi_memory/ obj-$(CONFIG_NMC1XXX_WIFI_MODULE) += nmi_android4.4_driver/ -obj-y += combo_mt66xx/ +#obj-y += combo_mt66xx/ obj-y += rda/ obj-$(MTK_MT5931_KK) += mt5931/ |