From aada563860a7b07e89f6ea40e7ce9e811ad6c25d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 26 Dec 2014 12:19:45 -0600
Subject: sync patch
---
.../lemote-yeelong/patches/3.17.7/sm7xx-fb.patch | 62 +++++++++++-----------
1 file changed, 31 insertions(+), 31 deletions(-)
(limited to 'target')
diff --git a/target/mips64/lemote-yeelong/patches/3.17.7/sm7xx-fb.patch b/target/mips64/lemote-yeelong/patches/3.17.7/sm7xx-fb.patch
index 413840abd..bcdec83cf 100644
--- a/target/mips64/lemote-yeelong/patches/3.17.7/sm7xx-fb.patch
+++ b/target/mips64/lemote-yeelong/patches/3.17.7/sm7xx-fb.patch
@@ -1,29 +1,29 @@
-diff -Nur linux-3.15.6.orig/drivers/staging/Kconfig linux-3.15.6/drivers/staging/Kconfig
---- linux-3.15.6.orig/drivers/staging/Kconfig 2014-07-18 01:23:31.000000000 +0200
-+++ linux-3.15.6/drivers/staging/Kconfig 2014-07-22 17:59:31.842279622 +0200
-@@ -80,6 +80,8 @@
+diff -Nur linux-3.17.7.orig/drivers/staging/Kconfig linux-3.17.7/drivers/staging/Kconfig
+--- linux-3.17.7.orig/drivers/staging/Kconfig 2014-12-16 11:37:26.000000000 -0600
++++ linux-3.17.7/drivers/staging/Kconfig 2014-12-26 11:10:09.700350770 -0600
+@@ -64,6 +64,8 @@
- source "drivers/staging/wlags49_h25/Kconfig"
+ source "drivers/staging/iio/Kconfig"
+source "drivers/staging/sm7xxfb/Kconfig"
+
- source "drivers/staging/crystalhd/Kconfig"
+ source "drivers/staging/xgifb/Kconfig"
- source "drivers/staging/cxt1e1/Kconfig"
-diff -Nur linux-3.15.6.orig/drivers/staging/Makefile linux-3.15.6/drivers/staging/Makefile
---- linux-3.15.6.orig/drivers/staging/Makefile 2014-07-18 01:23:31.000000000 +0200
-+++ linux-3.15.6/drivers/staging/Makefile 2014-07-22 17:59:31.842279622 +0200
-@@ -34,6 +34,7 @@
+ source "drivers/staging/emxx_udc/Kconfig"
+diff -Nur linux-3.17.7.orig/drivers/staging/Makefile linux-3.17.7/drivers/staging/Makefile
+--- linux-3.17.7.orig/drivers/staging/Makefile 2014-12-16 11:37:26.000000000 -0600
++++ linux-3.17.7/drivers/staging/Makefile 2014-12-26 11:09:30.844351126 -0600
+@@ -27,6 +27,7 @@
+ obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_IIO) += iio/
- obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
- obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
-+obj-$(CONFIG_FB_SM7XX) += sm7xxfb/
- obj-$(CONFIG_CRYSTALHD) += crystalhd/
- obj-$(CONFIG_CXT1E1) += cxt1e1/
obj-$(CONFIG_FB_XGI) += xgifb/
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/Kconfig linux-3.15.6/drivers/staging/sm7xxfb/Kconfig
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/Kconfig 2014-07-22 17:59:31.846279635 +0200
++obj-$(CONFIG_FB_SM7XX) += sm7xxfb/
+ obj-$(CONFIG_USB_EMXX) += emxx_udc/
+ obj-$(CONFIG_BCM_WIMAX) += bcm/
+ obj-$(CONFIG_FT1000) += ft1000/
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/Kconfig linux-3.17.7/drivers/staging/sm7xxfb/Kconfig
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/Kconfig 1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/Kconfig 2014-12-26 11:08:55.868351446 -0600
@@ -0,0 +1,13 @@
+config FB_SM7XX
+ tristate "Silicon Motion SM7XX framebuffer support"
@@ -38,14 +38,14 @@ diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/Kconfig linux-3.15.6/drivers
+ This driver is also available as a module. The module will be
+ called sm7xxfb. If you want to compile it as a module, say M
+ here and read <file:Documentation/kbuild/modules.txt>.
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/Makefile linux-3.15.6/drivers/staging/sm7xxfb/Makefile
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/Makefile 2014-07-22 17:59:31.846279635 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/Makefile linux-3.17.7/drivers/staging/sm7xxfb/Makefile
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/Makefile 1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/Makefile 2014-12-26 11:08:55.868351446 -0600
@@ -0,0 +1 @@
+obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xxfb.c linux-3.15.6/drivers/staging/sm7xxfb/sm7xxfb.c
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xxfb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/sm7xxfb.c 2014-07-22 17:59:31.930279894 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xxfb.c linux-3.17.7/drivers/staging/sm7xxfb/sm7xxfb.c
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xxfb.c 1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/sm7xxfb.c 2014-12-26 11:08:55.872351446 -0600
@@ -0,0 +1,1026 @@
+/*
+ * Silicon Motion SM7XX frame buffer device
@@ -1073,9 +1073,9 @@ diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xxfb.c linux-3.15.6/drive
+MODULE_AUTHOR("Siliconmotion ");
+MODULE_DESCRIPTION("Framebuffer driver for SMI Graphic Cards");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xx.h linux-3.15.6/drivers/staging/sm7xxfb/sm7xx.h
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xx.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/sm7xx.h 2014-07-22 17:59:31.846279635 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xx.h linux-3.17.7/drivers/staging/sm7xxfb/sm7xx.h
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xx.h 1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/sm7xx.h 2014-12-26 11:08:55.872351446 -0600
@@ -0,0 +1,779 @@
+/*
+ * Silicon Motion SM712 frame buffer device
@@ -1856,9 +1856,9 @@ diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xx.h linux-3.15.6/drivers
+};
+
+#define numVGAModes ARRAY_SIZE(VGAMode)
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/TODO linux-3.15.6/drivers/staging/sm7xxfb/TODO
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/TODO 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/TODO 2014-07-22 17:59:31.846279635 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/TODO linux-3.17.7/drivers/staging/sm7xxfb/TODO
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/TODO 1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/TODO 2014-12-26 11:08:55.876351446 -0600
@@ -0,0 +1,9 @@
+TODO:
+- Dual head support
--
cgit v1.2.3