From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 11 Jul 2012 21:05:06 +0000 (+0200)
Subject: Merge branch 'renesas-board-common' into renesas-board
X-Git-Tag: next-20120724~11^2~2^2^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8533bae35becc0b18dc5a6c59ead36dee57cfb47;p=karo-tx-linux.git

Merge branch 'renesas-board-common' into renesas-board

* renesas-board-common:
  ARM: mach-shmobile: select the fixed regulator driver on several boards
  regulator: extend the fixed dummy voltage regulator to accept voltage
  regulator: support multiple dummy fixed regulators

Conflicts:
	arch/arm/mach-shmobile/Kconfig
---

8533bae35becc0b18dc5a6c59ead36dee57cfb47
diff --cc arch/arm/mach-shmobile/Kconfig
index 379cefd0ed83,8854019651c0..0168382d3cba
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -123,7 -131,7 +132,8 @@@ config MACH_KZM9
  	depends on ARCH_SH73A0
  	select ARCH_REQUIRE_GPIOLIB
  	select USE_OF
 +	select SND_SOC_AK4642 if SND_SIMPLE_CARD
+ 	select REGULATOR_FIXED_VOLTAGE if REGULATOR
  
  comment "SH-Mobile System Configuration"