Pull update-tlbflush-sn into release branch

[linux-2.6-omap-h63xx.git] / arch / um / drivers / daemon_kern.c

diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index 507e3cbac9d38a281d357f4c40c86309ce585f9e..a61b7b46bc025b217796e0a443336b63578dbb70 100644 (file)
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -18,7 +18,7 @@ struct daemon_init {
        char *ctl_sock;
 };
 
-void daemon_init(struct net_device *dev, void *data)
+static void daemon_init(struct net_device *dev, void *data)
 {
        struct uml_net_private *pri;
        struct daemon_data *dpri;
@@ -64,7 +64,7 @@ static struct net_kern_info daemon_kern_info = {
        .write                  = daemon_write,
 };
 
-int daemon_setup(char *str, char **mac_out, void *data)
+static int daemon_setup(char *str, char **mac_out, void *data)
 {
        struct daemon_init *init = data;
        char *remain;