diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 11:06:46 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 11:06:46 +0100 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /arch/m32r/kernel/io_mappi2.c | |
| parent | Merge branch 'master' of /usr/src/ntfs-2.6/ (diff) | |
| parent | powerpc: import a fix from arch/ppc/mm/pgtable.c (diff) | |
| download | linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.xz linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/m32r/kernel/io_mappi2.c')
| -rw-r--r-- | arch/m32r/kernel/io_mappi2.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/kernel/io_mappi2.c index 5c03504bf653..df3c729cb3e0 100644 --- a/arch/m32r/kernel/io_mappi2.c +++ b/arch/m32r/kernel/io_mappi2.c @@ -33,12 +33,9 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int); static inline void *_port2addr(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET); + return (void *)(port | (NONCACHE_OFFSET)); } -#define LAN_IOSTART 0x300 -#define LAN_IOEND 0x320 - #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) static inline void *__port2addr_ata(unsigned long port) { @@ -59,15 +56,17 @@ static inline void *__port2addr_ata(unsigned long port) } #endif +#define LAN_IOSTART 0xa0000300 +#define LAN_IOEND 0xa0000320 #ifdef CONFIG_CHIP_OPSP static inline void *_port2addr_ne(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET + 0x10000000); + return (void *)(port + 0x10000000); } #else static inline void *_port2addr_ne(unsigned long port) { - return (void *)(port + NONCACHE_OFFSET + 0x04000000); + return (void *)(port + 0x04000000); } #endif static inline void *_port2addr_usb(unsigned long port) |