From: Chris Wright <chrisw@osdl.org>
Date: Mon, 19 Sep 2005 15:26:10 +0000 (-0700)
Subject: fix compile error (s/KERN_ERROR/KERN_ERR) in yenta-oops-fix.patch,
X-Git-Tag: v2.6.13.3~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7bee56aa8890f9140e6172fbe8e9db0dc140bff;p=thirdparty%2Fkernel%2Fstable-queue.git

fix compile error (s/KERN_ERROR/KERN_ERR) in yenta-oops-fix.patch,
and update to match Linus' tree (mentions trying 'pci=assign-busses' in
error message).
---

diff --git a/queue/yenta-oops-fix.patch b/queue/yenta-oops-fix.patch
index 07b292c1348..b85c74ba833 100644
--- a/queue/yenta-oops-fix.patch
+++ b/queue/yenta-oops-fix.patch
@@ -38,8 +38,8 @@ Index: linux-2.6.13.y/drivers/pcmcia/yenta_socket.c
 +	 * Bail out if so.
 +	 */
 +	if (!dev->subordinate) {
-+		printk(KERN_ERROR "Yenta: no bus associated with %s!\n",
-+			pci_name(dev));
++		printk(KERN_ERR "Yenta: no bus associated with %s! "
++			"(try 'pci=assign-busses')\n", pci_name(dev));
 +		return -ENODEV;
 +	}
 +