Merge commit 'v2.6.34-rc6' into core/locking

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 268e17f9ec3f..2c24fcdc722a 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -94,6 +94,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/uaccess.h>
+#include <linux/gfp.h>
 
 #include "specialix_io8.h"
 #include "cd1865.h"
@@ -646,8 +647,6 @@ static void sx_receive(struct specialix_board *bp)
         dprintk(SX_DEBUG_RX, "port: %p: count: %d\n", port, count);
         port->hits[count > 8 ? 9 : count]++;
 
-        tty_buffer_request_room(tty, count);
-
         while (count--)
                 tty_insert_flip_char(tty, sx_in(bp, CD186x_RDR), TTY_NORMAL);
         tty_flip_buffer_push(tty);