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
This commit is contained in:
Linus Torvalds 2012-12-13 13:21:19 -08:00
commit 8863e09241

View File

@ -53,7 +53,7 @@ config OF_DEVICE
config OF_I2C
def_tristate I2C
depends on I2C && !SPARC
depends on I2C
help
OpenFirmware I2C accessors