o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 14 insertions, 12 deletions

diff --git a/include/asm-arm/procinfo.h b/include/asm-arm/procinfo.h
index 0d8811624..a89b7509f 100644
--- a/include/asm-arm/procinfo.h
+++ b/include/asm-arm/procinfo.h
@@ -9,23 +9,25 @@
 
 #include <asm/proc-fns.h>
 
-#define F_MEMC   (1<<0)
-#define F_MMU    (1<<1)
-#define F_32BIT  (1<<2)
-#define F_CACHE  (1<<3)
-#define F_IOEB   (1<<31)
-
 #ifndef __ASSEMBLER__
 
+#define HWCAP_SWP	(1 << 0)
+#define HWCAP_HALF	(1 << 1)
+
 struct armversions {
-	unsigned long id;
-	unsigned long mask;
-	unsigned long features;
-	const char *manu;
-	const char *name;
-	const struct processor *proc;
+	const unsigned long id;		/* Processor ID			*/
+	const unsigned long mask;	/* Processor ID mask		*/
+	const char *manu;		/* Manufacturer			*/
+	const char *name;		/* Processor name		*/
+	const char *arch_vsn;		/* Architecture version		*/
+	const char *elf_vsn;		/* ELF library version		*/
+	const int hwcap;		/* ELF HWCAP			*/
+	const struct processor *proc;	/* Processor-specific ASM	*/
 };
 
+extern const struct armversions armidlist[];
+extern int armidindex;
+
 #endif
 
 #endif