firmware/memmap: avoid type conflicts with the generic memmap_init()
PATCH 1/1 firmware/memmap: avoid type conflicts with the generic memmap_init()
This will fix 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
CC Bernhard Walle <[email protected]>
Signed-off-by Fengguang Wu <[email protected]>
--- drivers/firmware/memmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/memmap.c +2 -2
@@ -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 ; } -late_initcall (memmap_init); +late_initcall (firmware_memmap_init);
Signature · 7 lines
1.7.10 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>