From 41e028be6d8551d4c0d8d78c464237aba0ca5801 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 17 May 2007 18:56:32 +1000
Subject: [PATCH] --- yaml --- r: 60549 b: refs/heads/master c:
 1a06e0fe96526e43bab90fbab2263b55fb3d45d1 h: refs/heads/master i:   60547:
 c02d4c0981db96fd0fa4778c599bf1d94f7592b8 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/sysdev/Makefile | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c905a27be753..bd0582a2df74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fa336d889caa72637e0860f53fa40ef66dcceaf
+refs/heads/master: 1a06e0fe96526e43bab90fbab2263b55fb3d45d1
diff --git a/trunk/arch/powerpc/sysdev/Makefile b/trunk/arch/powerpc/sysdev/Makefile
index c3ce0bd12c0b..31da3b3dc993 100644
--- a/trunk/arch/powerpc/sysdev/Makefile
+++ b/trunk/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
+endif
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_I8259)		+= i8259.o