X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-ixp2000%2Fixdp2x00.c;h=cda60b74c8f1495c370c16ee375804745afee665;hb=a9fdee76789476a10f923f9fb3c84993042da3ac;hp=5df9992b7afa4b7c09e67c359b496a1b1e03e559;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 5df9992b7..cda60b74c 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -194,7 +197,7 @@ void __init ixdp2x00_map_io(void) * Linux is a common design in telecom systems. The problem is that instead * of all the devices being controlled by a single host, different * devices are controlles by different NPUs on the same bus, leading to - * multiple hosts on the bus. The exact bus layout looks like: + * multiple hosts on the bus.i The exact bus layout looks like: * * Bus 0 * Master NPU <-------------------+-------------------> Slave NPU @@ -210,9 +213,9 @@ void __init ixdp2x00_map_io(void) * ... Dev PMC Media Eth0 Eth1 ... * * The master controlls all but Eth1, which is controlled by the - * slave. What this means is that the both the master and the slave + * slave. What this measn is that the both the master and the slave * have to scan the bus, but only one of them can enumerate the bus. - * In addition, after the bus is scanned, each kernel must remove + * In addition, after the bus is scaned, each kernel must remove * the device(s) it does not control from the PCI dev list otherwise * a driver on each NPU will try to manage it and we will have horrible * conflicts. Oh..and the slave NPU needs to see the master NPU