From 8abcca126e1c627b6a4bb8f160c96ae8a3799e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnim=20L=C3=A4uger?= <arniml@users.sourceforge.net>
Date: Mon, 8 Jun 2009 21:10:18 +0000
Subject: [PATCH] commented manufacturer ARM [ 2778313 ] Failed to detect ARM
 cores.

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1646 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 urjtag/ChangeLog          | 3 +++
 urjtag/data/MANUFACTURERS | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 5ee36535..3f3d170b 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-08  Arnim Laeuger  <arniml>
 
+  * data/MANUFACTURERS: commented manufacturer ARM
+    [ 2778313 ] Failed to detect ARM cores.
+
   * MAINTAINERS: new
 
 2009-06-05  Rutger Hofman <rfhh>
diff --git a/urjtag/data/MANUFACTURERS b/urjtag/data/MANUFACTURERS
index e1f298e9..19970e39 100644
--- a/urjtag/data/MANUFACTURERS
+++ b/urjtag/data/MANUFACTURERS
@@ -48,4 +48,5 @@
 00101110000	brecis		Brecis (PMC-Sierra)
 00111101001	marvell		Marvell
 00110101011	marvell		Marvell
-11110000111	arm  		ARM
+# collides with other ARM-based chips
+#11110000111	arm  		ARM