From: Lennert Buytenhek Date: Sat, 14 Jan 2006 21:21:16 +0000 (-0800) Subject: [PATCH] cs89x0: use #elif instead of #else/#if/#endif X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=580d7b8cc59d68a3d26bfcc64c2053b464782c9a;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git [PATCH] cs89x0: use #elif instead of #else/#if/#endif Signed-off-by: Lennert Buytenhek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 494c71e05c8..a7ef8a66ba0 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)