diff --git a/[refs] b/[refs]
index 129f8de9e280..8cfafba55f25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8a4c3b5250496f072d9098a641fd5642146d999
+refs/heads/master: 3dddbfc30106280d98a5752b6c622f65e5eb3663
diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h
index 5824a9777ad7..dd8e08fe8855 100644
--- a/trunk/include/linux/tty.h
+++ b/trunk/include/linux/tty.h
@@ -53,13 +53,6 @@
  */
 #define __DISABLED_CHAR '\0'
 
-/*
- * This is the flip buffer used for the tty driver.  The buffer is
- * located in the tty structure, and is used as a high speed interface
- * between the tty driver and the tty line discipline.
- */
-#define TTY_FLIPBUF_SIZE 512
-
 struct tty_buffer {
 	struct tty_buffer *next;
 	char *char_buf_ptr;