diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-22 18:58:46 +0300 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-22 19:09:03 +0300 |
commit | 710f957846cff998c681f3701f6f90eda896458f (patch) | |
tree | ba22ee7b469dd0cee974019cc32630838691f3af /drivers/rtc/Kconfig | |
parent | e953fd7bb32f55309a96abd5ceba9cf68d221434 (diff) | |
parent | 011b9910bdaf2e52c48c012490ab444fceea1959 (diff) | |
download | linux-710f957846cff998c681f3701f6f90eda896458f.tar.xz |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge in the conflicting eDP fix.
Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/rtc/Kconfig')
-rw-r--r-- | drivers/rtc/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index cdd97192dc69..4941cade319f 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -97,6 +97,18 @@ config RTC_INTF_DEV If unsure, say Y. +config RTC_INTF_DEV_UIE_EMUL + bool "RTC UIE emulation on dev interface" + depends on RTC_INTF_DEV + help + Provides an emulation for RTC_UIE if the underlying rtc chip + driver does not expose RTC_UIE ioctls. Those requests generate + once-per-second update interrupts, used for synchronization. + + The emulation code will read the time from the hardware + clock several times per second, please enable this option + only if you know that you really need it. + config RTC_DRV_TEST tristate "Test driver/device" help |