Merge tag 'topic/core-stuff-2014-12-19' of git://anongit.freedesktop.org/drm-intel...

[cascardo/linux.git] / include / drm / drmP.h

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index e1b2e8b..a5f6a1f 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -744,8 +744,6 @@ struct drm_device {
 
        /** \name Context support */
        /*@{ */
-       bool irq_enabled;               /**< True if irq handler is enabled */
-       int irq;
 
        __volatile__ long context_flag; /**< Context swapping flag */
        int last_context;               /**< Last current context */
@@ -753,6 +751,8 @@ struct drm_device {
 
        /** \name VBLANK IRQ support */
        /*@{ */
+       bool irq_enabled;
+       int irq;
 
        /*
         * At load time, disabling the vblank interrupt won't be allowed since