diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/removed/devfs | 2 | ||||
-rw-r--r-- | Documentation/driver-model/platform.txt | 2 | ||||
-rw-r--r-- | Documentation/netlabel/introduction.txt | 2 | ||||
-rw-r--r-- | Documentation/pci.txt | 2 | ||||
-rw-r--r-- | Documentation/powerpc/booting-without-of.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/ABI/removed/devfs b/Documentation/ABI/removed/devfs index 8195c4e0d0a1..8ffd28bf6598 100644 --- a/Documentation/ABI/removed/devfs +++ b/Documentation/ABI/removed/devfs | |||
@@ -6,7 +6,7 @@ Description: | |||
6 | races, contains a naming policy within the kernel that is | 6 | races, contains a naming policy within the kernel that is |
7 | against the LSB, and can be replaced by using udev. | 7 | against the LSB, and can be replaced by using udev. |
8 | The files fs/devfs/*, include/linux/devfs_fs*.h were removed, | 8 | The files fs/devfs/*, include/linux/devfs_fs*.h were removed, |
9 | along with the the assorted devfs function calls throughout the | 9 | along with the assorted devfs function calls throughout the |
10 | kernel tree. | 10 | kernel tree. |
11 | 11 | ||
12 | Users: | 12 | Users: |
diff --git a/Documentation/driver-model/platform.txt b/Documentation/driver-model/platform.txt index f7c9262b2dc8..c5491c22086c 100644 --- a/Documentation/driver-model/platform.txt +++ b/Documentation/driver-model/platform.txt | |||
@@ -125,7 +125,7 @@ three different ways to find such a match: | |||
125 | usually register later during booting, or by module loading. | 125 | usually register later during booting, or by module loading. |
126 | 126 | ||
127 | - Registering a driver using platform_driver_probe() works just like | 127 | - Registering a driver using platform_driver_probe() works just like |
128 | using platform_driver_register(), except that the the driver won't | 128 | using platform_driver_register(), except that the driver won't |
129 | be probed later if another device registers. (Which is OK, since | 129 | be probed later if another device registers. (Which is OK, since |
130 | this interface is only for use with non-hotpluggable devices.) | 130 | this interface is only for use with non-hotpluggable devices.) |
131 | 131 | ||
diff --git a/Documentation/netlabel/introduction.txt b/Documentation/netlabel/introduction.txt index a4ffba1694c8..5ecd8d1dcf4e 100644 --- a/Documentation/netlabel/introduction.txt +++ b/Documentation/netlabel/introduction.txt | |||
@@ -30,7 +30,7 @@ The communication layer exists to allow NetLabel configuration and monitoring | |||
30 | from user space. The NetLabel communication layer uses a message based | 30 | from user space. The NetLabel communication layer uses a message based |
31 | protocol built on top of the Generic NETLINK transport mechanism. The exact | 31 | protocol built on top of the Generic NETLINK transport mechanism. The exact |
32 | formatting of these NetLabel messages as well as the Generic NETLINK family | 32 | formatting of these NetLabel messages as well as the Generic NETLINK family |
33 | names can be found in the the 'net/netlabel/' directory as comments in the | 33 | names can be found in the 'net/netlabel/' directory as comments in the |
34 | header files as well as in 'include/net/netlabel.h'. | 34 | header files as well as in 'include/net/netlabel.h'. |
35 | 35 | ||
36 | * Security Module API | 36 | * Security Module API |
diff --git a/Documentation/pci.txt b/Documentation/pci.txt index e2c9d0a0c43d..d38261b67905 100644 --- a/Documentation/pci.txt +++ b/Documentation/pci.txt | |||
@@ -373,7 +373,7 @@ E.g. clearing pending interrupts. | |||
373 | 373 | ||
374 | 3.6 Register IRQ handler | 374 | 3.6 Register IRQ handler |
375 | ~~~~~~~~~~~~~~~~~~~~~~~~ | 375 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
376 | While calling request_irq() is the the last step described here, | 376 | While calling request_irq() is the last step described here, |
377 | this is often just another intermediate step to initialize a device. | 377 | this is often just another intermediate step to initialize a device. |
378 | This step can often be deferred until the device is opened for use. | 378 | This step can often be deferred until the device is opened for use. |
379 | 379 | ||
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index d4bfae75c946..c141f2388474 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
@@ -1444,7 +1444,7 @@ platforms are moved over to use the flattened-device-tree model. | |||
1444 | Basically, it is a bus of devices, that could act more or less | 1444 | Basically, it is a bus of devices, that could act more or less |
1445 | as a complete entity (UCC, USB etc ). All of them should be siblings on | 1445 | as a complete entity (UCC, USB etc ). All of them should be siblings on |
1446 | the "root" qe node, using the common properties from there. | 1446 | the "root" qe node, using the common properties from there. |
1447 | The description below applies to the the qe of MPC8360 and | 1447 | The description below applies to the qe of MPC8360 and |
1448 | more nodes and properties would be extended in the future. | 1448 | more nodes and properties would be extended in the future. |
1449 | 1449 | ||
1450 | i) Root QE device | 1450 | i) Root QE device |