diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-12-11 05:30:06 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-11 09:54:50 -0500 |
commit | 8af905b4a403ce74b8d907b50bccc453a58834bc (patch) | |
tree | bd647e8ed88df86f2193020980873847eb34f7e4 | |
parent | 5796df19824bef34aabf5656f447b3b170d34c3b (diff) |
[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: Paul Mundt <lethal@linux-sh.org>
--
drivers/net/smc91x.h | 90 ---------------------------------------------------
1 file changed, 90 deletions(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/smc91x.h | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 9367c574477a..d2767e6584a9 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -362,96 +362,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, | |||
362 | 362 | ||
363 | #define SMC_IRQ_FLAGS (0) | 363 | #define SMC_IRQ_FLAGS (0) |
364 | 364 | ||
365 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
366 | |||
367 | #define SMC_CAN_USE_8BIT 1 | ||
368 | #define SMC_CAN_USE_16BIT 1 | ||
369 | #define SMC_CAN_USE_32BIT 1 | ||
370 | #define SMC_NOWAIT 1 | ||
371 | |||
372 | #define SMC_inb(a, r) readb((a) + (r)) | ||
373 | #define SMC_inw(a, r) readw((a) + (r)) | ||
374 | #define SMC_inl(a, r) readl((a) + (r)) | ||
375 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
376 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
377 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
378 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
379 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
380 | |||
381 | #define SMC_IRQ_FLAGS (0) | ||
382 | |||
383 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
384 | |||
385 | #define SMC_CAN_USE_8BIT 1 | ||
386 | #define SMC_CAN_USE_16BIT 1 | ||
387 | #define SMC_CAN_USE_32BIT 1 | ||
388 | #define SMC_NOWAIT 1 | ||
389 | |||
390 | #define SMC_inb(a, r) readb((a) + (r)) | ||
391 | #define SMC_inw(a, r) readw((a) + (r)) | ||
392 | #define SMC_inl(a, r) readl((a) + (r)) | ||
393 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
394 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
395 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
396 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
397 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
398 | |||
399 | #define SMC_IRQ_FLAGS (0) | ||
400 | |||
401 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
402 | |||
403 | #define SMC_CAN_USE_8BIT 1 | ||
404 | #define SMC_CAN_USE_16BIT 1 | ||
405 | #define SMC_CAN_USE_32BIT 1 | ||
406 | #define SMC_NOWAIT 1 | ||
407 | |||
408 | #define SMC_inb(a, r) readb((a) + (r)) | ||
409 | #define SMC_inw(a, r) readw((a) + (r)) | ||
410 | #define SMC_inl(a, r) readl((a) + (r)) | ||
411 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
412 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
413 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
414 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
415 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
416 | |||
417 | #define SMC_IRQ_FLAGS (0) | ||
418 | |||
419 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
420 | |||
421 | #define SMC_CAN_USE_8BIT 1 | ||
422 | #define SMC_CAN_USE_16BIT 1 | ||
423 | #define SMC_CAN_USE_32BIT 1 | ||
424 | #define SMC_NOWAIT 1 | ||
425 | |||
426 | #define SMC_inb(a, r) readb((a) + (r)) | ||
427 | #define SMC_inw(a, r) readw((a) + (r)) | ||
428 | #define SMC_inl(a, r) readl((a) + (r)) | ||
429 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
430 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
431 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
432 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
433 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
434 | |||
435 | #define SMC_IRQ_FLAGS (0) | ||
436 | |||
437 | #elif defined(CONFIG_ARCH_VERSATILE) | ||
438 | |||
439 | #define SMC_CAN_USE_8BIT 1 | ||
440 | #define SMC_CAN_USE_16BIT 1 | ||
441 | #define SMC_CAN_USE_32BIT 1 | ||
442 | #define SMC_NOWAIT 1 | ||
443 | |||
444 | #define SMC_inb(a, r) readb((a) + (r)) | ||
445 | #define SMC_inw(a, r) readw((a) + (r)) | ||
446 | #define SMC_inl(a, r) readl((a) + (r)) | ||
447 | #define SMC_outb(v, a, r) writeb(v, (a) + (r)) | ||
448 | #define SMC_outw(v, a, r) writew(v, (a) + (r)) | ||
449 | #define SMC_outl(v, a, r) writel(v, (a) + (r)) | ||
450 | #define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) | ||
451 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | ||
452 | |||
453 | #define SMC_IRQ_FLAGS (0) | ||
454 | |||
455 | #else | 365 | #else |
456 | 366 | ||
457 | #define SMC_CAN_USE_8BIT 1 | 367 | #define SMC_CAN_USE_8BIT 1 |