aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-05-15 17:23:02 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-05-15 17:23:02 +0000
commita4c0645326f05e9e69e6422f0d76f2141aea16b3 (patch)
tree466d79b0d857a146d7c581ba64f1049b9ef8dfc9 /target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
parentec05877491ee0e7dcb6269ebb7e0293584694e3b (diff)
downloadupstream-a4c0645326f05e9e69e6422f0d76f2141aea16b3.tar.gz
upstream-a4c0645326f05e9e69e6422f0d76f2141aea16b3.tar.bz2
upstream-a4c0645326f05e9e69e6422f0d76f2141aea16b3.zip
kernel: update kernel from 2.6.38.2 to 2.6.38.6 and refresh patches
Thank you Peter Wagner for the patch. I refreshed the kernel patches and added the md5sum of the kernel. SVN-Revision: 26905
Diffstat (limited to 'target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch')
-rw-r--r--target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch26
1 files changed, 10 insertions, 16 deletions
diff --git a/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
index 6abcf9823b..854a1305e4 100644
--- a/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
+++ b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
-===================================================================
---- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-27 00:58:54.735744872 +0100
-@@ -1456,6 +1456,7 @@
+--- a/drivers/mmc/host/omap.c
++++ b/drivers/mmc/host/omap.c
+@@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct
host->dma_ch = -1;
host->irq = irq;
@@ -10,7 +8,7 @@ Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
host->phys_base = host->mem_res->start;
host->virt_base = ioremap(res->start, res->end - res->start + 1);
if (!host->virt_base)
-@@ -1495,7 +1496,9 @@
+@@ -1495,7 +1496,9 @@ static int __init mmc_omap_probe(struct
}
}
@@ -21,11 +19,9 @@ Index: linux-2.6.38-rc6/drivers/mmc/host/omap.c
return 0;
-Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
-===================================================================
---- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-27 00:57:32.633556994 +0100
-@@ -75,12 +75,13 @@
+--- a/drivers/mmc/core/core.c
++++ b/drivers/mmc/core/core.c
+@@ -75,12 +75,13 @@ static int mmc_schedule_delayed_work(str
}
/*
@@ -41,11 +37,9 @@ Index: linux-2.6.38-rc6/drivers/mmc/core/core.c
/**
* mmc_request_done - finish processing an MMC request
-Index: linux-2.6.38-rc6/include/linux/mmc/host.h
-===================================================================
---- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-27 00:57:32.633556994 +0100
-@@ -326,5 +326,7 @@
+--- a/include/linux/mmc/host.h
++++ b/include/linux/mmc/host.h
+@@ -325,5 +325,7 @@ static inline int mmc_card_is_powered_re
return host->pm_flags & MMC_PM_KEEP_POWER;
}