diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:32 -0400 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /arch/x86/Kbuild | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/Kbuild')
| -rw-r--r-- | arch/x86/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 0e9dec6cadd1..e5287d8517aa 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | |||
| 2 | obj-$(CONFIG_KVM) += kvm/ | 1 | obj-$(CONFIG_KVM) += kvm/ |
| 3 | 2 | ||
| 4 | # Xen paravirtualization support | 3 | # Xen paravirtualization support |
| @@ -7,6 +6,7 @@ obj-$(CONFIG_XEN) += xen/ | |||
| 7 | # lguest paravirtualization support | 6 | # lguest paravirtualization support |
| 8 | obj-$(CONFIG_LGUEST_GUEST) += lguest/ | 7 | obj-$(CONFIG_LGUEST_GUEST) += lguest/ |
| 9 | 8 | ||
| 9 | obj-y += realmode/ | ||
| 10 | obj-y += kernel/ | 10 | obj-y += kernel/ |
| 11 | obj-y += mm/ | 11 | obj-y += mm/ |
| 12 | 12 | ||