From 722f821a36b99a16556faa2c1a01f40e59afef75 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 4 Mar 2008 11:56:48 -0700
Subject: [PATCH] --- yaml --- r: 91681 b: refs/heads/master c:
 10f000a2fd805e8ccfe988e8615545467bb7f7df h: refs/heads/master i:   91679:
 7b1d25ed24945f00c5ba052a9206f56bb89f3254 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/alpha/kernel/pci.c | 23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 4cec7bce704d..f528d831c109 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b81d988c04cacb1f7ffb76cbff2d150eb9f02948
+refs/heads/master: 10f000a2fd805e8ccfe988e8615545467bb7f7df
diff --git a/trunk/arch/alpha/kernel/pci.c b/trunk/arch/alpha/kernel/pci.c
index 9dc1cee43265..c107cc08daf4 100644
--- a/trunk/arch/alpha/kernel/pci.c
+++ b/trunk/arch/alpha/kernel/pci.c
@@ -372,28 +372,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
 int
 pcibios_enable_device(struct pci_dev *dev, int mask)
 {
-	u16 cmd, oldcmd;
-	int i;
-
-	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-	oldcmd = cmd;
-
-	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-		struct resource *res = &dev->resource[i];
-
-		if (res->flags & IORESOURCE_IO)
-			cmd |= PCI_COMMAND_IO;
-		else if (res->flags & IORESOURCE_MEM)
-			cmd |= PCI_COMMAND_MEMORY;
-	}
-
-	if (cmd != oldcmd) {
-		printk(KERN_DEBUG "PCI: Enabling device: (%s), cmd %x\n",
-		       pci_name(dev), cmd);
-		/* Enable the appropriate bits in the PCI command register.  */
-		pci_write_config_word(dev, PCI_COMMAND, cmd);
-	}
-	return 0;
+	return pci_enable_resources(dev, mask);
 }
 
 /*