Merge git://git.infradead.org/iommu-2.6

[mv-sheeva.git] / drivers / input / serio / serport.c

diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 7ff71ba7b7c90265875ed79052c18966a81a0614..b9694b6445d00267142a14c04fe175405bcfd10f 100644 (file)
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -216,7 +216,7 @@ static void serport_ldisc_write_wakeup(struct tty_struct * tty)
  * The line discipline structure.
  */
 
-static struct tty_ldisc serport_ldisc = {
+static struct tty_ldisc_ops serport_ldisc = {
        .owner =        THIS_MODULE,
        .name =         "input",
        .open =         serport_ldisc_open,