Commit:     6026ee67eda769122be535e8f05be438dfdcb29a
Parent:     416b5d10afdc797c21c457ade3714e8f2f75edd9
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 1 17:36:48 2007 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sun Jun 3 11:44:21 2007 -0400

    smc91x: sh solution engine fixes.
    The current smc91x I/O routines ifdef the solution engine subtypes
    individually, which is rather bogus, as they can simply use
    CONFIG_SOLUTION_ENGINE instead. This fixes it for some of the other
    solution engines that weren't included in the ifdef list (SH7206
    There are also inb/outb definitions which are totally bogus (missing
    brackets in _both_ cases, SMC_CAN_USE_8BIT == 0, and even better, they
    try to use a 16-bit access to fake 8-bit access). Kill that nonsense off
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
     drivers/net/smc91x.h |    5 +----
     1 file changed, 1 insertion(+), 4 deletions(-)
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/smc91x.h |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 111f23d..506bffc 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -281,17 +281,14 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #elif   defined(CONFIG_SUPERH)
-#if defined(CONFIG_SH_7780_SOLUTION_ENGINE) || 
 #define SMC_CAN_USE_8BIT       0
 #define SMC_CAN_USE_16BIT      1
 #define SMC_CAN_USE_32BIT      0
 #define SMC_IO_SHIFT           0
 #define SMC_NOWAIT             1
-#define SMC_inb(a, r)          (inw((a) + ((r)&~1)) >> (8*(r%2)))&0xff
 #define SMC_inw(a, r)          inw((a) + (r))
-#define SMC_outb(v, a, r)      outw(((inw((a)+((r)&~1))*(0xff<<8*(r%2)))) | 
((v)<<(8*(r&2)))), (a) + ((r)&~1))
 #define SMC_outw(v, a, r)      outw(v, (a) + (r))
 #define SMC_insw(a, r, p, l)   insw((a) + (r), p, l)
 #define SMC_outsw(a, r, p, l)  outsw((a) + (r), p, l)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to