[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;