summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/ste-dma40-db8500.h
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-01-08 03:27:38 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-01-09 18:05:05 +0100
commitdc6821e0cfe74802aefd2067b40fcdc03fc4599e (patch)
treece7e455e8367090c561b18fff59a5d0fd919a750 /arch/arm/mach-ux500/ste-dma40-db8500.h
parentMerge branch 'master' into x86/memblock (diff)
downloadlinux-dc6821e0cfe74802aefd2067b40fcdc03fc4599e.tar.xz
linux-dc6821e0cfe74802aefd2067b40fcdc03fc4599e.zip
xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
The git commit d4bbf7e7759afc172e2bfbc5c416324590049cdd "Merge branch 'master' into x86/memblock" mismerged the 32-bit section causing: arch/x86/xen/mmu.c: In function ‘xen_setup_kernel_pagetable’: arch/x86/xen/mmu.c:1855: error: expected ‘;’ before ‘)’ token arch/x86/xen/mmu.c:1855: error: expected statement before ‘)’ token Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/arm/mach-ux500/ste-dma40-db8500.h')
0 files changed, 0 insertions, 0 deletions