diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/media/rc/ir-raw.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/media/rc/ir-raw.c')
| -rw-r--r-- | drivers/media/rc/ir-raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c index 01f258a2a57..11c19d8d0ee 100644 --- a/drivers/media/rc/ir-raw.c +++ b/drivers/media/rc/ir-raw.c | |||
| @@ -153,7 +153,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_edge); | |||
| 153 | * @type: the type of the event that has occurred | 153 | * @type: the type of the event that has occurred |
| 154 | * | 154 | * |
| 155 | * This routine (which may be called from an interrupt context) works | 155 | * This routine (which may be called from an interrupt context) works |
| 156 | * in similiar manner to ir_raw_event_store_edge. | 156 | * in similar manner to ir_raw_event_store_edge. |
| 157 | * This routine is intended for devices with limited internal buffer | 157 | * This routine is intended for devices with limited internal buffer |
| 158 | * It automerges samples of same type, and handles timeouts | 158 | * It automerges samples of same type, and handles timeouts |
| 159 | */ | 159 | */ |