diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-02-09 22:40:23 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-02-09 22:40:23 +0100 |
| commit | 2f04ffc8dd97e15ce30358c3bf00cf6a0e7dcc19 (patch) | |
| tree | cacd15eaf7e305941e2538a1b443d89ea560e839 | |
| parent | 04697d0e4011a0f2942411acff56f9bc9ca6c11a (diff) | |
| parent | 6299be6a85f3e115ccfbd5786ad8de3b0781cd3e (diff) | |
Merge branch 'gta02-machine-devices-2.6.32' into om-gta02-2.6.32
| -rw-r--r-- | arch/arm/mach-s3c2442/mach-gta02.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 269e03e3117..083b54c9bcf 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -557,8 +557,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | - REGULATOR_CHANGE_VOLTAGE, - .always_on = 1, + REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = ARRAY_SIZE(hcldo_consumers), .consumer_supplies = hcldo_consumers, |