[LV-k25-commit] kernel-2.5/drivers/char Makefile,1.45,1.46

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17159

Modified Files:
	Makefile 
Log Message:
Merge with 2.6.10

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile	20 Nov 2004 12:33:03 -0000	1.45
+++ Makefile	21 Mar 2005 23:29:55 -0000	1.46
@@ -63,6 +63,8 @@
 obj-$(CONFIG_EFI_RTC) += efirtc.o
 obj-$(CONFIG_SGI_DS1286) += ds1286.o
 obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
+obj-$(CONFIG_DS1302) += ds1302.o
+obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
   obj-$(CONFIG_NVRAM) += generic_nvram.o
 else