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 07b292c13480dba5805a7770009536d4b8f7f9a0..b85c74ba83305370cd2a818684dc01812c629143 100644 (file)
--- 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;
 +      }
 +