summaryrefslogtreecommitdiff
path: root/include/asm-arm/io.h
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-25 22:26:29 +0000
committerwdenk <wdenk>2003-06-25 22:26:29 +0000
commitb783edaee8252bfdba3f7b3fd29519a81ce71e42 (patch)
tree6993a909d2c21a3f07c51020edcc202a5697da91 /include/asm-arm/io.h
parenta300d83cb8ad20b844e957587705675e9ac14147 (diff)
downloadu-boot-imx-b783edaee8252bfdba3f7b3fd29519a81ce71e42.zip
u-boot-imx-b783edaee8252bfdba3f7b3fd29519a81ce71e42.tar.gz
u-boot-imx-b783edaee8252bfdba3f7b3fd29519a81ce71e42.tar.bz2
* Header file cleanup for ARM
* Patch by Murray Jensen, 24 Jun 2003: - make sure to use only U-boot provided header files - fix problems with ".rodata.str1.4" section as used by GCC-3.x
Diffstat (limited to 'include/asm-arm/io.h')
-rw-r--r--include/asm-arm/io.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 122419f..0f38e10 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -20,10 +20,14 @@
#ifndef __ASM_ARM_IO_H
#define __ASM_ARM_IO_H
+#ifdef __KERNEL__
+
#include <linux/types.h>
#include <asm/byteorder.h>
#include <asm/memory.h>
+#if 0 /* XXX###XXX */
#include <asm/arch/hardware.h>
+#endif /* XXX###XXX */
/*
* Generic virtual read/write. Note that we don't support half-word
@@ -68,7 +72,9 @@ extern void __raw_readsl(unsigned int addr, void *data, int longlen);
/*
* Now, pick up the machine-defined IO definitions
*/
+#if 0 /* XXX###XXX */
#include <asm/arch/io.h>
+#endif /* XXX###XXX */
/*
* IO port access primitives
@@ -252,10 +258,6 @@ out:
#define isa_eth_io_copy_and_sum(a,b,c,d) \
eth_copy_and_sum((a),__mem_isa(b),(c),(d))
-#ifndef PCI_MEMORY_VADDR /* XXX problem not understood -- wd */
-#define PCI_MEMORY_VADDR 0
-#endif /* XXX */
-
static inline int
isa_check_signature(unsigned long io_addr, const unsigned char *signature,
int length)
@@ -291,5 +293,5 @@ out:
#define isa_check_signature(io,sig,len) (0)
#endif /* __mem_isa */
-
+#endif /* __KERNEL__ */
#endif /* __ASM_ARM_IO_H */