diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
| commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
| tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /drivers/misc | |
| parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
| parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 0b92b2f6ea68..6d1ac180f6ee 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
| @@ -18,8 +18,8 @@ config ATMEL_PWM | |||
| 18 | depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 | 18 | depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 |
| 19 | help | 19 | help |
| 20 | This option enables device driver support for the PWM channels | 20 | This option enables device driver support for the PWM channels |
| 21 | on certain Atmel prcoessors. Pulse Width Modulation is used for | 21 | on certain Atmel processors. Pulse Width Modulation is used for |
| 22 | purposes including software controlled power-efficent backlights | 22 | purposes including software controlled power-efficient backlights |
| 23 | on LCD displays, motor control, and waveform generation. | 23 | on LCD displays, motor control, and waveform generation. |
| 24 | 24 | ||
| 25 | config ATMEL_TCLIB | 25 | config ATMEL_TCLIB |
| @@ -142,7 +142,7 @@ config ATMEL_SSC | |||
| 142 | tristate "Device driver for Atmel SSC peripheral" | 142 | tristate "Device driver for Atmel SSC peripheral" |
| 143 | depends on AVR32 || ARCH_AT91 | 143 | depends on AVR32 || ARCH_AT91 |
| 144 | ---help--- | 144 | ---help--- |
| 145 | This option enables device driver support for Atmel Syncronized | 145 | This option enables device driver support for Atmel Synchronized |
| 146 | Serial Communication peripheral (SSC). | 146 | Serial Communication peripheral (SSC). |
| 147 | 147 | ||
| 148 | The SSC peripheral supports a wide variety of serial frame based | 148 | The SSC peripheral supports a wide variety of serial frame based |