]> Gentwo Git Trees - linux/.git/commit
gentwo / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5fae405) | patch
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)
commit459f2a32024b46b7f144999738112eb88654eb0f
tree45a994bfaab92fe660c3ab3b3c178666944c24dbtree | snapshot
parent5fae405838527c136a920eb7b9a2edfc5d2b6198commit | diff
ARM: S5PC100: Fixup cross tree merge problems

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 diff | blob | blame | history
Development tree.