diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
| commit | be6bfc29bc759670fb3a2519325c4ab2edf259c9 (patch) | |
| tree | e4ffd461d48ecd984b6f250834dcccf099b1f6b9 /drivers/spi | |
| parent | a61674bdfc7c2bf909c4010699607b62b69b7bec (diff) | |
| parent | 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a (diff) | |
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 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-fsl-cpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c index 896add8cfd3b..8f7b26ec181e 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c @@ -16,7 +16,7 @@ * option) any later version. */ #include <asm/cpm.h> -#include <asm/qe.h> +#include <soc/fsl/qe/qe.h> #include <linux/dma-mapping.h> #include <linux/fsl_devices.h> #include <linux/kernel.h> |