Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge remote-tracking branches 'regulator/topic/da9053' and 'regulator/topic/da9063' into regulator-next

+2 -1
+1
drivers/regulator/da9052-regulator.c
··· 381 381 case DA9053_AA: 382 382 case DA9053_BA: 383 383 case DA9053_BB: 384 + case DA9053_BC: 384 385 for (i = 0; i < ARRAY_SIZE(da9053_regulator_info); i++) { 385 386 info = &da9053_regulator_info[i]; 386 387 if (info->reg_desc.id == id)
+1 -1
drivers/regulator/da9063-regulator.c
··· 698 698 rdata->initdata = da9063_matches[i].init_data; 699 699 700 700 n++; 701 - }; 701 + } 702 702 703 703 *da9063_reg_matches = da9063_matches; 704 704 return pdata;