Fix duplicate config

arch/arm/configs/apq8064_defconfig

@@ -389,7 +389,6 @@ CONFIG_MSM_AMSS_VERSION=6225
 # CONFIG_MSM_AMSS_VERSION_6210 is not set
 # CONFIG_MSM_AMSS_VERSION_6220 is not set
 CONFIG_MSM_AMSS_VERSION_6225=y
-CONFIG_HTC_BATT_CORE=y
 # CONFIG_HTC_BATT8x60 is not set
 CONFIG_HTC_BATT_8960=y
 CONFIG_HTC_ONMODE_CHARGING=y
@@ -1589,7 +1588,6 @@ CONFIG_BCMDHD_4334=y
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
 # CONFIG_WAN is not set
-CONFIG_HTC_TCP_SYN_FAIL=y
 # CONFIG_KINETO_GAN is not set
 # CONFIG_ISDN is not set
 
@@ -2046,14 +2044,9 @@ CONFIG_HWMON=y
 # htc battery
 #
 CONFIG_HTC_BATT_CORE=y
-CONFIG_HTC_BATT_8960=y
-CONFIG_HTC_ONMODE_CHARGING=n
-# CONFIG_HTC_OFFMODE_ALARM is not set
-# CONFIG_HTC_QUICKBOOT_OFFMODE_ALARM is not set
 #
 # fd operation monitor mechanism
 #
-CONFIG_HTC_FD_MONITOR=y
 
 #
 # Native drivers
@@ -2848,7 +2841,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
-CONFIG_USB_OTG_HOST=y
 # CONFIG_USB_DEBUG is not set
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -3132,7 +3124,6 @@ CONFIG_MMC_MSM_SPS_SUPPORT=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_HTC_DISABLE_DUMMY52 is not set
-# CONFIG_WIFI_IRQ_DEBUG is not set
 CONFIG_WIFI_MMC=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
@@ -3777,22 +3768,13 @@ CONFIG_NLATTR=y
 CONFIG_HTC_TCP_SYN_FAIL=y
 
 # NETWORK
-CONFIG_HTC_NETWORK_MODIFY=y
 
-CONFIG_CGROUP_TIMER_SLACK=y
 
 # For nonsmd packet filter feature
-CONFIG_MSM_NONSMD_PACKET_FILTER=y
 # For network packet monitor
-CONFIG_HTC_MONITOR=y
 # For power off mdm if device in offmode charging
-# CONFIG_HTC_POWEROFF_MODEM_IN_OFFMODE_CHARGING is not set
 
-# CONFIG_IOSCHED_TEST is not set
 
 #For store modem reset information
-CONFIG_HTC_STORE_MODEM_RESET_INFO=y
 
-CONFIG_WIFI_MMC=y
-CONFIG_HTC_IGNORE_SKB_ALIGNMENT=y
 # CONFIG_WIFI_IRQ_DEBUG is not set