summaryrefslogtreecommitdiffstats
path: root/drivers/char/Makefile
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-07-22 00:37:48 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-24 13:24:32 -0700
commit2240598c24683df1e1a6cdd1f461efd85547903c (patch)
tree9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8 /drivers/char/Makefile
parentb8c1c5da1520977cb55a358f20fc09567d40cad9 (diff)
downloadlinux-2240598c24683df1e1a6cdd1f461efd85547903c.tar.bz2
[SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r--drivers/char/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 8fecaf4010b1..23b26b87cc32 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -109,6 +109,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