From 2240598c24683df1e1a6cdd1f461efd85547903c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 22 Jul 2007 00:37:48 -0700
Subject: [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 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'drivers/char/Makefile')

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 8fecaf4010b..23b26b87cc3 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
 
-- 
cgit v1.2.3