diff options
| author | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
|---|---|---|
| committer | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
| commit | fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab (patch) | |
| tree | fda1a9d90f4a3e99af9da656939ff8c112cfeb33 /hw/xfree86/os-support/linux/Makefile.am | |
| parent | b46a00918691cbd5ca80b6d3acae7614f93e073b (diff) | |
| parent | 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459 (diff) | |
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
Diffstat (limited to 'hw/xfree86/os-support/linux/Makefile.am')
| -rw-r--r-- | hw/xfree86/os-support/linux/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 5a52ffdd4..beaae3d5b 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = liblinux.la if LINUX_IA64 -PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c +PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset PLATFORM_INCLUDES = -I$(srcdir)/../shared endif |