summaryrefslogtreecommitdiff
path: root/drivers/core
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2019-01-18 13:40:41 -0500
committerTom Rini <[email protected]>2019-01-18 13:40:41 -0500
commitc4d323793ba2e0616d93ca104e1e2b9a9fbccf9b (patch)
treea79b7b8282e29e820022d037b6f6f2c1d5d52c0d /drivers/core
parentf83ef0dac83110d20389eb71f09285f009f3d198 (diff)
parent3d5931e5986a49c44cdab845c6751d845812e8d8 (diff)
Merge branch '2019-01-18-master-imports'
- Bugfix for SPI environment optimization - Spelling fixes - Remove some defconfigs per various maintainers - Minor db410, bananapi r2 fixes - Bump QEMU to v3.1.0 for most platforms
Diffstat (limited to 'drivers/core')
-rw-r--r--drivers/core/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 046b87a3337..ddf2fb3fb82 100644
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -232,7 +232,7 @@ config OF_ISA_BUS
Is this option is enabled then support for the ISA bus will
be included for addresses read from DT. This is something that
should be known to be required or not based upon the board
- being targetted, and whether or not it makes use of an ISA bus.
+ being targeted, and whether or not it makes use of an ISA bus.
The bus is matched based upon its node name equalling "isa". The
busses #address-cells should equal 2, with the first cell being