summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-07-24 15:28:54 +0000
committerRichard Purdie <richard@openedhand.com>2007-07-24 15:28:54 +0000
commitd2db6dacf518723c4fa2a1959ee36cabfc9f7dba (patch)
tree454bb7453c16c1d48192a81330b1b1a23e1f9678
parentfdbae5ed0492c791b2dd9f3fc257880e8f233caa (diff)
downloadpoky-d2db6dacf518723c4fa2a1959ee36cabfc9f7dba.tar.gz
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
Diffstat
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/htcuni.patch182
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 @@
1--- 1---
2 arch/arm/mach-pxa/Kconfig | 2 2 arch/arm/mach-pxa/Kconfig | 2
3 arch/arm/mach-pxa/Makefile | 1 3 arch/arm/mach-pxa/Makefile | 1
4 arch/arm/mach-pxa/corgi.c | 2
4 arch/arm/mach-pxa/htcuniversal/Kconfig | 80 5 arch/arm/mach-pxa/htcuniversal/Kconfig | 80
5 arch/arm/mach-pxa/htcuniversal/Makefile | 19 6 arch/arm/mach-pxa/htcuniversal/Makefile | 19
6 arch/arm/mach-pxa/htcuniversal/htcuniversal.c | 470 +++++ 7 arch/arm/mach-pxa/htcuniversal/htcuniversal.c | 470 +++++
@@ -21,6 +22,7 @@
21 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c | 71 22 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c | 71
22 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h | 20 23 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h | 20
23 arch/arm/mach-pxa/pm.c | 36 24 arch/arm/mach-pxa/pm.c | 36
25 arch/arm/mach-pxa/spitz.c | 2
24 drivers/input/keyboard/Makefile | 2 26 drivers/input/keyboard/Makefile | 2
25 drivers/input/keyboard/asic3_keys.c | 131 + 27 drivers/input/keyboard/asic3_keys.c | 131 +
26 drivers/input/keyboard/pxa27x_keyboard.c | 2 28 drivers/input/keyboard/pxa27x_keyboard.c | 2
@@ -57,12 +59,12 @@
57 include/linux/pda_power.h | 31 59 include/linux/pda_power.h | 31
58 include/linux/soc/asic3_base.h | 104 + 60 include/linux/soc/asic3_base.h | 104 +
59 include/linux/soc/tmio_mmc.h | 17 61 include/linux/soc/tmio_mmc.h | 17
60 58 files changed, 7407 insertions(+), 14 deletions(-) 62 60 files changed, 7409 insertions(+), 16 deletions(-)
61 63
62Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig 64Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig
63=================================================================== 65===================================================================
64--- /dev/null 1970-01-01 00:00:00.000000000 +0000 66--- /dev/null 1970-01-01 00:00:00.000000000 +0000
65+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig 2007-07-19 11:41:55.000000000 +0100 67+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig 2007-07-23 15:56:10.000000000 +0100
66@@ -0,0 +1,80 @@ 68@@ -0,0 +1,80 @@
67+menuconfig MACH_HTCUNIVERSAL 69+menuconfig MACH_HTCUNIVERSAL
68+ bool "HTC Universal" 70+ bool "HTC Universal"
@@ -147,7 +149,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig
147Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 149Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
148=================================================================== 150===================================================================
149--- /dev/null 1970-01-01 00:00:00.000000000 +0000 151--- /dev/null 1970-01-01 00:00:00.000000000 +0000
150+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-07-19 11:41:55.000000000 +0100 152+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-07-23 15:56:10.000000000 +0100
151@@ -0,0 +1,19 @@ 153@@ -0,0 +1,19 @@
152+# 154+#
153+# Makefile for HTC Universal 155+# Makefile for HTC Universal
@@ -171,7 +173,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
171Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 173Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
172=================================================================== 174===================================================================
173--- /dev/null 1970-01-01 00:00:00.000000000 +0000 175--- /dev/null 1970-01-01 00:00:00.000000000 +0000
174+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-07-19 11:41:55.000000000 +0100 176+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-07-23 15:56:10.000000000 +0100
175@@ -0,0 +1,470 @@ 177@@ -0,0 +1,470 @@
176+/* 178+/*
177+ * Hardware definitions for HTC Universal 179+ * Hardware definitions for HTC Universal
@@ -646,7 +648,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
646Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 648Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
647=================================================================== 649===================================================================
648--- /dev/null 1970-01-01 00:00:00.000000000 +0000 650--- /dev/null 1970-01-01 00:00:00.000000000 +0000
649+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-07-19 11:41:55.000000000 +0100 651+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-07-23 15:56:10.000000000 +0100
650@@ -0,0 +1,917 @@ 652@@ -0,0 +1,917 @@
651+/* 653+/*
652+ * Audio support for codec Asahi Kasei AK4641 654+ * Audio support for codec Asahi Kasei AK4641
@@ -1568,7 +1570,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
1568Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 1570Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1569=================================================================== 1571===================================================================
1570--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1572--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1571+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-07-19 11:41:55.000000000 +0100 1573+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-07-23 15:56:10.000000000 +0100
1572@@ -0,0 +1,65 @@ 1574@@ -0,0 +1,65 @@
1573+/* 1575+/*
1574+ * Audio support for codec Asahi Kasei AK4641 1576+ * Audio support for codec Asahi Kasei AK4641
@@ -1638,7 +1640,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1638Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 1640Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
1639=================================================================== 1641===================================================================
1640--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1642--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1641+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-07-19 11:41:55.000000000 +0100 1643+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-07-23 15:56:10.000000000 +0100
1642@@ -0,0 +1,143 @@ 1644@@ -0,0 +1,143 @@
1643+/* 1645+/*
1644+ * LEDs support for the HP iPaq hx4700 1646+ * 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
1786Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 1788Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
1787=================================================================== 1789===================================================================
1788--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1790--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1789+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-07-19 11:41:55.000000000 +0100 1791+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-07-23 15:56:10.000000000 +0100
1790@@ -0,0 +1,61 @@ 1792@@ -0,0 +1,61 @@
1791+/* 1793+/*
1792+ * Use consistent with the GNU GPL is permitted, 1794+ * 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
1852Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 1854Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1853=================================================================== 1855===================================================================
1854--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1856--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1855+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-07-19 11:41:55.000000000 +0100 1857+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-07-23 15:56:10.000000000 +0100
1856@@ -0,0 +1,135 @@ 1858@@ -0,0 +1,135 @@
1857+/* Bluetooth interface driver for TI BRF6150 on HX4700 1859+/* Bluetooth interface driver for TI BRF6150 on HX4700
1858+ * 1860+ *
@@ -1992,7 +1994,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1992Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 1994Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
1993=================================================================== 1995===================================================================
1994--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1996--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1995+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-07-19 11:41:55.000000000 +0100 1997+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-07-23 15:56:10.000000000 +0100
1996@@ -0,0 +1,17 @@ 1998@@ -0,0 +1,17 @@
1997+/* 1999+/*
1998+ * Bluetooth support file for calling bluetooth configuration functions 2000+ * 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
2014Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2016Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
2015=================================================================== 2017===================================================================
2016--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2018--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2017+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-07-19 11:41:55.000000000 +0100 2019+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-07-23 15:56:10.000000000 +0100
2018@@ -0,0 +1,87 @@ 2020@@ -0,0 +1,87 @@
2019+/* 2021+/*
2020+ * Buttons driver for HTC Universal 2022+ * Buttons driver for HTC Universal
@@ -2106,7 +2108,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
2106Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2108Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2107=================================================================== 2109===================================================================
2108--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2110--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2109+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-07-19 11:41:55.000000000 +0100 2111+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-07-23 15:56:10.000000000 +0100
2110@@ -0,0 +1,226 @@ 2112@@ -0,0 +1,226 @@
2111+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs) 2113+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs)
2112+ * 2114+ *
@@ -2337,7 +2339,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2337Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2339Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
2338=================================================================== 2340===================================================================
2339--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2341--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2340+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-07-19 11:41:55.000000000 +0100 2342+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-07-23 15:56:10.000000000 +0100
2341@@ -0,0 +1,212 @@ 2343@@ -0,0 +1,212 @@
2342+/* 2344+/*
2343+ * Use consistent with the GNU GPL is permitted, 2345+ * 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
2554Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2556Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
2555=================================================================== 2557===================================================================
2556--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2558--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2557+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-07-19 11:41:55.000000000 +0100 2559+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-07-23 15:56:10.000000000 +0100
2558@@ -0,0 +1,167 @@ 2560@@ -0,0 +1,167 @@
2559+ 2561+
2560+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal 2562+/* 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
2726Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2728Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
2727=================================================================== 2729===================================================================
2728--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2730--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2729+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-07-19 11:41:55.000000000 +0100 2731+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-07-23 15:56:10.000000000 +0100
2730@@ -0,0 +1,16 @@ 2732@@ -0,0 +1,16 @@
2731+/* 2733+/*
2732+ * Bluetooth support file for calling bluetooth configuration functions 2734+ * 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
2747Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2749Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
2748=================================================================== 2750===================================================================
2749--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2751--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2750+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-07-19 11:41:55.000000000 +0100 2752+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-07-23 15:56:10.000000000 +0100
2751@@ -0,0 +1,69 @@ 2753@@ -0,0 +1,69 @@
2752+/* 2754+/*
2753+ * MyPal 716 power management support for the original HTC IPL in DoC G3 2755+ * 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
2821Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2823Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2822=================================================================== 2824===================================================================
2823--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2825--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2824+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-07-19 11:41:55.000000000 +0100 2826+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-07-23 15:56:10.000000000 +0100
2825@@ -0,0 +1,97 @@ 2827@@ -0,0 +1,97 @@
2826+/* 2828+/*
2827+ * pda_power driver for HTC Universal 2829+ * pda_power driver for HTC Universal
@@ -2923,7 +2925,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2923Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2925Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
2924=================================================================== 2926===================================================================
2925--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2927--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2926+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-07-19 11:41:55.000000000 +0100 2928+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-07-23 15:56:10.000000000 +0100
2927@@ -0,0 +1,490 @@ 2929@@ -0,0 +1,490 @@
2928+/* Touch screen driver for the TI something-or-other 2930+/* Touch screen driver for the TI something-or-other
2929+ * 2931+ *
@@ -3418,7 +3420,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
3418Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 3420Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3419=================================================================== 3421===================================================================
3420--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3422--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3421+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-07-19 11:41:55.000000000 +0100 3423+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-07-23 15:56:10.000000000 +0100
3422@@ -0,0 +1,71 @@ 3424@@ -0,0 +1,71 @@
3423+ 3425+
3424+/* 3426+/*
@@ -3494,7 +3496,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3494Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 3496Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3495=================================================================== 3497===================================================================
3496--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3498--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3497+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-07-19 11:41:55.000000000 +0100 3499+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-07-23 15:56:10.000000000 +0100
3498@@ -0,0 +1,20 @@ 3500@@ -0,0 +1,20 @@
3499+/* 3501+/*
3500+ * temporary TSC2046 touchscreen hack 3502+ * temporary TSC2046 touchscreen hack
@@ -3518,8 +3520,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3518+#endif 3520+#endif
3519Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig 3521Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3520=================================================================== 3522===================================================================
3521--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-07-19 11:41:52.000000000 +0100 3523--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-07-23 15:56:00.000000000 +0100
3522+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-07-19 11:41:55.000000000 +0100 3524+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-07-23 15:56:10.000000000 +0100
3523@@ -46,6 +46,8 @@ config MACH_HX2750 3525@@ -46,6 +46,8 @@ config MACH_HX2750
3524 help 3526 help
3525 This enables support for the HP iPAQ HX2750 handheld. 3527 This enables support for the HP iPAQ HX2750 handheld.
@@ -3531,8 +3533,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3531 if PXA_SHARPSL 3533 if PXA_SHARPSL
3532Index: linux-2.6.22/arch/arm/mach-pxa/Makefile 3534Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
3533=================================================================== 3535===================================================================
3534--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-07-19 11:41:52.000000000 +0100 3536--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-07-23 15:56:00.000000000 +0100
3535+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-07-19 11:41:55.000000000 +0100 3537+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-07-23 15:56:10.000000000 +0100
3536@@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_AKITA) += akita-ioexp. 3538@@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_AKITA) += akita-ioexp.
3537 obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o sharpsl_pm.o poodle_pm.o 3539 obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o sharpsl_pm.o poodle_pm.o
3538 obj-$(CONFIG_MACH_TOSA) += tosa.o 3540 obj-$(CONFIG_MACH_TOSA) += tosa.o
@@ -3543,8 +3545,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
3543 led-y := leds.o 3545 led-y := leds.o
3544Index: linux-2.6.22/arch/arm/mach-pxa/pm.c 3546Index: linux-2.6.22/arch/arm/mach-pxa/pm.c
3545=================================================================== 3547===================================================================
3546--- linux-2.6.22.orig/arch/arm/mach-pxa/pm.c 2007-07-19 11:41:51.000000000 +0100 3548--- linux-2.6.22.orig/arch/arm/mach-pxa/pm.c 2007-07-23 15:55:49.000000000 +0100
3547+++ linux-2.6.22/arch/arm/mach-pxa/pm.c 2007-07-19 11:41:55.000000000 +0100 3549+++ linux-2.6.22/arch/arm/mach-pxa/pm.c 2007-07-23 15:56:10.000000000 +0100
3548@@ -22,6 +22,7 @@ 3550@@ -22,6 +22,7 @@
3549 #include <asm/system.h> 3551 #include <asm/system.h>
3550 #include <asm/arch/pm.h> 3552 #include <asm/arch/pm.h>
@@ -3646,8 +3648,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pm.c
3646 3648
3647Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 3649Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
3648=================================================================== 3650===================================================================
3649--- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-19 11:41:50.000000000 +0100 3651--- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-09 00:32:17.000000000 +0100
3650+++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-19 11:41:55.000000000 +0100 3652+++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-23 15:56:10.000000000 +0100
3651@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform 3653@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform
3652 KPREC = pdata->reg_kprec; 3654 KPREC = pdata->reg_kprec;
3653 3655
@@ -3659,8 +3661,8 @@ Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
3659 mutex_unlock(&input_dev->mutex); 3661 mutex_unlock(&input_dev->mutex);
3660Index: linux-2.6.22/drivers/leds/Kconfig 3662Index: linux-2.6.22/drivers/leds/Kconfig
3661=================================================================== 3663===================================================================
3662--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-07-19 11:41:50.000000000 +0100 3664--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-07-09 00:32:17.000000000 +0100
3663+++ linux-2.6.22/drivers/leds/Kconfig 2007-07-19 11:41:55.000000000 +0100 3665+++ linux-2.6.22/drivers/leds/Kconfig 2007-07-23 15:56:10.000000000 +0100
3664@@ -95,6 +95,13 @@ config LEDS_COBALT 3666@@ -95,6 +95,13 @@ config LEDS_COBALT
3665 help 3667 help
3666 This option enables support for the front LED on Cobalt Server 3668 This option enables support for the front LED on Cobalt Server
@@ -3677,8 +3679,8 @@ Index: linux-2.6.22/drivers/leds/Kconfig
3677 config LEDS_TRIGGERS 3679 config LEDS_TRIGGERS
3678Index: linux-2.6.22/drivers/leds/Makefile 3680Index: linux-2.6.22/drivers/leds/Makefile
3679=================================================================== 3681===================================================================
3680--- linux-2.6.22.orig/drivers/leds/Makefile 2007-07-19 11:41:50.000000000 +0100 3682--- linux-2.6.22.orig/drivers/leds/Makefile 2007-07-09 00:32:17.000000000 +0100
3681+++ linux-2.6.22/drivers/leds/Makefile 2007-07-19 11:41:55.000000000 +0100 3683+++ linux-2.6.22/drivers/leds/Makefile 2007-07-23 15:56:10.000000000 +0100
3682@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net4 3684@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net4
3683 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o 3685 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
3684 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o 3686 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
@@ -3690,7 +3692,7 @@ Index: linux-2.6.22/drivers/leds/Makefile
3690Index: linux-2.6.22/drivers/leds/leds-asic3.c 3692Index: linux-2.6.22/drivers/leds/leds-asic3.c
3691=================================================================== 3693===================================================================
3692--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3694--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3693+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-07-19 11:41:55.000000000 +0100 3695+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-07-23 15:56:10.000000000 +0100
3694@@ -0,0 +1,189 @@ 3696@@ -0,0 +1,189 @@
3695+/* 3697+/*
3696+ * LEDs support for HTC ASIC3 devices. 3698+ * LEDs support for HTC ASIC3 devices.
@@ -3883,8 +3885,8 @@ Index: linux-2.6.22/drivers/leds/leds-asic3.c
3883+MODULE_LICENSE("GPL"); 3885+MODULE_LICENSE("GPL");
3884Index: linux-2.6.22/drivers/mfd/Kconfig 3886Index: linux-2.6.22/drivers/mfd/Kconfig
3885=================================================================== 3887===================================================================
3886--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-07-19 11:41:51.000000000 +0100 3888--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-07-23 15:55:45.000000000 +0100
3887+++ linux-2.6.22/drivers/mfd/Kconfig 2007-07-19 11:41:55.000000000 +0100 3889+++ linux-2.6.22/drivers/mfd/Kconfig 2007-07-23 15:56:10.000000000 +0100
3888@@ -17,6 +17,9 @@ config MFD_SM501 3890@@ -17,6 +17,9 @@ config MFD_SM501
3889 3891
3890 endmenu 3892 endmenu
@@ -3897,8 +3899,8 @@ Index: linux-2.6.22/drivers/mfd/Kconfig
3897 3899
3898Index: linux-2.6.22/drivers/mfd/Makefile 3900Index: linux-2.6.22/drivers/mfd/Makefile
3899=================================================================== 3901===================================================================
3900--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-07-19 11:41:51.000000000 +0100 3902--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-07-23 15:55:45.000000000 +0100
3901+++ linux-2.6.22/drivers/mfd/Makefile 2007-07-19 11:41:55.000000000 +0100 3903+++ linux-2.6.22/drivers/mfd/Makefile 2007-07-23 15:56:10.000000000 +0100
3902@@ -2,6 +2,8 @@ 3904@@ -2,6 +2,8 @@
3903 # Makefile for multifunction miscellaneous devices 3905 # Makefile for multifunction miscellaneous devices
3904 # 3906 #
@@ -3911,7 +3913,7 @@ Index: linux-2.6.22/drivers/mfd/Makefile
3911Index: linux-2.6.22/drivers/mfd/asic3_base.c 3913Index: linux-2.6.22/drivers/mfd/asic3_base.c
3912=================================================================== 3914===================================================================
3913--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3915--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3914+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-07-19 11:41:55.000000000 +0100 3916+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-07-23 15:56:10.000000000 +0100
3915@@ -0,0 +1,1208 @@ 3917@@ -0,0 +1,1208 @@
3916+/* 3918+/*
3917+ * Driver interface to HTC "ASIC3" 3919+ * Driver interface to HTC "ASIC3"
@@ -5124,7 +5126,7 @@ Index: linux-2.6.22/drivers/mfd/asic3_base.c
5124Index: linux-2.6.22/drivers/mfd/soc-core.c 5126Index: linux-2.6.22/drivers/mfd/soc-core.c
5125=================================================================== 5127===================================================================
5126--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5128--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5127+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-07-19 11:41:55.000000000 +0100 5129+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-07-23 15:56:10.000000000 +0100
5128@@ -0,0 +1,106 @@ 5130@@ -0,0 +1,106 @@
5129+/* 5131+/*
5130+ * drivers/soc/soc-core.c 5132+ * drivers/soc/soc-core.c
@@ -5235,7 +5237,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.c
5235Index: linux-2.6.22/drivers/mfd/soc-core.h 5237Index: linux-2.6.22/drivers/mfd/soc-core.h
5236=================================================================== 5238===================================================================
5237--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5239--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5238+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-07-19 11:41:55.000000000 +0100 5240+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-07-23 15:56:11.000000000 +0100
5239@@ -0,0 +1,30 @@ 5241@@ -0,0 +1,30 @@
5240+/* 5242+/*
5241+ * drivers/soc/soc-core.h 5243+ * drivers/soc/soc-core.h
@@ -5270,7 +5272,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.h
5270Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h 5272Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5271=================================================================== 5273===================================================================
5272--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5274--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5273+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-07-19 11:41:55.000000000 +0100 5275+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-07-23 15:56:11.000000000 +0100
5274@@ -0,0 +1,27 @@ 5276@@ -0,0 +1,27 @@
5275+/* 5277+/*
5276+ * linux/include/asm-arm/arch-pxa/clock.h 5278+ * linux/include/asm-arm/arch-pxa/clock.h
@@ -5302,7 +5304,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5302Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 5304Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
5303=================================================================== 5305===================================================================
5304--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5306--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5305+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-07-19 11:41:55.000000000 +0100 5307+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-07-23 15:56:11.000000000 +0100
5306@@ -0,0 +1,213 @@ 5308@@ -0,0 +1,213 @@
5307+/* 5309+/*
5308+ * include/asm/arm/arch-pxa/htcuniversal-asic.h 5310+ * 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
5520Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 5522Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
5521=================================================================== 5523===================================================================
5522--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5524--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5523+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-07-19 11:41:55.000000000 +0100 5525+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-07-23 15:56:11.000000000 +0100
5524@@ -0,0 +1,220 @@ 5526@@ -0,0 +1,220 @@
5525+/* 5527+/*
5526+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h 5528+ * 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
5745Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 5747Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
5746=================================================================== 5748===================================================================
5747--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5749--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5748+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-07-19 11:41:55.000000000 +0100 5750+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-07-23 15:56:11.000000000 +0100
5749@@ -0,0 +1,14 @@ 5751@@ -0,0 +1,14 @@
5750+/* 5752+/*
5751+ * include/asm/arm/arch-pxa/htcuniversal-init.h 5753+ * 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
5764Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 5766Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
5765=================================================================== 5767===================================================================
5766--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5768--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5767+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-07-19 11:41:55.000000000 +0100 5769+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-07-23 15:56:11.000000000 +0100
5768@@ -0,0 +1,3 @@ 5770@@ -0,0 +1,3 @@
5769+#include <asm/arch/irqs.h> 5771+#include <asm/arch/irqs.h>
5770+ 5772+
@@ -5772,7 +5774,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
5772Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 5774Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
5773=================================================================== 5775===================================================================
5774--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5776--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5775+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-07-19 11:41:55.000000000 +0100 5777+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-07-23 15:56:11.000000000 +0100
5776@@ -0,0 +1,6 @@ 5778@@ -0,0 +1,6 @@
5777+struct pxa_ll_pm_ops { 5779+struct pxa_ll_pm_ops {
5778+ void (*suspend)(unsigned long); 5780+ void (*suspend)(unsigned long);
@@ -5782,8 +5784,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
5782+extern struct pxa_ll_pm_ops *pxa_pm_set_ll_ops(struct pxa_ll_pm_ops *new_ops); 5784+extern struct pxa_ll_pm_ops *pxa_pm_set_ll_ops(struct pxa_ll_pm_ops *new_ops);
5783Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 5785Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
5784=================================================================== 5786===================================================================
5785--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-19 11:41:50.000000000 +0100 5787--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-09 00:32:17.000000000 +0100
5786+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-07-19 11:41:55.000000000 +0100 5788+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-07-23 15:56:11.000000000 +0100
5787@@ -25,12 +25,6 @@ struct corgits_machinfo { 5789@@ -25,12 +25,6 @@ struct corgits_machinfo {
5788 /* 5790 /*
5789 * SharpSL Backlight 5791 * SharpSL Backlight
@@ -5800,7 +5802,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
5800Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 5802Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5801=================================================================== 5803===================================================================
5802--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5804--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5803+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-07-19 11:41:55.000000000 +0100 5805+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-07-23 15:56:11.000000000 +0100
5804@@ -0,0 +1,18 @@ 5806@@ -0,0 +1,18 @@
5805+#include <linux/input.h> 5807+#include <linux/input.h>
5806+ 5808+
@@ -5823,7 +5825,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5823Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 5825Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5824=================================================================== 5826===================================================================
5825--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5827--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5826+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-07-19 11:41:55.000000000 +0100 5828+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-07-23 15:56:11.000000000 +0100
5827@@ -0,0 +1,34 @@ 5829@@ -0,0 +1,34 @@
5828+/* 5830+/*
5829+ * LEDs support for HTC ASIC3 devices. 5831+ * LEDs support for HTC ASIC3 devices.
@@ -5862,7 +5864,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5862Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 5864Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
5863=================================================================== 5865===================================================================
5864--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5866--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5865+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-07-19 11:41:55.000000000 +0100 5867+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-07-23 15:56:11.000000000 +0100
5866@@ -0,0 +1,602 @@ 5868@@ -0,0 +1,602 @@
5867+/* 5869+/*
5868+ * 5870+ *
@@ -6468,8 +6470,8 @@ Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
6468+#endif 6470+#endif
6469Index: linux-2.6.22/include/linux/backlight.h 6471Index: linux-2.6.22/include/linux/backlight.h
6470=================================================================== 6472===================================================================
6471--- linux-2.6.22.orig/include/linux/backlight.h 2007-07-19 11:41:50.000000000 +0100 6473--- linux-2.6.22.orig/include/linux/backlight.h 2007-07-09 00:32:17.000000000 +0100
6472+++ linux-2.6.22/include/linux/backlight.h 2007-07-19 11:41:55.000000000 +0100 6474+++ linux-2.6.22/include/linux/backlight.h 2007-07-23 15:56:11.000000000 +0100
6473@@ -87,4 +87,11 @@ extern void backlight_device_unregister( 6475@@ -87,4 +87,11 @@ extern void backlight_device_unregister(
6474 6476
6475 #define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev) 6477 #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
6485Index: linux-2.6.22/include/linux/gpiodev.h 6487Index: linux-2.6.22/include/linux/gpiodev.h
6486=================================================================== 6488===================================================================
6487--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6489--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6488+++ linux-2.6.22/include/linux/gpiodev.h 2007-07-19 11:41:55.000000000 +0100 6490+++ linux-2.6.22/include/linux/gpiodev.h 2007-07-23 15:56:11.000000000 +0100
6489@@ -0,0 +1,44 @@ 6491@@ -0,0 +1,44 @@
6490+#ifndef __GPIODEV_H 6492+#ifndef __GPIODEV_H
6491+#define __GPIODEV_H 6493+#define __GPIODEV_H
@@ -6534,7 +6536,7 @@ Index: linux-2.6.22/include/linux/gpiodev.h
6534Index: linux-2.6.22/include/linux/input_pda.h 6536Index: linux-2.6.22/include/linux/input_pda.h
6535=================================================================== 6537===================================================================
6536--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6538--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6537+++ linux-2.6.22/include/linux/input_pda.h 2007-07-19 11:41:55.000000000 +0100 6539+++ linux-2.6.22/include/linux/input_pda.h 2007-07-23 15:56:11.000000000 +0100
6538@@ -0,0 +1,47 @@ 6540@@ -0,0 +1,47 @@
6539+#ifndef _INPUT_PDA_H 6541+#ifndef _INPUT_PDA_H
6540+#define _INPUT_PDA_H 6542+#define _INPUT_PDA_H
@@ -6586,7 +6588,7 @@ Index: linux-2.6.22/include/linux/input_pda.h
6586Index: linux-2.6.22/include/linux/pda_power.h 6588Index: linux-2.6.22/include/linux/pda_power.h
6587=================================================================== 6589===================================================================
6588--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6590--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6589+++ linux-2.6.22/include/linux/pda_power.h 2007-07-19 11:41:55.000000000 +0100 6591+++ linux-2.6.22/include/linux/pda_power.h 2007-07-23 15:56:11.000000000 +0100
6590@@ -0,0 +1,31 @@ 6592@@ -0,0 +1,31 @@
6591+/* 6593+/*
6592+ * Common power driver for PDAs and phones with one or two external 6594+ * 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
6622Index: linux-2.6.22/include/linux/soc/asic3_base.h 6624Index: linux-2.6.22/include/linux/soc/asic3_base.h
6623=================================================================== 6625===================================================================
6624--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6626--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6625+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-07-19 11:41:55.000000000 +0100 6627+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-07-23 15:56:11.000000000 +0100
6626@@ -0,0 +1,104 @@ 6628@@ -0,0 +1,104 @@
6627+#include <asm/types.h> 6629+#include <asm/types.h>
6628+#include <linux/gpiodev.h> 6630+#include <linux/gpiodev.h>
@@ -6731,7 +6733,7 @@ Index: linux-2.6.22/include/linux/soc/asic3_base.h
6731Index: linux-2.6.22/include/linux/soc/tmio_mmc.h 6733Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6732=================================================================== 6734===================================================================
6733--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6735--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6734+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-07-19 11:41:55.000000000 +0100 6736+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-07-23 15:56:11.000000000 +0100
6735@@ -0,0 +1,17 @@ 6737@@ -0,0 +1,17 @@
6736+#include <linux/platform_device.h> 6738+#include <linux/platform_device.h>
6737+ 6739+
@@ -6752,8 +6754,8 @@ Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6752+}; 6754+};
6753Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 6755Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
6754=================================================================== 6756===================================================================
6755--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-19 11:41:52.000000000 +0100 6757--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-23 15:56:00.000000000 +0100
6756+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-19 11:41:55.000000000 +0100 6758+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-23 15:56:11.000000000 +0100
6757@@ -2063,6 +2063,8 @@ 6759@@ -2063,6 +2063,8 @@
6758 #define LDCMD_SOFINT (1 << 22) 6760 #define LDCMD_SOFINT (1 << 22)
6759 #define LDCMD_EOFINT (1 << 21) 6761 #define LDCMD_EOFINT (1 << 21)
@@ -6765,8 +6767,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
6765 #define LCCR5_SOFM2 (1<<1) /* Start Of Frame Mask for Overlay 2 (channel 2) */ 6767 #define LCCR5_SOFM2 (1<<1) /* Start Of Frame Mask for Overlay 2 (channel 2) */
6766Index: linux-2.6.22/drivers/mmc/host/Kconfig 6768Index: linux-2.6.22/drivers/mmc/host/Kconfig
6767=================================================================== 6769===================================================================
6768--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-19 11:41:50.000000000 +0100 6770--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-09 00:32:17.000000000 +0100
6769+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-07-19 11:43:21.000000000 +0100 6771+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-07-23 15:56:11.000000000 +0100
6770@@ -99,4 +99,10 @@ config MMC_TIFM_SD 6772@@ -99,4 +99,10 @@ config MMC_TIFM_SD
6771 6773
6772 To compile this driver as a module, choose M here: the 6774 To compile this driver as a module, choose M here: the
@@ -6781,8 +6783,8 @@ Index: linux-2.6.22/drivers/mmc/host/Kconfig
6781+ in the iPAQ hx4700 and others. 6783+ in the iPAQ hx4700 and others.
6782Index: linux-2.6.22/drivers/mmc/host/Makefile 6784Index: linux-2.6.22/drivers/mmc/host/Makefile
6783=================================================================== 6785===================================================================
6784--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-19 11:41:50.000000000 +0100 6786--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-09 00:32:17.000000000 +0100
6785+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-07-19 11:41:55.000000000 +0100 6787+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-07-23 15:56:11.000000000 +0100
6786@@ -15,4 +15,4 @@ obj-$(CONFIG_MMC_AU1X) += au1xmmc.o 6788@@ -15,4 +15,4 @@ obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
6787 obj-$(CONFIG_MMC_OMAP) += omap.o 6789 obj-$(CONFIG_MMC_OMAP) += omap.o
6788 obj-$(CONFIG_MMC_AT91) += at91_mci.o 6790 obj-$(CONFIG_MMC_AT91) += at91_mci.o
@@ -6792,7 +6794,7 @@ Index: linux-2.6.22/drivers/mmc/host/Makefile
6792Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c 6794Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
6793=================================================================== 6795===================================================================
6794--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6796--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6795+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-07-19 11:41:55.000000000 +0100 6797+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-07-23 15:56:11.000000000 +0100
6796@@ -0,0 +1,900 @@ 6798@@ -0,0 +1,900 @@
6797+/* Note that this driver can likely be merged into the tmio driver, so 6799+/* Note that this driver can likely be merged into the tmio driver, so
6798+ * consider this code temporary. It works, though. 6800+ * consider this code temporary. It works, though.
@@ -7697,7 +7699,7 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
7697Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h 7699Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7698=================================================================== 7700===================================================================
7699--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7701--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7700+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-07-19 11:41:55.000000000 +0100 7702+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-07-23 15:56:11.000000000 +0100
7701@@ -0,0 +1,25 @@ 7703@@ -0,0 +1,25 @@
7702+#ifndef __ASIC3_MMC_H 7704+#ifndef __ASIC3_MMC_H
7703+#define __ASIC3_MMC_H 7705+#define __ASIC3_MMC_H
@@ -7726,8 +7728,8 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7726+#endif // __ASIC3_MMC_H 7728+#endif // __ASIC3_MMC_H
7727Index: linux-2.6.22/drivers/input/keyboard/Makefile 7729Index: linux-2.6.22/drivers/input/keyboard/Makefile
7728=================================================================== 7730===================================================================
7729--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-19 11:41:50.000000000 +0100 7731--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-09 00:32:17.000000000 +0100
7730+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-07-19 11:41:55.000000000 +0100 7732+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-07-23 15:56:11.000000000 +0100
7731@@ -21,4 +21,4 @@ obj-$(CONFIG_KEYBOARD_OMAP) += omap-key 7733@@ -21,4 +21,4 @@ obj-$(CONFIG_KEYBOARD_OMAP) += omap-key
7732 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o 7734 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o
7733 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o 7735 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o
@@ -7737,7 +7739,7 @@ Index: linux-2.6.22/drivers/input/keyboard/Makefile
7737Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c 7739Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7738=================================================================== 7740===================================================================
7739--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7741--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7740+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-07-19 11:41:55.000000000 +0100 7742+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-07-23 15:56:11.000000000 +0100
7741@@ -0,0 +1,131 @@ 7743@@ -0,0 +1,131 @@
7742+/* 7744+/*
7743+ * Generic buttons driver for ASIC3 SoC. 7745+ * Generic buttons driver for ASIC3 SoC.
@@ -7872,8 +7874,8 @@ Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7872+MODULE_LICENSE("GPL"); 7874+MODULE_LICENSE("GPL");
7873Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 7875Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7874=================================================================== 7876===================================================================
7875--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-07-19 11:41:50.000000000 +0100 7877--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-07-09 00:32:17.000000000 +0100
7876+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-07-19 11:41:55.000000000 +0100 7878+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-07-23 15:56:11.000000000 +0100
7877@@ -178,6 +178,8 @@ 7879@@ -178,6 +178,8 @@
7878 defined(CONFIG_MACH_LOGICPD_PXA270) || \ 7880 defined(CONFIG_MACH_LOGICPD_PXA270) || \
7879 defined(CONFIG_MACH_MAINSTONE) 7881 defined(CONFIG_MACH_MAINSTONE)
@@ -7885,8 +7887,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7885 #endif 7887 #endif
7886Index: linux-2.6.22/include/linux/ioport.h 7888Index: linux-2.6.22/include/linux/ioport.h
7887=================================================================== 7889===================================================================
7888--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-19 11:41:50.000000000 +0100 7890--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-09 00:32:17.000000000 +0100
7889+++ linux-2.6.22/include/linux/ioport.h 2007-07-19 11:41:55.000000000 +0100 7891+++ linux-2.6.22/include/linux/ioport.h 2007-07-23 15:56:11.000000000 +0100
7890@@ -56,6 +56,7 @@ struct resource_list { 7892@@ -56,6 +56,7 @@ struct resource_list {
7891 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) 7893 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
7892 #define IORESOURCE_IRQ_LOWLEVEL (1<<3) 7894 #define IORESOURCE_IRQ_LOWLEVEL (1<<3)
@@ -7897,8 +7899,8 @@ Index: linux-2.6.22/include/linux/ioport.h
7897 #define IORESOURCE_DMA_TYPE_MASK (3<<0) 7899 #define IORESOURCE_DMA_TYPE_MASK (3<<0)
7898Index: linux-2.6.22/drivers/video/backlight/Kconfig 7900Index: linux-2.6.22/drivers/video/backlight/Kconfig
7899=================================================================== 7901===================================================================
7900--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-07-19 11:41:51.000000000 +0100 7902--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-07-23 15:55:38.000000000 +0100
7901+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-07-19 11:41:55.000000000 +0100 7903+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-07-23 15:56:11.000000000 +0100
7902@@ -34,7 +34,7 @@ config LCD_CLASS_DEVICE 7904@@ -34,7 +34,7 @@ config LCD_CLASS_DEVICE
7903 7905
7904 config BACKLIGHT_CORGI 7906 config BACKLIGHT_CORGI
@@ -7910,8 +7912,8 @@ Index: linux-2.6.22/drivers/video/backlight/Kconfig
7910 If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the 7912 If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
7911Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c 7913Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7912=================================================================== 7914===================================================================
7913--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-19 11:41:50.000000000 +0100 7915--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-09 00:32:17.000000000 +0100
7914+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-07-19 11:41:55.000000000 +0100 7916+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-07-23 15:56:11.000000000 +0100
7915@@ -24,7 +24,7 @@ 7917@@ -24,7 +24,7 @@
7916 static int corgibl_intensity; 7918 static int corgibl_intensity;
7917 static struct backlight_properties corgibl_data; 7919 static struct backlight_properties corgibl_data;
@@ -7930,3 +7932,29 @@ Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7930 7932
7931 bl_machinfo = machinfo; 7933 bl_machinfo = machinfo;
7932 if (!machinfo->limit_mask) 7934 if (!machinfo->limit_mask)
7935Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
7936===================================================================
7937--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c 2007-07-23 16:06:06.000000000 +0100
7938+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c 2007-07-23 16:07:32.000000000 +0100
7939@@ -142,7 +142,7 @@ struct corgissp_machinfo corgi_ssp_machi
7940 /*
7941 * Corgi Backlight Device
7942 */
7943-static struct corgibl_machinfo corgi_bl_machinfo = {
7944+static struct generic_bl_info corgi_bl_machinfo = {
7945 .max_intensity = 0x2f,
7946 .default_intensity = 0x1f,
7947 .limit_mask = 0x0b,
7948Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
7949===================================================================
7950--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c 2007-07-23 16:06:03.000000000 +0100
7951+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c 2007-07-23 16:06:43.000000000 +0100
7952@@ -221,7 +221,7 @@ struct corgissp_machinfo spitz_ssp_machi
7953 /*
7954 * Spitz Backlight Device
7955 */
7956-static struct corgibl_machinfo spitz_bl_machinfo = {
7957+static struct generic_bl_info spitz_bl_machinfo = {
7958 .default_intensity = 0x1f,
7959 .limit_mask = 0x0b,
7960 .max_intensity = 0x2f,
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-23 22:04:10 +0000