summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Streetman <ddstreet@canonical.com>2021-09-07 10:14:53 -0400
committerDan Streetman <ddstreet@canonical.com>2021-09-07 10:14:53 -0400
commitf34e9c33209ad9bf3ec807e3b7b9cd22dc8d155d (patch)
treeb84ca15331311b3b58f7fdd028ba8898754c1b01
parent2c1654e83aaab6e3f720398a59add3edb524fbd8 (diff)
revert/remove patch for dell clamshell sku
Reverts fix for LP: #1938259
-rw-r--r--debian/patches/dell-clamshell-accel-location-base-with-sku.patch28
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/dell-clamshell-accel-location-base-with-sku.patch b/debian/patches/dell-clamshell-accel-location-base-with-sku.patch
deleted file mode 100644
index 826d70cff3..0000000000
--- a/debian/patches/dell-clamshell-accel-location-base-with-sku.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Yao Wei <yao.wei@canonical.com>
-Date: Tue, 27 Jul 2021 14:05:28 +0800
-Subject: [PATCH] Use SKU to identify Dell clamshell models for accelerometer
- properties
-
-As per request from Dell, we need to use sku property of modalias that
-is patched into linux 5.13 for model identification:
-
- https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e26f023e01ef26b4138bc1099af309bdc4523d23
----
- hwdb.d/60-sensor.hwdb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/hwdb.d/60-sensor.hwdb
-+++ b/hwdb.d/60-sensor.hwdb
-@@ -282,10 +282,10 @@ sensor:modalias:acpi:*KIOX000A*:dmi:*svn
- sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:pnVostro5581:*
- ACCEL_LOCATION=base
-
--sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:pnLatitude9520:*:ct10:*
-+sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:*
- ACCEL_LOCATION=base
-
--sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:pnLatitude7420:*
-+sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:*
- ACCEL_LOCATION=base
-
- # Dell Venue 8 Pro 3845
diff --git a/debian/patches/series b/debian/patches/series
index c4b27160e5..2195027dbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,7 +56,6 @@ lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch
lp1934981-correct-suspend-then-sleep-string.patch
CVE-2020-13529.patch
CVE-2021-33910.patch
-dell-clamshell-accel-location-base-with-sku.patch
Merge-pull-request-20199-from-ddstreet-unit_cgroup_catchu.patch
udev-fix-slot-based-network-names-on-s390.patch
udev-add-missing-initialization-to-fix-freeing-invalid-ad.patch