aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-06-10 18:07:47 -0400
committerFelix Blyakher <felixb@sgi.com>2009-06-10 18:07:47 -0400
commit4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch)
tree0cea46e43f0625244c3d06a71d6559e5ec5419ca /include/linux/Kbuild
parent4156e735d3abde8e9243b5d22f7999dd3fffab2e (diff)
parent07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a67b6227d272..3f0eaa397ef5 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -67,6 +67,7 @@ header-y += falloc.h
67header-y += fd.h 67header-y += fd.h
68header-y += fdreg.h 68header-y += fdreg.h
69header-y += fib_rules.h 69header-y += fib_rules.h
70header-y += fiemap.h
70header-y += firewire-cdev.h 71header-y += firewire-cdev.h
71header-y += firewire-constants.h 72header-y += firewire-constants.h
72header-y += fuse.h 73header-y += fuse.h
@@ -137,6 +138,7 @@ header-y += qnxtypes.h
137header-y += radeonfb.h 138header-y += radeonfb.h
138header-y += raw.h 139header-y += raw.h
139header-y += resource.h 140header-y += resource.h
141header-y += romfs_fs.h
140header-y += rose.h 142header-y += rose.h
141header-y += serial_reg.h 143header-y += serial_reg.h
142header-y += smbno.h 144header-y += smbno.h
@@ -313,7 +315,6 @@ unifdef-y += irqnr.h
313unifdef-y += reboot.h 315unifdef-y += reboot.h
314unifdef-y += reiserfs_fs.h 316unifdef-y += reiserfs_fs.h
315unifdef-y += reiserfs_xattr.h 317unifdef-y += reiserfs_xattr.h
316unifdef-y += romfs_fs.h
317unifdef-y += route.h 318unifdef-y += route.h
318unifdef-y += rtc.h 319unifdef-y += rtc.h
319unifdef-y += rtnetlink.h 320unifdef-y += rtnetlink.h