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

Commit d766a4ed authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Jeff Garzik
Browse files

SMC911x: unbreak PXA builds 



Currently SMC911x driver is broken on ARM/PXA builds.
Unbreak such configurations.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 051d36f3

drivers/net/smc911x.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/net/smc911x.h

+4 −2
Original line number Diff line number Diff line
@@ -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