diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-09 08:56:12 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-09 08:56:12 +0200 |
| commit | 9fbbc87d14436aab7e61120b5b2692773abaf84a (patch) | |
| tree | afe952f9ff2d5cf70cfe52f4591c4e5629cab518 /config-armv7-generic | |
| parent | 003bacbdf7e20f8fdeea67a75192d18577a273da (diff) | |
| parent | 82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf (diff) | |
| download | kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc24.tar.gz kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc24.tar.xz kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc25kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc24kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc23kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc22
Diffstat (limited to 'config-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index 5f275be66..063b57e11 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -395,7 +395,6 @@ CONFIG_TI_THERMAL=y CONFIG_MMC_OMAP_HS=m # mvebu -CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_375=y CONFIG_MACH_ARMADA_38X=y @@ -403,45 +402,18 @@ CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y -CONFIG_MVEBU_DEVBUS=y -CONFIG_PCI_MVEBU=y CONFIG_CACHE_TAUROS2=y -CONFIG_MV_XOR=y -CONFIG_CRYPTO_DEV_MV_CESA=m -CONFIG_CRYPTO_DEV_MARVELL_CESA=m -CONFIG_MV643XX_ETH=m -CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_XP=y # CONFIG_ARM_MVEBU_V7_CPUIDLE is not set CONFIG_PINCTRL_DOVE=y -CONFIG_EDAC_MV64X60=m -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_88PM80X=m -CONFIG_RTC_DRV_ISL12057=m -CONFIG_RTC_DRV_MV=m -CONFIG_RTC_DRV_ARMADA38X=m -CONFIG_MVNETA=m -CONFIG_MVNETA_BM_ENABLE=m -CONFIG_GPIO_MVEBU=y -CONFIG_MVEBU_CLK_CORE=y -CONFIG_MVEBU_CLK_COREDIV=y -CONFIG_MMC_MVSDIO=m CONFIG_MMC_SDHCI_DOVE=m -CONFIG_SPI_ORION=m -CONFIG_USB_MV_UDC=m -CONFIG_MVEBU_MBUS=y -CONFIG_USB_XHCI_MVEBU=m -CONFIG_PHY_MVEBU_SATA=y -CONFIG_AHCI_MVEBU=m -CONFIG_ARMADA_THERMAL=m CONFIG_DOVE_THERMAL=m CONFIG_DRM_ARMADA=m CONFIG_ORION_WATCHDOG=m CONFIG_SND_KIRKWOOD_SOC=m CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m CONFIG_USB_EHCI_HCD_ORION=m -CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MVPP2=m CONFIG_COMMON_CLK_SI5351=m CONFIG_RTC_DRV_ARMADA38X=m |