Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 4ba54ff..e06ac51 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -102,6 +102,12 @@ config OF_RESERVED_MEM
 config OF_RESOLVE
        bool
 
+config OF_SLIMBUS
+       def_tristate SLIMBUS
+       depends on SLIMBUS
+       help
+         OpenFirmware SLIMBUS accessors
+
 config OF_OVERLAY
        bool "Device Tree overlays"
        select OF_DYNAMIC
@@ -112,6 +118,11 @@ config OF_OVERLAY
          While this option is selected automatically when needed, you can
          enable it manually to improve device tree unit test coverage.
 
+config OF_BATTERYDATA
+       def_bool y
+       help
+         OpenFirmware BatteryData accessors
+
 config OF_DMA_DEFAULT_COHERENT
        # arches should select this if DMA is coherent by default for OF devices
        bool