Re: [rtc-linux] [PATCH 3/5] drivers/rtc: Remove unneeded ifdef CONFIG_PM

[Wan ZongShun]

2010/7/14 Christian Dietrich <qy03fugy@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>:
> Because CONFIG_PM is a precondition to CONFIG_ACPI, the ifdef
> CONFIG_PM within ifdef CONFIG_ACPI is redundant.

If you don't have other specific tree to merge your patch,
please get Andrew's help to do this.

Acked-by: Wan ZongShun <mcuos.com@xxxxxxxxx>


>
> Signed-off-by: Christian Dietrich <qy03fugy@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
> Â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 <linux/acpi.h>
>
> -#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
> --
> 1.7.0.4
>
> --
> You received this message because you are subscribed to "rtc-linux".
> Membership options at http://groups.google.com/group/rtc-linux .
> Please read http://groups.google.com/group/rtc-linux/web/checklist
> before submitting a driver.



-- 
*linux-arm-kernel mailing list
mail addr:linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
you can subscribe by:
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

* linux-arm-NUC900 mailing list
mail addr:NUC900@xxxxxxxxxxxxxxxx
main web: https://groups.google.com/group/NUC900
you can subscribe it by sending me mail:
mcuos.com@xxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/