diff options
| author | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
| commit | 695f5ec02203ef23f127eacb86991d23307f3c6f (patch) | |
| tree | ecb9c29268fa34559dfa06472d991bc5d92708be /drivers/staging/iio/adc/mxs-lradc.c | |
| parent | 5bdeae302496a8ac49848f4fed26b1d87a67d966 (diff) | |
| parent | 793ec5f7dccf95c0d6d5d57a925a13261a7cbd2b (diff) | |
| download | linux-695f5ec02203ef23f127eacb86991d23307f3c6f.tar.bz2 | |
Merge branch 'n900-modem-support' into n900-dt-with-ssin900-dt-with-ssi
Conflicts:
arch/arm/boot/dts/omap3-n900.dts
Diffstat (limited to 'drivers/staging/iio/adc/mxs-lradc.c')
| -rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index 11fb95201545..dae8d1a9038e 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c @@ -1526,7 +1526,7 @@ static int mxs_lradc_probe(struct platform_device *pdev) struct resource *iores; int ret = 0, touch_ret; int i, s; - unsigned int scale_uv; + uint64_t scale_uv; /* Allocate the IIO device. */ iio = devm_iio_device_alloc(dev, sizeof(*lradc)); |