brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0048-Changed-wording-on-logging.-Previously-we-received-e.patch

diff --git a/target/linux/brcm2708/patches-3.10/0048-Changed-wording-on-logging.-Previously-we-received-e.patch b/target/linux/brcm2708/patches-3.10/0048-Changed-wording-on-logging.-Previously-we-received-e.patch
index 5d99f8b..5f7aa4d 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0048-Changed-wording-on-logging.-Previously-we-received-e.patch
+++ b/target/linux/brcm2708/patches-3.10/0048-Changed-wording-on-logging.-Previously-we-received-e.patch
@@ -1,7 +1,7 @@
-From 2d37b2d242b41270a7ae1aeccfe06fc253e8d180 Mon Sep 17 00:00:00 2001
+From 054157625ec6b69ba0f66d4337986122ce9e8d82 Mon Sep 17 00:00:00 2001
 From: Technion <Technion>
 Date: Mon, 11 Feb 2013 22:08:53 +1100
-Subject: [PATCH 048/174] Changed wording on logging. Previously, we received
+Subject: [PATCH 048/196] Changed wording on logging. Previously, we received
  errors like this: mmc0: could read SD Status register (SSR) at the 3th
  attempt A more sensible response is now returned. A typo also fixed in
  comments.
@@ -10,9 +10,11 @@ Subject: [PATCH 048/174] Changed wording on logging. Previously, we received
  drivers/mmc/core/sd.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
+index 1ee6cf3..90228f9 100644
 --- a/drivers/mmc/core/sd.c
 +++ b/drivers/mmc/core/sd.c
-@@ -238,7 +238,7 @@ static int mmc_read_scr(struct mmc_card
+@@ -238,7 +238,7 @@ static int mmc_read_scr(struct mmc_card *card)
  
                err = mmc_app_send_scr(card, card->raw_scr);
                if( !err )
@@ -21,7 +23,7 @@ Subject: [PATCH 048/174] Changed wording on logging. Previously, we received
  
                touch_nmi_watchdog();     // we are still alive!
  
-@@ -320,7 +320,7 @@ static int mmc_read_ssr(struct mmc_card
+@@ -320,7 +320,7 @@ static int mmc_read_ssr(struct mmc_card *card)
  
        if( tries > 1 )
        {
@@ -30,3 +32,6 @@ Subject: [PATCH 048/174] Changed wording on logging. Previously, we received
        }
  
        for (i = 0; i < 16; i++)
+-- 
+1.9.1
+