fix a small bug in the socket type patch which broke dhcp

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

diff --git a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
index 1249a63..a804828 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/921-gpio_spi_driver.patch
@@ -1,13 +1,10 @@
-Index: linux-2.6.25.10/include/linux/spi/spi_gpio.h
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/include/linux/spi/spi_gpio.h       2008-07-20 20:10:21.000000000 +0200
-@@ -0,0 +1,73 @@
+--- /dev/null
++++ b/include/linux/spi/spi_gpio.h
+@@ -0,0 +1,72 @@
 +/*
 + * spi_gpio interface to platform code
 + *
 + * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
 + *
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License version 2 as
@@ -76,16 +73,13 @@ Index: linux-2.6.25.10/include/linux/spi/spi_gpio.h
 +int spi_gpio_next_id(void);
 +
 +#endif /* _LINUX_SPI_SPI_GPIO */
-Index: linux-2.6.25.10/drivers/spi/spi_gpio.c
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.25.10/drivers/spi/spi_gpio.c     2008-07-20 20:10:21.000000000 +0200
-@@ -0,0 +1,251 @@
+--- /dev/null
++++ b/drivers/spi/spi_gpio.c
+@@ -0,0 +1,249 @@
 +/*
 + * Bitbanging SPI bus driver using GPIO API
 + *
 + * Copyright (c) 2008 Piotr Skamruk
-+ * Copyright (c) 2008 Michael Buesch
 + *
 + * based on spi_s3c2410_gpio.c
 + *   Copyright (c) 2006 Ben Dooks
@@ -329,13 +323,10 @@ Index: linux-2.6.25.10/drivers/spi/spi_gpio.c
 +module_exit(spi_gpio_exit);
 +
 +MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
-+MODULE_AUTHOR("Michael Buesch");
 +MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
 +MODULE_LICENSE("GPL v2");
-Index: linux-2.6.25.10/drivers/spi/Kconfig
-===================================================================
---- linux-2.6.25.10.orig/drivers/spi/Kconfig   2008-07-20 20:09:48.000000000 +0200
-+++ linux-2.6.25.10/drivers/spi/Kconfig        2008-07-20 20:11:48.000000000 +0200
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
 @@ -100,6 +100,19 @@ config SPI_BUTTERFLY
          inexpensive battery powered microcontroller evaluation board.
          This same cable can be used to flash new firmware.
@@ -356,10 +347,8 @@ Index: linux-2.6.25.10/drivers/spi/Kconfig
  config SPI_IMX
        tristate "Freescale iMX SPI controller"
        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-Index: linux-2.6.25.10/drivers/spi/Makefile
-===================================================================
---- linux-2.6.25.10.orig/drivers/spi/Makefile  2008-07-20 20:09:48.000000000 +0200
-+++ linux-2.6.25.10/drivers/spi/Makefile       2008-07-20 20:10:21.000000000 +0200
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.
  obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
  obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
@@ -368,19 +357,3 @@ Index: linux-2.6.25.10/drivers/spi/Makefile
  obj-$(CONFIG_SPI_IMX)                 += spi_imx.o
  obj-$(CONFIG_SPI_LM70_LLP)            += spi_lm70llp.o
  obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
-Index: linux-2.6.25.10/MAINTAINERS
-===================================================================
---- linux-2.6.25.10.orig/MAINTAINERS   2008-07-20 20:09:48.000000000 +0200
-+++ linux-2.6.25.10/MAINTAINERS        2008-07-20 20:10:59.000000000 +0200
-@@ -3685,6 +3685,11 @@ M:      dbrownell@users.sourceforge.net
- L:    spi-devel-general@lists.sourceforge.net
- S:    Maintained
- 
-+SPI GPIO MASTER DRIVER
-+P:    Michael Buesch
-+M:    mb@bu3sch.de
-+S:    Maintained
-+
- STABLE BRANCH:
- P:    Greg Kroah-Hartman
- M:    greg@kroah.com