Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580d7b8c authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Linus Torvalds
Browse files

[PATCH] cs89x0: use #elif instead of #else/#if/#endif 



Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 032874e4

drivers/net/cs89x0.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -353,8 +353,7 @@ writeword(unsigned long base_addr, int portno, int value) 
{

{

	__raw_writel((u16)value, base_addr + (portno << 1));

	__raw_writel((u16)value, base_addr + (portno << 1));

}

}

#else

#elif defined(CONFIG_ARCH_PNX010X)

#if defined(CONFIG_ARCH_PNX010X)

static int

static int

readword(unsigned long base_addr, int portno)

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);

	outw(value, base_addr + portno);

}

}

#endif

#endif

#endif





static void

static void

readwords(unsigned long base_addr, int portno, void *buf, int length)

readwords(unsigned long base_addr, int portno, void *buf, int length)