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

Commit e0bc5d4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-nforce2: Remove redundant error messages on ACPI conflict
  i2c: Use <linux/io.h> instead of <asm/io.h>
  i2c-algo-pca: Fix coding style issues
  i2c-dev: Fix all coding style issues
  i2c-core: Fix some coding style issues
  i2c-gpio: Move initialization code to subsys_initcall()
  i2c-parport: Make template structure const
  i2c-dev: Remove unnecessary casts
  at24: Fall back to byte or word reads if needed
  i2c-stub: Expose the default functionality flags
  i2c/scx200_acb: Make PCI device ids constant
  i2c-i801: Fix all checkpatch warnings
  i2c-i801: All newer devices have all the optional features
  i2c-i801: Let the user disable selected driver features
parents 7f02ab3c 7c4fda1a

Documentation/i2c/busses/i2c-i801

+7 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,13 @@ Authors: 
Module Parameters

Module Parameters

-----------------

-----------------





None.

* disable_features (bit vector)

Disable selected features normally supported by the device. This makes it

possible to work around possible driver or hardware bugs if the feature in

question doesn't work as intended for whatever reason. Bit values:

  1  disable SMBus PEC

  2  disable the block buffer

  8  disable the I2C block read functionality









Description

Description

drivers/i2c/busses/i2c-ali1535.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/acpi.h>

#include <asm/io.h>

#include <linux/io.h>









/* ALI1535 SMBus address offsets */

/* ALI1535 SMBus address offsets */

drivers/i2c/busses/i2c-ali15x3.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/acpi.h>

#include <asm/io.h>

#include <linux/io.h>





/* ALI15X3 SMBus address offsets */

/* ALI15X3 SMBus address offsets */

#define SMBHSTSTS	(0 + ali15x3_smba)

#define SMBHSTSTS	(0 + ali15x3_smba)

drivers/i2c/busses/i2c-amd756.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/acpi.h>

#include <asm/io.h>

#include <linux/io.h>





/* AMD756 SMBus address offsets */

/* AMD756 SMBus address offsets */

#define SMB_ADDR_OFFSET		0xE0

#define SMB_ADDR_OFFSET		0xE0

drivers/i2c/busses/i2c-amd8111.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/acpi.h>

#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <asm/io.h>

#include <linux/io.h>





MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");

MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");