diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-05-24 11:46:02 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:56:13 +0200 |
| commit | 19820f64d42cfa0f731c2be782bcfa5f81048e3a (patch) | |
| tree | 1faa0154731c36905d08d6d93d0319166331ba50 /drivers/input | |
| parent | cad4e6f1f3dcb98f3dae967a2ab1cb81e9e5a55c (diff) | |
input: touchscreen: bu21013_ts: Fix ifdefs
ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: -
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I9f0cd7ddb731b11f107a794f9afc53bfabf6a45e
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23700
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/bu21013_ts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c index de460a41d03..ae6c0e82af2 100644 --- a/drivers/input/touchscreen/bu21013_ts.c +++ b/drivers/input/touchscreen/bu21013_ts.c @@ -825,7 +825,8 @@ static int __devexit bu21013_remove(struct i2c_client *client) return 0; } -#if !defined(CONFIG_HAS_EARLYSUSPEND) && defined(CONFIG_PM) +#ifndef CONFIG_HAS_EARLYSUSPEND +#ifdef CONFIG_PM /** * bu21013_suspend() - suspend the touch screen controller * @dev: pointer to device structure @@ -860,7 +861,7 @@ static const struct dev_pm_ops bu21013_dev_pm_ops = { .suspend = bu21013_suspend, .resume = bu21013_resume, }; - +#endif #else static void bu21013_ts_early_suspend(struct early_suspend *data) { |