removed queue-3.0/gianfar-fix-phc-index-build-failure.patch

diff --git a/queue-3.0/gianfar-fix-phc-index-build-failure.patch b/queue-3.0/gianfar-fix-phc-index-build-failure.patch
deleted file mode 100644 (file)
index fde81c7..0000000
--- a/queue-3.0/gianfar-fix-phc-index-build-failure.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 28889b7e7818342f6c254e27b9b2c68702ab867a Mon Sep 17 00:00:00 2001
-From: Richard Cochran <richardcochran@gmail.com>
-Date: Thu, 20 Sep 2012 19:11:12 +0000
-Subject: gianfar: fix phc index build failure
-
-From: Richard Cochran <richardcochran@gmail.com>
-
-commit 28889b7e7818342f6c254e27b9b2c68702ab867a upstream.
-
-This patch fixes a build failure introduced in commit 66636287
-("gianfar: Support the get_ts_info ethtool method."). Not only was a
-global variable inconsistently named, but also it was not exported as
-it should have been.
-
-This fix is also needed in stable version 3.5.
-
-Signed-off-by: Richard Cochran <richardcochran@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
---- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
-+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
-@@ -1773,6 +1773,7 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
- }
- 
- int gfar_phc_index = -1;
-+EXPORT_SYMBOL(gfar_phc_index);
- 
- static int gfar_get_ts_info(struct net_device *dev,
-                           struct ethtool_ts_info *info)
-diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
-index c08e5d4..0daa66b 100644
---- a/drivers/net/ethernet/freescale/gianfar_ptp.c
-+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
-@@ -515,7 +515,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
-               err = PTR_ERR(etsects->clock);
-               goto no_clock;
-       }
--      gfar_phc_clock = ptp_clock_index(etsects->clock);
-+      gfar_phc_index = ptp_clock_index(etsects->clock);
- 
-       dev_set_drvdata(&dev->dev, etsects);
- 
-@@ -539,7 +539,7 @@ static int gianfar_ptp_remove(struct platform_device *dev)
-       gfar_write(&etsects->regs->tmr_temask, 0);
-       gfar_write(&etsects->regs->tmr_ctrl,   0);
- 
--      gfar_phc_clock = -1;
-+      gfar_phc_index = -1;
-       ptp_clock_unregister(etsects->clock);
-       iounmap(etsects->regs);
-       release_resource(etsects->rsrc);

diff --git a/queue-3.0/series b/queue-3.0/series
index 9fe233f4d917619c21c9c6cf0d635872c16d777d..d1571a773538d92d73a4354ce546ac2bded583e1 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -95,4 +95,3 @@ drm-i915-hdmi-clear-audio-enable-bit-for-hot-plug.patch
 md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch
 workqueue-unbound-rebind-morphing-in-rebind_workers-should-be-atomic.patch
 x86-fix-boot-on-twinhead-h12y.patch
-gianfar-fix-phc-index-build-failure.patch