diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-14 17:22:50 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-14 17:22:50 +0900 |
| commit | 32f98f6fc194255e3a639444fe06862e628124c0 (patch) | |
| tree | 938fffe42cdfcad3125631cb4d693afeae9f3669 /p29.patch | |
| parent | 7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3 (diff) | |
| download | patches-32f98f6fc194255e3a639444fe06862e628124c0.tar.gz | |
another pci patch is now upstream
Diffstat (limited to 'p29.patch')
| -rw-r--r-- | p29.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/p29.patch b/p29.patch index 8081712d15e478..bb1f2d68090129 100644 --- a/p29.patch +++ b/p29.patch @@ -77,7 +77,7 @@ vio_bus_type.bus_groups = vio_bus_groups; } #else /* CONFIG_PPC_SMLPAR */ -@@ -1549,12 +1556,13 @@ static ssize_t modalias_show(struct devi +@@ -1548,12 +1555,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) { -@@ -1590,7 +1598,7 @@ static int vio_hotplug(struct device *de +@@ -1589,7 +1597,7 @@ static int vio_hotplug(struct device *de struct bus_type vio_bus_type = { .name = "vio", |