diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /arch/powerpc/kvm/Makefile | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.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 | ||