diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 18:57:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 18:57:43 -0400 |
| commit | 9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe (patch) | |
| tree | b1797d88eb6ea57e618a68a23b960e4176449926 /drivers/char/Makefile | |
| parent | 03746bad30890284cc14fc39184c5b60b9cb8bc9 (diff) | |
| parent | 1966287dfa07b2aa125009587a5d2b8375775c53 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok
[SPARC32]: Fix bug in sparc optimized memset.
[SPARC64]: Update defconfig.
[SPARC]: Add missing NOTES section.
[SPARC32]: missing exports
[SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
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 | ||