Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / char / Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 4e6f387fd18909d1cf0bba7f4d1ed4e22a30c7b5..23b26b87cc3296e1cd9ecc97ed37633a6ec78f1f 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -107,6 +107,11 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/
 obj-$(CONFIG_HANGCHECK_TIMER)  += hangcheck-timer.o
 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