diff options
| author | Scott Wood | 2015-10-27 18:14:16 -0500 |
|---|---|---|
| committer | Scott Wood | 2015-10-27 18:14:16 -0500 |
| commit | 43f2cfcce26e2d67a3689d40777885a98447c586 (patch) | |
| tree | d6f7fe00e9c9343b6209e2842c7911ee6eb5f0ce /sound | |
| 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 'sound')
| -rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/p1022_ds.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/p1022_rdk.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 9621b9140df6..6f236f170cf5 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -12,11 +12,11 @@ #include <linux/module.h> #include <linux/interrupt.h> +#include <linux/fsl/guts.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/slab.h> #include <sound/soc.h> -#include <asm/fsl_guts.h> #include "fsl_dma.h" #include "fsl_ssi.h" diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 71c1a7dc3aeb..747aab0602bd 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -11,12 +11,12 @@ */ #include <linux/module.h> +#include <linux/fsl/guts.h> #include <linux/interrupt.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/slab.h> #include <sound/soc.h> -#include <asm/fsl_guts.h> #include "fsl_dma.h" #include "fsl_ssi.h" diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c index ee29048424be..1dd49e5f9675 100644 --- a/sound/soc/fsl/p1022_rdk.c +++ b/sound/soc/fsl/p1022_rdk.c @@ -18,12 +18,12 @@ */ #include <linux/module.h> +#include <linux/fsl/guts.h> #include <linux/interrupt.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/slab.h> #include <sound/soc.h> -#include <asm/fsl_guts.h> #include "fsl_dma.h" #include "fsl_ssi.h" |