aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-15 10:26:00 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:15:56 -0500
commita78f4dd331a4f6a396eb5849656a4a72a70a56d7 (patch)
tree6dbd9cc08ec80ace397d69ddd6e6f59b575639b4 /include/pcmcia
parent70294b468302fd7a0a99dad935c7ba5322989345 (diff)
[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.h2
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 {
166 /* deprecated, a cleaned up version will be moved into this 166 /* deprecated, a cleaned up version will be moved into this
167 struct soon */ 167 struct soon */
168 dev_link_t *instance; 168 dev_link_t *instance;
169 u_int state; 169 u_int p_state;
170 170
171 /* information about this device */ 171 /* information about this device */
172 u8 has_manf_id:1; 172 u8 has_manf_id:1;