diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:22:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:22:26 -0400 |
| commit | 1b41526975d8318ca17c93f724893884d03a0560 (patch) | |
| tree | 929f6def777a63e1565b751ad70f5ae75b07c660 /arch/arm/mach-ixp4xx/Kconfig | |
| parent | b1c231f5a57cb4a417c38a8a946f1e66db3bb9c0 (diff) | |
| parent | a7d14f875f03cb78992da8387be81a4c9197f101 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3543/1: [Fwd: PXA270 bootparams address not set]
[ARM] Trivial typo fixes
Diffstat (limited to 'arch/arm/mach-ixp4xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-ixp4xx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 2a39f9e481ad..3b23f43cb160 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
| @@ -141,7 +141,7 @@ config IXP4XX_INDIRECT_PCI | |||
| 141 | 2) If > 64MB of memory space is required, the IXP4xx can be | 141 | 2) If > 64MB of memory space is required, the IXP4xx can be |
| 142 | configured to use indirect registers to access PCI This allows | 142 | configured to use indirect registers to access PCI This allows |
| 143 | for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. | 143 | for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. |
| 144 | The disadvantadge of this is that every PCI access requires | 144 | The disadvantage of this is that every PCI access requires |
| 145 | three local register accesses plus a spinlock, but in some | 145 | three local register accesses plus a spinlock, but in some |
| 146 | cases the performance hit is acceptable. In addition, you cannot | 146 | cases the performance hit is acceptable. In addition, you cannot |
| 147 | mmap() PCI devices in this case due to the indirect nature | 147 | mmap() PCI devices in this case due to the indirect nature |