Merge branch 'x86/unify-pci' into x86/core

2026-09-20 18:15:29 +00:00 · 2008-07-10 18:47:29 +02:00 · 2008-07-10 18:47:29 +02:00 · f87f38ec5a
commit f87f38ec5a
parent a6784ad7ea 8dd779b19c
49 changed files with 431 additions and 277 deletions
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
--- a/arch/mips/mm/page.c
+++ b/arch/mips/mm/page.c
--- a/arch/mips/mm/sc-rm7k.c
+++ b/arch/mips/mm/sc-rm7k.c
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
--- a/arch/x86/pci/Makefile_32
+++ b/arch/x86/pci/Makefile_32
--- a/arch/x86/pci/Makefile_64
+++ b/arch/x86/pci/Makefile_64
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
--- a/arch/x86/pci/mp_bus_to_node.c
+++ b/arch/x86/pci/mp_bus_to_node.c
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
--- a/arch/x86/pci/visws.c
+++ b/arch/x86/pci/visws.c
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
--- a/include/asm-powerpc/hugetlb.h
+++ b/include/asm-powerpc/hugetlb.h
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/include/asm-powerpc/pgtable-ppc64.h
--- a/include/asm-s390/pgtable.h
+++ b/include/asm-s390/pgtable.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
--- a/net/can/raw.c
+++ b/net/can/raw.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c