diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/arm/common/scoop.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 688a595598c8..d3a04c2a2c85 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
| @@ -91,7 +91,7 @@ EXPORT_SYMBOL(read_scoop_reg); | |||
| 91 | EXPORT_SYMBOL(write_scoop_reg); | 91 | EXPORT_SYMBOL(write_scoop_reg); |
| 92 | 92 | ||
| 93 | #ifdef CONFIG_PM | 93 | #ifdef CONFIG_PM |
| 94 | static int scoop_suspend(struct device *dev, uint32_t state, uint32_t level) | 94 | static int scoop_suspend(struct device *dev, pm_message_t state, uint32_t level) |
| 95 | { | 95 | { |
| 96 | if (level == SUSPEND_POWER_DOWN) { | 96 | if (level == SUSPEND_POWER_DOWN) { |
| 97 | struct scoop_dev *sdev = dev_get_drvdata(dev); | 97 | struct scoop_dev *sdev = dev_get_drvdata(dev); |