Merge branch 'master' into for-linus

This commit is contained in:
Russell King 2010-03-08 20:24:11 +00:00
commit 91e013827c
5 changed files with 34 additions and 33 deletions

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)