Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / um / drivers / mcast_user.c

diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index afe85bfa66e0872eabc55cd1e0b25dace52900bc..8138f5ea1bf7516272de7b086ead9ca8295306ea 100644 (file)
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -23,6 +23,7 @@
 #include "user_util.h"
 #include "user.h"
 #include "os.h"
+#include "um_malloc.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
 
@@ -152,7 +153,7 @@ static int mcast_set_mtu(int mtu, void *data)
        return(mtu);
 }
 
-struct net_user_info mcast_user_info = {
+const struct net_user_info mcast_user_info = {
        .init           = mcast_user_init,
        .open           = mcast_open,
        .close          = mcast_close,