diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-06-18 16:51:13 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-06-18 16:51:13 -0700 |
| commit | ab7a6d860d4a275a810a64b1ba7b13726ed10575 (patch) | |
| tree | 1198628dab08c3989dff073b4bbe6920a1feca59 /hw/vfb/Makefile.am | |
| parent | e9130b8bac73a0843d5ff6b2216eccfb3e094a48 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
Diffstat (limited to 'hw/vfb/Makefile.am')
| -rw-r--r-- | hw/vfb/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index 40c385434..6842b45a5 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -14,8 +14,8 @@ SRCS = InitInput.c \ $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c -libfbcmap_a_CFLAGS = $(AM_CFLAGS) -DXFree86Server -libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap.c +libfbcmap_a_CFLAGS = $(AM_CFLAGS) +libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c Xvfb_SOURCES = $(SRCS) |