Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux

arch/arm/mach-clps711x/autcpu12.c

@@ -66,6 +66,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12")
 	BOOT_PARAMS(0xc0020000)
 	MAPIO(autcpu12_map_io)
 	INITIRQ(clps711x_init_irq)
-	INITTIME(clp711x_init_time)
+	INITTIME(clps711x_init_time)
 MACHINE_END
 

arch/arm/mach-clps711x/cdb89712.c

@@ -34,7 +34,7 @@
 
 extern void clps711x_init_irq(void);
 extern void clps711x_map_io(void);
-extern void clps711x-init_time(void);
+extern void clps711x_init_time(void);
 
 /*
  * Map the CS89712 Ethernet port.  That should be moved to the

include/asm-arm/arch-versatile/uncompress.h

@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/kernel.h>
-
 #define AMBA_UART_DR	(*(volatile unsigned char *)0x101F1000)
 #define AMBA_UART_LCRH	(*(volatile unsigned char *)0x101F102C)
 #define AMBA_UART_CR	(*(volatile unsigned char *)0x101F1030)