diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 23:32:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 23:32:13 +0100 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/media/video/pvrusb2/pvrusb2-hdw.h | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
| download | blackbird-op-linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.tar.gz blackbird-op-linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw.h')
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h index 51d3009ab57f..d7753ae9ff46 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h @@ -75,7 +75,7 @@ enum pvr2_v4l_type { * (but it might still on the bus). In this state there's nothing we can * do; it must be replugged in order to recover. * - * COLD - Device is in an unusuable state, needs microcontroller firmware. + * COLD - Device is in an unusable state, needs microcontroller firmware. * * WARM - We can communicate with the device and the proper * microcontroller firmware is running, but other device initialization is |
