Skip to content

Commit

Permalink
Merge branch 'next/defconfig' of git+ssh://ra.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/kernel/git/arm/arm-soc into next/defconfig
  • Loading branch information
Arnd Bergmann committed Sep 25, 2014
2 parents 7b13e1a + bf7389c commit bb25ce6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/configs/bcm2835_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bb25ce6

Please sign in to comment.