diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 01:12:15 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 01:12:15 +0400 |
commit | d2a2fc18d98d8ee2dec1542efc7f47beec256144 (patch) | |
tree | dba9097631b9736845920bc4029cc865071b8c65 /drivers/i2c/algos/i2c-algo-pcf.h | |
parent | 7bf97e1d5a94b6a71815771bb9452fc2c022c966 (diff) | |
parent | 41101a33026c215a09e5d3549aedfcdae9105515 (diff) | |
download | linux-d2a2fc18d98d8ee2dec1542efc7f47beec256144.tar.xz |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare.
Fix up trivial conflict in drivers/i2c/busses/i2c-gpio.c due to include
file cleanup clashing with DT support addition (which did the same
cleanup)
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-algo-bit: Don't resched on clock stretching
i2c: Update the FSF address
i2c: Convert drivers/i2c/muxes/* to use module_i2c_driver()
i2c-i801: Use usleep_range to wait for command completion
i2c-i801: Add device IDs for Intel Lynx Point
i2c-isch: Decrease delay in command completion check loop
i2c-gpio: Use linux/gpio.h rather than asm/gpio.h
Diffstat (limited to 'drivers/i2c/algos/i2c-algo-pcf.h')
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pcf.h b/drivers/i2c/algos/i2c-algo-pcf.h index 5263a9eeb8d7..1ec703ee788d 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.h +++ b/drivers/i2c/algos/i2c-algo-pcf.h @@ -16,7 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. */ /* -------------------------------------------------------------------- */ /* With some changes from Frodo Looijaard <frodol@dds.nl> */ |