aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-10 11:31:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-10 11:31:39 -0700
commit8de74717e1cd0e9ff69e31c71278cf18f6437165 (patch)
treea1e7a40924e2739e29f2a419885d99c378fda0c5
parent9ab6e6e7db3027728067a827b2366b2aca4f519d (diff)
parent098aebc30292c10b31f6aa58bf4fe2c4b26001f6 (diff)
downloadlinux-8de74717e1cd0e9ff69e31c71278cf18f6437165.tar.gz
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c build fix and cleanup from Wolfram Sang: "One buildfix for the i2c subsystem. While here, I decided to add the header cleanup as well" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: sun6i-p2wi: Remove duplicate inclusion of module.h i2c: mux: pca954x: fix dependencies
-rw-r--r--drivers/i2c/busses/i2c-sun6i-p2wi.c1
-rw-r--r--drivers/i2c/muxes/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c
index 09de4fd12d5..4d75d475970 100644
--- a/drivers/i2c/busses/i2c-sun6i-p2wi.c
+++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c
@@ -22,7 +22,6 @@
*
*/
#include <linux/clk.h>
-#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/io.h>
#include <linux/interrupt.h>
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index f7f9865b8b8..f6d313e528d 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -40,6 +40,7 @@ config I2C_MUX_PCA9541
config I2C_MUX_PCA954x
tristate "Philips PCA954x I2C Mux/switches"
+ depends on GPIOLIB
help
If you say yes here you get support for the Philips PCA954x
I2C mux/switch devices.