diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-27 13:14:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 13:14:03 -0400 |
| commit | 7559d97993ae7d552c96313155286f372cf4cf7c (patch) | |
| tree | fe9a82b65e5a32b0cd16f0b93e40c9425e20719a /drivers/net/can/bfin_can.c | |
| parent | a33e6112d9b0c1ab4fb55bb538832ec789200a10 (diff) | |
| parent | 21c11bc5d016ede062843cb3f98ee6824e6bcae2 (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
===================
this is a pull-request for net-next/master. It consists of three
patches by Lars-Peter Clausen to clean up the mcp251x spi-can driver,
two patches from Ludovic Desroches to bring device tree support to the
at91_can driver and a patch by me to fix a sparse warning in the
blackfin driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/bfin_can.c')
| -rw-r--r-- | drivers/net/can/bfin_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c index 6a0532176b69..d4a15e82bfc0 100644 --- a/drivers/net/can/bfin_can.c +++ b/drivers/net/can/bfin_can.c @@ -412,7 +412,7 @@ static int bfin_can_err(struct net_device *dev, u16 isrc, u16 status) return 0; } -irqreturn_t bfin_can_interrupt(int irq, void *dev_id) +static irqreturn_t bfin_can_interrupt(int irq, void *dev_id) { struct net_device *dev = dev_id; struct bfin_can_priv *priv = netdev_priv(dev); @@ -504,7 +504,7 @@ static int bfin_can_close(struct net_device *dev) return 0; } -struct net_device *alloc_bfin_candev(void) +static struct net_device *alloc_bfin_candev(void) { struct net_device *dev; struct bfin_can_priv *priv; |