Unverified Commit 526d02dd authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-4.21' into regulator-5.0

parents bfeffd15 4cac31e2

drivers/regulator/lochnagar-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static const struct of_device_id lochnagar_of_match[] = { 
	},

	{

		.compatible = "cirrus,lochnagar2-mic2vdd",

		.data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD],

		.data = &lochnagar_regulators[LOCHNAGAR_MIC2VDD],

	},

	{

		.compatible = "cirrus,lochnagar2-vddcore",

CRA Git | Maintained and supported by SUSTech CRA and CCSE