summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-09-26 01:38:28 +0200
committerArnd Bergmann <arnd@arndb.de>2014-09-26 01:38:28 +0200
commitbb25ce633d0621786526a2b7ad0d54468a55e986 (patch)
treeed1559bad22cd5cb002978f6a64e768dbbc14f30 /arch
parent7b13e1aa6e144d8014eaf593259a3deb532d990a (diff)
parentbf7389c49d1db5d731bbb9cece2fd95edc7a176a (diff)
downloadlinux-stable-bb25ce633d0621786526a2b7ad0d54468a55e986.tar.gz
linux-stable-bb25ce633d0621786526a2b7ad0d54468a55e986.tar.bz2
linux-stable-bb25ce633d0621786526a2b7ad0d54468a55e986.zip
Merge branch 'next/defconfig' of git+ssh://ra.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next/defconfig
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/bcm2835_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index 0302d293fba0..31cb07388885 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -98,6 +98,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
CONFIG_LEDS_TRIGGER_CAMERA=y
CONFIG_STAGING=y
CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y