2006-10-20 12:53:37

by Martin Peschke

[permalink] [raw]
Subject: [PATCH] 2.6.19.-rc2-mm2 compile fix for sclp_tty

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 <[email protected]>
Acked-by: Peter Oberparleiter <[email protected]>
---

sclp_tty.c | 2 --
1 files changed, 2 deletions(-)

--- a/drivers/s390/char/sclp_tty.c 2006-10-19 23:10:31.000000000 +0200
+++ b/drivers/s390/char/sclp_tty.c 2006-10-19 23:10:32.000000000 +0200
@@ -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 =
{



2006-10-20 13:18:27

by Alan

[permalink] [raw]
Subject: Re: [PATCH] 2.6.19.-rc2-mm2 compile fix for sclp_tty

Ar Gwe, 2006-10-20 am 14:53 +0200, ysgrifennodd Martin Peschke:
> 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 <[email protected]>
> Acked-by: Peter Oberparleiter <[email protected]>

Acked-by: Alan Cox <[email protected]>