diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-19 18:41:55 +0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 15:59:28 +0400 |
| commit | 174e7796624d2749359c3fdc673c1232b060d7f6 (patch) | |
| tree | b72c821e4c7aa32765fe0509d0ccd00c9c2b68d1 /arch/arm/mach-ux500/include/mach/uncompress.h | |
| parent | e5a1f68203e4dab8fdbb4c7d20977e6a5dbc7a49 (diff) | |
| download | linux-174e7796624d2749359c3fdc673c1232b060d7f6.tar.xz | |
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/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/uncompress.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index 36969d52e53a..533a00432950 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h @@ -22,7 +22,8 @@ #include <asm/mach-types.h> #include <linux/io.h> #include <linux/amba/serial.h> -#include <mach/hardware.h> +/* TODO: This goes away in multiplatform boot, this file gets deleted */ +#include "../../db8500-regs.h" void __iomem *ux500_uart_base; |