aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/skfp
diff options
context:
space:
mode:
authorYoann Padioleau <padator@wanadoo.fr>2007-06-01 00:46:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 08:18:27 -0700
commit632155e659449685b719995d7e7081cff7b01aba (patch)
tree3d6f7f12f89dd3ec7733c09042420cfac9114989 /drivers/net/skfp
parent78b7611c4a1e3ff008abc4751b566cb533d68f3d (diff)
potential parse error in ifdef
I have made a tool to parse the kernel that does not pre-process the source. That means that my parser tries to parse all the code, including code in the #else branch or code that is not often compiled because the driver is not very used (or not used at all). So, my parser sometimes reports parse error not originally detected by gcc. Here is my (first) patch. [akpm@linux-foundation.org: fix amd8111e.c] Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Acked-by: Matthew Wilcox <matthew@wil.cx> Acked-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Jeff Garzik <jeff@garzik.org> Acked-by: James Bottomley <James.Bottomley@steeleye.com> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/skfp')
-rw-r--r--drivers/net/skfp/smt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index fe847800acd..75afc1f07ba 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1748,7 +1748,7 @@ char *addr_to_string(struct fddi_addr *addr)
#endif
#ifdef AM29K
-smt_ifconfig(int argc, char *argv[])
+int smt_ifconfig(int argc, char *argv[])
{
if (argc >= 2 && !strcmp(argv[0],"opt_bypass") &&
!strcmp(argv[1],"yes")) {