Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[pandora-kernel.git] / drivers / media / video / cx23885 / cx23885-reg.h

diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index c0bc9a0..c87ac68 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -213,6 +213,7 @@ Channel manager Data Structure entry = 20 DWORD
 #define DEV_CNTRL2     0x00040000
 
 #define PCI_MSK_IR        (1 << 28)
+#define PCI_MSK_AV_CORE   (1 << 27)
 #define PCI_MSK_GPIO1     (1 << 24)
 #define PCI_MSK_GPIO0     (1 << 23)
 #define PCI_MSK_APB_DMA   (1 << 12)
@@ -291,6 +292,7 @@ Channel manager Data Structure entry = 20 DWORD
 #define RDR_CFG0       0x00050000
 #define RDR_CFG1       0x00050004
 #define RDR_CFG2       0x00050008
+#define RDR_RDRCTL1    0x0005030c
 #define RDR_TLCTL0     0x00050318
 
 /* APB DMAC Current Buffer Pointer */