From f33c1211134224afbddfcf31f51e7caa46044f2c Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 10 Apr 2011 19:22:34 +0200
Subject: [PATCH] --- yaml --- r: 248663 b: refs/heads/master c:
 d94206028854ba4c891004cecdbb2e220bf277bb h: refs/heads/master i:   248661:
 33322c1600b0c0954b6a8b1a308968195a62fb06   248659:
 9cf65fb6e5aeff8a1b7181628be07a46b83c7d6a   248655:
 f19f3f5fa9b834aefe0bc0879ee5587d1421148c v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/ifx6x60.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 092d29ff4ee6..fda81d64050c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99edb3d10a9d384d69557bd09cc39b9ec62aa04e
+refs/heads/master: d94206028854ba4c891004cecdbb2e220bf277bb
diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c
index 8ee5a41d340d..5315525220fb 100644
--- a/trunk/drivers/tty/serial/ifx6x60.c
+++ b/trunk/drivers/tty/serial/ifx6x60.c
@@ -41,7 +41,6 @@
 #include <linux/tty.h>
 #include <linux/device.h>
 #include <linux/spi/spi.h>
-#include <linux/tty.h>
 #include <linux/kfifo.h>
 #include <linux/tty_flip.h>
 #include <linux/timer.h>
@@ -56,7 +55,6 @@
 #include <linux/sched.h>
 #include <linux/time.h>
 #include <linux/wait.h>
-#include <linux/tty.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/spi/ifx_modem.h>