libnvdimm, of_pmem: workaround OF_NUMA=n build error

Stephen reports that an x86 allmodconfig build fails to build the
of_pmem driver due to a missing definition of of_node_to_nid(). That
helper is currently only exported in the OF_NUMA=y case. In other cases,
ppc and sparc, it is a weak symbol, and outside of those platforms it is
a static inline.

Until an OF_NUMA=n configuration can reliably support usage of
of_node_to_nid() in modules across architectures, mark this driver as
'bool' instead of 'tristate'.

Cc: Rob Herring <[email protected]>
Cc: Oliver O'Halloran <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Dan Williams <[email protected]>

diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index 2d6862bf7436721ae9e051e468a5ba8d09540e24..f6c533c4d09b4de8362096177c9f275973703606 100644 (file)
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -103,7 +103,8 @@ config NVDIMM_DAX
          Select Y if unsure
 
 config OF_PMEM
-       tristate "Device-tree support for persistent memory regions"
+       # FIXME: make tristate once OF_NUMA dependency removed
+       bool "Device-tree support for persistent memory regions"
        depends on OF
        default LIBNVDIMM
        help