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

Merge branch 'origin' into devel-stable

Browse Source 
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
This commit is contained in:
Russell King
2010-03-08 20:21:04 +00:00
parent 004c1c7096 25cf84cf37
commit 988addf82e
6361 changed files with 410081 additions and 173547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/pxa27x.c
View File

@@ -411,7 +411,7 @@ static int __init pxa27x_init(void)
reset_status = RCSR;
clks_register(pxa27x_clkregs, ARRAY_SIZE(pxa27x_clkregs));
clkdev_add_table(pxa27x_clkregs, ARRAY_SIZE(pxa27x_clkregs));
if ((ret = pxa_init_dma(IRQ_DMA, 32)))
return ret;