From 619e8f0a5b8d74a2f15c97d1b63f1d95dbd38d1b Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Mon, 9 Apr 2012 21:10:32 -0700 Subject: [PATCH] --- yaml --- r: 299259 b: refs/heads/master c: f441f8a0a180827e3f7bd705aed9cffba62cebc2 h: refs/heads/master i: 299257: c9141da641dd9b9dfb61b73a86e8758d7c2a00f5 299255: 93df76734af0b4a977a4f2dc7e198f8988b3b177 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/mach-nuri.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed8d88feb36d..29c8e02df77d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cd21f6162e7703adc13c5030f316db9ec6bf5cf +refs/heads/master: f441f8a0a180827e3f7bd705aed9cffba62cebc2 diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c index b3982c867c9c..f92ec88b1266 100644 --- a/trunk/arch/arm/mach-exynos/mach-nuri.c +++ b/trunk/arch/arm/mach-exynos/mach-nuri.c @@ -571,7 +571,7 @@ static struct regulator_init_data __initdata max8997_ldo7_data = { static struct regulator_init_data __initdata max8997_ldo8_data = { .constraints = { - .name = "VUSB/VDAC_3.3V_C210", + .name = "VUSB+VDAC_3.3V_C210", .min_uV = 3300000, .max_uV = 3300000, .valid_ops_mask = REGULATOR_CHANGE_STATUS,