diff options
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 52b368b34346..73c651e83d92 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
@@ -145,7 +145,7 @@ static struct irq_chip ixdp2x00_cpld_irq_chip = { | |||
145 | .unmask = ixdp2x00_irq_unmask | 145 | .unmask = ixdp2x00_irq_unmask |
146 | }; | 146 | }; |
147 | 147 | ||
148 | void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs) | 148 | void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs) |
149 | { | 149 | { |
150 | unsigned int irq; | 150 | unsigned int irq; |
151 | 151 | ||
@@ -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 |