Index: arch/arm/mach-pxa/eseries/e750_lcd.c
===================================================================
RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/eseries/e750_lcd.c,v
retrieving revision 1.2
diff -b -w -u -r1.2 e750_lcd.c
--- arch/arm/mach-pxa/eseries/e750_lcd.c	2 May 2005 23:26:16 -0000	1.2
+++ arch/arm/mach-pxa/eseries/e750_lcd.c	25 Feb 2006 22:39:06 -0000
@@ -18,6 +18,7 @@
 #include <linux/backlight.h>
 #include <linux/fb.h>
 #include <linux/err.h>
+#include <linux/platform_device.h>
 
 
 #include <asm/mach-types.h>
Index: arch/arm/mach-pxa/eseries/e750_pcmcia.c
===================================================================
RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/eseries/e750_pcmcia.c,v
retrieving revision 1.4
diff -b -w -u -r1.4 e750_pcmcia.c
--- arch/arm/mach-pxa/eseries/e750_pcmcia.c	28 Jun 2005 19:53:11 -0000	1.4
+++ arch/arm/mach-pxa/eseries/e750_pcmcia.c	25 Feb 2006 22:39:06 -0000
@@ -18,6 +18,7 @@
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <pcmcia/ss.h>
 
Index: arch/arm/mach-pxa/eseries/e750_tc6393xb.c
===================================================================
RCS file: /cvs/linux/kernel26/arch/arm/mach-pxa/eseries/e750_tc6393xb.c,v
retrieving revision 1.2
diff -b -w -u -r1.2 e750_tc6393xb.c
--- arch/arm/mach-pxa/eseries/e750_tc6393xb.c	22 Mar 2005 00:57:48 -0000	1.2
+++ arch/arm/mach-pxa/eseries/e750_tc6393xb.c	25 Feb 2006 22:39:06 -0000
@@ -7,6 +7,7 @@
 #include <linux/interrupt.h>
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
Index: drivers/mmc/tmio_mmc.c
===================================================================
RCS file: /cvs/linux/kernel26/drivers/mmc/tmio_mmc.c,v
retrieving revision 1.15
diff -b -w -u -r1.15 tmio_mmc.c
--- drivers/mmc/tmio_mmc.c	28 Jun 2005 16:37:41 -0000	1.15
+++ drivers/mmc/tmio_mmc.c	25 Feb 2006 22:39:14 -0000
@@ -29,7 +29,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -70,7 +70,8 @@
                 TMIO_H(0x242) |= 0x01;    // clock mode
         */
 
-static void reset_chip(struct tmio_mmc_host *host) {
+static void reset_chip(struct tmio_mmc_host *host) 
+{
         /* Reset */
         writew(0x0000, host->ctl_base + TMIO_CTRL_SD_SOFT_RESET_REG);
         writew(0x0000, host->ctl_base + TMIO_CTRL_SDIO_SOFT_RESET_REG);
@@ -329,7 +330,7 @@
 		/* Card insert / remove attempts */
 		if (ireg & (TMIO_STAT_CARD_INSERT | TMIO_STAT_CARD_REMOVE)){
 			ack_mmc_irqs(host, TMIO_STAT_CARD_INSERT | TMIO_STAT_CARD_REMOVE);
-	                mmc_detect_change(host->mmc);
+	                mmc_detect_change(host->mmc, HZ / 4);
 		}
 
 		/* CRC and other errors */
@@ -515,13 +516,15 @@
 
 }
 
-static int tmio_mmc_suspend(struct device *dev, uint32_t state, uint32_t level) {
+#ifdef CONFIG_PM
+
+static int tmio_mmc_suspend(struct device *dev, pm_message_t state)
+{
 	struct tmio_mmc_hwconfig *hwconfig = (struct tmio_mmc_hwconfig *)dev->platform_data;
         struct platform_device *sdev = to_platform_device(dev);
 	struct mmc_host *mmc = dev_get_drvdata(dev);
 	struct tmio_mmc_host *host = mmc_priv(mmc);
 
-        if (level == SUSPEND_POWER_DOWN) {
 	/* disable clock */
 	writew(0x0000, host->ctl_base + TMIO_CTRL_CLOCK_AND_WAIT_CONTROL_REG);
         msleep(10);
@@ -538,20 +541,20 @@
 
 	/* Disable SD/MMC function */
 	writeb(0, host->cnf_base + TMIO_CONF_COMMAND_REG);
-	}
+
 	return 0;
 }
 
-static int tmio_mmc_resume(struct device *dev, uint32_t level) {
+static int tmio_mmc_resume(struct device *dev) 
+{
 	struct mmc_host *mmc = dev_get_drvdata(dev);
 	struct tmio_mmc_host *host = mmc_priv(mmc);
-
-	if (level == RESUME_POWER_ON) {
 		hwinit(host, dev);
-	}
 	return 0;
 }
 
+#endif
+
 static int tmio_mmc_probe(struct device *dev)
 {
 	struct platform_device *sdev = to_platform_device(dev);
@@ -600,7 +603,7 @@
 	mmc_add_host(mmc);
 
 	printk(KERN_INFO "%s at 0x%08lx irq %d\n",
-		mmc->host_name, (unsigned long)host->ctl_base, host->irq);
+		mmc->dev->driver->name, (unsigned long)host->ctl_base, host->irq);
 
 	/* Lets unmask the IRQs we want to know about */
         disable_mmc_irqs(host, TMIO_MASK_ALL);
Index: drivers/soc/tc6393xb.c
===================================================================
RCS file: /cvs/linux/kernel26/drivers/soc/tc6393xb.c,v
retrieving revision 1.7
diff -b -w -u -r1.7 tc6393xb.c
--- drivers/soc/tc6393xb.c	28 Jun 2005 16:37:41 -0000	1.7
+++ drivers/soc/tc6393xb.c	25 Feb 2006 22:39:17 -0000
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/soc-device.h>
@@ -273,20 +273,17 @@
 
 #ifdef CONFIG_PM
 
-static int tc6393_suspend(struct device *dev, u32 state, u32 level)
+static int tc6393_suspend(struct device *dev, pm_message_t state)
 {
 	struct tc6393xb_platform_data *pdata = (struct tc6393xb_platform_data *)dev->platform_data;
 
-	if (level != SUSPEND_DISABLE)
-		return 0;
-
 	if (pdata->suspend)
 		pdata->suspend();
 
 	return 0;
 }
 
-static int tc6393_resume(struct device *dev, u32 level)
+static int tc6393_resume(struct device *dev)
 {
 	struct tc6393xb_platform_data *pdata = (struct tc6393xb_platform_data *)dev->platform_data;
 
Index: include/video/w100fb.h
===================================================================
RCS file: /cvs/linux/kernel26/include/video/w100fb.h,v
retrieving revision 1.13
diff -b -w -u -r1.13 w100fb.h
--- include/video/w100fb.h	27 Jan 2006 22:32:59 -0000	1.13
+++ include/video/w100fb.h	25 Feb 2006 22:39:26 -0000
@@ -36,6 +36,8 @@
 	unsigned long genlcd_cntl1;
 	unsigned long genlcd_cntl2;
 	unsigned long genlcd_cntl3;
+	unsigned long crtc_ps1_active;
+        
 };
 
 struct w100_gpio_regs {