diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
| commit | 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d (patch) | |
| tree | 8e2db4ba9263e92d264ef469c7dac28078f63874 /include/asm-arm/arch-integrator | |
| parent | 9bf2aa129a107a0e9e2a5318d35aca731ae7e666 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-arm/arch-integrator')
| -rw-r--r-- | include/asm-arm/arch-integrator/io.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h index 31f2deab51b0..c8f2175948bd 100644 --- a/include/asm-arm/arch-integrator/io.h +++ b/include/asm-arm/arch-integrator/io.h | |||
| @@ -32,6 +32,5 @@ | |||
| 32 | 32 | ||
| 33 | #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) | 33 | #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) |
| 34 | #define __mem_pci(a) (a) | 34 | #define __mem_pci(a) (a) |
| 35 | #define __mem_isa(a) ((a) + PCI_MEMORY_VADDR) | ||
| 36 | 35 | ||
| 37 | #endif | 36 | #endif |