mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'master' into for-linus
This commit is contained in:
commit
91e013827c
5 changed files with 34 additions and 33 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue