diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 09:00:20 +0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 09:00:20 +0400 |
commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /arch/arm/plat-s3c64xx/pm.c | |
parent | 805423e84e900e56c834aadee61a020b0d5092c3 (diff) | |
parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
download | linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.tar.xz |
Merge commit 'v2.6.31-rc8' into next
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) * this. */ -#include <plat/regs-gpio.h> - static void s3c64xx_cpu_suspend(void) { unsigned long tmp; |