summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/ipack/Kconfig2
-rw-r--r--drivers/staging/ipack/Makefile2
-rw-r--r--drivers/staging/ipack/carriers/Kconfig (renamed from drivers/staging/ipack/bridges/Kconfig)0
-rw-r--r--drivers/staging/ipack/carriers/Makefile (renamed from drivers/staging/ipack/bridges/Makefile)0
-rw-r--r--drivers/staging/ipack/carriers/tpci200.c (renamed from drivers/staging/ipack/bridges/tpci200.c)0
-rw-r--r--drivers/staging/ipack/carriers/tpci200.h (renamed from drivers/staging/ipack/bridges/tpci200.h)0
6 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ipack/Kconfig b/drivers/staging/ipack/Kconfig
index 4cf47066140c..9b4495a35f91 100644
--- a/drivers/staging/ipack/Kconfig
+++ b/drivers/staging/ipack/Kconfig
@@ -14,7 +14,7 @@ menuconfig IPACK_BUS
if IPACK_BUS
-source "drivers/staging/ipack/bridges/Kconfig"
+source "drivers/staging/ipack/carriers/Kconfig"
source "drivers/staging/ipack/devices/Kconfig"
diff --git a/drivers/staging/ipack/Makefile b/drivers/staging/ipack/Makefile
index 85ff223616fd..6f14ade0f8f3 100644
--- a/drivers/staging/ipack/Makefile
+++ b/drivers/staging/ipack/Makefile
@@ -3,4 +3,4 @@
#
obj-$(CONFIG_IPACK_BUS) += ipack.o
obj-y += devices/
-obj-y += bridges/
+obj-y += carriers/
diff --git a/drivers/staging/ipack/bridges/Kconfig b/drivers/staging/ipack/carriers/Kconfig
index 33fdc2456c0c..33fdc2456c0c 100644
--- a/drivers/staging/ipack/bridges/Kconfig
+++ b/drivers/staging/ipack/carriers/Kconfig
diff --git a/drivers/staging/ipack/bridges/Makefile b/drivers/staging/ipack/carriers/Makefile
index d8b76459300f..d8b76459300f 100644
--- a/drivers/staging/ipack/bridges/Makefile
+++ b/drivers/staging/ipack/carriers/Makefile
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/carriers/tpci200.c
index 376e79410e99..376e79410e99 100644
--- a/drivers/staging/ipack/bridges/tpci200.c
+++ b/drivers/staging/ipack/carriers/tpci200.c
diff --git a/drivers/staging/ipack/bridges/tpci200.h b/drivers/staging/ipack/carriers/tpci200.h
index 982f31920af5..982f31920af5 100644
--- a/drivers/staging/ipack/bridges/tpci200.h
+++ b/drivers/staging/ipack/carriers/tpci200.h