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

Merge branch 'mxs/saif' into next/drivers

Browse Source 
Conflicts:
	drivers/net/ethernet/cadence/Kconfig
This commit is contained in:
Arnd Bergmann
2011-12-06 14:23:35 +00:00
parent 58a273745f b07fed455c
commit 3642a0a2c7
682 changed files with 7078 additions and 5081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mmp/gplugd.c
View File

@@ -182,7 +182,7 @@ static void __init gplugd_init(void)
/* on-chip devices */
pxa168_add_uart(3);
pxa168_add_ssp(0);
pxa168_add_ssp(1);
pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));
platform_device_register(&pxa168_device_gpio);