linux-ti33x-psp 3.2: rebase patches onto latest git

[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.16 / 0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch
similarity index 93%
rename from recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch
rename to recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch
index 0b69021bf72794e7217fc8e7da4dd66e7f474ce3..2759af4cf3631669a025b91050e7f9ebcc72034e 100644 (file)
--- a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0057-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.16/0056-pch_gbe-Do-not-abort-probe-on-bad-MAC.patch
@@ -1,7 +1,7 @@
-From 56bfb17ce9aba57b7bd205d7828d4f3d9935276e Mon Sep 17 00:00:00 2001
+From aebee39c4e129dbeccd9485f8375b7e59a4b7b26 Mon Sep 17 00:00:00 2001
 From: Darren Hart <dvhart@linux.intel.com>
 Date: Mon, 16 Jan 2012 09:50:19 +0000
-Subject: [PATCH 57/69] pch_gbe: Do not abort probe on bad MAC
+Subject: [PATCH 56/68] pch_gbe: Do not abort probe on bad MAC
 
 commit 2b53d07891630dead46d65c8f896955fd3ae0302 upstream.
 
@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |   17 ++++++++++++++---
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c |   17 ++++++++++++++---
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -77,5 +77,5 @@ index 48406ca..43c7b25 100644
        setup_timer(&adapter->watchdog_timer, pch_gbe_watchdog,
                    (unsigned long)adapter);
 -- 
-1.7.9.5
+1.7.10