diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/acpi/namespace/nswalk.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/acpi/namespace/nswalk.c')
| -rw-r--r-- | drivers/acpi/namespace/nswalk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c index 4de2444df300..f9a7277dca6e 100644 --- a/drivers/acpi/namespace/nswalk.c +++ b/drivers/acpi/namespace/nswalk.c | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | * | 56 | * |
| 57 | * PARAMETERS: Type - Type of node to be searched for | 57 | * PARAMETERS: Type - Type of node to be searched for |
| 58 | * parent_node - Parent node whose children we are | 58 | * parent_node - Parent node whose children we are |
| 59 | * getting | 59 | * getting |
| 60 | * child_node - Previous child that was found. | 60 | * child_node - Previous child that was found. |
| 61 | * The NEXT child will be returned | 61 | * The NEXT child will be returned |
| 62 | * | 62 | * |