diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/mtd/maps/physmap_of.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/mtd/maps/physmap_of.c')
| -rw-r--r-- | drivers/mtd/maps/physmap_of.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 5fcfec034a94..fbf0ca939d72 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c | |||
| @@ -183,7 +183,7 @@ static int __devinit of_flash_probe(struct of_device *dev, | |||
| 183 | 183 | ||
| 184 | err = -EBUSY; | 184 | err = -EBUSY; |
| 185 | info->res = request_mem_region(res.start, res.end - res.start + 1, | 185 | info->res = request_mem_region(res.start, res.end - res.start + 1, |
| 186 | dev->dev.bus_id); | 186 | dev_name(&dev->dev)); |
| 187 | if (!info->res) | 187 | if (!info->res) |
| 188 | goto err_out; | 188 | goto err_out; |
| 189 | 189 | ||
| @@ -194,7 +194,7 @@ static int __devinit of_flash_probe(struct of_device *dev, | |||
| 194 | goto err_out; | 194 | goto err_out; |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | info->map.name = dev->dev.bus_id; | 197 | info->map.name = dev_name(&dev->dev); |
| 198 | info->map.phys = res.start; | 198 | info->map.phys = res.start; |
| 199 | info->map.size = res.end - res.start + 1; | 199 | info->map.size = res.end - res.start + 1; |
| 200 | info->map.bankwidth = *width; | 200 | info->map.bankwidth = *width; |