diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-12-09 05:52:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-09 05:52:19 -0500 |
commit | 43de004b6c197b0ea408bdebf4f14afdead74b63 (patch) | |
tree | a927905febd574951e89ba8856bfaa6acb5d35fa /drivers/net/gianfar.c | |
parent | e0188829cb724e7d12a2d4e343b368ff1d6e1471 (diff) |
gianfar: Fix build with CONFIG_NET_POLL_CONTROLLER=y
commit 46ceb60ca80fa07703bc6eb8f4651f900dff5a82 ("gianfar: Add
Multiple group Support") introduced the following build error
with CONFIG_NET_POLL_CONTROLLER=y:
CC ggianfar.o
ggianfar.c: In function 'gfar_netpoll':
ggianfar.c:2653: error: invalid storage class for function 'gfar_interrupt'
ggianfar.c:2652: warning: ISO C90 forbids mixed declarations and code
ggianfar.c:2681: error: invalid storage class for function 'adjust_link'
ggianfar.c:2764: error: invalid storage class for function 'gfar_set_multi'
ggianfar.c:2855: error: invalid storage class for function 'gfar_clear_exact_match'
ggianfar.c:2877: error: invalid storage class for function 'gfar_set_hash_for_addr'
ggianfar.c:2898: error: invalid storage class for function 'gfar_set_mac_for_addr'
ggianfar.c:2922: error: invalid storage class for function 'gfar_error'
ggianfar.c:3020: warning: ISO C90 forbids mixed declarations and code
ggianfar.c:3032: error: invalid storage class for function 'gfar_init'
ggianfar.c:3037: error: invalid storage class for function 'gfar_exit'
ggianfar.c:3041: error: initializer element is not constant
ggianfar.c:3042: error: initializer element is not constant
ggianfar.c:3042: warning: ISO C90 forbids mixed declarations and code
ggianfar.c:3042: error: expected declaration or statement at end of input
make[1]: *** [ggianfar.o] Error 1
This patch fixes the issue.
Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 16def131c390..6850dc0a7b91 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -2644,6 +2644,7 @@ static void gfar_netpoll(struct net_device *dev) | |||
2644 | gfar_interrupt(priv->gfargrp[i].interruptTransmit, | 2644 | gfar_interrupt(priv->gfargrp[i].interruptTransmit, |
2645 | &priv->gfargrp[i]); | 2645 | &priv->gfargrp[i]); |
2646 | enable_irq(priv->gfargrp[i].interruptTransmit); | 2646 | enable_irq(priv->gfargrp[i].interruptTransmit); |
2647 | } | ||
2647 | } | 2648 | } |
2648 | } | 2649 | } |
2649 | #endif | 2650 | #endif |