aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-10-21 04:36:29 +0400
committerJeff Garzik <jgarzik@redhat.com>2008-10-22 06:22:13 -0400
commitd766a4eda65b80afb50a39ce15c0ca424115bc07 (patch)
tree1a14b5d223ebdb861261c50156104d27c50c78b5 /drivers/net
parent051d36f3fbd013a73cb42a6762e5bf339a3732aa (diff)
SMC911x: unbreak PXA builds
Currently SMC911x driver is broken on ARM/PXA builds. Unbreak such configurations. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/smc911x.c2
-rw-r--r--drivers/net/smc911x.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 8aa7460ef0e..ec32b5d89c9 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1242,7 +1242,7 @@ smc911x_rx_dma_irq(int dma, void *data)
netif_rx(skb);
spin_lock_irqsave(&lp->lock, flags);
- pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16;
+ pkts = (SMC_GET_RX_FIFO_INF(lp) & RX_FIFO_INF_RXSUSED_) >> 16;
if (pkts != 0) {
smc911x_rcv(dev);
}else {
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index bf6240f23f5..cc7d85bdfb3 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -50,6 +50,10 @@
#define SMC_DYNAMIC_BUS_CONFIG
#endif
+#ifdef SMC_USE_PXA_DMA
+#define SMC_USE_DMA
+#endif
+
/* store this information for the driver.. */
struct smc911x_local {
/*
@@ -196,8 +200,6 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg,
#ifdef SMC_USE_PXA_DMA
-#define SMC_USE_DMA
-
/*
* Define the request and free functions
* These are unfortunately architecture specific as no generic allocation