From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Fri, 19 Sep 2008 20:15:26 +0000 (-0400)
Subject: Merge
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/c54a4356fd904634dae9b942fb3a587cdcb860b9?ds=sidebyside

Merge
---

c54a4356fd904634dae9b942fb3a587cdcb860b9
diff --cc aseg/Makefile
index a43a1f2,1c2867d..e2edc87
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  CC=gcc
- CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__
- OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smi.o
+ CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99
 -OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o
++OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o
  
  all: aseg.elf
  
diff --cc aseg/firstrun.c
index 9977d14,355fb9a..ca892ea
--- a/aseg/firstrun.c
+++ b/aseg/firstrun.c
@@@ -1,5 -1,5 +1,6 @@@
  #include <io.h>
 +#include <smi.h>
+ #include <pci.h>
  
  void __firstrun_start() {
  /*