diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-14 23:54:00 -0500 |
| commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
| tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /drivers/char/nozomi.c | |
| parent | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (diff) | |
| parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
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 dd3f9b1f11b4..294d03e8c61a 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, | |||
| 1828 | unsigned int cmd, unsigned long arg) | 1828 | unsigned int cmd, unsigned long arg) |
| 1829 | { | 1829 | { |
| 1830 | struct port *port = tty->driver_data; | 1830 | struct port *port = tty->driver_data; |
| 1831 | void __user *argp = (void __user *)arg; | ||
| 1832 | int rval = -ENOIOCTLCMD; | 1831 | int rval = -ENOIOCTLCMD; |
| 1833 | 1832 | ||
| 1834 | DBG1("******** IOCTL, cmd: %d", cmd); | 1833 | DBG1("******** IOCTL, cmd: %d", cmd); |