diff options
author | Michal Marek <mmarek@suse.cz> | 2010-12-01 13:13:56 +0100 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 13:13:56 +0100 |
commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /drivers/char/nozomi.c | |
parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
download | kernel_samsung_espresso10-307991055b0ce65d53dc1eb501c456c10eb36360.zip kernel_samsung_espresso10-307991055b0ce65d53dc1eb501c456c10eb36360.tar.gz kernel_samsung_espresso10-307991055b0ce65d53dc1eb501c456c10eb36360.tar.bz2 |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
Diffstat (limited to 'drivers/char/nozomi.c')
-rw-r--r-- | drivers/char/nozomi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c index dd3f9b1..294d03e 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); |