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

into home.osdl.org:/home/torvalds/v2.5/linux

arch/arm/Makefile

@@ -155,10 +155,8 @@ zImage Image bootpImage: vmlinux
 zinstall install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-MRPROPER_FILES	+= \
-	include/asm-arm/arch include/asm-arm/.arch \
-	include/asm-arm/constants.h* \
-	include/asm-arm/mach-types.h
+CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h
+MRPROPER_FILES += include/asm-arm/arch include/asm-arm/.arch
 
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:

arch/arm/mach-sa1100/cpu-sa1100.c

@@ -194,7 +194,7 @@ static int sa1100_target(struct cpufreq_policy *policy,
 		new_ppcr = sa11x0_freq_to_ppcr(target_freq);
 		if ((sa11x0_ppcr_to_freq(new_ppcr) > target_freq) &&
 		    (sa11x0_ppcr_to_freq(new_ppcr - 1) >= policy->min))
-			mew_ppcr--;
+			new_ppcr--;
 		break;
 	}
 

arch/arm/mach-sa1100/lart.c

@@ -8,6 +8,7 @@
 
 #include <asm/hardware.h>
 #include <asm/setup.h>
+#include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>

drivers/mtd/devices/lart.c

@@ -42,6 +42,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/types.h>
+#include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
 #ifdef HAVE_PARTITIONS