projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5fae405)
ARM: S5PC100: Fixup cross tree merge problems
authorBen Dooks <ben-linux@fluff.org>
Tue, 25 May 2010 09:19:34 +0000 (18:19 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 26 May 2010 10:09:50 +0000 (19:09 +0900)
The commit 45c79433c02b8fe7b8a1cbf60548a9798d0502ed got things building
but then commit 17d2f877ae8b68b09bf88a9949ee64fbbda5ee10 and others
where merged in from a seperate tree and this has resulted from a build
failure due to the redefinition of IRQ_EINT().

Fix this by merging a new commit.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
arch/arm/mach-s5pc100/include/mach/regs-gpio.h patch | blob | blame | history

diff --git a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h
index 763edebdd577dc2250646d25c4818700a257c3ab..dd6295e1251dbb0161c044fe335fa088c44aa91e 100644 (file)
--- a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h
+++ b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h
@@ -60,12 +60,9 @@
 #define S5PC100EINT30PEND              (S5P_VA_GPIO + 0xF40)
 #define S5P_EINT_PEND(x)               (S5PC100EINT30PEND + ((x) * 0x4))
 
-#define eint_offset(irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0)) : \
-                         (((irq) - S5P_EINT_BASE2)))
+#define EINT_REG_NR(x)                 (EINT_OFFSET(x) >> 3)
 
-#define EINT_REG_NR(x)                 (eint_offset(x) >> 3)
-
-#define eint_irq_to_bit(irq)           (1 << (eint_offset(irq) & 0x7))
+#define eint_irq_to_bit(irq)           (1 << (EINT_OFFSET(irq) & 0x7))
 
 /* values for S5P_EXTINT0 */
 #define S5P_EXTINT_LOWLEV              (0x00)