projects
/
cascardo
/
linux.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://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[cascardo/linux.git]
/
arch
/
arm
/
mach-sa1100
/
assabet.c
diff --git
a/arch/arm/mach-sa1100/assabet.c
b/arch/arm/mach-sa1100/assabet.c
index
8443a27
..
7dd894e
100644
(file)
--- a/
arch/arm/mach-sa1100/assabet.c
+++ b/
arch/arm/mach-sa1100/assabet.c
@@
-531,7
+531,7
@@
static void __init get_assabet_scr(void)
}
static void __init
-fixup_assabet(struct tag *tags, char **cmdline
, struct meminfo *mi
)
+fixup_assabet(struct tag *tags, char **cmdline)
{
/* This must be done before any call to machine_has_neponset() */
map_sa1100_gpio_regs();