aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/timer/timer.h
diff options
context:
space:
mode:
authorMarvin Borner2020-05-06 19:04:05 +0200
committerMarvin Borner2020-05-06 19:04:05 +0200
commitd94ffac4a584dc7a4f6f2ec567b8caab05ce9253 (patch)
tree559cd596a0a407d4b40c1d12d3c6a0686494da16 /src/kernel/timer/timer.h
parent1a8563a05608b5b5e27eada44cf4790926001c68 (diff)
New build parameters and shared includes
This changes many files but I've just applied some replace commands.. So - nothing special!
Diffstat (limited to 'src/kernel/timer/timer.h')
-rw-r--r--src/kernel/timer/timer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/timer/timer.h b/src/kernel/timer/timer.h
index 2315b62..7b80b75 100644
--- a/src/kernel/timer/timer.h
+++ b/src/kernel/timer/timer.h
@@ -2,7 +2,7 @@
#define MELVIX_TIMER_H
#include <stdint.h>
-#include <kernel/interrupts/interrupts.h>
+#include <interrupts/interrupts.h>
void timer_handler(struct regs *r);
@@ -21,6 +21,6 @@ void timer_wait(int ticks);
* Get the current timer ticks
* @return The current timer ticks (1000 ticks = 1 second)
*/
-uint32_t get_time();
+u32 get_time();
#endif \ No newline at end of file