| commit | 459f2a32024b46b7f144999738112eb88654eb0f | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Tue May 25 18:19:34 2010 +0900 |
| committer | Ben Dooks <ben-linux@fluff.org> | Wed May 26 19:09:50 2010 +0900 |
| tree | 45a994bfaab92fe660c3ab3b3c178666944c24db | |
| parent | 5fae405838527c136a920eb7b9a2edfc5d2b6198 [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>