diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:38:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:38:18 -0800 |
| commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
| tree | b384aef82007144b067cc171d2a9aa168b50b262 /Documentation/dvb/ci.txt | |
| parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
| parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
Diffstat (limited to 'Documentation/dvb/ci.txt')
| -rw-r--r-- | Documentation/dvb/ci.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/dvb/ci.txt b/Documentation/dvb/ci.txt index 531239b2908..2ecd834585e 100644 --- a/Documentation/dvb/ci.txt +++ b/Documentation/dvb/ci.txt @@ -71,7 +71,7 @@ eliminating the need for any additional ioctls. The disadvantage is that the driver/hardware has to manage the rest. For the application programmer it would be as simple as sending/receiving an array to/from the CI ioctls as defined in the Linux DVB API. No changes -have been made in the API to accomodate this feature. +have been made in the API to accommodate this feature. * Why the need for another CI interface ? @@ -102,7 +102,7 @@ This CI interface follows the CI high level interface, which is not implemented by most applications. Hence this area is revisited. This CI interface is quite different in the case that it tries to -accomodate all other CI based devices, that fall into the other categories +accommodate all other CI based devices, that fall into the other categories. This means that this CI interface handles the EN50221 style tags in the Application layer only and no session management is taken care of by the |