Commit 8863e092 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8d9ea717 476ab8fb
...@@ -53,7 +53,7 @@ config OF_DEVICE ...@@ -53,7 +53,7 @@ config OF_DEVICE
config OF_I2C config OF_I2C
def_tristate I2C def_tristate I2C
depends on I2C && !SPARC depends on I2C
help help
OpenFirmware I2C accessors OpenFirmware I2C accessors
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment