SMC911x: unbreak PXA builds
authorDmitry Baryshkov <dbaryshkov@gmail.com>
Tue, 21 Oct 2008 00:36:29 +0000 (04:36 +0400)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 22 Oct 2008 10:22:13 +0000 (06:22 -0400)
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>
drivers/net/smc911x.c
drivers/net/smc911x.h

index 8aa7460..ec32b5d 100644 (file)
@@ -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 {
index bf6240f..cc7d85b 100644 (file)
 #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