summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-l7200/io.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-25 06:44:44 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-25 06:44:44 -0400
commit76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d (patch)
tree8e2db4ba9263e92d264ef469c7dac28078f63874 /include/asm-arm/arch-l7200/io.h
parent9bf2aa129a107a0e9e2a5318d35aca731ae7e666 (diff)
parentdfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff)
downloadkernel-crypto-76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d.tar.gz
kernel-crypto-76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d.tar.xz
kernel-crypto-76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-arm/arch-l7200/io.h')
-rw-r--r--include/asm-arm/arch-l7200/io.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-l7200/io.h b/include/asm-arm/arch-l7200/io.h
index cab8ad0adf0..cd080d8384d 100644
--- a/include/asm-arm/arch-l7200/io.h
+++ b/include/asm-arm/arch-l7200/io.h
@@ -19,7 +19,6 @@
*/
#define __io_pci(a) ((void __iomem *)(PCIO_BASE + (a)))
#define __mem_pci(a) (a)
-#define __mem_isa(a) (a)
#define __ioaddr(p) __io_pci(p)