diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 19:55:17 +0100 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/media/rc/ene_ir.h | |
| parent | Input: max8925_onkey - avoid accessing input device too early (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz linux-b675b3667f6729dcd1036a2a129b35445947f905.zip | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/media/rc/ene_ir.h')
| -rw-r--r-- | drivers/media/rc/ene_ir.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h index fd108d90f750..6f978e85db8c 100644 --- a/drivers/media/rc/ene_ir.h +++ b/drivers/media/rc/ene_ir.h @@ -227,7 +227,7 @@ struct ene_device { /* TX buffer */ unsigned *tx_buffer; /* input samples buffer*/ - int tx_pos; /* position in that bufer */ + int tx_pos; /* position in that buffer */ int tx_len; /* current len of tx buffer */ int tx_done; /* done transmitting */ /* one more sample pending*/ |