summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s5p/pm.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-04-21 13:39:21 +0400
committerIngo Molnar <mingo@elte.hu>2011-04-21 13:39:28 +0400
commit42ac9e87fdd89b77fa2ca0a5226023c1c2d83226 (patch)
treedfdb1b720347a40f24a89a3e9c2727ae26ad5f01 /arch/arm/plat-s5p/pm.c
parent057f3fadb347e9c51b07e1b277bbdda79f976768 (diff)
parentf0e615c3cb72b42191b558c130409335812621d8 (diff)
downloadlinux-42ac9e87fdd89b77fa2ca0a5226023c1c2d83226.tar.xz
Merge commit 'v2.6.39-rc4' into sched/core
Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-s5p/pm.c')
-rw-r--r--arch/arm/plat-s5p/pm.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/plat-s5p/pm.c b/arch/arm/plat-s5p/pm.c
index d592b6304b48..d15dc47b0e3d 100644
--- a/arch/arm/plat-s5p/pm.c
+++ b/arch/arm/plat-s5p/pm.c
@@ -19,17 +19,6 @@
#define PFX "s5p pm: "
-/* s3c_pm_check_resume_pin
- *
- * check to see if the pin is configured correctly for sleep mode, and
- * make any necessary adjustments if it is not
-*/
-
-static void s3c_pm_check_resume_pin(unsigned int pin, unsigned int irqoffs)
-{
- /* nothing here yet */
-}
-
/* s3c_pm_configure_extint
*
* configure all external interrupt pins