diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-04-14 13:13:02 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-04-14 13:13:02 +0100 |
| commit | 7b5be104e58ddf140574c831e1da780357b8acf2 (patch) | |
| tree | d978f18c0b6d5439c98517d12e1d76f22716b34d /config-armv7-generic | |
| parent | 9883f903b2c773b1de94843adeb8691d56e0c4db (diff) | |
| download | kernel-7b5be104e58ddf140574c831e1da780357b8acf2.tar.gz kernel-7b5be104e58ddf140574c831e1da780357b8acf2.tar.xz kernel-7b5be104e58ddf140574c831e1da780357b8acf2.zip | |
Minor ARM config changes and cleanups for 3.15 merge window
Diffstat (limited to 'config-armv7-generic')
| -rw-r--r-- | config-armv7-generic | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index 65870a9e..59e76560 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -35,6 +35,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y +CONFIG_IRQ_CROSSBAR=y # CONFIG_MCPM is not set # CONFIG_OABI_COMPAT is not set @@ -118,7 +119,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768 CONFIG_XZ_DEC_ARM=y -CONFIG_LOCAL_TIMERS=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_CC_STACKPROTECTOR=y @@ -172,6 +172,9 @@ CONFIG_DWMAC_SUNXI=y CONFIG_EEPROM_SUNXI_SID=m CONFIG_RTC_DRV_SUNXI=m CONFIG_PHY_SUN4I_USB=m +CONFIG_AHCI_SUNXI=m +CONFIG_SPI_SUN4I=m +CONFIG_SPI_SUN6I=m CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m @@ -303,21 +306,19 @@ CONFIG_W1_MASTER_GPIO=m CONFIG_SPI=y CONFIG_SPI_MASTER=y CONFIG_SPI_GPIO=m -CONFIG_SPI_BITBANG=m -CONFIG_SPI_PL022=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_DESIGNWARE=m CONFIG_SPI_LM70_LLP=m CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PL022=m CONFIG_SPI_S3C64XX=m CONFIG_SPI_SC18IS602=m +CONFIG_SPI_TLE62X0=m CONFIG_SPI_XCOMM=m CONFIG_SPI_XILINX=m -CONFIG_SPI_DESIGNWARE=m -CONFIG_SPI_TLE62X0=m -CONFIG_SPI_SUN4I=m -CONFIG_SPI_SUN6I=m # CONFIG_SPI_FSL_SPI is not set CONFIG_NFC_NCI_SPI=y @@ -615,7 +616,6 @@ CONFIG_BPF_JIT=y # CONFIG_DRM_TILCDC is not set # CONFIG_DRM_IMX is not set # CONFIG_AHCI_IMX is not set -CONFIG_AHCI_SUNXI=m # CONFIG_CS89x0 is not set # CONFIG_DM9000 is not set # CONFIG_HW_RANDOM_ATMEL is not set |