diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
| commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
| tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/regulator/ab3100.c | |
| parent | ALSA: hda - Avoid codec D3 for keeping mute LED up on Lenovo Yxx0 (diff) | |
| parent | ALSA: hda - Add a fixup for HP Folio 13 mute LED (diff) | |
| download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.zip | |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/regulator/ab3100.c')
| -rw-r--r-- | drivers/regulator/ab3100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c index 77b46d0b37a6..e10febe9ec34 100644 --- a/drivers/regulator/ab3100.c +++ b/drivers/regulator/ab3100.c @@ -498,7 +498,7 @@ static int ab3100_regulator_register(struct platform_device *pdev, struct ab3100_platform_data *plfdata, struct regulator_init_data *init_data, struct device_node *np, - int id) + unsigned long id) { struct regulator_desc *desc; struct ab3100_regulator *reg; @@ -646,7 +646,7 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) err = ab3100_regulator_register( pdev, NULL, ab3100_regulator_matches[i].init_data, ab3100_regulator_matches[i].of_node, - (int) ab3100_regulator_matches[i].driver_data); + (unsigned long)ab3100_regulator_matches[i].driver_data); if (err) { ab3100_regulators_remove(pdev); return err; |