Index: pxa2xx_base.c
===================================================================
--- pxa2xx_base.c	(revision 405)
+++ pxa2xx_base.c	(working copy)
@@ -80,37 +80,40 @@
 
 static int pxa2xx_pcmcia_set_mcmem( int sock, int speed, int clock )
 {
+	/*
 	MCMEM(sock) = ((pxa2xx_mcxx_setup(speed, clock)
 		& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
 		| ((pxa2xx_mcxx_asst(speed, clock)
 		& MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
 		| ((pxa2xx_mcxx_hold(speed, clock)
 		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
-
+*/
 	return 0;
 }
 
 static int pxa2xx_pcmcia_set_mcio( int sock, int speed, int clock )
 {
+	/*
 	MCIO(sock) = ((pxa2xx_mcxx_setup(speed, clock)
 		& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
 		| ((pxa2xx_mcxx_asst(speed, clock)
 		& MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
 		| ((pxa2xx_mcxx_hold(speed, clock)
 		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
-
+*/
 	return 0;
 }
 
 static int pxa2xx_pcmcia_set_mcatt( int sock, int speed, int clock )
 {
+	/*
 	MCATT(sock) = ((pxa2xx_mcxx_setup(speed, clock)
 		& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
 		| ((pxa2xx_mcxx_asst(speed, clock)
 		& MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
 		| ((pxa2xx_mcxx_hold(speed, clock)
 		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
-
+*/
 	return 0;
 }
 
@@ -194,13 +197,15 @@
 		 * We have at least one socket, so set MECR:CIT
 		 * (Card Is There)
 		 */
-		MECR |= MECR_CIT;
+		//MECR |= MECR_CIT;
 
 		/* Set MECR:NOS (Number Of Sockets) */
+		/*
 		if (nr > 1)
 			MECR |= MECR_NOS;
 		else
 			MECR &= ~MECR_NOS;
+			*/
 	}
 
 	return ret;
Index: pxa2xx_core.c
===================================================================
--- pxa2xx_core.c	(revision 405)
+++ pxa2xx_core.c	(working copy)
@@ -100,37 +100,40 @@
 
 static int pxa2xx_core_pcmcia_set_mcmem( int sock, int speed, int clock )
 {
+	/*
 	MCMEM(sock) = ((pxa2xx_mcxx_setup(speed, clock)
 		& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
 		| ((pxa2xx_mcxx_asst(speed, clock)
 		& MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
 		| ((pxa2xx_mcxx_hold(speed, clock)
 		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
-
+*/
 	return 0;
 }
 
 static int pxa2xx_core_pcmcia_set_mcio( int sock, int speed, int clock )
 {
+	/*
 	MCIO(sock) = ((pxa2xx_mcxx_setup(speed, clock)
 		& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
 		| ((pxa2xx_mcxx_asst(speed, clock)
 		& MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
 		| ((pxa2xx_mcxx_hold(speed, clock)
 		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
-
+*/
 	return 0;
 }
 
 static int pxa2xx_core_pcmcia_set_mcatt( int sock, int speed, int clock )
 {
+	/*
 	MCATT(sock) = ((pxa2xx_mcxx_setup(speed, clock)
 		& MCXX_SETUP_MASK) << MCXX_SETUP_SHIFT)
 		| ((pxa2xx_mcxx_asst(speed, clock)
 		& MCXX_ASST_MASK) << MCXX_ASST_SHIFT)
 		| ((pxa2xx_mcxx_hold(speed, clock)
 		& MCXX_HOLD_MASK) << MCXX_HOLD_SHIFT);
-
+*/
 	return 0;
 }
 
@@ -138,10 +141,12 @@
 {
 	int sock = skt->nr;
 
+	/*
 	pxa2xx_core_pcmcia_set_mcmem( sock, PXA_PCMCIA_5V_MEM_ACCESS, cpu_clock );
 	pxa2xx_core_pcmcia_set_mcatt( sock, PXA_PCMCIA_ATTR_MEM_ACCESS, cpu_clock );
 	pxa2xx_core_pcmcia_set_mcio( sock, PXA_PCMCIA_IO_ACCESS, cpu_clock );
-
+	*/
+	
 	return 0;
 }
 
@@ -197,9 +202,11 @@
 		if (skt->irq_state != 1 && state->io_irq) {
 			skt->irq_state = 1;
 			set_irq_type(skt->irq, IRQT_FALLING);
+			printk("setting IRQT_FALLING\n");
 		} else if (skt->irq_state == 1 && state->io_irq == 0) {
 			skt->irq_state = 0;
 			set_irq_type(skt->irq, IRQT_NOEDGE);
+			printk("setting IRQT_NOEDGE\n");
 		}
 
 		skt->cs_state = *state;
@@ -438,7 +445,7 @@
 
 	debug(2, "%s() for sock %u\n", __FUNCTION__, skt->nr);
 
-	debug(3, "\tmap %u  speed %u\n\tstart 0x%08x  stop 0x%08x\n",
+	printk("\tmap %u  speed %u\n\tstart 0x%08x  stop 0x%08x\n",
 			map->map, map->speed, map->start, map->stop);
 	debug(3, "\tflags: %s%s%s%s%s%s%s%s\n",
 			(map->flags==0)?"<NONE>":"",
@@ -495,7 +502,7 @@
 
 	debug(2, "%s() for sock %u\n", __FUNCTION__, skt->nr);
 
-	debug(3, "\tmap %u speed %u card_start %08x\n",
+	printk("\tmap %u speed %u card_start %08x\n",
 			map->map, map->speed, map->card_start);
 	debug(3, "\tflags: %s%s%s%s%s%s%s%s\n",
 			(map->flags==0)?"<NONE>":"",
@@ -633,6 +640,8 @@
 {
 	int i, res = 0;
 
+	printk("Grabbing irq %d\n", nr);
+	
 	for (i = 0; i < nr; i++) {
 		if (irqs[i].sock != skt->nr)
 			continue;
@@ -742,7 +751,7 @@
 	 * In the meantime, setup default state of GPIO
 	 * outputs before we enable them as outputs.
 	 */
-
+	/*
 	GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) |
 		GPIO_bit(GPIO49_nPWE) |
 		GPIO_bit(GPIO50_nPIOR) |
@@ -756,10 +765,10 @@
 	pxa_gpio_mode(GPIO51_nPIOW_MD);
 	pxa_gpio_mode(GPIO52_nPCE_1_MD);
 	pxa_gpio_mode(GPIO53_nPCE_2_MD);
-	pxa_gpio_mode(GPIO54_pSKTSEL_MD); /* REVISIT: s/b dependent on num sockets */
-	pxa_gpio_mode(GPIO55_nPREG_MD);
+	pxa_gpio_mode(GPIO54_pSKTSEL_MD);*/ /* REVISIT: s/b dependent on num sockets */
+	/*pxa_gpio_mode(GPIO55_nPREG_MD);
 	pxa_gpio_mode(GPIO56_nPWAIT_MD);
-	pxa_gpio_mode(GPIO57_nIOIS16_MD);
+	pxa_gpio_mode(GPIO57_nIOIS16_MD);*/
 
 
 	down(&pxa2xx_sockets_lock);
@@ -875,14 +884,16 @@
 	}
 
 	/* We have at last one socket, so set MECR:CIT (Card Is There) */
-	MECR |= MECR_CIT;
+	//MECR |= MECR_CIT;
 
 	/* Set MECR:NOS (Number Of Sockets) */
+	/*
 	if ( nr>1 )
 		MECR |= MECR_NOS;
 	else
 		MECR &= ~MECR_NOS;
-
+	*/
+	
 	dev_set_drvdata(dev, sinfo);
 	ret = 0;
 	goto out;