[Gc-linux-cvs] linux/include/asm-ppc io.h,1.12,1.13

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/include/asm-ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/include/asm-ppc

Modified Files:
	io.h 
Log Message:
2.6.16 merged.


Index: io.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- io.h	18 Jan 2006 23:41:53 -0000	1.12
+++ io.h	24 Mar 2006 21:45:19 -0000	1.13
@@ -27,6 +27,8 @@
 
 #if defined(CONFIG_4xx)
 #include <asm/ibm4xx.h>
+#elif defined(CONFIG_PPC_MPC52xx)
+#include <asm/mpc52xx.h>
 #elif defined(CONFIG_8xx)
 #include <asm/mpc8xx.h>
 #elif defined(CONFIG_8260)