diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 00:06:26 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 00:06:26 -0700 |
| commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
| tree | 8b639000418e2756bf6baece4e00e07d2534bccc /include/net/irda/wrapper.h | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
| download | linux-b73077eb03f510a84b102fb97640e595a958403c.tar.gz linux-b73077eb03f510a84b102fb97640e595a958403c.tar.bz2 linux-b73077eb03f510a84b102fb97640e595a958403c.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/net/irda/wrapper.h')
| -rw-r--r-- | include/net/irda/wrapper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/wrapper.h b/include/net/irda/wrapper.h index 2942ad6ab932..eef53ebe3d76 100644 --- a/include/net/irda/wrapper.h +++ b/include/net/irda/wrapper.h @@ -42,7 +42,7 @@ #define IRDA_TRANS 0x20 /* Asynchronous transparency modifier */ -/* States for receving a frame in async mode */ +/* States for receiving a frame in async mode */ enum { OUTSIDE_FRAME, BEGIN_FRAME, |