From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 23 Jun 2006 09:04:10 +0000 (-0700)
Subject: [PATCH] frv: ieee1394 is borken on frv
X-Git-Tag: v2.6.18-rc1~1081^2~135
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73df4dfdb0e01a1cbf119416a00e520a5e22306;p=linux-2.6

[PATCH] frv: ieee1394 is borken on frv

The ieee1394 assumes it may make direct use of ->count in the semaphore
structure.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Ben Collins <bcollins@ubuntu.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 186737539c..79b81be679 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support"
 
 config IEEE1394
 	tristate "IEEE 1394 (FireWire) support"
-	depends on PCI || BROKEN
+	depends on (PCI || BROKEN) && (BROKEN || !FRV)
 	select NET
 	help
 	  IEEE 1394 describes a high performance serial bus, which is also