summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/52xx/lite5200b_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-29 06:37:03 +0100
committerOlof Johansson <olof@lixom.net>2013-12-29 06:38:16 +0100
commitfe5a365cdb9cc925d5ce86a5bb4509dca57f3894 (patch)
tree8dd536be0e16e86109295142edd1ef1fd18c2e98 /arch/powerpc/configs/52xx/lite5200b_defconfig
parentMerge tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/... (diff)
parentLinux 3.13-rc5 (diff)
downloadlinux-fe5a365cdb9cc925d5ce86a5bb4509dca57f3894.tar.xz
linux-fe5a365cdb9cc925d5ce86a5bb4509dca57f3894.zip
Merge tag 'v3.13-rc5' into next/boards
Need a newer base version to get a regulator fix for Samsung platforms that they enable building in a defconfig. Linux 3.13-rc5
Diffstat (limited to 'arch/powerpc/configs/52xx/lite5200b_defconfig')
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig3
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