diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-10-27 18:14:16 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-10-27 18:14:16 -0500 |
| commit | 43f2cfcce26e2d67a3689d40777885a98447c586 (patch) | |
| tree | d6f7fe00e9c9343b6209e2842c7911ee6eb5f0ce /arch/powerpc/platforms/85xx/smp.c | |
| parent | 9d28cc811bbb43c7ca8dc8be375bab1e0efb037b (diff) | |
| parent | e994412c5f19402a834f4b0d95e9159d1c7b0fb8 (diff) | |
Merge branch 'clock' into HEAD
This is a major overhaul of the clk-qoriq driver, which I'm merging
via PPC with Stephen Boyd's ack in order to apply subsequent PPC patches
that depend on it.
Diffstat (limited to 'arch/powerpc/platforms/85xx/smp.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c index 712764f3dcbc..6b107cea1c08 100644 --- a/arch/powerpc/platforms/85xx/smp.c +++ b/arch/powerpc/platforms/85xx/smp.c @@ -19,6 +19,7 @@ #include <linux/kexec.h> #include <linux/highmem.h> #include <linux/cpu.h> +#include <linux/fsl/guts.h> #include <asm/machdep.h> #include <asm/pgtable.h> @@ -26,7 +27,6 @@ #include <asm/mpic.h> #include <asm/cacheflush.h> #include <asm/dbell.h> -#include <asm/fsl_guts.h> #include <asm/code-patching.h> #include <asm/cputhreads.h> |