diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-01-14 16:21:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:13 -0500 |
| commit | 580d7b8cc59d68a3d26bfcc64c2053b464782c9a (patch) | |
| tree | e7192be6a97210d618f812f24e2dfa471963ae67 | |
| parent | 032874e49271f8c9c53c137cb60cf12617a953a0 (diff) | |
[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>
| -rw-r--r-- | drivers/net/cs89x0.c | 4 |
1 files changed, 1 insertions, 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) | |||
| 353 | { | 353 | { |
| 354 | __raw_writel((u16)value, base_addr + (portno << 1)); | 354 | __raw_writel((u16)value, base_addr + (portno << 1)); |
| 355 | } | 355 | } |
| 356 | #else | 356 | #elif defined(CONFIG_ARCH_PNX010X) |
| 357 | #if defined(CONFIG_ARCH_PNX010X) | ||
| 358 | static int | 357 | static int |
| 359 | readword(unsigned long base_addr, int portno) | 358 | readword(unsigned long base_addr, int portno) |
| 360 | { | 359 | { |
| @@ -379,7 +378,6 @@ writeword(unsigned long base_addr, int portno, int value) | |||
| 379 | outw(value, base_addr + portno); | 378 | outw(value, base_addr + portno); |
| 380 | } | 379 | } |
| 381 | #endif | 380 | #endif |
| 382 | #endif | ||
| 383 | 381 | ||
| 384 | static void | 382 | static void |
| 385 | readwords(unsigned long base_addr, int portno, void *buf, int length) | 383 | readwords(unsigned long base_addr, int portno, void *buf, int length) |
