aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshinori Sato <ysato@users.sourceforge.jp>2006-12-07 19:59:35 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-12-12 08:42:08 +0900
commita45e724ba07c02bcf3da96ddc4efefbfe10957f5 (patch)
tree2e6a7f3ec3b41bc996fe6fc2ea301fa120c97a06
parent11cbb70ea326e8ec78b2beb2b0c85c9ec71c279b (diff)
sh: Fix Solution Engine 7619 build.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/boards/se/7619/io.c28
-rw-r--r--arch/sh/boards/se/7619/setup.c38
2 files changed, 33 insertions, 33 deletions
diff --git a/arch/sh/boards/se/7619/io.c b/arch/sh/boards/se/7619/io.c
index 176f1f39cd9..2f105c3dd81 100644
--- a/arch/sh/boards/se/7619/io.c
+++ b/arch/sh/boards/se/7619/io.c
@@ -25,78 +25,78 @@ static inline void delay(void)
printk("bad I/O operation (%s) for port 0x%lx at 0x%08x\n", \
#name, (port), (__u32) __builtin_return_address(0))
-unsigned char se7619___inb(unsigned long port)
+unsigned char se7619_inb(unsigned long port)
{
badio(inb, port);
return 0;
}
-unsigned char se7619___inb_p(unsigned long port)
+unsigned char se7619_inb_p(unsigned long port)
{
badio(inb_p, port);
delay();
return 0;
}
-unsigned short se7619___inw(unsigned long port)
+unsigned short se7619_inw(unsigned long port)
{
badio(inw, port);
return 0;
}
-unsigned int se7619___inl(unsigned long port)
+unsigned int se7619_inl(unsigned long port)
{
badio(inl, port);
return 0;
}
-void se7619___outb(unsigned char value, unsigned long port)
+void se7619_outb(unsigned char value, unsigned long port)
{
badio(outb, port);
}
-void se7619___outb_p(unsigned char value, unsigned long port)
+void se7619_outb_p(unsigned char value, unsigned long port)
{
badio(outb_p, port);
delay();
}
-void se7619___outw(unsigned short value, unsigned long port)
+void se7619_outw(unsigned short value, unsigned long port)
{
badio(outw, port);
}
-void se7619___outl(unsigned int value, unsigned long port)
+void se7619_outl(unsigned int value, unsigned long port)
{
badio(outl, port);
}
-void se7619___insb(unsigned long port, void *addr, unsigned long count)
+void se7619_insb(unsigned long port, void *addr, unsigned long count)
{
badio(inw, port);
}
-void se7619___insw(unsigned long port, void *addr, unsigned long count)
+void se7619_insw(unsigned long port, void *addr, unsigned long count)
{
badio(inw, port);
}
-void se7619___insl(unsigned long port, void *addr, unsigned long count)
+void se7619_insl(unsigned long port, void *addr, unsigned long count)
{
badio(insl, port);
}
-void se7619___outsb(unsigned long port, const void *addr, unsigned long count)
+void se7619_outsb(unsigned long port, const void *addr, unsigned long count)
{
badio(insl, port);
}
-void se7619___outsw(unsigned long port, const void *addr, unsigned long count)
+void se7619_outsw(unsigned long port, const void *addr, unsigned long count)
{
badio(insl, port);
}
-void se7619___outsl(unsigned long port, const void *addr, unsigned long count)
+void se7619_outsl(unsigned long port, const void *addr, unsigned long count)
{
badio(outsw, port);
}
diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/se/7619/setup.c
index e627b26de0d..d1b516ea6cf 100644
--- a/arch/sh/boards/se/7619/setup.c
+++ b/arch/sh/boards/se/7619/setup.c
@@ -8,8 +8,8 @@
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <asm/io.h>
#include <asm/se7619.h>
+#include <asm/io.h>
#include <asm/machvec.h>
/*
@@ -19,25 +19,25 @@
struct sh_machine_vector mv_se __initmv = {
.mv_name = "SolutionEngine",
.mv_nr_irqs = 108,
- .mv_inb = se7619___inb,
- .mv_inw = se7619___inw,
- .mv_inl = se7619___inl,
- .mv_outb = se7619___outb,
- .mv_outw = se7619___outw,
- .mv_outl = se7619___outl,
+ .mv_inb = se7619_inb,
+ .mv_inw = se7619_inw,
+ .mv_inl = se7619_inl,
+ .mv_outb = se7619_outb,
+ .mv_outw = se7619_outw,
+ .mv_outl = se7619_outl,
- .mv_inb_p = se7619___inb_p,
- .mv_inw_p = se7619___inw,
- .mv_inl_p = se7619___inl,
- .mv_outb_p = se7619___outb_p,
- .mv_outw_p = se7619___outw,
- .mv_outl_p = se7619___outl,
+ .mv_inb_p = se7619_inb_p,
+ .mv_inw_p = se7619_inw,
+ .mv_inl_p = se7619_inl,
+ .mv_outb_p = se7619_outb_p,
+ .mv_outw_p = se7619_outw,
+ .mv_outl_p = se7619_outl,
- .mv_insb = se7619___insb,
- .mv_insw = se7619___insw,
- .mv_insl = se7619___insl,
- .mv_outsb = se7619___outsb,
- .mv_outsw = se7619___outsw,
- .mv_outsl = se7619___outsl,
+ .mv_insb = se7619_insb,
+ .mv_insw = se7619_insw,
+ .mv_insl = se7619_insl,
+ .mv_outsb = se7619_outsb,
+ .mv_outsw = se7619_outsw,
+ .mv_outsl = se7619_outsl,
};
ALIAS_MV(se)