[Hackndev-commit] SF.net SVN: hackndev: [1006] linux4palm/linux/trunk

[<mar...@us...>]

Revision: 1006
          http://svn.sourceforge.net/hackndev/?rev=1006&view=rev
Author:   marex_z71
Date:     2007-05-27 16:36:07 -0700 (Sun, 27 May 2007)

Log Message:
-----------
PalmT3: Make this compile again, needs revision though!!

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c
    linux4palm/linux/trunk/drivers/mfd/tsc2101.c
    linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c	2007-05-27 22:05:00 UTC (rev 1005)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c	2007-05-27 23:36:07 UTC (rev 1006)
@@ -24,10 +24,10 @@
 #include <linux/jiffies.h>
 #include <linux/platform_device.h>
 #include <linux/battchargemon.h>
+#include <linux/apm-emulation.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/apm.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa-regs.h>
 

Modified: linux4palm/linux/trunk/drivers/mfd/tsc2101.c
===================================================================
--- linux4palm/linux/trunk/drivers/mfd/tsc2101.c	2007-05-27 22:05:00 UTC (rev 1005)
+++ linux4palm/linux/trunk/drivers/mfd/tsc2101.c	2007-05-27 23:36:07 UTC (rev 1006)
@@ -18,7 +18,9 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/soc/tsc2101.h> 
+#include <linux/soc/tsc2101.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
 #include "tsc2101.h"
 
 extern void tsc2101_ts_setup(struct device *dev);
@@ -239,11 +241,11 @@
 static int tsc2101_suspend(struct device *dev, u32 state, u32 level)
 {
 	struct tsc2101_data *devdata = dev_get_drvdata(dev);
-	
-	if (level == SUSPEND_POWER_DOWN) {
+/* comment this out like in old driver, it's sick though */	
+/*	if (level == SUSPEND_POWER_DOWN) { */
 		tsc2101_ts_disable(devdata);
 		devdata->platform->suspend();
-	}
+/*	} */
 	
 	return 0;
 }
@@ -252,10 +254,11 @@
 {
 	struct tsc2101_data *devdata = dev_get_drvdata(dev);
 
-	if (level == RESUME_POWER_ON) {
+/* comment this out like in old driver, it's sick though */	
+/*	if (level == RESUME_POWER_ON) { */
 		devdata->platform->resume();
 		tsc2101_ts_enable(devdata);
-	}
+/*	} */
 
 	return 0;
 }

Modified: linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c
===================================================================
--- linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c	2007-05-27 22:05:00 UTC (rev 1005)
+++ linux4palm/linux/trunk/drivers/mmc/wbsd-palmt3.c	2007-05-27 23:36:07 UTC (rev 1006)
@@ -1369,9 +1369,9 @@
 
 	mmc->max_hw_segs = MAX_HW_SEGMENTS;
 	mmc->max_phys_segs = MAX_PHYS_SEGMENTS;
-	mmc->max_sectors = SAFE_MAX_SECTORS;
+/*	mmc->max_sectors = SAFE_MAX_SECTORS;
 	mmc->max_seg_size = MAX_SEGMENT_SIZE;
-
+*/
 	dev_set_drvdata(dev, mmc);
 
 	init_timer(&host->delayed_timer);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.