summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:22:23 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:22:23 -0700
commitfd4e5f29f7354c3e3edaa03d37a7bf83b0cbae36 (patch)
treedd776442b62b9f24928672c886ebf23efb1ace56 /include/linux
parent4adb18173aba217a7ce7f261427914d1350c4e18 (diff)
parentb6d31e80f0d6a722bf85b3a7090df473fc545980 (diff)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_ltalk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h
index e75e832b7ff0..76525760ba48 100644
--- a/include/linux/if_ltalk.h
+++ b/include/linux/if_ltalk.h
@@ -6,7 +6,7 @@
#define LTALK_ALEN 1
#ifdef __KERNEL__
-extern void ltalk_setup(struct net_device *);
+extern struct net_device *alloc_ltalkdev(int sizeof_priv);
#endif
#endif