---

yaml --- r: 60549 b: refs/heads/master c: 1a06e0f h: refs/heads/master i: 60547: c02d4c0 v: v3
git-mirror · Jun 25, 2007 · 41e028b · 41e028b
1 parent 61448af
commit 41e028b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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