diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 17:20:06 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 17:20:06 +0400 |
commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /arch/arm/mach-integrator/cpu.c | |
parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
download | linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'arch/arm/mach-integrator/cpu.c')
-rw-r--r-- | arch/arm/mach-integrator/cpu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index 44d4c2e8207b..f77f20255045 100644 --- 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> |