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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:
	drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
This commit is contained in:
David Woodhouse
2010-03-26 14:55:59 +00:00
parent 395b228858 220bf991b0
commit 329f9052db
8065 changed files with 531259 additions and 229930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/maps/pismo.c
View File

@@ -118,7 +118,7 @@ static int __devinit pismo_add_device(struct pismo_data *pismo, int i,
{
struct platform_device *dev;
struct resource res = { };
phys_addr_t base = region.base;
phys_addr_t base = region->base;
int ret;
if (base == ~0)