diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/include/asm/mach | |
parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/include/asm/mach')
-rw-r--r-- | arch/arm/include/asm/mach/arch.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 2b0efc3104a..bcb0c883e21 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h | |||
@@ -31,10 +31,10 @@ struct machine_desc { | |||
31 | unsigned int video_start; /* start of video RAM */ | 31 | unsigned int video_start; /* start of video RAM */ |
32 | unsigned int video_end; /* end of video RAM */ | 32 | unsigned int video_end; /* end of video RAM */ |
33 | 33 | ||
34 | unsigned int reserve_lp0 :1; /* never has lp0 */ | 34 | unsigned char reserve_lp0 :1; /* never has lp0 */ |
35 | unsigned int reserve_lp1 :1; /* never has lp1 */ | 35 | unsigned char reserve_lp1 :1; /* never has lp1 */ |
36 | unsigned int reserve_lp2 :1; /* never has lp2 */ | 36 | unsigned char reserve_lp2 :1; /* never has lp2 */ |
37 | unsigned int soft_reboot :1; /* soft reboot */ | 37 | char restart_mode; /* default restart mode */ |
38 | void (*fixup)(struct tag *, char **, | 38 | void (*fixup)(struct tag *, char **, |
39 | struct meminfo *); | 39 | struct meminfo *); |
40 | void (*reserve)(void);/* reserve mem blocks */ | 40 | void (*reserve)(void);/* reserve mem blocks */ |
@@ -46,6 +46,7 @@ struct machine_desc { | |||
46 | #ifdef CONFIG_MULTI_IRQ_HANDLER | 46 | #ifdef CONFIG_MULTI_IRQ_HANDLER |
47 | void (*handle_irq)(struct pt_regs *); | 47 | void (*handle_irq)(struct pt_regs *); |
48 | #endif | 48 | #endif |
49 | void (*restart)(char, const char *); | ||
49 | }; | 50 | }; |
50 | 51 | ||
51 | /* | 52 | /* |