Page MenuHomeFreeBSD
Files F144544647

D43193.1775342901.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D43193.1775342901.diff
View Options

diff --git a/sys/arm/allwinner/aw_thermal.c b/sys/arm/allwinner/aw_thermal.c
--- a/sys/arm/allwinner/aw_thermal.c
+++ b/sys/arm/allwinner/aw_thermal.c
@@ -45,7 +45,7 @@
#include <dev/clk/clk.h>
#include <dev/hwreset/hwreset.h>
-#include <dev/extres/nvmem/nvmem.h>
+#include <dev/nvmem/nvmem.h>
#include <arm/allwinner/aw_sid.h>
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1682,8 +1682,6 @@
dev/extres/phy/phynode_if.m optional phy
dev/extres/phy/phy_usb.c optional phy
dev/extres/phy/phynode_usb_if.m optional phy
-dev/extres/nvmem/nvmem.c optional nvmem fdt
-dev/extres/nvmem/nvmem_if.m optional nvmem
dev/extres/regulator/regdev_if.m optional regulator fdt
dev/extres/regulator/regnode_if.m optional regulator
dev/extres/regulator/regulator.c optional regulator
@@ -2531,6 +2529,8 @@
dev/nvme/nvme_sysctl.c optional nvme
dev/nvme/nvme_test.c optional nvme
dev/nvme/nvme_util.c optional nvme
+dev/nvmem/nvmem.c optional nvmem fdt
+dev/nvmem/nvmem_if.m optional nvmem
dev/oce/oce_hw.c optional oce pci
dev/oce/oce_if.c optional oce pci
dev/oce/oce_mbox.c optional oce pci
diff --git a/sys/dev/extres/nvmem/nvmem.h b/sys/dev/nvmem/nvmem.h
rename from sys/dev/extres/nvmem/nvmem.h
rename to sys/dev/nvmem/nvmem.h
--- a/sys/dev/extres/nvmem/nvmem.h
+++ b/sys/dev/nvmem/nvmem.h
@@ -23,8 +23,8 @@
* SUCH DAMAGE.
*/
-#ifndef _DEV_EXTRES_NVMEM_H_
-#define _DEV_EXTRES_NVMEM_H_
+#ifndef _DEV_NVMEM_H_
+#define _DEV_NVMEM_H_
int nvmem_get_cell_len(phandle_t node, const char *name);
int nvmem_read_cell_by_name(phandle_t node, const char *name, void *cell, size_t buflen);
@@ -32,4 +32,4 @@
int nvmem_write_cell_by_name(phandle_t node, const char *name, void *cell, size_t buflen);
int nvmem_write_cell_by_idx(phandle_t node, int idx, void *cell, size_t buflen);
-#endif /* _DEV_EXTRES_NVMEM_H_ */
+#endif /* _DEV_NVMEM_H_ */
diff --git a/sys/dev/extres/nvmem/nvmem.c b/sys/dev/nvmem/nvmem.c
rename from sys/dev/extres/nvmem/nvmem.c
rename to sys/dev/nvmem/nvmem.c
diff --git a/sys/dev/extres/nvmem/nvmem_if.m b/sys/dev/nvmem/nvmem_if.m
rename from sys/dev/extres/nvmem/nvmem_if.m
rename to sys/dev/nvmem/nvmem_if.m

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 10:48 PM (13 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28261755
Default Alt Text
D43193.1775342901.diff (2 KB)

Event Timeline