summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-11-07 17:02:53 +0000
committerPeter Robinson <pbrobinson@gmail.com>2016-11-07 17:02:53 +0000
commit5ed048875606161f58c505c16b506aabf9118654 (patch)
tree18d5091742417ca8a9ac11951972e34ccb6e1b4c /config-generic
parent01d6c12fcb330870f2b988b0e51020cd5dc3b871 (diff)
downloadkernel-5ed048875606161f58c505c16b506aabf9118654.tar.gz
kernel-5ed048875606161f58c505c16b506aabf9118654.tar.xz
kernel-5ed048875606161f58c505c16b506aabf9118654.zip
Minor ARM config updates. Other config update which are NFC
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic13
1 files changed, 2 insertions, 11 deletions
diff --git a/config-generic b/config-generic
index f62ebff70..d64c40bea 100644
--- a/config-generic
+++ b/config-generic
@@ -5729,7 +5729,6 @@ CONFIG_NET_DSA_BCM_SF2=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
CONFIG_NET_DSA_QCA8K=m
-
CONFIG_B53=m
CONFIG_B53_SPI_DRIVER=m
CONFIG_B53_MDIO_DRIVER=m
@@ -5812,7 +5811,6 @@ CONFIG_USBIP_VUDC=m
CONFIG_USBIP_VHCI_HC_PORTS=8
CONFIG_USBIP_VHCI_NR_HCS=1
# CONFIG_USBIP_DEBUG is not set
-# CONFIG_INTEL_MEI is not set
# CONFIG_VT6655 is not set
# CONFIG_IPACK_BUS is not set
# CONFIG_LUSTRE_FS is not set
@@ -5965,14 +5963,11 @@ CONFIG_GPIO_VIPERBOARD=m
# CONFIG_GPIO_TPIC2810 is not set
# CONFIG_GPIO_MPC8XXX is not set
# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_TS4800 is not set
# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_104_DIO_48E is not set
# CONFIG_GPIO_WS16C48 is not set
# CONFIG_GPIO_TS4900 is not set
-# FIXME: Why?
-
CONFIG_TEST_KSTRTOX=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
@@ -6026,6 +6021,7 @@ CONFIG_PSTORE_RAM=m
CONFIG_CHROME_PLATFORMS=y
# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
@@ -6036,18 +6032,14 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-# CONFIG_INTEL_MID_PTI is not set
CONFIG_IOMMU_SUPPORT=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
# CONFIG_MAILBOX is not set
# CONFIG_ALTERA_MBOX is not set
# CONFIG_MAILBOX_TEST is not set
-# CONFIG_RESET_CONTROLLER is not set
# CONFIG_TI_SYSCON_RESET is not set
+
CONFIG_FMC=m
CONFIG_FMC_FAKEDEV=m
CONFIG_FMC_TRIVIAL=m
@@ -6066,7 +6058,6 @@ CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_GOV_LADDER is not set
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
-# CONFIG_ASM9260_TIMER is not set
# CONFIG_HMC_DRV is not set