aboutsummaryrefslogtreecommitdiffstats
path: root/d13.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-14 13:59:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-14 13:59:04 +0200
commit5a7f345ba5e849229317f73497a17637c9a08e4a (patch)
tree4d7661b70e4da95d2acfddce1ba76b7b3190cd3f /d13.patch
parent1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff)
downloadpatches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz
get a bunch of stuff finally upstream.
Diffstat (limited to 'd13.patch')
-rw-r--r--d13.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/d13.patch b/d13.patch
index aec58db47c1152..548251452cb571 100644
--- a/d13.patch
+++ b/d13.patch
@@ -4,7 +4,7 @@
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
-@@ -1883,19 +1883,18 @@ static int uvesafb_setup(char *options)
+@@ -1860,19 +1860,18 @@ static int uvesafb_setup(char *options)
}
#endif /* !MODULE */