Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / of / Kconfig

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 80e5c13..9d2009a 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -48,12 +48,6 @@ config OF_IRQ
        def_bool y
        depends on !SPARC
 
-config OF_I2C
-       def_tristate I2C
-       depends on I2C
-       help
-         OpenFirmware I2C accessors
-
 config OF_NET
        depends on NETDEVICES
        def_bool y
@@ -80,4 +74,10 @@ config OF_MTD
        depends on MTD
        def_bool y
 
+config OF_RESERVED_MEM
+       depends on OF_FLATTREE && (DMA_CMA || (HAVE_GENERIC_DMA_COHERENT && HAVE_MEMBLOCK))
+       def_bool y
+       help
+         Initialization code for DMA reserved memory
+
 endmenu # OF