This patch moves the MOST USB adapter driver to the stable branch.
It is a follow-up to commit <b276527>.
Signed-off-by: Christian Gromm <christian.gromm@xxxxxxxxxxxxx>
---
drivers/most/Kconfig | 6 ++++++
drivers/most/Makefile | 2 ++
drivers/{staging => }/most/usb/Kconfig | 0
drivers/{staging => }/most/usb/Makefile | 0
drivers/{staging => }/most/usb/usb.c | 0
drivers/staging/most/Kconfig | 2 --
drivers/staging/most/Makefile | 1 -
7 files changed, 8 insertions(+), 3 deletions(-)
rename drivers/{staging => }/most/usb/Kconfig (100%)
rename drivers/{staging => }/most/usb/Makefile (100%)
rename drivers/{staging => }/most/usb/usb.c (100%)
diff --git a/drivers/most/Kconfig b/drivers/most/Kconfig
index 58d7999..400ed52 100644
--- a/drivers/most/Kconfig
+++ b/drivers/most/Kconfig
@@ -13,3 +13,9 @@ menuconfig MOST
module will be called most_core.
If in doubt, say N here.
+
+if MOST
+
+source "drivers/most/usb/Kconfig"
+
+endif
diff --git a/drivers/most/Makefile b/drivers/most/Makefile
index e810cd3..5c52ae1 100644
--- a/drivers/most/Makefile
+++ b/drivers/most/Makefile
@@ -2,3 +2,5 @@
obj-$(CONFIG_MOST) += most_core.o
most_core-y := core.o \
configfs.o
+
+obj-$(CONFIG_MOST_USB) += usb/
diff --git a/drivers/staging/most/usb/Kconfig b/drivers/most/usb/Kconfig
similarity index 100%
rename from drivers/staging/most/usb/Kconfig
rename to drivers/most/usb/Kconfig
diff --git a/drivers/staging/most/usb/Makefile b/drivers/most/usb/Makefile
similarity index 100%
rename from drivers/staging/most/usb/Makefile
rename to drivers/most/usb/Makefile
diff --git a/drivers/staging/most/usb/usb.c b/drivers/most/usb/usb.c
similarity index 100%
rename from drivers/staging/most/usb/usb.c
rename to drivers/most/usb/usb.c
diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig
index c5a99f7..c35fb34f 100644
--- a/drivers/staging/most/Kconfig
+++ b/drivers/staging/most/Kconfig
@@ -30,6 +30,4 @@ source "drivers/staging/most/dim2/Kconfig"
source "drivers/staging/most/i2c/Kconfig"
-source "drivers/staging/most/usb/Kconfig"
-
endif
diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile
index a803a98..7c10b84 100644
--- a/drivers/staging/most/Makefile
+++ b/drivers/staging/most/Makefile
@@ -6,4 +6,3 @@ obj-$(CONFIG_MOST_SOUND) += sound/
obj-$(CONFIG_MOST_VIDEO) += video/
obj-$(CONFIG_MOST_DIM2) += dim2/
obj-$(CONFIG_MOST_I2C) += i2c/
-obj-$(CONFIG_MOST_USB) += usb/
--
2.7.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
