aboutsummaryrefslogtreecommitdiffstats
path: root/csdio2.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-21 16:34:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-21 16:34:49 +0200
commit4758ee8bc89a86c2110b9e85878538ced8045ef5 (patch)
tree69539cae6631b1981fb23b51e01566f9e84f635d /csdio2.patch
parent02611ede94f297e19bea81ddf41425a24569a545 (diff)
downloadpatches-4758ee8bc89a86c2110b9e85878538ced8045ef5.tar.gz
add new patch and remove ones that were long ago merged
Diffstat (limited to 'csdio2.patch')
-rw-r--r--csdio2.patch13
1 files changed, 8 insertions, 5 deletions
diff --git a/csdio2.patch b/csdio2.patch
index af44611e9d5b84..8e3e75db3e6601 100644
--- a/csdio2.patch
+++ b/csdio2.patch
@@ -240,7 +240,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+connected to different SDIO hosts.
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -611,5 +611,28 @@ config TILE_SROM
+@@ -590,5 +590,28 @@ config TILE_SROM
source "drivers/char/xillybus/Kconfig"
@@ -271,11 +271,14 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -62,3 +62,4 @@ js-rtc-y = rtc.o
-
- obj-$(CONFIG_TILE_SROM) += tile-srom.o
- obj-$(CONFIG_XILLYBUS) += xillybus/
+@@ -44,6 +44,7 @@ obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gp
+ obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
+ obj-$(CONFIG_GPIO_TB0219) += tb0219.o
+ obj-$(CONFIG_TELCLOCK) += tlclk.o
+obj-$(CONFIG_MMC_GENERIC_CSDIO) += csdio.o
+
+ obj-$(CONFIG_MWAVE) += mwave/
+ obj-y += agp/
--- /dev/null
+++ b/drivers/char/csdio.c
@@ -0,0 +1,1070 @@