git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sh
/
boards
/
se
/
7300
/
io.c
diff --git
a/arch/sh/boards/se/7300/io.c
b/arch/sh/boards/se/7300/io.c
index
3c89def
..
8a03d7a
100644
(file)
--- a/
arch/sh/boards/se/7300/io.c
+++ b/
arch/sh/boards/se/7300/io.c
@@
-8,10
+8,9
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
-#include <asm/mach/se7300.h>
#include <asm/io.h>
#include <asm/io.h>
+#include <asm/se7300.h>
#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
#define badio(fn, a) panic("bad i/o operation %s for %08lx.", #fn, a)
@@
-100,6
+99,7
@@
bad_outb(struct iop *p, unsigned char value, unsigned long port)
badio(inw, port);
}
badio(inw, port);
}
+#ifdef CONFIG_SMC91X
/* MSTLANEX01 LAN at 0xb400:0000 */
static struct iop laniop = {
.start = 0x300,
/* MSTLANEX01 LAN at 0xb400:0000 */
static struct iop laniop = {
.start = 0x300,
@@
-111,6
+111,7
@@
static struct iop laniop = {
.outb = simple_outb,
.outw = simple_outw,
};
.outb = simple_outb,
.outw = simple_outw,
};
+#endif
/* NE2000 pc card NIC */
static struct iop neiop = {
/* NE2000 pc card NIC */
static struct iop neiop = {
@@
-124,6
+125,7
@@
static struct iop neiop = {
.outw = simple_outw,
};
.outw = simple_outw,
};
+#ifdef CONFIG_IDE
/* CF in CF slot */
static struct iop cfiop = {
.base = 0xb0600000,
/* CF in CF slot */
static struct iop cfiop = {
.base = 0xb0600000,
@@
-133,12
+135,13
@@
static struct iop cfiop = {
.outb = pcc_outb,
.outw = simple_outw,
};
.outb = pcc_outb,
.outw = simple_outw,
};
+#endif
static __inline__ struct iop *
port2iop(unsigned long port)
{
if (0) ;
static __inline__ struct iop *
port2iop(unsigned long port)
{
if (0) ;
-#if defined(CONFIG_SMC91
111
)
+#if defined(CONFIG_SMC91
X
)
else if (laniop.check(&laniop, port))
return &laniop;
#endif
else if (laniop.check(&laniop, port))
return &laniop;
#endif