diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:19 -0500 |
| commit | b8307db2477f9c551e54e0c7b643ea349a3349cd (patch) | |
| tree | 88654f8bd73857bbd40f75013ce41d8882d16ce6 /drivers/media/video/s2255drv.c | |
| parent | f0461d0146ee30927bc7efa2ae24ea8c6693b725 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into tracing/core
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 |