diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /drivers/char/amiserial.c | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
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/amiserial.c')
| -rw-r--r-- | drivers/char/amiserial.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index b0a70461a12c..c0bd6f472c52 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
| @@ -1299,7 +1299,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, | |||
| 1299 | { | 1299 | { |
| 1300 | struct async_struct * info = tty->driver_data; | 1300 | struct async_struct * info = tty->driver_data; |
| 1301 | struct async_icount cprev, cnow; /* kernel counter temps */ | 1301 | struct async_icount cprev, cnow; /* kernel counter temps */ |
| 1302 | struct serial_icounter_struct icount; | ||
| 1303 | void __user *argp = (void __user *)arg; | 1302 | void __user *argp = (void __user *)arg; |
| 1304 | unsigned long flags; | 1303 | unsigned long flags; |
| 1305 | 1304 | ||