diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /fs/compat_ioctl.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index d84e7058c298..0fc5ecab1b44 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -2655,7 +2655,7 @@ COMPATIBLE_IOCTL(TIOCSLTC) | |||
| 2655 | #endif | 2655 | #endif |
| 2656 | #ifdef TIOCSTART | 2656 | #ifdef TIOCSTART |
| 2657 | /* | 2657 | /* |
| 2658 | * For these two we have defintions in ioctls.h and/or termios.h on | 2658 | * For these two we have definitions in ioctls.h and/or termios.h on |
| 2659 | * some architectures but no actual implemention. Some applications | 2659 | * some architectures but no actual implemention. Some applications |
| 2660 | * like bash call them if they are defined in the headers, so we provide | 2660 | * like bash call them if they are defined in the headers, so we provide |
| 2661 | * entries here to avoid syslog message spew. | 2661 | * entries here to avoid syslog message spew. |