git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/fixes' into for-linus
[sfrench/cifs-2.6.git]
/
Documentation
/
media
/
dmx.h.rst.exceptions
diff --git
a/Documentation/media/dmx.h.rst.exceptions
b/Documentation/media/dmx.h.rst.exceptions
index 629db384104a82dc733a4c98d0078c882c61f486..63f55a9ae2b1ffa54d088eb60b7e79e36c050f6e 100644
(file)
--- a/
Documentation/media/dmx.h.rst.exceptions
+++ b/
Documentation/media/dmx.h.rst.exceptions
@@
-54,3
+54,5
@@
ignore symbol DMX_OUT_DECODER
ignore symbol DMX_OUT_TAP
ignore symbol DMX_OUT_TS_TAP
ignore symbol DMX_OUT_TSDEMUX_TAP
+
+replace ioctl DMX_DQBUF dmx_qbuf