From 0eed54b818f0ef4f2ef4cad53dce6c0cae6d07b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 11 Jun 2010 12:16:56 +0200 Subject: [PATCH] --- yaml --- r: 204413 b: refs/heads/master c: fd0961ff67727482bb20ca7e8ea97b83e9de2ddb h: refs/heads/master i: 204411: 6807a066cbe000554d47fc2effeaecafb4e17ff2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/ps3/htab.c | 2 +- trunk/drivers/rtc/rtc-fm3130.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4fb9bb295d91..40dc9f52a82f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 421f91d21ad6f799dc7b489bb33cc560ccc56f98 +refs/heads/master: fd0961ff67727482bb20ca7e8ea97b83e9de2ddb diff --git a/trunk/arch/powerpc/platforms/ps3/htab.c b/trunk/arch/powerpc/platforms/ps3/htab.c index 1e8a1e39dfe8..15a2510ee639 100644 --- a/trunk/arch/powerpc/platforms/ps3/htab.c +++ b/trunk/arch/powerpc/platforms/ps3/htab.c @@ -136,7 +136,7 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp, * As lv1_read_htab_entries() does not give us the RPN, we can * not synthesize the new hpte_r value here, and therefore can * not update the hpte with lv1_insert_htab_entry(), so we - * insted invalidate it and ask the caller to update it via + * instead invalidate it and ask the caller to update it via * ps3_hpte_insert() by returning a -1 value. */ if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { diff --git a/trunk/drivers/rtc/rtc-fm3130.c b/trunk/drivers/rtc/rtc-fm3130.c index ff6fce61ea41..e4de8f37ae4a 100644 --- a/trunk/drivers/rtc/rtc-fm3130.c +++ b/trunk/drivers/rtc/rtc-fm3130.c @@ -104,7 +104,7 @@ static int fm3130_get_time(struct device *dev, struct rtc_time *t) if (!fm3130->data_valid) { /* We have invalid data in RTC, probably due to battery faults or other problems. Return EIO - for now, it will allow us to set data later insted + for now, it will allow us to set data later instead of error during probing which disables device */ return -EIO; }