diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-02 18:50:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-02 18:50:57 -0800 |
| commit | b06b5a53adcc3ace1a82b324edf2b0c37e7be00e (patch) | |
| tree | 627599b14a3652778f4ca1f8a42d6627a6c6c84f /include/asm-arm/arch-iop13xx/io.h | |
| parent | c6b33cc4e9882b44f1b0c36396f420076e04a4e2 (diff) | |
| parent | d02b161eda65528ad3e89d642e416c265c17ceb8 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4081/1: Add definition for TI Sync Serial Protocol
[ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro
[ARM] Fix VFP initialisation issue for SMP systems
[ARM] 4078/1: Fix ARM copypage cache coherency problems
[ARM] 4077/1: iop13xx: fix __io() macro
[ARM] 4074/1: Flat loader stack alignment
[ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h
[ARM] 4071/1: S3C24XX: Documentation update
[ARM] 4066/1: correct a comment about PXA's sched_clock range
[ARM] 4065/1: S3C24XX: dma printk fixes
[ARM] 4064/1: make pxa_get_cycles() static
[ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering
Diffstat (limited to 'include/asm-arm/arch-iop13xx/io.h')
| -rw-r--r-- | include/asm-arm/arch-iop13xx/io.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop13xx/io.h b/include/asm-arm/arch-iop13xx/io.h index db6de2480a2..5a7bdb52660 100644 --- a/include/asm-arm/arch-iop13xx/io.h +++ b/include/asm-arm/arch-iop13xx/io.h @@ -21,10 +21,11 @@ #define IO_SPACE_LIMIT 0xffffffff -#define __io(a) (a) +#define __io(a) __iop13xx_io(a) #define __mem_pci(a) (a) #define __mem_isa(a) (a) +extern void __iomem * __iop13xx_io(unsigned long io_addr); extern void __iomem * __ioremap(unsigned long, size_t, unsigned long); extern void __iomem *__iop13xx_ioremap(unsigned long cookie, size_t size, unsigned long flags); |