diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/arm/plat-s3c24xx/pm.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/plat-s3c24xx/pm.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index c6b03f8ab260..5692eccdf4d1 100644 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c | |||
| @@ -555,7 +555,7 @@ static int s3c2410_pm_enter(suspend_state_t state) | |||
| 555 | __raw_writel(__raw_readl(S3C2410_INTPND), S3C2410_INTPND); | 555 | __raw_writel(__raw_readl(S3C2410_INTPND), S3C2410_INTPND); |
| 556 | __raw_writel(__raw_readl(S3C2410_SRCPND), S3C2410_SRCPND); | 556 | __raw_writel(__raw_readl(S3C2410_SRCPND), S3C2410_SRCPND); |
| 557 | 557 | ||
| 558 | /* call cpu specific preperation */ | 558 | /* call cpu specific preparation */ |
| 559 | 559 | ||
| 560 | pm_cpu_prep(); | 560 | pm_cpu_prep(); |
| 561 | 561 | ||