diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-19 15:41:55 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 13:59:28 +0200 |
| commit | 174e7796624d2749359c3fdc673c1232b060d7f6 (patch) | |
| tree | b72c821e4c7aa32765fe0509d0ccd00c9c2b68d1 /sound/soc/ux500 | |
| parent | e5a1f68203e4dab8fdbb4c7d20977e6a5dbc7a49 (diff) | |
| download | op-kernel-dev-174e7796624d2749359c3fdc673c1232b060d7f6.zip op-kernel-dev-174e7796624d2749359c3fdc673c1232b060d7f6.tar.gz | |
ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
This removes <mach/hardware.h> and <mach/db8500-regs.h>
from the Ux500, merging them into the local include
"db8500-regs.h" in mach-ux500. There is some impact
outside the ux500 machine, but most of it is dealt with
in earlier patches.
Contains portions of a clean-up patch from Arnd Bergmann.
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'sound/soc/ux500')
| -rw-r--r-- | sound/soc/ux500/mop500_ab8500.c | 2 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 2 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 78cce23..892ad9a 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -17,8 +17,6 @@ #include <linux/io.h> #include <linux/clk.h> -#include <mach/hardware.h> - #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/pcm.h> diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 0d9713e..54028cf 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -21,8 +21,6 @@ #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/asoc-ux500-msp.h> -#include <mach/hardware.h> - #include <sound/soc.h> #include <sound/soc-dai.h> diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index a582007..f2db6c9 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -22,8 +22,6 @@ #include <linux/of.h> #include <linux/platform_data/asoc-ux500-msp.h> -#include <mach/hardware.h> - #include <sound/soc.h> #include "ux500_msp_i2s.h" |
