X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-generic%2Ftermios.h;h=7d39ecc92d9430380ccd00d4be4021932b1db8c3;hb=252815b0cfe711001eff0327872209986b36d490;hp=33dca30a3c452199537913bcc6e3e1447dfcef5c;hpb=ecfe7f093768f7af0959f5be8ec039dcc29724af;p=linux-2.6

diff --git a/include/asm-generic/termios.h b/include/asm-generic/termios.h
index 33dca30a3c..7d39ecc92d 100644
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
@@ -61,8 +61,14 @@ static inline int kernel_termios_to_user_termio(struct termio __user *termio,
 	return 0;
 }
 
+#ifndef user_termios_to_kernel_termios
 #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios))
+#endif
+
+#ifndef kernel_termios_to_user_termios
 #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios))
+#endif
+
 #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
 #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))