summaryrefslogtreecommitdiffstats
path: root/drivers/char/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-30 20:57:51 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-06-04 00:20:07 +0200
commit463a86304cae92e10277b47180ac59cf93982e5b (patch)
tree06db025f072518df97d2127a67dd921024d0838b /drivers/char/Kconfig
parent5ab788d7383289bfc141ab357767bc6c11bbf77f (diff)
downloadblackbird-op-linux-463a86304cae92e10277b47180ac59cf93982e5b.tar.gz
blackbird-op-linux-463a86304cae92e10277b47180ac59cf93982e5b.zip
char/genrtc: x86: remove remnants of asm/rtc.h
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had the side-effect of unconditionally enabling the RTC_LIB symbol on x86, which in turn disables the selection of the CONFIG_RTC and CONFIG_GEN_RTC drivers that contain a two older implementations of the CONFIG_RTC_DRV_CMOS driver. This removes x86 from the list for genrtc, and changes all references to the asm/rtc.h header to instead point to the interfaces from linux/mc146818rtc.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r--drivers/char/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 601f64fcc890..31b5861649ee 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86
+ depends on ALPHA || M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
OpenPOWER on IntegriCloud