summaryrefslogtreecommitdiffstats
path: root/include/asm-sh/io.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-06-19 22:45:37 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-06-19 22:45:37 +0000
commit6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch)
tree0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /include/asm-sh/io.h
parentecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff)
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine status unknown.
Diffstat (limited to 'include/asm-sh/io.h')
-rw-r--r--include/asm-sh/io.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index c6de2a42a..0d516620c 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -85,9 +85,6 @@ extern unsigned long sh_isa_slot(unsigned long offset);
#define isa_memcpy_toio(a,b,c) \
memcpy((void *)(sh_isa_slot((unsigned long)(a))),(b),(c))
-#define ctrl_in(addr) *(addr)
-#define ctrl_out(data,addr) *(addr) = (data)
-
extern __inline__ unsigned long ctrl_inb(unsigned long addr)
{
return *(volatile unsigned char*)addr;