diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 01:23:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 01:23:28 +0200 |
| commit | 7477838f2e481256a40e0c44b92f9bccb065bc51 (patch) | |
| tree | f72a69428ce892a717177bd7336d5822ab0ac1e4 /arch/arm/configs/sama5_defconfig | |
| parent | Merge tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ARM: multi_v7_defconfig: Enable Exynos platform (diff) | |
| download | linux-7477838f2e481256a40e0c44b92f9bccb065bc51.tar.xz linux-7477838f2e481256a40e0c44b92f9bccb065bc51.zip | |
Merge tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
Pull ARM SoC defconfig updates from Olof Johansson:
"A number of defconfig updates for 3.16. We have quite a few of these
as new SoCs and drivers get supported, and we've started collecting
them in one shared branch.
We started halfway through the merge window so there'll be some small
conflicts with other branches on nearby changes, but nothing major.
Next cycle should be smoother"
* tag 'defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: multi_v7_defconfig: Enable Exynos platform
ARM: configs: update Allwinner options
ARM: qcom: Enable GSBI driver in defconfig
ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
ARM: at91/defconfig: sama5_defconfig: updated
ARM: add drivers for Colibri T30 to multi_v7_defconfig
ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig
ARM: configs: enable XHCI mvebu support in multi_v7_defconfig
ARM: multi_v7: Add Allwinner reset drivers to multi_v7_defconfig
ARM: sunxi: Add A31 reset driver to sunxi_defconfig
ARM: config: Update msm_defconfig
ARM: mvebu: enable MSI support in mvebu_v7_defconfig
ARM: config: Add qcom_defconfig
ARM: configs: enable XHCI mvebu support in mvebu_v7_defconfig
Diffstat (limited to 'arch/arm/configs/sama5_defconfig')
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 869fa18ebeb2..4414990521d3 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -137,6 +137,8 @@ CONFIG_SPI_GPIO=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set CONFIG_SSB=m +CONFIG_REGULATOR=y +CONFIG_REGULATOR_ACT8865=y CONFIG_FB=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set |