Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (34 commits)
  PCI: Only build PCI syscalls on architectures that want them
  PCI: limit pci_get_bus_and_slot to domain 0
  PCI: hotplug: acpiphp: avoid acpiphp "cannot get bridge info" PCI hotplug failure
  PCI: hotplug: acpiphp: remove hot plug parameter write to PCI host bridge
  PCI: hotplug: acpiphp: fix slot poweroff problem on systems without _PS3
  PCI: hotplug: pciehp: wait for 1 second after power off slot
  PCI: pci_set_power_state(): check for PM capabilities earlier
  PCI: cpci_hotplug: Convert to use the kthread API
  PCI: add pci_try_set_mwi
  PCI: pcie: remove SPIN_LOCK_UNLOCKED
  PCI: ROUND_UP macro cleanup in drivers/pci
  PCI: remove pci_dac_dma_... APIs
  PCI: pci-x-pci-express-read-control-interfaces cleanups
  PCI: Fix typo in include/linux/pci.h
  PCI: pci_ids, remove double or more empty lines
  PCI: pci_ids, add atheros and 3com_2 vendors
  PCI: pci_ids, reorder some entries
  PCI: i386: traps, change VENDOR to DEVICE
  PCI: ATM: lanai, change VENDOR to DEVICE
  PCI: Change all drivers to use pci_device->revision
  ...

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 21a6ccbf92e0..327eaa7b4999 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -931,7 +931,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         int i, addr_len, option;
         void __iomem *ioaddr;
         static int board_idx = -1;
-        u8 pci_rev;
 
         assert (pdev != NULL);
         assert (ent != NULL);
@@ -949,13 +948,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         }
 #endif
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev);
-
         if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
-            pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev >= 0x20) {
+            pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision >= 0x20) {
                 dev_info(&pdev->dev,
                            "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
-                           pdev->vendor, pdev->device, pci_rev);
+                           pdev->vendor, pdev->device, pdev->revision);
                 dev_info(&pdev->dev,
                            "Use the \"8139cp\" driver for improved performance and stability.\n");
         }