From c8f9fa98184f10b7572608b4b02bb33f24112e7e Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@misterjones.org>
Date: Fri, 22 Aug 2008 16:36:28 +0200
Subject: [PATCH] --- yaml --- r: 112452 b: refs/heads/master c:
 fb683f1627745e937ef199edd3428ac4b2ef1e08 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/smc91x.h   | 8 --------
 trunk/include/linux/smc91x.h | 9 +++++++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bf7c91f7d080..8efcf347752b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a929752c4b0b162d5091673bddb2a734bd3df45d
+refs/heads/master: fb683f1627745e937ef199edd3428ac4b2ef1e08
diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h
index 8322e7f37af5..bcbd645d88ce 100644
--- a/trunk/drivers/net/smc91x.h
+++ b/trunk/drivers/net/smc91x.h
@@ -778,14 +778,6 @@ smc_pxa_dma_irq(int dma, void *dummy)
 #define RPC_ANEG	0x0800	// When 1 PHY is in Auto-Negotiate Mode
 #define RPC_LSXA_SHFT	5	// Bits to shift LS2A,LS1A,LS0A to lsb
 #define RPC_LSXB_SHFT	2	// Bits to get LS2B,LS1B,LS0B to lsb
-#define RPC_LED_100_10	(0x00)	// LED = 100Mbps OR's with 10Mbps link detect
-#define RPC_LED_RES	(0x01)	// LED = Reserved
-#define RPC_LED_10	(0x02)	// LED = 10Mbps link detect
-#define RPC_LED_FD	(0x03)	// LED = Full Duplex Mode
-#define RPC_LED_TX_RX	(0x04)	// LED = TX or RX packet occurred
-#define RPC_LED_100	(0x05)	// LED = 100Mbps link dectect
-#define RPC_LED_TX	(0x06)	// LED = TX packet occurred
-#define RPC_LED_RX	(0x07)	// LED = RX packet occurred
 
 #ifndef RPC_LSA_DEFAULT
 #define RPC_LSA_DEFAULT	RPC_LED_100
diff --git a/trunk/include/linux/smc91x.h b/trunk/include/linux/smc91x.h
index ed25483d25d9..bc21db598c06 100644
--- a/trunk/include/linux/smc91x.h
+++ b/trunk/include/linux/smc91x.h
@@ -16,6 +16,15 @@
 
 #define SMC91X_USE_DMA		(1 << 6)
 
+#define RPC_LED_100_10	(0x00)	/* LED = 100Mbps OR's with 10Mbps link detect */
+#define RPC_LED_RES	(0x01)	/* LED = Reserved */
+#define RPC_LED_10	(0x02)	/* LED = 10Mbps link detect */
+#define RPC_LED_FD	(0x03)	/* LED = Full Duplex Mode */
+#define RPC_LED_TX_RX	(0x04)	/* LED = TX or RX packet occurred */
+#define RPC_LED_100	(0x05)	/* LED = 100Mbps link dectect */
+#define RPC_LED_TX	(0x06)	/* LED = TX packet occurred */
+#define RPC_LED_RX	(0x07)	/* LED = RX packet occurred */
+
 struct smc91x_platdata {
 	unsigned long flags;
 	unsigned char leda;