2.6.15-rc6 refresh

2 files changed, 0 insertions, 78 deletions

diff --git a/pci/fix-dumb-bug-in-mmconfig-fix.patch b/pci/fix-dumb-bug-in-mmconfig-fix.patch
deleted file mode 100644
index 2e00c5e4292da..0000000000000
--- a/pci/fix-dumb-bug-in-mmconfig-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ak@suse.de Thu Dec 15 19:19:29 2005
-Date: Fri, 16 Dec 2005 01:04:45 +0100
-From: Andi Kleen <ak@suse.de>
-To: gregkh@suse.de
-Cc: linux-kernel@vger.kernel.org
-Subject: PCI: Fix dumb bug in mmconfig fix
-Message-ID: <20051216000445.GN15804@wotan.suse.de>
-Content-Disposition: inline
-
-
-Use correct address when referencing mmconfig aperture while checking
-for broken MCFG.  This was a typo when porting the code from 64bit to
-32bit.  It caused oopses at boot on some ThinkPads.
-
-Should definitely go into 2.6.15.
-
-Signed-off-by: Andi Kleen <ak@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- arch/i386/pci/mmconfig.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/arch/i386/pci/mmconfig.c
-+++ gregkh-2.6/arch/i386/pci/mmconfig.c
-@@ -155,7 +155,7 @@ static __init void unreachable_devices(v
- 		addr = get_base_addr(0, 0, PCI_DEVFN(i, 0));
- 		if (addr != 0)
- 			pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0));
--		if (addr == 0 || readl((u32 __iomem *)addr) != val1)
-+		if (addr == 0 || readl((u32 __iomem *)mmcfg_virt_addr) != val1)
- 			set_bit(i, fallback_slots);
- 		spin_unlock_irqrestore(&pci_config_lock, flags);
- 	}
diff --git a/pci/pci-express-must-be-initialized-before-pci-hotplug.patch b/pci/pci-express-must-be-initialized-before-pci-hotplug.patch
deleted file mode 100644
index 62bfb629d7f01..0000000000000
--- a/pci/pci-express-must-be-initialized-before-pci-hotplug.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From owner-linux-pci@atrey.karlin.mff.cuni.cz Sun Dec 11 16:15:28 2005
-Date: Mon, 12 Dec 2005 11:12:01 +1100
-From: Anton Blanchard <anton@samba.org>
-To: Greg Kroah-Hartman <gregkh@suse.de>
-Cc: <miltonm@bga.com>, <rajesh.shah@intel.com>
-Subject: PCI express must be initialized before PCI hotplug
-Message-ID: <20051212001201.GF23641@krispykreme>
-Content-Disposition: inline
-
-
-From: Milton Miller <miltonm@bga.com>
-
-PCI express hotplug uses the pcieportbus driver so pcie must be
-initialized before hotplug/.  This patch changes the link order.
-
-Signed-Off-By: Milton Miller <miltonm@bga.com>
-Acked-by: Anton Blanchard <anton@samba.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/pci/Makefile |    7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- gregkh-2.6.orig/drivers/pci/Makefile
-+++ gregkh-2.6/drivers/pci/Makefile
-@@ -6,6 +6,9 @@ obj-y		+= access.o bus.o probe.o remove.
- 			pci-driver.o search.o pci-sysfs.o rom.o setup-res.o
- obj-$(CONFIG_PROC_FS) += proc.o
- 
-+# Build PCI Express stuff if needed
-+obj-$(CONFIG_PCIEPORTBUS) += pcie/
-+
- obj-$(CONFIG_HOTPLUG) += hotplug.o
- 
- # Build the PCI Hotplug drivers if we were asked to
-@@ -40,7 +43,3 @@ endif
- ifeq ($(CONFIG_PCI_DEBUG),y)
- EXTRA_CFLAGS += -DDEBUG
- endif
--
--# Build PCI Express stuff if needed
--obj-$(CONFIG_PCIEPORTBUS) += pcie/
--