]> asedeno.scripts.mit.edu Git - linux.git/blobdiff - drivers/regulator/pcf50633-regulator.c
Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'
[linux.git] / drivers / regulator / pcf50633-regulator.c
index d7da1c15a6da447d699e080a4bfda259f734c5f0..762e18447cae06601c8658b974e23c62851996e7 100644 (file)
@@ -41,7 +41,7 @@
                .enable_mask = PCF50633_REGULATOR_ON,           \
        }
 
-static struct regulator_ops pcf50633_regulator_ops = {
+static const struct regulator_ops pcf50633_regulator_ops = {
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .list_voltage = regulator_list_voltage_linear,
@@ -105,7 +105,7 @@ static int pcf50633_regulator_probe(struct platform_device *pdev)
 
 static struct platform_driver pcf50633_regulator_driver = {
        .driver = {
-               .name = "pcf50633-regltr",
+               .name = "pcf50633-regulator",
        },
        .probe = pcf50633_regulator_probe,
 };