From faec20e979c2e92745b2256a580d7a62b879c858 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Mon, 14 Sep 2009 08:03:42 +0000 Subject: [PATCH] --- yaml --- r: 162863 b: refs/heads/master c: e4c57d0f964cdbe278ed6b3bf632138fe575267e h: refs/heads/master i: 162861: 0039ec0057ea6f3d6d14f5915f1ec865425b1171 162859: 18e36b113120a7fe50a45669239a16b2f974a03e 162855: c6e96aaa5d182dd3931a7e8f9744457647b49f14 162847: 94ba979442874ae98f9c21f99705e0e6a02bdd67 v: v3 --- [refs] | 2 +- trunk/drivers/net/smc91x.h | 28 ---------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/[refs] b/[refs] index b12b0296873f..4e74560f5256 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa1b1ff0991b469eca6fde4456190df6ed59ff40 +refs/heads/master: e4c57d0f964cdbe278ed6b3bf632138fe575267e diff --git a/trunk/drivers/net/smc91x.h b/trunk/drivers/net/smc91x.h index 57a159fac99f..9c8c6ed4a3cd 100644 --- a/trunk/drivers/net/smc91x.h +++ b/trunk/drivers/net/smc91x.h @@ -83,34 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) } } -#elif defined(CONFIG_BLACKFIN) - -#define SMC_IRQ_FLAGS IRQF_TRIGGER_HIGH -#define RPC_LSA_DEFAULT RPC_LED_100_10 -#define RPC_LSB_DEFAULT RPC_LED_TX_RX - -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -# if defined(CONFIG_BF561) -#define SMC_CAN_USE_32BIT 1 -# else -#define SMC_CAN_USE_32BIT 0 -# endif -#define SMC_IO_SHIFT 0 -#define SMC_NOWAIT 1 -#define SMC_USE_BFIN_DMA 0 - -#define SMC_inw(a, r) readw((a) + (r)) -#define SMC_outw(v, a, r) writew(v, (a) + (r)) -#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) -#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) -# if SMC_CAN_USE_32BIT -#define SMC_inl(a, r) readl((a) + (r)) -#define SMC_outl(v, a, r) writel(v, (a) + (r)) -#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) -# endif - #elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) /* We can only do 16-bit reads and writes in the static memory space. */