Merge remote-tracking branches 'asoc/topic/imx' and 'asoc/topic/intel' into asoc...

[karo-tx-linux.git] / arch / arm / mach-footbridge / cats-hw.c

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index da04150948566383890b9704eb871ee0dc7108bb..8f05489671b7f315aa763f6cc9124eac2fd263fb 100644 (file)
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -76,7 +76,7 @@ __initcall(cats_hw_init);
  * hard reboots fail on early boards.
  */
 static void __init
-fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi)
+fixup_cats(struct tag *tags, char **cmdline)
 {
 #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
        screen_info.orig_video_lines  = 25;