diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /arch/arm/mach-s3c2410/irq.h | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'arch/arm/mach-s3c2410/irq.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/irq.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/irq.h b/arch/arm/mach-s3c2410/irq.h index f7cc4c983de5..842a9f42c97b 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) | |||
| 100 | 100 | ||
| 101 | /* exported for use in arch/arm/mach-s3c2410 */ | 101 | /* exported for use in arch/arm/mach-s3c2410 */ |
| 102 | 102 | ||
| 103 | #ifdef CONFIG_PM | ||
| 103 | extern int s3c_irq_wake(unsigned int irqno, unsigned int state); | 104 | extern int s3c_irq_wake(unsigned int irqno, unsigned int state); |
| 105 | #else | ||
| 106 | #define s3c_irq_wake NULL | ||
| 107 | #endif | ||
| 108 | |||
| 104 | extern int s3c_irqext_type(unsigned int irq, unsigned int type); | 109 | extern int s3c_irqext_type(unsigned int irq, unsigned int type); |