From: Russell King Date: Thu, 17 Nov 2011 17:15:27 +0000 (+0000) Subject: Merge branches 'fixes', 'misc', 'pgt', 'restart-base' and 'restart-cleanup' into... X-Git-Tag: next-20111118~78^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a2b593e51d91692c61fd2e92112b8c2c33ec5d2;p=karo-tx-linux.git Merge branches 'fixes', 'misc', 'pgt', 'restart-base' and 'restart-cleanup' into for-next --- 9a2b593e51d91692c61fd2e92112b8c2c33ec5d2 diff --cc arch/arm/include/asm/mach/arch.h index 2b0efc3104ac,7d19425dd496,217aa1911dd7,6fe6cf0895c9,7d19425dd496..bcb0c883e21e --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h @@@@@@ -31,11 -30,11 -30,12 -30,11 -30,11 +31,11 @@@@@@ struct machine_desc unsigned int video_start; /* start of video RAM */ unsigned int video_end; /* end of video RAM */ --- - unsigned int reserve_lp0 :1; /* never has lp0 */ --- - unsigned int reserve_lp1 :1; /* never has lp1 */ --- - unsigned int reserve_lp2 :1; /* never has lp2 */ --- - unsigned int soft_reboot :1; /* soft reboot */ - void (*fixup)(struct machine_desc *, - struct tag *, char **, +++ + unsigned char reserve_lp0 :1; /* never has lp0 */ +++ + unsigned char reserve_lp1 :1; /* never has lp1 */ +++ + unsigned char reserve_lp2 :1; /* never has lp2 */ +++ + char restart_mode; /* default restart mode */ + void (*fixup)(struct tag *, char **, struct meminfo *); void (*reserve)(void);/* reserve mem blocks */ void (*map_io)(void);/* IO mapping function */