[kernel] r19644 - in dists/trunk/linux/debian: . config patches patches/debian

[Ben Hutchings]

Author: benh
Date: Sun Dec 23 23:58:46 2012
New Revision: 19644

Log:
drm: Enable DRM_UDL as module

Disable autoloading as it is incompatible with older versions of xserver-xorg-video-displaylink

Added:
   dists/trunk/linux/debian/patches/debian/udl-disable-autoload.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Dec 23 23:42:13 2012	(r19643)
+++ dists/trunk/linux/debian/changelog	Sun Dec 23 23:58:46 2012	(r19644)
@@ -45,6 +45,9 @@
   * wireless/ti: Enable WL18XX as module
   * ptp: Enable clock drivers along with associated net/PHY drivers
   * [!x86] drm: Disable DRM_VMWGFX
+  * drm: Enable DRM_UDL as module
+    - Disable autoloading as it is incompatible with older versions of
+      xserver-xorg-video-displaylink
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Dec 23 23:42:13 2012	(r19643)
+++ dists/trunk/linux/debian/config/config	Sun Dec 23 23:58:46 2012	(r19644)
@@ -411,6 +411,11 @@
 # CONFIG_DRM_RADEON_KMS is not set
 
 ##
+## file: drivers/gpu/drm/udl/Kconfig
+##
+CONFIG_DRM_UDL=m
+
+##
 ## file: drivers/gpu/drm/vmwgfx/Kconfig
 ##
 # CONFIG_DRM_VMWGFX is not set

Added: dists/trunk/linux/debian/patches/debian/udl-disable-autoload.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/debian/udl-disable-autoload.patch	Sun Dec 23 23:58:46 2012	(r19644)
@@ -0,0 +1,20 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: udl: Disable autoload
+Date: Sun, 23 Dec 2012 23:58:16 +0000
+
+This kernel driver is incompatible with older versions of
+xserver-xorg-video-displaylink, so do not autoload it yet.  It will
+have to be loaded either by local configuration or as part of a
+package of a compatible X driver.
+
+--- a/drivers/gpu/drm/udl/udl_drv.c
++++ b/drivers/gpu/drm/udl/udl_drv.c
+@@ -30,7 +30,7 @@ static struct usb_device_id id_table[] =
+ 			USB_DEVICE_ID_MATCH_INT_PROTOCOL,},
+ 	{},
+ };
+-MODULE_DEVICE_TABLE(usb, id_table);
++/*MODULE_DEVICE_TABLE(usb, id_table);*/
+ 
+ MODULE_LICENSE("GPL");
+ 

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Sun Dec 23 23:42:13 2012	(r19643)
+++ dists/trunk/linux/debian/patches/series	Sun Dec 23 23:58:46 2012	(r19644)
@@ -65,3 +65,4 @@
 bugfix/all/ptp-Enable-clock-drivers-along-with-associated-net-P.patch
 bugfix/all/sfc-Select-PTP_1588_CLOCK.patch
 bugfix/all/pch_gbe-ptp_pch-Fix-the-dependency-direction-between.patch
+debian/udl-disable-autoload.patch