From 23c11ed0bd72531f095576c9c363a43ca2cb2567 Mon Sep 17 00:00:00 2001
From: Tilman Schmidt <tilman@imap.cc>
Date: Sat, 29 Nov 2008 21:38:04 -0800
Subject: [PATCH] --- yaml --- r: 122399 b: refs/heads/master c:
 af4218c3a699542adc9b76c8972828a726e7b0dc h: refs/heads/master i:   122397:
 8dbd4aad97cbd6ac2cd190b1f81177c18a852940   122395:
 1c4d752449fb5bb5a36ac53b061ed4806948cd7d   122391:
 758c013ae075c77b21c7dc61a1e97c5e2e9a9724   122383:
 2d399a1263bbf50f40a765291e8752cf8c5a7997   122367:
 b6d9ffbbeb5d838e64e46e4ef3da9073a0dde514 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/isdn/gigaset/ser-gigaset.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 488143a708a2..cb541bb498cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5419e6f054c877339f754e02c3b1dafd88cd96c
+refs/heads/master: af4218c3a699542adc9b76c8972828a726e7b0dc
diff --git a/trunk/drivers/isdn/gigaset/ser-gigaset.c b/trunk/drivers/isdn/gigaset/ser-gigaset.c
index 07052ed2a0c5..0b8c8f2b433f 100644
--- a/trunk/drivers/isdn/gigaset/ser-gigaset.c
+++ b/trunk/drivers/isdn/gigaset/ser-gigaset.c
@@ -16,7 +16,6 @@
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
-#include <linux/poll.h>
 #include <linux/completion.h>
 
 /* Version Information */
@@ -571,7 +570,6 @@ gigaset_tty_close(struct tty_struct *tty)
 	}
 
 	/* prevent other callers from entering ldisc methods */
-	/* FIXME: should use the tty state flags */
 	tty->disc_data = NULL;
 
 	if (!cs->hw.ser)
@@ -672,18 +670,6 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
 	return rc;
 }
 
-/*
- * Poll on the tty.
- * Unused, always return zero.
- *
- * FIXME: should probably return an exception - especially on hangup
- */
-static unsigned int
-gigaset_tty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
-{
-	return 0;
-}
-
 /*
  * Called by the tty driver when a block of data has been received.
  * Will not be re-entered while running but other ldisc functions
@@ -773,7 +759,6 @@ static struct tty_ldisc_ops gigaset_ldisc = {
 	.read		= gigaset_tty_read,
 	.write		= gigaset_tty_write,
 	.ioctl		= gigaset_tty_ioctl,
-	.poll		= gigaset_tty_poll,
 	.receive_buf	= gigaset_tty_receive,
 	.write_wakeup	= gigaset_tty_wakeup,
 };