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

Commit df3e6906 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu into next/defconfig 

mvebu config for 4.4 (part 1)

Update the v7 defconfig witth usefull config for the Seagate NAS

* tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b52d2320 ea592ed2

arch/arm/configs/mvebu_v7_defconfig

+8 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ CONFIG_MTD_SPI_NOR=y 
CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT24=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_ATA=y

CONFIG_SATA_AHCI=y

CONFIG_AHCI_MVEBU=y

CONFIG_AHCI_MVEBU=y

CONFIG_SATA_MV=y

CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y
@@ -85,6 +86,9 @@ CONFIG_SPI=y 
CONFIG_SPI_ORION=y

CONFIG_SPI_ORION=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCA953X=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_THERMAL=y

CONFIG_THERMAL=y

CONFIG_ARMADA_THERMAL=y

CONFIG_ARMADA_THERMAL=y
@@ -111,12 +115,15 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_DOVE=y

CONFIG_MMC_SDHCI_DOVE=y

CONFIG_MMC_SDHCI_PXAV3=y

CONFIG_MMC_SDHCI_PXAV3=y

CONFIG_MMC_MVSDIO=y

CONFIG_MMC_MVSDIO=y

CONFIG_LEDS_GPIO=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PCF8563=y

CONFIG_RTC_DRV_S35390A=y

CONFIG_RTC_DRV_S35390A=y

CONFIG_RTC_DRV_MV=y

CONFIG_RTC_DRV_MV=y

CONFIG_RTC_DRV_ARMADA38X=y

CONFIG_RTC_DRV_ARMADA38X=y