diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/linux/tty_driver.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/linux/tty_driver.h')
| -rw-r--r-- | include/linux/tty_driver.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index ecdaeb98b293..5cf685086dd3 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h | |||
| @@ -312,7 +312,6 @@ struct tty_driver { | |||
| 312 | */ | 312 | */ |
| 313 | struct tty_struct **ttys; | 313 | struct tty_struct **ttys; |
| 314 | struct ktermios **termios; | 314 | struct ktermios **termios; |
| 315 | struct ktermios **termios_locked; | ||
| 316 | void *driver_state; | 315 | void *driver_state; |
| 317 | 316 | ||
| 318 | /* | 317 | /* |