Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Browse Source 
Pull i2c fixes from Wolfram Sang:
 "Two buildfixes for I2C based on your tree from the day before
  yesterday.  Sadly, these build errors never reached me while the
  patches were sitting in -next.  Need to fix that"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: Export bus recovery functions
  i2c: jz4780: Fix build for m68k and sparc64
This commit is contained in:
Linus Torvalds 2015-04-18 08:19:04 -04:00
commit 40d7839879
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/i2c/busses/i2c-jz4780.c
View File

@ -23,6 +23,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>

3
drivers/i2c/i2c-core.c
View File

@ -596,6 +596,7 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap)
adap->bus_recovery_info->set_scl(adap, 1); adap->bus_recovery_info->set_scl(adap, 1);
return i2c_generic_recovery(adap); return i2c_generic_recovery(adap);
} }
EXPORT_SYMBOL_GPL(i2c_generic_scl_recovery);
int i2c_generic_gpio_recovery(struct i2c_adapter *adap) int i2c_generic_gpio_recovery(struct i2c_adapter *adap)
{ {
@ -610,6 +611,7 @@ int i2c_generic_gpio_recovery(struct i2c_adapter *adap)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(i2c_generic_gpio_recovery);
int i2c_recover_bus(struct i2c_adapter *adap) int i2c_recover_bus(struct i2c_adapter *adap)
{ {
@ -619,6 +621,7 @@ int i2c_recover_bus(struct i2c_adapter *adap)
dev_dbg(&adap->dev, "Trying i2c bus recovery\n"); dev_dbg(&adap->dev, "Trying i2c bus recovery\n");
return adap->bus_recovery_info->recover_bus(adap); return adap->bus_recovery_info->recover_bus(adap);
} }
EXPORT_SYMBOL_GPL(i2c_recover_bus);
static int i2c_device_probe(struct device *dev) static int i2c_device_probe(struct device *dev)
{ {