diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
| commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
| tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /arch/arm | |
| parent | dbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff) | |
| parent | b3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff) | |
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) | |||
| 184 | omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); | 184 | omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); |
| 185 | 185 | ||
| 186 | /* | 186 | /* |
| 187 | * Ethernet support trough the debug board | 187 | * Ethernet support through the debug board |
| 188 | * CS1 timings setup | 188 | * CS1 timings setup |
| 189 | */ | 189 | */ |
| 190 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); | 190 | omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); |