Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de74717 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9ab6e6e7 098aebc3

drivers/i2c/busses/i2c-sun6i-p2wi.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 *

 */

#include <linux/clk.h>

#include <linux/module.h>

#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/interrupt.h>

drivers/i2c/muxes/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.