kernel: update 3.18 to 3.18.14

[openwrt/svn-archive/archive.git] / target / linux / bcm53xx / patches-3.18 / 710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch

diff --git a/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch b/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
index 14de694dd001ee4627506246128047fc64da756c..6015c4aacae9a64e722449591a907d9d8270ffe8 100644 (file)
--- a/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
+++ b/target/linux/bcm53xx/patches-3.18/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
@@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  drivers/net/phy/b53/b53_common.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/drivers/net/phy/b53/b53_common.c b/drivers/net/phy/b53/b53_common.c
-index 2b05d5d..fd3b39c 100644
 --- a/drivers/net/phy/b53/b53_common.c
 +++ b/drivers/net/phy/b53/b53_common.c
 @@ -25,6 +25,7 @@
@@ -23,7 +21,7 @@ index 2b05d5d..fd3b39c 100644
  
  #include "b53_regs.h"
  #include "b53_priv.h"
-@@ -1313,6 +1314,11 @@ static int b53_switch_init(struct b53_device *dev)
+@@ -1313,6 +1314,11 @@ static int b53_switch_init(struct b53_de
                        sw_dev->cpu_port = 5;
        }
  
@@ -35,6 +33,3 @@ index 2b05d5d..fd3b39c 100644
        /* cpu port is always last */
        sw_dev->ports = sw_dev->cpu_port + 1;
        dev->enabled_ports |= BIT(sw_dev->cpu_port);
--- 
-1.8.4.5
-