diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-28 14:08:42 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-28 14:08:42 -0800 |
| commit | 6e2055a9e56e292715f935a85f381e54c1f54269 (patch) | |
| tree | 5cdb033f7da95ba47c37a42602c6d88d55e11db5 /drivers | |
| parent | dc93c85235efa5201e9a3c116bc3fbd1afc1a182 (diff) | |
| download | linux-6e2055a9e56e292715f935a85f381e54c1f54269.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/echo/Kconfig (renamed from drivers/staging/echo/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/misc/echo/Makefile (renamed from drivers/staging/echo/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/misc/echo/echo.c (renamed from drivers/staging/echo/echo.c) | 0 | ||||
| -rw-r--r-- | drivers/misc/echo/echo.h (renamed from drivers/staging/echo/echo.h) | 0 | ||||
| -rw-r--r-- | drivers/misc/echo/fir.h (renamed from drivers/staging/echo/fir.h) | 0 | ||||
| -rw-r--r-- | drivers/misc/echo/oslec.h (renamed from drivers/staging/echo/oslec.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/echo/TODO | 5 |
11 files changed, 2 insertions, 8 deletions
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 index f1d41ea9cd48..f1d41ea9cd48 100644 --- a/drivers/staging/echo/Kconfig +++ b/drivers/misc/echo/Kconfig diff --git a/drivers/staging/echo/Makefile b/drivers/misc/echo/Makefile index 7d4caac12a8d..7d4caac12a8d 100644 --- a/drivers/staging/echo/Makefile +++ b/drivers/misc/echo/Makefile diff --git a/drivers/staging/echo/echo.c b/drivers/misc/echo/echo.c index 9597e9523cac..9597e9523cac 100644 --- a/drivers/staging/echo/echo.c +++ b/drivers/misc/echo/echo.c diff --git a/drivers/staging/echo/echo.h b/drivers/misc/echo/echo.h index 9b08c63e6369..9b08c63e6369 100644 --- a/drivers/staging/echo/echo.h +++ b/drivers/misc/echo/echo.h diff --git a/drivers/staging/echo/fir.h b/drivers/misc/echo/fir.h index 7b9fabf1fea5..7b9fabf1fea5 100644 --- a/drivers/staging/echo/fir.h +++ b/drivers/misc/echo/fir.h diff --git a/drivers/staging/echo/oslec.h b/drivers/misc/echo/oslec.h index f4175360ce27..f4175360ce27 100644 --- a/drivers/staging/echo/oslec.h +++ b/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> |