From: Ben Dooks Date: Tue, 25 May 2010 09:19:34 +0000 (+0900) Subject: ARM: S5PC100: Fixup cross tree merge problems X-Git-Tag: v2.6.35-rc1~40^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=459f2a32024b46b7f144999738112eb88654eb0f;p=pandora-kernel.git 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 --- Reading git-diff-tree failed