From: Fengguang Wu <fengguang.wu@intel.com>
Date: Fri, 19 Oct 2012 20:56:55 +0000 (-0700)
Subject: firmware/memmap: avoid type conflicts with the generic memmap_init()
X-Git-Tag: v3.7-rc2~10^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac716966094e39c8027428993a57b79f2dd6c97;p=pandora-kernel.git

firmware/memmap: avoid type conflicts with the generic memmap_init()

Fix this build error:

  drivers/firmware/memmap.c:240:19: error: conflicting types for 'memmap_init'
  arch/ia64/include/asm/pgtable.h:565:17: note: previous declaration of 'memmap_init' was here

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Bernhard Walle <bwalle@suse.de>
Cc: Glauber Costa <glommer@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed