diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 05:16:00 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 05:16:04 -0400 |
| commit | fb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5 (patch) | |
| tree | 1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b /arch/arm/plat-pxa | |
| parent | 8954bb0da99b76c7ce5edf2f314807cff68b6ea8 (diff) | |
| parent | cdb4acc0568f4f6e10e778f0c2cd04fcd4786c09 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/plat-pxa')
| -rw-r--r-- | arch/arm/plat-pxa/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index 6187edfbcb7..a17cc0c6a6b 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile | |||
| @@ -2,8 +2,9 @@ | |||
| 2 | # Makefile for code common across different PXA processor families | 2 | # Makefile for code common across different PXA processor families |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := dma.o pmu.o | 5 | obj-y := dma.o |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_ARCH_PXA) += pmu.o | ||
| 7 | obj-$(CONFIG_GENERIC_GPIO) += gpio.o | 8 | obj-$(CONFIG_GENERIC_GPIO) += gpio.o |
| 8 | obj-$(CONFIG_PXA3xx) += mfp.o | 9 | obj-$(CONFIG_PXA3xx) += mfp.o |
| 9 | obj-$(CONFIG_ARCH_MMP) += mfp.o | 10 | obj-$(CONFIG_ARCH_MMP) += mfp.o |