aboutsummaryrefslogtreecommitdiffstats
path: root/p20.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-23 09:21:56 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-23 09:21:56 -0800
commit4a411fc9cd1b86d9a2ed4e3df49809258d90a1ae (patch)
treeb3ac3e260848c976b545911fa08fdd0cb3c1a3f3 /p20.patch
parent676ce066faeb64332c10434fc255cb34aeb30f71 (diff)
downloadpatches-4a411fc9cd1b86d9a2ed4e3df49809258d90a1ae.tar.gz
remove some patches already upstream and add more rtl8821ae patches
Diffstat (limited to 'p20.patch')
-rw-r--r--p20.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/p20.patch b/p20.patch
index f78b06b95aa3fc..d432c0b05d6376 100644
--- a/p20.patch
+++ b/p20.patch
@@ -4,7 +4,7 @@
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
-@@ -587,7 +587,8 @@ static ssize_t name##_show(struct device
+@@ -575,7 +575,8 @@ static ssize_t name##_show(struct device
{ \
struct parisc_device *padev = to_parisc_device(dev); \
return sprintf(buf, format_string, padev->field); \
@@ -14,7 +14,7 @@
#define pa_dev_attr_id(field, format) pa_dev_attr(field, id.field, format)
-@@ -601,22 +602,24 @@ static ssize_t modalias_show(struct devi
+@@ -589,22 +590,24 @@ static ssize_t modalias_show(struct devi
{
return make_modalias(dev, buf);
}