summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/irq.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-19 15:13:45 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-19 15:13:45 -0400
commit23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (patch)
tree3e690e564ac42444937b0d66b624c0e292d4a88a /arch/arm/mach-s3c2410/irq.h
parent8624a1c93772d24a38ed10cfcd290e8a18ac5b0a (diff)
parent47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff)
downloadop-kernel-dev-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.zip
op-kernel-dev-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/mach-s3c2410/irq.h')
-rw-r--r--arch/arm/mach-s3c2410/irq.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/irq.h b/arch/arm/mach-s3c2410/irq.h
index f7cc4c9..842a9f4 100644
--- a/arch/arm/mach-s3c2410/irq.h
+++ b/arch/arm/mach-s3c2410/irq.h
@@ -100,5 +100,10 @@ s3c_irqsub_ack(unsigned int irqno, unsigned int parentmask, unsigned int group)
/* exported for use in arch/arm/mach-s3c2410 */
+#ifdef CONFIG_PM
extern int s3c_irq_wake(unsigned int irqno, unsigned int state);
+#else
+#define s3c_irq_wake NULL
+#endif
+
extern int s3c_irqext_type(unsigned int irq, unsigned int type);
OpenPOWER on IntegriCloud