diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-05-01 21:12:40 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2013-05-01 21:12:40 +0000 |
commit | 292368409e970617737b64c9ef49bc46f40b53e5 (patch) | |
tree | 40348ff53d16e17a9d7fa209bba2171e417aea3a /target/linux | |
parent | 6f48ccea0279423b68c47488d090b45105afe740 (diff) | |
download | upstream-292368409e970617737b64c9ef49bc46f40b53e5.tar.gz upstream-292368409e970617737b64c9ef49bc46f40b53e5.tar.bz2 upstream-292368409e970617737b64c9ef49bc46f40b53e5.zip |
brcm63xx: add missing binary operands to BCM6345 ethernet patch
Thanks to Emilio Arias for reporting it.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 36505
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/brcm63xx/patches-3.8/419-MIPS-BCM63XX-enable-enet-for-BCM6345.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/419-MIPS-BCM63XX-enable-enet-for-BCM6345.patch b/target/linux/brcm63xx/patches-3.8/419-MIPS-BCM63XX-enable-enet-for-BCM6345.patch index 61b4d59833..3a4abb075d 100644 --- a/target/linux/brcm63xx/patches-3.8/419-MIPS-BCM63XX-enable-enet-for-BCM6345.patch +++ b/target/linux/brcm63xx/patches-3.8/419-MIPS-BCM63XX-enable-enet-for-BCM6345.patch @@ -189,7 +189,7 @@ Subject: [PATCH 69/72] 443-MIPS-BCM63XX-enable-enet-for-BCM6345.patch }; int __init bcm63xx_enet_register(int unit, -@@ -70,4 +96,66 @@ int __init bcm63xx_enet_register(int uni +@@ -70,4 +96,67 @@ int __init bcm63xx_enet_register(int uni int bcm63xx_enetsw_register(const struct bcm63xx_enetsw_platform_data *pd); @@ -231,8 +231,9 @@ Subject: [PATCH 69/72] 443-MIPS-BCM63XX-enable-enet-for-BCM6345.patch + return ENETDMA_6345_LEN_REG; + } +#endif -+#if defined(CONFIG_BCM6XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348) \ -+ defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6362) \ ++#if defined(CONFIG_BCM6XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348) || \ ++ defined(CONFIG_BCM63XX_CPU_6358) || \ ++ defined(CONFIG_BCM63XX_CPU_6362) || \ + defined(CONFIG_BCM63XX_CPU_6368) + switch (reg) { + case ENETDMAC_CHANCFG: |