aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-11 12:16:56 +0200
committerJiri Kosina <jkosina@suse.cz>2010-06-16 18:05:05 +0200
commitfd0961ff67727482bb20ca7e8ea97b83e9de2ddb (patch)
tree6d8d6d002ebda0ffb27a7e0beb6e3549cac914ae
parent421f91d21ad6f799dc7b489bb33cc560ccc56f98 (diff)
downloadmrst-s0i3-test-fd0961ff67727482bb20ca7e8ea97b83e9de2ddb.tar.gz
mrst-s0i3-test-fd0961ff67727482bb20ca7e8ea97b83e9de2ddb.tar.xz
mrst-s0i3-test-fd0961ff67727482bb20ca7e8ea97b83e9de2ddb.zip
fix typos concerning "instead"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/powerpc/platforms/ps3/htab.c2
-rw-r--r--drivers/rtc/rtc-fm3130.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 1e8a1e39dfe..15a2510ee63 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/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/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c
index ff6fce61ea4..e4de8f37ae4 100644
--- a/drivers/rtc/rtc-fm3130.c
+++ b/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;
}