diff --git a/[refs] b/[refs]
index 0afb50feb994..4399ef8ee169 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55d8538498f62ec72b5ba67aa386c7726f630475
+refs/heads/master: 36c7343b4ecac2432430f5393314f1bdc2c219a5
diff --git a/trunk/include/linux/tty_driver.h b/trunk/include/linux/tty_driver.h
index 59f1c0bd8f9c..d2a003586761 100644
--- a/trunk/include/linux/tty_driver.h
+++ b/trunk/include/linux/tty_driver.h
@@ -27,8 +27,7 @@
  * 	This routine is called by the kernel to write a series of
  * 	characters to the tty device.  The characters may come from
  * 	user space or kernel space.  This routine will return the
- *	number of characters actually accepted for writing.  This
- *	routine is mandatory.
+ *	number of characters actually accepted for writing.
  *
  *	Optional: Required for writable devices.
  *
@@ -134,7 +133,7 @@
  * 	This routine notifies the tty driver that it should hangup the
  * 	tty device.
  *
- *	Required:
+ *	Optional:
  *
  * void (*break_ctl)(struct tty_stuct *tty, int state);
  *