diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-14 13:59:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-14 13:59:38 -0400 |
| commit | 0c913bdf3eb5a829724c286209c079e727935724 (patch) | |
| tree | 895e0ee458c30044f6b8c49a7b279e6ccf65325c | |
| parent | 80a8003f9236992fce45e6b2d0f33098b55a3859 (diff) | |
| parent | 09e590e5d5a93f2eaa748a89c623258e6bad1648 (diff) | |
Merge branch 'upstream-fixes' into upstream
| -rw-r--r-- | drivers/net/smc91x.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 4ec4b4d23ae..9f9f8f2d533 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -136,14 +136,9 @@ #define SMC_CAN_USE_32BIT 0 #define SMC_IO_SHIFT 0 #define SMC_NOWAIT 1 -#define SMC_USE_PXA_DMA 1 -#define SMC_inb(a, r) readb((a) + (r)) #define SMC_inw(a, r) readw((a) + (r)) -#define SMC_inl(a, r) readl((a) + (r)) -#define SMC_outb(v, a, r) writeb(v, (a) + (r)) #define SMC_outw(v, a, r) writew(v, (a) + (r)) -#define SMC_outl(v, a, r) writel(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) |