diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 11:06:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 11:06:03 -0700 |
| commit | 482878a1a7758221a34413944e9139104ed487ee (patch) | |
| tree | ef430810f4d7f89a95852b11f29f1449a48f5033 /p19.patch | |
| parent | 210d894ff19726f6463e0fc1afbb3f6662d18e33 (diff) | |
| download | patches-482878a1a7758221a34413944e9139104ed487ee.tar.gz | |
kdbus and pci patches added
Diffstat (limited to 'p19.patch')
| -rw-r--r-- | p19.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/p19.patch b/p19.patch index 94bbb029dfd228..51c192b5195972 100644 --- a/p19.patch +++ b/p19.patch @@ -4,7 +4,7 @@ --- a/arch/mips/sgi-ip22/ip22-gio.c +++ b/arch/mips/sgi-ip22/ip22-gio.c -@@ -182,6 +182,7 @@ static ssize_t modalias_show(struct devi +@@ -191,6 +191,7 @@ static ssize_t modalias_show(struct devi return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; } @@ -12,7 +12,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -191,6 +192,7 @@ static ssize_t name_show(struct device * +@@ -200,6 +201,7 @@ static ssize_t name_show(struct device * giodev = to_gio_device(dev); return sprintf(buf, "%s", giodev->name); } @@ -20,7 +20,7 @@ static ssize_t id_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -200,13 +202,15 @@ static ssize_t id_show(struct device *de +@@ -209,13 +211,15 @@ static ssize_t id_show(struct device *de giodev = to_gio_device(dev); return sprintf(buf, "%x", giodev->id.id); } @@ -41,7 +41,7 @@ static int gio_device_uevent(struct device *dev, struct kobj_uevent_env *env) { -@@ -377,7 +381,7 @@ static void ip22_check_gio(int slotno, u +@@ -396,7 +400,7 @@ static void ip22_check_gio(int slotno, u static struct bus_type gio_bus_type = { .name = "gio", |