[Linuxconsole-commit]CVS: ruby/linux/include/linux console.h,1.6,1.7 fb.h,1.45,1.46 kernel.h,1.9,1.10 keyboard.h,1.1,1.2 tty.h,1.11,1.12 vt_kern.h,1.63,1.64

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv23561/include/linux

Modified Files:
	console.h fb.h kernel.h keyboard.h tty.h vt_kern.h 
Log Message:
Synced to 2.5.X.

Index: console.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/console.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- console.h	2001/12/07 00:17:55	1.6
+++ console.h	2002/01/20 03:54:46	1.7
@@ -45,7 +45,6 @@
 	void	(*write)(struct console *, const char *, unsigned);
 	int	(*read)(struct console *, const char *, unsigned);
 	kdev_t	(*device)(struct console *);
-	int	(*wait_key)(struct console *);
 	int	(*setup)(struct console *, char *);
 	struct  semaphore lock;
 	short	flags;

Index: fb.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/fb.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- fb.h	2001/11/25 05:16:47	1.45
+++ fb.h	2002/01/20 03:54:46	1.46
@@ -306,8 +306,6 @@
 
 #ifdef __KERNEL__
 
-#define GET_FB_IDX(node)	(MINOR(node))
-
 #include <linux/fs.h>
 #include <linux/poll.h>
 #include <linux/init.h>

Index: kernel.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/kernel.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kernel.h	2001/12/26 21:08:33	1.9
+++ kernel.h	2002/01/20 03:54:46	1.10
@@ -37,16 +37,6 @@
 #define	KERN_INFO	"<6>"	/* informational			*/
 #define	KERN_DEBUG	"<7>"	/* debug-level messages			*/
 
-# define NORET_TYPE    /**/
-# define ATTRIB_NORET  __attribute__((noreturn))
-# define NORET_AND     noreturn,
-
-#ifdef __i386__
-#define FASTCALL(x)	x __attribute__((regparm(3)))
-#else
-#define FASTCALL(x)	x
-#endif
-
 struct completion;
 
 extern struct notifier_block *panic_notifier_list;

Index: keyboard.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/keyboard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- keyboard.h	2000/04/04 22:26:14	1.1
+++ keyboard.h	2002/01/20 03:54:46	1.2
@@ -27,7 +27,6 @@
 extern const int max_vals[];
 extern unsigned short *key_maps[MAX_NR_KEYMAPS];
 extern unsigned short plain_map[NR_KEYS];
-extern wait_queue_head_t keypress_wait;
 extern unsigned char keyboard_type;
 #endif
 

Index: tty.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/tty.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tty.h	2001/12/06 23:32:51	1.11
+++ tty.h	2002/01/20 03:54:46	1.12
@@ -5,16 +5,6 @@
  * 'tty.h' defines some structures used by tty_io.c and some defines.
  */
 
-/*
- * These constants are also useful for user-level apps (e.g., VC
- * resizing).
- */
-#define MIN_NR_CONSOLES 1       /* must be at least 1 */
-#define MAX_NR_CONSOLES	63	/* serial lines start at 64 */
-#define MAX_NR_USER_CONSOLES 16	/* must be root to allocate above this */
-		/* Note: the ioctl VT_GETSTATE does not work for
-		   consoles 16 and higher (since it returns a short) */
-
 #ifdef __KERNEL__
 #include <linux/config.h>
 #include <linux/fs.h>

Index: vt_kern.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/vt_kern.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- vt_kern.h	2001/12/23 00:04:18	1.63
+++ vt_kern.h	2002/01/20 03:54:46	1.64
@@ -13,6 +13,10 @@
 #include <linux/kbd_kern.h>
 #include <linux/input.h>
 
+#define MIN_NR_CONSOLES 1       /* must be at least 1 */
+#define MAX_NR_CONSOLES 63      /* serial lines start at 64 */
+#define MAX_NR_USER_CONSOLES 16 /* number of VCs per VT */
+
 /* scroll */
 #define SM_UP       (1)
 #define SM_DOWN     (2)