diff options
| author | Linus Torvalds | 2006-01-10 02:06:53 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-10 02:06:53 +0100 |
| commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
| tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /arch/arm | |
| parent | [PATCH] rcu: don't set ->next_pending in rcu_start_batch() (diff) | |
| parent | Small fixups to the EHCI Kconfig help text (diff) | |
| download | kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.gz kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.xz kernel-qcow2-linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap1/board-perseus2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index bd900b7ab33c..92ff5dc07351 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c @@ -184,7 +184,7 @@ static void __init omap_perseus2_map_io(void) omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); /* - * Ethernet support trough the debug board + * Ethernet support through the debug board * CS1 timings setup */ omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); |