Skip to content

Commit

Permalink
[PATCH] cs89x0: use #elif instead of #else/#if/#endif
Browse files Browse the repository at this point in the history
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Lennert Buytenhek authored and Linus Torvalds committed Jan 15, 2006
1 parent 032874e commit 580d7b8
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/cs89x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
Expand Down

0 comments on commit 580d7b8

Please sign in to comment.