Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 0 insertions, 18 deletions

diff --git a/include/asm-sh64/termios.h b/include/asm-sh64/termios.h
index 4a9c7fb411bc..dc44e6ed3a7c 100644
--- a/include/asm-sh64/termios.h
+++ b/include/asm-sh64/termios.h
@@ -50,24 +50,6 @@ struct termio {
 
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 
-/* line disciplines */
-#define N_TTY           0
-#define N_SLIP          1
-#define N_MOUSE         2
-#define N_PPP           3
-#define N_STRIP         4
-#define N_AX25          5
-#define N_X25           6       /* X.25 async */
-#define N_6PACK         7
-#define N_MASC          8       /* Reserved for Mobitex module <kaz@cafe.net> */
-#define N_R3964         9       /* Reserved for Simatic R3964 module */
-#define N_PROFIBUS_FDL  10      /* Reserved for Profibus <Dave@mvhi.com> */
-#define N_IRDA          11      /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */
-#define N_SMSBLOCK      12      /* SMS block mode - for talking to GSM data cards about SMS messages */
-#define N_HDLC          13      /* synchronous HDLC */
-#define N_SYNC_PPP      14
-#define N_HCI           15      /* Bluetooth HCI UART */
-
 #ifdef __KERNEL__
 
 /*      intr=^C         quit=^\         erase=del       kill=^U