diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-07-22 03:37:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-24 16:24:32 -0400 |
| commit | 2240598c24683df1e1a6cdd1f461efd85547903c (patch) | |
| tree | 9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8 /drivers/char/Makefile | |
| parent | b8c1c5da1520977cb55a358f20fc09567d40cad9 (diff) | |
[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/Makefile | 3 |
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/ | |||
| 109 | 109 | ||
| 110 | obj-$(CONFIG_PS3_FLASH) += ps3flash.o | 110 | obj-$(CONFIG_PS3_FLASH) += ps3flash.o |
| 111 | 111 | ||
| 112 | obj-$(CONFIG_JS_RTC) += js-rtc.o | ||
| 113 | js-rtc-y = rtc.o | ||
| 114 | |||
| 112 | # Files generated that shall be removed upon make clean | 115 | # Files generated that shall be removed upon make clean |
| 113 | clean-files := consolemap_deftbl.c defkeymap.c | 116 | clean-files := consolemap_deftbl.c defkeymap.c |
| 114 | 117 | ||