diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 11:35:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 11:35:33 +0900 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /arch/x86/Kbuild | |
| parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
| parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
| download | blackbird-op-linux-8ace5c4698ec8da53e69095596718d5a936433de.tar.gz blackbird-op-linux-8ace5c4698ec8da53e69095596718d5a936433de.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/x86/Kbuild')
| -rw-r--r-- | arch/x86/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 0e103236b754..0e9dec6cadd1 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -15,3 +15,4 @@ obj-y += vdso/ obj-$(CONFIG_IA32_EMULATION) += ia32/ obj-y += platform/ +obj-y += net/ |
