1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
index 994fd6ec373b..71ed2dadae61 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
@@ -51,10 +51,11 @@ struct nouveau_drm_tile {
 };
 
 enum nouveau_drm_handle {
-        NVDRM_CLIENT = 0xffffffff,
-        NVDRM_DEVICE = 0xdddddddd,
-        NVDRM_PUSH   = 0xbbbb0000, /* |= client chid */
-        NVDRM_CHAN   = 0xcccc0000, /* |= client chid */
+        NVDRM_CLIENT  = 0xffffffff,
+        NVDRM_DEVICE  = 0xdddddddd,
+        NVDRM_CONTROL = 0xdddddddc,
+        NVDRM_PUSH    = 0xbbbb0000, /* |= client chid */
+        NVDRM_CHAN    = 0xcccc0000, /* |= client chid */
 };
 
 struct nouveau_cli {
@@ -127,10 +128,10 @@ struct nouveau_drm {
         struct nvbios vbios;
         struct nouveau_display *display;
         struct backlight_device *backlight;
-        struct nouveau_eventh vblank[4];
 
         /* power management */
-        struct nouveau_pm *pm;
+        struct nouveau_hwmon *hwmon;
+        struct nouveau_sysfs *sysfs;
 
         /* display power reference */
         bool have_disp_power_ref;
@@ -154,7 +155,6 @@ nouveau_dev(struct drm_device *dev)
 int nouveau_pmops_suspend(struct device *);
 int nouveau_pmops_resume(struct device *);
 
-#define NV_SUSPEND(cli, fmt, args...) nv_suspend((cli), fmt, ##args)
 #define NV_FATAL(cli, fmt, args...) nv_fatal((cli), fmt, ##args)
 #define NV_ERROR(cli, fmt, args...) nv_error((cli), fmt, ##args)
 #define NV_WARN(cli, fmt, args...) nv_warn((cli), fmt, ##args)