Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:06 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:44 +0200
commit30ec5451db5155b69099aed44616ef0a5a67d4d0 (patch)
tree5f3fb1ee2e59a767a2f8d26095ecaee53bf068ba
parent5dbbbc59f2b49e163e915f0aa5207aee5d677126 (diff)
platform/x86: mlx-platform: Remove unused define (bsc#1112374).
-rw-r--r--patches.drivers/platform-x86-mlx-platform-Remove-unused-define.patch26
-rw-r--r--series.conf1
2 files changed, 27 insertions, 0 deletions
diff --git a/patches.drivers/platform-x86-mlx-platform-Remove-unused-define.patch b/patches.drivers/platform-x86-mlx-platform-Remove-unused-define.patch
new file mode 100644
index 0000000000..ea1fbb6fb3
--- /dev/null
+++ b/patches.drivers/platform-x86-mlx-platform-Remove-unused-define.patch
@@ -0,0 +1,26 @@
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Thu, 26 Jul 2018 22:41:04 +0000
+Subject: platform/x86: mlx-platform: Remove unused define
+Patch-mainline: v4.19-rc1
+Git-commit: 0b4e30f49aa44725cbaefa6e839bd82a768c385a
+References: bsc#1112374
+
+Remove unused define MLXPLAT_CPLD_AGGR_MASK_MSN21XX.
+
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/platform/x86/mlx-platform.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/platform/x86/mlx-platform.c
++++ b/drivers/platform/x86/mlx-platform.c
+@@ -112,7 +112,6 @@
+ #define MLXPLAT_CPLD_AGGR_ASIC_MASK_NG 0x01
+ #define MLXPLAT_CPLD_AGGR_MASK_NG_DEF 0x04
+ #define MLXPLAT_CPLD_LOW_AGGR_MASK_LOW 0xc1
+-#define MLXPLAT_CPLD_AGGR_MASK_MSN21XX 0x04
+ #define MLXPLAT_CPLD_PSU_MASK GENMASK(1, 0)
+ #define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0)
+ #define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0)
diff --git a/series.conf b/series.conf
index 5829a11179..33b48b521e 100644
--- a/series.conf
+++ b/series.conf
@@ -39229,6 +39229,7 @@
patches.drivers/platform-x86-mlx-platform-Add-ASIC-hotplug-device-co.patch
patches.drivers/platform-x86-mlx-platform-Allow-mlxreg-io-driver-act.patch
patches.drivers/platform-x86-mlx-platform-Change-mlxreg-io-configura.patch
+ patches.drivers/platform-x86-mlx-platform-Remove-unused-define.patch
patches.drivers/platform-x86-asus-nb-wmi-Add-keymap-entry-for-lid-fl.patch
patches.arch/ARM-hwmod-RTC-Don-t-assume-lock-unlock-will-be-calle.patch
patches.arch/ARM-mvebu-declare-asm-symbols-as-character-arrays-in.patch