diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
| commit | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (patch) | |
| tree | d0abb5c923a7a3eca2d4b2c3e1964bf484870909 /arch/arm/common/locomo.c | |
| parent | 165415f700b0c77fa1f8db6198f48582639adf78 (diff) | |
| parent | 87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/arm/common/locomo.c')
| -rw-r--r-- | arch/arm/common/locomo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 2786f7c34b3f..a7bd85700152 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
| @@ -551,7 +551,7 @@ struct locomo_save_data { | |||
| 551 | u16 LCM_SPIMD; | 551 | u16 LCM_SPIMD; |
| 552 | }; | 552 | }; |
| 553 | 553 | ||
| 554 | static int locomo_suspend(struct device *dev, u32 pm_message_t, u32 level) | 554 | static int locomo_suspend(struct device *dev, pm_message_t state, u32 level) |
| 555 | { | 555 | { |
| 556 | struct locomo *lchip = dev_get_drvdata(dev); | 556 | struct locomo *lchip = dev_get_drvdata(dev); |
| 557 | struct locomo_save_data *save; | 557 | struct locomo_save_data *save; |