diff -u gdm-2.30.2.is.2.30.0/debian/gdm.upstart gdm-2.30.2.is.2.30.0/debian/gdm.upstart
--- gdm-2.30.2.is.2.30.0/debian/gdm.upstart
+++ gdm-2.30.2.is.2.30.0/debian/gdm.upstart
@@ -8,8 +8,7 @@
 
 start on (filesystem
           and started dbus
-          and (graphics-device-added fb0 PRIMARY_DEVICE_FOR_DISPLAY=1
-               or drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
+          and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
                or stopped udevtrigger))
 stop on runlevel [016]
 
diff -u gdm-2.30.2.is.2.30.0/debian/changelog gdm-2.30.2.is.2.30.0/debian/changelog
--- gdm-2.30.2.is.2.30.0/debian/changelog
+++ gdm-2.30.2.is.2.30.0/debian/changelog
@@ -1,3 +1,11 @@
+gdm (2.30.2.is.2.30.0-0ubuntu4) lucid-proposed; urgency=low
+
+  * debian/gdm.upstart: Do not already fire on a framebuffer device. When a
+    real DRM driver gets loaded later on, X will be started too early to catch
+    it. Cherrypicked from packaging trunk r275. (LP: #615549)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 20 Sep 2010 11:03:09 +0200
+
 gdm (2.30.2.is.2.30.0-0ubuntu3) lucid-proposed; urgency=low
 
   * debian/patches/95_git_name_escaping.patch: