diff --git a/[refs] b/[refs]
index 661942cc2e80..c556c96245bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d94afc6ccf6690b30ae112ec8101b3f10d50114e
+refs/heads/master: aa7738a5f503abea5445cdd8cc2d501502c748ae
diff --git a/trunk/include/asm-generic/termios.h b/trunk/include/asm-generic/termios.h
index 33dca30a3c45..7d39ecc92d94 100644
--- a/trunk/include/asm-generic/termios.h
+++ b/trunk/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))