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 c70d6e4..c0cc96b 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -36,8 +36,6 @@ source "drivers/message/fusion/Kconfig" source "drivers/firewire/Kconfig" -source "drivers/message/i2o/Kconfig" - source "drivers/macintosh/Kconfig" source "drivers/net/Kconfig" diff --git a/drivers/message/Makefile b/drivers/message/Makefile index 97ef5a0..755676d 100644 --- a/drivers/message/Makefile +++ b/drivers/message/Makefile @@ -2,5 +2,4 @@ # Makefile for MPT based block devices # -obj-$(CONFIG_I2O) += i2o/ obj-$(CONFIG_FUSION) += fusion/ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 071ac11..9e52bcd 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -110,4 +110,6 @@ source "drivers/staging/clocking-wizard/Kconfig" source "drivers/staging/fbtft/Kconfig" +source "drivers/staging/i2o/Kconfig" + endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index b65ca37..6e0ac52 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -47,3 +47,4 @@ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ obj-$(CONFIG_UNISYSSPAR) += unisys/ obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ obj-$(CONFIG_FB_TFT) += fbtft/ +obj-$(CONFIG_I2O) += i2o/ diff --git a/drivers/message/i2o/Kconfig b/drivers/staging/i2o/Kconfig index 5afa0e3..286c53f 100644 --- a/drivers/message/i2o/Kconfig +++ b/drivers/staging/i2o/Kconfig @@ -1,4 +1,3 @@ - menuconfig I2O tristate "I2O device support" depends on PCI diff --git a/drivers/message/i2o/Makefile b/drivers/staging/i2o/Makefile index b0982da..b0982da 100644 --- a/drivers/message/i2o/Makefile +++ b/drivers/staging/i2o/Makefile diff --git a/drivers/message/i2o/README b/drivers/staging/i2o/README index f072a8e..f072a8e 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 4a7d2eb..4a7d2eb 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 c463dc2..7aa0339 100644 --- a/drivers/message/i2o/bus-osm.c +++ b/drivers/staging/i2o/bus-osm.c @@ -14,7 +14,7 @@ */ #include <linux/module.h> -#include <linux/i2o.h> +#include "i2o.h" #define OSM_NAME "bus-osm" #define OSM_VERSION "1.317" diff --git a/drivers/message/i2o/config-osm.c b/drivers/staging/i2o/config-osm.c index 3bba7aa..519f52f 100644 --- a/drivers/message/i2o/config-osm.c +++ b/drivers/staging/i2o/config-osm.c @@ -14,7 +14,7 @@ */ #include <linux/module.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/dcache.h> #include <linux/namei.h> #include <linux/fs.h> diff --git a/drivers/message/i2o/core.h b/drivers/staging/i2o/core.h index 91614f1..91614f1 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 ce62d8b..7a16114 100644 --- a/drivers/message/i2o/debug.c +++ b/drivers/staging/i2o/debug.c @@ -1,7 +1,7 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/pci.h> -#include <linux/i2o.h> +#include "i2o.h" static void i2o_report_util_cmd(u8 cmd); static void i2o_report_exec_cmd(u8 cmd); diff --git a/drivers/message/i2o/device.c b/drivers/staging/i2o/device.c index 98348f4..2af2255 100644 --- a/drivers/message/i2o/device.c +++ b/drivers/staging/i2o/device.c @@ -14,7 +14,7 @@ */ #include <linux/module.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/delay.h> #include <linux/string.h> #include <linux/slab.h> diff --git a/drivers/message/i2o/driver.c b/drivers/staging/i2o/driver.c index 1b18a0d..111c3ed 100644 --- a/drivers/message/i2o/driver.c +++ b/drivers/staging/i2o/driver.c @@ -16,7 +16,7 @@ #include <linux/device.h> #include <linux/module.h> #include <linux/rwsem.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/workqueue.h> #include <linux/string.h> #include <linux/slab.h> diff --git a/drivers/message/i2o/exec-osm.c b/drivers/staging/i2o/exec-osm.c index a3970e5..16d857d 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/staging/i2o/exec-osm.c @@ -28,7 +28,7 @@ */ #include <linux/module.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/string.h> diff --git a/include/linux/i2o.h b/drivers/staging/i2o/i2o.h index d23c3c2..d23c3c2 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 6fc3866..0a13c64 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/staging/i2o/i2o_block.c @@ -52,7 +52,7 @@ #include <linux/module.h> #include <linux/slab.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/mutex.h> #include <linux/mempool.h> diff --git a/drivers/message/i2o/i2o_block.h b/drivers/staging/i2o/i2o_block.h index cf8873c..cf8873c 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 04bd3b6..04bd3b6 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 b7d87cd..ad84f33 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/staging/i2o/i2o_proc.c @@ -39,7 +39,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/pci.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/staging/i2o/i2o_scsi.c index 8152e9fa..1b11dcb 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/staging/i2o/i2o_scsi.c @@ -53,7 +53,7 @@ #include <linux/prefetch.h> #include <linux/pci.h> #include <linux/blkdev.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/scatterlist.h> #include <asm/dma.h> diff --git a/drivers/message/i2o/iop.c b/drivers/staging/i2o/iop.c index 92752fb..52334fc 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/staging/i2o/iop.c @@ -26,7 +26,7 @@ */ #include <linux/module.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/delay.h> #include <linux/sched.h> #include <linux/slab.h> diff --git a/drivers/message/i2o/memory.c b/drivers/staging/i2o/memory.c index 292b41e..8f9509d 100644 --- a/drivers/message/i2o/memory.c +++ b/drivers/staging/i2o/memory.c @@ -11,7 +11,7 @@ */ #include <linux/module.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/delay.h> #include <linux/string.h> #include <linux/slab.h> diff --git a/drivers/message/i2o/pci.c b/drivers/staging/i2o/pci.c index 0f9f3e1..b3b8a61 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/staging/i2o/pci.c @@ -30,7 +30,7 @@ #include <linux/pci.h> #include <linux/interrupt.h> #include <linux/slab.h> -#include <linux/i2o.h> +#include "i2o.h" #include <linux/module.h> #include "core.h" |