Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 775fadd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "Defconfig additions, removals, etc. Most of these are small changes
  adding the options for newly upstreamed drivers, or drivers needed for
  new board support.

  Bartlomiej Zolnierkiewicz has done a series of patches reducing the
  use of CONFIG_IDE from 19 to 3 in favor of CONFIG_ATA.

  Overall more patches than usual, but nothing big"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  ARM: davinci_all_defconfig: Enable da8xx usb otg
  ARM: defconfig: drop GPIO_SYSFS on multiplatforms
  ARM: multi_v7_defconfig: enable STMicroelectronics HVA driver
  ARM: configs: Add new config fragment to change RAM start point
  ARM: davinci_all_defconfig: Enable OHCI as module
  ARM: defconfig: turn on the DT cpufreq for Integrator
  ARM: omap2plus_defconfig: Run make savedefconfig to save some space
  ARM: davinci_all_defconfig: add missing options for systemd
  ARM: davinci_all_defconfig: enable the mstpri and ddrctl drivers
  ARM: bcm2835: add thermal driver to default config
  ARM: omap2plus_defconfig: Enable LP873X support
  ARM: omap2plus_defconfig: Enable REGULATOR_GPIO
  ARM: omap2plus_defconfig: Enable TOUCHSCREEN_TSC2004
  ARM: socfpga_defconfig: enable FS configs to support Angstrom filesystem
  ARM: config: Enable GPIO Key driver in stm32_defconfig
  ARM: tegra: Enable GMI driver in default configuration
  ARM: tegra: Enable SGTL5000 audio
  ARM: tegra: Update default configuration for v4.9-rc1
  ARM: socfpga: updates for socfpga_defconfig
  ARM: davinci_all_defconfig: enable LED default-on trigger
  ...
parents e79ab194 9f793ef3

arch/arm/configs/am200epdkit_defconfig

+3 −2
Original line number Diff line number Diff line
@@ -55,8 +55,9 @@ CONFIG_MTD_CFI_INTELEXT=y 
CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PXA2XX=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_IDE=m

CONFIG_BLK_DEV_IDECS=m

CONFIG_BLK_DEV_SD=m

CONFIG_ATA=m

CONFIG_PATA_PCMCIA=m

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=m

arch/arm/configs/assabet_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ CONFIG_MTD_CFI_INTELEXT=y 
CONFIG_MTD_SA1100=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_RAM=y

CONFIG_IDE=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_NET_PCMCIA=y

arch/arm/configs/badge4_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ CONFIG_MTD_SA1100=y 
CONFIG_PARPORT=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=m

CONFIG_IDE=m

CONFIG_BLK_DEV_IDECD=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

arch/arm/configs/bcm2835_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ CONFIG_SPI_BCM2835=y 
CONFIG_SPI_BCM2835AUX=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_BCM2835_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_BCM2835_WDT=y

CONFIG_DRM=y

arch/arm/configs/cerfcube_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_MTD_CFI_INTELEXT=y 
CONFIG_MTD_SA1100=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_RAM=m

CONFIG_IDE=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_NET_PCI=y