diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:13:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:13:40 -0500 |
| commit | 9fc5c3e3237e02a94f41cd1d2b4291593d29791d (patch) | |
| tree | c8823725b10bd4d36e9311ea392dfdecb4db7974 /drivers/rtc/Kconfig | |
| parent | 541048a1d31399ccdda27346a37eae4a2ad55186 (diff) | |
| parent | 7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/intel config: Fix the APB_TIMER selection
x86/mrst: Add additional debug prints for pb_keys
x86/intel config: Revamp configuration to allow for Moorestown and Medfield
x86/intel/scu/ipc: Match the changes in the x86 configuration
x86/apb: Fix configuration constraints
x86: Fix INTEL_MID silly
x86/Kconfig: Cyclone-timer depends on x86-summit
x86: Reduce clock calibration time during slave cpu startup
x86/config: Revamp configuration for MID devices
x86/sfi: Kill the IRQ as id hack
Diffstat (limited to 'drivers/rtc/Kconfig')
| -rw-r--r-- | drivers/rtc/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 877cf6fdcf24..e19a4031f45e 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -498,9 +498,9 @@ config RTC_DRV_CMOS | |||
| 498 | will be called rtc-cmos. | 498 | will be called rtc-cmos. |
| 499 | 499 | ||
| 500 | config RTC_DRV_VRTC | 500 | config RTC_DRV_VRTC |
| 501 | tristate "Virtual RTC for Moorestown platforms" | 501 | tristate "Virtual RTC for Intel MID platforms" |
| 502 | depends on X86_MRST | 502 | depends on X86_INTEL_MID |
| 503 | default y if X86_MRST | 503 | default y if X86_INTEL_MID |
| 504 | 504 | ||
| 505 | help | 505 | help |
| 506 | Say "yes" here to get direct support for the real time clock | 506 | Say "yes" here to get direct support for the real time clock |