summaryrefslogtreecommitdiffstats
path: root/src/hci
diff options
context:
space:
mode:
authorMichael Brown2008-03-10 14:02:53 +0100
committerMichael Brown2008-03-10 14:02:53 +0100
commit3e781eb87f7b5bfa638f94234bb5e9d64508b0a4 (patch)
tree5884ac0438320638c846166856a4b54b3564bd23 /src/hci
parent[PXE] Work around a buffer-size bug in WinPE (diff)
parentUse plain C in timer_rdtsc for division instead of inline asssembly. (diff)
downloadipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.gz
ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.xz
ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.zip
Merge branch 'xl0-timer'
Diffstat (limited to 'src/hci')
-rw-r--r--src/hci/mucurses/kb.c2
-rw-r--r--src/hci/shell_banner.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c
index 291ee6ac8..cada72917 100644
--- a/src/hci/mucurses/kb.c
+++ b/src/hci/mucurses/kb.c
@@ -1,6 +1,6 @@
#include <curses.h>
#include <stddef.h>
-#include <timer.h>
+#include <unistd.h>
#include "mucurses.h"
/** @file
diff --git a/src/hci/shell_banner.c b/src/hci/shell_banner.c
index d313d4dd0..62da487c7 100644
--- a/src/hci/shell_banner.c
+++ b/src/hci/shell_banner.c
@@ -18,8 +18,8 @@
#include <stdio.h>
#include <console.h>
-#include <latch.h>
#include <gpxe/features.h>
+#include <gpxe/timer.h>
#include <gpxe/shell_banner.h>
/** @file