summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-12-12 00:24:13 +0000
committerBen Dooks <ben-linux@fluff.org>2009-03-08 12:35:42 +0000
commit598ee00207a561572e011c49e39144a321ef3979 (patch)
tree1c02808c5044c18290b8088763669942d266d8b1
parent56b34426888d35b3b6367c216bbfb17b82b4f0ac (diff)
downloadlinux-stable-598ee00207a561572e011c49e39144a321ef3979.tar.gz
linux-stable-598ee00207a561572e011c49e39144a321ef3979.tar.bz2
linux-stable-598ee00207a561572e011c49e39144a321ef3979.zip
[ARM] S3C24XX: Fix bug in IRQ_EINT_BIT() calculation
There's a bug in calculation of IRQ_EINT_BIT introduced on the test branch for pm changes for s3c by Ben Dooks fixed in this patch. There's also a bit of a mystery about how wake gets to wake EINT set of interrupts, I added a couple of lines that make it work for EINT4+ but not sure what's meant to be there for EINT0-3. Still, this gets GTA02 resume working again. Signed-off-by: Andy Green <andy@openmoko.com> [ben-linux@fluff.org: remove irq-pm.c change] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/mach-s3c2410/include/mach/irqs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/irqs.h b/arch/arm/mach-s3c2410/include/mach/irqs.h
index 0cd89b735771..2a2384ffa7b1 100644
--- a/arch/arm/mach-s3c2410/include/mach/irqs.h
+++ b/arch/arm/mach-s3c2410/include/mach/irqs.h
@@ -80,7 +80,7 @@
#define IRQ_EINT22 S3C2410_IRQ(50)
#define IRQ_EINT23 S3C2410_IRQ(51)
-#define IRQ_EINT_BIT(x) ((x) - (IRQ_EINT4 + 4))
+#define IRQ_EINT_BIT(x) ((x) - IRQ_EINT4 + 4)
#define IRQ_EINT(x) (((x) >= 4) ? (IRQ_EINT4 + (x) - 4) : (IRQ_EINT0 + (x)))
#define IRQ_LCD_FIFO S3C2410_IRQ(52)