Index: linux/arch/arm/mach-pxa/tosa.c
===================================================================
--- linux.orig/arch/arm/mach-pxa/tosa.c	2005-03-06 22:35:44.000000000 +0000
+++ linux/arch/arm/mach-pxa/tosa.c	2005-03-06 22:37:34.000000000 +0000
@@ -39,6 +39,7 @@
 
 #include <asm/hardware/scoop.h>
 #include <asm/hardware/tc6393.h>
+#include <asm/hardware/sharpsl_param.h>
 
 #include "generic.h"
 
@@ -287,8 +288,8 @@
 
 static void __init tosa_init(void)
 {
-//	tosa_fb_info.comadj=tosa_get_comadj();
-//	tosa_fb_info.phadadj=tosa_get_phadadj();
+//	tosa_fb_info.comadj=sharpsl_param.comadj;
+//	tosa_fb_info.phadadj=sharpsl_param.phadadj;
 	pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_IN);
 	GPDR(TOSA_GPIO_TC6393_INT) &= ~GPIO_bit(TOSA_GPIO_TC6393_INT);
 	
@@ -299,11 +300,24 @@
 	pxa_set_mci_info(&tosa_mci_platform_data);
  	pxa_set_udc_info(&udc_info);
 	pxa_set_ficp_info(&tosa_ficp_platform_data);
+	
+ 	/* Scoop PCMCIA Socket Setup */
+ 	scoop_devs = kmalloc(sizeof(struct pcmcia_scoopdev) * 2, GFP_KERNEL);
+ 	if (scoop_devs) {
+ 		scoop_devs[0].dev=&tosascoop_device.dev;
+ 		scoop_devs[0].irq=TOSA_IRQ_GPIO_CF_IRQ;
+ 		scoop_devs[0].cd_irq=TOSA_IRQ_GPIO_CF_CD;
+ 		scoop_devs[0].cd_irq_str="PCMCIA0 CD";
+ 		scoop_devs[1].dev=&tosascoop_jc_device.dev;
+ 		scoop_devs[1].irq=TOSA_IRQ_GPIO_JC_CF_IRQ;
+ 		scoop_devs[1].cd_irq=-1;
+ 		scoop_num=2;
+ 	}	
 }
 static void __init fixup_tosa(struct machine_desc *desc, 
 		struct tag *tags, char **cmdline, struct meminfo *mi)
 {
-//	tosa_get_param();
+	sharpsl_save_param();
 	mi->nr_banks=1;
 	mi->bank[0].start = 0xa0000000;
 	mi->bank[0].node = 0;
Index: linux/include/asm-arm/arch-pxa/tosa.h
===================================================================
--- linux.orig/include/asm-arm/arch-pxa/tosa.h	2005-03-06 22:35:43.000000000 +0000
+++ linux/include/asm-arm/arch-pxa/tosa.h	2005-03-06 22:36:11.000000000 +0000
@@ -110,7 +110,6 @@
 #define TOSA_GPIO_RECORD_BTN        	(3)
 #define TOSA_GPIO_SYNC              	(4)     /* Cradle SYNC Button */
 #define TOSA_GPIO_USB_IN            	(5)
-//#define TOSA_GPIO_nSD_CLK         	(6)
 #define TOSA_GPIO_JACKET_DETECT     	(7)
 #define TOSA_GPIO_nSD_DETECT        	(9)
 #define TOSA_GPIO_nSD_INT           	(10)