Commit:     1a06e0fe96526e43bab90fbab2263b55fb3d45d1
Parent:     8fa336d889caa72637e0860f53fa40ef66dcceaf
Author:     Guennadi Liakhovetski <[EMAIL PROTECTED]>
AuthorDate: Thu May 17 18:56:32 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon Jun 25 16:58:07 2007 +1000

    [POWERPC] Don't link timer.o for powerpc systems using generic rtc
    With both generic rtc and powerpc timer suspend / resume code now in the
    (powerpc.git) tree, powerpc platforms using the generic timer and enabling
    power management will have timer.o linked in the kernel, which they don't
    need. Moreover, it will likely WARN_ON(!ppc_md.get_rtc_time), save
    zero-time and return no error on suspend...
    As a possible solution we can choose not to build timer.o when RTC_CLASS
    is enabled.  However, I can imagine systems with 2 rtc's, one served by the
    ppc-rtc, another one generic built as a module, in which case using the
    ppc-rtc for suspend / resume will be impossible.  Not to say, that such a
    configuration would be ugly...
    Signed-off-by: G. Liakhovetski <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/sysdev/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index c3ce0bd..31da3b3 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -20,7 +20,9 @@ mv64x60-$(CONFIG_PCI)         += mv64x60_pci.o
 obj-$(CONFIG_MV64X60)          += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
 # contains only the suspend handler for time
+ifeq ($(CONFIG_RTC_CLASS),)
 obj-$(CONFIG_PM)               += timer.o
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_I8259)                += i8259.o
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to