aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-10-02 13:38:04 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-02 16:11:47 +0200
commit93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847 (patch)
tree7bfa85f74d4056464b74dfd0354a33b3c0619ad5 /target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
parent123d12eada9a8d63e790af372f30359415812228 (diff)
downloadupstream-93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847.tar.gz
upstream-93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847.tar.bz2
upstream-93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847.zip
kernel: bump 4.14 to 4.14.248
All updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch')
-rw-r--r--target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch b/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
index cc32aee17b..377b525061 100644
--- a/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
+++ b/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
@@ -95,7 +95,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
return 0;
case BCMA_HOSTTYPE_SDIO:
return 0;
-@@ -239,18 +239,18 @@ void bcma_prepare_core(struct bcma_bus *
+@@ -240,18 +240,18 @@ void bcma_prepare_core(struct bcma_bus *
core->dev.release = bcma_release_core_dev;
core->dev.bus = &bcma_bus_type;
dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
@@ -120,7 +120,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
} else {
core->dev.dma_mask = &core->dev.coherent_dma_mask;
core->dma_dev = &core->dev;
-@@ -261,28 +261,6 @@ void bcma_prepare_core(struct bcma_bus *
+@@ -262,28 +262,6 @@ void bcma_prepare_core(struct bcma_bus *
}
}