diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-12-04 12:16:14 +0000 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-12-04 12:16:14 +0000 |
| commit | 1dda56f1cc8698c07308eaf2facb29480fdee3c0 (patch) | |
| tree | 1cc11216f38933a375fc439c14db7febe5e4290b /arch/arm/include/asm/fixmap.h | |
| parent | aca2a2cda8ae17c08fc1c56581c47ed970de41b7 (diff) | |
| parent | 06487ddc8fb020d46bdd9b1d3a931930c0e9b3b6 (diff) | |
Merge branch 'acpi' of git://git.linaro.org/arm/acpi/acpi into leg-kernel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/io.h
arch/arm/kernel/setup.c
arch/arm/mm/early_ioremap.c
arch/arm/mm/mmu.c
arch/arm64/Kconfig
arch/arm64/include/asm/io.h
arch/arm64/kernel/setup.c
arch/arm64/mm/ioremap.c
Diffstat (limited to 'arch/arm/include/asm/fixmap.h')
| -rw-r--r-- | arch/arm/include/asm/fixmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h index 8b2507e517cf..a2a5f50cc509 100644 --- a/arch/arm/include/asm/fixmap.h +++ b/arch/arm/include/asm/fixmap.h @@ -65,4 +65,4 @@ static inline unsigned int virt_to_fix(const unsigned long vaddr) return __virt_to_fix(vaddr); } -#endif +#endif /* _ASM_FIXMAP_H */ |