Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/pcmcia/cs.c

@@ -120,7 +120,7 @@ static const char *version =
 /*====================================================================*/
 
 socket_state_t dead_socket = {
-    0, SS_DETECT, 0, 0, 0
+	.csc_mask	= SS_DETECT,
 };
 
 

drivers/pcmcia/i82092.c

@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
 
 static int i82092aa_socket_suspend (struct pci_dev *dev, u32 state)
 {
-	return pcmcia_socket_dev_suspend(&dev->dev, state, 0);
+	return pcmcia_socket_dev_suspend(&dev->dev, state, SUSPEND_SAVE_STATE);
 }
 
 static int i82092aa_socket_resume (struct pci_dev *dev)

drivers/pcmcia/rsrc_mgr.c

@@ -77,10 +77,14 @@ typedef struct resource_map_t {
 } resource_map_t;
 
 /* Memory resource database */
-static resource_map_t mem_db = { 0, 0, &mem_db };
+static resource_map_t mem_db = {
+	.next	= &mem_db,
+};
 
 /* IO port resource database */
-static resource_map_t io_db = { 0, 0, &io_db };
+static resource_map_t io_db = {
+	.next	= &io_db,
+};
 
 static DECLARE_MUTEX(rsrc_sem);
 
@@ -93,7 +97,7 @@ typedef struct irq_info_t {
 } irq_info_t;
 
 /* Table of IRQ assignments */
-static irq_info_t irq_table[NR_IRQS] = { { 0, 0, 0 }, /* etc */ };
+static irq_info_t irq_table[NR_IRQS];
 
 #endif
 

drivers/pcmcia/yenta_socket.c

@@ -901,7 +901,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
 
 static int yenta_dev_suspend (struct pci_dev *dev, u32 state)
 {
-	return pcmcia_socket_dev_suspend(&dev->dev, state, 0);
+	return pcmcia_socket_dev_suspend(&dev->dev, state, SUSPEND_SAVE_STATE);
 }