diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 16:24:28 +0200 |
| commit | 24b1c251dfcd02877c40d7e52288c9bc2dc7ff35 (patch) | |
| tree | 8fb3d4332168686f601f58b23815910799b1699f /p19.patch | |
| parent | 71c7e32cd1509d46be836ed19dfe63e217eae8d4 (diff) | |
| download | patches-24b1c251dfcd02877c40d7e52288c9bc2dc7ff35.tar.gz | |
updates and new patches
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 51c192b5195972..0b318722de08f4 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 -@@ -191,6 +191,7 @@ static ssize_t modalias_show(struct devi +@@ -169,6 +169,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) -@@ -200,6 +201,7 @@ static ssize_t name_show(struct device * +@@ -178,6 +179,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) -@@ -209,13 +211,15 @@ static ssize_t id_show(struct device *de +@@ -187,13 +189,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) { -@@ -396,7 +400,7 @@ static void ip22_check_gio(int slotno, u +@@ -374,7 +378,7 @@ static void ip22_check_gio(int slotno, u static struct bus_type gio_bus_type = { .name = "gio", |