diff options
author | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 21:15:56 (GMT) |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 21:15:56 (GMT) |
commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 (patch) | |
tree | e607db32fd303246ee9b93af83a611fc7b93479a /drivers/rtc/Kconfig | |
parent | fe82dcec644244676d55a1384c958d5f67979adb (diff) | |
parent | 7efe665903d0d963b0ebf4cab25cc3ae32c62600 (diff) | |
download | linux-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.tar.xz |
Merge branch 'next' into efi-next-merge
Conflicts:
arch/x86/boot/compressed/eboot.c
Diffstat (limited to 'drivers/rtc/Kconfig')
-rw-r--r-- | drivers/rtc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index a168e96..54ef393 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -806,7 +806,7 @@ config RTC_DRV_DA9063 config RTC_DRV_EFI tristate "EFI RTC" - depends on EFI + depends on EFI && !X86 help If you say yes here you will get support for the EFI Real Time Clock. |