diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-01 01:57:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-01 01:57:47 -0700 |
| commit | a9729d974959121a8298f6109021c3493f764960 (patch) | |
| tree | 5c44b3a0e9a02d136e1de40cb605f3918a62da73 /include/linux | |
| parent | 439714df6ed8d1539b1d4f0491e0416ca8b697fd (diff) | |
| parent | 515f6d2d3ce6b667a6fc322839cb76cb56120b90 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cyclades.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index cc598507b813..46d8254c1a79 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -511,8 +511,8 @@ struct resource; struct cyclades_card { unsigned long base_phys; unsigned long ctl_phys; - unsigned long base_addr; - unsigned long ctl_addr; + void __iomem *base_addr; + void __iomem *ctl_addr; int irq; int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ int first_line; /* minor number of first channel on card */ @@ -539,9 +539,9 @@ struct cyclades_chip { * (required to support Alpha systems) * ***************************************/ -#define cy_writeb(port,val) {writeb((ucchar)(val),(ulong)(port)); mb();} -#define cy_writew(port,val) {writew((ushort)(val),(ulong)(port)); mb();} -#define cy_writel(port,val) {writel((uclong)(val),(ulong)(port)); mb();} +#define cy_writeb(port,val) {writeb((val),(port)); mb();} +#define cy_writew(port,val) {writew((val),(port)); mb();} +#define cy_writel(port,val) {writel((val),(port)); mb();} #define cy_readb(port) readb(port) #define cy_readw(port) readw(port) |