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

Merge branch 'v6v7' into devel

Browse Source 
Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/mm/Kconfig
This commit is contained in:
Russell King
2011-03-16 23:35:26 +00:00
parent 1f0090a1ea 3ba6e69ad8
commit bd1274dc00
28 changed files with 191 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/glue-proc.h
View File

@@ -230,7 +230,7 @@
# endif
#endif
#ifdef CONFIG_CPU_V6
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
# ifdef CPU_NAME
# undef MULTI_CPU
# define MULTI_CPU