diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 15:14:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 15:14:32 -0500 |
| commit | e696268a73f7f59a333624f9abf8ffc9412ee64c (patch) | |
| tree | dcbb2ae8df180303d391d7a8e22f58e9f3f3f46a /arch/arm/plat-iop/Makefile | |
| parent | 91aa69315ef9a76b8f734438617a2e32812b630f (diff) | |
| parent | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (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:
[ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT
[ARM] Fix s3c2410 ALSA audio for typedef elimination
[ARM] Fix ARM AACI ALSA driver
[ARM] fix mach-at91 build breakage
[ARM] Fix jornada720 build errors
[ARM] Fix iop13xx build error
[ARM] Fix build error caused by move of apm
[ARM] 4223/1: ixdp2351 : Fix for a define error
[ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx
[ARM] 4186/1: iop: remove cp6_enable/disable routines
[ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user
Diffstat (limited to 'arch/arm/plat-iop/Makefile')
| -rw-r--r-- | arch/arm/plat-iop/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile index 3250d732a171..4d2b1da3cd82 100644 --- a/arch/arm/plat-iop/Makefile +++ b/arch/arm/plat-iop/Makefile | |||
| @@ -24,6 +24,7 @@ obj-$(CONFIG_ARCH_IOP33X) += cp6.o | |||
| 24 | 24 | ||
| 25 | # IOP13XX | 25 | # IOP13XX |
| 26 | obj-$(CONFIG_ARCH_IOP13XX) += cp6.o | 26 | obj-$(CONFIG_ARCH_IOP13XX) += cp6.o |
| 27 | obj-$(CONFIG_ARCH_IOP13XX) += time.o | ||
| 27 | 28 | ||
| 28 | obj-m := | 29 | obj-m := |
| 29 | obj-n := | 30 | obj-n := |