19 files changed, 5 insertions, 21 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index dbdefa3fe775..f5fb0722a63a 100644
--- 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 a16a8d001ae0..7863b9fee50b 100644
--- 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
index 5cf43b3364eb..3949e5589560 100644
--- 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
index 6f14ade0f8f3..6f14ade0f8f3 100644
--- a/drivers/staging/ipack/Makefile
+++ b/drivers/ipack/Makefile
diff --git a/drivers/staging/ipack/carriers/Kconfig b/drivers/ipack/carriers/Kconfig
index 922ff5c35acc..922ff5c35acc 100644
--- a/drivers/staging/ipack/carriers/Kconfig
+++ b/drivers/ipack/carriers/Kconfig
diff --git a/drivers/staging/ipack/carriers/Makefile b/drivers/ipack/carriers/Makefile
index d8b76459300f..d8b76459300f 100644
--- a/drivers/staging/ipack/carriers/Makefile
+++ b/drivers/ipack/carriers/Makefile
diff --git a/drivers/staging/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
index c1a19b274c23..c1a19b274c23 100644
--- a/drivers/staging/ipack/carriers/tpci200.c
+++ b/drivers/ipack/carriers/tpci200.c
diff --git a/drivers/staging/ipack/carriers/tpci200.h b/drivers/ipack/carriers/tpci200.h
index 8d9be277b34d..8d9be277b34d 100644
--- a/drivers/staging/ipack/carriers/tpci200.h
+++ b/drivers/ipack/carriers/tpci200.h
diff --git a/drivers/staging/ipack/devices/Kconfig b/drivers/ipack/devices/Kconfig
index 0b82fdc198c0..0b82fdc198c0 100644
--- a/drivers/staging/ipack/devices/Kconfig
+++ b/drivers/ipack/devices/Kconfig
diff --git a/drivers/staging/ipack/devices/Makefile b/drivers/ipack/devices/Makefile
index 6de18bda4a9a..6de18bda4a9a 100644
--- a/drivers/staging/ipack/devices/Makefile
+++ b/drivers/ipack/devices/Makefile
diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index 783f120338d1..783f120338d1 100644
--- a/drivers/staging/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
diff --git a/drivers/staging/ipack/devices/ipoctal.h b/drivers/ipack/devices/ipoctal.h
index 28f1c4233154..28f1c4233154 100644
--- a/drivers/staging/ipack/devices/ipoctal.h
+++ b/drivers/ipack/devices/ipoctal.h
diff --git a/drivers/staging/ipack/devices/scc2698.h b/drivers/ipack/devices/scc2698.h
index 2ad6acd513fa..2ad6acd513fa 100644
--- a/drivers/staging/ipack/devices/scc2698.h
+++ b/drivers/ipack/devices/scc2698.h
diff --git a/drivers/staging/ipack/ipack.c b/drivers/ipack/ipack.c
index 6d5079de52b9..6d5079de52b9 100644
--- a/drivers/staging/ipack/ipack.c
+++ b/drivers/ipack/ipack.c
diff --git a/drivers/staging/ipack/ipack.h b/drivers/ipack/ipack.h
index 6760bfaf0ac4..6760bfaf0ac4 100644
--- a/drivers/staging/ipack/ipack.h
+++ b/drivers/ipack/ipack.h
diff --git a/drivers/staging/ipack/ipack_ids.h b/drivers/ipack/ipack_ids.h
index 8153fee3f2f7..8153fee3f2f7 100644
--- a/drivers/staging/ipack/ipack_ids.h
+++ b/drivers/ipack/ipack_ids.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 12a6f2e0aee5..943ca607200c 100644
--- 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 6d16f822e27e..20c764d7ab33 100644
--- 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
index e667acf5d332..000000000000
--- 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