fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / um / drivers / null.c

diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index 66b2fbe..9016c68 100644 (file)
--- a/arch/um/drivers/null.c
+++ b/arch/um/drivers/null.c
@@ -8,29 +8,31 @@
 #include "chan_user.h"
 #include "os.h"
 
+/* This address is used only as a unique identifer */
 static int null_chan;
 
-void *null_init(char *str, int device, struct chan_opts *opts)
+static void *null_init(char *str, int device, const struct chan_opts *opts)
 {
        return(&null_chan);
 }
 
-int null_open(int input, int output, int primary, void *d, char **dev_out)
+static int null_open(int input, int output, int primary, void *d,
+                    char **dev_out)
 {
        *dev_out = NULL;
        return(os_open_file(DEV_NULL, of_rdwr(OPENFLAGS()), 0));
 }
 
-int null_read(int fd, char *c_out, void *unused)
+static int null_read(int fd, char *c_out, void *unused)
 {
        return(-ENODEV);
 }
 
-void null_free(void *data)
+static void null_free(void *data)
 {
 }
 
-struct chan_ops null_ops = {
+const struct chan_ops null_ops = {
        .type           = "null",
        .init           = null_init,
        .open           = null_open,