Merge branch 'master' of https://github.com/RT-Thread/rt-thread

2 files changed, 1 insertions, 2 deletions

diff --git a/include/rtdef.h b/include/rtdef.h
index 0690371c6d..e4ddbd37d3 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -871,6 +871,7 @@ enum rt_device_class_type
     RT_Device_Class_Miscellaneous,                      /**< Miscellaneous device */
     RT_Device_Class_Sensor,                             /**< Sensor device */
     RT_Device_Class_Touch,                              /**< Touch device */
+    RT_Device_Class_PHY,                                /**< PHY device */
     RT_Device_Class_Unknown                             /**< unknown device */
 };
 
diff --git a/include/rtthread.h b/include/rtthread.h
index a76601a3bf..27cfea19e0 100644
--- a/include/rtthread.h
+++ b/include/rtthread.h
@@ -38,7 +38,6 @@ extern "C" {
 /*
  * kernel object interface
  */
-void rt_system_object_init(void);
 struct rt_object_information *
 rt_object_get_information(enum rt_object_class_type type);
 int rt_object_get_length(enum rt_object_class_type type);
@@ -74,7 +73,6 @@ void rt_object_put_sethook(void (*hook)(struct rt_object *object));
 /*
  * clock & timer interface
  */
-void rt_system_tick_init(void);
 rt_tick_t rt_tick_get(void);
 void rt_tick_set(rt_tick_t tick);
 void rt_tick_increase(void);