Remove the "Attributes" entry of struct client_t -- _all_ in-kernel drivers
did set it to INFO_IO_CLIENT | INFO_CARD_SHARE anyway, and the pcmcia core
didn't care at all what this value was set to.

Also, remove the setting of the respective request field in all in-kernel 
drivers -- the request structure is kept the same, though, to keep external 
drivers compiling. 

Signed-off-by: Dominik Brodowski <linux@brodo.de>
Index: 2.6.10/drivers/bluetooth/bluecard_cs.c
===================================================================
--- 2.6.10.orig/drivers/bluetooth/bluecard_cs.c	2004-12-29 11:27:18.340464471 +0100
+++ 2.6.10/drivers/bluetooth/bluecard_cs.c	2004-12-29 11:28:26.592864977 +0100
@@ -904,7 +904,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/bluetooth/bt3c_cs.c
===================================================================
--- 2.6.10.orig/drivers/bluetooth/bt3c_cs.c	2004-12-29 11:27:18.341464330 +0100
+++ 2.6.10/drivers/bluetooth/bt3c_cs.c	2004-12-29 11:28:26.593864837 +0100
@@ -709,7 +709,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 	    CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	    CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/bluetooth/btuart_cs.c
===================================================================
--- 2.6.10.orig/drivers/bluetooth/btuart_cs.c	2004-12-29 11:27:18.342464190 +0100
+++ 2.6.10/drivers/bluetooth/btuart_cs.c	2004-12-29 11:28:26.594864696 +0100
@@ -628,7 +628,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/bluetooth/dtl1_cs.c
===================================================================
--- 2.6.10.orig/drivers/bluetooth/dtl1_cs.c	2004-12-29 11:27:18.343464049 +0100
+++ 2.6.10/drivers/bluetooth/dtl1_cs.c	2004-12-29 11:28:26.594864696 +0100
@@ -607,7 +607,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/char/pcmcia/synclink_cs.c
===================================================================
--- 2.6.10.orig/drivers/char/pcmcia/synclink_cs.c	2004-12-29 11:27:18.360461658 +0100
+++ 2.6.10/drivers/char/pcmcia/synclink_cs.c	2004-12-29 11:28:26.667854430 +0100
@@ -608,7 +608,6 @@
     dev_list = link;
 
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	    CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	    CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/ide/legacy/ide-cs.c
===================================================================
--- 2.6.10.orig/drivers/ide/legacy/ide-cs.c	2004-12-29 11:27:18.361461518 +0100
+++ 2.6.10/drivers/ide/legacy/ide-cs.c	2004-12-29 11:28:26.668854290 +0100
@@ -144,7 +144,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/isdn/hardware/avm/avm_cs.c
===================================================================
--- 2.6.10.orig/drivers/isdn/hardware/avm/avm_cs.c	2004-12-29 11:27:18.362461377 +0100
+++ 2.6.10/drivers/isdn/hardware/avm/avm_cs.c	2004-12-29 11:28:26.669854149 +0100
@@ -178,7 +178,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/isdn/hisax/avma1_cs.c
===================================================================
--- 2.6.10.orig/drivers/isdn/hisax/avma1_cs.c	2004-12-29 11:27:18.363461237 +0100
+++ 2.6.10/drivers/isdn/hisax/avma1_cs.c	2004-12-29 11:28:26.670854008 +0100
@@ -193,7 +193,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/isdn/hisax/elsa_cs.c
===================================================================
--- 2.6.10.orig/drivers/isdn/hisax/elsa_cs.c	2004-12-29 11:27:18.364461096 +0100
+++ 2.6.10/drivers/isdn/hisax/elsa_cs.c	2004-12-29 11:28:26.671853868 +0100
@@ -227,7 +227,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
         CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
         CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/isdn/hisax/sedlbauer_cs.c
===================================================================
--- 2.6.10.orig/drivers/isdn/hisax/sedlbauer_cs.c	2004-12-29 11:27:18.365460955 +0100
+++ 2.6.10/drivers/isdn/hisax/sedlbauer_cs.c	2004-12-29 11:28:26.672853727 +0100
@@ -240,7 +240,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/isdn/hisax/teles_cs.c
===================================================================
--- 2.6.10.orig/drivers/isdn/hisax/teles_cs.c	2004-12-29 11:27:18.366460815 +0100
+++ 2.6.10/drivers/isdn/hisax/teles_cs.c	2004-12-29 11:28:26.672853727 +0100
@@ -208,7 +208,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
         CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
         CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/mtd/maps/pcmciamtd.c
===================================================================
--- 2.6.10.orig/drivers/mtd/maps/pcmciamtd.c	2004-12-29 11:27:18.367460674 +0100
+++ 2.6.10/drivers/mtd/maps/pcmciamtd.c	2004-12-29 11:28:26.674853446 +0100
@@ -800,7 +800,6 @@
 
 	/* Register with Card Services */
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
Index: 2.6.10/drivers/net/pcmcia/3c574_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/3c574_cs.c	2004-12-29 11:27:29.815850493 +0100
+++ 2.6.10/drivers/net/pcmcia/3c574_cs.c	2004-12-29 11:28:26.675853305 +0100
@@ -322,7 +322,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 			CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/3c589_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/3c589_cs.c	2004-12-29 11:27:29.816850352 +0100
+++ 2.6.10/drivers/net/pcmcia/3c589_cs.c	2004-12-29 11:28:26.676853165 +0100
@@ -236,7 +236,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/axnet_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/axnet_cs.c	2004-12-29 11:27:29.830848383 +0100
+++ 2.6.10/drivers/net/pcmcia/axnet_cs.c	2004-12-29 11:28:26.678852883 +0100
@@ -191,7 +191,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/com20020_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/com20020_cs.c	2004-12-29 11:27:29.831848243 +0100
+++ 2.6.10/drivers/net/pcmcia/com20020_cs.c	2004-12-29 11:28:26.679852743 +0100
@@ -211,7 +211,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
         CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
         CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/fmvj18x_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/fmvj18x_cs.c	2004-12-29 11:27:29.832848102 +0100
+++ 2.6.10/drivers/net/pcmcia/fmvj18x_cs.c	2004-12-29 11:28:26.680852602 +0100
@@ -299,7 +299,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/ibmtr_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/ibmtr_cs.c	2004-12-29 11:27:29.833847961 +0100
+++ 2.6.10/drivers/net/pcmcia/ibmtr_cs.c	2004-12-29 11:28:26.681852461 +0100
@@ -204,7 +204,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
         CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
         CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/nmclan_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/nmclan_cs.c	2004-12-29 11:27:29.835847680 +0100
+++ 2.6.10/drivers/net/pcmcia/nmclan_cs.c	2004-12-29 11:28:26.682852321 +0100
@@ -512,7 +512,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/pcnet_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/pcnet_cs.c	2004-12-29 11:27:29.836847540 +0100
+++ 2.6.10/drivers/net/pcmcia/pcnet_cs.c	2004-12-29 11:28:26.684852040 +0100
@@ -286,7 +286,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/pcmcia/smc91c92_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/smc91c92_cs.c	2004-12-29 11:27:29.838847258 +0100
+++ 2.6.10/drivers/net/pcmcia/smc91c92_cs.c	2004-12-29 11:28:26.686851758 +0100
@@ -374,7 +374,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask = CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
 	CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
Index: 2.6.10/drivers/net/pcmcia/xirc2ps_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/pcmcia/xirc2ps_cs.c	2004-12-29 11:27:29.840846977 +0100
+++ 2.6.10/drivers/net/pcmcia/xirc2ps_cs.c	2004-12-29 11:28:26.687851618 +0100
@@ -627,7 +627,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/wireless/airo_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/airo_cs.c	2004-12-29 11:27:31.025680334 +0100
+++ 2.6.10/drivers/net/wireless/airo_cs.c	2004-12-29 11:28:26.688851477 +0100
@@ -225,7 +225,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/wireless/atmel_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/atmel_cs.c	2004-12-29 11:27:31.026680193 +0100
+++ 2.6.10/drivers/net/wireless/atmel_cs.c	2004-12-29 11:28:26.689851336 +0100
@@ -237,7 +237,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/wireless/netwave_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/netwave_cs.c	2004-12-29 11:27:31.027680053 +0100
+++ 2.6.10/drivers/net/wireless/netwave_cs.c	2004-12-29 11:28:26.691851055 +0100
@@ -503,7 +503,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/wireless/orinoco_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/orinoco_cs.c	2004-12-29 11:27:31.028679912 +0100
+++ 2.6.10/drivers/net/wireless/orinoco_cs.c	2004-12-29 11:28:26.692850915 +0100
@@ -197,7 +197,6 @@
 	dev_list = link;
 
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/wireless/ray_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/ray_cs.c	2004-12-29 11:27:31.030679631 +0100
+++ 2.6.10/drivers/net/wireless/ray_cs.c	2004-12-29 11:28:26.694850633 +0100
@@ -398,7 +398,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
         CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
         CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/net/wireless/wavelan_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/wavelan_cs.c	2004-12-29 11:27:31.034679068 +0100
+++ 2.6.10/drivers/net/wireless/wavelan_cs.c	2004-12-29 11:28:26.698850071 +0100
@@ -4689,7 +4689,6 @@
 
   /* Register with Card Services */
   client_reg.dev_info = &dev_info;
-  client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
   client_reg.EventMask = 
     CS_EVENT_REGISTRATION_COMPLETE |
     CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
Index: 2.6.10/drivers/net/wireless/wl3501_cs.c
===================================================================
--- 2.6.10.orig/drivers/net/wireless/wl3501_cs.c	2004-12-29 11:27:31.036678787 +0100
+++ 2.6.10/drivers/net/wireless/wl3501_cs.c	2004-12-29 11:28:26.700849790 +0100
@@ -2015,7 +2015,6 @@
 	link->next		 = wl3501_dev_list;
 	wl3501_dev_list		 = link;
 	client_reg.dev_info	 = &wl3501_dev_info;
-	client_reg.Attributes	 = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask	 = CS_EVENT_CARD_INSERTION |
 				   CS_EVENT_RESET_PHYSICAL |
 				   CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/parport/parport_cs.c
===================================================================
--- 2.6.10.orig/drivers/parport/parport_cs.c	2004-12-29 11:27:19.071361673 +0100
+++ 2.6.10/drivers/parport/parport_cs.c	2004-12-29 11:28:26.701849649 +0100
@@ -143,7 +143,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.EventMask =
 	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/pcmcia/ds.c
===================================================================
--- 2.6.10.orig/drivers/pcmcia/ds.c	2004-12-29 11:28:25.937957088 +0100
+++ 2.6.10/drivers/pcmcia/ds.c	2004-12-29 11:28:26.702849508 +0100
@@ -709,7 +709,6 @@
 	*handle = client;
 	client->state &= ~CLIENT_UNBOUND;
 	client->Socket = s;
-	client->Attributes = req->Attributes;
 	client->EventMask = req->EventMask;
 	client->event_handler = req->event_handler;
 	client->event_callback_args = req->event_callback_args;
Index: 2.6.10/drivers/scsi/pcmcia/aha152x_stub.c
===================================================================
--- 2.6.10.orig/drivers/scsi/pcmcia/aha152x_stub.c	2004-12-29 11:27:19.072361532 +0100
+++ 2.6.10/drivers/scsi/pcmcia/aha152x_stub.c	2004-12-29 11:28:26.703849368 +0100
@@ -145,7 +145,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.event_handler = &aha152x_event;
     client_reg.EventMask =
 	CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/scsi/pcmcia/fdomain_stub.c
===================================================================
--- 2.6.10.orig/drivers/scsi/pcmcia/fdomain_stub.c	2004-12-29 11:27:19.073361391 +0100
+++ 2.6.10/drivers/scsi/pcmcia/fdomain_stub.c	2004-12-29 11:28:26.704849227 +0100
@@ -131,7 +131,6 @@
     link->next = dev_list;
     dev_list = link;
     client_reg.dev_info = &dev_info;
-    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
     client_reg.event_handler = &fdomain_event;
     client_reg.EventMask =
 	CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/scsi/pcmcia/nsp_cs.c
===================================================================
--- 2.6.10.orig/drivers/scsi/pcmcia/nsp_cs.c	2004-12-29 11:27:19.075361110 +0100
+++ 2.6.10/drivers/scsi/pcmcia/nsp_cs.c	2004-12-29 11:28:26.705849086 +0100
@@ -1672,7 +1672,6 @@
 	link->next               = dev_list;
 	dev_list                 = link;
 	client_reg.dev_info	 = &dev_info;
-	client_reg.Attributes	 = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask	 =
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 		CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET	|
Index: 2.6.10/drivers/scsi/pcmcia/qlogic_stub.c
===================================================================
--- 2.6.10.orig/drivers/scsi/pcmcia/qlogic_stub.c	2004-12-29 11:27:19.075361110 +0100
+++ 2.6.10/drivers/scsi/pcmcia/qlogic_stub.c	2004-12-29 11:28:26.706848946 +0100
@@ -212,7 +212,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.event_handler = &qlogic_event;
 	client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
 	client_reg.Version = 0x0210;
Index: 2.6.10/drivers/scsi/pcmcia/sym53c500_cs.c
===================================================================
--- 2.6.10.orig/drivers/scsi/pcmcia/sym53c500_cs.c	2004-12-29 11:26:10.783966088 +0100
+++ 2.6.10/drivers/scsi/pcmcia/sym53c500_cs.c	2004-12-29 11:28:26.707848805 +0100
@@ -995,7 +995,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.event_handler = &SYM53C500_event;
 	client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET |
 	    CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
Index: 2.6.10/drivers/serial/serial_cs.c
===================================================================
--- 2.6.10.orig/drivers/serial/serial_cs.c	2004-12-29 11:27:19.373319203 +0100
+++ 2.6.10/drivers/serial/serial_cs.c	2004-12-29 11:28:26.708848665 +0100
@@ -237,7 +237,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 	    CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	    CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/drivers/telephony/ixj_pcmcia.c
===================================================================
--- 2.6.10.orig/drivers/telephony/ixj_pcmcia.c	2004-12-29 11:27:19.374319063 +0100
+++ 2.6.10/drivers/telephony/ixj_pcmcia.c	2004-12-29 11:28:26.709848524 +0100
@@ -69,7 +69,6 @@
 	link->next = dev_list;
 	dev_list = link;
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask =
 	    CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
 	    CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
Index: 2.6.10/include/pcmcia/cs.h
===================================================================
--- 2.6.10.orig/include/pcmcia/cs.h	2004-12-29 11:28:25.198061152 +0100
+++ 2.6.10/include/pcmcia/cs.h	2004-12-29 11:28:26.710848383 +0100
@@ -124,7 +124,7 @@
 /* For RegisterClient */
 typedef struct client_reg_t {
     dev_info_t	*dev_info;
-    u_int	Attributes;
+    u_int	Attributes;  /* UNUSED */
     u_int	EventMask;
     int		(*event_handler)(event_t event, int priority,
 				 event_callback_args_t *);
@@ -279,7 +279,7 @@
 #define WIN_BAR_MASK		0xe000
 #define WIN_BAR_SHIFT		13
 
-/* Attributes for RegisterClient */
+/* Attributes for RegisterClient -- UNUSED -- */
 #define INFO_MASTER_CLIENT	0x01
 #define INFO_IO_CLIENT		0x02
 #define INFO_MTD_CLIENT		0x04
Index: 2.6.10/include/pcmcia/ds.h
===================================================================
--- 2.6.10.orig/include/pcmcia/ds.h	2004-12-29 11:28:25.938956947 +0100
+++ 2.6.10/include/pcmcia/ds.h	2004-12-29 11:28:26.710848383 +0100
@@ -163,7 +163,6 @@
 		struct pcmcia_socket	*Socket;
 		u_char			Function;
 		dev_info_t		dev_info;
-		u_int			Attributes;
 		u_int			state;
 		event_t			EventMask;
 		int (*event_handler)	(event_t event, int priority,
Index: 2.6.10/sound/pcmcia/pdaudiocf/pdaudiocf.c
===================================================================
--- 2.6.10.orig/sound/pcmcia/pdaudiocf/pdaudiocf.c	2004-12-29 11:27:19.536296281 +0100
+++ 2.6.10/sound/pcmcia/pdaudiocf/pdaudiocf.c	2004-12-29 11:28:26.711848243 +0100
@@ -183,7 +183,6 @@
 
 	/* Register with Card Services */
 	client_reg.dev_info = &dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask = 
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL
 #ifdef CONFIG_PM
Index: 2.6.10/sound/pcmcia/vx/vx_entry.c
===================================================================
--- 2.6.10.orig/sound/pcmcia/vx/vx_entry.c	2004-12-29 11:27:19.537296140 +0100
+++ 2.6.10/sound/pcmcia/vx/vx_entry.c	2004-12-29 11:28:26.712848102 +0100
@@ -162,7 +162,6 @@
 
 	/* Register with Card Services */
 	client_reg.dev_info = hw->dev_info;
-	client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
 	client_reg.EventMask = 
 		CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL
 #ifdef CONFIG_PM