On Fri, Apr 28, 2023 at 06:30:34PM +0200, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Applied, thanks. > --- > Documentation/dt-object-internal.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/dt-object-internal.txt b/Documentation/dt-object-internal.txt > index 51d68ab93ac9..c7357e6263df 100644 > --- a/Documentation/dt-object-internal.txt > +++ b/Documentation/dt-object-internal.txt > @@ -35,7 +35,7 @@ We have a number of peripherals that after probing (using some undefined method) > should result in different Device Tree configuration. > > We cannot boot with this static tree because due to the configuration of the > -foo platform there exist multiple conficting peripherals DT fragments. > +foo platform there exist multiple conflicting peripherals DT fragments. > > So for the bar peripheral we would have this: > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
