Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd989db8 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Jesper Nilsson
Browse files

cris: Fix conflicting types for _etext, _edata, _end 



Include asm/sections.h header which contains the correct
types for _etext, _edata and _end - char arrays.

Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent bebc6082

arch/cris/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/of_fdt.h>

#include <linux/of_fdt.h>

#include <asm/setup.h>

#include <asm/setup.h>

#include <arch/system.h>

#include <arch/system.h>

#include <asm/sections.h>





/*

/*

 * Setup options

 * Setup options
@@ -31,7 +32,6 @@ 
struct screen_info screen_info;

struct screen_info screen_info;





extern int root_mountflags;

extern int root_mountflags;

extern char _etext, _edata, _end;





char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };

char __initdata cris_command_line[COMMAND_LINE_SIZE] = { 0, };