Commit bac71696 authored by Fengguang Wu's avatar Fengguang Wu Committed by Linus Torvalds

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: default avatarFengguang Wu <>
Cc: Bernhard Walle <>
Cc: Glauber Costa <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent bbc2e3ef
......@@ -237,7 +237,7 @@ static ssize_t memmap_attr_show(struct kobject *kobj,
* firmware_map_add() or firmware_map_add_early() afterwards, the entries
* are not added to sysfs.
static int __init memmap_init(void)
static int __init firmware_memmap_init(void)
struct firmware_map_entry *entry;
......@@ -246,5 +246,5 @@ static int __init memmap_init(void)
return 0;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment