From: David Howells <dhowells@redhat.com>
Date: Sat, 13 Jun 2009 12:23:54 +0000 (+0100)
Subject: FRV: Fix interaction with new generic header stuff
X-Git-Tag: v2.6.31-rc1~347
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c55b40b27bc3249358dcfc86c0845be409ab7a6;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed