diff options
Diffstat (limited to 'include/linux')
155 files changed, 456 insertions, 584 deletions
diff --git a/include/linux/acct.h b/include/linux/acct.h index 9a66401073fc..3d54fbcf969e 100644 --- a/include/linux/acct.h +++ b/include/linux/acct.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #define _LINUX_ACCT_H | 16 | #define _LINUX_ACCT_H |
17 | 17 | ||
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/jiffies.h> | ||
20 | 19 | ||
21 | #include <asm/param.h> | 20 | #include <asm/param.h> |
22 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
@@ -116,7 +115,6 @@ struct acct_v3 | |||
116 | 115 | ||
117 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
118 | 117 | ||
119 | #include <linux/config.h> | ||
120 | 118 | ||
121 | #ifdef CONFIG_BSD_PROCESS_ACCT | 119 | #ifdef CONFIG_BSD_PROCESS_ACCT |
122 | struct vfsmount; | 120 | struct vfsmount; |
@@ -165,6 +163,7 @@ typedef struct acct acct_t; | |||
165 | #endif /* __KERNEL */ | 163 | #endif /* __KERNEL */ |
166 | 164 | ||
167 | #ifdef __KERNEL__ | 165 | #ifdef __KERNEL__ |
166 | #include <linux/jiffies.h> | ||
168 | /* | 167 | /* |
169 | * Yet another set of HZ to *HZ helper functions. | 168 | * Yet another set of HZ to *HZ helper functions. |
170 | * See <linux/jiffies.h> for the original. | 169 | * See <linux/jiffies.h> for the original. |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d3bc25e6d27d..1cf0b91d05bd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef _LINUX_ACPI_H | 25 | #ifndef _LINUX_ACPI_H |
26 | #define _LINUX_ACPI_H | 26 | #define _LINUX_ACPI_H |
27 | 27 | ||
28 | #include <linux/config.h> | ||
29 | 28 | ||
30 | #ifdef CONFIG_ACPI | 29 | #ifdef CONFIG_ACPI |
31 | 30 | ||
diff --git a/include/linux/affs_hardblocks.h b/include/linux/affs_hardblocks.h index 3fb869939d82..f1b948c1f592 100644 --- a/include/linux/affs_hardblocks.h +++ b/include/linux/affs_hardblocks.h | |||
@@ -1,45 +1,47 @@ | |||
1 | #ifndef AFFS_HARDBLOCKS_H | 1 | #ifndef AFFS_HARDBLOCKS_H |
2 | #define AFFS_HARDBLOCKS_H | 2 | #define AFFS_HARDBLOCKS_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | /* Just the needed definitions for the RDB of an Amiga HD. */ | 6 | /* Just the needed definitions for the RDB of an Amiga HD. */ |
5 | 7 | ||
6 | struct RigidDiskBlock { | 8 | struct RigidDiskBlock { |
7 | u32 rdb_ID; | 9 | __u32 rdb_ID; |
8 | __be32 rdb_SummedLongs; | 10 | __be32 rdb_SummedLongs; |
9 | s32 rdb_ChkSum; | 11 | __s32 rdb_ChkSum; |
10 | u32 rdb_HostID; | 12 | __u32 rdb_HostID; |
11 | __be32 rdb_BlockBytes; | 13 | __be32 rdb_BlockBytes; |
12 | u32 rdb_Flags; | 14 | __u32 rdb_Flags; |
13 | u32 rdb_BadBlockList; | 15 | __u32 rdb_BadBlockList; |
14 | __be32 rdb_PartitionList; | 16 | __be32 rdb_PartitionList; |
15 | u32 rdb_FileSysHeaderList; | 17 | __u32 rdb_FileSysHeaderList; |
16 | u32 rdb_DriveInit; | 18 | __u32 rdb_DriveInit; |
17 | u32 rdb_Reserved1[6]; | 19 | __u32 rdb_Reserved1[6]; |
18 | u32 rdb_Cylinders; | 20 | __u32 rdb_Cylinders; |
19 | u32 rdb_Sectors; | 21 | __u32 rdb_Sectors; |
20 | u32 rdb_Heads; | 22 | __u32 rdb_Heads; |
21 | u32 rdb_Interleave; | 23 | __u32 rdb_Interleave; |
22 | u32 rdb_Park; | 24 | __u32 rdb_Park; |
23 | u32 rdb_Reserved2[3]; | 25 | __u32 rdb_Reserved2[3]; |
24 | u32 rdb_WritePreComp; | 26 | __u32 rdb_WritePreComp; |
25 | u32 rdb_ReducedWrite; | 27 | __u32 rdb_ReducedWrite; |
26 | u32 rdb_StepRate; | 28 | __u32 rdb_StepRate; |
27 | u32 rdb_Reserved3[5]; | 29 | __u32 rdb_Reserved3[5]; |
28 | u32 rdb_RDBBlocksLo; | 30 | __u32 rdb_RDBBlocksLo; |
29 | u32 rdb_RDBBlocksHi; | 31 | __u32 rdb_RDBBlocksHi; |
30 | u32 rdb_LoCylinder; | 32 | __u32 rdb_LoCylinder; |
31 | u32 rdb_HiCylinder; | 33 | __u32 rdb_HiCylinder; |
32 | u32 rdb_CylBlocks; | 34 | __u32 rdb_CylBlocks; |
33 | u32 rdb_AutoParkSeconds; | 35 | __u32 rdb_AutoParkSeconds; |
34 | u32 rdb_HighRDSKBlock; | 36 | __u32 rdb_HighRDSKBlock; |
35 | u32 rdb_Reserved4; | 37 | __u32 rdb_Reserved4; |
36 | char rdb_DiskVendor[8]; | 38 | char rdb_DiskVendor[8]; |
37 | char rdb_DiskProduct[16]; | 39 | char rdb_DiskProduct[16]; |
38 | char rdb_DiskRevision[4]; | 40 | char rdb_DiskRevision[4]; |
39 | char rdb_ControllerVendor[8]; | 41 | char rdb_ControllerVendor[8]; |
40 | char rdb_ControllerProduct[16]; | 42 | char rdb_ControllerProduct[16]; |
41 | char rdb_ControllerRevision[4]; | 43 | char rdb_ControllerRevision[4]; |
42 | u32 rdb_Reserved5[10]; | 44 | __u32 rdb_Reserved5[10]; |
43 | }; | 45 | }; |
44 | 46 | ||
45 | #define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */ | 47 | #define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */ |
@@ -47,16 +49,16 @@ struct RigidDiskBlock { | |||
47 | struct PartitionBlock { | 49 | struct PartitionBlock { |
48 | __be32 pb_ID; | 50 | __be32 pb_ID; |
49 | __be32 pb_SummedLongs; | 51 | __be32 pb_SummedLongs; |
50 | s32 pb_ChkSum; | 52 | __s32 pb_ChkSum; |
51 | u32 pb_HostID; | 53 | __u32 pb_HostID; |
52 | __be32 pb_Next; | 54 | __be32 pb_Next; |
53 | u32 pb_Flags; | 55 | __u32 pb_Flags; |
54 | u32 pb_Reserved1[2]; | 56 | __u32 pb_Reserved1[2]; |
55 | u32 pb_DevFlags; | 57 | __u32 pb_DevFlags; |
56 | u8 pb_DriveName[32]; | 58 | __u8 pb_DriveName[32]; |
57 | u32 pb_Reserved2[15]; | 59 | __u32 pb_Reserved2[15]; |
58 | __be32 pb_Environment[17]; | 60 | __be32 pb_Environment[17]; |
59 | u32 pb_EReserved[15]; | 61 | __u32 pb_EReserved[15]; |
60 | }; | 62 | }; |
61 | 63 | ||
62 | #define IDNAME_PARTITION 0x50415254 /* "PART" */ | 64 | #define IDNAME_PARTITION 0x50415254 /* "PART" */ |
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 6d59c8efe3be..bfb8ec791b7b 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
@@ -27,8 +27,6 @@ | |||
27 | #ifndef _AGP_H | 27 | #ifndef _AGP_H |
28 | #define _AGP_H 1 | 28 | #define _AGP_H 1 |
29 | 29 | ||
30 | #include <linux/agp_backend.h> | ||
31 | |||
32 | #define AGPIOC_BASE 'A' | 30 | #define AGPIOC_BASE 'A' |
33 | #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) | 31 | #define AGPIOC_INFO _IOR (AGPIOC_BASE, 0, struct agp_info*) |
34 | #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) | 32 | #define AGPIOC_ACQUIRE _IO (AGPIOC_BASE, 1) |
@@ -112,6 +110,7 @@ typedef struct _agp_unbind { | |||
112 | 110 | ||
113 | #else /* __KERNEL__ */ | 111 | #else /* __KERNEL__ */ |
114 | #include <linux/mutex.h> | 112 | #include <linux/mutex.h> |
113 | #include <linux/agp_backend.h> | ||
115 | 114 | ||
116 | #define AGPGART_MINOR 175 | 115 | #define AGPGART_MINOR 175 |
117 | 116 | ||
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h index 9cf64b1b688b..29c0448265cf 100644 --- a/include/linux/amba/clcd.h +++ b/include/linux/amba/clcd.h | |||
@@ -9,7 +9,6 @@ | |||
9 | * License. See the file COPYING in the main directory of this archive | 9 | * License. See the file COPYING in the main directory of this archive |
10 | * for more details. | 10 | * for more details. |
11 | */ | 11 | */ |
12 | #include <linux/config.h> | ||
13 | #include <linux/fb.h> | 12 | #include <linux/fb.h> |
14 | 13 | ||
15 | /* | 14 | /* |
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index b203ea82a0a8..1eb238affb12 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h | |||
@@ -209,7 +209,6 @@ struct atm_cirange { | |||
209 | 209 | ||
210 | #ifdef __KERNEL__ | 210 | #ifdef __KERNEL__ |
211 | 211 | ||
212 | #include <linux/config.h> | ||
213 | #include <linux/wait.h> /* wait_queue_head_t */ | 212 | #include <linux/wait.h> /* wait_queue_head_t */ |
214 | #include <linux/time.h> /* struct timeval */ | 213 | #include <linux/time.h> /* struct timeval */ |
215 | #include <linux/net.h> | 214 | #include <linux/net.h> |
diff --git a/include/linux/audit.h b/include/linux/audit.h index b74c148f14e3..14259f6db5bc 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
@@ -24,8 +24,7 @@ | |||
24 | #ifndef _LINUX_AUDIT_H_ | 24 | #ifndef _LINUX_AUDIT_H_ |
25 | #define _LINUX_AUDIT_H_ | 25 | #define _LINUX_AUDIT_H_ |
26 | 26 | ||
27 | #include <linux/sched.h> | 27 | #include <linux/elf-em.h> |
28 | #include <linux/elf.h> | ||
29 | 28 | ||
30 | /* The netlink messages for the audit system is divided into blocks: | 29 | /* The netlink messages for the audit system is divided into blocks: |
31 | * 1000 - 1099 are for commanding the audit system | 30 | * 1000 - 1099 are for commanding the audit system |
@@ -273,6 +272,7 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ | |||
273 | }; | 272 | }; |
274 | 273 | ||
275 | #ifdef __KERNEL__ | 274 | #ifdef __KERNEL__ |
275 | #include <linux/sched.h> | ||
276 | 276 | ||
277 | struct audit_sig_info { | 277 | struct audit_sig_info { |
278 | uid_t uid; | 278 | uid_t uid; |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 59e1259b1c40..5d327313a9f7 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_BLKDEV_H | 1 | #ifndef _LINUX_BLKDEV_H |
2 | #define _LINUX_BLKDEV_H | 2 | #define _LINUX_BLKDEV_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/major.h> | 4 | #include <linux/major.h> |
6 | #include <linux/genhd.h> | 5 | #include <linux/genhd.h> |
7 | #include <linux/list.h> | 6 | #include <linux/list.h> |
diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h index be5d0f4ad24c..faf8a45af210 100644 --- a/include/linux/blkpg.h +++ b/include/linux/blkpg.h | |||
@@ -24,6 +24,7 @@ | |||
24 | * | 24 | * |
25 | * For today, only the partition stuff - aeb, 990515 | 25 | * For today, only the partition stuff - aeb, 990515 |
26 | */ | 26 | */ |
27 | #include <linux/compiler.h> | ||
27 | #include <linux/ioctl.h> | 28 | #include <linux/ioctl.h> |
28 | 29 | ||
29 | #define BLKPG _IO(0x12,105) | 30 | #define BLKPG _IO(0x12,105) |
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index b34d3e73d5ea..eb1a867ed245 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef BLKTRACE_H | 1 | #ifndef BLKTRACE_H |
2 | #define BLKTRACE_H | 2 | #define BLKTRACE_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
6 | #include <linux/relay.h> | 5 | #include <linux/relay.h> |
7 | 6 | ||
diff --git a/include/linux/blockgroup_lock.h b/include/linux/blockgroup_lock.h index 0137ee5dd43c..8607312983bd 100644 --- a/include/linux/blockgroup_lock.h +++ b/include/linux/blockgroup_lock.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Simple hashed spinlocking. | 6 | * Simple hashed spinlocking. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
11 | #include <linux/cache.h> | 10 | #include <linux/cache.h> |
12 | 11 | ||
diff --git a/include/linux/cache.h b/include/linux/cache.h index cc4b3aafad9a..4552504c0228 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define __LINUX_CACHE_H | 2 | #define __LINUX_CACHE_H |
3 | 3 | ||
4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
5 | #include <linux/config.h> | ||
6 | #include <asm/cache.h> | 5 | #include <asm/cache.h> |
7 | 6 | ||
8 | #ifndef L1_CACHE_ALIGN | 7 | #ifndef L1_CACHE_ALIGN |
diff --git a/include/linux/coda.h b/include/linux/coda.h index bbc5afcd7db6..b5cf0780c51a 100644 --- a/include/linux/coda.h +++ b/include/linux/coda.h | |||
@@ -59,7 +59,6 @@ Mellon the rights to redistribute these changes without encumbrance. | |||
59 | #ifndef _CODA_HEADER_ | 59 | #ifndef _CODA_HEADER_ |
60 | #define _CODA_HEADER_ | 60 | #define _CODA_HEADER_ |
61 | 61 | ||
62 | #include <linux/config.h> | ||
63 | 62 | ||
64 | /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ | 63 | /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ |
65 | #if defined(__NetBSD__) || \ | 64 | #if defined(__NetBSD__) || \ |
diff --git a/include/linux/compat.h b/include/linux/compat.h index 6d3a654be1ae..dda1697ec753 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
@@ -4,7 +4,6 @@ | |||
4 | * These are the type definitions for the architecture specific | 4 | * These are the type definitions for the architecture specific |
5 | * syscall compatibility layer. | 5 | * syscall compatibility layer. |
6 | */ | 6 | */ |
7 | #include <linux/config.h> | ||
8 | 7 | ||
9 | #ifdef CONFIG_COMPAT | 8 | #ifdef CONFIG_COMPAT |
10 | 9 | ||
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index f23d3c6fc2c0..9b4f11094937 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h | |||
@@ -78,6 +78,7 @@ extern void __chk_io_ptr(void __iomem *); | |||
78 | 78 | ||
79 | #endif /* __ASSEMBLY__ */ | 79 | #endif /* __ASSEMBLY__ */ |
80 | 80 | ||
81 | #ifdef __KERNEL__ | ||
81 | /* | 82 | /* |
82 | * Allow us to mark functions as 'deprecated' and have gcc emit a nice | 83 | * Allow us to mark functions as 'deprecated' and have gcc emit a nice |
83 | * warning for each use, in hopes of speeding the functions removal. | 84 | * warning for each use, in hopes of speeding the functions removal. |
@@ -127,6 +128,16 @@ extern void __chk_io_ptr(void __iomem *); | |||
127 | # define __attribute_pure__ /* unimplemented */ | 128 | # define __attribute_pure__ /* unimplemented */ |
128 | #endif | 129 | #endif |
129 | 130 | ||
131 | #ifndef noinline | ||
132 | #define noinline | ||
133 | #endif | ||
134 | |||
135 | #ifndef __always_inline | ||
136 | #define __always_inline inline | ||
137 | #endif | ||
138 | |||
139 | #endif /* __KERNEL__ */ | ||
140 | |||
130 | /* | 141 | /* |
131 | * From the GCC manual: | 142 | * From the GCC manual: |
132 | * | 143 | * |
@@ -145,12 +156,4 @@ extern void __chk_io_ptr(void __iomem *); | |||
145 | # define __attribute_const__ /* unimplemented */ | 156 | # define __attribute_const__ /* unimplemented */ |
146 | #endif | 157 | #endif |
147 | 158 | ||
148 | #ifndef noinline | ||
149 | #define noinline | ||
150 | #endif | ||
151 | |||
152 | #ifndef __always_inline | ||
153 | #define __always_inline inline | ||
154 | #endif | ||
155 | |||
156 | #endif /* __LINUX_COMPILER_H */ | 159 | #endif /* __LINUX_COMPILER_H */ |
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 17866d7e2b71..5aa95011f7e6 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h | |||
@@ -15,7 +15,6 @@ | |||
15 | #define _LINUX_CPUFREQ_H | 15 | #define _LINUX_CPUFREQ_H |
16 | 16 | ||
17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
18 | #include <linux/config.h> | ||
19 | #include <linux/notifier.h> | 18 | #include <linux/notifier.h> |
20 | #include <linux/threads.h> | 19 | #include <linux/threads.h> |
21 | #include <linux/device.h> | 20 | #include <linux/device.h> |
diff --git a/include/linux/cramfs_fs.h b/include/linux/cramfs_fs.h index a8948f34b776..a41f38428c37 100644 --- a/include/linux/cramfs_fs.h +++ b/include/linux/cramfs_fs.h | |||
@@ -1,13 +1,7 @@ | |||
1 | #ifndef __CRAMFS_H | 1 | #ifndef __CRAMFS_H |
2 | #define __CRAMFS_H | 2 | #define __CRAMFS_H |
3 | 3 | ||
4 | #ifndef __KERNEL__ | 4 | #include <linux/types.h> |
5 | |||
6 | typedef unsigned char u8; | ||
7 | typedef unsigned short u16; | ||
8 | typedef unsigned int u32; | ||
9 | |||
10 | #endif | ||
11 | 5 | ||
12 | #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ | 6 | #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ |
13 | #define CRAMFS_SIGNATURE "Compressed ROMFS" | 7 | #define CRAMFS_SIGNATURE "Compressed ROMFS" |
@@ -33,9 +27,9 @@ typedef unsigned int u32; | |||
33 | * Reasonably terse representation of the inode data. | 27 | * Reasonably terse representation of the inode data. |
34 | */ | 28 | */ |
35 | struct cramfs_inode { | 29 | struct cramfs_inode { |
36 | u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; | 30 | __u32 mode:CRAMFS_MODE_WIDTH, uid:CRAMFS_UID_WIDTH; |
37 | /* SIZE for device files is i_rdev */ | 31 | /* SIZE for device files is i_rdev */ |
38 | u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; | 32 | __u32 size:CRAMFS_SIZE_WIDTH, gid:CRAMFS_GID_WIDTH; |
39 | /* NAMELEN is the length of the file name, divided by 4 and | 33 | /* NAMELEN is the length of the file name, divided by 4 and |
40 | rounded up. (cramfs doesn't support hard links.) */ | 34 | rounded up. (cramfs doesn't support hard links.) */ |
41 | /* OFFSET: For symlinks and non-empty regular files, this | 35 | /* OFFSET: For symlinks and non-empty regular files, this |
@@ -44,27 +38,27 @@ struct cramfs_inode { | |||
44 | see README). For non-empty directories it is the offset | 38 | see README). For non-empty directories it is the offset |
45 | (divided by 4) of the inode of the first file in that | 39 | (divided by 4) of the inode of the first file in that |
46 | directory. For anything else, offset is zero. */ | 40 | directory. For anything else, offset is zero. */ |
47 | u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; | 41 | __u32 namelen:CRAMFS_NAMELEN_WIDTH, offset:CRAMFS_OFFSET_WIDTH; |
48 | }; | 42 | }; |
49 | 43 | ||
50 | struct cramfs_info { | 44 | struct cramfs_info { |
51 | u32 crc; | 45 | __u32 crc; |
52 | u32 edition; | 46 | __u32 edition; |
53 | u32 blocks; | 47 | __u32 blocks; |
54 | u32 files; | 48 | __u32 files; |
55 | }; | 49 | }; |
56 | 50 | ||
57 | /* | 51 | /* |
58 | * Superblock information at the beginning of the FS. | 52 | * Superblock information at the beginning of the FS. |
59 | */ | 53 | */ |
60 | struct cramfs_super { | 54 | struct cramfs_super { |
61 | u32 magic; /* 0x28cd3d45 - random number */ | 55 | __u32 magic; /* 0x28cd3d45 - random number */ |
62 | u32 size; /* length in bytes */ | 56 | __u32 size; /* length in bytes */ |
63 | u32 flags; /* feature flags */ | 57 | __u32 flags; /* feature flags */ |
64 | u32 future; /* reserved for future use */ | 58 | __u32 future; /* reserved for future use */ |
65 | u8 signature[16]; /* "Compressed ROMFS" */ | 59 | __u8 signature[16]; /* "Compressed ROMFS" */ |
66 | struct cramfs_info fsid; /* unique filesystem info */ | 60 | struct cramfs_info fsid; /* unique filesystem info */ |
67 | u8 name[16]; /* user-defined name */ | 61 | __u8 name[16]; /* user-defined name */ |
68 | struct cramfs_inode root; /* root inode data */ | 62 | struct cramfs_inode root; /* root inode data */ |
69 | }; | 63 | }; |
70 | 64 | ||
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 0ab1bc1152ca..5a0470e36111 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -17,7 +17,6 @@ | |||
17 | #ifndef _LINUX_CRYPTO_H | 17 | #ifndef _LINUX_CRYPTO_H |
18 | #define _LINUX_CRYPTO_H | 18 | #define _LINUX_CRYPTO_H |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 300d704bdb9a..b88f7f428e58 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h | |||
@@ -24,7 +24,6 @@ | |||
24 | * 1998/08/08 acme Version 0.0.1 | 24 | * 1998/08/08 acme Version 0.0.1 |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/config.h> | ||
28 | #include <linux/wanrouter.h> | 27 | #include <linux/wanrouter.h> |
29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
30 | 29 | ||
diff --git a/include/linux/dcookies.h b/include/linux/dcookies.h index 1d68428c925d..0fe7cdf326f7 100644 --- a/include/linux/dcookies.h +++ b/include/linux/dcookies.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef DCOOKIES_H | 9 | #ifndef DCOOKIES_H |
10 | #define DCOOKIES_H | 10 | #define DCOOKIES_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | 12 | ||
14 | #ifdef CONFIG_PROFILING | 13 | #ifdef CONFIG_PROFILING |
15 | 14 | ||
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h index 89810e73d256..0d74a6f22abc 100644 --- a/include/linux/devfs_fs_kernel.h +++ b/include/linux/devfs_fs_kernel.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _LINUX_DEVFS_FS_KERNEL_H | 2 | #define _LINUX_DEVFS_FS_KERNEL_H |
3 | 3 | ||
4 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
5 | #include <linux/config.h> | ||
6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
7 | #include <linux/types.h> | 6 | #include <linux/types.h> |
8 | 7 | ||
diff --git a/include/linux/device.h b/include/linux/device.h index f6e72a65a3f2..9943f51cd809 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _DEVICE_H_ | 11 | #ifndef _DEVICE_H_ |
12 | #define _DEVICE_H_ | 12 | #define _DEVICE_H_ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
16 | #include <linux/kobject.h> | 15 | #include <linux/kobject.h> |
17 | #include <linux/klist.h> | 16 | #include <linux/klist.h> |
diff --git a/include/linux/divert.h b/include/linux/divert.h index 6919b09133d4..8fb4e9de6843 100644 --- a/include/linux/divert.h +++ b/include/linux/divert.h | |||
@@ -27,10 +27,10 @@ struct divert_blk | |||
27 | { | 27 | { |
28 | int divert; /* are we active */ | 28 | int divert; /* are we active */ |
29 | unsigned int protos; /* protocols */ | 29 | unsigned int protos; /* protocols */ |
30 | u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */ | 30 | __u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */ |
31 | u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */ | 31 | __u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */ |
32 | u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */ | 32 | __u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */ |
33 | u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */ | 33 | __u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */ |
34 | }; | 34 | }; |
35 | 35 | ||
36 | /* | 36 | /* |
@@ -40,12 +40,12 @@ struct divert_blk | |||
40 | 40 | ||
41 | typedef union _divert_cf_arg | 41 | typedef union _divert_cf_arg |
42 | { | 42 | { |
43 | s16 int16; | 43 | __s16 int16; |
44 | u16 uint16; | 44 | __u16 uint16; |
45 | s32 int32; | 45 | __s32 int32; |
46 | u32 uint32; | 46 | __u32 uint32; |
47 | s64 int64; | 47 | __s64 int64; |
48 | u64 uint64; | 48 | __u64 uint64; |
49 | void __user *ptr; | 49 | void __user *ptr; |
50 | } divert_cf_arg; | 50 | } divert_cf_arg; |
51 | 51 | ||
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 64fd6c366604..b2cd2071d432 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define __DMI_H__ | 2 | #define __DMI_H__ |
3 | 3 | ||
4 | #include <linux/list.h> | 4 | #include <linux/list.h> |
5 | #include <linux/config.h> | ||
6 | 5 | ||
7 | enum dmi_field { | 6 | enum dmi_field { |
8 | DMI_NONE, | 7 | DMI_NONE, |
diff --git a/include/linux/dnotify.h b/include/linux/dnotify.h index f134a01975c7..102a902b4396 100644 --- a/include/linux/dnotify.h +++ b/include/linux/dnotify.h | |||
@@ -18,7 +18,6 @@ struct dnotify_struct { | |||
18 | 18 | ||
19 | #ifdef __KERNEL__ | 19 | #ifdef __KERNEL__ |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | 21 | ||
23 | #ifdef CONFIG_DNOTIFY | 22 | #ifdef CONFIG_DNOTIFY |
24 | 23 | ||
diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h new file mode 100644 index 000000000000..114a96d25652 --- /dev/null +++ b/include/linux/elf-em.h | |||
@@ -0,0 +1,44 @@ | |||
1 | #ifndef _LINUX_ELF_EM_H | ||
2 | #define _LINUX_ELF_EM_H | ||
3 | |||
4 | /* These constants define the various ELF target machines */ | ||
5 | #define EM_NONE 0 | ||
6 | #define EM_M32 1 | ||
7 | #define EM_SPARC 2 | ||
8 | #define EM_386 3 | ||
9 | #define EM_68K 4 | ||
10 | #define EM_88K 5 | ||
11 | #define EM_486 6 /* Perhaps disused */ | ||
12 | #define EM_860 7 | ||
13 | #define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ | ||
14 | #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ | ||
15 | #define EM_PARISC 15 /* HPPA */ | ||
16 | #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ | ||
17 | #define EM_PPC 20 /* PowerPC */ | ||
18 | #define EM_PPC64 21 /* PowerPC64 */ | ||
19 | #define EM_SH 42 /* SuperH */ | ||
20 | #define EM_SPARCV9 43 /* SPARC v9 64-bit */ | ||
21 | #define EM_IA_64 50 /* HP/Intel IA-64 */ | ||
22 | #define EM_X86_64 62 /* AMD x86-64 */ | ||
23 | #define EM_S390 22 /* IBM S/390 */ | ||
24 | #define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ | ||
25 | #define EM_V850 87 /* NEC v850 */ | ||
26 | #define EM_M32R 88 /* Renesas M32R */ | ||
27 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ | ||
28 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | ||
29 | |||
30 | /* | ||
31 | * This is an interim value that we will use until the committee comes | ||
32 | * up with a final number. | ||
33 | */ | ||
34 | #define EM_ALPHA 0x9026 | ||
35 | |||
36 | /* Bogus old v850 magic number, used by old tools. */ | ||
37 | #define EM_CYGNUS_V850 0x9080 | ||
38 | /* Bogus old m32r magic number, used by old tools. */ | ||
39 | #define EM_CYGNUS_M32R 0x9041 | ||
40 | /* This is the old interim value for S/390 architecture */ | ||
41 | #define EM_S390_OLD 0xA390 | ||
42 | |||
43 | |||
44 | #endif /* _LINUX_ELF_EM_H */ | ||
diff --git a/include/linux/elf.h b/include/linux/elf.h index d3bfacb24496..b70d1d2c8d28 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/auxvec.h> | 5 | #include <linux/auxvec.h> |
6 | #include <linux/elf-em.h> | ||
6 | #include <asm/elf.h> | 7 | #include <asm/elf.h> |
7 | 8 | ||
8 | #ifndef elf_read_implies_exec | 9 | #ifndef elf_read_implies_exec |
@@ -55,64 +56,6 @@ typedef __s64 Elf64_Sxword; | |||
55 | #define ET_LOPROC 0xff00 | 56 | #define ET_LOPROC 0xff00 |
56 | #define ET_HIPROC 0xffff | 57 | #define ET_HIPROC 0xffff |
57 | 58 | ||
58 | /* These constants define the various ELF target machines */ | ||
59 | #define EM_NONE 0 | ||
60 | #define EM_M32 1 | ||
61 | #define EM_SPARC 2 | ||
62 | #define EM_386 3 | ||
63 | #define EM_68K 4 | ||
64 | #define EM_88K 5 | ||
65 | #define EM_486 6 /* Perhaps disused */ | ||
66 | #define EM_860 7 | ||
67 | |||
68 | #define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ | ||
69 | |||
70 | #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ | ||
71 | |||
72 | #define EM_PARISC 15 /* HPPA */ | ||
73 | |||
74 | #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ | ||
75 | |||
76 | #define EM_PPC 20 /* PowerPC */ | ||
77 | #define EM_PPC64 21 /* PowerPC64 */ | ||
78 | |||
79 | #define EM_SH 42 /* SuperH */ | ||
80 | |||
81 | #define EM_SPARCV9 43 /* SPARC v9 64-bit */ | ||
82 | |||
83 | #define EM_IA_64 50 /* HP/Intel IA-64 */ | ||
84 | |||
85 | #define EM_X86_64 62 /* AMD x86-64 */ | ||
86 | |||
87 | #define EM_S390 22 /* IBM S/390 */ | ||
88 | |||
89 | #define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */ | ||
90 | |||
91 | #define EM_V850 87 /* NEC v850 */ | ||
92 | |||
93 | #define EM_M32R 88 /* Renesas M32R */ | ||
94 | |||
95 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ | ||
96 | |||
97 | /* | ||
98 | * This is an interim value that we will use until the committee comes | ||
99 | * up with a final number. | ||
100 | */ | ||
101 | #define EM_ALPHA 0x9026 | ||
102 | |||
103 | /* Bogus old v850 magic number, used by old tools. */ | ||
104 | #define EM_CYGNUS_V850 0x9080 | ||
105 | |||
106 | /* Bogus old m32r magic number, used by old tools. */ | ||
107 | #define EM_CYGNUS_M32R 0x9041 | ||
108 | |||
109 | /* | ||
110 | * This is the old interim value for S/390 architecture | ||
111 | */ | ||
112 | #define EM_S390_OLD 0xA390 | ||
113 | |||
114 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | ||
115 | |||
116 | /* This is the info that is needed to parse the dynamic section of the file */ | 59 | /* This is the info that is needed to parse the dynamic section of the file */ |
117 | #define DT_NULL 0 | 60 | #define DT_NULL 0 |
118 | #define DT_NEEDED 1 | 61 | #define DT_NEEDED 1 |
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index 174582fedb8b..408118a07763 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h | |||
@@ -21,7 +21,6 @@ struct sock_extended_err | |||
21 | 21 | ||
22 | #ifdef __KERNEL__ | 22 | #ifdef __KERNEL__ |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | #include <net/ip.h> | 24 | #include <net/ip.h> |
26 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 25 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
27 | #include <linux/ipv6.h> | 26 | #include <linux/ipv6.h> |
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 93535f093216..cf2abeca92a0 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
@@ -15,24 +15,24 @@ | |||
15 | 15 | ||
16 | /* This should work for both 32 and 64 bit userland. */ | 16 | /* This should work for both 32 and 64 bit userland. */ |
17 | struct ethtool_cmd { | 17 | struct ethtool_cmd { |
18 | u32 cmd; | 18 | __u32 cmd; |
19 | u32 supported; /* Features this interface supports */ | 19 | __u32 supported; /* Features this interface supports */ |
20 | u32 advertising; /* Features this interface advertises */ | 20 | __u32 advertising; /* Features this interface advertises */ |
21 | u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ | 21 | __u16 speed; /* The forced speed, 10Mb, 100Mb, gigabit */ |
22 | u8 duplex; /* Duplex, half or full */ | 22 | __u8 duplex; /* Duplex, half or full */ |
23 | u8 port; /* Which connector port */ | 23 | __u8 port; /* Which connector port */ |
24 | u8 phy_address; | 24 | __u8 phy_address; |
25 | u8 transceiver; /* Which transceiver to use */ | 25 | __u8 transceiver; /* Which transceiver to use */ |
26 | u8 autoneg; /* Enable or disable autonegotiation */ | 26 | __u8 autoneg; /* Enable or disable autonegotiation */ |
27 | u32 maxtxpkt; /* Tx pkts before generating tx int */ | 27 | __u32 maxtxpkt; /* Tx pkts before generating tx int */ |
28 | u32 maxrxpkt; /* Rx pkts before generating rx int */ | 28 | __u32 maxrxpkt; /* Rx pkts before generating rx int */ |
29 | u32 reserved[4]; | 29 | __u32 reserved[4]; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | #define ETHTOOL_BUSINFO_LEN 32 | 32 | #define ETHTOOL_BUSINFO_LEN 32 |
33 | /* these strings are set to whatever the driver author decides... */ | 33 | /* these strings are set to whatever the driver author decides... */ |
34 | struct ethtool_drvinfo { | 34 | struct ethtool_drvinfo { |
35 | u32 cmd; | 35 | __u32 cmd; |
36 | char driver[32]; /* driver short name, "tulip", "eepro100" */ | 36 | char driver[32]; /* driver short name, "tulip", "eepro100" */ |
37 | char version[32]; /* driver version string */ | 37 | char version[32]; /* driver version string */ |
38 | char fw_version[32]; /* firmware version string, if applicable */ | 38 | char fw_version[32]; /* firmware version string, if applicable */ |
@@ -40,53 +40,53 @@ struct ethtool_drvinfo { | |||
40 | /* For PCI devices, use pci_name(pci_dev). */ | 40 | /* For PCI devices, use pci_name(pci_dev). */ |
41 | char reserved1[32]; | 41 | char reserved1[32]; |
42 | char reserved2[16]; | 42 | char reserved2[16]; |
43 | u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ | 43 | __u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ |
44 | u32 testinfo_len; | 44 | __u32 testinfo_len; |
45 | u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ | 45 | __u32 eedump_len; /* Size of data from ETHTOOL_GEEPROM (bytes) */ |
46 | u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ | 46 | __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */ |
47 | }; | 47 | }; |
48 | 48 | ||
49 | #define SOPASS_MAX 6 | 49 | #define SOPASS_MAX 6 |
50 | /* wake-on-lan settings */ | 50 | /* wake-on-lan settings */ |
51 | struct ethtool_wolinfo { | 51 | struct ethtool_wolinfo { |
52 | u32 cmd; | 52 | __u32 cmd; |
53 | u32 supported; | 53 | __u32 supported; |
54 | u32 wolopts; | 54 | __u32 wolopts; |
55 | u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ | 55 | __u8 sopass[SOPASS_MAX]; /* SecureOn(tm) password */ |
56 | }; | 56 | }; |
57 | 57 | ||
58 | /* for passing single values */ | 58 | /* for passing single values */ |
59 | struct ethtool_value { | 59 | struct ethtool_value { |
60 | u32 cmd; | 60 | __u32 cmd; |
61 | u32 data; | 61 | __u32 data; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | /* for passing big chunks of data */ | 64 | /* for passing big chunks of data */ |
65 | struct ethtool_regs { | 65 | struct ethtool_regs { |
66 | u32 cmd; | 66 | __u32 cmd; |
67 | u32 version; /* driver-specific, indicates different chips/revs */ | 67 | __u32 version; /* driver-specific, indicates different chips/revs */ |
68 | u32 len; /* bytes */ | 68 | __u32 len; /* bytes */ |
69 | u8 data[0]; | 69 | __u8 data[0]; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | /* for passing EEPROM chunks */ | 72 | /* for passing EEPROM chunks */ |
73 | struct ethtool_eeprom { | 73 | struct ethtool_eeprom { |
74 | u32 cmd; | 74 | __u32 cmd; |
75 | u32 magic; | 75 | __u32 magic; |
76 | u32 offset; /* in bytes */ | 76 | __u32 offset; /* in bytes */ |
77 | u32 len; /* in bytes */ | 77 | __u32 len; /* in bytes */ |
78 | u8 data[0]; | 78 | __u8 data[0]; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | /* for configuring coalescing parameters of chip */ | 81 | /* for configuring coalescing parameters of chip */ |
82 | struct ethtool_coalesce { | 82 | struct ethtool_coalesce { |
83 | u32 cmd; /* ETHTOOL_{G,S}COALESCE */ | 83 | __u32 cmd; /* ETHTOOL_{G,S}COALESCE */ |
84 | 84 | ||
85 | /* How many usecs to delay an RX interrupt after | 85 | /* How many usecs to delay an RX interrupt after |
86 | * a packet arrives. If 0, only rx_max_coalesced_frames | 86 | * a packet arrives. If 0, only rx_max_coalesced_frames |
87 | * is used. | 87 | * is used. |
88 | */ | 88 | */ |
89 | u32 rx_coalesce_usecs; | 89 | __u32 rx_coalesce_usecs; |
90 | 90 | ||
91 | /* How many packets to delay an RX interrupt after | 91 | /* How many packets to delay an RX interrupt after |
92 | * a packet arrives. If 0, only rx_coalesce_usecs is | 92 | * a packet arrives. If 0, only rx_coalesce_usecs is |
@@ -94,21 +94,21 @@ struct ethtool_coalesce { | |||
94 | * to zero as this would cause RX interrupts to never be | 94 | * to zero as this would cause RX interrupts to never be |
95 | * generated. | 95 | * generated. |
96 | */ | 96 | */ |
97 | u32 rx_max_coalesced_frames; | 97 | __u32 rx_max_coalesced_frames; |
98 | 98 | ||
99 | /* Same as above two parameters, except that these values | 99 | /* Same as above two parameters, except that these values |
100 | * apply while an IRQ is being serviced by the host. Not | 100 | * apply while an IRQ is being serviced by the host. Not |
101 | * all cards support this feature and the values are ignored | 101 | * all cards support this feature and the values are ignored |
102 | * in that case. | 102 | * in that case. |
103 | */ | 103 | */ |
104 | u32 rx_coalesce_usecs_irq; | 104 | __u32 rx_coalesce_usecs_irq; |
105 | u32 rx_max_coalesced_frames_irq; | 105 | __u32 rx_max_coalesced_frames_irq; |
106 | 106 | ||
107 | /* How many usecs to delay a TX interrupt after | 107 | /* How many usecs to delay a TX interrupt after |
108 | * a packet is sent. If 0, only tx_max_coalesced_frames | 108 | * a packet is sent. If 0, only tx_max_coalesced_frames |
109 | * is used. | 109 | * is used. |
110 | */ | 110 | */ |
111 | u32 tx_coalesce_usecs; | 111 | __u32 tx_coalesce_usecs; |
112 | 112 | ||
113 | /* How many packets to delay a TX interrupt after | 113 | /* How many packets to delay a TX interrupt after |
114 | * a packet is sent. If 0, only tx_coalesce_usecs is | 114 | * a packet is sent. If 0, only tx_coalesce_usecs is |
@@ -116,22 +116,22 @@ struct ethtool_coalesce { | |||
116 | * to zero as this would cause TX interrupts to never be | 116 | * to zero as this would cause TX interrupts to never be |
117 | * generated. | 117 | * generated. |
118 | */ | 118 | */ |
119 | u32 tx_max_coalesced_frames; | 119 | __u32 tx_max_coalesced_frames; |
120 | 120 | ||
121 | /* Same as above two parameters, except that these values | 121 | /* Same as above two parameters, except that these values |
122 | * apply while an IRQ is being serviced by the host. Not | 122 | * apply while an IRQ is being serviced by the host. Not |
123 | * all cards support this feature and the values are ignored | 123 | * all cards support this feature and the values are ignored |
124 | * in that case. | 124 | * in that case. |
125 | */ | 125 | */ |
126 | u32 tx_coalesce_usecs_irq; | 126 | __u32 tx_coalesce_usecs_irq; |
127 | u32 tx_max_coalesced_frames_irq; | 127 | __u32 tx_max_coalesced_frames_irq; |
128 | 128 | ||
129 | /* How many usecs to delay in-memory statistics | 129 | /* How many usecs to delay in-memory statistics |
130 | * block updates. Some drivers do not have an in-memory | 130 | * block updates. Some drivers do not have an in-memory |
131 | * statistic block, and in such cases this value is ignored. | 131 | * statistic block, and in such cases this value is ignored. |
132 | * This value must not be zero. | 132 | * This value must not be zero. |
133 | */ | 133 | */ |
134 | u32 stats_block_coalesce_usecs; | 134 | __u32 stats_block_coalesce_usecs; |
135 | 135 | ||
136 | /* Adaptive RX/TX coalescing is an algorithm implemented by | 136 | /* Adaptive RX/TX coalescing is an algorithm implemented by |
137 | * some drivers to improve latency under low packet rates and | 137 | * some drivers to improve latency under low packet rates and |
@@ -140,18 +140,18 @@ struct ethtool_coalesce { | |||
140 | * not implemented by the driver causes these values to be | 140 | * not implemented by the driver causes these values to be |
141 | * silently ignored. | 141 | * silently ignored. |
142 | */ | 142 | */ |
143 | u32 use_adaptive_rx_coalesce; | 143 | __u32 use_adaptive_rx_coalesce; |
144 | u32 use_adaptive_tx_coalesce; | 144 | __u32 use_adaptive_tx_coalesce; |
145 | 145 | ||
146 | /* When the packet rate (measured in packets per second) | 146 | /* When the packet rate (measured in packets per second) |
147 | * is below pkt_rate_low, the {rx,tx}_*_low parameters are | 147 | * is below pkt_rate_low, the {rx,tx}_*_low parameters are |
148 | * used. | 148 | * used. |
149 | */ | 149 | */ |
150 | u32 pkt_rate_low; | 150 | __u32 pkt_rate_low; |
151 | u32 rx_coalesce_usecs_low; | 151 | __u32 rx_coalesce_usecs_low; |
152 | u32 rx_max_coalesced_frames_low; | 152 | __u32 rx_max_coalesced_frames_low; |
153 | u32 tx_coalesce_usecs_low; | 153 | __u32 tx_coalesce_usecs_low; |
154 | u32 tx_max_coalesced_frames_low; | 154 | __u32 tx_max_coalesced_frames_low; |
155 | 155 | ||
156 | /* When the packet rate is below pkt_rate_high but above | 156 | /* When the packet rate is below pkt_rate_high but above |
157 | * pkt_rate_low (both measured in packets per second) the | 157 | * pkt_rate_low (both measured in packets per second) the |
@@ -162,43 +162,43 @@ struct ethtool_coalesce { | |||
162 | * is above pkt_rate_high, the {rx,tx}_*_high parameters are | 162 | * is above pkt_rate_high, the {rx,tx}_*_high parameters are |
163 | * used. | 163 | * used. |
164 | */ | 164 | */ |
165 | u32 pkt_rate_high; | 165 | __u32 pkt_rate_high; |
166 | u32 rx_coalesce_usecs_high; | 166 | __u32 rx_coalesce_usecs_high; |
167 | u32 rx_max_coalesced_frames_high; | 167 | __u32 rx_max_coalesced_frames_high; |
168 | u32 tx_coalesce_usecs_high; | 168 | __u32 tx_coalesce_usecs_high; |
169 | u32 tx_max_coalesced_frames_high; | 169 | __u32 tx_max_coalesced_frames_high; |
170 | 170 | ||
171 | /* How often to do adaptive coalescing packet rate sampling, | 171 | /* How often to do adaptive coalescing packet rate sampling, |
172 | * measured in seconds. Must not be zero. | 172 | * measured in seconds. Must not be zero. |
173 | */ | 173 | */ |
174 | u32 rate_sample_interval; | 174 | __u32 rate_sample_interval; |
175 | }; | 175 | }; |
176 | 176 | ||
177 | /* for configuring RX/TX ring parameters */ | 177 | /* for configuring RX/TX ring parameters */ |
178 | struct ethtool_ringparam { | 178 | struct ethtool_ringparam { |
179 | u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ | 179 | __u32 cmd; /* ETHTOOL_{G,S}RINGPARAM */ |
180 | 180 | ||
181 | /* Read only attributes. These indicate the maximum number | 181 | /* Read only attributes. These indicate the maximum number |
182 | * of pending RX/TX ring entries the driver will allow the | 182 | * of pending RX/TX ring entries the driver will allow the |
183 | * user to set. | 183 | * user to set. |
184 | */ | 184 | */ |
185 | u32 rx_max_pending; | 185 | __u32 rx_max_pending; |
186 | u32 rx_mini_max_pending; | 186 | __u32 rx_mini_max_pending; |
187 | u32 rx_jumbo_max_pending; | 187 | __u32 rx_jumbo_max_pending; |
188 | u32 tx_max_pending; | 188 | __u32 tx_max_pending; |
189 | 189 | ||
190 | /* Values changeable by the user. The valid values are | 190 | /* Values changeable by the user. The valid values are |
191 | * in the range 1 to the "*_max_pending" counterpart above. | 191 | * in the range 1 to the "*_max_pending" counterpart above. |
192 | */ | 192 | */ |
193 | u32 rx_pending; | 193 | __u32 rx_pending; |
194 | u32 rx_mini_pending; | 194 | __u32 rx_mini_pending; |
195 | u32 rx_jumbo_pending; | 195 | __u32 rx_jumbo_pending; |
196 | u32 tx_pending; | 196 | __u32 tx_pending; |
197 | }; | 197 | }; |
198 | 198 | ||
199 | /* for configuring link flow control parameters */ | 199 | /* for configuring link flow control parameters */ |
200 | struct ethtool_pauseparam { | 200 | struct ethtool_pauseparam { |
201 | u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ | 201 | __u32 cmd; /* ETHTOOL_{G,S}PAUSEPARAM */ |
202 | 202 | ||
203 | /* If the link is being auto-negotiated (via ethtool_cmd.autoneg | 203 | /* If the link is being auto-negotiated (via ethtool_cmd.autoneg |
204 | * being true) the user may set 'autonet' here non-zero to have the | 204 | * being true) the user may set 'autonet' here non-zero to have the |
@@ -210,9 +210,9 @@ struct ethtool_pauseparam { | |||
210 | * then {rx,tx}_pause force the driver to use/not-use pause | 210 | * then {rx,tx}_pause force the driver to use/not-use pause |
211 | * flow control. | 211 | * flow control. |
212 | */ | 212 | */ |
213 | u32 autoneg; | 213 | __u32 autoneg; |
214 | u32 rx_pause; | 214 | __u32 rx_pause; |
215 | u32 tx_pause; | 215 | __u32 tx_pause; |
216 | }; | 216 | }; |
217 | 217 | ||
218 | #define ETH_GSTRING_LEN 32 | 218 | #define ETH_GSTRING_LEN 32 |
@@ -223,10 +223,10 @@ enum ethtool_stringset { | |||
223 | 223 | ||
224 | /* for passing string sets for data tagging */ | 224 | /* for passing string sets for data tagging */ |
225 | struct ethtool_gstrings { | 225 | struct ethtool_gstrings { |
226 | u32 cmd; /* ETHTOOL_GSTRINGS */ | 226 | __u32 cmd; /* ETHTOOL_GSTRINGS */ |
227 | u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ | 227 | __u32 string_set; /* string set id e.c. ETH_SS_TEST, etc*/ |
228 | u32 len; /* number of strings in the string set */ | 228 | __u32 len; /* number of strings in the string set */ |
229 | u8 data[0]; | 229 | __u8 data[0]; |
230 | }; | 230 | }; |
231 | 231 | ||
232 | enum ethtool_test_flags { | 232 | enum ethtool_test_flags { |
@@ -236,26 +236,28 @@ enum ethtool_test_flags { | |||
236 | 236 | ||
237 | /* for requesting NIC test and getting results*/ | 237 | /* for requesting NIC test and getting results*/ |
238 | struct ethtool_test { | 238 | struct ethtool_test { |
239 | u32 cmd; /* ETHTOOL_TEST */ | 239 | __u32 cmd; /* ETHTOOL_TEST */ |
240 | u32 flags; /* ETH_TEST_FL_xxx */ | 240 | __u32 flags; /* ETH_TEST_FL_xxx */ |
241 | u32 reserved; | 241 | __u32 reserved; |
242 | u32 len; /* result length, in number of u64 elements */ | 242 | __u32 len; /* result length, in number of u64 elements */ |
243 | u64 data[0]; | 243 | __u64 data[0]; |
244 | }; | 244 | }; |
245 | 245 | ||
246 | /* for dumping NIC-specific statistics */ | 246 | /* for dumping NIC-specific statistics */ |
247 | struct ethtool_stats { | 247 | struct ethtool_stats { |
248 | u32 cmd; /* ETHTOOL_GSTATS */ | 248 | __u32 cmd; /* ETHTOOL_GSTATS */ |
249 | u32 n_stats; /* number of u64's being returned */ | 249 | __u32 n_stats; /* number of u64's being returned */ |
250 | u64 data[0]; | 250 | __u64 data[0]; |
251 | }; | 251 | }; |
252 | 252 | ||
253 | struct ethtool_perm_addr { | 253 | struct ethtool_perm_addr { |
254 | u32 cmd; /* ETHTOOL_GPERMADDR */ | 254 | __u32 cmd; /* ETHTOOL_GPERMADDR */ |
255 | u32 size; | 255 | __u32 size; |
256 | u8 data[0]; | 256 | __u8 data[0]; |
257 | }; | 257 | }; |
258 | 258 | ||
259 | #ifdef __KERNEL__ | ||
260 | |||
259 | struct net_device; | 261 | struct net_device; |
260 | 262 | ||
261 | /* Some generic methods drivers may use in their ethtool_ops */ | 263 | /* Some generic methods drivers may use in their ethtool_ops */ |
@@ -371,6 +373,7 @@ struct ethtool_ops { | |||
371 | u32 (*get_ufo)(struct net_device *); | 373 | u32 (*get_ufo)(struct net_device *); |
372 | int (*set_ufo)(struct net_device *, u32); | 374 | int (*set_ufo)(struct net_device *, u32); |
373 | }; | 375 | }; |
376 | #endif /* __KERNEL__ */ | ||
374 | 377 | ||
375 | /* CMDs currently supported */ | 378 | /* CMDs currently supported */ |
376 | #define ETHTOOL_GSET 0x00000001 /* Get settings. */ | 379 | #define ETHTOOL_GSET 0x00000001 /* Get settings. */ |
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index f7bd1c7ebefb..facf34e98954 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h | |||
@@ -17,7 +17,6 @@ | |||
17 | #define _LINUX_EXT2_FS_H | 17 | #define _LINUX_EXT2_FS_H |
18 | 18 | ||
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <linux/ext2_fs_sb.h> | ||
21 | 20 | ||
22 | /* | 21 | /* |
23 | * The second extended filesystem constants/structures | 22 | * The second extended filesystem constants/structures |
@@ -70,6 +69,7 @@ | |||
70 | #define EXT2_SUPER_MAGIC 0xEF53 | 69 | #define EXT2_SUPER_MAGIC 0xEF53 |
71 | 70 | ||
72 | #ifdef __KERNEL__ | 71 | #ifdef __KERNEL__ |
72 | #include <linux/ext2_fs_sb.h> | ||
73 | static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) | 73 | static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) |
74 | { | 74 | { |
75 | return sb->s_fs_info; | 75 | return sb->s_fs_info; |
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index 3ade6a4e3bdd..757d54d8f1a5 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h | |||
@@ -17,11 +17,6 @@ | |||
17 | #define _LINUX_EXT3_FS_H | 17 | #define _LINUX_EXT3_FS_H |
18 | 18 | ||
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <linux/ext3_fs_i.h> | ||
21 | #include <linux/ext3_fs_sb.h> | ||
22 | |||
23 | |||
24 | struct statfs; | ||
25 | 20 | ||
26 | /* | 21 | /* |
27 | * The second extended filesystem constants/structures | 22 | * The second extended filesystem constants/structures |
@@ -487,6 +482,8 @@ struct ext3_super_block { | |||
487 | }; | 482 | }; |
488 | 483 | ||
489 | #ifdef __KERNEL__ | 484 | #ifdef __KERNEL__ |
485 | #include <linux/ext3_fs_i.h> | ||
486 | #include <linux/ext3_fs_sb.h> | ||
490 | static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) | 487 | static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb) |
491 | { | 488 | { |
492 | return sb->s_fs_info; | 489 | return sb->s_fs_info; |
@@ -664,6 +661,8 @@ struct ext3_dir_entry_2 { | |||
664 | #define DX_HASH_HALF_MD4 1 | 661 | #define DX_HASH_HALF_MD4 1 |
665 | #define DX_HASH_TEA 2 | 662 | #define DX_HASH_TEA 2 |
666 | 663 | ||
664 | #ifdef __KERNEL__ | ||
665 | |||
667 | /* hash info structure used by the directory hash */ | 666 | /* hash info structure used by the directory hash */ |
668 | struct dx_hash_info | 667 | struct dx_hash_info |
669 | { | 668 | { |
@@ -675,7 +674,6 @@ struct dx_hash_info | |||
675 | 674 | ||
676 | #define EXT3_HTREE_EOF 0x7fffffff | 675 | #define EXT3_HTREE_EOF 0x7fffffff |
677 | 676 | ||
678 | #ifdef __KERNEL__ | ||
679 | /* | 677 | /* |
680 | * Control parameters used by ext3_htree_next_block | 678 | * Control parameters used by ext3_htree_next_block |
681 | */ | 679 | */ |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 3de2bfb2410f..75a236c268fc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * structures etc. | 6 | * structures etc. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/limits.h> | 9 | #include <linux/limits.h> |
11 | #include <linux/ioctl.h> | 10 | #include <linux/ioctl.h> |
12 | 11 | ||
diff --git a/include/linux/ftape.h b/include/linux/ftape.h index 72faeec9f6e1..7e7038cba86a 100644 --- a/include/linux/ftape.h +++ b/include/linux/ftape.h | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
36 | #endif | 36 | #endif |
37 | #include <linux/types.h> | 37 | #include <linux/types.h> |
38 | #include <linux/config.h> | ||
39 | #include <linux/mtio.h> | 38 | #include <linux/mtio.h> |
40 | 39 | ||
41 | #define FT_SECTOR(x) (x+1) /* sector offset into real sector */ | 40 | #define FT_SECTOR(x) (x+1) /* sector offset into real sector */ |
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 71e7b2847cb3..2cdba0c23957 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h | |||
@@ -9,6 +9,7 @@ | |||
9 | * the Free Software Foundation. | 9 | * the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #ifdef __KERNEL__ | ||
12 | #include <asm/io.h> | 13 | #include <asm/io.h> |
13 | #include <linux/list.h> | 14 | #include <linux/list.h> |
14 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
@@ -154,6 +155,8 @@ static inline void gameport_register_driver(struct gameport_driver *drv) | |||
154 | 155 | ||
155 | void gameport_unregister_driver(struct gameport_driver *drv); | 156 | void gameport_unregister_driver(struct gameport_driver *drv); |
156 | 157 | ||
158 | #endif /* __KERNEL__ */ | ||
159 | |||
157 | #define GAMEPORT_MODE_DISABLED 0 | 160 | #define GAMEPORT_MODE_DISABLED 0 |
158 | #define GAMEPORT_MODE_RAW 1 | 161 | #define GAMEPORT_MODE_RAW 1 |
159 | #define GAMEPORT_MODE_COOKED 2 | 162 | #define GAMEPORT_MODE_COOKED 2 |
@@ -169,6 +172,8 @@ void gameport_unregister_driver(struct gameport_driver *drv); | |||
169 | #define GAMEPORT_ID_VENDOR_GRAVIS 0x0009 | 172 | #define GAMEPORT_ID_VENDOR_GRAVIS 0x0009 |
170 | #define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a | 173 | #define GAMEPORT_ID_VENDOR_GUILLEMOT 0x000a |
171 | 174 | ||
175 | #ifdef __KERNEL__ | ||
176 | |||
172 | static inline void gameport_trigger(struct gameport *gameport) | 177 | static inline void gameport_trigger(struct gameport *gameport) |
173 | { | 178 | { |
174 | if (gameport->trigger) | 179 | if (gameport->trigger) |
@@ -219,4 +224,5 @@ static inline void gameport_set_poll_interval(struct gameport *gameport, unsigne | |||
219 | void gameport_start_polling(struct gameport *gameport); | 224 | void gameport_start_polling(struct gameport *gameport); |
220 | void gameport_stop_polling(struct gameport *gameport); | 225 | void gameport_stop_polling(struct gameport *gameport); |
221 | 226 | ||
227 | #endif /* __KERNEL__ */ | ||
222 | #endif | 228 | #endif |
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h index 652611a4bdcd..e25384561955 100644 --- a/include/linux/generic_serial.h +++ b/include/linux/generic_serial.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #ifndef GENERIC_SERIAL_H | 12 | #ifndef GENERIC_SERIAL_H |
13 | #define GENERIC_SERIAL_H | 13 | #define GENERIC_SERIAL_H |
14 | 14 | ||
15 | #ifdef __KERNEL__ | ||
15 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
16 | 17 | ||
17 | struct real_driver { | 18 | struct real_driver { |
@@ -54,6 +55,7 @@ struct gs_port { | |||
54 | spinlock_t driver_lock; | 55 | spinlock_t driver_lock; |
55 | }; | 56 | }; |
56 | 57 | ||
58 | #endif /* __KERNEL__ */ | ||
57 | 59 | ||
58 | /* Flags */ | 60 | /* Flags */ |
59 | /* Warning: serial.h defines some ASYNC_ flags, they say they are "only" | 61 | /* Warning: serial.h defines some ASYNC_ flags, they say they are "only" |
@@ -75,7 +77,7 @@ struct gs_port { | |||
75 | #define GS_DEBUG_FLOW 0x00000020 | 77 | #define GS_DEBUG_FLOW 0x00000020 |
76 | #define GS_DEBUG_WRITE 0x00000040 | 78 | #define GS_DEBUG_WRITE 0x00000040 |
77 | 79 | ||
78 | 80 | #ifdef __KERNEL__ | |
79 | void gs_put_char(struct tty_struct *tty, unsigned char ch); | 81 | void gs_put_char(struct tty_struct *tty, unsigned char ch); |
80 | int gs_write(struct tty_struct *tty, | 82 | int gs_write(struct tty_struct *tty, |
81 | const unsigned char *buf, int count); | 83 | const unsigned char *buf, int count); |
@@ -94,5 +96,5 @@ int gs_init_port(struct gs_port *port); | |||
94 | int gs_setserial(struct gs_port *port, struct serial_struct __user *sp); | 96 | int gs_setserial(struct gs_port *port, struct serial_struct __user *sp); |
95 | int gs_getserial(struct gs_port *port, struct serial_struct __user *sp); | 97 | int gs_getserial(struct gs_port *port, struct serial_struct __user *sp); |
96 | void gs_got_break(struct gs_port *port); | 98 | void gs_got_break(struct gs_port *port); |
97 | 99 | #endif /* __KERNEL__ */ | |
98 | #endif | 100 | #endif |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 2ef845b35175..3498a0c68184 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -9,13 +9,7 @@ | |||
9 | * <drew@colorado.edu> | 9 | * <drew@colorado.edu> |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
14 | #include <linux/major.h> | ||
15 | #include <linux/device.h> | ||
16 | #include <linux/smp.h> | ||
17 | #include <linux/string.h> | ||
18 | #include <linux/fs.h> | ||
19 | 13 | ||
20 | enum { | 14 | enum { |
21 | /* These three have identical behaviour; use the second one if DOS FDISK gets | 15 | /* These three have identical behaviour; use the second one if DOS FDISK gets |
@@ -61,6 +55,12 @@ struct partition { | |||
61 | #endif | 55 | #endif |
62 | 56 | ||
63 | #ifdef __KERNEL__ | 57 | #ifdef __KERNEL__ |
58 | #include <linux/major.h> | ||
59 | #include <linux/device.h> | ||
60 | #include <linux/smp.h> | ||
61 | #include <linux/string.h> | ||
62 | #include <linux/fs.h> | ||
63 | |||
64 | struct partition { | 64 | struct partition { |
65 | unsigned char boot_ind; /* 0x80 - active */ | 65 | unsigned char boot_ind; /* 0x80 - active */ |
66 | unsigned char head; /* starting head */ | 66 | unsigned char head; /* starting head */ |
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3ac452945a7d..cc9e60844484 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <linux/mmzone.h> | 4 | #include <linux/mmzone.h> |
5 | #include <linux/stddef.h> | 5 | #include <linux/stddef.h> |
6 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
7 | #include <linux/config.h> | ||
8 | 7 | ||
9 | struct vm_area_struct; | 8 | struct vm_area_struct; |
10 | 9 | ||
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index eab537091f2a..114ae583cca9 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef LINUX_HARDIRQ_H | 1 | #ifndef LINUX_HARDIRQ_H |
2 | #define LINUX_HARDIRQ_H | 2 | #define LINUX_HARDIRQ_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/preempt.h> | 4 | #include <linux/preempt.h> |
6 | #include <linux/smp_lock.h> | 5 | #include <linux/smp_lock.h> |
7 | #include <asm/hardirq.h> | 6 | #include <asm/hardirq.h> |
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 892c4ea1b425..85ce7ef9a512 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_HIGHMEM_H | 1 | #ifndef _LINUX_HIGHMEM_H |
2 | #define _LINUX_HIGHMEM_H | 2 | #define _LINUX_HIGHMEM_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/fs.h> | 4 | #include <linux/fs.h> |
6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
7 | 6 | ||
diff --git a/include/linux/highuid.h b/include/linux/highuid.h index 53ecac3905e8..434e56246f67 100644 --- a/include/linux/highuid.h +++ b/include/linux/highuid.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_HIGHUID_H | 1 | #ifndef _LINUX_HIGHUID_H |
2 | #define _LINUX_HIGHUID_H | 2 | #define _LINUX_HIGHUID_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
6 | 5 | ||
7 | /* | 6 | /* |
diff --git a/include/linux/i2c-algo-ite.h b/include/linux/i2c-algo-ite.h index 26a8b89855f1..0073fe96c76e 100644 --- a/include/linux/i2c-algo-ite.h +++ b/include/linux/i2c-algo-ite.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #ifndef I2C_ALGO_ITE_H | 29 | #ifndef I2C_ALGO_ITE_H |
30 | #define I2C_ALGO_ITE_H 1 | 30 | #define I2C_ALGO_ITE_H 1 |
31 | 31 | ||
32 | #include <linux/i2c.h> | 32 | #include <linux/types.h> |
33 | 33 | ||
34 | /* Example of a sequential read request: | 34 | /* Example of a sequential read request: |
35 | struct i2c_iic_msg s_msg; | 35 | struct i2c_iic_msg s_msg; |
@@ -49,6 +49,9 @@ struct i2c_iic_msg { | |||
49 | char *buf; /* pointer to msg data */ | 49 | char *buf; /* pointer to msg data */ |
50 | }; | 50 | }; |
51 | 51 | ||
52 | #ifdef __KERNEL__ | ||
53 | struct i2c_adapter; | ||
54 | |||
52 | struct i2c_algo_iic_data { | 55 | struct i2c_algo_iic_data { |
53 | void *data; /* private data for lolevel routines */ | 56 | void *data; /* private data for lolevel routines */ |
54 | void (*setiic) (void *data, int ctl, int val); | 57 | void (*setiic) (void *data, int ctl, int val); |
@@ -65,5 +68,5 @@ struct i2c_algo_iic_data { | |||
65 | 68 | ||
66 | int i2c_iic_add_bus(struct i2c_adapter *); | 69 | int i2c_iic_add_bus(struct i2c_adapter *); |
67 | int i2c_iic_del_bus(struct i2c_adapter *); | 70 | int i2c_iic_del_bus(struct i2c_adapter *); |
68 | 71 | #endif /* __KERNEL__ */ | |
69 | #endif /* I2C_ALGO_ITE_H */ | 72 | #endif /* I2C_ALGO_ITE_H */ |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 1635ee25918f..0510430e00db 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -20,14 +20,15 @@ | |||
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ | 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ |
21 | /* ------------------------------------------------------------------------- */ | 21 | /* ------------------------------------------------------------------------- */ |
22 | 22 | ||
23 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and | 23 | /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and |
24 | Frodo Looijaard <frodol@dds.nl> */ | 24 | Frodo Looijaard <frodol@dds.nl> */ |
25 | 25 | ||
26 | #ifndef _LINUX_I2C_H | 26 | #ifndef _LINUX_I2C_H |
27 | #define _LINUX_I2C_H | 27 | #define _LINUX_I2C_H |
28 | 28 | ||
29 | #include <linux/module.h> | ||
30 | #include <linux/types.h> | 29 | #include <linux/types.h> |
30 | #ifdef __KERNEL__ | ||
31 | #include <linux/module.h> | ||
31 | #include <linux/i2c-id.h> | 32 | #include <linux/i2c-id.h> |
32 | #include <linux/mod_devicetable.h> | 33 | #include <linux/mod_devicetable.h> |
33 | #include <linux/device.h> /* for struct device */ | 34 | #include <linux/device.h> /* for struct device */ |
@@ -354,6 +355,7 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap) | |||
354 | { | 355 | { |
355 | return adap->nr; | 356 | return adap->nr; |
356 | } | 357 | } |
358 | #endif /* __KERNEL__ */ | ||
357 | 359 | ||
358 | /* | 360 | /* |
359 | * I2C Message - used for pure i2c transaction, also from /dev interface | 361 | * I2C Message - used for pure i2c transaction, also from /dev interface |
@@ -469,6 +471,7 @@ union i2c_smbus_data { | |||
469 | #define I2C_SMBUS 0x0720 /* SMBus-level access */ | 471 | #define I2C_SMBUS 0x0720 /* SMBus-level access */ |
470 | 472 | ||
471 | /* ----- I2C-DEV: char device interface stuff ------------------------- */ | 473 | /* ----- I2C-DEV: char device interface stuff ------------------------- */ |
474 | #ifdef __KERNEL__ | ||
472 | 475 | ||
473 | #define I2C_MAJOR 89 /* Device major number */ | 476 | #define I2C_MAJOR 89 /* Device major number */ |
474 | 477 | ||
@@ -646,5 +649,5 @@ static unsigned short *forces[] = { force, force_##chip1, \ | |||
646 | force_##chip6, force_##chip7, \ | 649 | force_##chip6, force_##chip7, \ |
647 | force_##chip8, NULL }; \ | 650 | force_##chip8, NULL }; \ |
648 | I2C_CLIENT_INSMOD_COMMON | 651 | I2C_CLIENT_INSMOD_COMMON |
649 | 652 | #endif /* __KERNEL__ */ | |
650 | #endif /* _LINUX_I2C_H */ | 653 | #endif /* _LINUX_I2C_H */ |
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h index 36fd18cdad28..c2519df1b6dc 100644 --- a/include/linux/i2o-dev.h +++ b/include/linux/i2o-dev.h | |||
@@ -13,7 +13,7 @@ | |||
13 | * This header file defines the I2O APIs that are available to both | 13 | * This header file defines the I2O APIs that are available to both |
14 | * the kernel and user level applications. Kernel specific structures | 14 | * the kernel and user level applications. Kernel specific structures |
15 | * are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which | 15 | * are defined in i2o_osm. OSMs should include _only_ i2o_osm.h which |
16 | * automatically includs this file. | 16 | * automatically includes this file. |
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
@@ -23,14 +23,7 @@ | |||
23 | /* How many controllers are we allowing */ | 23 | /* How many controllers are we allowing */ |
24 | #define MAX_I2O_CONTROLLERS 32 | 24 | #define MAX_I2O_CONTROLLERS 32 |
25 | 25 | ||
26 | //#include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
27 | #ifndef __KERNEL__ | ||
28 | |||
29 | typedef unsigned char u8; | ||
30 | typedef unsigned short u16; | ||
31 | typedef unsigned int u32; | ||
32 | |||
33 | #endif /* __KERNEL__ */ | ||
34 | 27 | ||
35 | /* | 28 | /* |
36 | * I2O Control IOCTLs and structures | 29 | * I2O Control IOCTLs and structures |
@@ -53,7 +46,7 @@ typedef unsigned int u32; | |||
53 | 46 | ||
54 | struct i2o_cmd_passthru32 { | 47 | struct i2o_cmd_passthru32 { |
55 | unsigned int iop; /* IOP unit number */ | 48 | unsigned int iop; /* IOP unit number */ |
56 | u32 msg; /* message */ | 49 | __u32 msg; /* message */ |
57 | }; | 50 | }; |
58 | 51 | ||
59 | struct i2o_cmd_passthru { | 52 | struct i2o_cmd_passthru { |
@@ -138,53 +131,53 @@ typedef struct i2o_sg_io_hdr { | |||
138 | #define I2O_BUS_UNKNOWN 0x80 | 131 | #define I2O_BUS_UNKNOWN 0x80 |
139 | 132 | ||
140 | typedef struct _i2o_pci_bus { | 133 | typedef struct _i2o_pci_bus { |
141 | u8 PciFunctionNumber; | 134 | __u8 PciFunctionNumber; |
142 | u8 PciDeviceNumber; | 135 | __u8 PciDeviceNumber; |
143 | u8 PciBusNumber; | 136 | __u8 PciBusNumber; |
144 | u8 reserved; | 137 | __u8 reserved; |
145 | u16 PciVendorID; | 138 | __u16 PciVendorID; |
146 | u16 PciDeviceID; | 139 | __u16 PciDeviceID; |
147 | } i2o_pci_bus; | 140 | } i2o_pci_bus; |
148 | 141 | ||
149 | typedef struct _i2o_local_bus { | 142 | typedef struct _i2o_local_bus { |
150 | u16 LbBaseIOPort; | 143 | __u16 LbBaseIOPort; |
151 | u16 reserved; | 144 | __u16 reserved; |
152 | u32 LbBaseMemoryAddress; | 145 | __u32 LbBaseMemoryAddress; |
153 | } i2o_local_bus; | 146 | } i2o_local_bus; |
154 | 147 | ||
155 | typedef struct _i2o_isa_bus { | 148 | typedef struct _i2o_isa_bus { |
156 | u16 IsaBaseIOPort; | 149 | __u16 IsaBaseIOPort; |
157 | u8 CSN; | 150 | __u8 CSN; |
158 | u8 reserved; | 151 | __u8 reserved; |
159 | u32 IsaBaseMemoryAddress; | 152 | __u32 IsaBaseMemoryAddress; |
160 | } i2o_isa_bus; | 153 | } i2o_isa_bus; |
161 | 154 | ||
162 | typedef struct _i2o_eisa_bus_info { | 155 | typedef struct _i2o_eisa_bus_info { |
163 | u16 EisaBaseIOPort; | 156 | __u16 EisaBaseIOPort; |
164 | u8 reserved; | 157 | __u8 reserved; |
165 | u8 EisaSlotNumber; | 158 | __u8 EisaSlotNumber; |
166 | u32 EisaBaseMemoryAddress; | 159 | __u32 EisaBaseMemoryAddress; |
167 | } i2o_eisa_bus; | 160 | } i2o_eisa_bus; |
168 | 161 | ||
169 | typedef struct _i2o_mca_bus { | 162 | typedef struct _i2o_mca_bus { |
170 | u16 McaBaseIOPort; | 163 | __u16 McaBaseIOPort; |
171 | u8 reserved; | 164 | __u8 reserved; |
172 | u8 McaSlotNumber; | 165 | __u8 McaSlotNumber; |
173 | u32 McaBaseMemoryAddress; | 166 | __u32 McaBaseMemoryAddress; |
174 | } i2o_mca_bus; | 167 | } i2o_mca_bus; |
175 | 168 | ||
176 | typedef struct _i2o_other_bus { | 169 | typedef struct _i2o_other_bus { |
177 | u16 BaseIOPort; | 170 | __u16 BaseIOPort; |
178 | u16 reserved; | 171 | __u16 reserved; |
179 | u32 BaseMemoryAddress; | 172 | __u32 BaseMemoryAddress; |
180 | } i2o_other_bus; | 173 | } i2o_other_bus; |
181 | 174 | ||
182 | typedef struct _i2o_hrt_entry { | 175 | typedef struct _i2o_hrt_entry { |
183 | u32 adapter_id; | 176 | __u32 adapter_id; |
184 | u32 parent_tid:12; | 177 | __u32 parent_tid:12; |
185 | u32 state:4; | 178 | __u32 state:4; |
186 | u32 bus_num:8; | 179 | __u32 bus_num:8; |
187 | u32 bus_type:8; | 180 | __u32 bus_type:8; |
188 | union { | 181 | union { |
189 | i2o_pci_bus pci_bus; | 182 | i2o_pci_bus pci_bus; |
190 | i2o_local_bus local_bus; | 183 | i2o_local_bus local_bus; |
@@ -196,66 +189,66 @@ typedef struct _i2o_hrt_entry { | |||
196 | } i2o_hrt_entry; | 189 | } i2o_hrt_entry; |
197 | 190 | ||
198 | typedef struct _i2o_hrt { | 191 | typedef struct _i2o_hrt { |
199 | u16 num_entries; | 192 | __u16 num_entries; |
200 | u8 entry_len; | 193 | __u8 entry_len; |
201 | u8 hrt_version; | 194 | __u8 hrt_version; |
202 | u32 change_ind; | 195 | __u32 change_ind; |
203 | i2o_hrt_entry hrt_entry[1]; | 196 | i2o_hrt_entry hrt_entry[1]; |
204 | } i2o_hrt; | 197 | } i2o_hrt; |
205 | 198 | ||
206 | typedef struct _i2o_lct_entry { | 199 | typedef struct _i2o_lct_entry { |
207 | u32 entry_size:16; | 200 | __u32 entry_size:16; |
208 | u32 tid:12; | 201 | __u32 tid:12; |
209 | u32 reserved:4; | 202 | __u32 reserved:4; |
210 | u32 change_ind; | 203 | __u32 change_ind; |
211 | u32 device_flags; | 204 | __u32 device_flags; |
212 | u32 class_id:12; | 205 | __u32 class_id:12; |
213 | u32 version:4; | 206 | __u32 version:4; |
214 | u32 vendor_id:16; | 207 | __u32 vendor_id:16; |
215 | u32 sub_class; | 208 | __u32 sub_class; |
216 | u32 user_tid:12; | 209 | __u32 user_tid:12; |
217 | u32 parent_tid:12; | 210 | __u32 parent_tid:12; |
218 | u32 bios_info:8; | 211 | __u32 bios_info:8; |
219 | u8 identity_tag[8]; | 212 | __u8 identity_tag[8]; |
220 | u32 event_capabilities; | 213 | __u32 event_capabilities; |
221 | } i2o_lct_entry; | 214 | } i2o_lct_entry; |
222 | 215 | ||
223 | typedef struct _i2o_lct { | 216 | typedef struct _i2o_lct { |
224 | u32 table_size:16; | 217 | __u32 table_size:16; |
225 | u32 boot_tid:12; | 218 | __u32 boot_tid:12; |
226 | u32 lct_ver:4; | 219 | __u32 lct_ver:4; |
227 | u32 iop_flags; | 220 | __u32 iop_flags; |
228 | u32 change_ind; | 221 | __u32 change_ind; |
229 | i2o_lct_entry lct_entry[1]; | 222 | i2o_lct_entry lct_entry[1]; |
230 | } i2o_lct; | 223 | } i2o_lct; |
231 | 224 | ||
232 | typedef struct _i2o_status_block { | 225 | typedef struct _i2o_status_block { |
233 | u16 org_id; | 226 | __u16 org_id; |
234 | u16 reserved; | 227 | __u16 reserved; |
235 | u16 iop_id:12; | 228 | __u16 iop_id:12; |
236 | u16 reserved1:4; | 229 | __u16 reserved1:4; |
237 | u16 host_unit_id; | 230 | __u16 host_unit_id; |
238 | u16 segment_number:12; | 231 | __u16 segment_number:12; |
239 | u16 i2o_version:4; | 232 | __u16 i2o_version:4; |
240 | u8 iop_state; | 233 | __u8 iop_state; |
241 | u8 msg_type; | 234 | __u8 msg_type; |
242 | u16 inbound_frame_size; | 235 | __u16 inbound_frame_size; |
243 | u8 init_code; | 236 | __u8 init_code; |
244 | u8 reserved2; | 237 | __u8 reserved2; |
245 | u32 max_inbound_frames; | 238 | __u32 max_inbound_frames; |
246 | u32 cur_inbound_frames; | 239 | __u32 cur_inbound_frames; |
247 | u32 max_outbound_frames; | 240 | __u32 max_outbound_frames; |
248 | char product_id[24]; | 241 | char product_id[24]; |
249 | u32 expected_lct_size; | 242 | __u32 expected_lct_size; |
250 | u32 iop_capabilities; | 243 | __u32 iop_capabilities; |
251 | u32 desired_mem_size; | 244 | __u32 desired_mem_size; |
252 | u32 current_mem_size; | 245 | __u32 current_mem_size; |
253 | u32 current_mem_base; | 246 | __u32 current_mem_base; |
254 | u32 desired_io_size; | 247 | __u32 desired_io_size; |
255 | u32 current_io_size; | 248 | __u32 current_io_size; |
256 | u32 current_io_base; | 249 | __u32 current_io_base; |
257 | u32 reserved3:24; | 250 | __u32 reserved3:24; |
258 | u32 cmd_status:8; | 251 | __u32 cmd_status:8; |
259 | } i2o_status_block; | 252 | } i2o_status_block; |
260 | 253 | ||
261 | /* Event indicator mask flags */ | 254 | /* Event indicator mask flags */ |
diff --git a/include/linux/ide.h b/include/linux/ide.h index a8bef1d1371c..77e66d055f5b 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Copyright (C) 1994-2002 Linus Torvalds & authors | 6 | * Copyright (C) 1994-2002 Linus Torvalds & authors |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
11 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
12 | #include <linux/hdreg.h> | 11 | #include <linux/hdreg.h> |
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 395f0aad9cbf..f272a80caa3e 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #ifndef _FRAD_H_ | 24 | #ifndef _FRAD_H_ |
25 | #define _FRAD_H_ | 25 | #define _FRAD_H_ |
26 | 26 | ||
27 | #include <linux/config.h> | ||
28 | #include <linux/if.h> | 27 | #include <linux/if.h> |
29 | 28 | ||
30 | #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) | 29 | #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) |
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h index 5502f597cf0e..2f94cf2c7abb 100644 --- a/include/linux/if_tr.h +++ b/include/linux/if_tr.h | |||
@@ -43,7 +43,6 @@ struct trh_hdr { | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
46 | #include <linux/config.h> | ||
47 | #include <linux/skbuff.h> | 46 | #include <linux/skbuff.h> |
48 | 47 | ||
49 | static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb) | 48 | static inline struct trh_hdr *tr_hdr(const struct sk_buff *skb) |
diff --git a/include/linux/init.h b/include/linux/init.h index 93dcbe1abb4c..6667785dd1ff 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_INIT_H | 1 | #ifndef _LINUX_INIT_H |
2 | #define _LINUX_INIT_H | 2 | #define _LINUX_INIT_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
6 | 5 | ||
7 | /* These macros are used to mark some functions or | 6 | /* These macros are used to mark some functions or |
diff --git a/include/linux/inotify.h b/include/linux/inotify.h index 09e00433c78e..71aa1553ef38 100644 --- a/include/linux/inotify.h +++ b/include/linux/inotify.h | |||
@@ -67,7 +67,6 @@ struct inotify_event { | |||
67 | 67 | ||
68 | #include <linux/dcache.h> | 68 | #include <linux/dcache.h> |
69 | #include <linux/fs.h> | 69 | #include <linux/fs.h> |
70 | #include <linux/config.h> | ||
71 | 70 | ||
72 | #ifdef CONFIG_INOTIFY | 71 | #ifdef CONFIG_INOTIFY |
73 | 72 | ||
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 2c08fdc2bdf7..9e0fefd7884a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #ifndef _LINUX_INTERRUPT_H | 2 | #ifndef _LINUX_INTERRUPT_H |
3 | #define _LINUX_INTERRUPT_H | 3 | #define _LINUX_INTERRUPT_H |
4 | 4 | ||
5 | #include <linux/config.h> | ||
6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
7 | #include <linux/linkage.h> | 6 | #include <linux/linkage.h> |
8 | #include <linux/bitops.h> | 7 | #include <linux/bitops.h> |
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 0a84b56935c2..5653b2f23b6a 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h | |||
@@ -36,7 +36,6 @@ | |||
36 | 36 | ||
37 | #include <linux/ipmi_msgdefs.h> | 37 | #include <linux/ipmi_msgdefs.h> |
38 | #include <linux/compiler.h> | 38 | #include <linux/compiler.h> |
39 | #include <linux/device.h> | ||
40 | 39 | ||
41 | /* | 40 | /* |
42 | * This file describes an interface to an IPMI driver. You have to | 41 | * This file describes an interface to an IPMI driver. You have to |
@@ -210,6 +209,7 @@ struct kernel_ipmi_msg | |||
210 | */ | 209 | */ |
211 | #include <linux/list.h> | 210 | #include <linux/list.h> |
212 | #include <linux/module.h> | 211 | #include <linux/module.h> |
212 | #include <linux/device.h> | ||
213 | 213 | ||
214 | #ifdef CONFIG_PROC_FS | 214 | #ifdef CONFIG_PROC_FS |
215 | #include <linux/proc_fs.h> | 215 | #include <linux/proc_fs.h> |
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 1263d8cb3c18..297853c841b4 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _IPV6_H | 1 | #ifndef _IPV6_H |
2 | #define _IPV6_H | 2 | #define _IPV6_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/in6.h> | 4 | #include <linux/in6.h> |
6 | #include <asm/byteorder.h> | 5 | #include <asm/byteorder.h> |
7 | 6 | ||
diff --git a/include/linux/irq.h b/include/linux/irq.h index ee2a82a572f7..42c9cd562860 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -9,7 +9,6 @@ | |||
9 | * Thanks. --rmk | 9 | * Thanks. --rmk |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/smp.h> | 12 | #include <linux/smp.h> |
14 | 13 | ||
15 | #if !defined(CONFIG_S390) | 14 | #if !defined(CONFIG_S390) |
diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h index af93505ec2ec..77e4bac29287 100644 --- a/include/linux/irq_cpustat.h +++ b/include/linux/irq_cpustat.h | |||
@@ -9,7 +9,6 @@ | |||
9 | * Keith Owens <kaos@ocs.com.au> July 2000. | 9 | * Keith Owens <kaos@ocs.com.au> July 2000. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | 12 | ||
14 | /* | 13 | /* |
15 | * Simple wrappers reducing source bloat. Define all irq_stat fields | 14 | * Simple wrappers reducing source bloat. Define all irq_stat fields |
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index 26c64c286f42..1e8728a9ee8a 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h | |||
@@ -22,7 +22,6 @@ | |||
22 | #ifndef LINUX_ISAPNP_H | 22 | #ifndef LINUX_ISAPNP_H |
23 | #define LINUX_ISAPNP_H | 23 | #define LINUX_ISAPNP_H |
24 | 24 | ||
25 | #include <linux/config.h> | ||
26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
27 | #include <linux/pnp.h> | 26 | #include <linux/pnp.h> |
28 | 27 | ||
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 53eaee96065b..62991148d5a5 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h | |||
@@ -146,7 +146,6 @@ typedef struct { | |||
146 | 146 | ||
147 | #ifdef __KERNEL__ | 147 | #ifdef __KERNEL__ |
148 | 148 | ||
149 | #include <linux/config.h> | ||
150 | #include <linux/errno.h> | 149 | #include <linux/errno.h> |
151 | #include <linux/fs.h> | 150 | #include <linux/fs.h> |
152 | #include <linux/major.h> | 151 | #include <linux/major.h> |
diff --git a/include/linux/isdn/tpam.h b/include/linux/isdn/tpam.h index 9f65bea49d11..d18dd0dc570d 100644 --- a/include/linux/isdn/tpam.h +++ b/include/linux/isdn/tpam.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #define _TPAM_H_ | 26 | #define _TPAM_H_ |
27 | 27 | ||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/pci.h> | ||
30 | 29 | ||
31 | /* IOCTL commands */ | 30 | /* IOCTL commands */ |
32 | #define TPAM_CMD_DSPLOAD 0x0001 | 31 | #define TPAM_CMD_DSPLOAD 0x0001 |
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h index 26b00a76e135..8687a7dc0632 100644 --- a/include/linux/isdn_ppp.h +++ b/include/linux/isdn_ppp.h | |||
@@ -67,7 +67,6 @@ struct isdn_ppp_comp_data { | |||
67 | #ifdef __KERNEL__ | 67 | #ifdef __KERNEL__ |
68 | 68 | ||
69 | 69 | ||
70 | #include <linux/config.h> | ||
71 | 70 | ||
72 | #ifdef CONFIG_IPPP_FILTER | 71 | #ifdef CONFIG_IPPP_FILTER |
73 | #include <linux/filter.h> | 72 | #include <linux/filter.h> |
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index 04e10f9f14f8..b9b5a684ed69 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h | |||
@@ -54,7 +54,6 @@ | |||
54 | 54 | ||
55 | #ifdef __KERNEL__ | 55 | #ifdef __KERNEL__ |
56 | 56 | ||
57 | #include <linux/config.h> | ||
58 | #include <linux/skbuff.h> | 57 | #include <linux/skbuff.h> |
59 | 58 | ||
60 | /***************************************************************************/ | 59 | /***************************************************************************/ |
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 9bbd04092365..54e2549f96ba 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #ifndef _LINUX_KALLSYMS_H | 5 | #ifndef _LINUX_KALLSYMS_H |
6 | #define _LINUX_KALLSYMS_H | 6 | #define _LINUX_KALLSYMS_H |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | 8 | ||
10 | #define KSYM_NAME_LEN 127 | 9 | #define KSYM_NAME_LEN 127 |
11 | 10 | ||
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index b46249082cca..43e895f1cabe 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_KERNEL_STAT_H | 1 | #ifndef _LINUX_KERNEL_STAT_H |
2 | #define _LINUX_KERNEL_STAT_H | 2 | #define _LINUX_KERNEL_STAT_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <asm/irq.h> | 4 | #include <asm/irq.h> |
6 | #include <linux/smp.h> | 5 | #include <linux/smp.h> |
7 | #include <linux/threads.h> | 6 | #include <linux/threads.h> |
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index e4a231549407..0db22a1ab474 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h | |||
@@ -20,7 +20,6 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/stddef.h> | 22 | #include <linux/stddef.h> |
23 | #include <linux/config.h> | ||
24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
25 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
26 | 25 | ||
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 778adc0fa640..8bf6702da2a0 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h | |||
@@ -29,7 +29,6 @@ | |||
29 | * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi | 29 | * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi |
30 | * <prasanna@in.ibm.com> added function-return probes. | 30 | * <prasanna@in.ibm.com> added function-return probes. |
31 | */ | 31 | */ |
32 | #include <linux/config.h> | ||
33 | #include <linux/list.h> | 32 | #include <linux/list.h> |
34 | #include <linux/notifier.h> | 33 | #include <linux/notifier.h> |
35 | #include <linux/smp.h> | 34 | #include <linux/smp.h> |
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index c08c9983e840..932021f872d5 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_LINKAGE_H | 1 | #ifndef _LINUX_LINKAGE_H |
2 | #define _LINUX_LINKAGE_H | 2 | #define _LINUX_LINKAGE_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <asm/linkage.h> | 4 | #include <asm/linkage.h> |
6 | 5 | ||
7 | #ifdef __cplusplus | 6 | #ifdef __cplusplus |
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 995f89dc8c04..a8876bc6513b 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/in.h> | 14 | #include <linux/in.h> |
16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
17 | #include <linux/kref.h> | 16 | #include <linux/kref.h> |
diff --git a/include/linux/lockd/nlm.h b/include/linux/lockd/nlm.h index 869b630cba24..d9d46e442538 100644 --- a/include/linux/lockd/nlm.h +++ b/include/linux/lockd/nlm.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef LINUX_LOCKD_NLM_H | 9 | #ifndef LINUX_LOCKD_NLM_H |
10 | #define LINUX_LOCKD_NLM_H | 10 | #define LINUX_LOCKD_NLM_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | 12 | ||
14 | /* Maximum file offset in file_lock.fl_end */ | 13 | /* Maximum file offset in file_lock.fl_end */ |
15 | # define NLM_OFFSET_MAX ((s32) 0x7fffffff) | 14 | # define NLM_OFFSET_MAX ((s32) 0x7fffffff) |
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 6a7621b2b12b..8dfdd352bccd 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | #ifdef __KERNEL__ | 29 | #ifdef __KERNEL__ |
30 | 30 | ||
31 | #include <linux/config.h> | ||
32 | #include <linux/mmzone.h> | 31 | #include <linux/mmzone.h> |
33 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
34 | #include <linux/rbtree.h> | 33 | #include <linux/rbtree.h> |
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index ff0a64073ebc..6789c4940c9c 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_MIGRATE_H | 1 | #ifndef _LINUX_MIGRATE_H |
2 | #define _LINUX_MIGRATE_H | 2 | #define _LINUX_MIGRATE_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
6 | 5 | ||
7 | #ifdef CONFIG_MIGRATION | 6 | #ifdef CONFIG_MIGRATION |
diff --git a/include/linux/mii.h b/include/linux/mii.h index 68f5a0f392dd..beddc6d3b0f6 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #define __LINUX_MII_H__ | 9 | #define __LINUX_MII_H__ |
10 | 10 | ||
11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
12 | #include <linux/if.h> | ||
13 | 12 | ||
14 | /* Generic MII registers. */ | 13 | /* Generic MII registers. */ |
15 | 14 | ||
@@ -136,6 +135,20 @@ | |||
136 | #define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ | 135 | #define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ |
137 | #define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */ | 136 | #define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */ |
138 | 137 | ||
138 | /* This structure is used in all SIOCxMIIxxx ioctl calls */ | ||
139 | struct mii_ioctl_data { | ||
140 | __u16 phy_id; | ||
141 | __u16 reg_num; | ||
142 | __u16 val_in; | ||
143 | __u16 val_out; | ||
144 | }; | ||
145 | |||
146 | #ifdef __KERNEL__ | ||
147 | |||
148 | #include <linux/if.h> | ||
149 | |||
150 | struct ethtool_cmd; | ||
151 | |||
139 | struct mii_if_info { | 152 | struct mii_if_info { |
140 | int phy_id; | 153 | int phy_id; |
141 | int advertising; | 154 | int advertising; |
@@ -151,9 +164,6 @@ struct mii_if_info { | |||
151 | void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); | 164 | void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); |
152 | }; | 165 | }; |
153 | 166 | ||
154 | struct ethtool_cmd; | ||
155 | struct mii_ioctl_data; | ||
156 | |||
157 | extern int mii_link_ok (struct mii_if_info *mii); | 167 | extern int mii_link_ok (struct mii_if_info *mii); |
158 | extern int mii_nway_restart (struct mii_if_info *mii); | 168 | extern int mii_nway_restart (struct mii_if_info *mii); |
159 | extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); | 169 | extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); |
@@ -168,16 +178,6 @@ extern int generic_mii_ioctl(struct mii_if_info *mii_if, | |||
168 | unsigned int *duplex_changed); | 178 | unsigned int *duplex_changed); |
169 | 179 | ||
170 | 180 | ||
171 | |||
172 | /* This structure is used in all SIOCxMIIxxx ioctl calls */ | ||
173 | struct mii_ioctl_data { | ||
174 | u16 phy_id; | ||
175 | u16 reg_num; | ||
176 | u16 val_in; | ||
177 | u16 val_out; | ||
178 | }; | ||
179 | |||
180 | |||
181 | static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) | 181 | static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) |
182 | { | 182 | { |
183 | return (struct mii_ioctl_data *) &rq->ifr_ifru; | 183 | return (struct mii_ioctl_data *) &rq->ifr_ifru; |
@@ -235,5 +235,5 @@ static inline unsigned int mii_duplex (unsigned int duplex_lock, | |||
235 | return 0; | 235 | return 0; |
236 | } | 236 | } |
237 | 237 | ||
238 | 238 | #endif /* __KERNEL__ */ | |
239 | #endif /* __LINUX_MII_H__ */ | 239 | #endif /* __LINUX_MII_H__ */ |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 1154684209a4..e2fa375e478e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -7,7 +7,6 @@ | |||
7 | 7 | ||
8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/gfp.h> | 10 | #include <linux/gfp.h> |
12 | #include <linux/list.h> | 11 | #include <linux/list.h> |
13 | #include <linux/mmzone.h> | 12 | #include <linux/mmzone.h> |
diff --git a/include/linux/mman.h b/include/linux/mman.h index 18a5689ef748..87920a0852a3 100644 --- a/include/linux/mman.h +++ b/include/linux/mman.h | |||
@@ -1,10 +1,6 @@ | |||
1 | #ifndef _LINUX_MMAN_H | 1 | #ifndef _LINUX_MMAN_H |
2 | #define _LINUX_MMAN_H | 2 | #define _LINUX_MMAN_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/mm.h> | ||
6 | |||
7 | #include <asm/atomic.h> | ||
8 | #include <asm/mman.h> | 4 | #include <asm/mman.h> |
9 | 5 | ||
10 | #define MREMAP_MAYMOVE 1 | 6 | #define MREMAP_MAYMOVE 1 |
@@ -13,6 +9,12 @@ | |||
13 | #define OVERCOMMIT_GUESS 0 | 9 | #define OVERCOMMIT_GUESS 0 |
14 | #define OVERCOMMIT_ALWAYS 1 | 10 | #define OVERCOMMIT_ALWAYS 1 |
15 | #define OVERCOMMIT_NEVER 2 | 11 | #define OVERCOMMIT_NEVER 2 |
12 | |||
13 | #ifdef __KERNEL__ | ||
14 | #include <linux/mm.h> | ||
15 | |||
16 | #include <asm/atomic.h> | ||
17 | |||
16 | extern int sysctl_overcommit_memory; | 18 | extern int sysctl_overcommit_memory; |
17 | extern int sysctl_overcommit_ratio; | 19 | extern int sysctl_overcommit_ratio; |
18 | extern atomic_t vm_committed_space; | 20 | extern atomic_t vm_committed_space; |
@@ -63,5 +65,5 @@ calc_vm_flag_bits(unsigned long flags) | |||
63 | _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) | | 65 | _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) | |
64 | _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ); | 66 | _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ); |
65 | } | 67 | } |
66 | 68 | #endif /* __KERNEL__ */ | |
67 | #endif /* _LINUX_MMAN_H */ | 69 | #endif /* _LINUX_MMAN_H */ |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index b5c21122c299..6be91fb2deb1 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | #ifndef __ASSEMBLY__ | 5 | #ifndef __ASSEMBLY__ |
6 | 6 | ||
7 | #include <linux/config.h> | ||
8 | #include <linux/spinlock.h> | 7 | #include <linux/spinlock.h> |
9 | #include <linux/list.h> | 8 | #include <linux/list.h> |
10 | #include <linux/wait.h> | 9 | #include <linux/wait.h> |
diff --git a/include/linux/module.h b/include/linux/module.h index eaec13ddd667..05e7dd17b7d0 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996 | 6 | * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996 |
7 | * Rewritten again by Rusty Russell, 2002 | 7 | * Rewritten again by Rusty Russell, 2002 |
8 | */ | 8 | */ |
9 | #include <linux/config.h> | ||
10 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
12 | #include <linux/list.h> | 11 | #include <linux/list.h> |
diff --git a/include/linux/msg.h b/include/linux/msg.h index 903e0ab8101f..acc7c174ff00 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _LINUX_MSG_H | 2 | #define _LINUX_MSG_H |
3 | 3 | ||
4 | #include <linux/ipc.h> | 4 | #include <linux/ipc.h> |
5 | #include <linux/list.h> | ||
6 | 5 | ||
7 | /* ipcs ctl commands */ | 6 | /* ipcs ctl commands */ |
8 | #define MSG_STAT 11 | 7 | #define MSG_STAT 11 |
@@ -63,6 +62,7 @@ struct msginfo { | |||
63 | #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) | 62 | #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff) |
64 | 63 | ||
65 | #ifdef __KERNEL__ | 64 | #ifdef __KERNEL__ |
65 | #include <linux/list.h> | ||
66 | 66 | ||
67 | /* one msg_msg structure for each message */ | 67 | /* one msg_msg structure for each message */ |
68 | struct msg_msg { | 68 | struct msg_msg { |
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index 23a568910341..09bfae6938b3 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h | |||
@@ -7,7 +7,6 @@ | |||
7 | #ifndef __MTD_CFI_H__ | 7 | #ifndef __MTD_CFI_H__ |
8 | #define __MTD_CFI_H__ | 8 | #define __MTD_CFI_H__ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
12 | #include <linux/types.h> | 11 | #include <linux/types.h> |
13 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index 7dfd6e1fcde7..28d461d862bd 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #ifndef __LINUX_MTD_MAP_H__ | 5 | #ifndef __LINUX_MTD_MAP_H__ |
6 | #define __LINUX_MTD_MAP_H__ | 6 | #define __LINUX_MTD_MAP_H__ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
10 | #include <linux/list.h> | 9 | #include <linux/list.h> |
11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index b6f2fdae65c6..012a47df1960 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #error This is a kernel header. Perhaps include mtd-user.h instead? | 13 | #error This is a kernel header. Perhaps include mtd-user.h instead? |
14 | #endif | 14 | #endif |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
19 | #include <linux/uio.h> | 18 | #include <linux/uio.h> |
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index da5e67b3fc70..4b99d285803f 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
@@ -56,7 +56,6 @@ | |||
56 | #ifndef __LINUX_MTD_NAND_H | 56 | #ifndef __LINUX_MTD_NAND_H |
57 | #define __LINUX_MTD_NAND_H | 57 | #define __LINUX_MTD_NAND_H |
58 | 58 | ||
59 | #include <linux/config.h> | ||
60 | #include <linux/wait.h> | 59 | #include <linux/wait.h> |
61 | #include <linux/spinlock.h> | 60 | #include <linux/spinlock.h> |
62 | #include <linux/mtd/mtd.h> | 61 | #include <linux/mtd/mtd.h> |
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h index c7b8bcdef013..bffaade1111e 100644 --- a/include/linux/mtd/physmap.h +++ b/include/linux/mtd/physmap.h | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #ifndef __LINUX_MTD_PHYSMAP__ | 17 | #ifndef __LINUX_MTD_PHYSMAP__ |
18 | 18 | ||
19 | #include <linux/config.h> | ||
20 | 19 | ||
21 | #if defined(CONFIG_MTD_PHYSMAP) | 20 | #if defined(CONFIG_MTD_PHYSMAP) |
22 | 21 | ||
diff --git a/include/linux/mtd/xip.h b/include/linux/mtd/xip.h index 220d50bb71cd..e9d40bdde48c 100644 --- a/include/linux/mtd/xip.h +++ b/include/linux/mtd/xip.h | |||
@@ -18,7 +18,6 @@ | |||
18 | #ifndef __LINUX_MTD_XIP_H__ | 18 | #ifndef __LINUX_MTD_XIP_H__ |
19 | #define __LINUX_MTD_XIP_H__ | 19 | #define __LINUX_MTD_XIP_H__ |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | 21 | ||
23 | #ifdef CONFIG_MTD_XIP | 22 | #ifdef CONFIG_MTD_XIP |
24 | 23 | ||
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index a6ce409ec6fc..1d7cdd20b553 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h | |||
@@ -77,11 +77,11 @@ struct nbd_device { | |||
77 | * server. All data are in network byte order. | 77 | * server. All data are in network byte order. |
78 | */ | 78 | */ |
79 | struct nbd_request { | 79 | struct nbd_request { |
80 | u32 magic; | 80 | __u32 magic; |
81 | u32 type; /* == READ || == WRITE */ | 81 | __u32 type; /* == READ || == WRITE */ |
82 | char handle[8]; | 82 | char handle[8]; |
83 | u64 from; | 83 | __u64 from; |
84 | u32 len; | 84 | __u32 len; |
85 | } | 85 | } |
86 | #ifdef __GNUC__ | 86 | #ifdef __GNUC__ |
87 | __attribute__ ((packed)) | 87 | __attribute__ ((packed)) |
@@ -93,8 +93,8 @@ struct nbd_request { | |||
93 | * it has completed an I/O request (or an error occurs). | 93 | * it has completed an I/O request (or an error occurs). |
94 | */ | 94 | */ |
95 | struct nbd_reply { | 95 | struct nbd_reply { |
96 | u32 magic; | 96 | __u32 magic; |
97 | u32 error; /* 0 = ok, else error */ | 97 | __u32 error; /* 0 = ok, else error */ |
98 | char handle[8]; /* handle you got from request */ | 98 | char handle[8]; /* handle you got from request */ |
99 | }; | 99 | }; |
100 | #endif | 100 | #endif |
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 96dc237b8f03..b208f0cd556b 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h | |||
@@ -12,8 +12,6 @@ | |||
12 | #include <linux/in.h> | 12 | #include <linux/in.h> |
13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
14 | 14 | ||
15 | #include <linux/ncp_fs_i.h> | ||
16 | #include <linux/ncp_fs_sb.h> | ||
17 | #include <linux/ipx.h> | 15 | #include <linux/ipx.h> |
18 | #include <linux/ncp_no.h> | 16 | #include <linux/ncp_no.h> |
19 | 17 | ||
@@ -146,7 +144,8 @@ struct ncp_nls_ioctl | |||
146 | 144 | ||
147 | #ifdef __KERNEL__ | 145 | #ifdef __KERNEL__ |
148 | 146 | ||
149 | #include <linux/config.h> | 147 | #include <linux/ncp_fs_i.h> |
148 | #include <linux/ncp_fs_sb.h> | ||
150 | 149 | ||
151 | /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ | 150 | /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ |
152 | #undef PRINTK | 151 | #undef PRINTK |
diff --git a/include/linux/net.h b/include/linux/net.h index 84a490e5f0a1..385e68f5bd93 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -18,9 +18,7 @@ | |||
18 | #ifndef _LINUX_NET_H | 18 | #ifndef _LINUX_NET_H |
19 | #define _LINUX_NET_H | 19 | #define _LINUX_NET_H |
20 | 20 | ||
21 | #include <linux/config.h> | ||
22 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
23 | #include <linux/stringify.h> | ||
24 | #include <asm/socket.h> | 22 | #include <asm/socket.h> |
25 | 23 | ||
26 | struct poll_table_struct; | 24 | struct poll_table_struct; |
@@ -57,6 +55,7 @@ typedef enum { | |||
57 | #define __SO_ACCEPTCON (1 << 16) /* performed a listen */ | 55 | #define __SO_ACCEPTCON (1 << 16) /* performed a listen */ |
58 | 56 | ||
59 | #ifdef __KERNEL__ | 57 | #ifdef __KERNEL__ |
58 | #include <linux/stringify.h> | ||
60 | 59 | ||
61 | #define SOCK_ASYNC_NOSPACE 0 | 60 | #define SOCK_ASYNC_NOSPACE 0 |
62 | #define SOCK_ASYNC_WAITDATA 1 | 61 | #define SOCK_ASYNC_WAITDATA 1 |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 01db7b88a2b1..5128dd7634cb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <asm/cache.h> | 34 | #include <asm/cache.h> |
35 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
36 | 36 | ||
37 | #include <linux/config.h> | ||
38 | #include <linux/device.h> | 37 | #include <linux/device.h> |
39 | #include <linux/percpu.h> | 38 | #include <linux/percpu.h> |
40 | 39 | ||
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index b31a9bca9361..10168e26a846 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
@@ -40,7 +40,6 @@ | |||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #ifdef __KERNEL__ | 42 | #ifdef __KERNEL__ |
43 | #include <linux/config.h> | ||
44 | #ifdef CONFIG_NETFILTER | 43 | #ifdef CONFIG_NETFILTER |
45 | 44 | ||
46 | extern void netfilter_init(void); | 45 | extern void netfilter_init(void); |
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index 34f63cf2e293..4c2d9945ca54 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h | |||
@@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple | |||
42 | } u; | 42 | } u; |
43 | 43 | ||
44 | /* The protocol. */ | 44 | /* The protocol. */ |
45 | u16 protonum; | 45 | __u16 protonum; |
46 | } dst; | 46 | } dst; |
47 | }; | 47 | }; |
48 | 48 | ||
diff --git a/include/linux/netfilter_arp.h b/include/linux/netfilter_arp.h index a3f8977f7f12..92bc6ddcbf73 100644 --- a/include/linux/netfilter_arp.h +++ b/include/linux/netfilter_arp.h | |||
@@ -5,7 +5,6 @@ | |||
5 | * (C)2002 Rusty Russell IBM -- This code is GPL. | 5 | * (C)2002 Rusty Russell IBM -- This code is GPL. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/netfilter.h> | 8 | #include <linux/netfilter.h> |
10 | 9 | ||
11 | /* There is no PF_ARP. */ | 10 | /* There is no PF_ARP. */ |
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index a75b84bb9a88..87764022cc67 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h | |||
@@ -4,7 +4,6 @@ | |||
4 | /* bridge-specific defines for netfilter. | 4 | /* bridge-specific defines for netfilter. |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/config.h> | ||
8 | #include <linux/netfilter.h> | 7 | #include <linux/netfilter.h> |
9 | #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER) | 8 | #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER) |
10 | #include <asm/atomic.h> | 9 | #include <asm/atomic.h> |
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h index 85301c5e8d24..ce02c984f3ba 100644 --- a/include/linux/netfilter_ipv4.h +++ b/include/linux/netfilter_ipv4.h | |||
@@ -5,7 +5,6 @@ | |||
5 | * (C)1998 Rusty Russell -- This code is GPL. | 5 | * (C)1998 Rusty Russell -- This code is GPL. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/netfilter.h> | 8 | #include <linux/netfilter.h> |
10 | 9 | ||
11 | /* only for userspace compatibility */ | 10 | /* only for userspace compatibility */ |
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index d54d7b278e96..4255bfec0920 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <linux/netfilter/nf_conntrack_common.h> | 4 | #include <linux/netfilter/nf_conntrack_common.h> |
5 | 5 | ||
6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
7 | #include <linux/config.h> | ||
8 | #include <linux/netfilter_ipv4/ip_conntrack_tuple.h> | 7 | #include <linux/netfilter_ipv4/ip_conntrack_tuple.h> |
9 | #include <linux/bitops.h> | 8 | #include <linux/bitops.h> |
10 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
diff --git a/include/linux/netfilter_ipv4/listhelp.h b/include/linux/netfilter_ipv4/listhelp.h index 360429f48737..5d92cf044d91 100644 --- a/include/linux/netfilter_ipv4/listhelp.h +++ b/include/linux/netfilter_ipv4/listhelp.h | |||
@@ -1,6 +1,5 @@ | |||
1 | #ifndef _LISTHELP_H | 1 | #ifndef _LISTHELP_H |
2 | #define _LISTHELP_H | 2 | #define _LISTHELP_H |
3 | #include <linux/config.h> | ||
4 | #include <linux/list.h> | 3 | #include <linux/list.h> |
5 | 4 | ||
6 | /* Header to do more comprehensive job than linux/list.h; assume list | 5 | /* Header to do more comprehensive job than linux/list.h; assume list |
diff --git a/include/linux/nfs.h b/include/linux/nfs.h index ca2ffa6ae1d5..54af92c1c70b 100644 --- a/include/linux/nfs.h +++ b/include/linux/nfs.h | |||
@@ -7,9 +7,6 @@ | |||
7 | #ifndef _LINUX_NFS_H | 7 | #ifndef _LINUX_NFS_H |
8 | #define _LINUX_NFS_H | 8 | #define _LINUX_NFS_H |
9 | 9 | ||
10 | #include <linux/sunrpc/msg_prot.h> | ||
11 | #include <linux/string.h> | ||
12 | |||
13 | #define NFS_PROGRAM 100003 | 10 | #define NFS_PROGRAM 100003 |
14 | #define NFS_PORT 2049 | 11 | #define NFS_PORT 2049 |
15 | #define NFS_MAXDATA 8192 | 12 | #define NFS_MAXDATA 8192 |
@@ -129,7 +126,10 @@ enum nfs_ftype { | |||
129 | NFFIFO = 8 | 126 | NFFIFO = 8 |
130 | }; | 127 | }; |
131 | 128 | ||
132 | #if defined(__KERNEL__) | 129 | #ifdef __KERNEL__ |
130 | #include <linux/sunrpc/msg_prot.h> | ||
131 | #include <linux/string.h> | ||
132 | |||
133 | /* | 133 | /* |
134 | * This is the kernel NFS client file handle representation | 134 | * This is the kernel NFS client file handle representation |
135 | */ | 135 | */ |
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 0c1c306cdaec..1059e6d69d3b 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #define _LINUX_NFS4_H | 14 | #define _LINUX_NFS4_H |
15 | 15 | ||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/list.h> | ||
18 | 17 | ||
19 | #define NFS4_VERIFIER_SIZE 8 | 18 | #define NFS4_VERIFIER_SIZE 8 |
20 | #define NFS4_FHSIZE 128 | 19 | #define NFS4_FHSIZE 128 |
@@ -97,6 +96,9 @@ enum nfs4_acl_whotype { | |||
97 | NFS4_ACL_WHO_EVERYONE, | 96 | NFS4_ACL_WHO_EVERYONE, |
98 | }; | 97 | }; |
99 | 98 | ||
99 | #ifdef __KERNEL__ | ||
100 | #include <linux/list.h> | ||
101 | |||
100 | struct nfs4_ace { | 102 | struct nfs4_ace { |
101 | uint32_t type; | 103 | uint32_t type; |
102 | uint32_t flag; | 104 | uint32_t flag; |
@@ -345,8 +347,6 @@ enum lock_type4 { | |||
345 | #define NFS4_MINOR_VERSION 0 | 347 | #define NFS4_MINOR_VERSION 0 |
346 | #define NFS4_DEBUG 1 | 348 | #define NFS4_DEBUG 1 |
347 | 349 | ||
348 | #ifdef __KERNEL__ | ||
349 | |||
350 | /* Index of predefined Linux client operations */ | 350 | /* Index of predefined Linux client operations */ |
351 | 351 | ||
352 | enum { | 352 | enum { |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index c71227dd4389..7e079f8ce18b 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -9,26 +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> | ||
14 | #include <linux/mm.h> | ||
15 | #include <linux/pagemap.h> | ||
16 | #include <linux/rwsem.h> | ||
17 | #include <linux/wait.h> | ||
18 | |||
19 | #include <linux/nfs_fs_sb.h> | ||
20 | |||
21 | #include <linux/sunrpc/debug.h> | ||
22 | #include <linux/sunrpc/auth.h> | ||
23 | #include <linux/sunrpc/clnt.h> | ||
24 | |||
25 | #include <linux/nfs.h> | ||
26 | #include <linux/nfs2.h> | ||
27 | #include <linux/nfs3.h> | ||
28 | #include <linux/nfs4.h> | ||
29 | #include <linux/nfs_xdr.h> | ||
30 | #include <linux/rwsem.h> | ||
31 | #include <linux/mempool.h> | ||
32 | 12 | ||
33 | /* | 13 | /* |
34 | * Enable debugging support for nfs client. | 14 | * Enable debugging support for nfs client. |
@@ -63,6 +43,25 @@ | |||
63 | #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ | 43 | #define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ |
64 | 44 | ||
65 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
46 | #include <linux/in.h> | ||
47 | #include <linux/mm.h> | ||
48 | #include <linux/pagemap.h> | ||
49 | #include <linux/rwsem.h> | ||
50 | #include <linux/wait.h> | ||
51 | |||
52 | #include <linux/nfs_fs_sb.h> | ||
53 | |||
54 | #include <linux/sunrpc/debug.h> | ||
55 | #include <linux/sunrpc/auth.h> | ||
56 | #include <linux/sunrpc/clnt.h> | ||
57 | |||
58 | #include <linux/nfs.h> | ||
59 | #include <linux/nfs2.h> | ||
60 | #include <linux/nfs3.h> | ||
61 | #include <linux/nfs4.h> | ||
62 | #include <linux/nfs_xdr.h> | ||
63 | #include <linux/rwsem.h> | ||
64 | #include <linux/mempool.h> | ||
66 | 65 | ||
67 | /* | 66 | /* |
68 | * NFSv3/v4 Access mode cache entry | 67 | * NFSv3/v4 Access mode cache entry |
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index ec7c2e872d72..2dcad295fece 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #ifndef LINUX_NFSD_NFSD_H | 10 | #ifndef LINUX_NFSD_NFSD_H |
11 | #define LINUX_NFSD_NFSD_H | 11 | #define LINUX_NFSD_NFSD_H |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
15 | #include <linux/unistd.h> | 14 | #include <linux/unistd.h> |
16 | #include <linux/dirent.h> | 15 | #include <linux/dirent.h> |
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index 0798b7781a6e..f9edcd2ff3c8 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <asm/types.h> | 17 | #include <asm/types.h> |
18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
19 | # include <linux/config.h> | ||
20 | # include <linux/types.h> | 19 | # include <linux/types.h> |
21 | # include <linux/string.h> | 20 | # include <linux/string.h> |
22 | # include <linux/fs.h> | 21 | # include <linux/fs.h> |
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 781efbf94ed3..dae0faea2807 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <asm/types.h> | 12 | #include <asm/types.h> |
13 | #ifdef __KERNEL__ | 13 | #ifdef __KERNEL__ |
14 | # include <linux/config.h> | ||
15 | # include <linux/types.h> | 14 | # include <linux/types.h> |
16 | # include <linux/in.h> | 15 | # include <linux/in.h> |
17 | #endif | 16 | #endif |
diff --git a/include/linux/numa.h b/include/linux/numa.h index e481feb1bfd8..a31a7301b159 100644 --- a/include/linux/numa.h +++ b/include/linux/numa.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_NUMA_H | 1 | #ifndef _LINUX_NUMA_H |
2 | #define _LINUX_NUMA_H | 2 | #define _LINUX_NUMA_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #ifdef CONFIG_NODES_SHIFT | 5 | #ifdef CONFIG_NODES_SHIFT |
7 | #define NODES_SHIFT CONFIG_NODES_SHIFT | 6 | #define NODES_SHIFT CONFIG_NODES_SHIFT |
diff --git a/include/linux/parport.h b/include/linux/parport.h index 008d736a6c9a..d42737eeee06 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
@@ -96,7 +96,6 @@ typedef enum { | |||
96 | /* The rest is for the kernel only */ | 96 | /* The rest is for the kernel only */ |
97 | #ifdef __KERNEL__ | 97 | #ifdef __KERNEL__ |
98 | 98 | ||
99 | #include <linux/config.h> | ||
100 | #include <linux/jiffies.h> | 99 | #include <linux/jiffies.h> |
101 | #include <linux/proc_fs.h> | 100 | #include <linux/proc_fs.h> |
102 | #include <linux/spinlock.h> | 101 | #include <linux/spinlock.h> |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 3a6a4e37a482..fee8275df6d8 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -17,8 +17,6 @@ | |||
17 | #ifndef LINUX_PCI_H | 17 | #ifndef LINUX_PCI_H |
18 | #define LINUX_PCI_H | 18 | #define LINUX_PCI_H |
19 | 19 | ||
20 | #include <linux/mod_devicetable.h> | ||
21 | |||
22 | /* Include the pci register defines */ | 20 | /* Include the pci register defines */ |
23 | #include <linux/pci_regs.h> | 21 | #include <linux/pci_regs.h> |
24 | 22 | ||
@@ -46,8 +44,9 @@ | |||
46 | 44 | ||
47 | #ifdef __KERNEL__ | 45 | #ifdef __KERNEL__ |
48 | 46 | ||
47 | #include <linux/mod_devicetable.h> | ||
48 | |||
49 | #include <linux/types.h> | 49 | #include <linux/types.h> |
50 | #include <linux/config.h> | ||
51 | #include <linux/ioport.h> | 50 | #include <linux/ioport.h> |
52 | #include <linux/list.h> | 51 | #include <linux/list.h> |
53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h index 682525511c9e..66b5de404f22 100644 --- a/include/linux/percpu_counter.h +++ b/include/linux/percpu_counter.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * WARNING: these things are HUGE. 4 kbytes per counter on 32-way P4. | 6 | * WARNING: these things are HUGE. 4 kbytes per counter on 32-way P4. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/spinlock.h> | 9 | #include <linux/spinlock.h> |
11 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
12 | #include <linux/threads.h> | 11 | #include <linux/threads.h> |
diff --git a/include/linux/pm.h b/include/linux/pm.h index 66be58902b17..658c1b93d5bb 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
25 | 25 | ||
26 | #include <linux/config.h> | ||
27 | #include <linux/list.h> | 26 | #include <linux/list.h> |
28 | #include <asm/atomic.h> | 27 | #include <asm/atomic.h> |
29 | 28 | ||
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h index 008932d73c35..78027c533b94 100644 --- a/include/linux/pm_legacy.h +++ b/include/linux/pm_legacy.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __LINUX_PM_LEGACY_H__ | 1 | #ifndef __LINUX_PM_LEGACY_H__ |
2 | #define __LINUX_PM_LEGACY_H__ | 2 | #define __LINUX_PM_LEGACY_H__ |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #ifdef CONFIG_PM_LEGACY | 5 | #ifdef CONFIG_PM_LEGACY |
7 | 6 | ||
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index 217d3daf7336..ecce5912f4d6 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Copyright (C) 1998 Paul Mackerras. | 6 | * Copyright (C) 1998 Paul Mackerras. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | 9 | ||
11 | #define PMU_DRIVER_VERSION 2 | 10 | #define PMU_DRIVER_VERSION 2 |
12 | 11 | ||
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 402056cd049d..c6b13ff85028 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h | |||
@@ -42,8 +42,6 @@ | |||
42 | #ifndef _PPP_DEFS_H_ | 42 | #ifndef _PPP_DEFS_H_ |
43 | #define _PPP_DEFS_H_ | 43 | #define _PPP_DEFS_H_ |
44 | 44 | ||
45 | #include <linux/crc-ccitt.h> | ||
46 | |||
47 | /* | 45 | /* |
48 | * The basic PPP frame. | 46 | * The basic PPP frame. |
49 | */ | 47 | */ |
@@ -97,7 +95,11 @@ | |||
97 | 95 | ||
98 | #define PPP_INITFCS 0xffff /* Initial FCS value */ | 96 | #define PPP_INITFCS 0xffff /* Initial FCS value */ |
99 | #define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ | 97 | #define PPP_GOODFCS 0xf0b8 /* Good final FCS value */ |
98 | |||
99 | #ifdef __KERNEL__ | ||
100 | #include <linux/crc-ccitt.h> | ||
100 | #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c) | 101 | #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c) |
102 | #endif | ||
101 | 103 | ||
102 | /* | 104 | /* |
103 | * Extended asyncmap - allows any character to be escaped. | 105 | * Extended asyncmap - allows any character to be escaped. |
@@ -179,12 +181,4 @@ struct ppp_idle { | |||
179 | time_t recv_idle; /* time since last NP packet received */ | 181 | time_t recv_idle; /* time since last NP packet received */ |
180 | }; | 182 | }; |
181 | 183 | ||
182 | #ifndef __P | ||
183 | #ifdef __STDC__ | ||
184 | #define __P(x) x | ||
185 | #else | ||
186 | #define __P(x) () | ||
187 | #endif | ||
188 | #endif | ||
189 | |||
190 | #endif /* _PPP_DEFS_H_ */ | 184 | #endif /* _PPP_DEFS_H_ */ |
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 5769d14d1e6a..d0926d63406c 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * preempt_count (used for kernel preemption, interrupt count, etc.) | 6 | * preempt_count (used for kernel preemption, interrupt count, etc.) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/thread_info.h> | 9 | #include <linux/thread_info.h> |
11 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
12 | 11 | ||
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 4b47a0253425..5810d28fbed9 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_PROC_FS_H | 1 | #ifndef _LINUX_PROC_FS_H |
2 | #define _LINUX_PROC_FS_H | 2 | #define _LINUX_PROC_FS_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
6 | #include <linux/fs.h> | 5 | #include <linux/fs.h> |
7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
diff --git a/include/linux/profile.h b/include/linux/profile.h index 1f2fea6640a4..e633004ae052 100644 --- a/include/linux/profile.h +++ b/include/linux/profile.h | |||
@@ -4,7 +4,6 @@ | |||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | 5 | ||
6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
7 | #include <linux/config.h> | ||
8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
9 | #include <linux/cpumask.h> | 8 | #include <linux/cpumask.h> |
10 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
diff --git a/include/linux/quota.h b/include/linux/quota.h index 2dab71e1c3d1..b8fbf26eb885 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h | |||
@@ -37,8 +37,6 @@ | |||
37 | 37 | ||
38 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
40 | #include <linux/spinlock.h> | ||
41 | #include <linux/mutex.h> | ||
42 | 40 | ||
43 | #define __DQUOT_VERSION__ "dquot_6.5.1" | 41 | #define __DQUOT_VERSION__ "dquot_6.5.1" |
44 | #define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 | 42 | #define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 |
@@ -133,6 +131,8 @@ struct if_dqinfo { | |||
133 | }; | 131 | }; |
134 | 132 | ||
135 | #ifdef __KERNEL__ | 133 | #ifdef __KERNEL__ |
134 | #include <linux/spinlock.h> | ||
135 | #include <linux/mutex.h> | ||
136 | 136 | ||
137 | #include <linux/dqblk_xfs.h> | 137 | #include <linux/dqblk_xfs.h> |
138 | #include <linux/dqblk_v1.h> | 138 | #include <linux/dqblk_v1.h> |
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 21e5a9124856..5110201a4159 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #ifndef _LINUX_QUOTAOPS_ | 10 | #ifndef _LINUX_QUOTAOPS_ |
11 | #define _LINUX_QUOTAOPS_ | 11 | #define _LINUX_QUOTAOPS_ |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/smp_lock.h> | 13 | #include <linux/smp_lock.h> |
15 | 14 | ||
16 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h index 5353afb11db3..5e961035c725 100644 --- a/include/linux/reiserfs_xattr.h +++ b/include/linux/reiserfs_xattr.h | |||
@@ -2,8 +2,6 @@ | |||
2 | File: linux/reiserfs_xattr.h | 2 | File: linux/reiserfs_xattr.h |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <linux/config.h> | ||
6 | #include <linux/init.h> | ||
7 | #include <linux/xattr.h> | 5 | #include <linux/xattr.h> |
8 | 6 | ||
9 | /* Magic value in header */ | 7 | /* Magic value in header */ |
@@ -15,6 +13,7 @@ struct reiserfs_xattr_header { | |||
15 | }; | 13 | }; |
16 | 14 | ||
17 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
16 | #include <linux/init.h> | ||
18 | 17 | ||
19 | struct reiserfs_xattr_handler { | 18 | struct reiserfs_xattr_handler { |
20 | char *prefix; | 19 | char *prefix; |
diff --git a/include/linux/relay.h b/include/linux/relay.h index 4bcc1531d6a9..24accb483849 100644 --- a/include/linux/relay.h +++ b/include/linux/relay.h | |||
@@ -10,7 +10,6 @@ | |||
10 | #ifndef _LINUX_RELAY_H | 10 | #ifndef _LINUX_RELAY_H |
11 | #define _LINUX_RELAY_H | 11 | #define _LINUX_RELAY_H |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
16 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
diff --git a/include/linux/rio.h b/include/linux/rio.h index c7e907faae9c..d93857056cb9 100644 --- a/include/linux/rio.h +++ b/include/linux/rio.h | |||
@@ -17,7 +17,6 @@ | |||
17 | #ifdef __KERNEL__ | 17 | #ifdef __KERNEL__ |
18 | 18 | ||
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <linux/config.h> | ||
21 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
22 | #include <linux/list.h> | 21 | #include <linux/list.h> |
23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h index f54772d0e7f8..7adb2a1aac92 100644 --- a/include/linux/rio_drv.h +++ b/include/linux/rio_drv.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
17 | 17 | ||
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/config.h> | ||
20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
21 | #include <linux/list.h> | 20 | #include <linux/list.h> |
22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index d6b9bcd1384c..2d4c81a220db 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h | |||
@@ -4,7 +4,6 @@ | |||
4 | * Declarations for Reverse Mapping functions in mm/rmap.c | 4 | * Declarations for Reverse Mapping functions in mm/rmap.c |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/config.h> | ||
8 | #include <linux/list.h> | 7 | #include <linux/list.h> |
9 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index df0cdd41085c..facd9ee37b76 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
@@ -909,7 +909,6 @@ struct tcamsg | |||
909 | 909 | ||
910 | #ifdef __KERNEL__ | 910 | #ifdef __KERNEL__ |
911 | 911 | ||
912 | #include <linux/config.h> | ||
913 | #include <linux/mutex.h> | 912 | #include <linux/mutex.h> |
914 | 913 | ||
915 | extern size_t rtattr_strlcpy(char *dest, const struct rtattr *rta, size_t size); | 914 | extern size_t rtattr_strlcpy(char *dest, const struct rtattr *rta, size_t size); |
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index bfb988885002..f99fe90732ab 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
19 | #include <asm/system.h> | 18 | #include <asm/system.h> |
diff --git a/include/linux/scc.h b/include/linux/scc.h index 885a4a02b23c..3495bd953cc6 100644 --- a/include/linux/scc.h +++ b/include/linux/scc.h | |||
@@ -3,7 +3,6 @@ | |||
3 | #ifndef _SCC_H | 3 | #ifndef _SCC_H |
4 | #define _SCC_H | 4 | #define _SCC_H |
5 | 5 | ||
6 | #include <linux/config.h> | ||
7 | 6 | ||
8 | /* selection of hardware types */ | 7 | /* selection of hardware types */ |
9 | 8 | ||
diff --git a/include/linux/sched.h b/include/linux/sched.h index 29b7d4f87d20..701b8cbceb05 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1,9 +1,46 @@ | |||
1 | #ifndef _LINUX_SCHED_H | 1 | #ifndef _LINUX_SCHED_H |
2 | #define _LINUX_SCHED_H | 2 | #define _LINUX_SCHED_H |
3 | 3 | ||
4 | #include <linux/auxvec.h> /* For AT_VECTOR_SIZE */ | ||
5 | |||
6 | /* | ||
7 | * cloning flags: | ||
8 | */ | ||
9 | #define CSIGNAL 0x000000ff /* signal mask to be sent at exit */ | ||
10 | #define CLONE_VM 0x00000100 /* set if VM shared between processes */ | ||
11 | #define CLONE_FS 0x00000200 /* set if fs info shared between processes */ | ||
12 | #define CLONE_FILES 0x00000400 /* set if open files shared between processes */ | ||
13 | #define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ | ||
14 | #define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ | ||
15 | #define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ | ||
16 | #define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ | ||
17 | #define CLONE_THREAD 0x00010000 /* Same thread group? */ | ||
18 | #define CLONE_NEWNS 0x00020000 /* New namespace group? */ | ||
19 | #define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ | ||
20 | #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ | ||
21 | #define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ | ||
22 | #define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ | ||
23 | #define CLONE_DETACHED 0x00400000 /* Unused, ignored */ | ||
24 | #define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ | ||
25 | #define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ | ||
26 | #define CLONE_STOPPED 0x02000000 /* Start in stopped state */ | ||
27 | |||
28 | /* | ||
29 | * Scheduling policies | ||
30 | */ | ||
31 | #define SCHED_NORMAL 0 | ||
32 | #define SCHED_FIFO 1 | ||
33 | #define SCHED_RR 2 | ||
34 | #define SCHED_BATCH 3 | ||
35 | |||
36 | #ifdef __KERNEL__ | ||
37 | |||
38 | struct sched_param { | ||
39 | int sched_priority; | ||
40 | }; | ||
41 | |||
4 | #include <asm/param.h> /* for HZ */ | 42 | #include <asm/param.h> /* for HZ */ |
5 | 43 | ||
6 | #include <linux/config.h> | ||
7 | #include <linux/capability.h> | 44 | #include <linux/capability.h> |
8 | #include <linux/threads.h> | 45 | #include <linux/threads.h> |
9 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
@@ -37,31 +74,15 @@ | |||
37 | #include <linux/rcupdate.h> | 74 | #include <linux/rcupdate.h> |
38 | #include <linux/futex.h> | 75 | #include <linux/futex.h> |
39 | 76 | ||
40 | #include <linux/auxvec.h> /* For AT_VECTOR_SIZE */ | 77 | #include <linux/time.h> |
78 | #include <linux/param.h> | ||
79 | #include <linux/resource.h> | ||
80 | #include <linux/timer.h> | ||
81 | #include <linux/hrtimer.h> | ||
41 | 82 | ||
42 | struct exec_domain; | 83 | #include <asm/processor.h> |
43 | 84 | ||
44 | /* | 85 | struct exec_domain; |
45 | * cloning flags: | ||
46 | */ | ||
47 | #define CSIGNAL 0x000000ff /* signal mask to be sent at exit */ | ||
48 | #define CLONE_VM 0x00000100 /* set if VM shared between processes */ | ||
49 | #define CLONE_FS 0x00000200 /* set if fs info shared between processes */ | ||
50 | #define CLONE_FILES 0x00000400 /* set if open files shared between processes */ | ||
51 | #define CLONE_SIGHAND 0x00000800 /* set if signal handlers and blocked signals shared */ | ||
52 | #define CLONE_PTRACE 0x00002000 /* set if we want to let tracing continue on the child too */ | ||
53 | #define CLONE_VFORK 0x00004000 /* set if the parent wants the child to wake it up on mm_release */ | ||
54 | #define CLONE_PARENT 0x00008000 /* set if we want to have the same parent as the cloner */ | ||
55 | #define CLONE_THREAD 0x00010000 /* Same thread group? */ | ||
56 | #define CLONE_NEWNS 0x00020000 /* New namespace group? */ | ||
57 | #define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */ | ||
58 | #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ | ||
59 | #define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ | ||
60 | #define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ | ||
61 | #define CLONE_DETACHED 0x00400000 /* Unused, ignored */ | ||
62 | #define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ | ||
63 | #define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ | ||
64 | #define CLONE_STOPPED 0x02000000 /* Start in stopped state */ | ||
65 | 86 | ||
66 | /* | 87 | /* |
67 | * List of flags we want to share for kernel threads, | 88 | * List of flags we want to share for kernel threads, |
@@ -103,13 +124,6 @@ extern unsigned long nr_uninterruptible(void); | |||
103 | extern unsigned long nr_active(void); | 124 | extern unsigned long nr_active(void); |
104 | extern unsigned long nr_iowait(void); | 125 | extern unsigned long nr_iowait(void); |
105 | 126 | ||
106 | #include <linux/time.h> | ||
107 | #include <linux/param.h> | ||
108 | #include <linux/resource.h> | ||
109 | #include <linux/timer.h> | ||
110 | #include <linux/hrtimer.h> | ||
111 | |||
112 | #include <asm/processor.h> | ||
113 | 127 | ||
114 | /* | 128 | /* |
115 | * Task state bitmask. NOTE! These bits are also | 129 | * Task state bitmask. NOTE! These bits are also |
@@ -156,20 +170,6 @@ extern unsigned long nr_iowait(void); | |||
156 | /* Task command name length */ | 170 | /* Task command name length */ |
157 | #define TASK_COMM_LEN 16 | 171 | #define TASK_COMM_LEN 16 |
158 | 172 | ||
159 | /* | ||
160 | * Scheduling policies | ||
161 | */ | ||
162 | #define SCHED_NORMAL 0 | ||
163 | #define SCHED_FIFO 1 | ||
164 | #define SCHED_RR 2 | ||
165 | #define SCHED_BATCH 3 | ||
166 | |||
167 | struct sched_param { | ||
168 | int sched_priority; | ||
169 | }; | ||
170 | |||
171 | #ifdef __KERNEL__ | ||
172 | |||
173 | #include <linux/spinlock.h> | 173 | #include <linux/spinlock.h> |
174 | 174 | ||
175 | /* | 175 | /* |
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index cd2773b29a64..3e8b1cf54303 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_SECCOMP_H | 1 | #ifndef _LINUX_SECCOMP_H |
2 | #define _LINUX_SECCOMP_H | 2 | #define _LINUX_SECCOMP_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | #ifdef CONFIG_SECCOMP | 5 | #ifdef CONFIG_SECCOMP |
7 | 6 | ||
diff --git a/include/linux/sem.h b/include/linux/sem.h index 3c1f1120fe88..9aaffb0b1d81 100644 --- a/include/linux/sem.h +++ b/include/linux/sem.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _LINUX_SEM_H | 2 | #define _LINUX_SEM_H |
3 | 3 | ||
4 | #include <linux/ipc.h> | 4 | #include <linux/ipc.h> |
5 | #include <asm/atomic.h> | ||
6 | 5 | ||
7 | /* semop flags */ | 6 | /* semop flags */ |
8 | #define SEM_UNDO 0x1000 /* undo the operation on exit */ | 7 | #define SEM_UNDO 0x1000 /* undo the operation on exit */ |
@@ -78,6 +77,7 @@ struct seminfo { | |||
78 | #define SEMUSZ 20 /* sizeof struct sem_undo */ | 77 | #define SEMUSZ 20 /* sizeof struct sem_undo */ |
79 | 78 | ||
80 | #ifdef __KERNEL__ | 79 | #ifdef __KERNEL__ |
80 | #include <asm/atomic.h> | ||
81 | 81 | ||
82 | struct task_struct; | 82 | struct task_struct; |
83 | 83 | ||
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 5a095572881d..7bc5c7c12b54 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h | |||
@@ -26,7 +26,6 @@ | |||
26 | * by Keith Owens and Andrea Arcangeli | 26 | * by Keith Owens and Andrea Arcangeli |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <linux/config.h> | ||
30 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
31 | #include <linux/preempt.h> | 30 | #include <linux/preempt.h> |
32 | 31 | ||
diff --git a/include/linux/serialP.h b/include/linux/serialP.h index 2b9e6b9554d5..e811a615f696 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h | |||
@@ -19,7 +19,6 @@ | |||
19 | * For definitions of the flags field, see tty.h | 19 | * For definitions of the flags field, see tty.h |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/config.h> | ||
23 | #include <linux/termios.h> | 22 | #include <linux/termios.h> |
24 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index c32e60e79dea..fcfb783bef41 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -132,7 +132,6 @@ | |||
132 | 132 | ||
133 | #ifdef __KERNEL__ | 133 | #ifdef __KERNEL__ |
134 | 134 | ||
135 | #include <linux/config.h> | ||
136 | #include <linux/compiler.h> | 135 | #include <linux/compiler.h> |
137 | #include <linux/interrupt.h> | 136 | #include <linux/interrupt.h> |
138 | #include <linux/circ_buf.h> | 137 | #include <linux/circ_buf.h> |
diff --git a/include/linux/signal.h b/include/linux/signal.h index 70739f51a09f..1e4ce7225eee 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h | |||
@@ -1,12 +1,12 @@ | |||
1 | #ifndef _LINUX_SIGNAL_H | 1 | #ifndef _LINUX_SIGNAL_H |
2 | #define _LINUX_SIGNAL_H | 2 | #define _LINUX_SIGNAL_H |
3 | 3 | ||
4 | #include <linux/list.h> | ||
5 | #include <linux/spinlock.h> | ||
6 | #include <asm/signal.h> | 4 | #include <asm/signal.h> |
7 | #include <asm/siginfo.h> | 5 | #include <asm/siginfo.h> |
8 | 6 | ||
9 | #ifdef __KERNEL__ | 7 | #ifdef __KERNEL__ |
8 | #include <linux/list.h> | ||
9 | #include <linux/spinlock.h> | ||
10 | 10 | ||
11 | /* | 11 | /* |
12 | * These values of sa_flags are used only by the kernel as part of the | 12 | * These values of sa_flags are used only by the kernel as part of the |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f8f234708b98..4dc65b55812e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifndef _LINUX_SKBUFF_H | 14 | #ifndef _LINUX_SKBUFF_H |
15 | #define _LINUX_SKBUFF_H | 15 | #define _LINUX_SKBUFF_H |
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
19 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
20 | #include <linux/time.h> | 19 | #include <linux/time.h> |
diff --git a/include/linux/slab.h b/include/linux/slab.h index 3af03b19c983..a7d7f131b5da 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | typedef struct kmem_cache kmem_cache_t; | 12 | typedef struct kmem_cache kmem_cache_t; |
13 | 13 | ||
14 | #include <linux/config.h> /* kmalloc_sizes.h needs CONFIG_ options */ | ||
15 | #include <linux/gfp.h> | 14 | #include <linux/gfp.h> |
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
17 | #include <linux/types.h> | 16 | #include <linux/types.h> |
diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h index 621a3d3662f3..367d6c3e8ed4 100644 --- a/include/linux/smb_fs.h +++ b/include/linux/smb_fs.h | |||
@@ -10,8 +10,6 @@ | |||
10 | #define _LINUX_SMB_FS_H | 10 | #define _LINUX_SMB_FS_H |
11 | 11 | ||
12 | #include <linux/smb.h> | 12 | #include <linux/smb.h> |
13 | #include <linux/smb_fs_i.h> | ||
14 | #include <linux/smb_fs_sb.h> | ||
15 | 13 | ||
16 | /* | 14 | /* |
17 | * ioctl commands | 15 | * ioctl commands |
@@ -24,6 +22,8 @@ | |||
24 | 22 | ||
25 | 23 | ||
26 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
25 | #include <linux/smb_fs_i.h> | ||
26 | #include <linux/smb_fs_sb.h> | ||
27 | 27 | ||
28 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
29 | #include <linux/pagemap.h> | 29 | #include <linux/pagemap.h> |
diff --git a/include/linux/smp.h b/include/linux/smp.h index e2fa3ab4afc5..c93c3fe4308c 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * Alan Cox. <alan@redhat.com> | 6 | * Alan Cox. <alan@redhat.com> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | 9 | ||
11 | extern void cpu_idle(void); | 10 | extern void cpu_idle(void); |
12 | 11 | ||
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h index fa1ff3b165fe..cf715a40d833 100644 --- a/include/linux/smp_lock.h +++ b/include/linux/smp_lock.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __LINUX_SMPLOCK_H | 1 | #ifndef __LINUX_SMPLOCK_H |
2 | #define __LINUX_SMPLOCK_H | 2 | #define __LINUX_SMPLOCK_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #ifdef CONFIG_LOCK_KERNEL | 4 | #ifdef CONFIG_LOCK_KERNEL |
6 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
diff --git a/include/linux/socket.h b/include/linux/socket.h index 9ab2ddd80221..361409094649 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h | |||
@@ -18,8 +18,6 @@ struct __kernel_sockaddr_storage { | |||
18 | 18 | ||
19 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | 19 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) |
20 | 20 | ||
21 | #include <linux/config.h> /* for CONFIG_COMPAT */ | ||
22 | #include <linux/linkage.h> | ||
23 | #include <asm/socket.h> /* arch-dependent defines */ | 21 | #include <asm/socket.h> /* arch-dependent defines */ |
24 | #include <linux/sockios.h> /* the SIOCxxx I/O controls */ | 22 | #include <linux/sockios.h> /* the SIOCxxx I/O controls */ |
25 | #include <linux/uio.h> /* iovec support */ | 23 | #include <linux/uio.h> /* iovec support */ |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 799be6747944..ae23beef9cc9 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
@@ -46,7 +46,6 @@ | |||
46 | * linux/spinlock.h: builds the final spin_*() APIs. | 46 | * linux/spinlock.h: builds the final spin_*() APIs. |
47 | */ | 47 | */ |
48 | 48 | ||
49 | #include <linux/config.h> | ||
50 | #include <linux/preempt.h> | 49 | #include <linux/preempt.h> |
51 | #include <linux/linkage.h> | 50 | #include <linux/linkage.h> |
52 | #include <linux/compiler.h> | 51 | #include <linux/compiler.h> |
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h index 151a803ed0ed..5bfc553bdb21 100644 --- a/include/linux/stop_machine.h +++ b/include/linux/stop_machine.h | |||
@@ -4,7 +4,6 @@ | |||
4 | very heavy lock, which is equivalent to grabbing every spinlock | 4 | very heavy lock, which is equivalent to grabbing every spinlock |
5 | (and more). So the "read" side to such a lock is anything which | 5 | (and more). So the "read" side to such a lock is anything which |
6 | diables preeempt. */ | 6 | diables preeempt. */ |
7 | #include <linux/config.h> | ||
8 | #include <linux/cpu.h> | 7 | #include <linux/cpu.h> |
9 | #include <asm/system.h> | 8 | #include <asm/system.h> |
10 | 9 | ||
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index be4772ed43c0..a6de332e57d4 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #ifdef __KERNEL__ | 12 | #ifdef __KERNEL__ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/sunrpc/sched.h> | 14 | #include <linux/sunrpc/sched.h> |
16 | #include <linux/sunrpc/msg_prot.h> | 15 | #include <linux/sunrpc/msg_prot.h> |
17 | #include <linux/sunrpc/xdr.h> | 16 | #include <linux/sunrpc/xdr.h> |
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h index 1a42d902bc11..e4729aa67654 100644 --- a/include/linux/sunrpc/debug.h +++ b/include/linux/sunrpc/debug.h | |||
@@ -9,19 +9,6 @@ | |||
9 | #ifndef _LINUX_SUNRPC_DEBUG_H_ | 9 | #ifndef _LINUX_SUNRPC_DEBUG_H_ |
10 | #define _LINUX_SUNRPC_DEBUG_H_ | 10 | #define _LINUX_SUNRPC_DEBUG_H_ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | |||
14 | #include <linux/timer.h> | ||
15 | #include <linux/workqueue.h> | ||
16 | |||
17 | /* | ||
18 | * Enable RPC debugging/profiling. | ||
19 | */ | ||
20 | #ifdef CONFIG_SYSCTL | ||
21 | #define RPC_DEBUG | ||
22 | #endif | ||
23 | /* #define RPC_PROFILE */ | ||
24 | |||
25 | /* | 12 | /* |
26 | * RPC debug facilities | 13 | * RPC debug facilities |
27 | */ | 14 | */ |
@@ -41,6 +28,17 @@ | |||
41 | 28 | ||
42 | #ifdef __KERNEL__ | 29 | #ifdef __KERNEL__ |
43 | 30 | ||
31 | #include <linux/timer.h> | ||
32 | #include <linux/workqueue.h> | ||
33 | |||
34 | /* | ||
35 | * Enable RPC debugging/profiling. | ||
36 | */ | ||
37 | #ifdef CONFIG_SYSCTL | ||
38 | #define RPC_DEBUG | ||
39 | #endif | ||
40 | /* #define RPC_PROFILE */ | ||
41 | |||
44 | /* | 42 | /* |
45 | * Debugging macros etc | 43 | * Debugging macros etc |
46 | */ | 44 | */ |
diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h index d93c24b47f3f..5fa0f2084307 100644 --- a/include/linux/sunrpc/stats.h +++ b/include/linux/sunrpc/stats.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef _LINUX_SUNRPC_STATS_H | 9 | #ifndef _LINUX_SUNRPC_STATS_H |
10 | #define _LINUX_SUNRPC_STATS_H | 10 | #define _LINUX_SUNRPC_STATS_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
14 | 13 | ||
15 | struct rpc_stat { | 14 | struct rpc_stat { |
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 37c1c76fd547..96e31aa64cc7 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #endif | 6 | #endif |
7 | #include <linux/swap.h> | 7 | #include <linux/swap.h> |
8 | #include <linux/notifier.h> | 8 | #include <linux/notifier.h> |
9 | #include <linux/config.h> | ||
10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
11 | #include <linux/pm.h> | 10 | #include <linux/pm.h> |
12 | 11 | ||
diff --git a/include/linux/swap.h b/include/linux/swap.h index 5b1fdf1cff4f..e24fa9b69cbf 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_SWAP_H | 1 | #ifndef _LINUX_SWAP_H |
2 | #define _LINUX_SWAP_H | 2 | #define _LINUX_SWAP_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/spinlock.h> | 4 | #include <linux/spinlock.h> |
6 | #include <linux/linkage.h> | 5 | #include <linux/linkage.h> |
7 | #include <linux/mmzone.h> | 6 | #include <linux/mmzone.h> |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 3996960fc565..70c64dbe4b8a 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -53,7 +53,6 @@ struct mq_attr; | |||
53 | struct compat_stat; | 53 | struct compat_stat; |
54 | struct compat_timeval; | 54 | struct compat_timeval; |
55 | 55 | ||
56 | #include <linux/config.h> | ||
57 | #include <linux/types.h> | 56 | #include <linux/types.h> |
58 | #include <linux/aio_abi.h> | 57 | #include <linux/aio_abi.h> |
59 | #include <linux/capability.h> | 58 | #include <linux/capability.h> |
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h index ea819b89c235..4812ff60561c 100644 --- a/include/linux/sysrq.h +++ b/include/linux/sysrq.h | |||
@@ -11,7 +11,6 @@ | |||
11 | * based upon discusions in irc://irc.openprojects.net/#kernelnewbies | 11 | * based upon discusions in irc://irc.openprojects.net/#kernelnewbies |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | struct pt_regs; | 15 | struct pt_regs; |
17 | struct tty_struct; | 16 | struct tty_struct; |
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 542d39596bd8..a8b24eff5b5f 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h | |||
@@ -159,7 +159,6 @@ struct tcp_info | |||
159 | 159 | ||
160 | #ifdef __KERNEL__ | 160 | #ifdef __KERNEL__ |
161 | 161 | ||
162 | #include <linux/config.h> | ||
163 | #include <linux/skbuff.h> | 162 | #include <linux/skbuff.h> |
164 | #include <net/sock.h> | 163 | #include <net/sock.h> |
165 | #include <net/inet_connection_sock.h> | 164 | #include <net/inet_connection_sock.h> |
diff --git a/include/linux/threads.h b/include/linux/threads.h index e646bcdf2614..38d1a5d6568e 100644 --- a/include/linux/threads.h +++ b/include/linux/threads.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_THREADS_H | 1 | #ifndef _LINUX_THREADS_H |
2 | #define _LINUX_THREADS_H | 2 | #define _LINUX_THREADS_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | 4 | ||
6 | /* | 5 | /* |
7 | * The default limit for the nr of threads is now in | 6 | * The default limit for the nr of threads is now in |
diff --git a/include/linux/timer.h b/include/linux/timer.h index 0a485beba9f5..c982304dbafd 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _LINUX_TIMER_H | 1 | #ifndef _LINUX_TIMER_H |
2 | #define _LINUX_TIMER_H | 2 | #define _LINUX_TIMER_H |
3 | 3 | ||
4 | #include <linux/config.h> | ||
5 | #include <linux/list.h> | 4 | #include <linux/list.h> |
6 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
7 | #include <linux/stddef.h> | 6 | #include <linux/stddef.h> |
diff --git a/include/linux/timex.h b/include/linux/timex.h index 03914b7e41b1..34d3ccff7bbb 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
@@ -53,7 +53,6 @@ | |||
53 | #ifndef _LINUX_TIMEX_H | 53 | #ifndef _LINUX_TIMEX_H |
54 | #define _LINUX_TIMEX_H | 54 | #define _LINUX_TIMEX_H |
55 | 55 | ||
56 | #include <linux/config.h> | ||
57 | #include <linux/compiler.h> | 56 | #include <linux/compiler.h> |
58 | #include <linux/time.h> | 57 | #include <linux/time.h> |
59 | 58 | ||
diff --git a/include/linux/tty.h b/include/linux/tty.h index f13f49afe198..e898eeb94166 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
@@ -16,7 +16,6 @@ | |||
16 | consoles 16 and higher (since it returns a short) */ | 16 | consoles 16 and higher (since it returns a short) */ |
17 | 17 | ||
18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
19 | #include <linux/config.h> | ||
20 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
21 | #include <linux/major.h> | 20 | #include <linux/major.h> |
22 | #include <linux/termios.h> | 21 | #include <linux/termios.h> |
diff --git a/include/linux/types.h b/include/linux/types.h index 1046c7ad86d9..a5e46e783ffa 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _LINUX_TYPES_H | 2 | #define _LINUX_TYPES_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | #include <linux/config.h> | ||
6 | 5 | ||
7 | #define BITS_TO_LONGS(bits) \ | 6 | #define BITS_TO_LONGS(bits) \ |
8 | (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) | 7 | (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) |
diff --git a/include/linux/udp.h b/include/linux/udp.h index 85a55658831c..bdd39be09406 100644 --- a/include/linux/udp.h +++ b/include/linux/udp.h | |||
@@ -35,7 +35,6 @@ struct udphdr { | |||
35 | #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ | 35 | #define UDP_ENCAP_ESPINUDP 2 /* draft-ietf-ipsec-udp-encaps-06 */ |
36 | 36 | ||
37 | #ifdef __KERNEL__ | 37 | #ifdef __KERNEL__ |
38 | #include <linux/config.h> | ||
39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
40 | 39 | ||
41 | #include <net/inet_sock.h> | 40 | #include <net/inet_sock.h> |
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h index 843aeaaa79d4..86b5b4271b5a 100644 --- a/include/linux/ufs_fs.h +++ b/include/linux/ufs_fs.h | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/time.h> | ||
36 | #include <linux/stat.h> | 35 | #include <linux/stat.h> |
37 | #include <linux/fs.h> | 36 | #include <linux/fs.h> |
38 | 37 | ||
diff --git a/include/linux/unistd.h b/include/linux/unistd.h index 10ed9834b822..c18c60f3254e 100644 --- a/include/linux/unistd.h +++ b/include/linux/unistd.h | |||
@@ -1,7 +1,9 @@ | |||
1 | #ifndef _LINUX_UNISTD_H_ | 1 | #ifndef _LINUX_UNISTD_H_ |
2 | #define _LINUX_UNISTD_H_ | 2 | #define _LINUX_UNISTD_H_ |
3 | 3 | ||
4 | #ifdef __KERNEL__ | ||
4 | extern int errno; | 5 | extern int errno; |
6 | #endif | ||
5 | 7 | ||
6 | /* | 8 | /* |
7 | * Include machine specific syscallX macros | 9 | * Include machine specific syscallX macros |
diff --git a/include/linux/usb.h b/include/linux/usb.h index e34e5e3dce52..1f492c0c7047 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -10,7 +10,6 @@ | |||
10 | 10 | ||
11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
12 | 12 | ||
13 | #include <linux/config.h> | ||
14 | #include <linux/errno.h> /* for -ENODEV */ | 13 | #include <linux/errno.h> /* for -ENODEV */ |
15 | #include <linux/delay.h> /* for mdelay() */ | 14 | #include <linux/delay.h> /* for mdelay() */ |
16 | #include <linux/interrupt.h> /* for in_interrupt() */ | 15 | #include <linux/interrupt.h> /* for in_interrupt() */ |
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index b2d08984a9f7..608487a62c98 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef __LINUX_USB_USUAL_H | 9 | #ifndef __LINUX_USB_USUAL_H |
10 | #define __LINUX_USB_USUAL_H | 10 | #define __LINUX_USB_USUAL_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | 12 | ||
14 | /* We should do this for cleanliness... But other usb_foo.h do not do this. */ | 13 | /* We should do this for cleanliness... But other usb_foo.h do not do this. */ |
15 | /* #include <linux/usb.h> */ | 14 | /* #include <linux/usb.h> */ |
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h index 8859f0b41543..7b7aadb69092 100644 --- a/include/linux/usbdevice_fs.h +++ b/include/linux/usbdevice_fs.h | |||
@@ -123,6 +123,7 @@ struct usbdevfs_hub_portinfo { | |||
123 | char port [127]; /* e.g. port 3 connects to device 27 */ | 123 | char port [127]; /* e.g. port 3 connects to device 27 */ |
124 | }; | 124 | }; |
125 | 125 | ||
126 | #ifdef __KERNEL__ | ||
126 | #ifdef CONFIG_COMPAT | 127 | #ifdef CONFIG_COMPAT |
127 | #include <linux/compat.h> | 128 | #include <linux/compat.h> |
128 | struct usbdevfs_urb32 { | 129 | struct usbdevfs_urb32 { |
@@ -147,6 +148,7 @@ struct usbdevfs_ioctl32 { | |||
147 | compat_caddr_t data; | 148 | compat_caddr_t data; |
148 | }; | 149 | }; |
149 | #endif | 150 | #endif |
151 | #endif /* __KERNEL__ */ | ||
150 | 152 | ||
151 | #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) | 153 | #define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer) |
152 | #define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer) | 154 | #define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer) |
diff --git a/include/linux/vt_buffer.h b/include/linux/vt_buffer.h index 1f7ba3629053..057db7d2f448 100644 --- a/include/linux/vt_buffer.h +++ b/include/linux/vt_buffer.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #ifndef _LINUX_VT_BUFFER_H_ | 13 | #ifndef _LINUX_VT_BUFFER_H_ |
14 | #define _LINUX_VT_BUFFER_H_ | 14 | #define _LINUX_VT_BUFFER_H_ |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | 16 | ||
18 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) | 17 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) |
19 | #include <asm/vga.h> | 18 | #include <asm/vga.h> |
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 530ae3f4248c..6ef527bb6235 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
@@ -6,7 +6,6 @@ | |||
6 | * with information needed by the vt package | 6 | * with information needed by the vt package |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/config.h> | ||
10 | #include <linux/vt.h> | 9 | #include <linux/vt.h> |
11 | #include <linux/kd.h> | 10 | #include <linux/kd.h> |
12 | #include <linux/tty.h> | 11 | #include <linux/tty.h> |
diff --git a/include/linux/wait.h b/include/linux/wait.h index d28518236b62..544e855c7c02 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
21 | 21 | ||
22 | #include <linux/config.h> | ||
23 | #include <linux/list.h> | 22 | #include <linux/list.h> |
24 | #include <linux/stddef.h> | 23 | #include <linux/stddef.h> |
25 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h index 1b6b76a4eb54..2cd05013edfc 100644 --- a/include/linux/wanrouter.h +++ b/include/linux/wanrouter.h | |||
@@ -44,8 +44,6 @@ | |||
44 | * Jan 02, 1997 Gene Kozin Initial version (based on wanpipe.h). | 44 | * Jan 02, 1997 Gene Kozin Initial version (based on wanpipe.h). |
45 | *****************************************************************************/ | 45 | *****************************************************************************/ |
46 | 46 | ||
47 | #include <linux/spinlock.h> /* Support for SMP Locking */ | ||
48 | |||
49 | #ifndef _ROUTER_H | 47 | #ifndef _ROUTER_H |
50 | #define _ROUTER_H | 48 | #define _ROUTER_H |
51 | 49 | ||
@@ -457,6 +455,8 @@ typedef struct wanif_conf | |||
457 | #include <linux/fs.h> /* support for device drivers */ | 455 | #include <linux/fs.h> /* support for device drivers */ |
458 | #include <linux/proc_fs.h> /* proc filesystem pragmatics */ | 456 | #include <linux/proc_fs.h> /* proc filesystem pragmatics */ |
459 | #include <linux/netdevice.h> /* support for network drivers */ | 457 | #include <linux/netdevice.h> /* support for network drivers */ |
458 | #include <linux/spinlock.h> /* Support for SMP Locking */ | ||
459 | |||
460 | /*---------------------------------------------------------------------------- | 460 | /*---------------------------------------------------------------------------- |
461 | * WAN device data space. | 461 | * WAN device data space. |
462 | */ | 462 | */ |