From 7bae34e1f4679282388aa2f923817c540e8bd8a6 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Tue, 22 Mar 2011 11:12:19 +0100
Subject: [PATCH] --- yaml --- r: 248701 b: refs/heads/master c:
 3a42610812c55e8a60e2660e01c6cb6eb01d4171 h: refs/heads/master i:   248699:
 84280c3fc1ffe7a79fd13660720ac85ffb3dcaf3 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/class/cdc-acm.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aed01c9bfc1f..7e24e7c7b6c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2c7b9353e8f782590852052fe2948692020147e
+refs/heads/master: 3a42610812c55e8a60e2660e01c6cb6eb01d4171
diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c
index a693381ed3cc..b84ccec8fc7b 100644
--- a/trunk/drivers/usb/class/cdc-acm.c
+++ b/trunk/drivers/usb/class/cdc-acm.c
@@ -626,8 +626,6 @@ static void acm_tty_unregister(struct acm *acm)
 	kfree(acm);
 }
 
-static int acm_tty_chars_in_buffer(struct tty_struct *tty);
-
 static void acm_port_down(struct acm *acm)
 {
 	int i, nr = acm->rx_buflimit;