fix Makefile to point to the correct .lds

[netwatch.git] / grubload / output.c

diff --git a/grubload/output.c b/grubload/output.c
index 6a6ffabc99698e5ec014170f2dc83b8f601bb301..5f0365d7ccdd9c80859b291f78b38cdad7b15ae9 100644 (file)
--- a/grubload/output.c
+++ b/grubload/output.c
@@ -1,3 +1,14 @@
+/* output.c
+ * Console output routines
+ * NetWatch multiboot loader
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree. 
+ *
+ */
+
+

 #include <stdarg.h>
 #include <minilib.h>
 #include <console.h>
 #include <stdarg.h>
 #include <minilib.h>
 #include <console.h>


@@ -8,7 +19,7 @@
 
 static void safeputs(const char *s)
 {
 
 static void safeputs(const char *s)
 {

-       unsigned long old = smram_save_state();
+       smram_state_t old = smram_save_state();

        smram_aseg_set_state(SMRAM_ASEG_SMMONLY);
        puts(s);
        smram_restore_state(old);
        smram_aseg_set_state(SMRAM_ASEG_SMMONLY);
        puts(s);
        smram_restore_state(old);