aboutsummaryrefslogtreecommitdiffstats
path: root/p29.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-16 22:37:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-16 22:37:10 -0700
commit210d894ff19726f6463e0fc1afbb3f6662d18e33 (patch)
tree2a4842e20c1ec73d777a232cef6c2f8d03063a89 /p29.patch
parentf9168bc128d94166d042a2e6514287b1ace399f2 (diff)
downloadpatches-210d894ff19726f6463e0fc1afbb3f6662d18e33.tar.gz
patch refreshes for newer kernel
Diffstat (limited to 'p29.patch')
-rw-r--r--p29.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/p29.patch b/p29.patch
index a3e479668f2522..01c6a81e00d07f 100644
--- a/p29.patch
+++ b/p29.patch
@@ -77,7 +77,7 @@
vio_bus_type.bus_groups = vio_bus_groups;
}
#else /* CONFIG_PPC_SMLPAR */
-@@ -1561,12 +1568,13 @@ static ssize_t modalias_show(struct devi
+@@ -1562,12 +1569,13 @@ static ssize_t modalias_show(struct devi
return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
}
@@ -96,7 +96,7 @@
void vio_unregister_device(struct vio_dev *viodev)
{
-@@ -1602,7 +1610,7 @@ static int vio_hotplug(struct device *de
+@@ -1603,7 +1611,7 @@ static int vio_hotplug(struct device *de
struct bus_type vio_bus_type = {
.name = "vio",