diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
| commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
| tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /include/pcmcia/cistpl.h | |
| parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
| download | kernel_samsung_smdk4412-a208f37a465e222218974ab20a31b42b7b4893b2.zip kernel_samsung_smdk4412-a208f37a465e222218974ab20a31b42b7b4893b2.tar.gz kernel_samsung_smdk4412-a208f37a465e222218974ab20a31b42b7b4893b2.tar.bz2 | |
Merge branch 'linus' into x86/x2apic
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 d3bbb19..e2e10c1 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 int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse); -int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_t *info); +int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *count); /* ... but use these wrappers instead */ #define pcmcia_get_first_tuple(p_dev, tuple) \ |