diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 04:36:37 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 04:36:37 +0400 |
| commit | 6a8c62f3e97fdf184fde60bc99155476e8e9cd55 (patch) | |
| tree | 71b818d584f79baf1a192df65c758a592a63360d /arch/powerpc/configs/52xx/lite5200b_defconfig | |
| parent | b46d0c46ccaa366a5bb8ac709fdf2bcaa76221fd (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| download | linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.tar.xz | |
Merge 3.13-rc4 into tty-next
We want the fixes in here as well.
Diffstat (limited to 'arch/powerpc/configs/52xx/lite5200b_defconfig')
| -rw-r--r-- | arch/powerpc/configs/52xx/lite5200b_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index f3638ae0a627..104a332e79ab 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_defconfig @@ -15,7 +15,6 @@ CONFIG_PPC_MPC52xx=y CONFIG_PPC_MPC5200_SIMPLE=y CONFIG_PPC_LITE5200=y # CONFIG_PPC_PMAC is not set -CONFIG_PPC_BESTCOMM=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SPARSE_IRQ=y @@ -59,6 +58,8 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_MPC=y # CONFIG_HWMON is not set CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_DMADEVICES=y +CONFIG_PPC_BESTCOMM=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |