diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 06:19:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 06:20:01 -0400 |
| commit | 45bceffc3013bda7d2ebc7802e9b153b674e2d44 (patch) | |
| tree | 222d7dd8fd300925cbf12cdc0fba5bee2528997e /include/linux/Kbuild | |
| parent | 6f2f3cf00ee32f75ba007a46bab88a54d68a5deb (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on an older, pre-rc1 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 03f22076381f..334a3593cdfd 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -57,6 +57,7 @@ header-y += dlmconstants.h | |||
| 57 | header-y += dlm_device.h | 57 | header-y += dlm_device.h |
| 58 | header-y += dlm_netlink.h | 58 | header-y += dlm_netlink.h |
| 59 | header-y += dm-ioctl.h | 59 | header-y += dm-ioctl.h |
| 60 | header-y += dm-log-userspace.h | ||
| 60 | header-y += dn.h | 61 | header-y += dn.h |
| 61 | header-y += dqblk_xfs.h | 62 | header-y += dqblk_xfs.h |
| 62 | header-y += efs_fs_sb.h | 63 | header-y += efs_fs_sb.h |