Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd97ab4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6 

* 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Revert wrong fixes for common misspellings
parents 7fcaa9aa e9c54999

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,7 @@ static struct clk timer2_clk = { 
	.name = "timer2",

	.name = "timer2",

	.parent = &pll1_aux_clk,

	.parent = &pll1_aux_clk,

	.lpsc = DAVINCI_LPSC_TIMER2,

	.lpsc = DAVINCI_LPSC_TIMER2,

	.usecount = 1,              /* REVISIT: why can't' this be disabled? */

	.usecount = 1,              /* REVISIT: why can't this be disabled? */

};

};





static struct clk timer3_clk = {

static struct clk timer3_clk = {

arch/arm/mach-davinci/dm644x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -274,7 +274,7 @@ static struct clk timer2_clk = { 
	.name = "timer2",

	.name = "timer2",

	.parent = &pll1_aux_clk,

	.parent = &pll1_aux_clk,

	.lpsc = DAVINCI_LPSC_TIMER2,

	.lpsc = DAVINCI_LPSC_TIMER2,

	.usecount = 1,              /* REVISIT: why can't' this be disabled? */

	.usecount = 1,              /* REVISIT: why can't this be disabled? */

};

};





static struct clk_lookup dm644x_clks[] = {

static struct clk_lookup dm644x_clks[] = {

arch/powerpc/include/asm/uninorth.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ 
 *

 *

 * Obviously, the GART is not cache coherent and so any change to it

 * Obviously, the GART is not cache coherent and so any change to it

 * must be flushed to memory (or maybe just make the GART space non

 * must be flushed to memory (or maybe just make the GART space non

 * cachable). AGP memory itself does't seem to be cache coherent neither.

 * cachable). AGP memory itself doesn't seem to be cache coherent neither.

 *

 *

 * In order to invalidate the GART (which is probably necessary to inval

 * In order to invalidate the GART (which is probably necessary to inval

 * the bridge internal TLBs), the following sequence has to be written,

 * the bridge internal TLBs), the following sequence has to be written,

drivers/infiniband/hw/qib/qib_iba6120.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1799,7 +1799,7 @@ static int qib_6120_setup_reset(struct qib_devdata *dd) 
	/*

	/*

	 * Keep chip from being accessed until we are ready.  Use

	 * Keep chip from being accessed until we are ready.  Use

	 * writeq() directly, to allow the write even though QIB_PRESENT

	 * writeq() directly, to allow the write even though QIB_PRESENT

	 * isn't' set.

	 * isn't set.

	 */

	 */

	dd->flags &= ~(QIB_INITTED | QIB_PRESENT);

	dd->flags &= ~(QIB_INITTED | QIB_PRESENT);

	dd->int_counter = 0; /* so we check interrupts work again */

	dd->int_counter = 0; /* so we check interrupts work again */

drivers/infiniband/hw/qib/qib_iba7220.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2111,7 +2111,7 @@ static int qib_setup_7220_reset(struct qib_devdata *dd) 
	/*

	/*

	 * Keep chip from being accessed until we are ready.  Use

	 * Keep chip from being accessed until we are ready.  Use

	 * writeq() directly, to allow the write even though QIB_PRESENT

	 * writeq() directly, to allow the write even though QIB_PRESENT

	 * isn't' set.

	 * isn't set.

	 */

	 */

	dd->flags &= ~(QIB_INITTED | QIB_PRESENT);

	dd->flags &= ~(QIB_INITTED | QIB_PRESENT);

	dd->int_counter = 0; /* so we check interrupts work again */

	dd->int_counter = 0; /* so we check interrupts work again */