diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:30:42 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:30:42 +0000 |
commit | 4ee1d48f495829f9153bf6dae93fe090befe591c (patch) | |
tree | d0486f6bcb4c6cac1c25d4787ca13885ef6bd7ad /target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch | |
parent | c818073c4a312dc687e49a4981e013bff40b38d3 (diff) | |
download | master-187ad058-4ee1d48f495829f9153bf6dae93fe090befe591c.tar.gz master-187ad058-4ee1d48f495829f9153bf6dae93fe090befe591c.tar.bz2 master-187ad058-4ee1d48f495829f9153bf6dae93fe090befe591c.zip |
brcm47xx: update bcma and ssb to master-2011-07-21
* add new patches for bcm4716 SoC
* add support for serial flash on bcma bus
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27723 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch b/target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch index a1a9055e7e..39a765b5fe 100644 --- a/target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch +++ b/target/linux/brcm47xx/patches-3.0/812-disable_wgt634u_crap.patch @@ -7,7 +7,7 @@ -obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o --- a/arch/mips/bcm47xx/wgt634u.c +++ /dev/null -@@ -1,169 +0,0 @@ +@@ -1,170 +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 @@ -142,11 +142,12 @@ - * machine. Use the MAC address as an heuristic. Netgear Inc. has - * been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx. - */ +- u8 *et0mac; - - if (bcm47xx_active_bus_type != BCM47XX_BUS_TYPE_SSB) - return -ENODEV; - -- u8 *et0mac = bcm47xx_bus.ssb.sprom.et0mac; +- et0mac = bcm47xx_bus.ssb.sprom.et0mac; - - if (et0mac[0] == 0x00 && - ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) || |