aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc91x.h
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-06-24 03:36:05 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-12 16:52:41 -0400
commit52256c0e06e4a4df67134b951a21b50c713a9588 (patch)
tree6e003932a594d85cb8bcbc880d5fc12d25faf8a6 /drivers/net/smc91x.h
parent159198862adad7109bb347bb30a620f67beac45f (diff)
[NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data
Now that the original SMC_USE_PXA_DMA specific code will always being built if CONFIG_ARCH_PXA is defined, so to make this part of the code to be PXA public, and still prevent it from being built if support of PXA is not selected. A SMC91X_USE_DMA flag is added to the platform data to allow platform to choose its usage of DMA. Note this flag itself is so named to be generic enough (assuming other platforms can also use DMA). It keeps backward compatibility to set the SMC91X_USE_DMA flag if SMC_USE_PXA_DMA is still defined. Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r--drivers/net/smc91x.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 80fb80f39200..f02cc6ac248b 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -492,7 +492,7 @@ struct smc_local {
492 492
493 spinlock_t lock; 493 spinlock_t lock;
494 494
495#ifdef SMC_USE_PXA_DMA 495#ifdef CONFIG_ARCH_PXA
496 /* DMA needs the physical address of the chip */ 496 /* DMA needs the physical address of the chip */
497 u_long physaddr; 497 u_long physaddr;
498 struct device *device; 498 struct device *device;
@@ -510,7 +510,7 @@ struct smc_local {
510#define SMC_16BIT(p) ((p)->cfg.flags & SMC91X_USE_16BIT) 510#define SMC_16BIT(p) ((p)->cfg.flags & SMC91X_USE_16BIT)
511#define SMC_32BIT(p) ((p)->cfg.flags & SMC91X_USE_32BIT) 511#define SMC_32BIT(p) ((p)->cfg.flags & SMC91X_USE_32BIT)
512 512
513#ifdef SMC_USE_PXA_DMA 513#ifdef CONFIG_ARCH_PXA
514/* 514/*
515 * Let's use the DMA engine on the XScale PXA2xx for RX packets. This is 515 * Let's use the DMA engine on the XScale PXA2xx for RX packets. This is
516 * always happening in irq context so no need to worry about races. TX is 516 * always happening in irq context so no need to worry about races. TX is
@@ -604,7 +604,7 @@ smc_pxa_dma_irq(int dma, void *dummy)
604{ 604{
605 DCSR(dma) = 0; 605 DCSR(dma) = 0;
606} 606}
607#endif /* SMC_USE_PXA_DMA */ 607#endif /* CONFIG_ARCH_PXA */
608 608
609 609
610/* 610/*