diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 08:53:38 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 08:53:38 +0200 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/x86/Kbuild | |
| parent | powerpc: Fix bug in move of altivec code to vector.S (diff) | |
| parent | block: fix kernel-doc in recent block/ changes (diff) | |
| download | linux-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.tar.xz linux-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.zip | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'arch/x86/Kbuild')
| -rw-r--r-- | arch/x86/Kbuild | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild new file mode 100644 index 000000000000..ad8ec356fb36 --- /dev/null +++ b/arch/x86/Kbuild @@ -0,0 +1,16 @@ + +obj-$(CONFIG_KVM) += kvm/ + +# Xen paravirtualization support +obj-$(CONFIG_XEN) += xen/ + +# lguest paravirtualization support +obj-$(CONFIG_LGUEST_GUEST) += lguest/ + +obj-y += kernel/ +obj-y += mm/ + +obj-y += crypto/ +obj-y += vdso/ +obj-$(CONFIG_IA32_EMULATION) += ia32/ + |