staging: remove i2o subsystem

This subsystem isn't used anymore, and the hardware isn't around.  It's
been in staging for a while, and it's time for it to now be removed.

Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index bfacf69..c204ab2 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -108,8 +108,6 @@ source "drivers/staging/clocking-wizard/Kconfig"
 
 source "drivers/staging/fbtft/Kconfig"
 
-source "drivers/staging/i2o/Kconfig"
-
 source "drivers/staging/fsl-mc/Kconfig"
 
 endif # STAGING

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a12221f..9b91517 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -46,5 +46,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/
 obj-$(CONFIG_FSL_MC_BUS)       += fsl-mc/

diff --cc drivers/staging/i2o/Kconfig
Simple merge

diff --cc drivers/staging/i2o/Makefile
Simple merge

diff --cc drivers/staging/i2o/README
Simple merge

diff --cc drivers/staging/i2o/README.ioctl
Simple merge

diff --cc drivers/staging/i2o/bus-osm.c
Simple merge

diff --cc drivers/staging/i2o/config-osm.c
Simple merge

diff --cc drivers/staging/i2o/core.h
Simple merge

diff --cc drivers/staging/i2o/debug.c
Simple merge

diff --cc drivers/staging/i2o/device.c
Simple merge

diff --cc drivers/staging/i2o/driver.c
Simple merge

diff --cc drivers/staging/i2o/exec-osm.c
Simple merge

diff --cc drivers/staging/i2o/i2o.h
Simple merge

diff --cc drivers/staging/i2o/i2o_block.c
Simple merge

diff --cc drivers/staging/i2o/i2o_block.h
Simple merge

diff --cc drivers/staging/i2o/i2o_config.c
Simple merge

diff --cc drivers/staging/i2o/i2o_proc.c
Simple merge

diff --cc drivers/staging/i2o/i2o_scsi.c
Simple merge

diff --cc drivers/staging/i2o/iop.c
Simple merge

diff --cc drivers/staging/i2o/memory.c
Simple merge

diff --cc drivers/staging/i2o/pci.c
Simple merge