Merge tag 'mtd/for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

[linux-2.6-microblaze.git] / include / drm / drm_device.h

diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
index f588f96..604b1d1 100644 (file)
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
@@ -191,20 +191,6 @@ struct drm_device {
         */
        struct list_head clientlist;
 
-       /**
-        * @irq_enabled:
-        *
-        * Indicates that interrupt handling is enabled, specifically vblank
-        * handling. Drivers which don't use drm_irq_install() need to set this
-        * to true manually.
-        */
-       bool irq_enabled;
-
-       /**
-        * @irq: Used by the drm_irq_install() and drm_irq_unistall() helpers.
-        */
-       int irq;
-
        /**
         * @vblank_disable_immediate:
         *
@@ -372,6 +358,10 @@ struct drm_device {
 
        /* Scatter gather memory */
        struct drm_sg_mem *sg;
+
+       /* IRQs */
+       bool irq_enabled;
+       int irq;
 #endif
 };