FRV: Fix interaction with new generic header stuff
authorDavid Howells <dhowells@redhat.com>
Sat, 13 Jun 2009 12:23:54 +0000 (13:23 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jun 2009 20:17:28 +0000 (13:17 -0700)
commit5c55b40b27bc3249358dcfc86c0845be409ab7a6
treec5cb355bb469cb55030e312562b405dbfd376184
parentd32f60ed54351ebdea8ae6fbfa0d26e93de29252
FRV: Fix interaction with new generic header stuff

Fix interaction with new generic header stuff as added by:

commit 6103ec56c65c33774c7c38652c8204120c3c7519
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Wed May 13 22:56:27 2009 +0000

    asm-generic: add generic ABI headers

The problem is that asm/signal.h has been made to include asm-generic/signal.h,
but the redundant stuff from asm/signal.h has not been discarded, leading to
multiple redefinitions.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/frv/include/asm/signal.h