[kernel] refresh 2.6.26 patches

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.26 / 921-gpio_spi_driver.patch

diff --git a/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch
index 2457cbe..c70a380 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/921-gpio_spi_driver.patch
@@ -330,7 +330,7 @@
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 +MODULE_LICENSE("GPL v2");
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig

-@@ -100,6 +100,19 @@
+@@ -100,6 +100,19 @@ config SPI_BUTTERFLY

          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
  


@@ -352,7 +352,7 @@
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile

-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.

  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
  obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o
  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
  obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o


@@ -362,7 +362,7 @@
  obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
  obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
 --- a/MAINTAINERS
 +++ b/MAINTAINERS

-@@ -3795,6 +3795,11 @@
+@@ -3795,6 +3795,11 @@ L:      cbe-oss-dev@ozlabs.org

  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported