Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regmap

[pandora-kernel.git] / arch / arm / mach-pxa / poodle.c

diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index a113ea9..948ce3e 100644 (file)
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -454,8 +454,8 @@ static void __init poodle_init(void)
        poodle_init_spi();
 }
 
-static void __init fixup_poodle(struct machine_desc *desc,
-               struct tag *tags, char **cmdline, struct meminfo *mi)
+static void __init fixup_poodle(struct tag *tags, char **cmdline,
+                               struct meminfo *mi)
 {
        sharpsl_save_param();
        mi->nr_banks=1;