X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fpcmcia%2Fss.h;h=6e84258b94de2475cd48afc6c69d2f46999a76ca;hb=81f8320f624a785d77443ace83391d0fdee695f6;hp=ede639812f8a534a66925ff804c26dc0c601effd;hpb=4854c7b27f0975a2b629f35ea3996d2968eb7c4f;p=linux-2.6

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index ede639812f..6e84258b94 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -262,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
@@ -283,7 +284,7 @@ struct pcmcia_socket {
 #endif
 
 	/* socket device */
-	struct class_device		dev;
+	struct device			dev;
 	void				*driver_data;	/* data internal to the socket driver */
 
 };