xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'restart' into for-linus

Browse Source 
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
This commit is contained in:
Russell King
2012-01-05 13:25:15 +00:00
parent 2e0e943436 0575fb754d
commit 7b9dd47136
592 changed files with 3091 additions and 5517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/system.h
View File

@@ -108,7 +108,6 @@ extern void __show_regs(struct pt_regs *);
extern int __pure cpu_architecture(void);
extern void cpu_init(void);
void arm_machine_restart(char mode, const char *cmd);
void soft_restart(unsigned long);
extern void (*arm_pm_restart)(char str, const char *cmd);