Meins

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
diff --git a/arch/arm/mach-msm/common.c b/arch/arm/mach-msm/common.c
index 8500857..032dc5d 100644
--- a/arch/arm/mach-msm/common.c
+++ b/arch/arm/mach-msm/common.c
@@ -140,57 +140,9 @@ static struct platform_device msm_sdc2_device = {
 	},
 };
 
-static struct resource msm_sdc3_resources[] = {
-	{
-		.start	= MSM_SDC3_BASE,
-		.end	= MSM_SDC3_BASE + MSM_SDC3_SIZE -1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.start	= INT_SDC3_0,
-		.end	= INT_SDC3_1,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device msm_sdc3_device = {
-	.name		= "msm_sdcc",
-	.id		= 3,
-	.num_resources	= ARRAY_SIZE(msm_sdc3_resources),
-	.resource	= msm_sdc3_resources,
-	.dev		= {
-		.coherent_dma_mask	= 0xffffffff,
-	},
-};
-
-static struct resource msm_sdc4_resources[] = {
-	{
-		.start	= MSM_SDC4_BASE,
-		.end	= MSM_SDC4_BASE + MSM_SDC4_SIZE -1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.start	= INT_SDC4_0,
-		.end	= INT_SDC4_1,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device msm_sdc4_device = {
-	.name		= "msm_sdcc",
-	.id		= 4,
-	.num_resources	= ARRAY_SIZE(msm_sdc4_resources),
-	.resource	= msm_sdc4_resources,
-	.dev		= {
-		.coherent_dma_mask	= 0xffffffff,
-	},
-};
-
 static struct platform_device *msm_sdcc_devices[] __initdata = {
 	&msm_sdc1_device,
 	&msm_sdc2_device,
-	&msm_sdc3_device,
-	&msm_sdc4_device,
 };
 
 int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat)
diff --git a/arch/arm/mach-msm/gpio.c b/arch/arm/mach-msm/gpio.c
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 8320108..ab86933 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -58,8 +58,6 @@ static struct map_desc msm_io_desc[] __initdata = {
 	},
 	MSM_DEVICE(SDC1),
 	MSM_DEVICE(SDC2),
-	MSM_DEVICE(SDC3),
-	MSM_DEVICE(SDC4),
 };
 
 void __init msm_map_common_io(void)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
diff --git a/drivers/i2c/busses/i2c-msm.c b/drivers/i2c/busses/i2c-msm.c
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c
diff --git a/drivers/usb/function/msm_hsusb.c b/drivers/usb/function/msm_hsusb.c
diff --git a/drivers/usb/function/msm_hsusb_hw.h b/drivers/usb/function/msm_hsusb_hw.h
diff --git a/drivers/usb/function/ums.c b/drivers/usb/function/ums.c
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
diff --git a/include/asm-arm/arch-msm/entry-macro.S b/include/asm-arm/arch-msm/entry-macro.S
diff --git a/include/asm-arm/arch-msm/memory.h b/include/asm-arm/arch-msm/memory.h
diff --git a/include/asm-arm/arch-msm/msm_iomap.h b/include/asm-arm/arch-msm/msm_iomap.h
index b41389f..c6e175b 100644
--- a/include/asm-arm/arch-msm/msm_iomap.h
+++ b/include/asm-arm/arch-msm/msm_iomap.h
@@ -104,22 +104,15 @@
 #define MSM_AD5_BASE          0xE0200000
 #define MSM_AD5_PHYS          0xAC000000
 #define MSM_AD5_SIZE          (SZ_1M*13)
-
+/* kaiser SD */
 #define MSM_SDC1_BASE         0xE1000000
-#define MSM_SDC1_PHYS         0xA0400000
+#define MSM_SDC1_PHYS         0xA0300000
 #define MSM_SDC1_SIZE         SZ_4K
-
+/* kaiser wifi */
 #define MSM_SDC2_BASE         0xE1001000
-#define MSM_SDC2_PHYS         0xA0500000
+#define MSM_SDC2_PHYS         0xA0400000
 #define MSM_SDC2_SIZE         SZ_4K
 
-#define MSM_SDC3_BASE         0xE1002000
-#define MSM_SDC3_PHYS         0xA0600000
-#define MSM_SDC3_SIZE         SZ_4K
-
-#define MSM_SDC4_BASE         0xE1003000
-#define MSM_SDC4_PHYS         0xA0700000
-#define MSM_SDC4_SIZE         SZ_4K
 
 /* Used by debug-macro.S, uncompress.h, etc. */
 #if defined(CONFIG_MSM_LL_DEBUG_UART1)
diff --git a/include/asm-arm/arch-msm/uncompress.h b/include/asm-arm/arch-msm/uncompress.h
diff --git a/kernel/printk.c b/kernel/printk.c
index 89011bf..cbdae1e 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -34,6 +34,8 @@
 #include <linux/syscalls.h>
 #include <linux/jiffies.h>
 
+
+
 #include <asm/uaccess.h>
 
 #define __LOG_BUF_LEN	(1 << CONFIG_LOG_BUF_SHIFT)