diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-02 23:11:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-04 20:18:58 -0400 |
commit | ff20877ab3be42cf9c21a9b0173db690aa3165b0 (patch) | |
tree | 35b8d2de051aa178fe3bb14278242d3740cf4069 /drivers/net/ethernet/marvell | |
parent | 6f45eba1894a3ece88574079a931cc2e5beee1f3 (diff) |
net: mv643xx_eth: add missing semicolon
76723bca28 "net: mv643xx_eth: add DT parsing support" added a
dummy mv643xx_eth_shared_of_probe() fallback function with a
typo.
This adds the missing semicolon so we can build without CONFIG_OF
again, and changes both dummy functions to the more conventional
"static inline" syntax, which can avoid potential problems with
the empty macro.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 23ea7b6e23f1..c7f9fb33ce95 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
@@ -2582,12 +2582,14 @@ static void mv643xx_eth_shared_of_remove(void) | |||
2582 | } | 2582 | } |
2583 | } | 2583 | } |
2584 | #else | 2584 | #else |
2585 | static int mv643xx_eth_shared_of_probe(struct platform_device *pdev) | 2585 | static inline int mv643xx_eth_shared_of_probe(struct platform_device *pdev) |
2586 | { | 2586 | { |
2587 | return 0 | 2587 | return 0; |
2588 | } | 2588 | } |
2589 | 2589 | ||
2590 | #define mv643xx_eth_shared_of_remove() | 2590 | static inline void mv643xx_eth_shared_of_remove(void) |
2591 | { | ||
2592 | } | ||
2591 | #endif | 2593 | #endif |
2592 | 2594 | ||
2593 | static int mv643xx_eth_shared_probe(struct platform_device *pdev) | 2595 | static int mv643xx_eth_shared_probe(struct platform_device *pdev) |