diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 06:10:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 06:10:50 -0400 |
commit | 35780c8ea7ad5c6d5483244d5f5bf37176fda86a (patch) | |
tree | 2bc34969f558da2a9b3de915e3f2499a959085da /drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | |
parent | 6ce37a58e334ef773f88283939afc9f4965c7697 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/urgent
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h index b58369e7f30b..614755ea2ea3 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h +++ b/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | |||
@@ -24,6 +24,8 @@ | |||
24 | #define FX2CMD_MEM_WRITE_DWORD 0x01u | 24 | #define FX2CMD_MEM_WRITE_DWORD 0x01u |
25 | #define FX2CMD_MEM_READ_DWORD 0x02u | 25 | #define FX2CMD_MEM_READ_DWORD 0x02u |
26 | 26 | ||
27 | #define FX2CMD_HCW_ZILOG_RESET 0x10u /* 1=reset 0=release */ | ||
28 | |||
27 | #define FX2CMD_MEM_READ_64BYTES 0x28u | 29 | #define FX2CMD_MEM_READ_64BYTES 0x28u |
28 | 30 | ||
29 | #define FX2CMD_REG_WRITE 0x04u | 31 | #define FX2CMD_REG_WRITE 0x04u |