From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Dec 2012 21:21:19 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8863e092410c766ca52da3e95eb9f707c7864fc2;hp=8d9ea7172edd2e52da26b9485b4c97969a0d2648;p=linux-beck.git

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 dfba3e64d595..d37bfcf5a3a2 100644
--- 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