Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / um / include / chan_user.h

diff --git a/arch/um/include/chan_user.h b/arch/um/include/chan_user.h
index 659bb3cac32f51f3e7f8017bd137270e068cabf6..38f16d812e7c29d230aa6d72086ef2f3329b40eb 100644 (file)
--- a/arch/um/include/chan_user.h
+++ b/arch/um/include/chan_user.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -9,18 +9,18 @@
 #include "init.h"
 
 struct chan_opts {
-       void (*announce)(char *dev_name, int dev);
+       void (*const announce)(char *dev_name, int dev);
        char *xterm_title;
-       int raw;
-       unsigned long tramp_stack;
-       int in_kernel;
+       const int raw;
+       const unsigned long tramp_stack;
+       const int in_kernel;
 };
 
 enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE };
 
 struct chan_ops {
        char *type;
-       void *(*init)(char *, int, struct chan_opts *);
+       void *(*init)(char *, int, const struct chan_opts *);
        int (*open)(int, int, int, void *, char **);
        void (*close)(int, void *);
        int (*read)(int, char *, void *);
@@ -31,8 +31,8 @@ struct chan_ops {
        int winch;
 };
 
-extern struct chan_ops fd_ops, null_ops, port_ops, pts_ops, pty_ops, tty_ops,
-       xterm_ops;
+extern const struct chan_ops fd_ops, null_ops, port_ops, pts_ops, pty_ops,
+       tty_ops, xterm_ops;
 
 extern void generic_close(int fd, void *unused);
 extern int generic_read(int fd, char *c_out, void *unused);
@@ -54,14 +54,3 @@ __uml_help(fn, prefix "[0-9]*=<channel description>\n" \
 );
 
 #endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */