Index: AsmMacros.h
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/AsmMacros.h,v
retrieving revision 1.1
diff -u -r1.1 AsmMacros.h
--- AsmMacros.h	4 Jan 2002 10:32:26 -0000	1.1
+++ AsmMacros.h	10 Jan 2002 18:29:34 -0000
@@ -64,12 +64,7 @@
 
 #if defined(__GNUC__)
 #if defined(linux) && defined(__alpha__)
-#define inb _inb
-#define inw _inw
-#define inl _inl
-#define outb(p,v) _outb((v),(p))
-#define outw(p,v) _outw((v),(p))
-#define outl(p,v) _outl((v),(p))
+#include <sys/io.h>
 #else
 #if defined(__sparc__)
 #ifndef ASI_PL
Index: pci.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/pci.c,v
retrieving revision 1.1
diff -u -r1.1 pci.c
--- pci.c	4 Jan 2002 10:32:26 -0000	1.1
+++ pci.c	10 Jan 2002 18:29:35 -0000
@@ -269,34 +269,19 @@
  
 #if defined(__GLIBC__) && __GLIBC__ >= 2
 #if defined(linux)
+#if defined(__alpha__)
+#include <sys/io.h>
+#else
 #include <sys/perm.h>
 #endif
 #endif
+#endif
  
 #if defined(__alpha__)
 #if defined(linux)
 #include <asm/unistd.h>
 #define BUS(tag) (((tag)>>16)&0xff)
 #define DFN(tag) (((tag)>>8)&0xff)
-static int pciconfig_read(
-          unsigned char bus,
-          unsigned char dfn,
-          unsigned char off,
-          unsigned char len,
-          void * buf)
-{
-  return syscall(__NR_pciconfig_read, bus, dfn, off, len, buf);
-}
-
-static int pciconfig_write(
-          unsigned char bus,
-          unsigned char dfn,
-          unsigned char off,
-          unsigned char len,
-          void * buf)
-{
-  return syscall(__NR_pciconfig_write, bus, dfn, off, len, buf);
-}
 #else
 Generate compiler error - scanpci unsupported on non-linux alpha platforms
 #endif /* linux */