From: Martin Peschke <mp3@de.ibm.com>

Extern declaration of tty_std_termios in sclp_tty was a hack
which is obsolete.

  CC      drivers/s390/char/sclp_tty.o
drivers/s390/char/sclp_tty.c:63: error: conflicting types for 'tty_std_termios'
include/linux/tty.h:261: error: previous declaration of 'tty_std_termios' was here
drivers/s390/char/sclp_tty.c: In function 'sclp_tty_init':
drivers/s390/char/sclp_tty.c:790: error: incompatible types in assignment
make[2]: *** [drivers/s390/char/sclp_tty.o] Error 1
make[1]: *** [drivers/s390/char] Error 2
make: *** [drivers/s390] Error 2
Kernel compilation...FAILED

Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Acked-by: Peter Oberparleiter <oberpar@de.ibm.com>
Acked-by: Alan Cox <alan@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/s390/char/sclp_tty.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN drivers/s390/char/sclp_tty.c~tty-switch-to-ktermios-sclp-fix drivers/s390/char/sclp_tty.c
--- a/drivers/s390/char/sclp_tty.c~tty-switch-to-ktermios-sclp-fix
+++ a/drivers/s390/char/sclp_tty.c
@@ -60,8 +60,6 @@ static unsigned short int sclp_tty_chars
 
 struct tty_driver *sclp_tty_driver;
 
-extern struct termios  tty_std_termios;
-
 static struct sclp_ioctls sclp_ioctls;
 static struct sclp_ioctls sclp_ioctls_init =
 {
_