diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-30 01:05:48 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-30 01:06:03 +0100 |
| commit | 0b79f2772a0c49266e611a36d55a2d0e2a241929 (patch) | |
| tree | cbb54756a3d47ecba7162741756609ce1a3229d6 /arch/arm/mach-ux500/cpu-db8500.c | |
| parent | Merge tag 'cleanup_for_v3.9_round2' of git://git.infradead.org/users/jcooper/... (diff) | |
| parent | ARM: ux500: de-globalize <mach/id.h> (diff) | |
| download | linux-0b79f2772a0c49266e611a36d55a2d0e2a241929.tar.xz linux-0b79f2772a0c49266e611a36d55a2d0e2a241929.zip | |
Merge tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
From Linus Walleij:
Removal of the <mach/id.h> include from ux500
- First an ACKed MFD patch deleting the only consumer
of these cpu_is* functions outside of mach-ux500
- Introduce a new local cpu_is_u8580() in this patch
set to avoid clashing with other patch sets.
- Finally de-globalize <mach/id.h>.
* tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: de-globalize <mach/id.h>
ARM: ux500: Introduce cpu_is_u8580()
mfd: prcmu: delete pin control helpers
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ux500/cpu-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 218a6b1ada7e..d614d7150dcb 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -36,7 +36,9 @@ #include "devices-db8500.h" #include "ste-dma40-db8500.h" + #include "board-mop500.h" +#include "id.h" /* minimum static i/o mapping required to boot U8500 platforms */ static struct map_desc u8500_uart_io_desc[] __initdata = { |