diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/powerpc/kvm/Makefile | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/powerpc/kvm/Makefile')
| -rw-r--r-- | arch/powerpc/kvm/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index df7ba59e6d53..4b2df66c79d8 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile | |||
| @@ -16,8 +16,18 @@ AFLAGS_booke_interrupts.o := -I$(obj) | |||
| 16 | 16 | ||
| 17 | kvm-440-objs := \ | 17 | kvm-440-objs := \ |
| 18 | booke.o \ | 18 | booke.o \ |
| 19 | booke_emulate.o \ | ||
| 19 | booke_interrupts.o \ | 20 | booke_interrupts.o \ |
| 20 | 44x.o \ | 21 | 44x.o \ |
| 21 | 44x_tlb.o \ | 22 | 44x_tlb.o \ |
| 22 | 44x_emulate.o | 23 | 44x_emulate.o |
| 23 | obj-$(CONFIG_KVM_440) += kvm-440.o | 24 | obj-$(CONFIG_KVM_440) += kvm-440.o |
| 25 | |||
| 26 | kvm-e500-objs := \ | ||
| 27 | booke.o \ | ||
| 28 | booke_emulate.o \ | ||
| 29 | booke_interrupts.o \ | ||
| 30 | e500.o \ | ||
| 31 | e500_tlb.o \ | ||
| 32 | e500_emulate.o | ||
| 33 | obj-$(CONFIG_KVM_E500) += kvm-e500.o | ||