Skip to content

Commit

Permalink
drivers/rtc: remove unneeded ifdef CONFIG_PM
Browse files Browse the repository at this point in the history
Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef CONFIG_PM
within ifdef CONFIG_ACPI is redundant.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Christian Dietrich authored and Linus Torvalds committed Aug 11, 2010
1 parent 6d23b25 commit de639c3
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/rtc/rtc-cmos.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,6 @@ static inline int cmos_poweroff(struct device *dev)

#include <linux/acpi.h>

#ifdef CONFIG_PM
static u32 rtc_handler(void *context)
{
acpi_clear_event(ACPI_EVENT_RTC);
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit de639c3

Please sign in to comment.