diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/dqblk_xfs.h | 4 | ||||
-rw-r--r-- | include/linux/fb.h | 2 | ||||
-rw-r--r-- | include/linux/nfs_fs.h | 1 | ||||
-rw-r--r-- | include/linux/udp.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/dqblk_xfs.h b/include/linux/dqblk_xfs.h index 2fda1b2aabd9..527504c11c5e 100644 --- a/include/linux/dqblk_xfs.h +++ b/include/linux/dqblk_xfs.h | |||
@@ -125,14 +125,14 @@ typedef struct fs_disk_quota { | |||
125 | 125 | ||
126 | /* | 126 | /* |
127 | * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system. | 127 | * fs_quota_stat is the struct returned in Q_XGETQSTAT for a given file system. |
128 | * Provides a centralized way to get meta infomation about the quota subsystem. | 128 | * Provides a centralized way to get meta information about the quota subsystem. |
129 | * eg. space taken up for user and group quotas, number of dquots currently | 129 | * eg. space taken up for user and group quotas, number of dquots currently |
130 | * incore. | 130 | * incore. |
131 | */ | 131 | */ |
132 | #define FS_QSTAT_VERSION 1 /* fs_quota_stat.qs_version */ | 132 | #define FS_QSTAT_VERSION 1 /* fs_quota_stat.qs_version */ |
133 | 133 | ||
134 | /* | 134 | /* |
135 | * Some basic infomation about 'quota files'. | 135 | * Some basic information about 'quota files'. |
136 | */ | 136 | */ |
137 | typedef struct fs_qfilestat { | 137 | typedef struct fs_qfilestat { |
138 | __u64 qfs_ino; /* inode number */ | 138 | __u64 qfs_ino; /* inode number */ |
diff --git a/include/linux/fb.h b/include/linux/fb.h index b45928f5c63f..ffefeeeeca93 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -557,7 +557,7 @@ struct fb_pixmap { | |||
557 | * Frame buffer operations | 557 | * Frame buffer operations |
558 | * | 558 | * |
559 | * LOCKING NOTE: those functions must _ALL_ be called with the console | 559 | * LOCKING NOTE: those functions must _ALL_ be called with the console |
560 | * semaphore held, this is the only suitable locking mecanism we have | 560 | * semaphore held, this is the only suitable locking mechanism we have |
561 | * in 2.6. Some may be called at interrupt time at this point though. | 561 | * in 2.6. Some may be called at interrupt time at this point though. |
562 | */ | 562 | */ |
563 | 563 | ||
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index d90b1bb37563..55ea853d57bc 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef _LINUX_NFS_FS_H | 9 | #ifndef _LINUX_NFS_FS_H |
10 | #define _LINUX_NFS_FS_H | 10 | #define _LINUX_NFS_FS_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/in.h> | 12 | #include <linux/in.h> |
14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
15 | #include <linux/pagemap.h> | 14 | #include <linux/pagemap.h> |
diff --git a/include/linux/udp.h b/include/linux/udp.h index bdd39be09406..90223f057d50 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h | |||
@@ -46,7 +46,7 @@ struct udp_sock { | |||
46 | unsigned int corkflag; /* Cork is required */ | 46 | unsigned int corkflag; /* Cork is required */ |
47 | __u16 encap_type; /* Is this an Encapsulation socket? */ | 47 | __u16 encap_type; /* Is this an Encapsulation socket? */ |
48 | /* | 48 | /* |
49 | * Following member retains the infomation to create a UDP header | 49 | * Following member retains the information to create a UDP header |
50 | * when the socket is uncorked. | 50 | * when the socket is uncorked. |
51 | */ | 51 | */ |
52 | __u16 len; /* total length of pending frames */ | 52 | __u16 len; /* total length of pending frames */ |