diff options
author | John Crispin <john@openwrt.org> | 2011-09-26 09:35:02 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2011-09-26 09:35:02 +0000 |
commit | cf59e7255dff4020c397f375fd62f15df955f5d2 (patch) | |
tree | 2218e4171f371926b919a798d46ff949dcceac48 /target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch | |
parent | 07986230f1b5ff482a46242da6eefd1055521f7b (diff) | |
download | upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.tar.gz upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.tar.bz2 upstream-cf59e7255dff4020c397f375fd62f15df955f5d2.zip |
* rebase 3.0 patches * fold some fixes into existing patches
SVN-Revision: 28308
Diffstat (limited to 'target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch b/target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch index 94f13c98b2..cf618e046d 100644 --- a/target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch +++ b/target/linux/lantiq/patches-3.0/130-falcon-spi-flash.patch @@ -1,6 +1,6 @@ --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -55,6 +55,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci. +@@ -56,6 +56,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci. obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o @@ -484,7 +484,7 @@ +MODULE_DESCRIPTION("Lantiq Falcon SPI controller driver"); --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -210,6 +210,10 @@ config SPI_MPC52xx +@@ -219,6 +219,10 @@ config SPI_MPC52xx This drivers supports the MPC52xx SPI controller in master SPI mode. |