diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 13:00:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 13:00:22 -0400 |
| commit | d07b3c25327c5ae3792d0ed0c135dee4727200a1 (patch) | |
| tree | 2ffad8da1f9004bdeb32bf76faa08fa104797b89 /arch/arm/mach-ixp2000/ixdp2x00.c | |
| parent | dde33348e53ecab687a9768bf5262f0b8f79b7f2 (diff) | |
| parent | 6cbdc8c5357276307a77deeada3f04626ff17da6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
[ARM] spelling fixes
[ARM] at91_adc parenthesis balance
[ARM] 4400/1: S3C24XX: Add high-speed MMC device definition
[ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings
[ARM] 4398/1: S3C2443: Fix watchdog IRQ number
[ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity
[ARM] 4396/1: S3C2443: Add missing HCLK clocks
[ARM] 4395/1: S3C24XX: add include of <linux/sysdev.h> to relevant machines
[ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu
[ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts
[ARM] ARMv6: add CPU_HAS_ASID configuration
[ARM] integrator: fix pci_v3 compile error with DEBUG_LL
[ARM] gic: Fix gic cascade irq handling
[ARM] Silence OMAP kernel configuration warning
[ARM] Update ARM syscalls
[ARM] 4384/1: S3C2412/13 SPI registers offset correction
[ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files
[ARM] 4382/1: iop13xx: fix msi support
[ARM] Remove Integrator/CP SMP platform support
[ARM] 4378/1: KS8695: Serial driver fix
...
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 52b368b34346..011065b967b4 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -195,7 +195,7 @@ void __init ixdp2x00_map_io(void) | |||
| 195 | * instances of the kernel. So far so good. Peers on the PCI bus running | 195 | * instances of the kernel. So far so good. Peers on the PCI bus running |
| 196 | * Linux is a common design in telecom systems. The problem is that instead | 196 | * Linux is a common design in telecom systems. The problem is that instead |
| 197 | * of all the devices being controlled by a single host, different | 197 | * of all the devices being controlled by a single host, different |
| 198 | * devices are controlles by different NPUs on the same bus, leading to | 198 | * devices are controlled by different NPUs on the same bus, leading to |
| 199 | * multiple hosts on the bus. The exact bus layout looks like: | 199 | * multiple hosts on the bus. The exact bus layout looks like: |
| 200 | * | 200 | * |
| 201 | * Bus 0 | 201 | * Bus 0 |
| @@ -211,7 +211,7 @@ void __init ixdp2x00_map_io(void) | |||
| 211 | * | | | | | | 211 | * | | | | | |
| 212 | * ... Dev PMC Media Eth0 Eth1 ... | 212 | * ... Dev PMC Media Eth0 Eth1 ... |
| 213 | * | 213 | * |
| 214 | * The master controlls all but Eth1, which is controlled by the | 214 | * The master controls all but Eth1, which is controlled by the |
| 215 | * slave. What this means is that the both the master and the slave | 215 | * slave. What this means is that the both the master and the slave |
| 216 | * have to scan the bus, but only one of them can enumerate the bus. | 216 | * have to scan the bus, but only one of them can enumerate the bus. |
| 217 | * In addition, after the bus is scanned, each kernel must remove | 217 | * In addition, after the bus is scanned, each kernel must remove |