Merge branch 'master' into gfs2

[pandora-kernel.git] / arch / um / drivers / slip_user.c

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 71af444..8460285 100644 (file)
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -14,7 +14,6 @@
 #include "net_user.h"
 #include "slip.h"
 #include "slip_common.h"
-#include "helper.h"
 #include "os.h"
 
 void slip_user_init(void *data, void *dev)
@@ -242,7 +241,7 @@ static void slip_del_addr(unsigned char *addr, unsigned char *netmask,
        close_addr(addr, netmask, pri->name);
 }
 
-struct net_user_info slip_user_info = {
+const struct net_user_info slip_user_info = {
        .init           = slip_user_init,
        .open           = slip_open,
        .close          = slip_close,