linux-rp-2.6.22: Fix patch compile problems

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2220 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 105 insertions, 77 deletions

diff --git a/meta/packages/linux/linux-rp-2.6.22/htcuni.patch b/meta/packages/linux/linux-rp-2.6.22/htcuni.patch
index 590b2d86c0..2573d85130 100644
--- a/meta/packages/linux/linux-rp-2.6.22/htcuni.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/htcuni.patch
@@ -1,6 +1,7 @@
 ---
  arch/arm/mach-pxa/Kconfig                                |    2 
  arch/arm/mach-pxa/Makefile                               |    1 
+ arch/arm/mach-pxa/corgi.c                                |    2 
  arch/arm/mach-pxa/htcuniversal/Kconfig                   |   80 
  arch/arm/mach-pxa/htcuniversal/Makefile                  |   19 
  arch/arm/mach-pxa/htcuniversal/htcuniversal.c            |  470 +++++
@@ -21,6 +22,7 @@
  arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c        |   71 
  arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h              |   20 
  arch/arm/mach-pxa/pm.c                                   |   36 
+ arch/arm/mach-pxa/spitz.c                                |    2 
  drivers/input/keyboard/Makefile                          |    2 
  drivers/input/keyboard/asic3_keys.c                      |  131 +
  drivers/input/keyboard/pxa27x_keyboard.c                 |    2 
@@ -57,12 +59,12 @@
  include/linux/pda_power.h                                |   31 
  include/linux/soc/asic3_base.h                           |  104 +
  include/linux/soc/tmio_mmc.h                             |   17 
- 58 files changed, 7407 insertions(+), 14 deletions(-)
+ 60 files changed, 7409 insertions(+), 16 deletions(-)
 
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,80 @@
 +menuconfig MACH_HTCUNIVERSAL
 +	bool "HTC Universal"
@@ -147,7 +149,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,19 @@
 +#
 +# Makefile for HTC Universal
@@ -171,7 +173,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,470 @@
 +/*
 + * Hardware definitions for HTC Universal
@@ -646,7 +648,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,917 @@
 +/*
 + * Audio support for codec Asahi Kasei AK4641
@@ -1568,7 +1570,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,65 @@
 +/*
 + * Audio support for codec Asahi Kasei AK4641
@@ -1638,7 +1640,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,143 @@
 +/*
 + * LEDs support for the HP iPaq hx4700
@@ -1786,7 +1788,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,61 @@
 +/*
 + * Use consistent with the GNU GPL is permitted,
@@ -1852,7 +1854,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,135 @@
 +/* Bluetooth interface driver for TI BRF6150 on HX4700
 + *
@@ -1992,7 +1994,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,17 @@
 +/*
 + * Bluetooth support file for calling bluetooth configuration functions
@@ -2014,7 +2016,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,87 @@
 +/*
 + * Buttons driver for HTC Universal
@@ -2106,7 +2108,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,226 @@
 +/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs)
 + *
@@ -2337,7 +2339,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,212 @@
 +/*
 + * Use consistent with the GNU GPL is permitted,
@@ -2554,7 +2556,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,167 @@
 +
 +/* Phone interface driver for Qualcomm MSM6250 on HTC Universal
@@ -2726,7 +2728,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,16 @@
 +/*
 + * Bluetooth support file for calling bluetooth configuration functions
@@ -2747,7 +2749,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,69 @@
 +/*
 + * MyPal 716 power management support for the original HTC IPL in DoC G3
@@ -2821,7 +2823,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,97 @@
 +/*
 + * pda_power driver for HTC Universal
@@ -2923,7 +2925,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,490 @@
 +/* Touch screen driver for the TI something-or-other
 + *
@@ -3418,7 +3420,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,71 @@
 +
 +/*
@@ -3494,7 +3496,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
 Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,20 @@
 +/*
 + * temporary TSC2046 touchscreen hack
@@ -3518,8 +3520,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
 +#endif
 Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig	2007-07-19 11:41:52.000000000 +0100
-+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig	2007-07-23 15:56:00.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/Kconfig	2007-07-23 15:56:10.000000000 +0100
 @@ -46,6 +46,8 @@ config MACH_HX2750
  	help
  	  This enables support for the HP iPAQ HX2750 handheld.
@@ -3531,8 +3533,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
  if PXA_SHARPSL
 Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile	2007-07-19 11:41:52.000000000 +0100
-+++ linux-2.6.22/arch/arm/mach-pxa/Makefile	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile	2007-07-23 15:56:00.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/Makefile	2007-07-23 15:56:10.000000000 +0100
 @@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_AKITA)	+= akita-ioexp.
  obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o sharpsl_pm.o poodle_pm.o
  obj-$(CONFIG_MACH_TOSA)         += tosa.o
@@ -3543,8 +3545,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
  led-y := leds.o
 Index: linux-2.6.22/arch/arm/mach-pxa/pm.c
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-pxa/pm.c	2007-07-19 11:41:51.000000000 +0100
-+++ linux-2.6.22/arch/arm/mach-pxa/pm.c	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/arch/arm/mach-pxa/pm.c	2007-07-23 15:55:49.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/pm.c	2007-07-23 15:56:10.000000000 +0100
 @@ -22,6 +22,7 @@
  #include <asm/system.h>
  #include <asm/arch/pm.h>
@@ -3646,8 +3648,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pm.c
  
 Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
 ===================================================================
---- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c	2007-07-23 15:56:10.000000000 +0100
 @@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform
  		KPREC = pdata->reg_kprec;
  
@@ -3659,8 +3661,8 @@ Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
  	mutex_unlock(&input_dev->mutex);
 Index: linux-2.6.22/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.22.orig/drivers/leds/Kconfig	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/leds/Kconfig	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/leds/Kconfig	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/leds/Kconfig	2007-07-23 15:56:10.000000000 +0100
 @@ -95,6 +95,13 @@ config LEDS_COBALT
  	help
  	  This option enables support for the front LED on Cobalt Server
@@ -3677,8 +3679,8 @@ Index: linux-2.6.22/drivers/leds/Kconfig
  config LEDS_TRIGGERS
 Index: linux-2.6.22/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.22.orig/drivers/leds/Makefile	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/leds/Makefile	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/leds/Makefile	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/leds/Makefile	2007-07-23 15:56:10.000000000 +0100
 @@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX)		+= leds-net4
  obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
  obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
@@ -3690,7 +3692,7 @@ Index: linux-2.6.22/drivers/leds/Makefile
 Index: linux-2.6.22/drivers/leds/leds-asic3.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/leds/leds-asic3.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/leds/leds-asic3.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,189 @@
 +/*
 + * LEDs support for HTC ASIC3 devices.
@@ -3883,8 +3885,8 @@ Index: linux-2.6.22/drivers/leds/leds-asic3.c
 +MODULE_LICENSE("GPL");
 Index: linux-2.6.22/drivers/mfd/Kconfig
 ===================================================================
---- linux-2.6.22.orig/drivers/mfd/Kconfig	2007-07-19 11:41:51.000000000 +0100
-+++ linux-2.6.22/drivers/mfd/Kconfig	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/mfd/Kconfig	2007-07-23 15:55:45.000000000 +0100
++++ linux-2.6.22/drivers/mfd/Kconfig	2007-07-23 15:56:10.000000000 +0100
 @@ -17,6 +17,9 @@ config MFD_SM501
  
  endmenu
@@ -3897,8 +3899,8 @@ Index: linux-2.6.22/drivers/mfd/Kconfig
  
 Index: linux-2.6.22/drivers/mfd/Makefile
 ===================================================================
---- linux-2.6.22.orig/drivers/mfd/Makefile	2007-07-19 11:41:51.000000000 +0100
-+++ linux-2.6.22/drivers/mfd/Makefile	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/mfd/Makefile	2007-07-23 15:55:45.000000000 +0100
++++ linux-2.6.22/drivers/mfd/Makefile	2007-07-23 15:56:10.000000000 +0100
 @@ -2,6 +2,8 @@
  # Makefile for multifunction miscellaneous devices
  #
@@ -3911,7 +3913,7 @@ Index: linux-2.6.22/drivers/mfd/Makefile
 Index: linux-2.6.22/drivers/mfd/asic3_base.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mfd/asic3_base.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/mfd/asic3_base.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,1208 @@
 +/*
 + * Driver interface to HTC "ASIC3"
@@ -5124,7 +5126,7 @@ Index: linux-2.6.22/drivers/mfd/asic3_base.c
 Index: linux-2.6.22/drivers/mfd/soc-core.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mfd/soc-core.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/mfd/soc-core.c	2007-07-23 15:56:10.000000000 +0100
 @@ -0,0 +1,106 @@
 +/*
 + * drivers/soc/soc-core.c
@@ -5235,7 +5237,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.c
 Index: linux-2.6.22/drivers/mfd/soc-core.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mfd/soc-core.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/mfd/soc-core.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,30 @@
 +/*
 + * drivers/soc/soc-core.h
@@ -5270,7 +5272,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.h
 Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,27 @@
 +/*
 + *  linux/include/asm-arm/arch-pxa/clock.h
@@ -5302,7 +5304,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
 Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,213 @@
 +/*
 + * include/asm/arm/arch-pxa/htcuniversal-asic.h
@@ -5520,7 +5522,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
 Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,220 @@
 +/*
 + * include/asm-arm/arch-pxa/htcuniversal-gpio.h
@@ -5745,7 +5747,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
 Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,14 @@
 +/*
 + * include/asm/arm/arch-pxa/htcuniversal-init.h
@@ -5764,7 +5766,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
 Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,3 @@
 +#include <asm/arch/irqs.h>
 +
@@ -5772,7 +5774,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
 Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,6 @@
 +struct pxa_ll_pm_ops {
 +	void (*suspend)(unsigned long);
@@ -5782,8 +5784,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
 +extern struct pxa_ll_pm_ops *pxa_pm_set_ll_ops(struct pxa_ll_pm_ops *new_ops);
 Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
 ===================================================================
---- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h	2007-07-23 15:56:11.000000000 +0100
 @@ -25,12 +25,6 @@ struct corgits_machinfo {
  /*
   * SharpSL Backlight
@@ -5800,7 +5802,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
 Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,18 @@
 +#include <linux/input.h>
 +
@@ -5823,7 +5825,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
 Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,34 @@
 +/*
 + * LEDs support for HTC ASIC3 devices.
@@ -5862,7 +5864,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
 Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,602 @@
 +/*
 + *
@@ -6468,8 +6470,8 @@ Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
 +#endif
 Index: linux-2.6.22/include/linux/backlight.h
 ===================================================================
---- linux-2.6.22.orig/include/linux/backlight.h	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/include/linux/backlight.h	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/include/linux/backlight.h	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/include/linux/backlight.h	2007-07-23 15:56:11.000000000 +0100
 @@ -87,4 +87,11 @@ extern void backlight_device_unregister(
  
  #define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev)
@@ -6485,7 +6487,7 @@ Index: linux-2.6.22/include/linux/backlight.h
 Index: linux-2.6.22/include/linux/gpiodev.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/gpiodev.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/linux/gpiodev.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,44 @@
 +#ifndef __GPIODEV_H
 +#define __GPIODEV_H
@@ -6534,7 +6536,7 @@ Index: linux-2.6.22/include/linux/gpiodev.h
 Index: linux-2.6.22/include/linux/input_pda.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/input_pda.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/linux/input_pda.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,47 @@
 +#ifndef _INPUT_PDA_H
 +#define _INPUT_PDA_H
@@ -6586,7 +6588,7 @@ Index: linux-2.6.22/include/linux/input_pda.h
 Index: linux-2.6.22/include/linux/pda_power.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/pda_power.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/linux/pda_power.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,31 @@
 +/*
 + * Common power driver for PDAs and phones with one or two external
@@ -6622,7 +6624,7 @@ Index: linux-2.6.22/include/linux/pda_power.h
 Index: linux-2.6.22/include/linux/soc/asic3_base.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/soc/asic3_base.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/linux/soc/asic3_base.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,104 @@
 +#include <asm/types.h>
 +#include <linux/gpiodev.h>
@@ -6731,7 +6733,7 @@ Index: linux-2.6.22/include/linux/soc/asic3_base.h
 Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/soc/tmio_mmc.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/include/linux/soc/tmio_mmc.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,17 @@
 +#include <linux/platform_device.h>
 +
@@ -6752,8 +6754,8 @@ Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
 +};
 Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
 ===================================================================
---- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h	2007-07-19 11:41:52.000000000 +0100
-+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h	2007-07-23 15:56:00.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h	2007-07-23 15:56:11.000000000 +0100
 @@ -2063,6 +2063,8 @@
  #define LDCMD_SOFINT	(1 << 22)
  #define LDCMD_EOFINT	(1 << 21)
@@ -6765,8 +6767,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
  #define LCCR5_SOFM2	(1<<1)		/* Start Of Frame Mask for Overlay 2 (channel 2) */
 Index: linux-2.6.22/drivers/mmc/host/Kconfig
 ===================================================================
---- linux-2.6.22.orig/drivers/mmc/host/Kconfig	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/mmc/host/Kconfig	2007-07-19 11:43:21.000000000 +0100
+--- linux-2.6.22.orig/drivers/mmc/host/Kconfig	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/mmc/host/Kconfig	2007-07-23 15:56:11.000000000 +0100
 @@ -99,4 +99,10 @@ config MMC_TIFM_SD
  
            To compile this driver as a module, choose M here: the
@@ -6781,8 +6783,8 @@ Index: linux-2.6.22/drivers/mmc/host/Kconfig
 +	  in the iPAQ hx4700 and others.
 Index: linux-2.6.22/drivers/mmc/host/Makefile
 ===================================================================
---- linux-2.6.22.orig/drivers/mmc/host/Makefile	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/mmc/host/Makefile	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/mmc/host/Makefile	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/mmc/host/Makefile	2007-07-23 15:56:11.000000000 +0100
 @@ -15,4 +15,4 @@ obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
  obj-$(CONFIG_MMC_OMAP)		+= omap.o
  obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
@@ -6792,7 +6794,7 @@ Index: linux-2.6.22/drivers/mmc/host/Makefile
 Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,900 @@
 +/* Note that this driver can likely be merged into the tmio driver, so
 + * consider this code temporary.  It works, though.
@@ -7697,7 +7699,7 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
 Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,25 @@
 +#ifndef __ASIC3_MMC_H
 +#define __ASIC3_MMC_H
@@ -7726,8 +7728,8 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
 +#endif // __ASIC3_MMC_H
 Index: linux-2.6.22/drivers/input/keyboard/Makefile
 ===================================================================
---- linux-2.6.22.orig/drivers/input/keyboard/Makefile	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/input/keyboard/Makefile	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/input/keyboard/Makefile	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/input/keyboard/Makefile	2007-07-23 15:56:11.000000000 +0100
 @@ -21,4 +21,4 @@ obj-$(CONFIG_KEYBOARD_OMAP)		+= omap-key
  obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x_keyboard.o
  obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
@@ -7737,7 +7739,7 @@ Index: linux-2.6.22/drivers/input/keyboard/Makefile
 Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c	2007-07-19 11:41:55.000000000 +0100
++++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c	2007-07-23 15:56:11.000000000 +0100
 @@ -0,0 +1,131 @@
 +/*
 + * Generic buttons driver for ASIC3 SoC.
@@ -7872,8 +7874,8 @@ Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
 +MODULE_LICENSE("GPL");
 Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
 ===================================================================
---- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h	2007-07-23 15:56:11.000000000 +0100
 @@ -178,6 +178,8 @@
        defined(CONFIG_MACH_LOGICPD_PXA270) || \
        defined(CONFIG_MACH_MAINSTONE)
@@ -7885,8 +7887,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
  #endif
 Index: linux-2.6.22/include/linux/ioport.h
 ===================================================================
---- linux-2.6.22.orig/include/linux/ioport.h	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/include/linux/ioport.h	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/include/linux/ioport.h	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/include/linux/ioport.h	2007-07-23 15:56:11.000000000 +0100
 @@ -56,6 +56,7 @@ struct resource_list {
  #define IORESOURCE_IRQ_HIGHLEVEL	(1<<2)
  #define IORESOURCE_IRQ_LOWLEVEL		(1<<3)
@@ -7897,8 +7899,8 @@ Index: linux-2.6.22/include/linux/ioport.h
  #define IORESOURCE_DMA_TYPE_MASK	(3<<0)
 Index: linux-2.6.22/drivers/video/backlight/Kconfig
 ===================================================================
---- linux-2.6.22.orig/drivers/video/backlight/Kconfig	2007-07-19 11:41:51.000000000 +0100
-+++ linux-2.6.22/drivers/video/backlight/Kconfig	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/video/backlight/Kconfig	2007-07-23 15:55:38.000000000 +0100
++++ linux-2.6.22/drivers/video/backlight/Kconfig	2007-07-23 15:56:11.000000000 +0100
 @@ -34,7 +34,7 @@ config LCD_CLASS_DEVICE
  
  config BACKLIGHT_CORGI
@@ -7910,8 +7912,8 @@ Index: linux-2.6.22/drivers/video/backlight/Kconfig
  	  If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
 Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
 ===================================================================
---- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c	2007-07-19 11:41:50.000000000 +0100
-+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c	2007-07-19 11:41:55.000000000 +0100
+--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c	2007-07-09 00:32:17.000000000 +0100
++++ linux-2.6.22/drivers/video/backlight/corgi_bl.c	2007-07-23 15:56:11.000000000 +0100
 @@ -24,7 +24,7 @@
  static int corgibl_intensity;
  static struct backlight_properties corgibl_data;
@@ -7930,3 +7932,29 @@ Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
  
  	bl_machinfo = machinfo;
  	if (!machinfo->limit_mask)
+Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
+===================================================================
+--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c	2007-07-23 16:06:06.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/corgi.c	2007-07-23 16:07:32.000000000 +0100
+@@ -142,7 +142,7 @@ struct corgissp_machinfo corgi_ssp_machi
+ /*
+  * Corgi Backlight Device
+  */
+-static struct corgibl_machinfo corgi_bl_machinfo = {
++static struct generic_bl_info corgi_bl_machinfo = {
+ 	.max_intensity = 0x2f,
+ 	.default_intensity = 0x1f,
+ 	.limit_mask = 0x0b,
+Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
+===================================================================
+--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c	2007-07-23 16:06:03.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-pxa/spitz.c	2007-07-23 16:06:43.000000000 +0100
+@@ -221,7 +221,7 @@ struct corgissp_machinfo spitz_ssp_machi
+ /*
+  * Spitz Backlight Device
+  */
+-static struct corgibl_machinfo spitz_bl_machinfo = {
++static struct generic_bl_info spitz_bl_machinfo = {
+ 	.default_intensity = 0x1f,
+ 	.limit_mask = 0x0b,
+ 	.max_intensity = 0x2f,