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 /p22.patch | |
| parent | 210d894ff19726f6463e0fc1afbb3f6662d18e33 (diff) | |
| download | patches-482878a1a7758221a34413944e9139104ed487ee.tar.gz | |
kdbus and pci patches added
Diffstat (limited to 'p22.patch')
| -rw-r--r-- | p22.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/p22.patch b/p22.patch index 2ac2bbd80f0bf9..ae6f4fda0f85ba 100644 --- a/p22.patch +++ b/p22.patch @@ -4,7 +4,7 @@ --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c -@@ -64,24 +64,22 @@ static ssize_t name##_show(struct device +@@ -65,24 +65,22 @@ static ssize_t name##_show(struct device { \ struct amba_device *dev = to_amba_device(_dev); \ return sprintf(buf, fmt, arg); \ @@ -38,7 +38,7 @@ #ifdef CONFIG_PM /* -@@ -136,7 +134,7 @@ static const struct dev_pm_ops amba_pm = +@@ -137,7 +135,7 @@ static const struct dev_pm_ops amba_pm = */ struct bus_type amba_bustype = { .name = "amba", |