diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 14:37:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 14:37:21 +0100 |
| commit | dbf9387c08a68634b8d350b3585f91eae1ed59e1 (patch) | |
| tree | fd18f7645ccd6326cd90a310fa00c9ccaf5e4393 /arch/arm/configs | |
| parent | 30c04fdd032d1962dbe71eee8ad38dc5053194d0 (diff) | |
| parent | 4f26b761531c00605010d595b495901106729f8b (diff) | |
| download | talos-op-linux-dbf9387c08a68634b8d350b3585f91eae1ed59e1.tar.gz talos-op-linux-dbf9387c08a68634b8d350b3585f91eae1ed59e1.zip | |
Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux into next/boards
Merge "Allwinner defconfig additions for 3.15" from Maxime Ripard:
Enables SPI and SID drivers in sunxi defconfig
* tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux:
ARM: sunxi: Enable A31 SPI and SID in the defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 3e2259b60236..b5df4a511b0a 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -24,6 +24,7 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y +CONFIG_EEPROM_SUNXI_SID=y CONFIG_NETDEVICES=y CONFIG_SUN4I_EMAC=y # CONFIG_NET_CADENCE is not set @@ -48,6 +49,8 @@ CONFIG_I2C=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y +CONFIG_SPI=y +CONFIG_SPI_SUN6I=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y |
