diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /drivers/media/video/ivtv/ivtv-driver.h | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index ab287b48fc2b..2ceb5227637c 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
| @@ -251,6 +251,7 @@ struct ivtv_mailbox_data { | |||
| 251 | #define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */ | 251 | #define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */ |
| 252 | #define IVTV_F_I_INITED 21 /* set after first open */ | 252 | #define IVTV_F_I_INITED 21 /* set after first open */ |
| 253 | #define IVTV_F_I_FAILED 22 /* set if first open failed */ | 253 | #define IVTV_F_I_FAILED 22 /* set if first open failed */ |
| 254 | #define IVTV_F_I_WORK_INITED 23 /* worker thread was initialized */ | ||
| 254 | 255 | ||
| 255 | /* Event notifications */ | 256 | /* Event notifications */ |
| 256 | #define IVTV_F_I_EV_DEC_STOPPED 28 /* decoder stopped event */ | 257 | #define IVTV_F_I_EV_DEC_STOPPED 28 /* decoder stopped event */ |