lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge nommu tree

Browse Source 
Fix merge conflict in arch/arm/mm/proc-xscale.S

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2006-03-25 22:08:55 +00:00
committed by Russell King
parent 3ee357f0f3 c76b6b41d0
commit 0003cedfc5
25 changed files with 189 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mm/proc-arm922.S
View File

@ -29,6 +29,7 @@
#include <linux/config.h>
#include <linux/init.h>
#include <asm/assembler.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
#include <asm/procinfo.h>
#include <asm/page.h>