[packages/kernel/LINUX_3_7] - According to https://bugzilla.kernel.org/show_bug.cgi?id=50711#c9, REGULATOR_DUMMY should be set

[lmasko]

commit 9688471d16805164975fd82dfbafb597fcc3a0cc
Author: Lukasz Masko <lmasko at pld-linux.org>
Date:   Thu Apr 18 15:04:21 2013 +0200

    - According to https://bugzilla.kernel.org/show_bug.cgi?id=50711#c9,
      REGULATOR_DUMMY should be set to 'y' only for development purposes.
      It cannot be set to 'm', so the only option left is setting it to 'n'.
    - The above change allows to remove 2 patches from kernel-small_fixes,
      which were added to make my SD card reader work - now it works without
      them.

 kernel-multiarch.config  |  2 +-
 kernel-small_fixes.patch | 33 ---------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
---
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 6397ecb..00b12df 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -4660,7 +4660,7 @@ RAPIDIO_TSI500 all=y
 #-
 REGULATOR all=y
 REGULATOR_DEBUG all=n
-REGULATOR_DUMMY all=y
+REGULATOR_DUMMY all=n
 REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
 REGULATOR_USERSPACE_CONSUMER all=m
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 2bdeb94..0c41f85 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -666,39 +666,6 @@ index 205af8d..22436f7 100644
 1.7.6.5
 
 
-diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index 042c1ff..d07c240 100644
---- a/drivers/regulator/core.c
-+++ b/drivers/regulator/core.c
-@@ -1872,7 +1872,14 @@ int regulator_count_voltages(struct regulator *regulator)
- {
- 	struct regulator_dev	*rdev = regulator->rdev;
-
--	return rdev->desc->n_voltages ? : -EINVAL;
-+	if (rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE) {
-+		if (rdev->desc->n_voltages)
-+			return rdev->desc->n_voltages;
-+		else
-+			return -EINVAL;
-+	} else {
-+		return 1;
-+	}
- }
- EXPORT_SYMBOL_GPL(regulator_count_voltages);
-
-diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index c7851c0..6f6534e 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -2923,7 +2923,7 @@ int sdhci_add_host(struct sdhci_host *host)
- 		regulator_enable(host->vmmc);
-
- #ifdef CONFIG_REGULATOR
--	if (host->vmmc) {
-+	if (host->vmmc && regulator_count_voltages(host->vmmc) > 1) {
- 		ret = regulator_is_supported_voltage(host->vmmc, 3300000,
- 			3300000);
- 		if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_330)))
 From 2d32b29a1c2830f7c42caa8258c714acd983961f Mon Sep 17 00:00:00 2001
 From: majianpeng <majianpeng at gmail.com>
 Date: Tue, 29 Jan 2013 13:16:06 +0800
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/9688471d16805164975fd82dfbafb597fcc3a0cc