diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 22:28:04 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 22:28:04 +0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/plat-orion/Makefile | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
| download | linux-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.xz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
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- := |