Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

Pull tiny sparc update from David Miller:
 "Not much going on this release cycle in sparc land, just a Kconfig
  tweak."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  of_i2c: sparc: Allow OF_I2C for sparc

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index dfba3e64d59530bd67be7fea1519769364e02235..d37bfcf5a3a26560a9632930e996e11effabbbe5 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -53,7 +53,7 @@ config OF_DEVICE
 
 config OF_I2C
        def_tristate I2C
-       depends on I2C && !SPARC
+       depends on I2C
        help
          OpenFirmware I2C accessors