kernel: in kernel 3.6.8 and later tg3 depends on hwmon.ko

[openwrt.git] / target / linux / brcm47xx / patches-3.3 / 812-disable_wgt634u_crap.patch

diff --git a/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch b/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch
index 76419e8..2819ca1 100644 (file)
--- a/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch
+++ b/target/linux/brcm47xx/patches-3.3/812-disable_wgt634u_crap.patch
@@ -3,11 +3,11 @@
 @@ -4,4 +4,3 @@
  #
  
- obj-y                                 += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o bus.o
+ obj-y                                 += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o sprom.o
 -obj-$(CONFIG_BCM47XX_SSB)     += wgt634u.o
 --- a/arch/mips/bcm47xx/wgt634u.c
 +++ /dev/null
-@@ -1,170 +0,0 @@
+@@ -1,177 +0,0 @@
 -/*
 - * This file is subject to the terms and conditions of the GNU General Public
 - * License.  See the file "COPYING" in the main directory of this archive
@@ -143,6 +143,7 @@
 -       * been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx.
 -       */
 -      u8 *et0mac;
+-      int err;
 -
 -      if (bcm47xx_bus_type != BCM47XX_BUS_TYPE_SSB)
 -              return -ENODEV;
@@ -156,6 +157,12 @@
 -
 -              printk(KERN_INFO "WGT634U machine detected.\n");
 -
+-              err = gpio_request(WGT634U_GPIO_RESET, "reset-buton");
+-              if (err) {
+-                      printk(KERN_INFO "Can not register gpio for reset button\n");
+-                      return 0;
+-              }
+-
 -              if (!request_irq(gpio_to_irq(WGT634U_GPIO_RESET),
 -                               gpio_interrupt, IRQF_SHARED,
 -                               "WGT634U GPIO", &bcm47xx_bus.ssb.chipco)) {