summaryrefslogtreecommitdiff
path: root/drivers/hwmon/lis3lv02d_spi.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-18 05:16:55 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-18 05:16:55 +0400
commit4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch)
tree999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/hwmon/lis3lv02d_spi.c
parent492b057c426e4aa747484958e18e9da29003985d (diff)
parent3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff)
downloadlinux-4b337c5f245b6587ba844ac7bb13c313a2912f7b.tar.xz
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/hwmon/lis3lv02d_spi.c')
-rw-r--r--drivers/hwmon/lis3lv02d_spi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
index 07ae74b0e191..3827ff04485f 100644
--- a/drivers/hwmon/lis3lv02d_spi.c
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -72,6 +72,7 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
lis3_dev.write = lis3_spi_write;
lis3_dev.irq = spi->irq;
lis3_dev.ac = lis3lv02d_axis_normal;
+ lis3_dev.pdata = spi->dev.platform_data;
spi_set_drvdata(spi, &lis3_dev);
ret = lis3lv02d_init_device(&lis3_dev);