From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 14 Jan 2006 21:21:16 +0000 (-0800)
Subject: [PATCH] cs89x0: use #elif instead of #else/#if/#endif
X-Git-Tag: v2.6.16-rc1~123
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=580d7b8cc59d68a3d26bfcc64c2053b464782c9a;p=linux-2.6

[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>
---

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 494c71e05c..a7ef8a66ba 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)