diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 02:22:50 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 02:22:50 (GMT) |
commit | e8650a08232e75274304b812ff04cfce9af9671c (patch) | |
tree | 0609c942e6ca99016e788ff2ee2bbed1bb9215a4 /drivers/i2c | |
parent | 3c2c4b73aa79e4a1b601710b59e092441175f4bb (diff) | |
parent | f70d4a95edc7da87f39cd8b603ba131df2c198ed (diff) | |
download | linux-e8650a08232e75274304b812ff04cfce9af9671c.tar.xz |
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/i2c')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-s6000.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-s6000.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d2c5095..94468a6 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -351,7 +351,7 @@ config I2C_DAVINCI For details please see http://www.ti.com/davinci config I2C_DESIGNWARE_PLATFORM - tristate "Synopsys DesignWare Platfrom" + tristate "Synopsys DesignWare Platform" depends on HAVE_CLK help If you say yes to this option, support will be included for the diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c index c64ba73..b76a29d 100644 --- a/drivers/i2c/busses/i2c-s6000.c +++ b/drivers/i2c/busses/i2c-s6000.c @@ -3,7 +3,7 @@ * * Description: Driver for S6000 Family I2C Interface * Copyright (c) 2008 emlix GmbH - * Author: Oskar Schirmer <os@emlix.com> + * Author: Oskar Schirmer <oskar@scara.com> * * Partially based on i2c-bfin-twi.c driver by <sonic.zhang@analog.com> * Copyright (c) 2005-2007 Analog Devices, Inc. diff --git a/drivers/i2c/busses/i2c-s6000.h b/drivers/i2c/busses/i2c-s6000.h index ff23b81..4936f9f 100644 --- a/drivers/i2c/busses/i2c-s6000.h +++ b/drivers/i2c/busses/i2c-s6000.h @@ -6,7 +6,7 @@ * for more details. * * Copyright (C) 2008 Emlix GmbH <info@emlix.com> - * Author: Oskar Schirmer <os@emlix.com> + * Author: Oskar Schirmer <oskar@scara.com> */ #ifndef __DRIVERS_I2C_BUSSES_I2C_S6000_H |