firmware/memmap: avoid type conflicts with the generic memmap_init()
authorFengguang Wu <fengguang.wu@intel.com>
Fri, 19 Oct 2012 20:56:55 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Oct 2012 21:07:47 +0000 (14:07 -0700)
commitbac716966094e39c8027428993a57b79f2dd6c97
tree468a1a1c9ec62272deba7a2213826a1a18f172ff
parentbbc2e3ef87851bc5430b2b4cf4ca3a2f29baeda6
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>
drivers/firmware/memmap.c