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

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Browse Source 
Conflicts:
	arch/arm/mach-pxa/tosa.c
This commit is contained in:
Russell King
2011-03-26 10:03:03 +00:00
parent 16c29dafcc 5898eb79fb
commit 938c0ace3f
51 changed files with 515 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,7 +473,7 @@ static struct pxafb_mach_info saar_lcd_info = {
static void __init saar_init_lcd(void)
{
set_pxa_fb_info(&saar_lcd_info);
pxa_set_fb_info(NULL, &saar_lcd_info);
}
#else
static inline void saar_init_lcd(void) {}