diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 10:02:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 10:02:51 +1100 |
| commit | 03041e1f99d03c8076ca3acf5db3e912366f136b (patch) | |
| tree | 9dbad0c81ddcce37ce1315a529acee72c88a1e1d /arch/arm/mach-sa1100/include/mach/io.h | |
| parent | 0f58659760315f5b94e3c66f952531119ebd4038 (diff) | |
| parent | 393c1ee73f6360581ba21fe167e24ae80ded514b (diff) | |
Merge commit 'arm/devel'
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/io.h')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/io.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/io.h b/arch/arm/mach-sa1100/include/mach/io.h index 0c070a6149bc..d8b43f3dcd2d 100644 --- a/arch/arm/mach-sa1100/include/mach/io.h +++ b/arch/arm/mach-sa1100/include/mach/io.h @@ -16,11 +16,7 @@ * We don't actually have real ISA nor PCI buses, but there is so many * drivers out there that might just work if we fake them... */ -static inline void __iomem *__io(unsigned long addr) -{ - return (void __iomem *)addr; -} -#define __io(a) __io(a) -#define __mem_pci(a) (a) +#define __io(a) __typesafe_io(a) +#define __mem_pci(a) (a) #endif |