diff --git a/[refs] b/[refs] index ab77e580b8f3..f8d0eb533ca4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6885107736a4dd23e7d3bc103fe6d043c63c4de +refs/heads/master: c564b6fda961bd999aac0b709b79288dd8f426cd diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c index d741f35d7b3a..14a102e877d6 100644 --- a/trunk/arch/um/drivers/line.c +++ b/trunk/arch/um/drivers/line.c @@ -275,6 +275,8 @@ int line_ioctl(struct tty_struct *tty, struct file * file, case TIOCGLTC: case TIOCSLTC: #endif + /* Note: these are out of date as we now have TCGETS2 etc but this + whole lot should probably go away */ case TCGETS: case TCSETSF: case TCSETSW: