diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-12-12 13:25:16 +1100 |
| commit | 171c69846b9c9c30081e3165c474c6b42d8e3726 (patch) | |
| tree | acbe54e255538beca8c1258bc5de1fe5d3ba4c46 /scripts | |
| parent | 3f43b18abbc10c6127922bd34f3f768c379a0a68 (diff) | |
| parent | 078014dd36989c66378dfe80066c3f8a1f6952e8 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/pci/pci-driver.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/list.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h index 685d80e1bb0e..2cf23f002d3f 100644 --- a/scripts/kconfig/list.h +++ b/scripts/kconfig/list.h @@ -34,7 +34,7 @@ struct list_head { * list_entry - get the struct for this entry * @ptr: the &struct list_head pointer. * @type: the type of the struct this is embedded in. - * @member: the name of the list_struct within the struct. + * @member: the name of the list_head within the struct. */ #define list_entry(ptr, type, member) \ container_of(ptr, type, member) @@ -43,7 +43,7 @@ struct list_head { * list_for_each_entry - iterate over list of given type * @pos: the type * to use as a loop cursor. * @head: the head for your list. - * @member: the name of the list_struct within the struct. + * @member: the name of the list_head within the struct. */ #define list_for_each_entry(pos, head, member) \ for (pos = list_entry((head)->next, typeof(*pos), member); \ @@ -55,7 +55,7 @@ struct list_head { * @pos: the type * to use as a loop cursor. * @n: another type * to use as temporary storage * @head: the head for your list. - * @member: the name of the list_struct within the struct. + * @member: the name of the list_head within the struct. */ #define list_for_each_entry_safe(pos, n, head, member) \ for (pos = list_entry((head)->next, typeof(*pos), member), \ |