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/nhk8815_defconfig | |
| parent | 233d84c46c2253d13e10b42d88c14748fbb67a98 (diff) | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
Merge commit 'v2.6.38-rc2' into topic/misc
Diffstat (limited to 'arch/arm/configs/nhk8815_defconfig')
| -rw-r--r-- | arch/arm/configs/nhk8815_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 0e2dc26ebe66..37207d1bf44b 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig | |||
| @@ -7,7 +7,7 @@ CONFIG_IKCONFIG_PROC=y | |||
| 7 | CONFIG_LOG_BUF_SHIFT=14 | 7 | CONFIG_LOG_BUF_SHIFT=14 |
| 8 | CONFIG_SYSFS_DEPRECATED_V2=y | 8 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 9 | CONFIG_BLK_DEV_INITRD=y | 9 | CONFIG_BLK_DEV_INITRD=y |
| 10 | CONFIG_EMBEDDED=y | 10 | CONFIG_EXPERT=y |
| 11 | CONFIG_KALLSYMS_ALL=y | 11 | CONFIG_KALLSYMS_ALL=y |
| 12 | CONFIG_SLAB=y | 12 | CONFIG_SLAB=y |
| 13 | CONFIG_MODULES=y | 13 | CONFIG_MODULES=y |