Pull update-tlbflush-sn into release branch

[linux-2.6-omap-h63xx.git] / drivers / char / ip2 / i2lib.c

diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c
index ba85eb1b6ec75bfa56cd10b06b95cd9ff0186ee8..fc944d375be75101429b98e2f160dd41f4e6100e 100644 (file)
--- a/drivers/char/ip2/i2lib.c
+++ b/drivers/char/ip2/i2lib.c
@@ -854,7 +854,7 @@ i2Input(i2ChanStrPtr pCh)
                count += IBUF_SIZE;
        }
        // Don't give more than can be taken by the line discipline
-       amountToMove = pCh->pTTY->ldisc.receive_room( pCh->pTTY );
+       amountToMove = pCh->pTTY->receive_room;
        if (count > amountToMove) {
                count = amountToMove;
        }