Merge branch 'devel-stable' into devel

[deliverable/linux.git] / arch / arm / mach-integrator / cpu.c

diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 1cb222daa06d505579c25cdda97573ada746cb81..a3fbcb3adc2959fbcf6e2437a94ea018b75fa7c7 100644 (file)
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -13,7 +13,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/cpufreq.h>
-#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/init.h>