From: Andrew Morton <akpm@osdl.org>

As described in the next patch, revert

commit 8c4b2cf9af9b4ecc29d4f0ec4ecc8e94dc4432d7
Author: Bernhard Kaindl <bk@suse.de>
Date:   Sat Feb 18 01:36:55 2006 -0800

Cc: Andreas Schneider <mail@cynapses.org>
Cc: Bernhard Kaindl <bk@suse.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/pci/common.c |   32 --------------------------------
 drivers/pci/probe.c    |    4 +---
 2 files changed, 1 insertion(+), 35 deletions(-)

diff -puN arch/i386/pci/common.c~revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix arch/i386/pci/common.c
--- devel/arch/i386/pci/common.c~revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix	2006-04-14 21:59:20.000000000 -0700
+++ devel-akpm/arch/i386/pci/common.c	2006-04-14 21:59:20.000000000 -0700
@@ -8,7 +8,6 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/dmi.h>
 
 #include <asm/acpi.h>
 #include <asm/segment.h>
@@ -121,42 +120,11 @@ void __devinit  pcibios_fixup_bus(struct
 	pci_read_bridge_bases(b);
 }
 
-/*
- * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)
- */
-#ifdef __i386__
-static int __devinit assign_all_busses(struct dmi_system_id *d)
-{
-	pci_probe |= PCI_ASSIGN_ALL_BUSSES;
-	printk(KERN_INFO "%s detected: enabling PCI bus# renumbering"
-			" (pci=assign-busses)\n", d->ident);
-	return 0;
-}
-#endif
-
-/*
- * Laptops which need pci=assign-busses to see Cardbus cards
- */
-static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
-#ifdef __i386__
-	{
-		.callback = assign_all_busses,
-		.ident = "Samsung X20 Laptop",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Samsung Electronics"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "SX20S"),
-		},
-	},
-#endif		/* __i386__ */
-	{}
-};
 
 struct pci_bus * __devinit pcibios_scan_root(int busnum)
 {
 	struct pci_bus *bus = NULL;
 
-	dmi_check_system(pciprobe_dmi_table);
-
 	while ((bus = pci_find_next_bus(bus)) != NULL) {
 		if (bus->number == busnum) {
 			/* Already scanned */
diff -puN drivers/pci/probe.c~revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix drivers/pci/probe.c
--- devel/drivers/pci/probe.c~revert-pci-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix	2006-04-14 21:59:20.000000000 -0700
+++ devel-akpm/drivers/pci/probe.c	2006-04-14 21:59:20.000000000 -0700
@@ -587,15 +587,13 @@ int __devinit pci_scan_bridge(struct pci
 		    (child->number > bus->subordinate) ||
 		    (child->number < bus->number) ||
 		    (child->subordinate < bus->number)) {
-			printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) is "
+			printk(KERN_WARNING "PCI: Bus #%02x (-#%02x) may be "
 			       "hidden behind%s bridge #%02x (-#%02x)%s\n",
 			       child->number, child->subordinate,
 			       bus->self->transparent ? " transparent" : " ",
 			       bus->number, bus->subordinate,
 			       pcibios_assign_all_busses() ? " " :
 			       " (try 'pci=assign-busses')");
-			printk(KERN_WARNING "Please report the result to "
-			       "linux-kernel to fix this permanently\n");
 		}
 		bus = bus->parent;
 	}
_