Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv10947/drivers/char
Modified Files:
Makefile
Removed Files:
i810-tco.h wd501p.h
Log Message:
Merge with 2.5.50
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile 22 Jun 2003 16:18:53 -0000 1.30
+++ Makefile 26 Jun 2003 23:07:10 -0000 1.31
@@ -79,7 +79,7 @@
obj-$(CONFIG_NWFLASH) += nwflash.o
obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
-obj-$(CONFIG_WATCHDOGS) += watchdog/
+obj-$(CONFIG_WATCHDOG) += watchdog/
obj-$(CONFIG_MWAVE) += mwave/
obj-$(CONFIG_AGP) += agp/
obj-$(CONFIG_DRM) += drm/
--- i810-tco.h DELETED ---
--- wd501p.h DELETED ---
|
