diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-05-24 11:45:00 +0200 |
|---|---|---|
| committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-17 13:42:02 +0200 |
| commit | 75bd993ba646515c1d083cbb56cd71b7c2c1743d (patch) | |
| tree | 7422beb2e60f2e23aee0822d4f4eb987a7f3c82e /drivers | |
| parent | 1b01081b923876e7a60c95c586ba3dd5fb29dc9b (diff) | |
[ANDROID]: hwmon: lsm303dlh_m: Fix ifdefs
ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: -
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I085ff9f7e54491b6dde56c956dada8ebd6c7d8a1
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23698
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/lsm303dlh_m.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hwmon/lsm303dlh_m.c b/drivers/hwmon/lsm303dlh_m.c index 42ef63157ae..5d35dc2208d 100644 --- a/drivers/hwmon/lsm303dlh_m.c +++ b/drivers/hwmon/lsm303dlh_m.c @@ -177,6 +177,7 @@ static int lsm303dlh_m_write(struct lsm303dlh_m_data *ddata, return ret; } +#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_PM) static int lsm303dlh_m_do_suspend(struct lsm303dlh_m_data *ddata) { int ret; @@ -249,6 +250,7 @@ fail: mutex_unlock(&ddata->lock); return ret; } +#endif static int lsm303dlh_m_read_multi(struct lsm303dlh_m_data *ddata, u8 reg, u8 count, u8 *val, char *msg) @@ -791,7 +793,8 @@ static int __devexit lsm303dlh_m_remove(struct i2c_client *client) return 0; } -#if (!defined(CONFIG_HAS_EARLYSUSPEND) && defined(CONFIG_PM)) +#ifndef CONFIG_HAS_EARLYSUSPEND +#ifdef CONFIG_PM static int lsm303dlh_m_suspend(struct device *dev) { struct lsm303dlh_m_data *ddata; @@ -826,6 +829,7 @@ static const struct dev_pm_ops lsm303dlh_m_dev_pm_ops = { .suspend = lsm303dlh_m_suspend, .resume = lsm303dlh_m_resume, }; +#endif #else static void lsm303dlh_m_early_suspend(struct early_suspend *data) { |