[armhf/mx5] regulator: Re-enable REGULATOR as built-in

svn path=/dists/trunk/linux/; revision=20633

debian/changelog

@@ -26,8 +26,9 @@ linux (3.11.1-1~exp1) UNRELEASED; urgency=low
     - Remove aic7xxx_old, enc28j60 and imm from module lists
     - [sh4] kernel-image no longer provides ext3-modules
   * [hppa] udeb: kernel-image does not provide ext2-modules (since 3.2.7-1)
-  * [armhf/mx5] mmc: Re-enable MMC_SDHCI_PLTFM as MMC_SDHCI_ESDHC_IMX
-    depends on it
+  * [armhf/mx5] Fix configuration regressions in 3.11-1~exp1:
+    - mmc: Re-enable MMC_SDHCI_PLTFM as module
+    - regulator: Re-enable REGULATOR as built-in
 
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 13 Sep 2013 04:37:21 +0100
 

debian/config/armhf/config.mx5

@@ -115,12 +115,10 @@ CONFIG_PWM_IMX=y
 ##
 ## file: drivers/regulator/Kconfig
 ##
-CONFIG_REGULATOR=m
+CONFIG_REGULATOR=y
 #. Provide dummy if lookup fails
 CONFIG_REGULATOR_DUMMY=y
-#. It is not set at top level
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-#. Included as module, should not be regulator stuff included as built-in?
 CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_MC13892=y