diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/Kbuild | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/Kbuild')
| -rw-r--r-- | include/Kbuild | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/Kbuild b/include/Kbuild index d8c3e3cbf416..8d226bfa2696 100644 --- a/include/Kbuild +++ b/include/Kbuild | |||
| @@ -8,3 +8,5 @@ header-y += mtd/ | |||
| 8 | header-y += rdma/ | 8 | header-y += rdma/ |
| 9 | header-y += video/ | 9 | header-y += video/ |
| 10 | header-y += drm/ | 10 | header-y += drm/ |
| 11 | header-y += xen/ | ||
| 12 | header-y += scsi/ | ||