diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 18:29:07 -0400 |
| commit | 82638844d9a8581bbf33201cc209a14876eca167 (patch) | |
| tree | 961d7f9360194421a71aa644a9d0c176a960ce49 /include/pcmcia/cistpl.h | |
| parent | 9982fbface82893e77d211fbabfbd229da6bdde6 (diff) | |
| parent | 63cf13b77ab785e87c867defa8545e6d4a989774 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
arch/x86/xen/smp.c
kernel/sched_rt.c
net/iucv/iucv.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/pcmcia/cistpl.h')
| -rw-r--r-- | include/pcmcia/cistpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h index d3bbb19caf81..e2e10c1e9a06 100644 --- a/include/pcmcia/cistpl.h +++ b/include/pcmcia/cistpl.h | |||
| @@ -595,7 +595,7 @@ int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple | |||
| 595 | int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); | 595 | int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); |
| 596 | int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse); | 596 | int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse); |
| 597 | 597 | ||
| 598 | int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_t *info); | 598 | int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *count); |
| 599 | 599 | ||
| 600 | /* ... but use these wrappers instead */ | 600 | /* ... but use these wrappers instead */ |
| 601 | #define pcmcia_get_first_tuple(p_dev, tuple) \ | 601 | #define pcmcia_get_first_tuple(p_dev, tuple) \ |