diff --git a/debian/changelog b/debian/changelog index 6512716b1..f62a15159 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ linux (4.4~rc5-1~exp1) UNRELEASED; urgency=medium [ Ben Hutchings ] * [arm64] Drop now-redundant patches for X-Gene (fixes FTBFS) * [s390x] udeb: Add crc-modules package (fixes FTBFS) + * cirrus,mgag200: Drop patches for compatibility with wheezy userland -- Ben Hutchings Mon, 14 Dec 2015 02:51:03 +0000 diff --git a/debian/patches/debian/cirrus-disable-modeset-by-default.patch b/debian/patches/debian/cirrus-disable-modeset-by-default.patch deleted file mode 100644 index 1fb3a3c15..000000000 --- a/debian/patches/debian/cirrus-disable-modeset-by-default.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Ben Hutchings -Subject: cirrus: Disable by default -Forwarded: not-needed - -This kernel driver is incompatible with older versions of -xserver-xorg-video-cirrus, so do not enable it by default. It will be -enabled by a modprobe configuration file installed by -xserver-xorg-video-modesetting. - ---- a/drivers/gpu/drm/cirrus/cirrus_drv.c -+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c -@@ -15,7 +15,7 @@ - - #include "cirrus_drv.h" - --int cirrus_modeset = -1; -+int cirrus_modeset = 0; - int cirrus_bpp = 24; - - MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); diff --git a/debian/patches/debian/mgag200-disable-autoload.patch b/debian/patches/debian/mgag200-disable-autoload.patch deleted file mode 100644 index cf023bcfe..000000000 --- a/debian/patches/debian/mgag200-disable-autoload.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Ben Hutchings -Subject: mgag200: Disable autoload -Date: Mon, 24 Dec 2012 00:10:05 +0000 -Forwarded: not-needed - -This kernel driver is incompatible with older versions of -xserver-xorg-video-mga, so do not enable it by default. It will be -enabled by a modprobe configuration file installed by -xserver-xorg-video-modesetting. - ---- a/drivers/gpu/drm/mgag200/mgag200_drv.c -+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c -@@ -21,7 +21,7 @@ - * which then performs further device association and calls our graphics init - * functions - */ --int mgag200_modeset = -1; -+int mgag200_modeset = 0; - - MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); - module_param_named(modeset, mgag200_modeset, int, 0400); diff --git a/debian/patches/series b/debian/patches/series index 75705f43c..3c0719578 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,8 +37,6 @@ debian/yama-disable-by-default.patch debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch # Disable autoloading/probing of various drivers by default -debian/cirrus-disable-modeset-by-default.patch -debian/mgag200-disable-autoload.patch debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch debian/snd-pcsp-disable-autoload.patch bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch