fix merge

ZR233 · ZR233 · commit 40876c366784 · 2025-07-07T10:00:10.000+08:00
diff --git a/axplat/src/time.rs b/axplat/src/time.rs
@@ -41,9 +41,6 @@ pub trait TimeIf {
     /// deadline (in nanoseconds).
     #[cfg(feature = "irq")]
     fn set_oneshot_timer(deadline_ns: u64);
-
-    #[cfg(feature = "irq")]
-    fn irq_num()->usize;
 }
 
 /// Returns nanoseconds elapsed since system boot.

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,6 @@ pub trait TimeIf {`
`41`	`41`	`/// deadline (in nanoseconds).`
`42`	`42`	`#[cfg(feature = "irq")]`
`43`	`43`	`fn set_oneshot_timer(deadline_ns: u64);`
`44`		`-`
`45`		`- #[cfg(feature = "irq")]`
`46`		`- fn irq_num()->usize;`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`/// Returns nanoseconds elapsed since system boot.`