summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/mcftimer.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-04-14 00:32:13 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-14 00:32:13 +0200
commita84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch)
treeba054d4b1a20dadec088fd4d8983fb5939227e46 /arch/m68k/include/asm/mcftimer.h
parentARM: 6872/1: arch:common:Makefile Remove unused config in the Makefile. (diff)
parentARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio() (diff)
downloadlinux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.tar.xz
linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.zip
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/m68k/include/asm/mcftimer.h')
-rw-r--r--arch/m68k/include/asm/mcftimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/mcftimer.h b/arch/m68k/include/asm/mcftimer.h
index 92b276fe8240..351c27237874 100644
--- a/arch/m68k/include/asm/mcftimer.h
+++ b/arch/m68k/include/asm/mcftimer.h
@@ -27,7 +27,7 @@
/*
* Bit definitions for the Timer Mode Register (TMR).
- * Register bit flags are common accross ColdFires.
+ * Register bit flags are common across ColdFires.
*/
#define MCFTIMER_TMR_PREMASK 0xff00 /* Prescalar mask */
#define MCFTIMER_TMR_DISCE 0x0000 /* Disable capture */