diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
| commit | fece13ca005a5f559147e9424321f4b5e01272b4 (patch) | |
| tree | 54e762e70afb664d14152e6bcf89a48be3fb9c13 /drivers/gpu/drm/nouveau/nouveau_sysfs.c | |
| parent | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (diff) | |
| parent | f5af19d10d151c5a2afae3306578f485c244db25 (diff) | |
| download | linux-fece13ca005a5f559147e9424321f4b5e01272b4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_sysfs.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sysfs.c b/drivers/gpu/drm/nouveau/nouveau_sysfs.c index 8fbbf30..1ec8f38 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sysfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_sysfs.c @@ -165,7 +165,7 @@ nouveau_sysfs_fini(struct drm_device *dev) struct nvif_device *device = &drm->device; if (sysfs && sysfs->ctrl.priv) { - device_remove_file(nv_device_base(nvkm_device(device)), &dev_attr_pstate); + device_remove_file(nv_device_base(nvxx_device(device)), &dev_attr_pstate); nvif_object_fini(&sysfs->ctrl); } @@ -192,7 +192,7 @@ nouveau_sysfs_init(struct drm_device *dev) NVIF_IOCTL_NEW_V0_CONTROL, NULL, 0, &sysfs->ctrl); if (ret == 0) - device_create_file(nv_device_base(nvkm_device(device)), &dev_attr_pstate); + device_create_file(nv_device_base(nvxx_device(device)), &dev_attr_pstate); return 0; } |