Merge commit 'v2.6.37' into next

[~andy/linux] / drivers / hwmon / lis3lv02d_spi.c

diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
index 955544b1c71e4d9a05e0c95274ca6525500ba7ae..2549de1de4e2baccadca7ed80d8fc642d65ca781 100644 (file)
--- a/drivers/hwmon/lis3lv02d_spi.c
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -50,7 +50,7 @@ static int lis3_spi_init(struct lis3lv02d *lis3)
        if (ret < 0)
                return ret;
 
-       reg |= CTRL1_PD0;
+       reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen;
        return lis3->write(lis3, CTRL_REG1, reg);
 }