[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 922-w1_gpio_driver_backport.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch b/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch
index fa2f38e..dc5aadf 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/922-w1_gpio_driver_backport.patch
@@ -1,6 +1,6 @@
 --- a/drivers/w1/masters/Kconfig
 +++ b/drivers/w1/masters/Kconfig
 --- a/drivers/w1/masters/Kconfig
 +++ b/drivers/w1/masters/Kconfig

-@@ -42,5 +42,15 @@
+@@ -42,5 +42,15 @@ config W1_MASTER_DS1WM

          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
          hx4700.
  
          in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like
          hx4700.
  


@@ -18,7 +18,7 @@
  
 --- a/drivers/w1/masters/Makefile
 +++ b/drivers/w1/masters/Makefile
  
 --- a/drivers/w1/masters/Makefile
 +++ b/drivers/w1/masters/Makefile

-@@ -6,3 +6,4 @@
+@@ -6,3 +6,4 @@ obj-$(CONFIG_W1_MASTER_MATROX)         += matro

  obj-$(CONFIG_W1_MASTER_DS2490)                += ds2490.o
  obj-$(CONFIG_W1_MASTER_DS2482)                += ds2482.o
  obj-$(CONFIG_W1_MASTER_DS1WM)         += ds1wm.o
  obj-$(CONFIG_W1_MASTER_DS2490)                += ds2490.o
  obj-$(CONFIG_W1_MASTER_DS2482)                += ds2482.o
  obj-$(CONFIG_W1_MASTER_DS1WM)         += ds1wm.o