diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 15:57:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 15:57:45 -0500 |
| commit | 756fe285070feb254a770cefc5640fe005ea9c27 (patch) | |
| tree | c391c039bc8ef7ec6958017413aba250210e9af6 /arch/arm/mach-footbridge/Makefile | |
| parent | eec74a410fafd32c8f832d47dc196006ade68d05 (diff) | |
| parent | ed5a35acbb48d512332a53565e6341c65eecfa29 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: cyberpro: pci_request_regions needs a persistent name
ARM: dma-isa: request cascade channel after registering it
ARM: footbridge: trim down old ISA rtc setup
ARM: fix PAGE_KERNEL
ARM: Fix wrong shared bit for CPU write buffer bug test
ARM: 5857/1: ARM: dmabounce: fix build
ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
ARM: 5855/1: putc support for nuc900
ARM: 5854/1: fix compiling error for NUC900
ARM: 5849/1: ARMv7: fix Oprofile events count
ARM: add missing include to nwflash.c
ARM: Kill CONFIG_CPU_32
ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
Diffstat (limited to 'arch/arm/mach-footbridge/Makefile')
| -rw-r--r-- | arch/arm/mach-footbridge/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile index 32f8609e4f85..3afb1b25946f 100644 --- a/arch/arm/mach-footbridge/Makefile +++ b/arch/arm/mach-footbridge/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | # Object file lists. | 5 | # Object file lists. |
| 6 | 6 | ||
| 7 | obj-y := common.o dc21285.o dma.o isa-irq.o time.o | 7 | obj-y := common.o dc21285.o dma.o isa-irq.o |
| 8 | obj-m := | 8 | obj-m := |
| 9 | obj-n := | 9 | obj-n := |
| 10 | obj- := | 10 | obj- := |
| @@ -25,4 +25,4 @@ obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o | |||
| 25 | obj-$(CONFIG_PCI) +=$(pci-y) | 25 | obj-$(CONFIG_PCI) +=$(pci-y) |
| 26 | obj-$(CONFIG_LEDS) +=$(leds-y) | 26 | obj-$(CONFIG_LEDS) +=$(leds-y) |
| 27 | 27 | ||
| 28 | obj-$(CONFIG_ISA) += isa.o | 28 | obj-$(CONFIG_ISA) += isa.o isa-rtc.o |