projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux
[cascardo/linux.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
..
a28772d
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)