summaryrefslogtreecommitdiff
path: root/drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-29 01:32:00 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-29 01:32:00 +0400
commit9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch)
tree99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h
parente56b3bc7942982ac2589c942fb345e38bc7a341a (diff)
parentf934fb19ef34730263e6afc01e8ec27a8a71470f (diff)
downloadlinux-9e3ee1c39c0cc71222f9980ccbf87fe072897eef.tar.xz
Merge branch 'linus' into cpus4096
Conflicts: kernel/stop_machine.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h2
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 @@
#define FX2CMD_MEM_WRITE_DWORD 0x01u
#define FX2CMD_MEM_READ_DWORD 0x02u
+#define FX2CMD_HCW_ZILOG_RESET 0x10u /* 1=reset 0=release */
+
#define FX2CMD_MEM_READ_64BYTES 0x28u
#define FX2CMD_REG_WRITE 0x04u