summaryrefslogtreecommitdiff
path: root/include/uapi/linux/Kbuild
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-09 18:35:46 +0100
committerMark Brown <broonie@kernel.org>2015-06-09 18:35:46 +0100
commit6724af486903df57338c14424e02599e371cf563 (patch)
tree0e42ae32bbfe7e93ba9db11a1124aeb4378cbd71 /include/uapi/linux/Kbuild
parentd2233325e5b7891914901867ca5355347d59df14 (diff)
parent9deef024a12ebae4965c89837f662905ac88944b (diff)
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Diffstat (limited to 'include/uapi/linux/Kbuild')
-rw-r--r--include/uapi/linux/Kbuild3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 68ceb97c458c..1a0006a76b00 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -6,6 +6,7 @@ header-y += caif/
header-y += dvb/
header-y += hdlc/
header-y += hsi/
+header-y += iio/
header-y += isdn/
header-y += mmc/
header-y += nfsd/
@@ -430,6 +431,7 @@ header-y += virtio_blk.h
header-y += virtio_config.h
header-y += virtio_console.h
header-y += virtio_ids.h
+header-y += virtio_input.h
header-y += virtio_net.h
header-y += virtio_pci.h
header-y += virtio_ring.h
@@ -446,5 +448,6 @@ header-y += wireless.h
header-y += x25.h
header-y += xattr.h
header-y += xfrm.h
+header-y += xilinx-v4l2-controls.h
header-y += zorro.h
header-y += zorro_ids.h