linux: update 3.1 to 3.1.1

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 810-mmc-fixes.patch

diff --git a/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch b/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
index 97de558..81d08c6 100644 (file)
--- a/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/mmc/host/omap.c
-===================================================================
---- linux-3.1.orig/drivers/mmc/host/omap.c     2011-10-30 00:48:27.429058258 +0200
-+++ linux-3.1/drivers/mmc/host/omap.c  2011-10-30 00:48:55.981038523 +0200
+--- 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;
  
@@ -21,10 +19,8 @@ Index: linux-3.1/drivers/mmc/host/omap.c
  
        return 0;
  
-Index: linux-3.1/drivers/mmc/core/core.c
-===================================================================
---- linux-3.1.orig/drivers/mmc/core/core.c     2011-10-30 00:48:27.437058255 +0200
-+++ linux-3.1/drivers/mmc/core/core.c  2011-10-30 00:48:55.981038523 +0200
+--- a/drivers/mmc/core/core.c
++++ b/drivers/mmc/core/core.c
 @@ -76,12 +76,13 @@ static int mmc_schedule_delayed_work(str
  }
  
@@ -41,10 +37,8 @@ Index: linux-3.1/drivers/mmc/core/core.c
  
  /**
   *    mmc_request_done - finish processing an MMC request
-Index: linux-3.1/include/linux/mmc/host.h
-===================================================================
---- linux-3.1.orig/include/linux/mmc/host.h    2011-10-30 00:48:27.445058249 +0200
-+++ linux-3.1/include/linux/mmc/host.h 2011-10-30 00:48:55.981038523 +0200
+--- a/include/linux/mmc/host.h
++++ b/include/linux/mmc/host.h
 @@ -394,4 +394,7 @@ static inline int mmc_host_cmd23(struct
  {
        return host->caps & MMC_CAP_CMD23;