summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-01-14 13:21:16 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 18:27:13 -0800
commit580d7b8cc59d68a3d26bfcc64c2053b464782c9a (patch)
treee7192be6a97210d618f812f24e2dfa471963ae67 /drivers/net
parent032874e49271f8c9c53c137cb60cf12617a953a0 (diff)
downloadop-kernel-dev-580d7b8cc59d68a3d26bfcc64c2053b464782c9a.zip
op-kernel-dev-580d7b8cc59d68a3d26bfcc64c2053b464782c9a.tar.gz
[PATCH] cs89x0: use #elif instead of #else/#if/#endif
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/cs89x0.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 494c71e..a7ef8a6 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -353,8 +353,7 @@ writeword(unsigned long base_addr, int portno, int value)
{
__raw_writel((u16)value, base_addr + (portno << 1));
}
-#else
-#if defined(CONFIG_ARCH_PNX010X)
+#elif defined(CONFIG_ARCH_PNX010X)
static int
readword(unsigned long base_addr, int portno)
{
@@ -379,7 +378,6 @@ writeword(unsigned long base_addr, int portno, int value)
outw(value, base_addr + portno);
}
#endif
-#endif
static void
readwords(unsigned long base_addr, int portno, void *buf, int length)
OpenPOWER on IntegriCloud