aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/nozomi.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-19 17:04:25 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-19 17:04:25 +0900
commitfe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch)
tree40323a8f05d3754372f561bb8f4698ef1a4e9c8f /drivers/char/nozomi.c
parent2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff)
parent6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff)
downloadkernel_samsung_smdk4412-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.gz
kernel_samsung_smdk4412-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.bz2
kernel_samsung_smdk4412-fe040be2fdc49a4132c5f64359c629aeeb8e4947.zip
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'drivers/char/nozomi.c')
-rw-r--r--drivers/char/nozomi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index dd3f9b1f11b..294d03e8c61 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1828,7 +1828,6 @@ static int ntty_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct port *port = tty->driver_data;
- void __user *argp = (void __user *)arg;
int rval = -ENOIOCTLCMD;
DBG1("******** IOCTL, cmd: %d", cmd);