spelling fixes: arch/m68knommu/
PATCH 1/1 spelling fixes: arch/m68knommu/
Spelling fixes in arch/m68knommu/.
---
arch/m68knommu/kernel/comempci.c | 8 ++++---- arch/m68knommu/platform/523x/config.c | 2 +- arch/m68knommu/platform/527x/config.c | 2 +- arch/m68knommu/platform/528x/config.c | 2 +- arch/m68knommu/platform/5307/pit.c | 2 +- arch/m68knommu/platform/5307/timers.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-)
arch/m68knommu/kernel/comempci.c +0 -0
@@ -79,7 +79,7 @@ void pci_interrupt(int irq, void *id, struct pt_regs *fp);
/*****************************************************************************/
/*
- * Some platforms have custom ways of reseting the PCI bus.
+ * Some platforms have custom ways of resetting the PCI bus.
*/
void pci_resetbus(void)
@@ -145,7 +145,7 @@ int pcibios_assign_resource_slot(int slot)
}
/* Determine space required by BAR */
- /* FIXME: this should go backwords from 0x80000000... */
+ /* FIXME: this should go backwards from 0x80000000... */
for (i = 0; (i < 32); i++) {
if ((0x1 << i) & (val & 0xfffffffc))
break;@@ -385,8 +385,8 @@ void pcibios_update_resource(struct pci_dev *dev, struct resource *root, struct /*****************************************************************************/
/*
- * Local routines to interrcept the standard I/O and vector handling
- * code. Don't include this 'till now - initialization code above needs
+ * Local routines to intercept the standard I/O and vector handling
+ * code. Don't include this until now - initialization code above needs
* access to the real code too.
*/
#include <asm/mcfpci.h>
arch/m68knommu/platform/523x/config.c +0 -0
@@ -3,7 +3,7 @@
/*
* linux/arch/m68knommu/platform/523x/config.c
*
- * Sub-architcture dependant initialization code for the Freescale
+ * Sub-architcture dependent initialization code for the Freescale
* 523x CPUs.
*
* Copyright (C) 1999-2005, Greg Ungerer ([email protected])
arch/m68knommu/platform/527x/config.c +0 -0
@@ -3,7 +3,7 @@
/*
* linux/arch/m68knommu/platform/527x/config.c
*
- * Sub-architcture dependant initialization code for the Freescale
+ * Sub-architcture dependent initialization code for the Freescale
* 5270/5271 CPUs.
*
* Copyright (C) 1999-2004, Greg Ungerer ([email protected])
arch/m68knommu/platform/528x/config.c +0 -0
@@ -3,7 +3,7 @@
/*
* linux/arch/m68knommu/platform/528x/config.c
*
- * Sub-architcture dependant initialization code for the Motorola
+ * Sub-architcture dependent initialization code for the Motorola
* 5280 and 5282 CPUs.
*
* Copyright (C) 1999-2003, Greg Ungerer ([email protected])
arch/m68knommu/platform/5307/pit.c +0 -0
@@ -79,7 +79,7 @@ unsigned long coldfire_pit_offset(void)
/* * If we are still in the first half of the upcount and a - * timer interupt is pending, then add on a ticks worth of time. + * timer interrupt is pending, then add on a ticks worth of time. */ offset = ((pmr - pcntr) * (1000000 / HZ)) / pmr; if ((offset < (1000000 / HZ / 2)) && (*ipr & MCFPIT_IMR_IBIT))
arch/m68knommu/platform/5307/timers.c +0 -0
@@ -29,8 +29,8 @@
#define TA(a) (MCF_MBAR + MCFTIMER_BASE1 + (a))
/*
- * Default the timer and vector to use for ColdFire. Some ColdFire
- * CPU's and some boards may want different. Their sub-architecture
+ * Default timer and vector to use for ColdFire. Some ColdFire CPUs
+ * and some boards may want different values. Their sub-architecture
* startup code (in config.c) can change these if they want.
*/
unsigned int mcf_timervector = 29;
Signature · 4 lines
1.5.0.1 -- Simon Arlott
Quoted 5 lines · Simon Arlott
- * Local routines to interrcept the standard I/O and vector handling
- * code. Don't include this 'till now - initialization code above needs
+ * Local routines to intercept the standard I/O and vector handling
+ * code. Don't include this until now - initialization code above needs
* access to the real code too.
What's wrong with 'til?
Quoted 2 lines
- * Sub-architcture dependant initialization code for the Freescale
+ * Sub-architcture dependent initialization code for the Freescale
...
Quoted 2 lines
- * Sub-architcture dependant initialization code for the Freescale
+ * Sub-architcture dependent initialization code for the Freescale
...
Quoted 2 lines
- * Sub-architcture dependant initialization code for the Motorola
+ * Sub-architcture dependent initialization code for the Motorola
You want "Sub-architecture".
-f
Quoted 11 lines · Finn Thain
Quoted 5 lines · Simon Arlott
- * Local routines to interrcept the standard I/O and vector handling
- * code. Don't include this 'till now - initialization code above needs
+ * Local routines to intercept the standard I/O and vector handling
+ * code. Don't include this until now - initialization code above needs
* access to the real code too.What's wrong with 'til?
Nothing, but is there anything wrong with correcting 'till to until?
Quoted 8 lines
Quoted 2 lines
- * Sub-architcture dependant initialization code for the Freescale
+ * Sub-architcture dependent initialization code for the Freescale...
Quoted 2 lines
- * Sub-architcture dependant initialization code for the Freescale
+ * Sub-architcture dependent initialization code for the Freescale
Quoted 6 lines
...
Quoted 2 lines
- * Sub-architcture dependant initialization code for the Motorola
+ * Sub-architcture dependent initialization code for the MotorolaYou want "Sub-architecture".
Bah. I managed to miss that word in the line more than once... and I had it highlighted in red :|
Signature · 1 line
Simon Arlott
Quoted 10 lines · Simon Arlott
Quoted 9 lines · Finn Thain
Quoted 5 lines · Simon Arlott
- * Local routines to interrcept the standard I/O and vector handling
- * code. Don't include this 'till now - initialization code above needs
+ * Local routines to intercept the standard I/O and vector handling
+ * code. Don't include this until now - initialization code above needs
* access to the real code too.
Quoted 4 lines
Quoted 2 lines
What's wrong with 'til?
Nothing, but is there anything wrong with correcting 'till to until?
Correcting? Well, you might correct the grammar, e.g. "This wasn't included until now because..." Non-native English speakers will read this comment and that's a good argument for good grammar, but I don't care too much for fixing this myself.
It is hard for me to understand other people's terse comments, which would make it hard for me to rewrite them in correct English. Sometimes I first have to figure out the idiom being used. But it is even harder to understand them after nuances are removed.
To answer your question, I find it easier to parse the original idiom, "'til now". Your corruption, "until now", loses information available to anyone who can recognise the idiom. Granted, this is not the worst example of that effect...
-f
Quoted 4 lines · Finn Thain
To answer your question, I find it easier to parse the original idiom, "'til now". Your corruption, "until now", loses information available to anyone who can recognise the idiom. Granted, this is not the worst example of that effect...
It is either "till now" or "until now".
"'til" is just broken english.
-- kolla
Quoted 9 lines · Kolbjørn Barmen
Quoted 4 lines · Finn Thain
To answer your question, I find it easier to parse the original idiom, "'til now". Your corruption, "until now", loses information available to anyone who can recognise the idiom. Granted, this is not the worst example of that effect...
It is either "till now" or "until now".
"'til" is just broken english.
Seems you are right that "till" is also an accepted abbreviation (I found both in the Oxford American Dictionary). I suppose that there's no typo to fix here.
-f
Quoted 3 lines
-- kolla
Quoted 9 lines · Finn Thain
Quoted 7 lines · Kolbjørn Barmen
Quoted 4 lines · Finn Thain
To answer your question, I find it easier to parse the original idiom, "'til now". Your corruption, "until now", loses information available to anyone who can recognise the idiom. Granted, this is not the worst example of that effect...
Quoted 6 lines
Quoted 2 lines
It is either "till now" or "until now".
"'til" is just broken english.Seems you are right that "till" is also an accepted abbreviation (I found both in the Oxford American Dictionary). I suppose that there's no typo to fix here.
Well, both "'till" and "'til" are broken. It is either "till" or "until". The fix was valid.
"until" and "till" are _not_ the same word, "till" is not an abbreviation of "until", it's actually quite the opposite. I suspect this is obivous for most non-english germanic speakers I will guess. "Until" is in norwegian "inntil", meaning "in to", and "till" is just english spelling of our "til" (meaning "to").
The spelling of "until" should ofcourse be "in till". :)
I belive the Scots also say "unto".
Signature · 2 lines
Kolbjørn Barmen UNINETT Driftsenter
Quoted 21 lines · Kolbjørn Barmen
Quoted 9 lines · Finn Thain
Quoted 7 lines · Kolbjørn Barmen
Quoted 4 lines · Finn Thain
To answer your question, I find it easier to parse the original idiom, "'til now". Your corruption, "until now", loses information available to anyone who can recognise the idiom. Granted, this is not the worst example of that effect...
Quoted 6 lines
Quoted 2 lines
It is either "till now" or "until now".
"'til" is just broken english.Seems you are right that "till" is also an accepted abbreviation (I found both in the Oxford American Dictionary). I suppose that there's no typo to fix here.
Well, both "'till" and "'til" are broken. It is either "till" or "until". The fix was valid.
Quoted 7 lines
"until" and "till" are _not_ the same word, "till" is not an abbreviation of "until", it's actually quite the opposite. I suspect this is obivous for most non-english germanic speakers I will guess. "Until" is in norwegian "inntil", meaning "in to", and "till" is just english spelling of our "til" (meaning "to").
The spelling of "until" should ofcourse be "in till". :)
The etymology of "until" shows that it bases itself in the middle english "untill" which is derived from (quote) "un- (see unto) + till" or just merely (quote) "till".
Looking up "till" gives (quote) "till (til) prep., conj. [OE. til] same as UNTIL"
That means that "til" is Old English for "till" which when used as a preposition or conjunction is the same as "until". (Old English stopped being used circa 1100AD.)
However, discussing "til" is merely a distraction. "til" is not "'til". "'til" is a contraction of "until" where the "'" here denotes the missing letters ("un"). Just like "he'll" where the "'" denotes the letters "wi" (giving "he will") or "'70" meaning "1970".
So I'd say that "'til" is as correct as "until" which can, in turn, be directly replaced by the word "till". Or at least according to my late '70s dictionary.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: