diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 15:56:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 15:56:47 -0400 |
| commit | 8bc84f87315e8bdbe242ba788fdc6a74d653b177 (patch) | |
| tree | b96fef5c82de40cb2a5bfe6f29699f1c820513cd /arch/ia64/configs/generic_defconfig | |
| parent | 18e5a45db30e0e338cdd663eda05a8288cc14fa5 (diff) | |
| parent | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (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_defconfig | 1 |
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 |
| 235 | CONFIG_CRC_T10DIF=y | 235 | CONFIG_CRC_T10DIF=y |
| 236 | CONFIG_MISC_DEVICES=y | 236 | CONFIG_MISC_DEVICES=y |
| 237 | CONFIG_DMAR=y | ||