Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mirror_ubuntu-artful-kernel.git] / include / linux / if_ltalk.h

diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h
index e75e832b7ff0dd56d79bb07029a89a16c067afa2..81e434c50790f302213e3ce23b8447e9cb30a8b2 100644 (file)
--- a/include/linux/if_ltalk.h
+++ b/include/linux/if_ltalk.h
@@ -1,12 +1,7 @@
 #ifndef __LINUX_LTALK_H
 #define __LINUX_LTALK_H
 
-#define LTALK_HLEN             1
-#define LTALK_MTU              600
-#define LTALK_ALEN             1
-
-#ifdef __KERNEL__
-extern void ltalk_setup(struct net_device *);
-#endif
+#include <uapi/linux/if_ltalk.h>
 
+extern struct net_device *alloc_ltalkdev(int sizeof_priv);
 #endif