From fdfd496fc79b70de186d4b46d827463e0c871400 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Mon, 7 Jun 2010 18:49:19 +0100 Subject: [PATCH] --- yaml --- r: 200801 b: refs/heads/master c: cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09 h: refs/heads/master i: 200799: 2d8fbfac56368ea3c8137b27b27528e441a3a021 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-pxa/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 166ff2af6b80..b306f4260621 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dbed71ad1ab0636745af958934f1ca670702ca0 +refs/heads/master: cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09 diff --git a/trunk/arch/arm/plat-pxa/Makefile b/trunk/arch/arm/plat-pxa/Makefile index 6187edfbcb77..a17cc0c6a6b0 100644 --- a/trunk/arch/arm/plat-pxa/Makefile +++ b/trunk/arch/arm/plat-pxa/Makefile @@ -2,8 +2,9 @@ # Makefile for code common across different PXA processor families # -obj-y := dma.o pmu.o +obj-y := dma.o +obj-$(CONFIG_ARCH_PXA) += pmu.o obj-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o