aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/configs/generic_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-08-18 15:56:42 -0400
committerIngo Molnar <mingo@elte.hu>2011-08-18 15:56:47 -0400
commit8bc84f87315e8bdbe242ba788fdc6a74d653b177 (patch)
treeb96fef5c82de40cb2a5bfe6f29699f1c820513cd /arch/ia64/configs/generic_defconfig
parent18e5a45db30e0e338cdd663eda05a8288cc14fa5 (diff)
parentfe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (diff)
Merge branch 'perf/urgent' into perf/core
Merge reason: add the latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64/configs/generic_defconfig')
-rw-r--r--arch/ia64/configs/generic_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index 1d7bca0a396d..0e5cd1405e0e 100644
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -234,3 +234,4 @@ CONFIG_CRYPTO_MD5=y
234# CONFIG_CRYPTO_ANSI_CPRNG is not set 234# CONFIG_CRYPTO_ANSI_CPRNG is not set
235CONFIG_CRC_T10DIF=y 235CONFIG_CRC_T10DIF=y
236CONFIG_MISC_DEVICES=y 236CONFIG_MISC_DEVICES=y
237CONFIG_DMAR=y