diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 21:50:30 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 21:50:30 -0400 |
| commit | d192f93cfca6a0aedbf10fa548d8bc17b86275d6 (patch) | |
| tree | 357a4106ec49747bd78550a79d68f7b6d1f642a3 /include/linux/Kbuild | |
| parent | adcb079f28ec08165897e2450a4a60b219274008 (diff) | |
| parent | d5703bd35a4c76b0717ea51e2e8aabce341828a1 (diff) | |
Merge tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/maintainers
* tag 'tegra-for-3.7-maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
MAINTAINERS: tegra: remove Olof/Colin, add device tree files
MAINTAINERS: add defconfig file to TEGRA section
+ sync with 3.6-rc4
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 |