diff options
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/message/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/i2o/Kconfig (renamed from drivers/message/i2o/Kconfig) | 1 | ||||
-rw-r--r-- | drivers/staging/i2o/Makefile (renamed from drivers/message/i2o/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/README (renamed from drivers/message/i2o/README) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/README.ioctl (renamed from drivers/message/i2o/README.ioctl) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/bus-osm.c (renamed from drivers/message/i2o/bus-osm.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/config-osm.c (renamed from drivers/message/i2o/config-osm.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/core.h (renamed from drivers/message/i2o/core.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/debug.c (renamed from drivers/message/i2o/debug.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/device.c (renamed from drivers/message/i2o/device.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/driver.c (renamed from drivers/message/i2o/driver.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/exec-osm.c (renamed from drivers/message/i2o/exec-osm.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/i2o.h (renamed from include/linux/i2o.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/i2o_block.c (renamed from drivers/message/i2o/i2o_block.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/i2o_block.h (renamed from drivers/message/i2o/i2o_block.h) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/i2o_config.c (renamed from drivers/message/i2o/i2o_config.c) | 0 | ||||
-rw-r--r-- | drivers/staging/i2o/i2o_proc.c (renamed from drivers/message/i2o/i2o_proc.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/i2o_scsi.c (renamed from drivers/message/i2o/i2o_scsi.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/iop.c (renamed from drivers/message/i2o/iop.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/memory.c (renamed from drivers/message/i2o/memory.c) | 2 | ||||
-rw-r--r-- | drivers/staging/i2o/pci.c (renamed from drivers/message/i2o/pci.c) | 2 |
24 files changed, 15 insertions, 16 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index c70d6e45dc10..c0cc96bab9e7 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -36,8 +36,6 @@ source "drivers/message/fusion/Kconfig" | |||
36 | 36 | ||
37 | source "drivers/firewire/Kconfig" | 37 | source "drivers/firewire/Kconfig" |
38 | 38 | ||
39 | source "drivers/message/i2o/Kconfig" | ||
40 | |||
41 | source "drivers/macintosh/Kconfig" | 39 | source "drivers/macintosh/Kconfig" |
42 | 40 | ||
43 | source "drivers/net/Kconfig" | 41 | source "drivers/net/Kconfig" |
diff --git a/drivers/message/Makefile b/drivers/message/Makefile index 97ef5a01ad11..755676ded67c 100644 --- a/drivers/message/Makefile +++ b/drivers/message/Makefile | |||
@@ -2,5 +2,4 @@ | |||
2 | # Makefile for MPT based block devices | 2 | # Makefile for MPT based block devices |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_I2O) += i2o/ | ||
6 | obj-$(CONFIG_FUSION) += fusion/ | 5 | obj-$(CONFIG_FUSION) += fusion/ |
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 071ac116818f..9e52bcd5356d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -110,4 +110,6 @@ source "drivers/staging/clocking-wizard/Kconfig" | |||
110 | 110 | ||
111 | source "drivers/staging/fbtft/Kconfig" | 111 | source "drivers/staging/fbtft/Kconfig" |
112 | 112 | ||
113 | source "drivers/staging/i2o/Kconfig" | ||
114 | |||
113 | endif # STAGING | 115 | endif # STAGING |
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index b65ca376d957..6e0ac524c84d 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
@@ -47,3 +47,4 @@ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ | |||
47 | obj-$(CONFIG_UNISYSSPAR) += unisys/ | 47 | obj-$(CONFIG_UNISYSSPAR) += unisys/ |
48 | obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ | 48 | obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ |
49 | obj-$(CONFIG_FB_TFT) += fbtft/ | 49 | obj-$(CONFIG_FB_TFT) += fbtft/ |
50 | obj-$(CONFIG_I2O) += i2o/ | ||
diff --git a/drivers/message/i2o/Kconfig b/drivers/staging/i2o/Kconfig index 5afa0e393ecf..286c53f4b13d 100644 --- a/drivers/message/i2o/Kconfig +++ b/drivers/staging/i2o/Kconfig | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | menuconfig I2O | 1 | menuconfig I2O |
3 | tristate "I2O device support" | 2 | tristate "I2O device support" |
4 | depends on PCI | 3 | depends on PCI |
diff --git a/drivers/message/i2o/Makefile b/drivers/staging/i2o/Makefile index b0982dacfd0a..b0982dacfd0a 100644 --- a/drivers/message/i2o/Makefile +++ b/drivers/staging/i2o/Makefile | |||
diff --git a/drivers/message/i2o/README b/drivers/staging/i2o/README index f072a8eb3041..f072a8eb3041 100644 --- a/drivers/message/i2o/README +++ b/drivers/staging/i2o/README | |||
diff --git a/drivers/message/i2o/README.ioctl b/drivers/staging/i2o/README.ioctl index 4a7d2ebdfc97..4a7d2ebdfc97 100644 --- a/drivers/message/i2o/README.ioctl +++ b/drivers/staging/i2o/README.ioctl | |||
diff --git a/drivers/message/i2o/bus-osm.c b/drivers/staging/i2o/bus-osm.c index c463dc2efc09..7aa0339aea05 100644 --- a/drivers/message/i2o/bus-osm.c +++ b/drivers/staging/i2o/bus-osm.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/i2o.h> | 17 | #include "i2o.h" |
18 | 18 | ||
19 | #define OSM_NAME "bus-osm" | 19 | #define OSM_NAME "bus-osm" |
20 | #define OSM_VERSION "1.317" | 20 | #define OSM_VERSION "1.317" |
diff --git a/drivers/message/i2o/config-osm.c b/drivers/staging/i2o/config-osm.c index 3bba7aa82e58..519f52f9f688 100644 --- a/drivers/message/i2o/config-osm.c +++ b/drivers/staging/i2o/config-osm.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/i2o.h> | 17 | #include "i2o.h" |
18 | #include <linux/dcache.h> | 18 | #include <linux/dcache.h> |
19 | #include <linux/namei.h> | 19 | #include <linux/namei.h> |
20 | #include <linux/fs.h> | 20 | #include <linux/fs.h> |
diff --git a/drivers/message/i2o/core.h b/drivers/staging/i2o/core.h index 91614f11f89a..91614f11f89a 100644 --- a/drivers/message/i2o/core.h +++ b/drivers/staging/i2o/core.h | |||
diff --git a/drivers/message/i2o/debug.c b/drivers/staging/i2o/debug.c index ce62d8bfe1c8..7a16114ed8ea 100644 --- a/drivers/message/i2o/debug.c +++ b/drivers/staging/i2o/debug.c | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
2 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
3 | #include <linux/pci.h> | 3 | #include <linux/pci.h> |
4 | #include <linux/i2o.h> | 4 | #include "i2o.h" |
5 | 5 | ||
6 | static void i2o_report_util_cmd(u8 cmd); | 6 | static void i2o_report_util_cmd(u8 cmd); |
7 | static void i2o_report_exec_cmd(u8 cmd); | 7 | static void i2o_report_exec_cmd(u8 cmd); |
diff --git a/drivers/message/i2o/device.c b/drivers/staging/i2o/device.c index 98348f420b52..2af22553dd4e 100644 --- a/drivers/message/i2o/device.c +++ b/drivers/staging/i2o/device.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/i2o.h> | 17 | #include "i2o.h" |
18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
19 | #include <linux/string.h> | 19 | #include <linux/string.h> |
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
diff --git a/drivers/message/i2o/driver.c b/drivers/staging/i2o/driver.c index 1b18a0d1d05b..111c3edde035 100644 --- a/drivers/message/i2o/driver.c +++ b/drivers/staging/i2o/driver.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/rwsem.h> | 18 | #include <linux/rwsem.h> |
19 | #include <linux/i2o.h> | 19 | #include "i2o.h" |
20 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/staging/i2o/exec-osm.c index a3970e56ae53..16d857d5e655 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/staging/i2o/exec-osm.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/i2o.h> | 31 | #include "i2o.h" |
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #include <linux/workqueue.h> | 33 | #include <linux/workqueue.h> |
34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
diff --git a/include/linux/i2o.h b/drivers/staging/i2o/i2o.h index d23c3c20b201..d23c3c20b201 100644 --- a/include/linux/i2o.h +++ b/drivers/staging/i2o/i2o.h | |||
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/staging/i2o/i2o_block.c index 6fc3866965df..0a13c64ce000 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/staging/i2o/i2o_block.c | |||
@@ -52,7 +52,7 @@ | |||
52 | 52 | ||
53 | #include <linux/module.h> | 53 | #include <linux/module.h> |
54 | #include <linux/slab.h> | 54 | #include <linux/slab.h> |
55 | #include <linux/i2o.h> | 55 | #include "i2o.h" |
56 | #include <linux/mutex.h> | 56 | #include <linux/mutex.h> |
57 | 57 | ||
58 | #include <linux/mempool.h> | 58 | #include <linux/mempool.h> |
diff --git a/drivers/message/i2o/i2o_block.h b/drivers/staging/i2o/i2o_block.h index cf8873cbca3f..cf8873cbca3f 100644 --- a/drivers/message/i2o/i2o_block.h +++ b/drivers/staging/i2o/i2o_block.h | |||
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/staging/i2o/i2o_config.c index 04bd3b6de401..04bd3b6de401 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/staging/i2o/i2o_config.c | |||
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c index b7d87cd227a9..ad84f3304f3c 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/staging/i2o/i2o_proc.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <linux/types.h> | 39 | #include <linux/types.h> |
40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
41 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
42 | #include <linux/i2o.h> | 42 | #include "i2o.h" |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/proc_fs.h> | 44 | #include <linux/proc_fs.h> |
45 | #include <linux/seq_file.h> | 45 | #include <linux/seq_file.h> |
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/staging/i2o/i2o_scsi.c index 8152e9fa9d95..1b11dcb3faea 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/staging/i2o/i2o_scsi.c | |||
@@ -53,7 +53,7 @@ | |||
53 | #include <linux/prefetch.h> | 53 | #include <linux/prefetch.h> |
54 | #include <linux/pci.h> | 54 | #include <linux/pci.h> |
55 | #include <linux/blkdev.h> | 55 | #include <linux/blkdev.h> |
56 | #include <linux/i2o.h> | 56 | #include "i2o.h" |
57 | #include <linux/scatterlist.h> | 57 | #include <linux/scatterlist.h> |
58 | 58 | ||
59 | #include <asm/dma.h> | 59 | #include <asm/dma.h> |
diff --git a/drivers/message/i2o/iop.c b/drivers/staging/i2o/iop.c index 92752fb5b2d3..52334fc8b547 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/staging/i2o/iop.c | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <linux/i2o.h> | 29 | #include "i2o.h" |
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
diff --git a/drivers/message/i2o/memory.c b/drivers/staging/i2o/memory.c index 292b41e49fbd..8f9509d275a4 100644 --- a/drivers/message/i2o/memory.c +++ b/drivers/staging/i2o/memory.c | |||
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/i2o.h> | 14 | #include "i2o.h" |
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
diff --git a/drivers/message/i2o/pci.c b/drivers/staging/i2o/pci.c index 0f9f3e1a2b6b..b3b8a61dd4a6 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/staging/i2o/pci.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/i2o.h> | 33 | #include "i2o.h" |
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include "core.h" | 35 | #include "core.h" |
36 | 36 | ||