diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:17:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:17:54 -0500 |
| commit | 70ac551651a2c5a234b703d9a495817f2ca09639 (patch) | |
| tree | 71f55b9a3de438969a7a0d951971febf59784294 /drivers/net | |
| parent | 7f729ccff35befa08a836ab33a4372c7f6735645 (diff) | |
| parent | bd5d080ab99642e3245ef7cfa54490384c01d878 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/smc91x.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index a10cd184d597..5c2824be4ee6 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -100,14 +100,14 @@ | |||
| 100 | #define SMC_IO_SHIFT 0 | 100 | #define SMC_IO_SHIFT 0 |
| 101 | #define SMC_NOWAIT 1 | 101 | #define SMC_NOWAIT 1 |
| 102 | 102 | ||
| 103 | #define SMC_inb(a, r) inb((a) + (r)) | 103 | #define SMC_inb(a, r) readb((a) + (r)) |
| 104 | #define SMC_insb(a, r, p, l) insb((a) + (r), p, (l)) | 104 | #define SMC_insb(a, r, p, l) readsb((a) + (r), p, (l)) |
| 105 | #define SMC_inw(a, r) inw((a) + (r)) | 105 | #define SMC_inw(a, r) readw((a) + (r)) |
| 106 | #define SMC_insw(a, r, p, l) insw((a) + (r), p, l) | 106 | #define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) |
| 107 | #define SMC_outb(v, a, r) outb(v, (a) + (r)) | 107 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) |
| 108 | #define SMC_outsb(a, r, p, l) outsb((a) + (r), p, (l)) | 108 | #define SMC_outsb(a, r, p, l) writesb((a) + (r), p, (l)) |
| 109 | #define SMC_outw(v, a, r) outw(v, (a) + (r)) | 109 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) |
| 110 | #define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l) | 110 | #define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) |
| 111 | 111 | ||
| 112 | #define set_irq_type(irq, type) do {} while (0) | 112 | #define set_irq_type(irq, type) do {} while (0) |
| 113 | 113 | ||