diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-19 10:41:55 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 07:59:28 -0400 |
commit | 174e7796624d2749359c3fdc673c1232b060d7f6 (patch) | |
tree | b72c821e4c7aa32765fe0509d0ccd00c9c2b68d1 /arch/arm/mach-ux500/devices-db8500.c | |
parent | e5a1f68203e4dab8fdbb4c7d20977e6a5dbc7a49 (diff) |
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 'arch/arm/mach-ux500/devices-db8500.c')
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index df4d7de0fd9f..4c0ef1419400 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c | |||
@@ -15,10 +15,10 @@ | |||
15 | #include <linux/platform_data/dma-ste-dma40.h> | 15 | #include <linux/platform_data/dma-ste-dma40.h> |
16 | #include <linux/mfd/dbx500-prcmu.h> | 16 | #include <linux/mfd/dbx500-prcmu.h> |
17 | 17 | ||
18 | #include <mach/hardware.h> | ||
19 | #include <mach/setup.h> | 18 | #include <mach/setup.h> |
20 | #include <mach/irqs.h> | 19 | #include <mach/irqs.h> |
21 | 20 | ||
21 | #include "db8500-regs.h" | ||
22 | #include "devices-db8500.h" | 22 | #include "devices-db8500.h" |
23 | #include "ste-dma40-db8500.h" | 23 | #include "ste-dma40-db8500.h" |
24 | 24 | ||