mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
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 <[email protected]> Cc: Bernhard Walle <[email protected]> Cc: Glauber Costa <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
bbc2e3ef87
commit
bac7169660
1 changed files with 2 additions and 2 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue