diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-20 02:10:40 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-20 02:10:40 +0300 |
| commit | 7d83f8fca517b123cf0136503a9e50974f65ec49 (patch) | |
| tree | 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e /arch/arm/mach-kirkwood/Makefile | |
| parent | be093beb608edf821b45fe00a8a080fb5c6ed4af (diff) | |
| parent | 569106c70e49ad67c69fa7d43a2a5218e63a4619 (diff) | |
| download | linux-7d83f8fca517b123cf0136503a9e50974f65ec49.tar.xz | |
Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:
arch/arm/mach-mx1/devices.c
Diffstat (limited to 'arch/arm/mach-kirkwood/Makefile')
| -rw-r--r-- | arch/arm/mach-kirkwood/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index b96c55dad343..de81b4b5bd33 100644 --- a/arch/arm/mach-kirkwood/Makefile +++ b/arch/arm/mach-kirkwood/Makefile @@ -1,5 +1,6 @@ -obj-y += common.o addr-map.o irq.o pcie.o +obj-y += common.o addr-map.o irq.o pcie.o mpp.o obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o +obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o |