kernel: bump 6.1 to 6.1.36

[openwrt/openwrt.git] / target / linux / generic / backport-6.1 / 811-v6.4-0014-nvmem-bcm-ocotp-Use-devm_platform_ioremap_resource.patch

diff --git a/target/linux/generic/backport-6.1/811-v6.4-0014-nvmem-bcm-ocotp-Use-devm_platform_ioremap_resource.patch b/target/linux/generic/backport-6.1/811-v6.4-0014-nvmem-bcm-ocotp-Use-devm_platform_ioremap_resource.patch
index a0874f73d15c1fc04d5b37400423bfd6977e3ecd..200eb1928f8c4a6af6947dc713194c9b5ea305de 100644 (file)
--- a/target/linux/generic/backport-6.1/811-v6.4-0014-nvmem-bcm-ocotp-Use-devm_platform_ioremap_resource.patch
+++ b/target/linux/generic/backport-6.1/811-v6.4-0014-nvmem-bcm-ocotp-Use-devm_platform_ioremap_resource.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/nvmem/bcm-ocotp.c
 +++ b/drivers/nvmem/bcm-ocotp.c
-@@ -254,7 +254,6 @@ MODULE_DEVICE_TABLE(acpi, bcm_otpc_acpi_
+@@ -244,7 +244,6 @@ MODULE_DEVICE_TABLE(acpi, bcm_otpc_acpi_
  static int bcm_otpc_probe(struct platform_device *pdev)
  {
        struct device *dev = &pdev->dev;
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        struct otpc_priv *priv;
        struct nvmem_device *nvmem;
        int err;
-@@ -269,8 +268,7 @@ static int bcm_otpc_probe(struct platfor
+@@ -259,8 +258,7 @@ static int bcm_otpc_probe(struct platfor
                return -ENODEV;
  
        /* Get OTP base address register. */