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/powerpc/configs/85xx/ksi8560_defconfig | |
| parent | 233d84c46c2253d13e10b42d88c14748fbb67a98 (diff) | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
Merge commit 'v2.6.38-rc2' into topic/misc
Diffstat (limited to 'arch/powerpc/configs/85xx/ksi8560_defconfig')
| -rw-r--r-- | arch/powerpc/configs/85xx/ksi8560_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 385b1af37d75..8f7c1061891a 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_defconfig | |||
| @@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y | |||
| 4 | CONFIG_LOG_BUF_SHIFT=14 | 4 | CONFIG_LOG_BUF_SHIFT=14 |
| 5 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
| 6 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 6 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 7 | CONFIG_EMBEDDED=y | 7 | CONFIG_EXPERT=y |
| 8 | # CONFIG_BLK_DEV_BSG is not set | 8 | # CONFIG_BLK_DEV_BSG is not set |
| 9 | CONFIG_KSI8560=y | 9 | CONFIG_KSI8560=y |
| 10 | CONFIG_CPM2=y | 10 | CONFIG_CPM2=y |