From eae60fec735432db84be711399f5ff23a84d4f7a Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Nov 2005 14:26:41 +1100
Subject: [PATCH] --- yaml --- r: 12279 b: refs/heads/master c:
 3c4cf5ee5a9224a800a74b5dfcb435550ed30737 h: refs/heads/master i:   12277:
 e6da65c88c01ab951502e651a90782b31ebdbe7a   12275:
 9580c252704aa92873b026ee6bb094ff008cac5d   12271:
 44461ebb6a5cd5e099d59cb2632c151856061d06 v: v3

---
 [refs]                              |  2 +-
 trunk/include/asm-powerpc/termios.h | 34 +----------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index 67f7060e32b5..3684074ab9f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 870c6ff2ac0cb708697c2c06f3e5eddf9e3b38cb
+refs/heads/master: 3c4cf5ee5a9224a800a74b5dfcb435550ed30737
diff --git a/trunk/include/asm-powerpc/termios.h b/trunk/include/asm-powerpc/termios.h
index 27a012cfcb4e..7f80a019b6a0 100644
--- a/trunk/include/asm-powerpc/termios.h
+++ b/trunk/include/asm-powerpc/termios.h
@@ -96,39 +96,7 @@ struct termio {
 
 #ifdef __KERNEL__
 
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-	unsigned short __tmp; \
-	get_user(__tmp,&(termio)->x); \
-	(termios)->x = (0xffff0000 & (termios)->x) | __tmp; \
-}
-
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-	copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-	put_user((termios)->c_iflag, &(termio)->c_iflag); \
-	put_user((termios)->c_oflag, &(termio)->c_oflag); \
-	put_user((termios)->c_cflag, &(termio)->c_cflag); \
-	put_user((termios)->c_lflag, &(termio)->c_lflag); \
-	put_user((termios)->c_line,  &(termio)->c_line); \
-	copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#include <asm-generic/termios.h>
 
 #endif	/* __KERNEL__ */