diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 01:03:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 01:03:55 +0200 |
| commit | a9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f (patch) | |
| tree | d97875ecd47172c8739ec8f24ea159bbee8fb628 /Documentation/video4linux/Zoran | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc (diff) | |
| download | linux-a9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f.tar.xz linux-a9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f.zip | |
Merge branch 'dunlap' (Randy's Documentation patches)
Merge Documentation fixes from Randy Dunlap.
Fixed up several small annoyances (bad changelogs and corrupted utf8
names), I need to try to convince people to do things right.
* emailed from Randy Dunlap <rdunlap@xenotime.net>:
Documentation: fix typo in ABI/stable/sysfs-driver-usb-usbtmc
Documentation: replace install commands with softdeps
Documentation: remove references to /etc/modprobe.conf
Documentation: input.txt: clarify mousedev 'cat' command syntax
Documentation: CodingStyle: add inline assembly guidelines
Documentation: sysrq: Crutcher Dunnavant is unavailable
Documentation: mention scripts/diffconfig tool
Documentation: remove 'mach' from dontdiff file
Diffstat (limited to 'Documentation/video4linux/Zoran')
| -rw-r--r-- | Documentation/video4linux/Zoran | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran index 9ed629d4874b..b5a911fd0602 100644 --- a/Documentation/video4linux/Zoran +++ b/Documentation/video4linux/Zoran @@ -255,7 +255,7 @@ Load zr36067.o. If it can't autodetect your card, use the card=X insmod option with X being the card number as given in the previous section. To have more than one card, use card=X1[,X2[,X3,[X4[..]]]] -To automate this, add the following to your /etc/modprobe.conf: +To automate this, add the following to your /etc/modprobe.d/zoran.conf: options zr36067 card=X1[,X2[,X3[,X4[..]]]] alias char-major-81-0 zr36067 |