diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-24 12:41:10 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-24 12:41:10 -0500 |
| commit | 49c6ad430d74fb7995990be0f66165e4b94a6bc5 (patch) | |
| tree | 9a0b4d5158cea625efd1f4185cdea79fe9f10d85 /arch/arm/configs/tct_hammer_defconfig | |
| parent | 233d84c46c2253d13e10b42d88c14748fbb67a98 (diff) | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
Merge commit 'v2.6.38-rc2' into topic/misc
Diffstat (limited to 'arch/arm/configs/tct_hammer_defconfig')
| -rw-r--r-- | arch/arm/configs/tct_hammer_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig index e89ca19489c2..95c0f0d63db6 100644 --- a/arch/arm/configs/tct_hammer_defconfig +++ b/arch/arm/configs/tct_hammer_defconfig | |||
| @@ -5,7 +5,7 @@ CONFIG_SYSVIPC=y | |||
| 5 | CONFIG_LOG_BUF_SHIFT=14 | 5 | CONFIG_LOG_BUF_SHIFT=14 |
| 6 | CONFIG_SYSFS_DEPRECATED_V2=y | 6 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 7 | CONFIG_BLK_DEV_INITRD=y | 7 | CONFIG_BLK_DEV_INITRD=y |
| 8 | CONFIG_EMBEDDED=y | 8 | CONFIG_EXPERT=y |
| 9 | # CONFIG_KALLSYMS is not set | 9 | # CONFIG_KALLSYMS is not set |
| 10 | # CONFIG_BUG is not set | 10 | # CONFIG_BUG is not set |
| 11 | # CONFIG_ELF_CORE is not set | 11 | # CONFIG_ELF_CORE is not set |