diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /drivers | |
parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'drivers')
48 files changed, 0 insertions, 52 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 99f87efe0f58..36b88f6c5f82 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/config.h> /* CONFIG_PROC_FS */ | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 4abc193314ee..ada68e65b5ff 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * Questions/Comments/Bugfixes to iss_storagedev@hp.com | 19 | * Questions/Comments/Bugfixes to iss_storagedev@hp.com |
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | #include <linux/config.h> /* CONFIG_PROC_FS */ | ||
23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
24 | #include <linux/types.h> | 23 | #include <linux/types.h> |
25 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c index b8c22255f6ad..9f8082f8dd29 100644 --- a/drivers/char/briq_panel.c +++ b/drivers/char/briq_panel.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
12 | #include <linux/tty.h> | 12 | #include <linux/tty.h> |
13 | #include <linux/timer.h> | 13 | #include <linux/timer.h> |
14 | #include <linux/config.h> | ||
15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
16 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c index 65c9d2ec60bd..216532445652 100644 --- a/drivers/char/ftape/lowlevel/fdc-io.c +++ b/drivers/char/ftape/lowlevel/fdc-io.c | |||
@@ -26,7 +26,6 @@ | |||
26 | * Linux. | 26 | * Linux. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <linux/config.h> /* for CONFIG_FT_* */ | ||
30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/drivers/char/ftape/zftape/zftape-rw.c b/drivers/char/ftape/zftape/zftape-rw.c index a61ef50f3dfc..dab634686885 100644 --- a/drivers/char/ftape/zftape/zftape-rw.c +++ b/drivers/char/ftape/zftape/zftape-rw.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * zftape. | 24 | * zftape. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/config.h> /* for CONFIG_ZFT_DFLT_BLK_SZ */ | ||
28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
29 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
30 | 29 | ||
diff --git a/drivers/char/ftape/zftape/zftape-rw.h b/drivers/char/ftape/zftape/zftape-rw.h index 14c07f086575..1ceec22b60bd 100644 --- a/drivers/char/ftape/zftape/zftape-rw.h +++ b/drivers/char/ftape/zftape/zftape-rw.h | |||
@@ -28,7 +28,6 @@ | |||
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/config.h> /* for CONFIG_ZFT_DFLT_BLK_SZ */ | ||
32 | #include "../zftape/zftape-buffers.h" | 31 | #include "../zftape/zftape-buffers.h" |
33 | 32 | ||
34 | #define SEGMENTS_PER_TAPE (ft_segments_per_track * ft_tracks_per_tape) | 33 | #define SEGMENTS_PER_TAPE (ft_segments_per_track * ft_tracks_per_tape) |
diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c index 3cf4d641a51c..c9caff57db85 100644 --- a/drivers/char/hw_random/ixp4xx-rng.c +++ b/drivers/char/hw_random/ixp4xx-rng.c | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/config.h> | ||
19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
20 | #include <linux/module.h> | 19 | #include <linux/module.h> |
21 | #include <linux/moduleparam.h> | 20 | #include <linux/moduleparam.h> |
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c index 5426b1e5595f..5c0dec39cf6c 100644 --- a/drivers/char/mspec.c +++ b/drivers/char/mspec.c | |||
@@ -30,7 +30,6 @@ | |||
30 | * processor from ever speculating a cache line from this page. | 30 | * processor from ever speculating a cache line from this page. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include <linux/config.h> | ||
34 | #include <linux/types.h> | 33 | #include <linux/types.h> |
35 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
diff --git a/drivers/char/nsc_gpio.c b/drivers/char/nsc_gpio.c index 7719bd75810b..4d47d79bcea7 100644 --- a/drivers/char/nsc_gpio.c +++ b/drivers/char/nsc_gpio.c | |||
@@ -7,7 +7,6 @@ | |||
7 | Copyright (c) 2005 Jim Cromie <jim.cromie@gmail.com> | 7 | Copyright (c) 2005 Jim Cromie <jim.cromie@gmail.com> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | ||
11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
12 | #include <linux/module.h> | 11 | #include <linux/module.h> |
13 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index d1ecb2c6de98..73e324209913 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #define MAX_DEVICE_COUNT 4 | 36 | #define MAX_DEVICE_COUNT 4 |
37 | 37 | ||
38 | #include <linux/config.h> | ||
39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
41 | #include <linux/signal.h> | 40 | #include <linux/signal.h> |
diff --git a/drivers/char/sx.c b/drivers/char/sx.c index 57e31e5eaedb..8fd71a5fc619 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c | |||
@@ -203,9 +203,7 @@ | |||
203 | #define RCS_ID "$Id: sx.c,v 1.33 2000/03/08 10:01:02 wolff, pvdl Exp $" | 203 | #define RCS_ID "$Id: sx.c,v 1.33 2000/03/08 10:01:02 wolff, pvdl Exp $" |
204 | #define RCS_REV "$Revision: 1.33 $" | 204 | #define RCS_REV "$Revision: 1.33 $" |
205 | 205 | ||
206 | |||
207 | #include <linux/module.h> | 206 | #include <linux/module.h> |
208 | #include <linux/config.h> | ||
209 | #include <linux/kdev_t.h> | 207 | #include <linux/kdev_t.h> |
210 | #include <linux/kernel.h> | 208 | #include <linux/kernel.h> |
211 | #include <linux/sched.h> | 209 | #include <linux/sched.h> |
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index 38d94987de83..a4150c4519c4 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -63,7 +63,6 @@ | |||
63 | #define MAX_PCI_DEVICES 10 | 63 | #define MAX_PCI_DEVICES 10 |
64 | #define MAX_TOTAL_DEVICES 20 | 64 | #define MAX_TOTAL_DEVICES 20 |
65 | 65 | ||
66 | #include <linux/config.h> | ||
67 | #include <linux/module.h> | 66 | #include <linux/module.h> |
68 | #include <linux/errno.h> | 67 | #include <linux/errno.h> |
69 | #include <linux/signal.h> | 68 | #include <linux/signal.h> |
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c index 8f89948832fc..aaac94db0d8b 100644 --- a/drivers/char/watchdog/iTCO_wdt.c +++ b/drivers/char/watchdog/iTCO_wdt.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #define PFX DRV_NAME ": " | 49 | #define PFX DRV_NAME ": " |
50 | 50 | ||
51 | /* Includes */ | 51 | /* Includes */ |
52 | #include <linux/config.h> /* For CONFIG_WATCHDOG_NOWAYOUT/... */ | ||
53 | #include <linux/module.h> /* For module specific items */ | 52 | #include <linux/module.h> /* For module specific items */ |
54 | #include <linux/moduleparam.h> /* For new moduleparam's */ | 53 | #include <linux/moduleparam.h> /* For new moduleparam's */ |
55 | #include <linux/types.h> /* For standard types (like size_t) */ | 54 | #include <linux/types.h> /* For standard types (like size_t) */ |
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c index 8f90b90a5021..5dbd7dc2936f 100644 --- a/drivers/char/watchdog/omap_wdt.c +++ b/drivers/char/watchdog/omap_wdt.c | |||
@@ -27,7 +27,6 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/config.h> | ||
31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
33 | #include <linux/fs.h> | 32 | #include <linux/fs.h> |
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c index 6f8515db5b07..8e1e6e48e0a7 100644 --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/char/watchdog/pcwd.c | |||
@@ -49,7 +49,6 @@ | |||
49 | * More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/ | 49 | * More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/ |
50 | */ | 50 | */ |
51 | 51 | ||
52 | #include <linux/config.h> /* For CONFIG_WATCHDOG_NOWAYOUT/... */ | ||
53 | #include <linux/module.h> /* For module specific items */ | 52 | #include <linux/module.h> /* For module specific items */ |
54 | #include <linux/moduleparam.h> /* For new moduleparam's */ | 53 | #include <linux/moduleparam.h> /* For new moduleparam's */ |
55 | #include <linux/types.h> /* For standard types (like size_t) */ | 54 | #include <linux/types.h> /* For standard types (like size_t) */ |
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c index 2de6e497c140..f4872c871063 100644 --- a/drivers/char/watchdog/pcwd_pci.c +++ b/drivers/char/watchdog/pcwd_pci.c | |||
@@ -31,7 +31,6 @@ | |||
31 | * Includes, defines, variables, module parameters, ... | 31 | * Includes, defines, variables, module parameters, ... |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <linux/config.h> /* For CONFIG_WATCHDOG_NOWAYOUT/... */ | ||
35 | #include <linux/module.h> /* For module specific items */ | 34 | #include <linux/module.h> /* For module specific items */ |
36 | #include <linux/moduleparam.h> /* For new moduleparam's */ | 35 | #include <linux/moduleparam.h> /* For new moduleparam's */ |
37 | #include <linux/types.h> /* For standard types (like size_t) */ | 36 | #include <linux/types.h> /* For standard types (like size_t) */ |
diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c index db2731ba88e3..3a55fc6abcd8 100644 --- a/drivers/char/watchdog/pnx4008_wdt.c +++ b/drivers/char/watchdog/pnx4008_wdt.c | |||
@@ -14,7 +14,6 @@ | |||
14 | * or implied. | 14 | * or implied. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
19 | #include <linux/moduleparam.h> | 18 | #include <linux/moduleparam.h> |
20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index d965d074cd61..371ed4f69a97 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c | |||
@@ -32,7 +32,6 @@ | |||
32 | The w83791g chip is the same as the w83791d but lead-free. | 32 | The w83791g chip is the same as the w83791d but lead-free. |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/config.h> | ||
36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
38 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 952a28d485ce..3e276e958ef7 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * kind, whether express or implied. | 9 | * kind, whether express or implied. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
15 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c index 0cb7b9b520ea..965c43659e35 100644 --- a/drivers/ide/pci/generic.c +++ b/drivers/ide/pci/generic.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 24 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
25 | 25 | ||
26 | #include <linux/config.h> /* for CONFIG_BLK_DEV_IDEPCI */ | ||
27 | #include <linux/types.h> | 26 | #include <linux/types.h> |
28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
29 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c index 68c74bbf8b06..c1cec236ecf0 100644 --- a/drivers/ide/pci/jmicron.c +++ b/drivers/ide/pci/jmicron.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * May be copied or modified under the terms of the GNU General Public License | 5 | * May be copied or modified under the terms of the GNU General Public License |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/types.h> | 8 | #include <linux/types.h> |
10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c index 608cd7609072..5f6950c2d1d1 100644 --- a/drivers/ide/pci/rz1000.c +++ b/drivers/ide/pci/rz1000.c | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 18 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
19 | 19 | ||
20 | #include <linux/config.h> /* for CONFIG_BLK_DEV_IDEPCI */ | ||
21 | #include <linux/types.h> | 20 | #include <linux/types.h> |
22 | #include <linux/module.h> | 21 | #include <linux/module.h> |
23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_mmap.c b/drivers/infiniband/hw/ipath/ipath_mmap.c index 11b7378ff214..a82157db4689 100644 --- a/drivers/infiniband/hw/ipath/ipath_mmap.c +++ b/drivers/infiniband/hw/ipath/ipath_mmap.c | |||
@@ -30,7 +30,6 @@ | |||
30 | * SOFTWARE. | 30 | * SOFTWARE. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include <linux/config.h> | ||
34 | #include <linux/module.h> | 33 | #include <linux/module.h> |
35 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
36 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
diff --git a/drivers/leds/leds-ams-delta.c b/drivers/leds/leds-ams-delta.c index e9f06116c4d7..599878c8e714 100644 --- a/drivers/leds/leds-ams-delta.c +++ b/drivers/leds/leds-ams-delta.c | |||
@@ -8,7 +8,6 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/config.h> | ||
12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
14 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index cef00744a9dc..d231efa624d4 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/dma-mapping.h> | 12 | #include <linux/dma-mapping.h> |
14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index 1328e10caa35..baaae3dbf2e6 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c | |||
@@ -12,8 +12,6 @@ | |||
12 | * kind, whether express or implied. | 12 | * kind, whether express or implied. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | |||
16 | #include <linux/config.h> | ||
17 | #include <linux/module.h> | 15 | #include <linux/module.h> |
18 | #include <linux/types.h> | 16 | #include <linux/types.h> |
19 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 21dc68eff514..a43e24245b7e 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -21,8 +21,6 @@ | |||
21 | * | 21 | * |
22 | *************************************************************************/ | 22 | *************************************************************************/ |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | |||
26 | #define DRV_NAME "pcnet32" | 24 | #define DRV_NAME "pcnet32" |
27 | #ifdef CONFIG_PCNET32_NAPI | 25 | #ifdef CONFIG_PCNET32_NAPI |
28 | #define DRV_VERSION "1.33-NAPI" | 26 | #define DRV_VERSION "1.33-NAPI" |
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 94b47c8d0ab4..f14e99276dba 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * option) any later version. | 13 | * option) any later version. |
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | #include <linux/config.h> | ||
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
19 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c index f91028c5386d..67260eb3188a 100644 --- a/drivers/net/ucc_geth_phy.c +++ b/drivers/net/ucc_geth_phy.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
22 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
23 | #include <linux/string.h> | 22 | #include <linux/string.h> |
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c index 2f0b77724192..0b20dfacbf59 100644 --- a/drivers/rtc/rtc-max6902.c +++ b/drivers/rtc/rtc-max6902.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * - Initial driver creation. | 19 | * - Initial driver creation. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/config.h> | ||
23 | #include <linux/module.h> | 22 | #include <linux/module.h> |
24 | #include <linux/version.h> | 23 | #include <linux/version.h> |
25 | 24 | ||
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index ee2ccad70487..734adc9d5206 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/config.h> | ||
28 | #include <linux/module.h> | 27 | #include <linux/module.h> |
29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/imm.h b/drivers/scsi/imm.h index ece936ac29c7..8f6f32fc61ff 100644 --- a/drivers/scsi/imm.h +++ b/drivers/scsi/imm.h | |||
@@ -66,7 +66,6 @@ | |||
66 | */ | 66 | */ |
67 | /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */ | 67 | /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */ |
68 | 68 | ||
69 | #include <linux/config.h> | ||
70 | #include <linux/stddef.h> | 69 | #include <linux/stddef.h> |
71 | #include <linux/module.h> | 70 | #include <linux/module.h> |
72 | #include <linux/kernel.h> | 71 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/ppa.h b/drivers/scsi/ppa.h index 7511df3588e4..ba8021427b88 100644 --- a/drivers/scsi/ppa.h +++ b/drivers/scsi/ppa.h | |||
@@ -73,7 +73,6 @@ | |||
73 | */ | 73 | */ |
74 | /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */ | 74 | /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */ |
75 | 75 | ||
76 | #include <linux/config.h> | ||
77 | #include <linux/stddef.h> | 76 | #include <linux/stddef.h> |
78 | #include <linux/module.h> | 77 | #include <linux/module.h> |
79 | #include <linux/kernel.h> | 78 | #include <linux/kernel.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h index 3b35cb779539..a8f894c78194 100644 --- a/drivers/serial/cpm_uart/cpm_uart.h +++ b/drivers/serial/cpm_uart/cpm_uart.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #ifndef CPM_UART_H | 16 | #ifndef CPM_UART_H |
17 | #define CPM_UART_H | 17 | #define CPM_UART_H |
18 | 18 | ||
19 | #include <linux/config.h> | ||
20 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
21 | #include <linux/fs_uart_pd.h> | 20 | #include <linux/fs_uart_pd.h> |
22 | 21 | ||
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c index c1adc9e4b239..7502109d37f0 100644 --- a/drivers/serial/netx-serial.c +++ b/drivers/serial/netx-serial.c | |||
@@ -17,8 +17,6 @@ | |||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | |||
22 | #if defined(CONFIG_SERIAL_NETX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 20 | #if defined(CONFIG_SERIAL_NETX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
23 | #define SUPPORT_SYSRQ | 21 | #define SUPPORT_SYSRQ |
24 | #endif | 22 | #endif |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index f336ba6778dd..5c025d1190c1 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | #undef DEBUG | 21 | #undef DEBUG |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/module.h> | 23 | #include <linux/module.h> |
25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
26 | #include <linux/timer.h> | 25 | #include <linux/timer.h> |
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 28643c4dc850..7ee992146ae9 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
@@ -10,7 +10,6 @@ | |||
10 | * Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003). | 10 | * Modified to support SH7300(SH-Mobile) SCIF. Takashi Kusuda (Jun 2003). |
11 | * Modified to support H8/300 Series Yoshinori Sato (Feb 2004). | 11 | * Modified to support H8/300 Series Yoshinori Sato (Feb 2004). |
12 | */ | 12 | */ |
13 | #include <linux/config.h> | ||
14 | #include <linux/serial_core.h> | 13 | #include <linux/serial_core.h> |
15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
16 | 15 | ||
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 5fc14563ee3a..20eb6e95a3a0 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | //#define DEBUG | 14 | //#define DEBUG |
15 | 15 | ||
16 | #include <linux/config.h> | ||
17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
18 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
19 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index aacdceb8f44b..a5d2cdfff46f 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c | |||
@@ -11,7 +11,6 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index 16332cc57946..ebb20ff7ac58 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c | |||
@@ -17,7 +17,6 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/config.h> | ||
21 | #include <linux/usb.h> | 20 | #include <linux/usb.h> |
22 | #include "usb.h" | 21 | #include "usb.h" |
23 | 22 | ||
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index 83601d4009e3..64554acad63f 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #define DEBUG 1 | 21 | #define DEBUG 1 |
22 | // #define VERBOSE | 22 | // #define VERBOSE |
23 | 23 | ||
24 | #include <linux/config.h> | ||
25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
26 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index cb2e2a604d1b..0a315200b331 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -35,7 +35,6 @@ | |||
35 | * via an ELAN U132 adapter. | 35 | * via an ELAN U132 adapter. |
36 | * | 36 | * |
37 | */ | 37 | */ |
38 | #include <linux/config.h> | ||
39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
40 | #include <linux/module.h> | 39 | #include <linux/module.h> |
41 | #include <linux/moduleparam.h> | 40 | #include <linux/moduleparam.h> |
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c index 4640d1000d83..923e22db18d4 100644 --- a/drivers/usb/input/usbtouchscreen.c +++ b/drivers/usb/input/usbtouchscreen.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | //#define DEBUG | 36 | //#define DEBUG |
37 | 37 | ||
38 | #include <linux/config.h> | ||
39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
40 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
41 | #include <linux/input.h> | 40 | #include <linux/input.h> |
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index bfde82f5d180..fc6cc147996f 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/config.h> | ||
24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
26 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index b88a09497c28..c6f2f488a40f 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c | |||
@@ -35,7 +35,6 @@ | |||
35 | * via an ELAN U132 adapter. | 35 | * via an ELAN U132 adapter. |
36 | * | 36 | * |
37 | */ | 37 | */ |
38 | #include <linux/config.h> | ||
39 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
40 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index a44124c7e851..a287836e39f1 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
@@ -36,7 +36,6 @@ | |||
36 | * | 36 | * |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include <linux/config.h> | ||
40 | #include <linux/mutex.h> | 39 | #include <linux/mutex.h> |
41 | #include <linux/module.h> | 40 | #include <linux/module.h> |
42 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index fb48feca8353..bf26c3c56990 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c | |||
@@ -47,7 +47,6 @@ | |||
47 | * | 47 | * |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #include <linux/config.h> | ||
51 | #include <linux/mutex.h> | 50 | #include <linux/mutex.h> |
52 | #include <linux/module.h> | 51 | #include <linux/module.h> |
53 | #include <linux/kernel.h> | 52 | #include <linux/kernel.h> |
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c index c1113d6e941d..5686e2164e39 100644 --- a/drivers/video/intelfb/intelfb_i2c.c +++ b/drivers/video/intelfb/intelfb_i2c.c | |||
@@ -25,7 +25,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
25 | 25 | ||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include <linux/config.h> | ||
29 | #include <linux/module.h> | 28 | #include <linux/module.h> |
30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
31 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |