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

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Browse Source 
Conflicts:
	drivers/net/irda/sh_irda.c
This commit is contained in:
Russell King
2010-08-06 18:13:19 +01:00
parent f165eb77f4 beccb12f6f
commit 500b9fc922
46 changed files with 5618 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/boards/mach-ap325rxa/setup.c
View File

@@ -154,7 +154,7 @@ static struct platform_device nand_flash_device = {
#define PORT_DRVCRA 0xA405018A
#define PORT_DRVCRB 0xA405018C
static void ap320_wvga_power_on(void *board_data)
static void ap320_wvga_power_on(void *board_data, struct fb_info *info)
{
msleep(100);