Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv24069/drivers/char
Modified Files:
Makefile tty_io.c
Removed Files:
acquirewdt.c advantechwdt.c eurotechwdt.c i810-tco.c
ib700wdt.c machzwd.c mixcomwd.c pcwd.c sbc60xxwdt.c
scx200_wdt.c shwdt.c softdog.c w83877f_wdt.c wdt.c wdt285.c
wdt977.c wdt_pci.c
Log Message:
Merge with 2.5.49
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile 11 May 2003 20:28:22 -0000 1.29
+++ Makefile 22 Jun 2003 16:18:53 -0000 1.30
@@ -79,31 +79,12 @@
obj-$(CONFIG_NWFLASH) += nwflash.o
obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
-# Only one watchdog can succeed. We probe the hardware watchdog
-# drivers first, then the softdog driver. This means if your hardware
-# watchdog dies or is 'borrowed' for some reason the software watchdog
-# still gives you some cover.
-
-obj-$(CONFIG_PCWATCHDOG) += pcwd.o
-obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
-obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
-obj-$(CONFIG_IB700_WDT) += ib700wdt.o
-obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
-obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
-obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
-obj-$(CONFIG_WDT) += wdt.o
-obj-$(CONFIG_WDTPCI) += wdt_pci.o
-obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
-obj-$(CONFIG_977_WATCHDOG) += wdt977.o
-obj-$(CONFIG_I810_TCO) += i810-tco.o
-obj-$(CONFIG_MACHZ_WDT) += machzwd.o
-obj-$(CONFIG_SH_WDT) += shwdt.o
-obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
-obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+obj-$(CONFIG_WATCHDOGS) += watchdog/
obj-$(CONFIG_MWAVE) += mwave/
obj-$(CONFIG_AGP) += agp/
obj-$(CONFIG_DRM) += drm/
obj-$(CONFIG_PCMCIA) += pcmcia/
+
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tty_io.c 19 Jun 2003 23:31:47 -0000 1.13
+++ tty_io.c 22 Jun 2003 16:18:53 -0000 1.14
@@ -146,10 +146,9 @@
extern void console_8xx_init(void);
extern int rs_8xx_init(void);
extern void mac_scc_console_init(void);
-extern void hwc_console_init(void);
-extern void hwc_tty_init(void);
+extern void sclp_console_init(void);
+extern void sclp_tty_init(void);
extern void con3215_init(void);
-extern void tty3215_init(void);
extern void tub3270_con_init(void);
extern void tub3270_init(void);
extern void uart_console_init(void);
@@ -2210,8 +2209,8 @@
#ifdef CONFIG_TN3215
con3215_init();
#endif
-#ifdef CONFIG_HWC
- hwc_console_init();
+#ifdef CONFIG_SCLP_CONSOLE
+ sclp_console_init();
#endif
#ifdef CONFIG_STDIO_CONSOLE
stdio_console_init();
@@ -2351,8 +2350,8 @@
#ifdef CONFIG_TN3215
tty3215_init();
#endif
-#ifdef CONFIG_HWC
- hwc_tty_init();
+#ifdef CONFIG_SCLP
+ sclp_tty_init();
#endif
#ifdef CONFIG_A2232
a2232board_init();
--- acquirewdt.c DELETED ---
--- advantechwdt.c DELETED ---
--- eurotechwdt.c DELETED ---
--- i810-tco.c DELETED ---
--- ib700wdt.c DELETED ---
--- machzwd.c DELETED ---
--- mixcomwd.c DELETED ---
--- pcwd.c DELETED ---
--- sbc60xxwdt.c DELETED ---
--- scx200_wdt.c DELETED ---
--- shwdt.c DELETED ---
--- softdog.c DELETED ---
--- w83877f_wdt.c DELETED ---
--- wdt.c DELETED ---
--- wdt285.c DELETED ---
--- wdt977.c DELETED ---
--- wdt_pci.c DELETED ---
|