From ed9d7679f229998f746412e2ebbb37312dab108b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 2 Apr 2009 16:56:36 -0700
Subject: [PATCH] --- yaml --- r: 139615 b: refs/heads/master c:
 846c151a4de188bb8f7043097518dab2ff5b5c2c h: refs/heads/master i:   139613:
 f7b8ec5391773d442834abb08eba304f642b7001   139611:
 6fbcd3027c5c5bcda318e328eb4fd8d06e28a0b1   139607:
 df918c450ca37a737687382fc12fce540d437563   139599:
 fcec3c75c1b9fa53ae4c8860264d886162cb575b   139583:
 b359999ed69c5ab5e93d12f246716fdb439dfa18 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/tty_io.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f12e4d9b487c..6e18360a46d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6fac63cc1f52ec27f29fe6c6c8494a2ffac33fd
+refs/heads/master: 846c151a4de188bb8f7043097518dab2ff5b5c2c
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 33dac94922a7..a44b701c5bba 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -1758,7 +1758,7 @@ static int __tty_open(struct inode *inode, struct file *filp)
 	struct tty_driver *driver;
 	int index;
 	dev_t device = inode->i_rdev;
-	unsigned short saved_flags = filp->f_flags;
+	unsigned saved_flags = filp->f_flags;
 
 	nonseekable_open(inode, filp);