diff --git a/debian/changelog b/debian/changelog index 065ce37c7..71ab6e900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low * 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 Thu, 06 Dec 2012 18:14:33 +0100 diff --git a/debian/config/config b/debian/config/config index 215852350..2b4fd2c59 100644 --- a/debian/config/config +++ b/debian/config/config @@ -410,6 +410,11 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y ## # CONFIG_DRM_RADEON_KMS is not set +## +## file: drivers/gpu/drm/udl/Kconfig +## +CONFIG_DRM_UDL=m + ## ## file: drivers/gpu/drm/vmwgfx/Kconfig ## diff --git a/debian/patches/debian/udl-disable-autoload.patch b/debian/patches/debian/udl-disable-autoload.patch new file mode 100644 index 000000000..17a3d0ecd --- /dev/null +++ b/debian/patches/debian/udl-disable-autoload.patch @@ -0,0 +1,20 @@ +From: Ben Hutchings +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"); + diff --git a/debian/patches/series b/debian/patches/series index ede9a3a49..ee0e7cf3a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -65,3 +65,4 @@ bugfix/all/ptp-Make-PTP_1588_CLOCK-select-rather-than-depend-on.patch 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