diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-28 12:05:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-28 12:05:55 -0400 |
| commit | 508dc4f8eece1a70c493afc6511fdf5934fef567 (patch) | |
| tree | b852a6a5bf9977a33a87158985de02d188ba71d7 /include/linux/Kbuild | |
| parent | 734e9a26d612f64e1c9cfd92256969b773954ae2 (diff) | |
| parent | e3e45c01ae690e65f2650e5288b9af802e95a136 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes because upcoming uprobes changes will rely on it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 d9a754474878..fa217607c582 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -391,6 +391,7 @@ header-y += v4l2-dv-timings.h | |||
| 391 | header-y += v4l2-mediabus.h | 391 | header-y += v4l2-mediabus.h |
| 392 | header-y += v4l2-subdev.h | 392 | header-y += v4l2-subdev.h |
| 393 | header-y += veth.h | 393 | header-y += veth.h |
| 394 | header-y += vfio.h | ||
| 394 | header-y += vhost.h | 395 | header-y += vhost.h |
| 395 | header-y += videodev2.h | 396 | header-y += videodev2.h |
| 396 | header-y += virtio_9p.h | 397 | header-y += virtio_9p.h |