[Linuxconsole-commit]CVS: ruby/ruby-2.6/include/linux console.h,1.2,1.3 input.h,1.2,1.3 kbd_kern.h,1.2,1.3

[Aivils S. <ai...@us...>]

Update of /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/include/linux

Modified Files:
	console.h input.h kbd_kern.h 
Log Message:
sync to 2.6.1

Index: console.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/console.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- console.h	14 Nov 2003 17:44:23 -0000	1.2
+++ console.h	5 Feb 2004 11:53:56 -0000	1.3
@@ -18,18 +18,6 @@
 #include <linux/spinlock.h>
 
 /*
- *	Array of consoles built from command line options (console=)
- */
-struct console_cmdline
-{
-	char	name[8];			/* Name of the driver	    */
-	int	index;				/* Minor dev. to use	    */
-	char	*options;			/* Options for the driver   */
-};
-#define MAX_CMDLINECONSOLES 8
-extern struct console_cmdline console_list[MAX_CMDLINECONSOLES];
-
-/*
  *	The interface for a console, or any other device that
  *	wants to capture console messages (printer driver?)
  */
@@ -53,6 +41,7 @@
 	struct	 console *next;
 };
 
+extern int add_preferred_console(char *name, int idx, char *options);
 extern void register_console(struct console *);
 extern int unregister_console(struct console *);
 extern struct console *console_drivers;

Index: input.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/input.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.h	2 Oct 2003 09:32:19 -0000	1.2
+++ input.h	5 Feb 2004 11:53:56 -0000	1.3
@@ -870,6 +870,7 @@
 	char *name;
 
 	struct input_device_id *id_table;
+        struct input_device_id *blacklist;
 
 	struct list_head	h_list;
 	struct list_head	node;

Index: kbd_kern.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/include/linux/kbd_kern.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kbd_kern.h	12 Sep 2003 08:33:21 -0000	1.2
+++ kbd_kern.h	5 Feb 2004 11:53:56 -0000	1.3
@@ -5,6 +5,7 @@
 #include <linux/kd.h>
 #include <linux/interrupt.h>
 #include <linux/keyboard.h>
+#include <linux/input.h>
 
 extern struct tasklet_struct keyboard_tasklet;