diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-29 17:15:32 -0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-29 17:15:32 -0400 |
| commit | 19bf7f8ac3f8131100027281c495dbbe00cd5ae0 (patch) | |
| tree | 270b97e3ca47c0f62a1babca2ae37f79a76a309c /include/Kbuild | |
| parent | 787c57c0fb393fe8a3974d300ddcfe30373386fe (diff) | |
| parent | 35fd3dc58da675d659513384221349ef90749a01 (diff) | |
Merge remote-tracking branch 'master' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'include/Kbuild')
| -rw-r--r-- | include/Kbuild | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/Kbuild b/include/Kbuild index 8d226bfa2696..83256b64166a 100644 --- a/include/Kbuild +++ b/include/Kbuild | |||
| @@ -1,12 +1,8 @@ | |||
| 1 | # Top-level Makefile calls into asm-$(ARCH) | 1 | # Top-level Makefile calls into asm-$(ARCH) |
| 2 | # List only non-arch directories below | 2 | # List only non-arch directories below |
| 3 | 3 | ||
| 4 | header-y += asm-generic/ | ||
| 5 | header-y += linux/ | 4 | header-y += linux/ |
| 6 | header-y += sound/ | 5 | header-y += sound/ |
| 7 | header-y += mtd/ | ||
| 8 | header-y += rdma/ | 6 | header-y += rdma/ |
| 9 | header-y += video/ | 7 | header-y += video/ |
| 10 | header-y += drm/ | ||
| 11 | header-y += xen/ | ||
| 12 | header-y += scsi/ | 8 | header-y += scsi/ |