projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dma-mapping-6.4-2023-04-28' of git://git.infradead.org/users/hch/dma-mapping
[platform/kernel/linux-starfive.git]
/
drivers
/
of
/
address.c
diff --git
a/drivers/of/address.c
b/drivers/of/address.c
index
0d49f8c
..
e692809
100644
(file)
--- a/
drivers/of/address.c
+++ b/
drivers/of/address.c
@@
-1037,7
+1037,7
@@
phys_addr_t __init of_dma_get_max_cpu_address(struct device_node *np)
bool of_dma_is_coherent(struct device_node *np)
{
struct device_node *node;
- bool is_coherent =
IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT)
;
+ bool is_coherent =
dma_default_coherent
;
node = of_node_get(np);