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/m41t00: Do not forget to write year
  i2c-mv64xxx: Fix random oops at boot
  i2c: Migration aids for i2c_adapter.dev removal
  i2c-pnx: Add entry to MAINTAINERS
  i2c-pnx: Fix interrupt handler, get rid of EARLY config option

1 files changed, 0 insertions, 9 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index e1989f3a2684..9367c4cfe936 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -564,13 +564,4 @@ config I2C_PNX
           This driver can also be built as a module.  If so, the module
           will be called i2c-pnx.
 
-config I2C_PNX_EARLY
-        bool "Early initialization for I2C on PNXxxxx"
-        depends on I2C_PNX=y
-        help
-          Under certain circumstances one may need to make sure I2C on PNXxxxx
-          is initialized earlier than some other driver that depends on it
-          (for instance, that might be USB in case of PNX4008). With this
-          option turned on you can guarantee that.
-
 endmenu