From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 Dec 2011 05:53:13 +0000 (+1100)
Subject: Merge commit 'refs/next/20111214/regmap'
X-Git-Tag: next-20111219~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f6a6938664306a5caaf034f19b7fa59d57bc3b0;p=karo-tx-linux.git

Merge commit 'refs/next/20111214/regmap'

Conflicts:
	drivers/base/regmap/regcache.c
	drivers/base/regmap/regmap.c
---

6f6a6938664306a5caaf034f19b7fa59d57bc3b0
diff --cc drivers/gpio/Kconfig
index 79199f404b74,8482a23887dc..e3380137b05b
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -70,7 -70,7 +70,7 @@@ config GPIO_GENERI
  
  config GPIO_DA9052
  	tristate "Dialog DA9052 GPIO"
--	depends on PMIC_DA9052
++	depends on PMIC_DA9052 && BROKEN
  	help
  	  Say yes here to enable the GPIO driver for the DA9052 chip.