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://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
netwinder-hw.c
diff --git
a/arch/arm/mach-footbridge/netwinder-hw.c
b/arch/arm/mach-footbridge/netwinder-hw.c
index
06e514f
..
4cbc2e6
100644
(file)
--- a/
arch/arm/mach-footbridge/netwinder-hw.c
+++ b/
arch/arm/mach-footbridge/netwinder-hw.c
@@
-631,8
+631,7
@@
__initcall(nw_hw_init);
* the parameter page.
*/
static void __init
* the parameter page.
*/
static void __init
-fixup_netwinder(struct machine_desc *desc, struct tag *tags,
- char **cmdline, struct meminfo *mi)
+fixup_netwinder(struct tag *tags, char **cmdline, struct meminfo *mi)
{
#ifdef CONFIG_ISAPNP
extern int isapnp_disable;
{
#ifdef CONFIG_ISAPNP
extern int isapnp_disable;