Skip to content

Commit

Permalink
TTY: serial, move 68360 driver to staging
Browse files Browse the repository at this point in the history
This driver has been broken at least since 2008. At that time,
a88487c (Fix compile errors in SGI console drivers) broke this
driver completely.

And since nobody noticed for the past 3 years, move it into staging. I
think this will rot there and we will throw it away completely after
some time. Or maybe someone will volunteer to fix it ;).

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Sep 22, 2011
1 parent 3d43b7d commit 3a0db72
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 18 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ menuconfig STAGING

if STAGING

source "drivers/staging/serial/Kconfig"

source "drivers/staging/et131x/Kconfig"

source "drivers/staging/slicoss/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# fix for build system bug...
obj-$(CONFIG_STAGING) += staging.o

obj-y += serial/
obj-$(CONFIG_ET131X) += et131x/
obj-$(CONFIG_SLICOSS) += slicoss/
obj-$(CONFIG_VIDEO_GO7007) += go7007/
Expand Down
File renamed without changes.
16 changes: 16 additions & 0 deletions drivers/staging/serial/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
config SERIAL_68360_SMC
bool "68360 SMC uart support"
depends on M68360
help
This driver supports the SMC serial ports of the Motorola 68360 CPU.

config SERIAL_68360_SCC
bool "68360 SCC uart support"
depends on M68360
help
This driver supports the SCC serial ports of the Motorola 68360 CPU.

config SERIAL_68360
bool
depends on SERIAL_68360_SMC || SERIAL_68360_SCC
default y
1 change: 1 addition & 0 deletions drivers/staging/serial/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj-$(CONFIG_SERIAL_68360) += 68360serial.o
6 changes: 6 additions & 0 deletions drivers/staging/serial/TODO
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
These are a few serial drivers that either do not build, or do not work if they
do build, or if they seem to work, are for obsolete hardware, or are full of
unfixable races and no one uses them anymore.

If no one steps up to adopt any of these drivers, they will be removed
in the 3.4 release.
17 changes: 0 additions & 17 deletions drivers/tty/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1042,23 +1042,6 @@ config SERIAL_MCF_CONSOLE
help
Enable a ColdFire internal serial port to be the system console.

config SERIAL_68360_SMC
bool "68360 SMC uart support"
depends on M68360
help
This driver supports the SMC serial ports of the Motorola 68360 CPU.

config SERIAL_68360_SCC
bool "68360 SCC uart support"
depends on M68360
help
This driver supports the SCC serial ports of the Motorola 68360 CPU.

config SERIAL_68360
bool
depends on SERIAL_68360_SMC || SERIAL_68360_SCC
default y

config SERIAL_PMACZILOG
tristate "Mac or PowerMac z85c30 ESCC support"
depends on (M68K && MAC) || (PPC_OF && PPC_PMAC)
Expand Down
1 change: 0 additions & 1 deletion drivers/tty/serial/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
obj-$(CONFIG_SERIAL_68360) += 68360serial.o
obj-$(CONFIG_SERIAL_MCF) += mcf.o
obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o
obj-$(CONFIG_SERIAL_DZ) += dz.o
Expand Down

0 comments on commit 3a0db72

Please sign in to comment.