commit 2240598c24683df1e1a6cdd1f461efd85547903c
author Al Viro <viro@zeniv.linux.org.uk> Sun Jul 22 00:37:48 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Tue Jul 24 13:24:32 2007 -0700
tree 9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8
parent b8c1c5da1520977cb55a358f20fc09567d40cad9

[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>

drivers/char/Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 8fecaf4..23b26b8 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -109,6 +109,9 @@
 
 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