Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314321
b: refs/heads/master
c: b31525d
h: refs/heads/master
i:
  314319: dd89c40
v: v3
  • Loading branch information
stigge@antcom.de authored and David S. Miller committed Jun 19, 2012
1 parent 48f7374 commit 4329bc2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 674147e21195a496164e1c7ff70d0f0b45235f25
refs/heads/master: b31525d16b50fe0eb33545afbc0be1a03f2896e3
6 changes: 1 addition & 5 deletions trunk/drivers/net/ethernet/nxp/lpc_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@

#define MODNAME "lpc-eth"
#define DRV_VERSION "1.00"
#define PHYDEF_ADDR 0x00

#define ENET_MAXF_SIZE 1536
#define ENET_RX_DESC 48
Expand Down Expand Up @@ -416,9 +415,6 @@ static bool use_iram_for_net(struct device *dev)
#define TXDESC_CONTROL_LAST (1 << 30)
#define TXDESC_CONTROL_INT (1 << 31)

static int lpc_eth_hard_start_xmit(struct sk_buff *skb,
struct net_device *ndev);

/*
* Structure of a TX/RX descriptors and RX status
*/
Expand Down Expand Up @@ -1441,7 +1437,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
res->start);
netdev_dbg(ndev, "IO address size :%d\n",
res->end - res->start + 1);
netdev_err(ndev, "IO address (mapped) :0x%p\n",
netdev_dbg(ndev, "IO address (mapped) :0x%p\n",
pldat->net_base);
netdev_dbg(ndev, "IRQ number :%d\n", ndev->irq);
netdev_dbg(ndev, "DMA buffer size :%d\n", pldat->dma_buff_size);
Expand Down

0 comments on commit 4329bc2

Please sign in to comment.