Merge branch 'amiga'

diff --cc README
Simple merge

diff --cc lib/Makefile
index 26ea170b40f1202b9cda71f5d80525c900de6742,bacdbc5aa087e09cc9a48bb75113830acaf1eaca..de976ed5e11c642caf42f77805e36d512e5987a2
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -77,18 -75,10 +77,22 @@@ ifdef PCI_HAVE_PM_WIN32_SYSDB
  OBJS += win32-sysdbg
  endif
  
 +ifdef PCI_OS_WINDOWS
 +OBJS += win32-helpers
 +endif
 +
 +ifdef PCI_USE_PHYSMEM
 +ifndef PCI_OS_WINDOWS
 +ifndef PCI_OS_DJGPP
 +OBJS += physmem-posix
 +endif
 +endif
 +endif
 +
+ ifdef PCI_HAVE_PM_AOS_EXPANSION
+ OBJS += aos-expansion
+ endif
+ 
  all: $(PCILIB) $(PCILIBPC)
  
  ifeq ($(SHARED),no)

diff --cc lib/configure
Simple merge

diff --cc lib/init.c
Simple merge

diff --cc lib/internal.h
Simple merge

diff --cc lib/pci.h
Simple merge

diff --cc lib/sysdep.h
Simple merge

diff --cc pcilib.man
Simple merge