From 21a48c99fdf8ec8fcca8c1b6e13da4e8ef9a1b2b Mon Sep 17 00:00:00 2001 From: Alim Akhtar Date: Sat, 14 Jan 2023 07:50:10 +0530 Subject: [PATCH] FROMGIT: scsi: ufs: ufs: Remove duplicate entry PA_GRANULARITY is duplicated, delete one of the entries. Change-Id: I2b7e65364000d07216717bb8974593bc9ae19fd3 Signed-off-by: Alim Akhtar Reviewed-by: Bart Van Assche Link: https://lore.kernel.org/r/20230114022010.27088-1-alim.akhtar@samsung.com Signed-off-by: Martin K. Petersen (cherry picked from commit 3730bea883cd8f74fd9b2b31d51665c74cf73362 git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next) Signed-off-by: Bart Van Assche --- include/ufs/unipro.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h index 6c553f98fe57..dc9dd1d23f0f 100644 --- a/include/ufs/unipro.h +++ b/include/ufs/unipro.h @@ -141,7 +141,6 @@ #define PA_SAVECONFIGTIME 0x15A4 #define PA_RXHSUNTERMCAP 0x15A5 #define PA_RXLSTERMCAP 0x15A6 -#define PA_GRANULARITY 0x15AA #define PA_HIBERN8TIME 0x15A7 #define PA_LOCALVERINFO 0x15A9 #define PA_GRANULARITY 0x15AA