diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /arch/arm/plat-s3c64xx/pm.c | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'arch/arm/plat-s3c64xx/pm.c')
| -rw-r--r-- | arch/arm/plat-s3c64xx/pm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c64xx/pm.c b/arch/arm/plat-s3c64xx/pm.c index 07a6516a4f3c..47632fc7eb66 100644 --- a/arch/arm/plat-s3c64xx/pm.c +++ b/arch/arm/plat-s3c64xx/pm.c | |||
| @@ -117,8 +117,6 @@ void s3c_pm_save_core(void) | |||
| 117 | * this. | 117 | * this. |
| 118 | */ | 118 | */ |
| 119 | 119 | ||
| 120 | #include <plat/regs-gpio.h> | ||
| 121 | |||
| 122 | static void s3c64xx_cpu_suspend(void) | 120 | static void s3c64xx_cpu_suspend(void) |
| 123 | { | 121 | { |
| 124 | unsigned long tmp; | 122 | unsigned long tmp; |