summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 13:21:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 13:21:19 -0800
commit8863e092410c766ca52da3e95eb9f707c7864fc2 (patch)
tree19bd3a2c5449d8997ffbd28fbf87a425118c4332
parent8d9ea7172edd2e52da26b9485b4c97969a0d2648 (diff)
parent476ab8fb78105f525cc56babb3980ffdd916aa24 (diff)
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
-rw-r--r--drivers/of/Kconfig2
1 files changed, 1 insertions, 1 deletions
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