summaryrefslogtreecommitdiff
path: root/com32/lib/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-20 22:41:34 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-20 22:41:34 -0800
commit8f652f110068ed20dd84bdc46233d803bc4150be (patch)
tree69b7780c4ce6a25353f4f7d75fe93310030d1490 /com32/lib/Makefile
parent7135a6783c4ca37f3b9f3baa87573a3f61060db4 (diff)
parentee43a6e64a6498f457e46f1e2844ab3506ba889d (diff)
downloadsyslinux-8f652f110068ed20dd84bdc46233d803bc4150be.tar.gz
Merge remote branch 'origin/master' into pathbased
Diffstat (limited to 'com32/lib/Makefile')
-rw-r--r--com32/lib/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index 7bd340c1..3e6aa810 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -65,10 +65,11 @@ LIBOBJS = \
sys/vesacon_write.o sys/vesaserial_write.o \
sys/vesa/initvesa.o sys/vesa/drawtxt.o sys/vesa/background.o \
sys/vesa/alphatbl.o sys/vesa/screencpy.o sys/vesa/fmtpixel.o \
+ sys/vesa/i915resolution.o \
\
- pci/cfgtype.o pci/scan.o \
- pci/readb.o pci/readw.o pci/readl.o pci/readbios.o \
- pci/writeb.o pci/writew.o pci/writel.o pci/writebios.o \
+ pci/cfgtype.o pci/scan.o pci/bios.o \
+ pci/readb.o pci/readw.o pci/readl.o \
+ pci/writeb.o pci/writew.o pci/writel.o \
\
zlib/adler32.o zlib/compress.o zlib/crc32.o \
zlib/uncompr.o zlib/deflate.o zlib/trees.o zlib/zutil.o \