Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

Old tree, so the automatic merge had some problems.

diff --combined drivers/i2c/busses/Kconfig
index 6e9da13,a3bec8d..8334496
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -7,7 -7,7 +7,7 @@@ menu "I2C Hardware Bus support
  
  config I2C_ALI1535
        tristate "ALI 1535"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the SMB
          Host controller on Acer Labs Inc. (ALI) M1535 South Bridges.  The SMB
@@@ -31,7 -31,7 +31,7 @@@ config I2C_ALI156
  
  config I2C_ALI15X3
        tristate "ALI 15x3"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the
          Acer Labs Inc. (ALI) M1514 and M1543 motherboard I2C interfaces.
@@@ -41,7 -41,7 +41,7 @@@
  
  config I2C_AMD756
        tristate "AMD 756/766/768/8111 and nVidia nForce"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the AMD
          756/766/768 mainboard I2C interfaces.  The driver also includes
@@@ -66,7 -66,7 +66,7 @@@ config I2C_AMD756_S488
  
  config I2C_AMD8111
        tristate "AMD 8111"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the
          second (SMBus 2.0) AMD 8111 mainboard I2C interface.
@@@ -109,7 -109,7 +109,7 @@@ config I2C_HYDR
  
  config I2C_I801
        tristate "Intel 82801 (ICH)"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Intel
          801 family of mainboard I2C interfaces.  Specifically, the following
@@@ -130,7 -130,7 +130,7 @@@
  
  config I2C_I810
        tristate "Intel 810/815"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the Intel
@@@ -144,6 -144,22 +144,22 @@@
          This driver can also be built as a module.  If so, the module
          will be called i2c-i810.
  
+ config I2C_PXA
+       tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)"
+       depends on I2C && EXPERIMENTAL && ARCH_PXA
+       help
+         If you have devices in the PXA I2C bus, say yes to this option.
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-pxa.
+ 
+ config I2C_PXA_SLAVE
+       bool "Intel PXA2XX I2C Slave comms support"
+       depends on I2C_PXA
+       help
+         Support I2C slave mode communications on the PXA I2C bus.  This
+         is necessary for systems where the PXA may be a target on the
+         I2C bus.
+ 
  config I2C_PIIX4
        tristate "Intel PIIX4"
        depends on I2C && PCI
@@@ -182,8 -198,14 +198,8 @@@ config I2C_IOP3X
          will be called i2c-iop3xx.
  
  config I2C_ISA
 -      tristate "ISA Bus support"
 -      depends on I2C && EXPERIMENTAL
 -      help
 -        If you say yes to this option, support will be included for i2c
 -        interfaces that are on the ISA bus.
 -
 -        This driver can also be built as a module.  If so, the module
 -        will be called i2c-isa.
 +      tristate
 +      depends on I2C
  
  config I2C_ITE
        tristate "ITE I2C Adapter"
@@@ -242,11 -264,12 +258,11 @@@ config I2C_MP
          will be called i2c-mpc.
  
  config I2C_NFORCE2
 -      tristate "Nvidia Nforce2"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      tristate "Nvidia nForce2, nForce3 and nForce4"
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the Nvidia
 -        Nforce2 family of mainboard I2C interfaces.
 -        This driver also supports the nForce3 Pro 150 MCP.
 +        nForce2, nForce3 and nForce4 families of mainboard I2C interfaces.
  
          This driver can also be built as a module.  If so, the module
          will be called i2c-nforce2.
@@@ -298,7 -321,7 +314,7 @@@ config I2C_PARPORT_LIGH
  
  config I2C_PROSAVAGE
        tristate "S3/VIA (Pro)Savage"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the
@@@ -381,7 -404,7 +397,7 @@@ config SCx200_AC
  
  config I2C_SIS5595
        tristate "SiS 5595"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the 
          SiS5595 SMBus (a subset of I2C) interface.
@@@ -391,7 -414,7 +407,7 @@@
  
  config I2C_SIS630
        tristate "SiS 630/730"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the 
          SiS630 and SiS730 SMBus (a subset of I2C) interface.
@@@ -401,7 -424,7 +417,7 @@@
  
  config I2C_SIS96X
        tristate "SiS 96x"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the SiS
          96x SMBus (a subset of I2C) interfaces.  Specifically, the following
@@@ -412,7 -435,6 +428,7 @@@
            648/961
            650/961
            735
 +          745
  
          This driver can also be built as a module.  If so, the module
          will be called i2c-sis96x.
@@@ -443,7 -465,7 +459,7 @@@ config I2C_VI
  
  config I2C_VIAPRO
        tristate "VIA 82C596/82C686/823x"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the VIA
          82C596/82C686/823x I2C interfaces.  Specifically, the following 
@@@ -461,7 -483,7 +477,7 @@@
  
  config I2C_VOODOO3
        tristate "Voodoo 3"
 -      depends on I2C && PCI && EXPERIMENTAL
 +      depends on I2C && PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the