Commit dbf9387c authored Mar 17, 2014 by Arnd Bergmann

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>

parents 30c04fdd 4f26b761

arch/arm/configs/sunxi_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -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