Pull style into test branch

[mv-sheeva.git] / arch / um / drivers / slirp_user.c

diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index b94c66114bc85d7a56fe4d9f6d29d4d31a633c13..ce5e85d1de3d8029ca968033d2d66117de66abcf 100644 (file)
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -104,7 +104,7 @@ static void slirp_close(int fd, void *data)
        }
 
        if(err == 0) {
-               printk("slirp_close: process %d has not exited\n");
+               printk("slirp_close: process %d has not exited\n", pri->pid);
                return;
        }
 
@@ -126,7 +126,7 @@ static int slirp_set_mtu(int mtu, void *data)
        return(mtu);
 }
 
-struct net_user_info slirp_user_info = {
+const struct net_user_info slirp_user_info = {
        .init           = slirp_user_init,
        .open           = slirp_open,
        .close          = slirp_close,