diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 07:12:42 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-14 07:12:42 -0500 |
| commit | 0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2 (patch) | |
| tree | c2ab5e6d5ff4def2ffafe2cd61ac14aedb5a86e7 /arch/arm/mach-mx3 | |
| parent | 5b88128fd70dcf0d5d7c0ae7d7849777ff925bde (diff) | |
| parent | b9214b9780d6897a6892e7c8cc903168d6fef097 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/mach-mx31_3ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c index 4e516b49a901..6b4aa2c47107 100644 --- a/arch/arm/mach-mx3/mach-mx31_3ds.c +++ b/arch/arm/mach-mx3/mach-mx31_3ds.c | |||
| @@ -147,10 +147,10 @@ static struct mc13783_regulator_init_data mx31_3ds_regulators[] = { | |||
| 147 | .init_data = &pwgtx_init, | 147 | .init_data = &pwgtx_init, |
| 148 | }, { | 148 | }, { |
| 149 | 149 | ||
| 150 | .id = MC13783_REGU_GPO1, /* Turn on 1.8V */ | 150 | .id = MC13783_REG_GPO1, /* Turn on 1.8V */ |
| 151 | .init_data = &gpo_init, | 151 | .init_data = &gpo_init, |
| 152 | }, { | 152 | }, { |
| 153 | .id = MC13783_REGU_GPO3, /* Turn on 3.3V */ | 153 | .id = MC13783_REG_GPO3, /* Turn on 3.3V */ |
| 154 | .init_data = &gpo_init, | 154 | .init_data = &gpo_init, |
| 155 | }, | 155 | }, |
| 156 | }; | 156 | }; |