diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 19:38:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 19:38:28 -0400 |
| commit | bb25ce633d0621786526a2b7ad0d54468a55e986 (patch) | |
| tree | ed1559bad22cd5cb002978f6a64e768dbbc14f30 | |
| parent | 7b13e1aa6e144d8014eaf593259a3deb532d990a (diff) | |
| parent | bf7389c49d1db5d731bbb9cece2fd95edc7a176a (diff) | |
Merge branch 'next/defconfig' of git+ssh://ra.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next/defconfig
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 1 |
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 | |||
| 98 | CONFIG_LEDS_TRIGGER_CAMERA=y | 98 | CONFIG_LEDS_TRIGGER_CAMERA=y |
| 99 | CONFIG_STAGING=y | 99 | CONFIG_STAGING=y |
| 100 | CONFIG_USB_DWC2=y | 100 | CONFIG_USB_DWC2=y |
| 101 | CONFIG_USB_DWC2_HOST=y | ||
| 101 | # CONFIG_IOMMU_SUPPORT is not set | 102 | # CONFIG_IOMMU_SUPPORT is not set |
| 102 | CONFIG_EXT2_FS=y | 103 | CONFIG_EXT2_FS=y |
| 103 | CONFIG_EXT2_FS_XATTR=y | 104 | CONFIG_EXT2_FS_XATTR=y |