aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-03 15:28:10 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-12 12:36:43 +0200
commit04c07e05a119d860b4d3b3191ff78d699aa5c209 (patch)
tree81c249a041728ae46aef05e47ea33e5fd240432f /target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch
parentf8f1dc6eab935f90b31401d87f412e3f8769dfd0 (diff)
downloadupstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.tar.gz
upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.tar.bz2
upstream-04c07e05a119d860b4d3b3191ff78d699aa5c209.zip
bcm63xx: refresh patches for kernel 5.4
Refresh patches to make them apply to kernel 5.4. The removed patches have been merged upstream. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch')
-rw-r--r--target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch b/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch
index 19ea476ca5..559ec94c2e 100644
--- a/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch
+++ b/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
-@@ -341,6 +341,7 @@ config PINCTRL_OCELOT
+@@ -387,6 +387,7 @@ config PINCTRL_OCELOT
source "drivers/pinctrl/actions/Kconfig"
source "drivers/pinctrl/aspeed/Kconfig"
source "drivers/pinctrl/bcm/Kconfig"
@@ -31,7 +31,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
source "drivers/pinctrl/intel/Kconfig"
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-
+@@ -50,6 +50,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-
obj-y += actions/
obj-$(CONFIG_ARCH_ASPEED) += aspeed/
obj-y += bcm/