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

Commit 8af905b4 authored by Paul Mundt's avatar Paul Mundt Committed by Jeff Garzik
Browse files

[PATCH] smc91x: Kill off excessive versatile hooks. 



This looks like a result of too many auto-merges. The
CONFIG_ARCH_VERSATILE case was handled a total of 6 times.
This kills 5 of them.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>

--

 drivers/net/smc91x.h |   90 ---------------------------------------------------
 1 file changed, 90 deletions(-)
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5796df19

drivers/net/smc91x.h

+0 −90
Original line number Original line Diff line number Diff line
@@ -362,96 +362,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, 




#define SMC_IRQ_FLAGS		(0)

#define SMC_IRQ_FLAGS		(0)





#elif	defined(CONFIG_ARCH_VERSATILE)



#define SMC_CAN_USE_8BIT	1

#define SMC_CAN_USE_16BIT	1

#define SMC_CAN_USE_32BIT	1

#define SMC_NOWAIT		1



#define SMC_inb(a, r)		readb((a) + (r))

#define SMC_inw(a, r)		readw((a) + (r))

#define SMC_inl(a, r)		readl((a) + (r))

#define SMC_outb(v, a, r)	writeb(v, (a) + (r))

#define SMC_outw(v, a, r)	writew(v, (a) + (r))

#define SMC_outl(v, a, r)	writel(v, (a) + (r))

#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)

#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)



#define SMC_IRQ_FLAGS		(0)



#elif	defined(CONFIG_ARCH_VERSATILE)



#define SMC_CAN_USE_8BIT	1

#define SMC_CAN_USE_16BIT	1

#define SMC_CAN_USE_32BIT	1

#define SMC_NOWAIT		1



#define SMC_inb(a, r)		readb((a) + (r))

#define SMC_inw(a, r)		readw((a) + (r))

#define SMC_inl(a, r)		readl((a) + (r))

#define SMC_outb(v, a, r)	writeb(v, (a) + (r))

#define SMC_outw(v, a, r)	writew(v, (a) + (r))

#define SMC_outl(v, a, r)	writel(v, (a) + (r))

#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)

#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)



#define SMC_IRQ_FLAGS		(0)



#elif	defined(CONFIG_ARCH_VERSATILE)



#define SMC_CAN_USE_8BIT	1

#define SMC_CAN_USE_16BIT	1

#define SMC_CAN_USE_32BIT	1

#define SMC_NOWAIT		1



#define SMC_inb(a, r)		readb((a) + (r))

#define SMC_inw(a, r)		readw((a) + (r))

#define SMC_inl(a, r)		readl((a) + (r))

#define SMC_outb(v, a, r)	writeb(v, (a) + (r))

#define SMC_outw(v, a, r)	writew(v, (a) + (r))

#define SMC_outl(v, a, r)	writel(v, (a) + (r))

#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)

#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)



#define SMC_IRQ_FLAGS		(0)



#elif	defined(CONFIG_ARCH_VERSATILE)



#define SMC_CAN_USE_8BIT	1

#define SMC_CAN_USE_16BIT	1

#define SMC_CAN_USE_32BIT	1

#define SMC_NOWAIT		1



#define SMC_inb(a, r)		readb((a) + (r))

#define SMC_inw(a, r)		readw((a) + (r))

#define SMC_inl(a, r)		readl((a) + (r))

#define SMC_outb(v, a, r)	writeb(v, (a) + (r))

#define SMC_outw(v, a, r)	writew(v, (a) + (r))

#define SMC_outl(v, a, r)	writel(v, (a) + (r))

#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)

#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)



#define SMC_IRQ_FLAGS		(0)



#elif	defined(CONFIG_ARCH_VERSATILE)



#define SMC_CAN_USE_8BIT	1

#define SMC_CAN_USE_16BIT	1

#define SMC_CAN_USE_32BIT	1

#define SMC_NOWAIT		1



#define SMC_inb(a, r)		readb((a) + (r))

#define SMC_inw(a, r)		readw((a) + (r))

#define SMC_inl(a, r)		readl((a) + (r))

#define SMC_outb(v, a, r)	writeb(v, (a) + (r))

#define SMC_outw(v, a, r)	writew(v, (a) + (r))

#define SMC_outl(v, a, r)	writel(v, (a) + (r))

#define SMC_insl(a, r, p, l)	readsl((a) + (r), p, l)

#define SMC_outsl(a, r, p, l)	writesl((a) + (r), p, l)



#define SMC_IRQ_FLAGS		(0)



#else

#else





#define SMC_CAN_USE_8BIT	1

#define SMC_CAN_USE_8BIT	1