diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 22:22:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 22:22:50 -0400 |
| commit | e8650a08232e75274304b812ff04cfce9af9671c (patch) | |
| tree | 0609c942e6ca99016e788ff2ee2bbed1bb9215a4 /drivers/misc | |
| parent | 3c2c4b73aa79e4a1b601710b59e092441175f4bb (diff) | |
| parent | f70d4a95edc7da87f39cd8b603ba131df2c198ed (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina:
"As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
edac, mips: don't change code that has been removed in edac/mips tree
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
lib: Change mail address of Oskar Schirmer
net: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
i2c: Change mail address of Oskar Schirmer
net: Fix tcp_build_and_update_options comment in struct tcp_sock
atomic64_32.h: fix parameter naming mismatch
Kconfig: replace "--- help ---" with "---help---"
c2port: fix bogus Kconfig "default no"
edac: Fix spelling errors.
qla1280: Remove redundant NULL check before release_firmware() call
remoteproc: remove redundant NULL check before release_firmware()
qla2xxx: Remove redundant NULL check before release_firmware() call.
aic94xx: Get rid of redundant NULL check before release_firmware() call
tehuti: delete redundant NULL check before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
bna: remove redundant NULL test before release_firmware()
tg3: remove redundant NULL test before release_firmware() call
typhoon: get rid of redundant conditional before all to release_firmware()
...
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/c2port/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/c2port/Kconfig b/drivers/misc/c2port/Kconfig index e46af9a5810d..33ee834e1b83 100644 --- a/drivers/misc/c2port/Kconfig +++ b/drivers/misc/c2port/Kconfig | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | menuconfig C2PORT | 5 | menuconfig C2PORT |
| 6 | tristate "Silicon Labs C2 port support (EXPERIMENTAL)" | 6 | tristate "Silicon Labs C2 port support (EXPERIMENTAL)" |
| 7 | depends on EXPERIMENTAL | 7 | depends on EXPERIMENTAL |
| 8 | default no | 8 | default n |
| 9 | help | 9 | help |
| 10 | This option enables support for Silicon Labs C2 port used to | 10 | This option enables support for Silicon Labs C2 port used to |
| 11 | program Silicon micro controller chips (and other 8051 compatible). | 11 | program Silicon micro controller chips (and other 8051 compatible). |
| @@ -23,8 +23,8 @@ if C2PORT | |||
| 23 | 23 | ||
| 24 | config C2PORT_DURAMAR_2150 | 24 | config C2PORT_DURAMAR_2150 |
| 25 | tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)" | 25 | tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)" |
| 26 | depends on X86 && C2PORT | 26 | depends on X86 |
| 27 | default no | 27 | default n |
| 28 | help | 28 | help |
| 29 | This option enables C2 support for the Eurotech's Duramar 2150 | 29 | This option enables C2 support for the Eurotech's Duramar 2150 |
| 30 | on board micro controller. | 30 | on board micro controller. |