diff options
| author | Scott Wood | 2015-10-28 00:14:16 +0100 |
|---|---|---|
| committer | Scott Wood | 2015-10-28 00:14:16 +0100 |
| commit | 43f2cfcce26e2d67a3689d40777885a98447c586 (patch) | |
| tree | d6f7fe00e9c9343b6209e2842c7911ee6eb5f0ce /arch/powerpc/platforms/86xx | |
| parent | powerpc: handle error case in cpm_muram_alloc() (diff) | |
| parent | clk: qoriq: Add ls1043a support. (diff) | |
| download | kernel-qcow2-linux-43f2cfcce26e2d67a3689d40777885a98447c586.tar.gz kernel-qcow2-linux-43f2cfcce26e2d67a3689d40777885a98447c586.tar.xz kernel-qcow2-linux-43f2cfcce26e2d67a3689d40777885a98447c586.zip | |
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/86xx')
| -rw-r--r-- | arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c index 55413a547ea8..437a9c372ae1 100644 --- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c +++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c @@ -24,6 +24,7 @@ #include <linux/delay.h> #include <linux/seq_file.h> #include <linux/of.h> +#include <linux/fsl/guts.h> #include <asm/time.h> #include <asm/machdep.h> @@ -38,7 +39,6 @@ #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> #include <sysdev/simple_gpio.h> -#include <asm/fsl_guts.h> #include "mpc86xx.h" |