diff options
Diffstat (limited to 'arch/arm/mach-ixp2000')
-rw-r--r-- | arch/arm/mach-ixp2000/enp2611.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/pci.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index 500e997ba7a..9c49435d42c 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c | |||
@@ -198,7 +198,7 @@ subsys_initcall(enp2611_pci_init); | |||
198 | 198 | ||
199 | 199 | ||
200 | /************************************************************************* | 200 | /************************************************************************* |
201 | * ENP-2611 Machine Intialization | 201 | * ENP-2611 Machine Initialization |
202 | *************************************************************************/ | 202 | *************************************************************************/ |
203 | static struct flash_platform_data enp2611_flash_platform_data = { | 203 | static struct flash_platform_data enp2611_flash_platform_data = { |
204 | .map_name = "cfi_probe", | 204 | .map_name = "cfi_probe", |
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 52b368b3434..011065b967b 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 |
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 3084a5fa751..d3d730d2fc2 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
@@ -276,7 +276,7 @@ static int __init ixdp2x01_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
276 | /* Device is located after first MB bridge */ | 276 | /* Device is located after first MB bridge */ |
277 | case 0x0008: | 277 | case 0x0008: |
278 | if (tmp_bus == dev->bus) { | 278 | if (tmp_bus == dev->bus) { |
279 | /* Device is located directy after first MB bridge */ | 279 | /* Device is located directly after first MB bridge */ |
280 | switch (devpin) { | 280 | switch (devpin) { |
281 | case DEVPIN(1, 1): /* Onboard 82546 ch 0 */ | 281 | case DEVPIN(1, 1): /* Onboard 82546 ch 0 */ |
282 | if (machine_is_ixdp2401()) | 282 | if (machine_is_ixdp2401()) |
@@ -299,7 +299,7 @@ static int __init ixdp2x01_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
299 | break; | 299 | break; |
300 | case 0x0010: | 300 | case 0x0010: |
301 | if (tmp_bus == dev->bus) { | 301 | if (tmp_bus == dev->bus) { |
302 | /* Device is located directy after second MB bridge */ | 302 | /* Device is located directly after second MB bridge */ |
303 | /* Secondary bus of second bridge */ | 303 | /* Secondary bus of second bridge */ |
304 | switch (devpin) { | 304 | switch (devpin) { |
305 | case DEVPIN(0, 1): /* DB#0 */ | 305 | case DEVPIN(0, 1): /* DB#0 */ |
@@ -348,7 +348,7 @@ int __init ixdp2x01_pci_init(void) | |||
348 | subsys_initcall(ixdp2x01_pci_init); | 348 | subsys_initcall(ixdp2x01_pci_init); |
349 | 349 | ||
350 | /************************************************************************* | 350 | /************************************************************************* |
351 | * IXDP2x01 Machine Intialization | 351 | * IXDP2x01 Machine Initialization |
352 | *************************************************************************/ | 352 | *************************************************************************/ |
353 | static struct flash_platform_data ixdp2x01_flash_platform_data = { | 353 | static struct flash_platform_data ixdp2x01_flash_platform_data = { |
354 | .map_name = "cfi_probe", | 354 | .map_name = "cfi_probe", |
diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c index 5a09a90c08f..03f4cf7f9de 100644 --- a/arch/arm/mach-ixp2000/pci.c +++ b/arch/arm/mach-ixp2000/pci.c | |||
@@ -102,7 +102,7 @@ int ixp2000_pci_read_config(struct pci_bus *bus, unsigned int devfn, int where, | |||
102 | } | 102 | } |
103 | 103 | ||
104 | /* | 104 | /* |
105 | * We don't do error checks by callling clear_master_aborts() b/c the | 105 | * We don't do error checks by calling clear_master_aborts() b/c the |
106 | * assumption is that the caller did a read first to make sure a device | 106 | * assumption is that the caller did a read first to make sure a device |
107 | * exists. | 107 | * exists. |
108 | */ | 108 | */ |