diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 16:03:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 16:03:55 -0700 |
| commit | a9d38a4f2da6c49a257253a9fdef7a6bcb0e0e4f (patch) | |
| tree | d97875ecd47172c8739ec8f24ea159bbee8fb628 /Documentation/fb/intelfb.txt | |
| parent | 9613bebb223dea3179c265dc31e1bb41ae39f321 (diff) | |
| parent | c48013824b855c4498092aa6f2fa5345962c1f65 (diff) | |
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/fb/intelfb.txt')
| -rw-r--r-- | Documentation/fb/intelfb.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fb/intelfb.txt b/Documentation/fb/intelfb.txt index dd9e944ea628..feac4e4d6968 100644 --- a/Documentation/fb/intelfb.txt +++ b/Documentation/fb/intelfb.txt @@ -120,7 +120,7 @@ Using the same setup as described above, load the module like this: modprobe intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1 -Or just add the following to /etc/modprobe.conf +Or just add the following to a configuration file in /etc/modprobe.d/ options intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1 |