linuxconsole-commit — CVS commit mailing list

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick Config.help,1.3,1.4 analog.c,1.69,1.70 a3d.c,1.21,NONE adi.c,1.23,NONE amijoy.c,1.13,NONE cobra.c,1.19,NONE db9.c,1.13,NONE gamecon.c,1.22,NONE gf2k.c,1.19,NONE grip.c,1.21,NONE guillemot.c,1.10,NONE interact.c,1.16,NONE magellan.c,1.16,NONE sidewinder.c,1.29,NONE spaceball.c,1.17,NONE spaceorb.c,1.15,NONE stinger.c,1.10,NONE tmdc.c,1.31,NONE turbografx.c,1.14,NONE twidjoy.c,1.5,NONE warrior.c,1.14,NONE

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/drivers/input/joystick

Modified Files:
	Config.help analog.c 
Removed Files:
	a3d.c adi.c amijoy.c cobra.c db9.c gamecon.c gf2k.c grip.c 
	guillemot.c interact.c magellan.c sidewinder.c spaceball.c 
	spaceorb.c stinger.c tmdc.c turbografx.c twidjoy.c warrior.c 
Log Message:
Syned to 2.5.25

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/Config.help,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.help	6 Jul 2002 17:49:45 -0000	1.3
+++ Config.help	10 Jul 2002 18:08:03 -0000	1.4
@@ -203,3 +203,12 @@
   The module will be called joy-amiga.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
+CONFIG_INPUT_JOYDUMP
+  Say Y here if you want to dump data from your joystick into the system
+  log for debugging purposes. Say N if you are making a production
+  configuration or aren't sure. 
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joydump.o. If you want to compile it as
+  a module, say M here and read <file:Documentation/modules.txt>.

Index: analog.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/analog.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- analog.c	25 May 2002 20:32:03 -0000	1.69
+++ analog.c	10 Jul 2002 18:08:03 -0000	1.70
@@ -159,7 +159,7 @@
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"TSC"
 #elif __alpha__
-#define GET_TIME(x)	get_cycles(x)
+#define GET_TIME(x)	do { x = get_cycles(x); } while (0)
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"PCC"
 #else

--- a3d.c DELETED ---

--- adi.c DELETED ---

--- amijoy.c DELETED ---

--- cobra.c DELETED ---

--- db9.c DELETED ---

--- gamecon.c DELETED ---

--- gf2k.c DELETED ---

--- grip.c DELETED ---

--- guillemot.c DELETED ---

--- interact.c DELETED ---

--- magellan.c DELETED ---

--- sidewinder.c DELETED ---

--- spaceball.c DELETED ---

--- spaceorb.c DELETED ---

--- stinger.c DELETED ---

--- tmdc.c DELETED ---

--- turbografx.c DELETED ---

--- twidjoy.c DELETED ---

--- warrior.c DELETED ---

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick/iforce Config.help,1.1,1.2 Config.in,1.3,1.4

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/drivers/input/joystick/iforce

Modified Files:
	Config.help Config.in 
Log Message:
Syned to 2.5.25

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/Config.help,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.help	3 Feb 2002 19:38:21 -0000	1.1
+++ Config.help	10 Jul 2002 18:08:04 -0000	1.2
@@ -1,17 +1,21 @@
-CONFIG_JOYSTICK_IFORCE_USB
+CONFIG_JOYSTICK_IFORCE
   Say Y here if you have an I-Force joystick or steering wheel
-  connected to your USB port. 
+
+  You also must choose at least one of the two options below.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called iforce.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
+CONFIG_JOYSTICK_IFORCE_USB
+  Say Y here if you have an I-Force joystick or steering wheel
+  connected to your USB port. 
+
 CONFIG_JOYSTICK_IFORCE_232
   Say Y here if you have an I-Force joystick or steering wheel
   connected to your serial (COM) port.
 
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called iforce.o. If you want to compile it as a
-  module, say M here and read <file:Documentation/modules.txt>.
+  You will need an additional utility called inputattach, see
+  Documentation/input/joystick.txt and ff.txt.
+

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	17 Apr 2002 19:40:14 -0000	1.3
+++ Config.in	10 Jul 2002 18:08:04 -0000	1.4
@@ -2,11 +2,13 @@
 # I-Force driver configuration
 #
 
-dep_tristate 'I-Force devices' CONFIG_JOYSTICK_IFORCE $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK
+dep_tristate '  I-Force devices' CONFIG_JOYSTICK_IFORCE $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK
 
 if [ "$CONFIG_JOYSTICK_IFORCE" = "m" -o "$CONFIG_JOYSTICK_IFORCE" = "y" ]; then
-	dep_bool '  I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB $CONFIG_USB
-	if [ "$CONFIG_INPUT_SERIO" != "n" -a "$CONFIG_INPUT_SERPORT" != "n" ]; then
-		bool '  I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232
+	if [ "$CONFIG_USB" != "n" ]; then
+		bool '    I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB
+	fi
+	if [ "$CONFIG_SERIO" != "n" ]; then
+		bool '    I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232
 	fi
 fi

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/gameport Config.in,1.2,1.3 Config.help,1.1,NONE Makefile,1.2,NONE cs461x.c,1.2,NONE emu10k1-gp.c,1.9,NONE fm801-gp.c,1.2,NONE gameport.c,1.18,NONE lightning.c,1.20,NONE ns558.c,1.43,NONE vortex.c,1.5,NONE

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/drivers/input/gameport

Modified Files:
	Config.in 
Removed Files:
	Config.help Makefile cs461x.c emu10k1-gp.c fm801-gp.c 
	gameport.c lightning.c ns558.c vortex.c 
Log Message:
Syned to 2.5.25

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/Config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Config.in	6 Jul 2002 17:49:45 -0000	1.2
+++ Config.in	10 Jul 2002 18:08:03 -0000	1.3
@@ -14,6 +14,6 @@
 dep_tristate '  Classic ISA and PnP gameport support' CONFIG_GAMEPORT_NS558 $CONFIG_GAMEPORT
 dep_tristate '  PDPI Lightning 4 gamecard support' CONFIG_GAMEPORT_L4 $CONFIG_GAMEPORT
 dep_tristate '  SB Live and Audigy gameport support' CONFIG_GAMEPORT_EMU10K1 $CONFIG_GAMEPORT
-dep_tristate '  Aureal Vortex and Vortex 2 gameport support' CONFIG_GAMEPORT_VORTEX $CONFIG_GAMEPORT
+dep_tristate '  Aureal Vortex, Vortex 2 gameport support' CONFIG_GAMEPORT_VORTEX $CONFIG_GAMEPORT
 dep_tristate '  ForteMedia FM801 gameport support' CONFIG_GAMEPORT_FM801 $CONFIG_GAMEPORT
-dep_tristate '  Crystal SoundFusion  gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT
+dep_tristate '  Crystal SoundFusion gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT

--- Config.help DELETED ---

--- Makefile DELETED ---

--- cs461x.c DELETED ---

--- emu10k1-gp.c DELETED ---

--- fm801-gp.c DELETED ---

--- gameport.c DELETED ---

--- lightning.c DELETED ---

--- ns558.c DELETED ---

--- vortex.c DELETED ---

[Linuxconsole-commit]CVS: ruby/linux/drivers/input evbug.c,1.10,1.11 Config.help,1.1,NONE Config.in,1.64,NONE Makefile,1.51,NONE evdev.c,1.48,NONE input.c,1.50,NONE joydev.c,1.43,NONE keybdev.c,1.19,NONE mousedev.c,1.42,NONE power.c,1.10,NONE tsdev.c,1.15,NONE

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/drivers/input

Modified Files:
	evbug.c 
Removed Files:
	Config.help Config.in Makefile evdev.c input.c joydev.c 
	keybdev.c mousedev.c power.c tsdev.c 
Log Message:
Syned to 2.5.25

Index: evbug.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/evbug.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- evbug.c	25 Sep 2001 10:12:07 -0000	1.10
+++ evbug.c	10 Jul 2002 18:08:03 -0000	1.11
@@ -37,6 +37,8 @@
 MODULE_DESCRIPTION("Input driver event debug module"); 
 MODULE_LICENSE("GPL");
 
+static char evbug_name[] = "evbug";
+
 static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
 {
 	printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", handle->dev->phys, type, code, value);
@@ -52,6 +54,7 @@
 
 	handle->dev = dev;
 	handle->handler = handler;
+	handle->name = evbug_name;
 
 	input_open_device(handle);
 

--- Config.help DELETED ---

--- Config.in DELETED ---

--- Makefile DELETED ---

--- evdev.c DELETED ---

--- input.c DELETED ---

--- joydev.c DELETED ---

--- keybdev.c DELETED ---

--- mousedev.c DELETED ---

--- power.c DELETED ---

--- tsdev.c DELETED ---

[Linuxconsole-commit]CVS: ruby/linux/drivers/char Makefile,1.45,1.46 tty_io.c,1.50,1.51

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/drivers/char

Modified Files:
	Makefile tty_io.c 
Log Message:
Syned to 2.5.25

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile	22 Jun 2002 17:50:59 -0000	1.45
+++ Makefile	10 Jul 2002 18:08:02 -0000	1.46
@@ -114,8 +114,20 @@
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
 	$(obj)/conmakehash $< > $@
 
-$(obj)/defkeymap.c: $(src)/defkeymap.map
-	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+$(obj)/defkeymap.o:  $(obj)/defkeymap.c
 
-$(obj)/qtronixmap.c: $(src)/qtronixmap.map
-	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+$(obj)/qtronixmap.o: $(obj)/qtronixmap.c
+
+# Uncomment if you're changing the keymap and have an appropriate
+# loadkeys version for the map. By default, we'll use the shipped
+# versions.
+# GENERATE_KEYMAP := 1
+
+ifdef GENERATE_KEYMAP
+
+$(obj)/defkeymap.c $(obj)/qtronixmap.c: $(obj)/%.c: $(src)/%.map
+	loadkeys --mktable $< > $@.tmp
+	sed -e 's/^static *//' $@.tmp > $@
+	rm $@.tmp
+
+endif
\ No newline at end of file

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/tty_io.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- tty_io.c	4 Jun 2002 19:45:09 -0000	1.50
+++ tty_io.c	10 Jul 2002 18:08:03 -0000	1.51
@@ -1324,7 +1324,7 @@
 	ptmx_found:
 		set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */
 		minor -= driver->minor_start;
-		devpts_pty_new(driver->other->name_base + minor, mk_kdev(driver->other->major, minor + driver->other->minor_start));
+		devpts_pty_new(driver->other->name_base + minor, MKDEV(driver->other->major, minor + driver->other->minor_start));
 		tty_register_devfs(&pts_driver[major], DEVFS_FL_DEFAULT,
 				   pts_driver[major].minor_start + minor);
 		noctty = 1;

[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/platforms chrp_setup.c,1.5,1.6 prep_setup.c,1.5,1.6

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory usw-pr-cvs1:/tmp/cvs-serv10580/linux/arch/ppc/platforms

Modified Files:
	chrp_setup.c prep_setup.c 
Log Message:
Syned to 2.5.25

Index: chrp_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/chrp_setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- chrp_setup.c	18 Jun 2002 18:51:54 -0000	1.5
+++ chrp_setup.c	10 Jul 2002 18:08:02 -0000	1.6
@@ -371,7 +371,6 @@
 	int i;
 	unsigned long chrp_int_ack;
 	unsigned char init_senses[NR_IRQS - NUM_8259_INTERRUPTS];
-	int nmi_irq = -1;
 
 	for (np = find_devices("pci"); np != NULL; np = np->next) {
 		unsigned int *addrp = (unsigned int *)
@@ -391,7 +390,7 @@
 	OpenPIC_InitSenses = init_senses;
 	OpenPIC_NumInitSenses = NR_IRQS - NUM_8259_INTERRUPTS;
 
-	openpic_init(1, NUM_8259_INTERRUPTS, nmi_irq);
+	openpic_init(NUM_8259_INTERRUPTS);
 
 	for (i = 0; i < NUM_8259_INTERRUPTS; i++)
 		irq_desc[i].handler = &i8259_pic;
@@ -417,35 +416,6 @@
 		ppc_md.progress("  Have fun!    ", 0x7777);
 }
 
-/*
- * One of the main thing these mappings are needed for is so that
- * xmon can get to the serial port early on.  We probably should
- * handle the machines with the mpc106 as well as the python (F50)
- * and the GG2 (longtrail).  Actually we should look in the device
- * tree and do the right thing.
- */
-static void __init
-chrp_map_io(void)
-{
-	char *name;
-
-	/*
-	 * The code below tends to get removed, please don't take it out.
-	 * The F50 needs this mapping and it you take it out I'll track you
-	 * down and slap your hands.  If it causes problems please email me.
-	 *  -- Cort <co...@fs...>
-	 */
-	name = get_property(find_path_device("/"), "name", NULL);
-	if (name && strncmp(name, "IBM-70", 6) == 0
-	    && strstr(name, "-F50")) {
-		io_block_mapping(0x80000000, 0x80000000, 0x10000000, _PAGE_IO);
-		io_block_mapping(0x90000000, 0x90000000, 0x10000000, _PAGE_IO);
-		return;
-	} else {
-		io_block_mapping(0xf8000000, 0xf8000000, 0x04000000, _PAGE_IO);
-	}
-}
-
 void __init
 chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	  unsigned long r6, unsigned long r7)
@@ -483,7 +453,6 @@
 	ppc_md.calibrate_decr = chrp_calibrate_decr;
 
 	ppc_md.find_end_of_memory = pmac_find_end_of_memory;
-	ppc_md.setup_io_mappings = chrp_map_io;
 
 	if (rtas_data) {
 		struct device_node *rtas;

Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- prep_setup.c	18 Jun 2002 18:51:54 -0000	1.5
+++ prep_setup.c	10 Jul 2002 18:08:02 -0000	1.6
@@ -681,7 +681,7 @@
 	int i;
 
 	if (OpenPIC_Addr != NULL)
-		openpic_init(1, NUM_8259_INTERRUPTS, -1);
+		openpic_init(NUM_8259_INTERRUPTS);
 	for ( i = 0 ; i < NUM_8259_INTERRUPTS ; i++ )
 		irq_desc[i].handler = &i8259_pic;
 	i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR);

[Linuxconsole-commit]CVS: ruby AGAINST-2.5.25,NONE,1.1 AGAINST-2.5.24,1.1,NONE

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

Update of /cvsroot/linuxconsole/ruby
In directory usw-pr-cvs1:/tmp/cvs-serv10580

Added Files:
	AGAINST-2.5.25 
Removed Files:
	AGAINST-2.5.24 
Log Message:
Syned to 2.5.25

--- NEW FILE: AGAINST-2.5.25 ---

--- AGAINST-2.5.24 DELETED ---

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick/iforce iforce-main.c,1.18,1.19 iforce-packets.c,1.15,1.16 iforce.h,1.12,1.13

[johann d. <jd...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce
In directory usw-pr-cvs1:/tmp/cvs-serv21328

Modified Files:
	iforce-main.c iforce-packets.c iforce.h 
Log Message:
IFORCE_{USB,232} are used as values for iforce::bus.
CONFIG_JOYSTICK_IFORCE_{USB,232} are used for config-dependant blocks of code.


Index: iforce-main.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- iforce-main.c	9 Jun 2002 11:03:03 -0000	1.18
+++ iforce-main.c	7 Jul 2002 10:22:50 -0000	1.19
@@ -248,7 +248,7 @@
 	struct iforce *iforce = dev->private;
 
 	switch (iforce->bus) {
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 		case IFORCE_USB:
 			iforce->irq->dev = iforce->usbdev;
 			if (usb_submit_urb(iforce->irq, GFP_KERNEL))
@@ -305,7 +305,7 @@
 	iforce_send_packet(iforce, FF_CMD_ENABLE, "\001");
 
 	switch (iforce->bus) {
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 		case IFORCE_USB:
 			usb_unlink_urb(iforce->irq);
 
@@ -323,12 +323,12 @@
 void iforce_delete_device(struct iforce *iforce)
 {
 	switch (iforce->bus) {
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 	case IFORCE_USB:
 		iforce_usb_delete(iforce);
 		break;
 #endif
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 	case IFORCE_232:
 		//TODO: Wait for the last packets to be sent
 		break;
@@ -520,10 +520,10 @@
 
 static int __init iforce_init(void)
 {
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 	usb_register(&iforce_usb_driver);
 #endif
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 	serio_register_device(&iforce_serio_dev);
 #endif
 	return 0;
@@ -531,10 +531,10 @@
 
 static void __exit iforce_exit(void)
 {
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 	usb_deregister(&iforce_usb_driver);
 #endif
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 	serio_unregister_device(&iforce_serio_dev);
 #endif
 }

Index: iforce-packets.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-packets.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- iforce-packets.c	9 Jun 2002 11:08:04 -0000	1.15
+++ iforce-packets.c	7 Jul 2002 10:22:50 -0000	1.16
@@ -101,13 +101,13 @@
  */
 	switch (iforce->bus) {
 
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 		case IFORCE_232:
 		if (empty)
 			iforce_serial_xmit(iforce);
 		break;
 #endif
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 		case IFORCE_USB: 
 
 		if (iforce->usbdev && empty &&
@@ -161,7 +161,7 @@
 		printk(KERN_WARNING "iforce-packets.c: re-entrant call to iforce_process %d\n", being_used);
 	being_used++;
 
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 	if (HI(iforce->expect_packet) == HI(cmd)) {
 		iforce->expect_packet = 0;
 		iforce->ecmd = cmd;
@@ -251,7 +251,7 @@
 
 	case IFORCE_USB:
 
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 		iforce->cr.bRequest = packet[0];
 		iforce->ctrl->dev = iforce->usbdev;
 
@@ -281,7 +281,7 @@
 
 	case IFORCE_232:
 
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 		iforce->expect_packet = FF_CMD_QUERY;
 		iforce_send_packet(iforce, FF_CMD_QUERY, packet);
 

Index: iforce.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- iforce.h	9 Jun 2002 11:08:04 -0000	1.12
+++ iforce.h	7 Jul 2002 10:22:50 -0000	1.13
@@ -39,7 +39,7 @@
 #include <linux/circ_buf.h>
 #include <asm/semaphore.h>
 
-/* FF: This module provides arbitrary resource management routines.
+/* This module provides arbitrary resource management routines.
  * I use it to manage the device's memory.
  * Despite the name of this module, I am *not* going to access the ioports.
  */
@@ -47,12 +47,9 @@
 
 #define IFORCE_MAX_LENGTH	16
 
-#if defined(CONFIG_JOYSTICK_IFORCE_232)
+/* iforce::bus */
 #define IFORCE_232	1
-#endif
-#if defined(CONFIG_JOYSTICK_IFORCE_USB)
 #define IFORCE_USB	2
-#endif
 
 #define FALSE 0
 #define TRUE 1
@@ -129,12 +126,12 @@
 	u16 ecmd;
 	u16 expect_packet;
 
-#ifdef IFORCE_232
+#ifdef CONFIG_JOYSTICK_IFORCE_232
 	struct serio *serio;		/* RS232 transfer */
 	int idx, pkt, len, id;
 	unsigned char csum;
 #endif
-#ifdef IFORCE_USB
+#ifdef CONFIG_JOYSTICK_IFORCE_USB
 	struct usb_device *usbdev;	/* USB transfer */
 	struct urb *irq, *out, *ctrl;
 	struct usb_ctrlrequest cr;

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick Config.help,1.2,1.3 Config.in,1.3,1.4

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick
In directory usw-pr-cvs1:/tmp/cvs-serv25033/joystick

Modified Files:
	Config.help Config.in 
Log Message:
Typo fixes.

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/Config.help,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Config.help	3 Feb 2002 19:38:21 -0000	1.2
+++ Config.help	6 Jul 2002 17:49:45 -0000	1.3
@@ -1,4 +1,4 @@
-CONFIG_JOYSTICK
+CONFIG_INPUT_JOYSTICK
   If you have a joystick, 6dof controller, gamepad, steering wheel,
   weapon control system or something like that you can say Y here
   and the list of supported devices will be displayed. This option

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	30 Jan 2002 00:08:41 -0000	1.3
+++ Config.in	6 Jul 2002 17:49:45 -0000	1.4
@@ -20,7 +20,7 @@
 dep_tristate '  SpaceTec SpaceOrb/Avenger 6dof controllers' CONFIG_JOYSTICK_SPACEORB $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
 dep_tristate '  SpaceTec SpaceBall 6dof controllers' CONFIG_JOYSTICK_SPACEBALL $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
 dep_tristate '  Gravis Stinger gamepad' CONFIG_JOYSTICK_STINGER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
-dep_tristate '  Twiddler as as joystick' CONFIG_JOYSTICK_TWIDDLER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
+dep_tristate '  Twiddler as a joystick' CONFIG_JOYSTICK_TWIDDLER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
 
 dep_tristate '  Multisystem, Sega Genesis, Saturn joysticks and gamepads' CONFIG_JOYSTICK_DB9 $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT
 dep_tristate '  Multisystem, NES, SNES, N64, PSX joysticks and gamepads' CONFIG_JOYSTICK_GAMECON $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/gameport Config.in,1.1,1.2

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport
In directory usw-pr-cvs1:/tmp/cvs-serv25033/gameport

Modified Files:
	Config.in 
Log Message:
Typo fixes.

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.in	23 Jan 2002 05:31:11 -0000	1.1
+++ Config.in	6 Jul 2002 17:49:45 -0000	1.2
@@ -13,7 +13,7 @@
 
 dep_tristate '  Classic ISA and PnP gameport support' CONFIG_GAMEPORT_NS558 $CONFIG_GAMEPORT
 dep_tristate '  PDPI Lightning 4 gamecard support' CONFIG_GAMEPORT_L4 $CONFIG_GAMEPORT
-dep_tristate '  SB Live and Audigy gameport support' CONFIG_INPUT_EMU10K1 $CONFIG_GAMEPORT
+dep_tristate '  SB Live and Audigy gameport support' CONFIG_GAMEPORT_EMU10K1 $CONFIG_GAMEPORT
 dep_tristate '  Aureal Vortex and Vortex 2 gameport support' CONFIG_GAMEPORT_VORTEX $CONFIG_GAMEPORT
 dep_tristate '  ForteMedia FM801 gameport support' CONFIG_GAMEPORT_FM801 $CONFIG_GAMEPORT
 dep_tristate '  Crystal SoundFusion  gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT

[Linuxconsole-commit]CVS: ruby/linux/drivers/usb/input powermate.c,1.1,1.2

[Vojtech P. <vo...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv16943/drivers/usb/input

Modified Files:
	powermate.c 
Log Message:
Add "Contour design jog" support.


Index: powermate.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/powermate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- powermate.c	16 Apr 2002 17:41:51 -0000	1.1
+++ powermate.c	1 Jul 2002 15:43:25 -0000	1.2
@@ -31,9 +31,12 @@
 #include <linux/init.h>
 #include <linux/usb.h>
 
-#define POWERMATE_VENDOR       0x077d    /* Griffin Technology, Inc. */
-#define POWERMATE_PRODUCT_NEW  0x0410    /* Griffin PowerMate */
-#define POWERMATE_PRODUCT_OLD  0x04AA    /* Griffin soundKnob */
+#define POWERMATE_VENDOR	0x077d	/* Griffin Technology, Inc. */
+#define POWERMATE_PRODUCT_NEW	0x0410	/* Griffin PowerMate */
+#define POWERMATE_PRODUCT_OLD	0x04AA	/* Griffin soundKnob */
+
+#define CONTOUR_VENDOR		0x05f3	/* Contour Design, Inc. */
+#define CONTOUR_JOG		0x0240	/* Jog and Shuttle */
 
 /* these are the command codes we send to the device */
 #define SET_STATIC_BRIGHTNESS  0x01
@@ -324,6 +327,7 @@
 static struct usb_device_id powermate_devices [] = {
 	{ USB_DEVICE(POWERMATE_VENDOR, POWERMATE_PRODUCT_NEW) },
 	{ USB_DEVICE(POWERMATE_VENDOR, POWERMATE_PRODUCT_OLD) },
+	{ USB_DEVICE(CONTOUR_VENDOR, CONTOUR_JOG) },
 	{ } /* Terminating entry */
 };
 

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick gamecon.c,1.21,1.22

[Vojtech P. <vo...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick
In directory usw-pr-cvs1:/tmp/cvs-serv16610/drivers/input/joystick

Modified Files:
	gamecon.c 
Log Message:
Fix button event assignments.


Index: gamecon.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/gamecon.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gamecon.c	22 Jan 2002 20:27:27 -0000	1.21
+++ gamecon.c	1 Jul 2002 15:42:25 -0000	1.22
@@ -398,8 +398,8 @@
 
 			case GC_PSX_RUMBLE:
 
-				input_report_key(dev + i, BTN_THUMB,  ~data[0] & 0x04);
-				input_report_key(dev + i, BTN_THUMB2, ~data[0] & 0x02);
+				input_report_key(dev + i, BTN_THUMBL, ~data[0] & 0x04);
+				input_report_key(dev + i, BTN_THUMBR, ~data[0] & 0x02);
 
 			case GC_PSX_NEGCON:
 			case GC_PSX_ANALOG:

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/gameport cs461x.c,1.1,1.2 vortex.c,1.4,1.5 emu10k1-gp.c,1.8,1.9

[Vojtech P. <vo...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport
In directory usw-pr-cvs1:/tmp/cvs-serv14910/drivers/input/gameport

Modified Files:
	cs461x.c vortex.c emu10k1-gp.c 
Log Message:
Fix search-and-replace in emu.
Cleanup pci provate member handling in cs461x, vortex and emu.


Index: cs461x.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/cs461x.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs461x.c	22 Jan 2002 19:38:19 -0000	1.1
+++ cs461x.c	1 Jul 2002 15:39:30 -0000	1.2
@@ -159,7 +159,7 @@
 
 static int cs461x_free(struct pci_dev *pdev)
 {
-	struct gameport *port = (struct gameport *)pdev->driver_data;
+	struct gameport *port = pci_get_drvdata(pdev);
 	if(port){
 	    gameport_unregister_port(port);
 	    kfree(port);
@@ -280,7 +280,7 @@
 	}
 	memset(port, 0, sizeof(struct gameport));
 
-	pdev->driver_data = port;
+	pci_set_drvdata(pdev, port);
 	
 	port->open = cs461x_gameport_open;
 	port->trigger = cs461x_gameport_trigger;

Index: vortex.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/vortex.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vortex.c	24 Jan 2002 19:51:25 -0000	1.4
+++ vortex.c	1 Jul 2002 15:39:30 -0000	1.5
@@ -117,7 +117,7 @@
 	vortex->dev = dev;
 	sprintf(vortex->phys, "pci%s/gameport0", dev->slot_name);
 
-	dev->driver_data = vortex;
+	pci_set_drvdata(dev, vortex);
 
 	vortex->gameport.driver = vortex;
 	vortex->gameport.fuzz = 64;
@@ -153,7 +153,7 @@
 
 static void __devexit vortex_remove(struct pci_dev *dev)
 {
-	struct vortex *vortex = dev->driver_data;
+	struct vortex *vortex = pci_get_drvdata(dev);
 	gameport_unregister_port(&vortex->gameport);
 	iounmap(vortex->base);
 	kfree(vortex);

Index: emu10k1-gp.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/emu10k1-gp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- emu10k1-gp.c	22 Jan 2002 20:40:46 -0000	1.8
+++ emu10k1-gp.c	1 Jul 2002 15:39:30 -0000	1.9
@@ -60,21 +60,21 @@
 
 static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-	int ioemu, iolen;
+	int ioport, iolen;
 	struct emu *emu;
         
 	if (pci_enable_device(pdev))
 		return -EBUSY;
 
-	ioemu = pci_resource_start(pdev, 0);
+	ioport = pci_resource_start(pdev, 0);
 	iolen = pci_resource_len(pdev, 0);
 
-	if (!request_region(ioemu, iolen, "emu10k1-gp"))
+	if (!request_region(ioport, iolen, "emu10k1-gp"))
 		return -EBUSY;
 
 	if (!(emu = kmalloc(sizeof(struct emu), GFP_KERNEL))) {
 		printk(KERN_ERR "emu10k1-gp: Memory allocation failed.\n");
-		release_region(ioemu, iolen);
+		release_region(ioport, iolen);
 		return -ENOMEM;
 	}
 	memset(emu, 0, sizeof(struct emu));
@@ -84,14 +84,14 @@
 	emu->size = iolen;
 	emu->dev = pdev;
 
-	emu->gameport.io = ioemu;
+	emu->gameport.io = ioport;
 	emu->gameport.name = pdev->name;
 	emu->gameport.phys = emu->phys;
 	emu->gameport.idbus = BUS_PCI;
 	emu->gameport.idvendor = pdev->vendor;
 	emu->gameport.idproduct = pdev->device;
 
-	pdev->driver_data = emu;
+	pci_set_drvdata(pdev, emu);
 
 	gameport_register_port(&emu->gameport);
 
@@ -103,7 +103,7 @@
 
 static void __devexit emu_remove(struct pci_dev *pdev)
 {
-	struct emu *emu = (void *)pdev->driver_data;
+	struct emu *emu = pci_get_drvdata(pdev);
 	gameport_unregister_port(&emu->gameport);
 	release_region(emu->gameport.io, emu->size);
 	kfree(emu);

[Linuxconsole-commit]CVS: ruby/linux/drivers/acorn/char Makefile,1.9,1.10

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/acorn/char
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/drivers/acorn/char

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.24

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/acorn/char/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	3 Jun 2002 22:44:57 -0000	1.9
+++ Makefile	22 Jun 2002 17:50:58 -0000	1.10
@@ -10,6 +10,3 @@
 obj-y		+= $(obj-$(MACHINE))
 
 include $(TOPDIR)/Rules.make
-
-%.c: %.map
-	loadkeys --mktable $< > $@

[Linuxconsole-commit]CVS: ruby/linux/arch/parisc config.in,1.6,1.7

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/parisc
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/parisc

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/parisc/config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.in	14 Mar 2002 22:32:22 -0000	1.6
+++ config.in	22 Jun 2002 17:50:58 -0000	1.7
@@ -27,7 +27,7 @@
 bool 'U2/Uturn I/O MMU' CONFIG_IOMMU_CCIO y
 bool 'LASI I/O support' CONFIG_GSC_LASI y
 
-bool 'PCI bus support' CONFIG_PCI y
+bool 'PCI support' CONFIG_PCI y
 
 if [ "$CONFIG_PCI" = "y" ]; then
 	bool 'GSCtoPCI/DINO PCI support' CONFIG_GSC_DINO y
@@ -49,7 +49,7 @@
 comment 'Loadable module support'
 bool 'Enable loadable module support' CONFIG_MODULES
 if [ "$CONFIG_MODULES" = "y" ]; then
-  bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS
+  bool 'Set version information on all module symbols' CONFIG_MODVERSIONS
   bool 'Kernel module loader' CONFIG_KMOD
 fi
 endmenu

[Linuxconsole-commit]CVS: ruby/linux/drivers Makefile,1.35,1.36

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

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

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.24

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile	18 Jun 2002 18:51:55 -0000	1.35
+++ Makefile	22 Jun 2002 17:50:58 -0000	1.36
@@ -38,6 +38,6 @@
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BLUEZ)		+= bluetooth/
 obj-$(CONFIG_HOTPLUG_PCI)	+= hotplug/
-obj-$(CONFIG_ISDN)		+= isdn/
+obj-$(CONFIG_ISDN_BOOL)		+= isdn/
 
 include $(TOPDIR)/Rules.make

[Linuxconsole-commit]CVS: ruby/linux/arch/sparc64 config.in,1.26,1.27

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/sparc64
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/sparc64

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/sparc64/config.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- config.in	6 May 2002 17:29:59 -0000	1.26
+++ config.in	22 Jun 2002 17:50:58 -0000	1.27
@@ -16,7 +16,7 @@
 define_bool CONFIG_VT_CONSOLE y
 
 bool 'Symmetric multi-processing support' CONFIG_SMP
-bool 'Preemptible kernel' CONFIG_PREEMPT
+bool 'Preemptible Kernel' CONFIG_PREEMPT
 
 # Identify this as a Sparc64 build
 define_bool CONFIG_SPARC64 y

[Linuxconsole-commit]CVS: ruby/linux/arch/mips64 config.in,1.21,1.22

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/mips64
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/mips64

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips64/config.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- config.in	24 Apr 2002 18:56:51 -0000	1.21
+++ config.in	22 Jun 2002 17:50:58 -0000	1.22
@@ -10,12 +10,12 @@
 comment 'Machine selection'
 choice 'Machine type'						\
 	"SGI-IP22,Indy/Indigo2 CONFIG_SGI_IP22			\
-	 SGI-IP27,Origin200/2000 CONFIG_SGI_IP27 SGI-IP27,Origin200/2000"
+	 SGI-IP27,Origin200/2000 CONFIG_SGI_IP27" SGI-IP27,Origin200/2000
 
 if [ "$CONFIG_SGI_IP27" = "y" ]; then
    bool '  IP27 N-Mode' CONFIG_SGI_SN0_N_MODE
    bool '  Discontiguous Memory Support' CONFIG_DISCONTIGMEM
-   bool '  NUMA support' CONFIG_NUMA
+   bool '  NUMA Support' CONFIG_NUMA
    bool '  Mapped kernel support' CONFIG_MAPPED_KERNEL
    bool '  Kernel text replication support' CONFIG_REPLICATE_KTEXT
    bool '  Exception handler replication support' CONFIG_REPLICATE_EXHANDLERS
@@ -122,8 +122,6 @@
 endmenu
 
 source drivers/pci/Config.in
-
-endmenu
 
 source drivers/mtd/Config.in
 

[Linuxconsole-commit]CVS: ruby/linux/arch/ppc64 config.in,1.6,1.7

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc64
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/ppc64

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.in	4 Jun 2002 19:45:05 -0000	1.6
+++ config.in	22 Jun 2002 17:50:58 -0000	1.7
@@ -47,9 +47,9 @@
    define_bool CONFIG_KCORE_ELF y
 fi
 
-bool 'Kernel Support for 64 bit ELF binaries' CONFIG_BINFMT_ELF
+bool 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF
 
-tristate 'Kernel support for 32 bit binaries' CONFIG_BINFMT_ELF32
+tristate 'Kernel support for 32-bit ELF binaries' CONFIG_BINFMT_ELF32
 
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 

[Linuxconsole-commit]CVS: ruby/linux/drivers/char Config.in,1.41,1.42 Makefile,1.44,1.45

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/drivers/char

Modified Files:
	Config.in Makefile 
Log Message:
Synced to 2.5.24

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Config.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Config.in	18 Jun 2002 18:51:55 -0000	1.41
+++ Config.in	22 Jun 2002 17:50:58 -0000	1.42
@@ -128,7 +128,7 @@
 bool 'Watchdog Timer Support'	CONFIG_WATCHDOG
 if [ "$CONFIG_WATCHDOG" != "n" ]; then
    bool '  Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
-   tristate '  Software Watchdog' CONFIG_SOFT_WATCHDOG
+   tristate '  Software watchdog' CONFIG_SOFT_WATCHDOG
    tristate '  WDT Watchdog timer' CONFIG_WDT
    tristate '  WDT PCI Watchdog timer' CONFIG_WDTPCI
    if [ "$CONFIG_WDT" != "n" ]; then
@@ -172,14 +172,14 @@
    bool 'EFI Real Time Clock Services' CONFIG_EFI_RTC
 fi
 if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
-   bool 'Tadpole ANA H8 Support'  CONFIG_H8
+   bool 'Tadpole ANA H8 Support (OBSOLETE)'  CONFIG_H8
 fi
 
 tristate 'Double Talk PC internal speech card support' CONFIG_DTLK
 tristate 'Siemens R3964 line discipline' CONFIG_R3964
 tristate 'Applicom intelligent fieldbus card support' CONFIG_APPLICOM
 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_X86" = "y" ]; then
-   dep_tristate 'Sony Vaio Programmable I/O Control Device support' CONFIG_SONYPI $CONFIG_PCI
+   dep_tristate 'Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)' CONFIG_SONYPI $CONFIG_PCI
 fi
 
 mainmenu_option next_comment

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile	18 Jun 2002 18:51:55 -0000	1.44
+++ Makefile	22 Jun 2002 17:50:59 -0000	1.45
@@ -111,13 +111,11 @@
 
 include $(TOPDIR)/Rules.make
 
-consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
-	./conmakehash $< > $@
-
-.DELETE_ON_ERROR:
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
+	$(obj)/conmakehash $< > $@
 
-defkeymap.c: defkeymap.map
+$(obj)/defkeymap.c: $(src)/defkeymap.map
 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
 
-qtronixmap.c: qtronixmap.map
+$(obj)/qtronixmap.c: $(src)/qtronixmap.map
 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@

[Linuxconsole-commit]CVS: ruby/linux/arch/sparc config.in,1.27,1.28

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/sparc
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/sparc

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/sparc/config.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- config.in	3 May 2002 22:16:46 -0000	1.27
+++ config.in	22 Jun 2002 17:50:58 -0000	1.28
@@ -171,7 +171,7 @@
           tristate '  Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
         fi
       fi
-      tristate '  PPP (point-to-point) support' CONFIG_PPP
+      tristate '  PPP (point-to-point protocol) support' CONFIG_PPP
       if [ ! "$CONFIG_PPP" = "n" ]; then
         dep_tristate '  PPP support for async serial ports' CONFIG_PPP_ASYNC $CONFIG_PPP
         dep_tristate '  PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP

[Linuxconsole-commit]CVS: ruby/linux/drivers/video Makefile,1.49,1.50

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/drivers/video

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.24

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Makefile,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Makefile	15 Jun 2002 19:17:10 -0000	1.49
+++ Makefile	22 Jun 2002 17:50:59 -0000	1.50
@@ -1,5 +1,5 @@
 # Makefile for the Linux video drivers.
-# 5 Aug 1999, James Simmons, <mailto:jsi...@tr...>
+# 5 Aug 1999, James Simmons, <mailto:jsi...@us...>
 # Rewritten to use lists instead of if-statements.
 
 O_TARGET := video.o
@@ -105,15 +105,9 @@
 
 include $(TOPDIR)/Rules.make
 
-clean:
-	rm -f core *.o *.a *.s
-
-host-progs := ../conmakehash
-
-promcon_tbl.c: prom.uni ../char/conmakehash
-	../char/conmakehash prom.uni | \
-	sed -e '/#include <[^>]*>/p' -e 's/types/init/' \
-	    -e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > promcon_tbl.c
-
-promcon_tbl.o: promcon_tbl.c $(TOPDIR)/include/linux/types.h
+host-progs := ../char/conmakehash
 
+$(obj)/promcon_tbl.c: $(src)/prom.uni $(obj)/../char/conmakehash
+	$(obj)/../char/conmakehash $< | \
+	sed -e '/#include <[^>]*>/p' -e 's/types/init/' \	
+	    -e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > $@	

[Linuxconsole-commit]CVS: ruby/linux/arch/ia64 config.in,1.25,1.26

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/ia64
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/ia64

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ia64/config.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- config.in	3 Jun 2002 22:44:55 -0000	1.25
+++ config.in	22 Jun 2002 17:50:58 -0000	1.26
@@ -64,12 +64,12 @@
 	fi
 fi
 
-if [ "$CONFIG_IA64_GENERIC" = "y" ] || [ "$CONFIG_IA64_DIG" = "y" ] || [ "$CONFIG_IA64_HP_ZX1" = "y" ]; then
+if [ "$CONFIG_IA64_GENERIC" = "y" -o  "$CONFIG_IA64_DIG" = "y" -o "$CONFIG_IA64_HP_ZX1" = "y" ]; then
 	bool '  Enable IA-64 Machine Check Abort' CONFIG_IA64_MCA
 	define_bool CONFIG_PM y
 fi
 
-if [ "$CONFIG_IA64_SGI_SN1" = "y" ] || [ "$CONFIG_IA64_SGI_SN2" = "y" ]; then
+if [ "$CONFIG_IA64_SGI_SN1" = "y" -o  "$CONFIG_IA64_SGI_SN2" = "y" ]; then
 	define_bool CONFIG_IA64_SGI_SN y
 	bool '  Enable extra debugging code' CONFIG_IA64_SGI_SN_DEBUG n
 	bool '  Enable SGI Medusa Simulator Support' CONFIG_IA64_SGI_SN_SIM
@@ -187,7 +187,7 @@
 mainmenu_option next_comment
 comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)'
 
-bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
+bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
 if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
   source drivers/cdrom/Config.in
 fi

[Linuxconsole-commit]CVS: ruby/linux/arch/mips config.in,1.20,1.21

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/mips

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- config.in	24 Apr 2002 18:56:50 -0000	1.20
+++ config.in	22 Jun 2002 17:50:58 -0000	1.21
@@ -386,7 +386,6 @@
 fi
 endmenu
 
-source drivers/usb/Config.in
 source drivers/input/Config.in
 source drivers/char/Config.in
 
@@ -412,12 +411,14 @@
 #      bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE
 #   fi
    bool 'Enhanced Real Time Clock Support' CONFIG_RTC
+
    endmenu
 fi
 
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
    mainmenu_option next_comment
    comment 'SGI Character devices'
+   
    bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
    if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
       int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
@@ -426,6 +427,7 @@
 fi
 
 source fs/Config.in
+
 source drivers/video/Config.in
 
 if [ "$CONFIG_DECSTATION" != "y" ]; then
@@ -442,6 +444,8 @@
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
    source drivers/sgi/Config.in
 fi
+
+source drivers/usb/Config.in
 
 mainmenu_option next_comment
 comment 'Kernel hacking'

[Linuxconsole-commit]CVS: ruby/linux/arch/arm config.in,1.27,1.28

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/arm
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/arm

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/arm/config.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- config.in	4 Jun 2002 19:45:04 -0000	1.27
+++ config.in	22 Jun 2002 17:50:57 -0000	1.28
@@ -66,7 +66,7 @@
    choice 'Cerf Flash available'  \
         "8MB    CONFIG_SA1100_CERF_FLASH_8MB \
          16MB   CONFIG_SA1100_CERF_FLASH_16MB \
-         32MB   CONFIG_SA1100_CERF_FLASH_32MB" CerfFlash
+         32MB   CONFIG_SA1100_CERF_FLASH_32MB" 8MB
    bool 'Cerf w/CPLD support (CerfPDA)' CONFIG_SA1100_CERF_CPLD
 fi
 dep_bool '  Compaq iPAQ H3100' CONFIG_SA1100_H3100 $CONFIG_ARCH_SA1100
@@ -341,7 +341,7 @@
 if [ "$CONFIG_CPU_ARM720T" = "y" -o "$CONFIG_CPU_ARM920T" = "y" -o \
      "$CONFIG_CPU_ARM922T" = "y" -o "$CONFIG_CPU_ARM926T" = "y" -o \
      "$CONFIG_CPU_ARM1020" = "y" -o "$CONFIG_CPU_XSCALE" = "y" ]; then
-   dep_bool 'Support Thumb instructions (experimental)' CONFIG_ARM_THUMB $CONFIG_EXPERIMENTAL
+   dep_bool 'Support Thumb instructions (EXPERIMENTAL)' CONFIG_ARM_THUMB $CONFIG_EXPERIMENTAL
 fi
 if [ "$CONFIG_CPU_ARM920T" = "y" -o "$CONFIG_CPU_ARM922T" = "y" -o \
      "$CONFIG_CPU_ARM926T" = "y" -o "$CONFIG_CPU_ARM1020" = "y" ]; then
@@ -440,7 +440,7 @@
 fi
 
 source drivers/pci/Config.in
-bool 'Support hot-pluggable devices' CONFIG_HOTPLUG
+bool 'Support for hot-pluggable devices' CONFIG_HOTPLUG
 if [ "$CONFIG_HOTPLUG" = "y" ]; then
    source drivers/pcmcia/Config.in
 else
@@ -449,7 +449,7 @@
 comment 'At least one math emulation must be selected'
 tristate 'NWFPE math emulation' CONFIG_FPE_NWFPE
 if [ "$CONFIG_CPU_26" = "n" -a "$CONFIG_CPU_32v3" = "n" ]; then
-   dep_tristate 'FastFPE math emulation (experimental)' CONFIG_FPE_FASTFPE $CONFIG_EXPERIMENTAL
+   dep_tristate 'FastFPE math emulation (EXPERIMENTAL)' CONFIG_FPE_FASTFPE $CONFIG_EXPERIMENTAL
 fi
 choice 'Kernel core (/proc/kcore) format' \
 	"ELF		CONFIG_KCORE_ELF	\
@@ -458,7 +458,7 @@
 tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 bool 'Power Management support' CONFIG_PM
-dep_bool 'Preemptible Kernel (experimental)' CONFIG_PREEMPT $CONFIG_CPU_32 $CONFIG_EXPERIMENTAL
+dep_bool 'Preemptible Kernel (EXPERIMENTAL)' CONFIG_PREEMPT $CONFIG_CPU_32 $CONFIG_EXPERIMENTAL
 dep_tristate 'Advanced Power Management Emulation' CONFIG_APM $CONFIG_PM
 dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
 string 'Default kernel command string' CONFIG_CMDLINE ""
@@ -520,7 +520,7 @@
    mainmenu_option next_comment
    comment 'Network device support'
 
-   bool 'Network device support?' CONFIG_NETDEVICES
+   bool 'Network device support' CONFIG_NETDEVICES
    if [ "$CONFIG_NETDEVICES" = "y" ]; then
       source drivers/net/Config.in
    fi
@@ -546,7 +546,7 @@
 mainmenu_option next_comment
 comment 'SCSI support'
 
-tristate 'SCSI support?' CONFIG_SCSI
+tristate 'SCSI support' CONFIG_SCSI
 
 if [ "$CONFIG_SCSI" != "n" ]; then
    source drivers/scsi/Config.in
@@ -584,7 +584,7 @@
    mainmenu_option next_comment
    comment 'Sound'
 
-   tristate 'Sound support' CONFIG_SOUND
+   tristate 'Sound card support' CONFIG_SOUND
    if [ "$CONFIG_SOUND" != "n" ]; then
       source sound/Config.in
    fi