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/asm-generic/Kbuild.asm | |
| 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/asm-generic/Kbuild.asm')
| -rw-r--r-- | include/asm-generic/Kbuild.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 70d185534b9d..290910e4ede4 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm | |||
| @@ -9,6 +9,7 @@ unifdef-y += a.out.h | |||
| 9 | endif | 9 | endif |
| 10 | unifdef-y += auxvec.h | 10 | unifdef-y += auxvec.h |
| 11 | unifdef-y += byteorder.h | 11 | unifdef-y += byteorder.h |
| 12 | unifdef-y += bitsperlong.h | ||
| 12 | unifdef-y += errno.h | 13 | unifdef-y += errno.h |
| 13 | unifdef-y += fcntl.h | 14 | unifdef-y += fcntl.h |
| 14 | unifdef-y += ioctl.h | 15 | unifdef-y += ioctl.h |