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

Commit 659dba34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Fix OMAP clock prescaler to match the comment
  i2c: Refactor a kfree in i2c-dev
  i2c: Fix return value check in i2c-dev
  i2c: Enable PEC on more i2c-i801 devices
  i2c: Discard the i2c algo del_bus wrappers
  i2c: New ARM Versatile/Realview bus driver
  i2c: fix broken ds1337 initialization
  i2c: i2c-i801 documentation update
  i2c: Use the __ATTR macro where possible
  i2c: Whitespace cleanups
  i2c: Use put_user instead of copy_to_user where possible
  i2c: New Atmel AT91 bus driver
  i2c: Add support for nested i2c bus locking
  i2c: Cleanups to the i2c-nforce2 bus driver
  i2c: Add request/release_mem_region to i2c-ibm_iic bus driver
  i2c: New Philips PNX bus driver
  i2c: Delete the broken i2c-ite bus driver
  i2c: Update the list of driver IDs
  i2c: Fix documentation typos
parents 3640543d d7aef138

Documentation/feature-removal-schedule.txt

+0 −11
Original line number Diff line number Diff line
@@ -216,17 +216,6 @@ Who: Thomas Gleixner <tglx@linutronix.de> 


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



What:	i2c-ite and i2c-algo-ite drivers

When:	September 2006

Why:	These drivers never compiled since they were added to the kernel

	tree 5 years ago. This feature removal can be reevaluated if

	someone shows interest in the drivers, fixes them and takes over

	maintenance.

	http://marc.theaimsgroup.com/?l=linux-mips&m=115040510817448

Who:	Jean Delvare <khali@linux-fr.org>



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



What:	Bridge netfilter deferred IPv4/IPv6 output hook calling

When:	January 2007

Why:	The deferred output hooks are a layering violation causing unusual

Documentation/i2c/busses/i2c-amd8111

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Supported adapters: 


Datasheets:

	AMD datasheet not yet available, but almost everything can be found

	in publically available ACPI 2.0 specification, which the adapter 

	in the publicly available ACPI 2.0 specification, which the adapter

	follows.



Author: Vojtech Pavlik <vojtech@suse.cz>

Documentation/i2c/busses/i2c-i801

+4 −1
Original line number Diff line number Diff line
@@ -9,7 +9,10 @@ Supported adapters: 
  * Intel 82801EB/ER (ICH5) (HW PEC supported, 32 byte buffer not supported)

  * Intel 6300ESB

  * Intel 82801FB/FR/FW/FRW (ICH6)

  * Intel ICH7

  * Intel 82801G (ICH7)

  * Intel 631xESB/632xESB (ESB2)

  * Intel 82801H (ICH8)

  * Intel ICH9

    Datasheets: Publicly available at the Intel website



Authors:

Documentation/i2c/busses/i2c-nforce2

+3 −3
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ Supported adapters: 
  * nForce4 MCP51              10de:0264

  * nForce4 MCP55              10de:0368



Datasheet: not publically available, but seems to be similar to the

Datasheet: not publicly available, but seems to be similar to the

           AMD-8111 SMBus 2.0 adapter.



Authors:

	Hans-Frieder Vogt <hfvogt@arcor.de>, 

	Hans-Frieder Vogt <hfvogt@gmx.net>,

	Thomas Leibold <thomas@plx.com>, 

        Patrick Dreker <patrick@dreker.de>

arch/arm/mach-pnx4008/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel.

#



obj-y			:= core.o irq.o time.o clock.o gpio.o serial.o dma.o

obj-y			:= core.o irq.o time.o clock.o gpio.o serial.o dma.o i2c.o

obj-m			:=

obj-n			:=

obj-			:=