diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-18 15:16:23 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-18 15:16:23 -0400 |
| commit | 2a7f487cf26649ab3e9a8d8b366325fedc63c231 (patch) | |
| tree | e0bb1e30c3fda79b5b542c8d62876e8d1caa5b5a /drivers/gpu/drm/drm_info.c | |
| parent | 4fcd294d4a6e156cccd077f24c6a255298df0fd8 (diff) | |
| parent | c54d751aad27da1e9dabdea706dd627379a0a7be (diff) | |
Merge remote-tracking branch 'agreen/for-nicolas' into linaro-2.6.38testing
Diffstat (limited to 'drivers/gpu/drm/drm_info.c')
| -rw-r--r-- | drivers/gpu/drm/drm_info.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index be9a9c07d15..73bf49360c9 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c @@ -54,11 +54,11 @@ int drm_name_info(struct seq_file *m, void *data) if (drm_core_check_feature(dev, DRIVER_USE_PLATFORM_DEVICE)) { if (master->unique) { seq_printf(m, "%s %s %s\n", - dev->driver->platform_device->name, + dev->platformdev->name, dev_name(dev->dev), master->unique); } else { seq_printf(m, "%s\n", - dev->driver->platform_device->name); + dev->platformdev->name); } } else { if (master->unique) { |