From 1c0f1fc47fd58f25e31016aedf59ecb901c1030b Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Tue, 20 Nov 2012 10:23:13 +0000
Subject: [PATCH] --- yaml --- r: 335855 b: refs/heads/master c:
 aecb55be41b1bab432e81d550ebce010e7d178c6 h: refs/heads/master i:   335853:
 e6738861cadf5e52423cbef3b9c244d55d860700   335851:
 107fbdd0700fc4e1273a949194b7c1b3bb03168d   335847:
 cb14c14373ccbad51216579acb851ff4299fbec2   335839:
 126df267e5b364efb52a72c30da8fef293d719c8 v: v3

---
 [refs]                                                  | 2 +-
 trunk/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 01039cfa9856..ec47b6ec405d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2355a62bcbdcc4b567425bab036bfab6ade87eed
+refs/heads/master: aecb55be41b1bab432e81d550ebce010e7d178c6
diff --git a/trunk/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/trunk/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 77e6db9dcfed..a788501e978e 100644
--- a/trunk/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/trunk/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -894,6 +894,8 @@ static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
 	return IRQ_HANDLED;
 }
 
+static void axienet_dma_err_handler(unsigned long data);
+
 /**
  * axienet_open - Driver open routine.
  * @ndev:	Pointer to net_device structure