diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-16 13:34:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-16 13:34:38 -0800 |
| commit | f25e22956058e783cb9bd6d015c2f6b621e831ca (patch) | |
| tree | b02875d2a4c8a31c7b2f206108d95cc5791aaf4f /drivers/i2c/busses/i2c-stm32f4.c | |
| parent | d025fbf1a2cd1d60f39579d331a9accf84c5ec5b (diff) | |
| parent | 45fd4470ba86e9ca2837b666a52cc65dc69f0fa3 (diff) | |
| download | linux-stericsson-f25e22956058e783cb9bd6d015c2f6b621e831ca.tar.gz | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Two bugfixes for the AT24 I2C eeprom driver and some minor corrections
for I2C bus drivers"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: piix4: Fix port number check on release
i2c: stm32: Fix copyrights
i2c-cht-wc: constify platform_device_id
eeprom: at24: change nvmem stride to 1
eeprom: at24: fix I2C device selection for runtime PM
Diffstat (limited to 'drivers/i2c/busses/i2c-stm32f4.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-stm32f4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c index 4ec108496f15..47c8d00de53f 100644 --- a/drivers/i2c/busses/i2c-stm32f4.c +++ b/drivers/i2c/busses/i2c-stm32f4.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Driver for STMicroelectronics STM32 I2C controller * @@ -6,11 +7,11 @@ * http://www.st.com/resource/en/reference_manual/DM00031020.pdf * * Copyright (C) M'boumba Cedric Madianga 2016 + * Copyright (C) STMicroelectronics 2017 * Author: M'boumba Cedric Madianga <cedric.madianga@gmail.com> * * This driver is based on i2c-st.c * - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/clk.h> |