Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[sfrench/cifs-2.6.git] / drivers / char / Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 2bc3a55ee407523d342d7c7bcd71a9d6bfb9ac96..d68ddbe70f737414a876c9f52cf1417223cbe8b7 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -108,6 +108,9 @@ obj-$(CONFIG_TCG_TPM)               += tpm/
 
 obj-$(CONFIG_PS3_FLASH)                += ps3flash.o
 
+obj-$(CONFIG_JS_RTC)           += js-rtc.o
+js-rtc-y = rtc.o
+
 # Files generated that shall be removed upon make clean
 clean-files := consolemap_deftbl.c defkeymap.c