diff options
| author | Myron Stowe <myron.stowe@hp.com> | 2006-10-26 20:38:58 +0300 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-11-08 09:53:33 -0500 |
| commit | 267dc25e5c32d855594f34a9e7f17d7b2dc2b80a (patch) | |
| tree | 3b38811ac739b2fc623ecfc625ee626bb692580e | |
| parent | 00a1e648ef47ab7756a90f03b40ff7e63d2bbccc (diff) | |
xfree86: re-enable chipset-specific drivers for Linux/ia64
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
(cherry picked from 794f2e7291ccb4e48f9fbfc8f08302e3aac0f79f commit)
| -rw-r--r-- | hw/xfree86/os-support/linux/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 6fdc1bc42..7f7102295 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -1,7 +1,9 @@ noinst_LTLIBRARIES = liblinux.la if LINUX_IA64 -PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c +PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c +PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset +PLATFORM_INCLUDES = -I$(srcdir)/../shared endif if LINUX_ALPHA PLATFORM_PCI_SUPPORT = lnx_ev56.c \ @@ -34,14 +36,13 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ $(APM_SOURCES) \ $(PLATFORM_PCI_SUPPORT) -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) -INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack +INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack # FIXME: These need to be added to the build LNX_EXTRA_SOURCES = \ lnx_font.c \ - lnx_ia64.c \ lnx_jstk.c \ lnxResource.c @@ -49,5 +50,4 @@ EXTRA_DIST = \ $(LNX_EXTRA_SOURCES) \ lnx.h \ lnx_kbd.h \ - $(srcdir)/../shared/ia64Pci.h \ $(srcdir)/../shared/xf86Axp.h |