aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 12:06:16 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 12:06:16 -0400
commit4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (patch)
treea2054556900af8c16fd9f5419f012dcf1ee2995a /include/linux/Kbuild
parentd002ec481c24f325ed6cfcb7810d317c015dd1b5 (diff)
parent7ecdb70a0ea436c06540140242bfac6ac3babfc0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6: (292 commits) [GFS2] Fix endian bug for de_type [GFS2] Initialize SELinux extended attributes at inode creation time. [GFS2] Move logging code into log.c (mostly) [GFS2] Mark nlink cleared so VFS sees it happen [GFS2] Two redundant casts removed [GFS2] Remove uneeded endian conversion [GFS2] Remove duplicate sb reading code [GFS2] Mark metadata reads for blktrace [GFS2] Remove iflags.h, use FS_ [GFS2] Fix code style/indent in ops_file.c [GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix [GFS2] Remove readv/writev methods and use aio_read/aio_write instead (gfs bits) [GFS2] inode-diet: Eliminate i_blksize from the inode structure [GFS2] inode_diet: Replace inode.u.generic_ip with inode.i_private (gfs) [GFS2] Fix typo in last patch [GFS2] Fix direct i/o logic in filemap.c [GFS2] Fix bug in Makefiles for lock modules [GFS2] Remove (extra) fs_subsys declaration [GFS2/DLM] Fix trailing whitespace [GFS2] Tidy up meta_io code ...
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 7d564b6fc98f..ea005c0a79fd 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -46,6 +46,7 @@ header-y += coff.h
46header-y += comstats.h 46header-y += comstats.h
47header-y += consolemap.h 47header-y += consolemap.h
48header-y += cycx_cfm.h 48header-y += cycx_cfm.h
49header-y += dlm_device.h
49header-y += dm-ioctl.h 50header-y += dm-ioctl.h
50header-y += dn.h 51header-y += dn.h
51header-y += dqblk_v1.h 52header-y += dqblk_v1.h
@@ -104,6 +105,7 @@ header-y += ixjuser.h
104header-y += jffs2.h 105header-y += jffs2.h
105header-y += keyctl.h 106header-y += keyctl.h
106header-y += limits.h 107header-y += limits.h
108header-y += lock_dlm_plock.h
107header-y += magic.h 109header-y += magic.h
108header-y += major.h 110header-y += major.h
109header-y += matroxfb.h 111header-y += matroxfb.h
@@ -192,6 +194,7 @@ unifdef-y += cyclades.h
192unifdef-y += dccp.h 194unifdef-y += dccp.h
193unifdef-y += dirent.h 195unifdef-y += dirent.h
194unifdef-y += divert.h 196unifdef-y += divert.h
197unifdef-y += dlm.h
195unifdef-y += elfcore.h 198unifdef-y += elfcore.h
196unifdef-y += errno.h 199unifdef-y += errno.h
197unifdef-y += errqueue.h 200unifdef-y += errqueue.h
@@ -208,6 +211,7 @@ unifdef-y += ftape.h
208unifdef-y += gameport.h 211unifdef-y += gameport.h
209unifdef-y += generic_serial.h 212unifdef-y += generic_serial.h
210unifdef-y += genhd.h 213unifdef-y += genhd.h
214unifdef-y += gfs2_ondisk.h
211unifdef-y += hayesesp.h 215unifdef-y += hayesesp.h
212unifdef-y += hdlcdrv.h 216unifdef-y += hdlcdrv.h
213unifdef-y += hdlc.h 217unifdef-y += hdlc.h