summaryrefslogtreecommitdiffstats
path: root/drivers/i2o
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-07-05 23:09:37 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-07-05 23:09:37 +0000
commitaba344fdfed81b2c03d6114c54cfd73a486aa10b (patch)
treed032d8430bf1234c3ecc6f6330d6de6e887e5963 /drivers/i2o
parent40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff)
Merge with Linux 2.3.9.
Diffstat (limited to 'drivers/i2o')
-rw-r--r--drivers/i2o/i2o_config.c1
-rw-r--r--drivers/i2o/i2o_core.c1
-rw-r--r--drivers/i2o/i2o_lan.c1
-rw-r--r--drivers/i2o/i2o_pci.c1
-rw-r--r--drivers/i2o/i2o_proc.c1
5 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2o/i2o_config.c b/drivers/i2o/i2o_config.c
index c3c644883..8fd93bff9 100644
--- a/drivers/i2o/i2o_config.c
+++ b/drivers/i2o/i2o_config.c
@@ -14,7 +14,6 @@
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
diff --git a/drivers/i2o/i2o_core.c b/drivers/i2o/i2o_core.c
index 3a3f1fe94..7945c7961 100644
--- a/drivers/i2o/i2o_core.c
+++ b/drivers/i2o/i2o_core.c
@@ -19,7 +19,6 @@
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
diff --git a/drivers/i2o/i2o_lan.c b/drivers/i2o/i2o_lan.c
index 1ebbe0b49..f15b7476e 100644
--- a/drivers/i2o/i2o_lan.c
+++ b/drivers/i2o/i2o_lan.c
@@ -25,6 +25,7 @@
* - code/test for other LAN classes
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/netdevice.h>
diff --git a/drivers/i2o/i2o_pci.c b/drivers/i2o/i2o_pci.c
index 596d9f953..196d58c85 100644
--- a/drivers/i2o/i2o_pci.c
+++ b/drivers/i2o/i2o_pci.c
@@ -12,7 +12,6 @@
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
diff --git a/drivers/i2o/i2o_proc.c b/drivers/i2o/i2o_proc.c
index ce38b3914..cdadc9cdc 100644
--- a/drivers/i2o/i2o_proc.c
+++ b/drivers/i2o/i2o_proc.c
@@ -38,7 +38,6 @@
#define FMT_U64_HEX "0x%08x%08x"
#define U64_VAL(pu64) *((u32*)(pu64)+1), *((u32*)(pu64))
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/i2o.h>