From 6e2055a9e56e292715f935a85f381e54c1f54269 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 28 Feb 2014 14:08:42 -0800
Subject: [PATCH] staging: echo: move to drivers/misc/

The code is clean, there are users of it, so it doesn't belong in
staging anymore, move it to drivers/misc/.

Cc: Steve Underwood <steveu@coppice.org>
Cc: David Rowe <david@rowetel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/misc/Kconfig                    | 1 +
 drivers/misc/Makefile                   | 1 +
 drivers/{staging => misc}/echo/Kconfig  | 0
 drivers/{staging => misc}/echo/Makefile | 0
 drivers/{staging => misc}/echo/echo.c   | 0
 drivers/{staging => misc}/echo/echo.h   | 0
 drivers/{staging => misc}/echo/fir.h    | 0
 drivers/{staging => misc}/echo/oslec.h  | 0
 drivers/staging/Kconfig                 | 2 --
 drivers/staging/Makefile                | 1 -
 drivers/staging/echo/TODO               | 5 -----
 11 files changed, 2 insertions(+), 8 deletions(-)
 rename drivers/{staging => misc}/echo/Kconfig (100%)
 rename drivers/{staging => misc}/echo/Makefile (100%)
 rename drivers/{staging => misc}/echo/echo.c (100%)
 rename drivers/{staging => misc}/echo/echo.h (100%)
 rename drivers/{staging => misc}/echo/fir.h (100%)
 rename drivers/{staging => misc}/echo/oslec.h (100%)
 delete mode 100644 drivers/staging/echo/TODO

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 6cb388e8fb7d..3816b59d3e1e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -526,4 +526,5 @@ source "drivers/misc/mei/Kconfig"
 source "drivers/misc/vmw_vmci/Kconfig"
 source "drivers/misc/mic/Kconfig"
 source "drivers/misc/genwqe/Kconfig"
+source "drivers/misc/echo/Kconfig"
 endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 99b9424ce31d..7eb4b69580c0 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -54,3 +54,4 @@ obj-$(CONFIG_LATTICE_ECP3_CONFIG)	+= lattice-ecp3-config.o
 obj-$(CONFIG_SRAM)		+= sram.o
 obj-y				+= mic/
 obj-$(CONFIG_GENWQE)		+= genwqe/
+obj-$(CONFIG_ECHO)		+= echo/
diff --git a/drivers/staging/echo/Kconfig b/drivers/misc/echo/Kconfig
similarity index 100%
rename from drivers/staging/echo/Kconfig
rename to drivers/misc/echo/Kconfig
diff --git a/drivers/staging/echo/Makefile b/drivers/misc/echo/Makefile
similarity index 100%
rename from drivers/staging/echo/Makefile
rename to drivers/misc/echo/Makefile
diff --git a/drivers/staging/echo/echo.c b/drivers/misc/echo/echo.c
similarity index 100%
rename from drivers/staging/echo/echo.c
rename to drivers/misc/echo/echo.c
diff --git a/drivers/staging/echo/echo.h b/drivers/misc/echo/echo.h
similarity index 100%
rename from drivers/staging/echo/echo.h
rename to drivers/misc/echo/echo.h
diff --git a/drivers/staging/echo/fir.h b/drivers/misc/echo/fir.h
similarity index 100%
rename from drivers/staging/echo/fir.h
rename to drivers/misc/echo/fir.h
diff --git a/drivers/staging/echo/oslec.h b/drivers/misc/echo/oslec.h
similarity index 100%
rename from drivers/staging/echo/oslec.h
rename to drivers/misc/echo/oslec.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 40e5ca971a9c..2ce3169318f9 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -34,8 +34,6 @@ source "drivers/staging/winbond/Kconfig"
 
 source "drivers/staging/wlan-ng/Kconfig"
 
-source "drivers/staging/echo/Kconfig"
-
 source "drivers/staging/comedi/Kconfig"
 
 source "drivers/staging/olpc_dcon/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 00735bbbd0fd..4d04090e4cb6 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_USBIP_CORE)	+= usbip/
 obj-$(CONFIG_W35UND)		+= winbond/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
-obj-$(CONFIG_ECHO)		+= echo/
 obj-$(CONFIG_COMEDI)		+= comedi/
 obj-$(CONFIG_FB_OLPC_DCON)	+= olpc_dcon/
 obj-$(CONFIG_PANEL)		+= panel/
diff --git a/drivers/staging/echo/TODO b/drivers/staging/echo/TODO
deleted file mode 100644
index 72a311a5a9cc..000000000000
--- a/drivers/staging/echo/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-TODO:
-	- send to lkml for review
-
-Please send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc: Steve
-Underwood <steveu@coppice.org> and David Rowe <david@rowetel.com>
-- 
2.34.1