Skip to content

Commit

Permalink
ARM: S5PC100: Fixup cross tree merge problems
Browse files Browse the repository at this point in the history
The commit 45c7943 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>
  • Loading branch information
Ben Dooks committed May 26, 2010
1 parent 5fae405 commit 459f2a3
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions arch/arm/mach-s5pc100/include/mach/regs-gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 459f2a3

Please sign in to comment.