diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers/misc/Kconfig | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index cf02ddc3436f..b5e67c0ff433 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -180,7 +180,7 @@ config THINKPAD_ACPI | |||
| 180 | For more information about this driver see | 180 | For more information about this driver see |
| 181 | <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . | 181 | <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . |
| 182 | 182 | ||
| 183 | This driver was formely known as ibm-acpi. | 183 | This driver was formerly known as ibm-acpi. |
| 184 | 184 | ||
| 185 | If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. | 185 | If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. |
| 186 | 186 | ||
| @@ -214,7 +214,7 @@ config THINKPAD_ACPI_BAY | |||
| 214 | default y | 214 | default y |
| 215 | ---help--- | 215 | ---help--- |
| 216 | Allows the thinkpad_acpi driver to handle removable bays. It will | 216 | Allows the thinkpad_acpi driver to handle removable bays. It will |
| 217 | eletrically disable the device in the bay, and also generate | 217 | electrically disable the device in the bay, and also generate |
| 218 | notifications when the bay lever is ejected or inserted. | 218 | notifications when the bay lever is ejected or inserted. |
| 219 | 219 | ||
| 220 | If you are not sure, say Y here. | 220 | If you are not sure, say Y here. |