kernel: 5.15: fix bug in patch format (#10006)

Signed-off-by: José Hwong <josehwong@hotmail.com>

Signed-off-by: José Hwong <josehwong@hotmail.com>
This commit is contained in:
benihi 2022-08-26 09:09:32 -04:00 committed by GitHub
parent ec3a9bd8ac
commit 3e87e5f41d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,11 +23,7 @@ Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
--- a/drivers/pci/controller/pci-aardvark.c --- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c
<<<<<<< HEAD
@@ -1632,9 +1632,7 @@ static int advk_pcie_enable_phy(struct a
=======
@@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a @@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a
>>>>>>> edeae512c0 (kernel: bump 5.15 to 5.15.63)
} }
ret = phy_power_on(pcie->phy); ret = phy_power_on(pcie->phy);