Merge ../linus

[linux-2.6-omap-h63xx.git] / arch / um / include / net_user.h

diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h
index cd19defbfefcbd997ebd0059d70c295f6448adff..19f207cd70fe4b3bf6ed33dee917a58622055d9a 100644 (file)
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
@@ -25,7 +25,6 @@ struct net_user_info {
 };
 
 extern void ether_user_init(void *data, void *dev);
-extern void dev_ip_addr(void *d, unsigned char *bin_buf);
 extern void iter_addresses(void *d, void (*cb)(unsigned char *,
                                               unsigned char *, void *),
                           void *arg);
@@ -51,6 +50,4 @@ extern char *split_if_spec(char *str, ...);
 
 extern int dev_netmask(void *d, void *m);
 
-extern void random_mac(unsigned char *addr);
-
 #endif