Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (0fb7f4f0) · Commits · 戴 / test

Documentation/i2c/busses/i2c-sis96x

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ I suspect that this driver could be made to work for the following SiS
		chipsets as well: 635, and 635T. If anyone owns a board with those chips
		AND is willing to risk crashing & burning an otherwise well-behaved kernel
		in the name of progress... please contact me at <mhoffman@lightlink.com> or
		via the project's mailing list: <i2c@lm-sensors.org>. Please send bug
		via the linux-i2c mailing list: <linux-i2c@vger.kernel.org>. Please send bug
		reports and/or success stories as well.

MAINTAINERS

+10 −10

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ S: Maintained
		ALI1563 I2C DRIVER
		P: Rudolf Marek
		M: r.marek@assembler.cz
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		ALPHA PORT
		@@ -1749,7 +1749,7 @@ FREESCALE I2C CPM DRIVER
		P: Jochen Friedrich
		M: jochen@scram.de
		L: linuxppc-dev@ozlabs.org
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		FREESCALE SOC FS_ENET DRIVER
		@@ -2022,7 +2022,7 @@ S: Maintained
		I2C/SMBUS STUB DRIVER
		P: Mark M. Hoffman
		M: mhoffman@lightlink.com
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		I2C SUBSYSTEM
		@@ -2030,14 +2030,14 @@ P: Jean Delvare (PC drivers, core)
		M: khali@linux-fr.org
		P: Ben Dooks (embedded platforms)
		M: ben-linux@fluff.org
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
		S: Maintained

		I2C-TINY-USB DRIVER
		P: Till Harbaum
		M: till@harbaum.org
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		T: http://www.harbaum.org/till/i2c_tiny_usb
		S: Maintained

		@@ -3153,7 +3153,7 @@ S: Maintained
		OPENCORES I2C BUS DRIVER
		P: Peter Korsgaard
		M: jacmet@sunsite.dk
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		OPROFILE
		@@ -3200,7 +3200,7 @@ S: Maintained
		PA SEMI SMBUS DRIVER
		P: Olof Johansson
		M: olof@lixom.net
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		PANASONIC LAPTOP ACPI EXTRAS DRIVER
		@@ -3345,7 +3345,7 @@ S: Maintained
		PNXxxxx I2C DRIVER
		P: Vitaly Wool
		M: vitalywool@gmail.com
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		PPP PROTOCOL DRIVERS AND COMPRESSORS
		@@ -3809,7 +3809,7 @@ S: Maintained
		SIS 96X I2C/SMBUS DRIVER
		P: Mark M. Hoffman
		M: mhoffman@lightlink.com
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		SIS FRAMEBUFFER DRIVER
		@@ -4556,7 +4556,7 @@ S: Maintained
		VIAPRO SMBUS DRIVER
		P: Jean Delvare
		M: khali@linux-fr.org
		L: i2c@lm-sensors.org
		L: linux-i2c@vger.kernel.org
		S: Maintained

		VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER

drivers/i2c/busses/i2c-s3c2410.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c i2c, struct i2c_msg msgs, int
		unsigned long timeout;
		int ret;

		if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
		if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
		return -EIO;

		ret = s3c24xx_i2c_set_master(i2c);

drivers/i2c/busses/scx200_i2c.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {

		static struct i2c_adapter scx200_i2c_ops = {
		.owner = THIS_MODULE,
		.class = I2C_CLASS_HWMON \| I2C_CLASS_SPD,
		.id = I2C_HW_B_SCX200,
		.algo_data = &scx200_i2c_data,
		.name = "NatSemi SCx200 I2C",

Admin message