summaryrefslogtreecommitdiff
path: root/arch/avr32/configs/merisc_defconfig
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-07-01 18:17:13 +0400
committerJens Axboe <jaxboe@fusionio.com>2011-07-01 18:17:13 +0400
commit04bf7869ca0fd12009aee301cac2264a36df4d98 (patch)
tree66cb81ebf8b76560a31433c2c493dc430c914af9 /arch/avr32/configs/merisc_defconfig
parentd2f31a5fd60d168b00fc4f7617b68a1287b21e90 (diff)
parent7b28afe01ab6ffb5f152f47831b44933facd2328 (diff)
downloadlinux-04bf7869ca0fd12009aee301cac2264a36df4d98.tar.xz
Merge branch 'for-linus' into for-3.1/core
Conflicts: block/blk-throttle.c block/cfq-iosched.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'arch/avr32/configs/merisc_defconfig')
-rw-r--r--arch/avr32/configs/merisc_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
index 8b670a6530bf..3befab966827 100644
--- a/arch/avr32/configs/merisc_defconfig
+++ b/arch/avr32/configs/merisc_defconfig
@@ -7,6 +7,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_BASE_FULL is not set
CONFIG_MODULES=y