diff --git a/[refs] b/[refs]
index 8a069a7fea28..d0d6794c7e0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 032874e49271f8c9c53c137cb60cf12617a953a0
+refs/heads/master: 580d7b8cc59d68a3d26bfcc64c2053b464782c9a
diff --git a/trunk/drivers/net/cs89x0.c b/trunk/drivers/net/cs89x0.c
index 494c71e05c82..a7ef8a66ba0f 100644
--- a/trunk/drivers/net/cs89x0.c
+++ b/trunk/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)