From patchwork Wed Jul 14 14:04:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/5] drivers/rtc: Remove unneeded ifdef CONFIG_PM Date: Wed, 14 Jul 2010 04:04:43 -0000 From: Christian Dietrich X-Patchwork-Id: 58904 Message-Id: <1768dbd136598aa52607378cdc7ba7b7870ab263.1279116162.git.qy03fugy@stud.informatik.uni-erlangen.de> To: Alessandro Zummo , Paul Gortmaker , Andrew Morton , Ralf Baechle , Chris Wright , Arnaud Patard , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Cc: vamos-dev@i4.informatik.uni-erlangen.de Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef CONFIG_PM within ifdef CONFIG_ACPI is redundant. Signed-off-by: Christian Dietrich Acked-by: Wan ZongShun --- drivers/rtc/rtc-cmos.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 11b8ea2..5856167 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -970,7 +970,6 @@ static inline int cmos_poweroff(struct device *dev) #include -#ifdef CONFIG_PM static u32 rtc_handler(void *context) { acpi_clear_event(ACPI_EVENT_RTC); @@ -999,11 +998,6 @@ static void rtc_wake_off(struct device *dev) { acpi_disable_event(ACPI_EVENT_RTC, 0); } -#else -#define rtc_wake_setup() do{}while(0) -#define rtc_wake_on NULL -#define rtc_wake_off NULL -#endif /* Every ACPI platform has a mc146818 compatible "cmos rtc". Here we find * its device node and pass extra config data. This helps its driver use