aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-05-18 11:08:07 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-05-18 11:08:07 -0700
commit65274eea7731d7222671ffdd8ba5602bd7cef02f (patch)
tree67258d619521c1aa270ac3b561374c3c32fbd727 /pci
parentd00a604eef0a8dda16d93fbb423878e703bbc506 (diff)
downloadpatches-65274eea7731d7222671ffdd8ba5602bd7cef02f.tar.gz
make kobject_add be quiet as it scares the children
also rebase to 2.6.17-rc4-git6
Diffstat (limited to 'pci')
-rw-r--r--pci/pci-64-bit-resources-drivers-net-changes.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/pci/pci-64-bit-resources-drivers-net-changes.patch b/pci/pci-64-bit-resources-drivers-net-changes.patch
index d4cf5129d882d..85dbd0091d9a7 100644
--- a/pci/pci-64-bit-resources-drivers-net-changes.patch
+++ b/pci/pci-64-bit-resources-drivers-net-changes.patch
@@ -126,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if ((dev = skge_devinit(hw, 0, using_dac)) == NULL)
--- gregkh-2.6.orig/drivers/net/sky2.c
+++ gregkh-2.6/drivers/net/sky2.c
-@@ -3268,9 +3268,9 @@ static int __devinit sky2_probe(struct p
+@@ -3279,9 +3279,9 @@ static int __devinit sky2_probe(struct p
if (err)
goto err_out_iounmap;