aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-10-15 14:12:39 +0200
committerKalimochoAz <calimochoazucarado@gmail.com>2012-10-15 14:12:39 +0200
commit4a983743e330743dd5f96dc534efc3a042a8585b (patch)
tree2063c2c69faa32264a6bfae16ad60282a0cc9e65 /arch
parent833eb1cbb6560c3c188dd858ae14582ba1969ced (diff)
downloadkernel_samsung_crespo-4a983743e330743dd5f96dc534efc3a042a8585b.zip
kernel_samsung_crespo-4a983743e330743dd5f96dc534efc3a042a8585b.tar.gz
kernel_samsung_crespo-4a983743e330743dd5f96dc534efc3a042a8585b.tar.bz2
Update defconfig to add BFQ
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/crespo_defconfig17
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/configs/crespo_defconfig b/arch/arm/configs/crespo_defconfig
index daee1a8..ad8a565 100644
--- a/arch/arm/configs/crespo_defconfig
+++ b/arch/arm/configs/crespo_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.36 Kernel Configuration
+# Linux/arm 3.0.46 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -133,7 +133,7 @@ CONFIG_PERF_USE_VMALLOC=y
#
# Kernel Performance Events And Counters
#
-CONFIG_PERF_COUNTERS=y
+# CONFIG_PERF_EVENTS is not set
# CONFIG_PERF_COUNTERS is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLUB_DEBUG=y
@@ -175,8 +175,12 @@ CONFIG_LBDAF=y
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
+CONFIG_IOSCHED_CFQ=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_CGROUP_BFQIO=y
CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_BFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="deadline"
# CONFIG_INLINE_SPIN_TRYLOCK is not set
@@ -955,6 +959,7 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_SYNC is not set
# CONFIG_CONNECTOR is not set
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
@@ -1057,7 +1062,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
-# CONFIG_ANDROID_PMEM is not set
# CONFIG_INTEL_MID_PTI is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
@@ -1102,6 +1106,7 @@ CONFIG_USB_SWITCH_FSA9480=y
CONFIG_SAMSUNG_MODEMCTL=y
CONFIG_PN544=y
CONFIG_GENERIC_BLN=y
+CONFIG_BLD=y
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1753,6 +1758,7 @@ CONFIG_PVR_SGX_LOW_LATENCY_SCHEDULING=y
CONFIG_PVR_USSE_EDM_STATUS_DEBUG=y
CONFIG_PVR_DUMP_MK_TRACE=y
# CONFIG_PVR_PDUMP is not set
+# CONFIG_PVR_LINUX_MEM_AREA_POOL is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
@@ -1878,6 +1884,7 @@ CONFIG_SND_SOC_WM8994_SAMSUNG=y
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
#
# USB Input Devices
@@ -2424,7 +2431,7 @@ CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_STRIP_ASM_SYMS is not set
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_SECTION_MISMATCH is not set
CONFIG_DEBUG_KERNEL=y