From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Oct 2012 05:39:38 +0000 (+0300)
Subject: Merge tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c52f1dd5292e87f77380624f67da6eaf5dd2df3a;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'regmap-fix-mmio' of git://git./linux/kernel/git/broonie/regmap

Pull regmap fix from Mark Brown:
 "regmap: Fix for dependencies for MMIO

  Trivial dependency issue, not noticed before as the only user of MMIO
  also needs I2C."

* tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: select REGMAP if REGMAP_MMIO and REGMAP_IRQ enabled
---

c52f1dd5292e87f77380624f67da6eaf5dd2df3a