diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-04 23:27:43 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-04 23:27:43 -0500 |
| commit | 14d676f56fad26fd3c31eeff5d4ef8ea4a163571 (patch) | |
| tree | 5e740c5931daecf44a6e74c230f2deb291290f4b /drivers/media/video/s2255drv.c | |
| parent | 797eaed40e1df4a3b9ece6894a71ce2b568bca38 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/s2255drv.c')
| -rw-r--r-- | drivers/media/video/s2255drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index 5272926db73e..3c3f8cf73108 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
| @@ -192,7 +192,7 @@ struct s2255_dmaqueue { | |||
| 192 | #define S2255_FW_FAILED 3 | 192 | #define S2255_FW_FAILED 3 |
| 193 | #define S2255_FW_DISCONNECTING 4 | 193 | #define S2255_FW_DISCONNECTING 4 |
| 194 | 194 | ||
| 195 | #define S2255_FW_MARKER 0x22552f2f | 195 | #define S2255_FW_MARKER cpu_to_le32(0x22552f2f) |
| 196 | /* 2255 read states */ | 196 | /* 2255 read states */ |
| 197 | #define S2255_READ_IDLE 0 | 197 | #define S2255_READ_IDLE 0 |
| 198 | #define S2255_READ_FRAME 1 | 198 | #define S2255_READ_FRAME 1 |