diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 01:13:01 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 01:13:01 -0700 |
| commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
| tree | 972993c6568085b8d407fc7e13de10f4b93c651d /drivers/isdn/i4l/isdn_ttyfax.h | |
| parent | 899c612d74d4a242158a4db20367388d6299c028 (diff) | |
| parent | 86809173ce32ef03bd4d0389dfc72df0c805e9c4 (diff) | |
| download | lwn-e644dae645e167d154c0526358940986682a72b0.tar.gz lwn-e644dae645e167d154c0526358940986682a72b0.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/isdn/i4l/isdn_ttyfax.h')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ttyfax.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_ttyfax.h b/drivers/isdn/i4l/isdn_ttyfax.h index 757a89010020..ccda4fcf8f7b 100644 --- a/drivers/isdn/i4l/isdn_ttyfax.h +++ b/drivers/isdn/i4l/isdn_ttyfax.h @@ -15,4 +15,3 @@ #define XON 0x11 #define XOFF 0x13 #define DC2 0x12 - |