Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 218502bf authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'irq/urgent' into irq/core



Reason: Further patches are conflicting with mainline fixes

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 51327ada 6d83f94d
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@
      services.
    </para>
    <para>
      The core of every DRM driver is struct drm_device.  Drivers
      will typically statically initialize a drm_device structure,
      The core of every DRM driver is struct drm_driver.  Drivers
      will typically statically initialize a drm_driver structure,
      then pass it to drm_init() at load time.
    </para>

@@ -84,7 +84,7 @@
    <title>Driver initialization</title>
    <para>
      Before calling the DRM initialization routines, the driver must
      first create and fill out a struct drm_device structure.
      first create and fill out a struct drm_driver structure.
    </para>
    <programlisting>
      static struct drm_driver driver = {
Loading