diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /arch/powerpc/oprofile/op_model_cell.c | |
| parent | Documentation: update URL to hfsplus Technote 1150 (diff) | |
| parent | Linux 3.14-rc3 (diff) | |
| download | linux-d4263348f796f29546f90802177865dd4379dd0a.tar.xz linux-d4263348f796f29546f90802177865dd4379dd0a.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/powerpc/oprofile/op_model_cell.c')
| -rw-r--r-- | arch/powerpc/oprofile/op_model_cell.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c index b9589c19ccda..1f0ebdeea5f7 100644 --- a/arch/powerpc/oprofile/op_model_cell.c +++ b/arch/powerpc/oprofile/op_model_cell.c @@ -16,7 +16,6 @@ #include <linux/cpufreq.h> #include <linux/delay.h> -#include <linux/init.h> #include <linux/jiffies.h> #include <linux/kthread.h> #include <linux/oprofile.h> |