aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/862-gpio_spi_driver.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-24 18:53:14 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-24 18:53:14 +0000
commitaba8ca6df21d9d39352aad1d4e85845505955528 (patch)
treee96d52efd638433b45e08314144092a9f041cfec /target/linux/generic/patches-4.0/862-gpio_spi_driver.patch
parent6ebdada8c78252e91ec2f1f1c8f3230f2261f955 (diff)
downloadmaster-187ad058-aba8ca6df21d9d39352aad1d4e85845505955528.tar.gz
master-187ad058-aba8ca6df21d9d39352aad1d4e85845505955528.tar.bz2
master-187ad058-aba8ca6df21d9d39352aad1d4e85845505955528.zip
generic/4.0: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44532 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/862-gpio_spi_driver.patch')
-rw-r--r--target/linux/generic/patches-4.0/862-gpio_spi_driver.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.0/862-gpio_spi_driver.patch b/target/linux/generic/patches-4.0/862-gpio_spi_driver.patch
index 8ffea82ee3..be059383f3 100644
--- a/target/linux/generic/patches-4.0/862-gpio_spi_driver.patch
+++ b/target/linux/generic/patches-4.0/862-gpio_spi_driver.patch
@@ -345,7 +345,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
+MODULE_LICENSE("GPL v2");
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -232,6 +232,15 @@ config SPI_IMG_SPFI
+@@ -242,6 +242,15 @@ config SPI_IMG_SPFI
This enables support for the SPFI master controller found on
IMG SoCs.
@@ -363,7 +363,7 @@ Please use the new mainline SPI-GPIO driver, as of 2.6.29.
depends on ARCH_MXC || COMPILE_TEST
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -40,6 +40,7 @@ obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-li
+@@ -41,6 +41,7 @@ obj-$(CONFIG_SPI_FSL_LIB) += spi-fsl-li
obj-$(CONFIG_SPI_FSL_ESPI) += spi-fsl-espi.o
obj-$(CONFIG_SPI_FSL_SPI) += spi-fsl-spi.o
obj-$(CONFIG_SPI_GPIO) += spi-gpio.o