aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrew Dodd <atd7@cornell.edu>2013-02-16 17:02:48 -0500
committerAndrew Dodd <atd7@cornell.edu>2013-02-27 09:19:15 -0500
commit78eca744f2700e1bb0d4ac93c944329d82006e16 (patch)
tree7915237ca1805532df90a97930932e9faef7bf1b /arch
parentd4f19c013807861e52b7721ac4de5914fcfc12c1 (diff)
downloadkernel_samsung_smdk4412-78eca744f2700e1bb0d4ac93c944329d82006e16.zip
kernel_samsung_smdk4412-78eca744f2700e1bb0d4ac93c944329d82006e16.tar.gz
kernel_samsung_smdk4412-78eca744f2700e1bb0d4ac93c944329d82006e16.tar.bz2
config: Regenerate for new bcmdhd driver
Change-Id: Ic290661cf04c03a10e444d0ee8b1b6c713470e78
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/cyanogenmod_n8013_defconfig14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/configs/cyanogenmod_n8013_defconfig b/arch/arm/configs/cyanogenmod_n8013_defconfig
index 5b485ac..0b773e3 100644
--- a/arch/arm/configs/cyanogenmod_n8013_defconfig
+++ b/arch/arm/configs/cyanogenmod_n8013_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.31 Kernel Configuration
+# Linux/arm 3.0.64 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -587,6 +587,9 @@ CONFIG_ARM_ERRATA_761320=y
# CONFIG_ARM_ERRATA_761171 is not set
# CONFIG_ARM_ERRATA_762974 is not set
# CONFIG_ARM_ERRATA_763722 is not set
+CONFIG_ARM_ERRATA_764369=y
+# CONFIG_PL310_ERRATA_769419 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
CONFIG_ARM_GIC=y
CONFIG_PL330=y
# CONFIG_FIQ_DEBUGGER is not set
@@ -597,8 +600,6 @@ CONFIG_PL330=y
# CONFIG_PCI_SYSCALL is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
# CONFIG_PCCARD is not set
-CONFIG_ARM_ERRATA_764369=y
-# CONFIG_PL310_ERRATA_769419 is not set
#
# Kernel Features
@@ -1338,11 +1339,14 @@ CONFIG_WLAN=y
# CONFIG_USB_NET_RNDIS_WLAN is not set
CONFIG_WIFI_CONTROL_FUNC=y
# CONFIG_ATH_COMMON is not set
+CONFIG_BCMDHD=m
# CONFIG_BCM4330 is not set
CONFIG_BCM4334=y
# CONFIG_BCM43241 is not set
CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
+CONFIG_DHD_USE_STATIC_BUF=y
+CONFIG_DHD_USE_SCHED_SCAN=y
CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
CONFIG_WLAN_REGION_CODE=100
# CONFIG_HOSTAP is not set
@@ -2075,6 +2079,7 @@ CONFIG_MALI_OSMEM_ONLY=y
# CONFIG_MALI_DED_OSMEM is not set
# CONFIG_MALI_R3P1_LSI is not set
# CONFIG_VIDEO_MALI400MP_DEBUG is not set
+# CONFIG_VIDEO_MALI400MP_STREAMLINE_PROFILING is not set
CONFIG_VIDEO_MALI400MP_DVFS=y
CONFIG_VIDEO_UMP=y
# CONFIG_UMP_R3P1_LSI is not set
@@ -2290,6 +2295,7 @@ CONFIG_SND_SOC_USE_EXTERNAL_MIC_BIAS=y
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HIDRAW is not set
+CONFIG_UHID=y
#
# USB Input Devices
@@ -2301,7 +2307,6 @@ CONFIG_USB_HID=y
#
# Special HID drivers
#
-CONFIG_UHID=y
CONFIG_HID_A4TECH=y
CONFIG_HID_ACRUX=y
# CONFIG_HID_ACRUX_FF is not set
@@ -2447,7 +2452,6 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
# CONFIG_USB_LIBUSUAL is not set
#