diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 11:03:03 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 11:03:03 +0100 |
| commit | 90889a635a9b5488624bccce3ff6b2eec68c007b (patch) | |
| tree | 8ddde1e04060bd65ca2aafb09b38066cb7d69b4d /drivers/rtc/Makefile | |
| parent | Merge branch 'timers/for-arm' into timers/core (diff) | |
| parent | timekeeping: Switch HAS_PERSISTENT_CLOCK to ALWAYS_USE_PERSISTENT_CLOCK (diff) | |
| download | linux-90889a635a9b5488624bccce3ff6b2eec68c007b.tar.xz linux-90889a635a9b5488624bccce3ff6b2eec68c007b.zip | |
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Trivial conflict in arch/x86/Kconfig
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/rtc/Makefile')
| -rw-r--r-- | drivers/rtc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 4418ef3f9ecc..ec2988b00a44 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -6,6 +6,7 @@ ccflags-$(CONFIG_RTC_DEBUG) := -DDEBUG obj-$(CONFIG_RTC_LIB) += rtc-lib.o obj-$(CONFIG_RTC_HCTOSYS) += hctosys.o +obj-$(CONFIG_RTC_SYSTOHC) += systohc.o obj-$(CONFIG_RTC_CLASS) += rtc-core.o rtc-core-y := class.o interface.o |