Merge branch 'for-2636/i2c/nuc' into next-i2c

diff --combined drivers/i2c/busses/Kconfig
index 77eabae4df8a0eb087d1825e85d1e6e54744eac0,ee284d2f74fdded51e33a44288933c2764581d46..21d88532d5b2858d93b6695adcc939f4c670f535
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -448,6 -448,13 +448,13 @@@ config I2C_NOMADI
          If you say yes to this option, support will be included for the
          I2C interface from ST-Ericsson's Nomadik and Ux500 architectures.
  
+ config I2C_NUC900
+       tristate "NUC900 I2C Driver"
+       depends on ARCH_W90X900
+       help
+         Say Y here to include support for I2C controller in the
+         Winbond/Nuvoton NUC900 based System-on-Chip devices.
+ 
  config I2C_OCORES
        tristate "OpenCores I2C Controller"
        depends on EXPERIMENTAL
@@@ -496,8 -503,8 +503,8 @@@ config I2C_PMCMS
          will be called i2c-pmcmsp.
  
  config I2C_PNX
 -      tristate "I2C bus support for Philips PNX targets"
 -      depends on ARCH_PNX4008
 +      tristate "I2C bus support for Philips PNX and NXP LPC targets"
 +      depends on ARCH_PNX4008 || ARCH_LPC32XX
        help
          This driver supports the Philips IP3204 I2C IP block master and/or
          slave controller