diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-26 12:40:56 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-26 12:40:56 +0000 |
| commit | 7cad1e99513584d3690c847ed451d443ae4ec1cf (patch) | |
| tree | 9e88e56ebe217712372a179367734a556d19c594 /libdha | |
| parent | a8aec55f160dd129505c39c5970fe43959b2408a (diff) | |
| download | mpv-7cad1e99513584d3690c847ed451d443ae4ec1cf.tar.bz2 mpv-7cad1e99513584d3690c847ed451d443ae4ec1cf.tar.xz | |
x86-64 (amd64) support by Kenny Root
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12688 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdha')
| -rw-r--r-- | libdha/pci.c | 2 | ||||
| -rw-r--r-- | libdha/sysdep/pci_linux.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libdha/pci.c b/libdha/pci.c index 8d43d6c0ae..9524d8a2c0 100644 --- a/libdha/pci.c +++ b/libdha/pci.c @@ -492,6 +492,8 @@ static int pcibus=-1, pcicard=-1, pcifunc=-1 ; #include "sysdep/pci_arm32.c" #elif defined(__powerpc__) #include "sysdep/pci_powerpc.c" +#elif defined(__x86_64__) +/* Nothing here right now */ #else #include "sysdep/pci_x86.c" #endif diff --git a/libdha/sysdep/pci_linux.c b/libdha/sysdep/pci_linux.c index 7d27fc073f..3dbc592c0d 100644 --- a/libdha/sysdep/pci_linux.c +++ b/libdha/sysdep/pci_linux.c @@ -7,7 +7,7 @@ #ifdef __i386__ // is this needed? #include <sys/perm.h> #else -#if !defined(__sparc__) && !defined(__powerpc__) +#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__x86_64__) #include <sys/io.h> #endif #endif @@ -117,8 +117,8 @@ static __inline__ int disable_os_io(void) return(0); } -#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)) \ - && defined(__linux__) && !defined(CONFIG_SVGAHELPER) +#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \ + || defined(__x86_64__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER) #define CONFIG_PCI_LINUX_PROC #endif |