diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-08 00:41:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-08 00:41:53 -0400 |
| commit | eb84d6b60491a3ca3d90d62ee5346b007770d40d (patch) | |
| tree | 22aadf9ada15e1ae5ba4c400aafab6f2541996e6 /arch/x86/Kbuild | |
| parent | 97a13e5289baa96eaddd06e61d277457d837af3a (diff) | |
| parent | d030671f3f261e528dc6e396a13f10859a74ae7c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/Kbuild')
| -rw-r--r-- | arch/x86/Kbuild | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 61b6d51866f8..3942f74c92d7 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild | |||
| @@ -17,6 +17,4 @@ obj-$(CONFIG_IA32_EMULATION) += ia32/ | |||
| 17 | obj-y += platform/ | 17 | obj-y += platform/ |
| 18 | obj-y += net/ | 18 | obj-y += net/ |
| 19 | 19 | ||
| 20 | ifeq ($(CONFIG_X86_64),y) | 20 | obj-$(CONFIG_KEXEC_FILE) += purgatory/ |
| 21 | obj-$(CONFIG_KEXEC) += purgatory/ | ||
| 22 | endif | ||