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

[<ke...@us...>]

Revision: 1217
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1217&view=rev
Author:   keddar
Date:     2007-07-29 06:28:36 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
palmtt3: small fix's after UPDATE to 2.6.21-hnd3

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_battery.c
    linux4palm/linux/trunk/include/linux/mfd/tsc2101.h

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig	2007-07-29 01:22:46 UTC (rev 1216)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/Kconfig	2007-07-29 13:28:36 UTC (rev 1217)
@@ -8,7 +8,8 @@
 	bool "Disable display border"
 	depends on MACH_T3XSCALE
 	help
-	  Some displays can disable white border. This could allow it. This makes screen bigger for 4 pixels in both directions.
+	  Some displays can disable white border. This could allow it.
+	  This makes screen bigger for 4 pixels in both directions.
 
 config PALMTT3_BUTTONS
 	tristate "Buttons support"

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c	2007-07-29 01:22:46 UTC (rev 1216)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3.c	2007-07-29 13:28:36 UTC (rev 1217)
@@ -39,7 +39,7 @@
 #include <asm/arch/serial.h>
 
 #include <linux/input.h>
-#include <linux/soc/tsc2101.h>
+#include <linux/mfd/tsc2101.h>
 #include <asm/arch/pxa-pm_ll.h>
 #include <asm/arch/palmtt3-gpio.h>
 #include <asm/arch/palmtt3-init.h>

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_battery.c	2007-07-29 01:22:46 UTC (rev 1216)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtt3/palmtt3_battery.c	2007-07-29 13:28:36 UTC (rev 1217)
@@ -31,7 +31,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa-regs.h>
 
-#include <linux/soc/tsc2101.h>
+#include <linux/mfd/tsc2101.h>
 #include <asm/arch/tps65010.h>
 
 #include <asm/arch/palmtt3-gpio.h>

Modified: linux4palm/linux/trunk/include/linux/mfd/tsc2101.h
===================================================================
--- linux4palm/linux/trunk/include/linux/mfd/tsc2101.h	2007-07-29 01:22:46 UTC (rev 1216)
+++ linux4palm/linux/trunk/include/linux/mfd/tsc2101.h	2007-07-29 13:28:36 UTC (rev 1217)
@@ -29,7 +29,7 @@
 	spinlock_t lock;
 	int pendown;
 	struct tsc2101_platform_info *platform;
-	struct input_dev inputdevice;
+	struct input_dev *inputdevice;
 	struct timer_list ts_timer;
 	struct timer_list misc_timer;
 	struct tsc2101_misc_data miscdata;


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