Merge branch 'regulator-register' into regulator-drivers

This commit is contained in:
Mark Brown
2012-04-09 12:30:21 +01:00
förälder f604c10cde 09de3473c7
incheckning 1474e4dbca
16 ändrade filer med 19 tillägg och 17 borttagningar

Visa fil

@@ -112,7 +112,7 @@ static struct regulator_ops isl_fixed_ops = {
.list_voltage = isl6271a_list_fixed_voltage,
};
static struct regulator_desc isl_rd[] = {
static const struct regulator_desc isl_rd[] = {
{
.name = "Core Buck",
.id = 0,