aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorJames Morris <jmorris@macbook.(none)>2009-12-03 01:33:40 -0500
committerJames Morris <jmorris@macbook.(none)>2009-12-03 01:33:40 -0500
commitc84d6efd363a3948eb32ec40d46bab6338580454 (patch)
tree3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /include/linux/Kbuild
parent7539cf4b92be4aecc573ea962135f246a7a33401 (diff)
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
Merge branch 'master' into next
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index ffcdb9b509db..5a5385749e16 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -126,6 +126,7 @@ header-y += nfs_mount.h
126header-y += nl80211.h 126header-y += nl80211.h
127header-y += param.h 127header-y += param.h
128header-y += pci_regs.h 128header-y += pci_regs.h
129header-y += perf_event.h
129header-y += pfkeyv2.h 130header-y += pfkeyv2.h
130header-y += pg.h 131header-y += pg.h
131header-y += phantom.h 132header-y += phantom.h
@@ -364,6 +365,7 @@ unifdef-y += utsname.h
364unifdef-y += videodev2.h 365unifdef-y += videodev2.h
365unifdef-y += videodev.h 366unifdef-y += videodev.h
366unifdef-y += virtio_config.h 367unifdef-y += virtio_config.h
368unifdef-y += virtio_ids.h
367unifdef-y += virtio_blk.h 369unifdef-y += virtio_blk.h
368unifdef-y += virtio_net.h 370unifdef-y += virtio_net.h
369unifdef-y += virtio_9p.h 371unifdef-y += virtio_9p.h