diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 21:43:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 21:43:01 +0100 |
| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch) | |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b /arch/arm/mach-pxa/Makefile | |
| parent | a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 (diff) | |
| parent | 938870491f0cad030b358af47e28d124b72702d1 (diff) | |
| download | blackbird-op-linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.tar.gz blackbird-op-linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.zip | |
Merge branch 'pxa-tosa' into pxa
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-pxa/Makefile')
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 0865236513c7..b282412a01f5 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -4,7 +4,7 @@ # Common support (must be linked before board specific support) obj-y += clock.o devices.o generic.o irq.o dma.o \ - time.o gpio.o + time.o gpio.o reset.o obj-$(CONFIG_PM) += pm.o sleep.o standby.o obj-$(CONFIG_CPU_FREQ) += cpu-pxa.o @@ -61,3 +61,5 @@ obj-$(CONFIG_LEDS) += $(led-y) ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o endif + +obj-$(CONFIG_TOSA_BT) += tosa-bt.o |
