summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Taprogge <jens.taprogge@taprogge.org>2012-09-27 12:37:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-19 11:45:10 -0700
commit052c4cfc92f5ce6334fdaf6926e7c177bc1cc099 (patch)
treeccf3515da5b339db3006e98a74c5d5da4da9ee07
parent341c92d74bd2055a6bcbb8a9f638510fe8480728 (diff)
downloadop-kernel-dev-052c4cfc92f5ce6334fdaf6926e7c177bc1cc099.zip
op-kernel-dev-052c4cfc92f5ce6334fdaf6926e7c177bc1cc099.tar.gz
staging: ipack: Rename bridges to carriers.
This is the name used by the standard. Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org> Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 4cf4706..9b4495a 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 85ff223..6f14ade 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 33fdc24..33fdc24 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 d8b7645..d8b7645 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 376e794..376e794 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 982f319..982f319 100644
--- a/drivers/staging/ipack/bridges/tpci200.h
+++ b/drivers/staging/ipack/carriers/tpci200.h
OpenPOWER on IntegriCloud