diff options
| author | Benjamin Herrenschmidt | 2008-10-15 02:31:54 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2008-10-15 02:31:54 +0200 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /drivers/char/vt_ioctl.c | |
| parent | powerpc: Fix CHRP PCI config access for indirect_pci (diff) | |
| parent | Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | kernel-qcow2-linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.gz kernel-qcow2-linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.xz kernel-qcow2-linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.zip | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'drivers/char/vt_ioctl.c')
| -rw-r--r-- | drivers/char/vt_ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index c904e9ad4a71..8944ce508e2f 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -395,6 +395,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, kbd = kbd_table + console; switch (cmd) { + case TIOCLINUX: + return tioclinux(tty, arg); case KIOCSOUND: if (!perm) goto eperm; |