From 96af957eaa91a9640270e5284e324d84c9da4d19 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 12 Jun 2008 15:21:55 -0700 Subject: [PATCH] --- yaml --- r: 98070 b: refs/heads/master c: e6d2bb2bacb43ff03b0f458108d71981d58e775a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/Kconfig | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7184261ac5a4..ffa77236bce6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1da2e3d679a8ea2d9e82040359a706da0bd3bef6 +refs/heads/master: e6d2bb2bacb43ff03b0f458108d71981d58e775a diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig index d307bf26af58..2d854bb9373e 100644 --- a/trunk/drivers/char/Kconfig +++ b/trunk/drivers/char/Kconfig @@ -749,7 +749,7 @@ config NVRAM if RTC_LIB=n config RTC - tristate "Enhanced Real Time Clock Support" + tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \ && !ARM && !SUPERH && !S390 && !AVR32 ---help--- @@ -1036,9 +1036,9 @@ config HPET non-periodic and/or periodic. config HPET_RTC_IRQ - bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC - default n - depends on HPET + bool + default HPET_EMULATE_RTC + depends on RTC && HPET help If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It is assumed the platform called hpet_alloc with the RTC IRQ values for