diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 16:26:00 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 17:15:56 +0200 |
| commit | a78f4dd331a4f6a396eb5849656a4a72a70a56d7 (patch) | |
| tree | 6dbd9cc08ec80ace397d69ddd6e6f59b575639b4 /include/pcmcia | |
| parent | 70294b468302fd7a0a99dad935c7ba5322989345 (diff) | |
| download | linux-a78f4dd331a4f6a396eb5849656a4a72a70a56d7.tar.gz | |
[PATCH] pcmcia: rename pcmcia_device.state
Rename pcmcia_device.state (which is used in very few places) to p_state in order to avoid a namespace collision when moving the deprecated dev_link_t into struct pcmcia_device Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
| -rw-r--r-- | include/pcmcia/ds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index 8a6a95ea26ec..7f712df3e297 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h @@ -166,7 +166,7 @@ struct pcmcia_device { /* deprecated, a cleaned up version will be moved into this struct soon */ dev_link_t *instance; - u_int state; + u_int p_state; /* information about this device */ u8 has_manf_id:1; |