git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
include
/
mach
/
setup.h
diff --git
a/arch/arm/mach-ux500/include/mach/setup.h
b/arch/arm/mach-ux500/include/mach/setup.h
index
469877e
..
a7d363f
100644
(file)
--- a/
arch/arm/mach-ux500/include/mach/setup.h
+++ b/
arch/arm/mach-ux500/include/mach/setup.h
@@
-14,7
+14,7
@@
#include <asm/mach/time.h>
#include <linux/init.h>
-
extern
void __init ux500_map_io(void);
+void __init ux500_map_io(void);
extern void __init u5500_map_io(void);
extern void __init u8500_map_io(void);