Staging: ipack: move out of staging

The ipack subsystem is cleaned up enough to now move out of the staging
tree, and into drivers/ipack.

Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Cc: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index dbdefa3fe775fee1b5a7b0e1d1733e6a4c88d1aa..f5fb0722a63a14c9155b58a86f69c82e6efa8d92 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -156,4 +156,6 @@ source "drivers/pwm/Kconfig"
 
 source "drivers/irqchip/Kconfig"
 
+source "drivers/ipack/Kconfig"
+
 endmenu

diff --git a/drivers/Makefile b/drivers/Makefile
index a16a8d001ae0c3fd0afd8cf3648cebe5c839d75b..7863b9fee50bbc33793a2acb2f104c34c22b2bd0 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -145,3 +145,4 @@ obj-$(CONFIG_EXTCON)                += extcon/
 obj-$(CONFIG_MEMORY)           += memory/
 obj-$(CONFIG_IIO)              += iio/
 obj-$(CONFIG_VME_BUS)          += vme/
+obj-$(CONFIG_IPACK_BUS)                += ipack/

diff --git a/drivers/staging/ipack/Kconfig b/drivers/ipack/Kconfig
similarity index 85%
rename from drivers/staging/ipack/Kconfig
rename to drivers/ipack/Kconfig
index 5cf43b3364ebfd1082de3fb83f976f88949dfa60..3949e558956030362f26f3459d3d1ccc270c4cb2 100644 (file)
--- a/drivers/staging/ipack/Kconfig
+++ b/drivers/ipack/Kconfig
@@ -17,8 +17,8 @@ menuconfig IPACK_BUS
 
 if IPACK_BUS
 
-source "drivers/staging/ipack/carriers/Kconfig"
+source "drivers/ipack/carriers/Kconfig"
 
-source "drivers/staging/ipack/devices/Kconfig"
+source "drivers/ipack/devices/Kconfig"
 
 endif # IPACK

diff --git a/drivers/staging/ipack/Makefile b/drivers/ipack/Makefile
similarity index 100%
rename from drivers/staging/ipack/Makefile
rename to drivers/ipack/Makefile

diff --git a/drivers/staging/ipack/carriers/Kconfig b/drivers/ipack/carriers/Kconfig
similarity index 100%
rename from drivers/staging/ipack/carriers/Kconfig
rename to drivers/ipack/carriers/Kconfig

diff --git a/drivers/staging/ipack/carriers/Makefile b/drivers/ipack/carriers/Makefile
similarity index 100%
rename from drivers/staging/ipack/carriers/Makefile
rename to drivers/ipack/carriers/Makefile

diff --git a/drivers/staging/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
similarity index 100%
rename from drivers/staging/ipack/carriers/tpci200.c
rename to drivers/ipack/carriers/tpci200.c

diff --git a/drivers/staging/ipack/carriers/tpci200.h b/drivers/ipack/carriers/tpci200.h
similarity index 100%
rename from drivers/staging/ipack/carriers/tpci200.h
rename to drivers/ipack/carriers/tpci200.h

diff --git a/drivers/staging/ipack/devices/Kconfig b/drivers/ipack/devices/Kconfig
similarity index 100%
rename from drivers/staging/ipack/devices/Kconfig
rename to drivers/ipack/devices/Kconfig

diff --git a/drivers/staging/ipack/devices/Makefile b/drivers/ipack/devices/Makefile
similarity index 100%
rename from drivers/staging/ipack/devices/Makefile
rename to drivers/ipack/devices/Makefile

diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
similarity index 100%
rename from drivers/staging/ipack/devices/ipoctal.c
rename to drivers/ipack/devices/ipoctal.c

diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/ipack/devices/ipoctal.h
similarity index 100%
rename from drivers/staging/ipack/devices/ipoctal.h
rename to drivers/ipack/devices/ipoctal.h

diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/ipack/devices/scc2698.h
similarity index 100%
rename from drivers/staging/ipack/devices/scc2698.h
rename to drivers/ipack/devices/scc2698.h

diff --git a/drivers/staging/ipack/ipack.c b/drivers/ipack/ipack.c
similarity index 100%
rename from drivers/staging/ipack/ipack.c
rename to drivers/ipack/ipack.c

diff --git a/drivers/staging/ipack/ipack.h b/drivers/ipack/ipack.h
similarity index 100%
rename from drivers/staging/ipack/ipack.h
rename to drivers/ipack/ipack.h

diff --git a/drivers/staging/ipack/ipack_ids.h b/drivers/ipack/ipack_ids.h
similarity index 100%
rename from drivers/staging/ipack/ipack_ids.h
rename to drivers/ipack/ipack_ids.h

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 12a6f2e0aee5eeb7d63df075d98da76f6eb91052..943ca607200c7eb0b91821f5e36b0e4e32f048ad 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -122,8 +122,6 @@ source "drivers/staging/ozwpan/Kconfig"
 
 source "drivers/staging/ccg/Kconfig"
 
-source "drivers/staging/ipack/Kconfig"
-
 source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/csr/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 6d16f822e27e70419343e7d3de384ff3ac30e45b..20c764d7ab33cae7e0f48b31062dd4741968b476 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
 obj-$(CONFIG_VT6655)           += vt6655/
 obj-$(CONFIG_VT6656)           += vt6656/
 obj-$(CONFIG_VME_BUS)          += vme/
-obj-$(CONFIG_IPACK_BUS)                += ipack/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)              += iio/
 obj-$(CONFIG_ZRAM)             += zram/

diff --git a/drivers/staging/ipack/TODO b/drivers/staging/ipack/TODO
deleted file mode 100644 (file)
index e667acf..0000000
--- a/drivers/staging/ipack/TODO
+++ /dev/null
@@ -1,16 +0,0 @@
-                               TODO
-                               ====
-Introduction
-============
-
-These drivers add support for IndustryPack devices: carrier and IP module
-boards.
-
-The ipack driver is just an abstraction of the bus providing the common
-operations between the two kind of boards.
-
-Contact
-=======
-
-Contact: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
-Mailing List: industrypack-devel@lists.sourceforge.net