summaryrefslogtreecommitdiff
path: root/drivers/staging/dgrp/dgrp_mon_ops.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 18:28:59 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 18:28:59 (GMT)
commitccfc27302cdd82529500f3712841f30a62d19aaf (patch)
tree945667e58ce3e308f29a8a28f04e1bcd081cd9d6 /drivers/staging/dgrp/dgrp_mon_ops.c
parent42bf3e27e846156e9cead6f2cd6c43fa0ceb8362 (diff)
parent178e485a0ebbfdb7165b4363d8fea2a07d650c0b (diff)
downloadlinux-fsl-qoriq-ccfc27302cdd82529500f3712841f30a62d19aaf.tar.xz
Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY fixes from Greg Kroah-Hartman: "Here are some tty and serial driver fixes for your 3.7-rc1 tree. Again, the UABI header file fixes, and a number of build and runtime serial driver bugfixes that solve problems people have been reporting (the staging driver is a tty driver, hence the fixes coming in through this tree.) All of these have been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: staging: dgrp: check return value of alloc_tty_driver staging: dgrp: check for NULL pointer in (un)register_proc_table serial/8250_hp300: Missing 8250 register interface conversion bits UAPI: (Scripted) Disintegrate include/linux/hsi tty: serial: sccnxp: Fix bug with unterminated platform_id list staging: serial: dgrp: Add missing #include <linux/uaccess.h> serial: sccnxp: Allows the driver to be compiled as a module tty: Fix bogus "callbacks suppressed" messages net, TTY: initialize tty->driver_data before usage
Diffstat (limited to 'drivers/staging/dgrp/dgrp_mon_ops.c')
-rw-r--r--drivers/staging/dgrp/dgrp_mon_ops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/dgrp/dgrp_mon_ops.c b/drivers/staging/dgrp/dgrp_mon_ops.c
index 268dcb9..4792d05 100644
--- a/drivers/staging/dgrp/dgrp_mon_ops.c
+++ b/drivers/staging/dgrp/dgrp_mon_ops.c
@@ -38,6 +38,7 @@
#include <linux/sched.h>
#include <asm/unaligned.h>
#include <linux/proc_fs.h>
+#include <linux/uaccess.h>
#include "dgrp_common.h"