Skip to content

Commit

Permalink
SMC911x: unbreak PXA builds
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Dmitry Baryshkov authored and Jeff Garzik committed Oct 22, 2008
1 parent 051d36f commit d766a4e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/smc911x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions drivers/net/smc911x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/*
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d766a4e

Please sign in to comment.