diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-11 06:16:56 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:05:05 -0400 |
commit | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (patch) | |
tree | 6d8d6d002ebda0ffb27a7e0beb6e3549cac914ae | |
parent | 421f91d21ad6f799dc7b489bb33cc560ccc56f98 (diff) |
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.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-fm3130.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index 1e8a1e39dfe8..15a2510ee639 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, | |||
136 | * As lv1_read_htab_entries() does not give us the RPN, we can | 136 | * As lv1_read_htab_entries() does not give us the RPN, we can |
137 | * not synthesize the new hpte_r value here, and therefore can | 137 | * not synthesize the new hpte_r value here, and therefore can |
138 | * not update the hpte with lv1_insert_htab_entry(), so we | 138 | * not update the hpte with lv1_insert_htab_entry(), so we |
139 | * insted invalidate it and ask the caller to update it via | 139 | * instead invalidate it and ask the caller to update it via |
140 | * ps3_hpte_insert() by returning a -1 value. | 140 | * ps3_hpte_insert() by returning a -1 value. |
141 | */ | 141 | */ |
142 | if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { | 142 | 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 ff6fce61ea41..e4de8f37ae4a 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) | |||
104 | if (!fm3130->data_valid) { | 104 | if (!fm3130->data_valid) { |
105 | /* We have invalid data in RTC, probably due | 105 | /* We have invalid data in RTC, probably due |
106 | to battery faults or other problems. Return EIO | 106 | to battery faults or other problems. Return EIO |
107 | for now, it will allow us to set data later insted | 107 | for now, it will allow us to set data later instead |
108 | of error during probing which disables device */ | 108 | of error during probing which disables device */ |
109 | return -EIO; | 109 | return -EIO; |
110 | } | 110 | } |