diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 11:29:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 11:29:31 -0500 |
| commit | 437f2f91d6597c67662f847d9ed4c99cb3c440cd (patch) | |
| tree | 9051f1a9cccd9951f1c7eb89f064d27c1b592497 /arch/arm/mach-omap1/io.c | |
| parent | 4d9c6a21befe6c73c35f2799c7e25a9eda82a95d (diff) | |
| parent | baa745a3378046ca1c5477495df6ccbec7690428 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix alignment fault handling for ARMv6 and later CPUs
[ARM] 5340/1: fix stack placement after noexecstack changes
[ARM] 5339/1: fix __fls() on ARM
[ARM] Orion: fix bug in pcie configuration cycle function field mask
[ARM] omap: fix a pile of issues
Diffstat (limited to 'arch/arm/mach-omap1/io.c')
| -rw-r--r-- | arch/arm/mach-omap1/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index b3bd8ca85118..4c3e582f3d3c 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c | |||
| @@ -128,7 +128,7 @@ void __init omap1_map_common_io(void) | |||
| 128 | * Common low-level hardware init for omap1. This should only get called from | 128 | * Common low-level hardware init for omap1. This should only get called from |
| 129 | * board specific init. | 129 | * board specific init. |
| 130 | */ | 130 | */ |
| 131 | void __init omap1_init_common_hw() | 131 | void __init omap1_init_common_hw(void) |
| 132 | { | 132 | { |
| 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort | 133 | /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort |
| 134 | * on a Posted Write in the TIPB Bridge". | 134 | * on a Posted Write in the TIPB Bridge". |