diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-16 23:06:49 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-16 23:06:49 +0100 |
| commit | 1e87347c2f6e124d73b4921c4580adad4ac534d6 (patch) | |
| tree | 9c548931dced2383c7eb8978b4fb2696a46d1a49 /arch/arm/plat-orion/Makefile | |
| parent | f29251ff532ca1124d14a03b040ba097edc6e9c0 (diff) | |
| parent | 3cff484d4b264ff467a3b45c544cbbbab69f0bf8 (diff) | |
| download | talos-obmc-linux-1e87347c2f6e124d73b4921c4580adad4ac534d6.tar.gz talos-obmc-linux-1e87347c2f6e124d73b4921c4580adad4ac534d6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'arch/arm/plat-orion/Makefile')
| -rw-r--r-- | arch/arm/plat-orion/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile index 56021a72e10c..95a5fc53b6db 100644 --- a/arch/arm/plat-orion/Makefile +++ b/arch/arm/plat-orion/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -obj-y := irq.o pcie.o time.o +obj-y := irq.o pcie.o time.o common.o mpp.o obj-m := obj-n := obj- := |
