From 5bc6d89e9af967f6b9be532abde36139435072a2 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 10 Aug 2010 18:02:22 -0700 Subject: [PATCH] --- yaml --- r: 208473 b: refs/heads/master c: de639c311689f4dbf3f9df734a8243e7e44b79da h: refs/heads/master i: 208471: bc6e05ac4b18871d7e69454d879abfb16692c078 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-cmos.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 63aec34c7c8c..7878e765324f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d23b2582fd0bc0a8cf3cfa4307f66281cacad4b +refs/heads/master: de639c311689f4dbf3f9df734a8243e7e44b79da diff --git a/trunk/drivers/rtc/rtc-cmos.c b/trunk/drivers/rtc/rtc-cmos.c index 11b8ea29d2b7..5856167a0c90 100644 --- a/trunk/drivers/rtc/rtc-cmos.c +++ b/trunk/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