X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fpcmcia%2Fss.h;h=623a0fc0dae1a21adbb4221d816c87022a782412;hb=4796b71fbb907ce6b8a9acf1852d3646a80b4576;hp=5e0a01ab22163e96d010552a749023cc9e825fda;hpb=b3899c6613160b18f79e4356184de55311302fe4;p=linux-2.6-omap-h63xx.git

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 5e0a01ab221..623a0fc0dae 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -15,7 +15,6 @@
 #ifndef _LINUX_SS_H
 #define _LINUX_SS_H
 
-#include <linux/config.h>
 #include <linux/device.h>
 #include <linux/sched.h>	/* task_struct, completion */
 #include <linux/mutex.h>
@@ -263,9 +262,10 @@ struct pcmcia_socket {
 		u8			present:1,	/* PCMCIA card is present in socket */
 					busy:1,		/* "master" ioctl is used */
 					dead:1,		/* pcmcia module is being unloaded */
-					device_add_pending:1, /* a pseudo-multifunction-device
+					device_add_pending:1, /* a multifunction-device
 							       * add event is pending */
-					reserved:4;
+					mfc_pfc:1,	/* the pending event adds a mfc (1) or pfc (0) */
+					reserved:3;
 	} 				pcmcia_state;
 
 	struct work_struct		device_add;	/* for adding further pseudo-multifunction