diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-13 22:55:01 (GMT) |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-13 22:55:01 (GMT) |
| commit | be6bfc29bc759670fb3a2519325c4ab2edf259c9 (patch) | |
| tree | e4ffd461d48ecd984b6f250834dcccf099b1f6b9 /arch/powerpc/platforms/85xx/twr_p102x.c | |
| parent | a61674bdfc7c2bf909c4010699607b62b69b7bec (diff) | |
| parent | 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a (diff) | |
| download | linux-be6bfc29bc759670fb3a2519325c4ab2edf259c9.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include moving QE code out of arch/powerpc (to be shared with
arm), device tree updates, and minor fixes."
Diffstat (limited to 'arch/powerpc/platforms/85xx/twr_p102x.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/twr_p102x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 892e613..71bc255 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -22,8 +22,8 @@ #include <asm/pci-bridge.h> #include <asm/udbg.h> #include <asm/mpic.h> -#include <asm/qe.h> -#include <asm/qe_ic.h> +#include <soc/fsl/qe/qe.h> +#include <soc/fsl/qe/qe_ic.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> |