diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 08:00:48 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-06 08:00:48 +0100 |
| commit | 02cee68998010c4a2cc2383c86babc2ecc737183 (patch) | |
| tree | 13c6483472f672c3b2570b075ed2ad4fd4c5405e /drivers/pcmcia/cs_internal.h | |
| parent | Input: synaptic_i2c - make unnecessarily global functions static (diff) | |
| parent | Linux 2.6.32-rc6 (diff) | |
| download | linux-02cee68998010c4a2cc2383c86babc2ecc737183.tar.xz linux-02cee68998010c4a2cc2383c86babc2ecc737183.zip | |
Merge commit 'v2.6.32-rc6' into next
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
| -rw-r--r-- | drivers/pcmcia/cs_internal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 79615e6d540b..1f4098f1354d 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -197,8 +197,7 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse); int pcmcia_replace_cis(struct pcmcia_socket *s, const u8 *data, const size_t len); -int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, - unsigned int *count); +int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count); /* rsrc_mgr.c */ int pcmcia_validate_mem(struct pcmcia_socket *s); |