From 580d7b8cc59d68a3d26bfcc64c2053b464782c9a Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 14 Jan 2006 13:21:16 -0800
Subject: [PATCH] [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>
---
drivers/net/cs89x0.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 494c71e05c82..a7ef8a66ba0f 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)
--
GitLab