summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-01 21:09:58 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-01 21:09:58 +0000
commit1ee78ec1a4e8bc4230371fa2de0e48ace8343b4f (patch)
tree98a4b7700cd1087b95428876a20694e80dba2c75 /meta
parent3430bf0f11e6e20f0d84e4cdd6f7814fa3a79e3b (diff)
downloadpoky-1ee78ec1a4e8bc4230371fa2de0e48ace8343b4f.tar.gz
linux-rp-2.6.22: Fix c7x0 compile problem
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2305 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux/linux-rp-2.6.22/htcuni.patch152
-rw-r--r--meta/packages/linux/linux-rp_2.6.22.bb2
2 files changed, 81 insertions, 73 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 2573d85130..6958129ca1 100644
--- a/meta/packages/linux/linux-rp-2.6.22/htcuni.patch
+++ b/meta/packages/linux/linux-rp-2.6.22/htcuni.patch
@@ -1,7 +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/corgi.c | 3
5 arch/arm/mach-pxa/htcuniversal/Kconfig | 80 5 arch/arm/mach-pxa/htcuniversal/Kconfig | 80
6 arch/arm/mach-pxa/htcuniversal/Makefile | 19 6 arch/arm/mach-pxa/htcuniversal/Makefile | 19
7 arch/arm/mach-pxa/htcuniversal/htcuniversal.c | 470 +++++ 7 arch/arm/mach-pxa/htcuniversal/htcuniversal.c | 470 +++++
@@ -59,12 +59,12 @@
59 include/linux/pda_power.h | 31 59 include/linux/pda_power.h | 31
60 include/linux/soc/asic3_base.h | 104 + 60 include/linux/soc/asic3_base.h | 104 +
61 include/linux/soc/tmio_mmc.h | 17 61 include/linux/soc/tmio_mmc.h | 17
62 60 files changed, 7409 insertions(+), 16 deletions(-) 62 60 files changed, 7410 insertions(+), 16 deletions(-)
63 63
64Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig 64Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig
65=================================================================== 65===================================================================
66--- /dev/null 1970-01-01 00:00:00.000000000 +0000 66--- /dev/null 1970-01-01 00:00:00.000000000 +0000
67+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig 2007-07-23 15:56:10.000000000 +0100 67+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig 2007-07-27 16:10:40.000000000 +0100
68@@ -0,0 +1,80 @@ 68@@ -0,0 +1,80 @@
69+menuconfig MACH_HTCUNIVERSAL 69+menuconfig MACH_HTCUNIVERSAL
70+ bool "HTC Universal" 70+ bool "HTC Universal"
@@ -149,7 +149,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Kconfig
149Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 149Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
150=================================================================== 150===================================================================
151--- /dev/null 1970-01-01 00:00:00.000000000 +0000 151--- /dev/null 1970-01-01 00:00:00.000000000 +0000
152+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-07-23 15:56:10.000000000 +0100 152+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-07-27 16:10:40.000000000 +0100
153@@ -0,0 +1,19 @@ 153@@ -0,0 +1,19 @@
154+# 154+#
155+# Makefile for HTC Universal 155+# Makefile for HTC Universal
@@ -173,7 +173,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
173Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 173Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
174=================================================================== 174===================================================================
175--- /dev/null 1970-01-01 00:00:00.000000000 +0000 175--- /dev/null 1970-01-01 00:00:00.000000000 +0000
176+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-07-23 15:56:10.000000000 +0100 176+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-07-27 16:10:40.000000000 +0100
177@@ -0,0 +1,470 @@ 177@@ -0,0 +1,470 @@
178+/* 178+/*
179+ * Hardware definitions for HTC Universal 179+ * Hardware definitions for HTC Universal
@@ -648,7 +648,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
648Index: 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
649=================================================================== 649===================================================================
650--- /dev/null 1970-01-01 00:00:00.000000000 +0000 650--- /dev/null 1970-01-01 00:00:00.000000000 +0000
651+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-07-23 15:56:10.000000000 +0100 651+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-07-27 16:10:40.000000000 +0100
652@@ -0,0 +1,917 @@ 652@@ -0,0 +1,917 @@
653+/* 653+/*
654+ * Audio support for codec Asahi Kasei AK4641 654+ * Audio support for codec Asahi Kasei AK4641
@@ -1570,7 +1570,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
1570Index: 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
1571=================================================================== 1571===================================================================
1572--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1572--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1573+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-07-23 15:56:10.000000000 +0100 1573+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-07-27 16:10:40.000000000 +0100
1574@@ -0,0 +1,65 @@ 1574@@ -0,0 +1,65 @@
1575+/* 1575+/*
1576+ * Audio support for codec Asahi Kasei AK4641 1576+ * Audio support for codec Asahi Kasei AK4641
@@ -1640,7 +1640,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1640Index: 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
1641=================================================================== 1641===================================================================
1642--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1642--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1643+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-07-23 15:56:10.000000000 +0100 1643+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-07-27 16:10:40.000000000 +0100
1644@@ -0,0 +1,143 @@ 1644@@ -0,0 +1,143 @@
1645+/* 1645+/*
1646+ * LEDs support for the HP iPaq hx4700 1646+ * LEDs support for the HP iPaq hx4700
@@ -1788,7 +1788,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
1788Index: 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
1789=================================================================== 1789===================================================================
1790--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1790--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1791+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-07-23 15:56:10.000000000 +0100 1791+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-07-27 16:10:40.000000000 +0100
1792@@ -0,0 +1,61 @@ 1792@@ -0,0 +1,61 @@
1793+/* 1793+/*
1794+ * Use consistent with the GNU GPL is permitted, 1794+ * Use consistent with the GNU GPL is permitted,
@@ -1854,7 +1854,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
1854Index: 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
1855=================================================================== 1855===================================================================
1856--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1856--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1857+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-07-23 15:56:10.000000000 +0100 1857+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-07-27 16:10:40.000000000 +0100
1858@@ -0,0 +1,135 @@ 1858@@ -0,0 +1,135 @@
1859+/* Bluetooth interface driver for TI BRF6150 on HX4700 1859+/* Bluetooth interface driver for TI BRF6150 on HX4700
1860+ * 1860+ *
@@ -1994,7 +1994,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1994Index: 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
1995=================================================================== 1995===================================================================
1996--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1996--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1997+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-07-23 15:56:10.000000000 +0100 1997+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-07-27 16:10:40.000000000 +0100
1998@@ -0,0 +1,17 @@ 1998@@ -0,0 +1,17 @@
1999+/* 1999+/*
2000+ * Bluetooth support file for calling bluetooth configuration functions 2000+ * Bluetooth support file for calling bluetooth configuration functions
@@ -2016,7 +2016,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
2016Index: 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
2017=================================================================== 2017===================================================================
2018--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2018--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2019+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-07-23 15:56:10.000000000 +0100 2019+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-07-27 16:10:40.000000000 +0100
2020@@ -0,0 +1,87 @@ 2020@@ -0,0 +1,87 @@
2021+/* 2021+/*
2022+ * Buttons driver for HTC Universal 2022+ * Buttons driver for HTC Universal
@@ -2108,7 +2108,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
2108Index: 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
2109=================================================================== 2109===================================================================
2110--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2110--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2111+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-07-23 15:56:10.000000000 +0100 2111+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-07-27 16:10:40.000000000 +0100
2112@@ -0,0 +1,226 @@ 2112@@ -0,0 +1,226 @@
2113+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs) 2113+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs)
2114+ * 2114+ *
@@ -2339,7 +2339,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2339Index: 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
2340=================================================================== 2340===================================================================
2341--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2341--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2342+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-07-23 15:56:10.000000000 +0100 2342+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-07-27 16:10:40.000000000 +0100
2343@@ -0,0 +1,212 @@ 2343@@ -0,0 +1,212 @@
2344+/* 2344+/*
2345+ * Use consistent with the GNU GPL is permitted, 2345+ * Use consistent with the GNU GPL is permitted,
@@ -2556,7 +2556,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
2556Index: 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
2557=================================================================== 2557===================================================================
2558--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2558--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2559+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-07-23 15:56:10.000000000 +0100 2559+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-07-27 16:10:40.000000000 +0100
2560@@ -0,0 +1,167 @@ 2560@@ -0,0 +1,167 @@
2561+ 2561+
2562+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal 2562+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal
@@ -2728,7 +2728,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
2728Index: 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
2729=================================================================== 2729===================================================================
2730--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2730--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2731+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-07-23 15:56:10.000000000 +0100 2731+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-07-27 16:10:40.000000000 +0100
2732@@ -0,0 +1,16 @@ 2732@@ -0,0 +1,16 @@
2733+/* 2733+/*
2734+ * Bluetooth support file for calling bluetooth configuration functions 2734+ * Bluetooth support file for calling bluetooth configuration functions
@@ -2749,7 +2749,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
2749Index: 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
2750=================================================================== 2750===================================================================
2751--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2751--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2752+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-07-23 15:56:10.000000000 +0100 2752+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-07-27 16:10:40.000000000 +0100
2753@@ -0,0 +1,69 @@ 2753@@ -0,0 +1,69 @@
2754+/* 2754+/*
2755+ * 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
@@ -2823,7 +2823,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
2823Index: 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
2824=================================================================== 2824===================================================================
2825--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2825--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2826+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-07-23 15:56:10.000000000 +0100 2826+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-07-27 16:10:40.000000000 +0100
2827@@ -0,0 +1,97 @@ 2827@@ -0,0 +1,97 @@
2828+/* 2828+/*
2829+ * pda_power driver for HTC Universal 2829+ * pda_power driver for HTC Universal
@@ -2925,7 +2925,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2925Index: 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
2926=================================================================== 2926===================================================================
2927--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2927--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2928+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-07-23 15:56:10.000000000 +0100 2928+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-07-27 16:10:40.000000000 +0100
2929@@ -0,0 +1,490 @@ 2929@@ -0,0 +1,490 @@
2930+/* Touch screen driver for the TI something-or-other 2930+/* Touch screen driver for the TI something-or-other
2931+ * 2931+ *
@@ -3420,7 +3420,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
3420Index: 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
3421=================================================================== 3421===================================================================
3422--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3422--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3423+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-07-23 15:56:10.000000000 +0100 3423+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-07-27 16:10:40.000000000 +0100
3424@@ -0,0 +1,71 @@ 3424@@ -0,0 +1,71 @@
3425+ 3425+
3426+/* 3426+/*
@@ -3496,7 +3496,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3496Index: 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
3497=================================================================== 3497===================================================================
3498--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3498--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3499+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-07-23 15:56:10.000000000 +0100 3499+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-07-27 16:10:40.000000000 +0100
3500@@ -0,0 +1,20 @@ 3500@@ -0,0 +1,20 @@
3501+/* 3501+/*
3502+ * temporary TSC2046 touchscreen hack 3502+ * temporary TSC2046 touchscreen hack
@@ -3520,8 +3520,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3520+#endif 3520+#endif
3521Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig 3521Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3522=================================================================== 3522===================================================================
3523--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-07-23 15:56:00.000000000 +0100 3523--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-07-27 16:10:20.000000000 +0100
3524+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-07-23 15:56:10.000000000 +0100 3524+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-07-27 16:10:40.000000000 +0100
3525@@ -46,6 +46,8 @@ config MACH_HX2750 3525@@ -46,6 +46,8 @@ config MACH_HX2750
3526 help 3526 help
3527 This enables support for the HP iPAQ HX2750 handheld. 3527 This enables support for the HP iPAQ HX2750 handheld.
@@ -3533,8 +3533,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3533 if PXA_SHARPSL 3533 if PXA_SHARPSL
3534Index: linux-2.6.22/arch/arm/mach-pxa/Makefile 3534Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
3535=================================================================== 3535===================================================================
3536--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-07-23 15:56:00.000000000 +0100 3536--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-07-27 16:10:20.000000000 +0100
3537+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-07-23 15:56:10.000000000 +0100 3537+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-07-27 16:10:40.000000000 +0100
3538@@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_AKITA) += akita-ioexp. 3538@@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_AKITA) += akita-ioexp.
3539 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
3540 obj-$(CONFIG_MACH_TOSA) += tosa.o 3540 obj-$(CONFIG_MACH_TOSA) += tosa.o
@@ -3545,8 +3545,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
3545 led-y := leds.o 3545 led-y := leds.o
3546Index: linux-2.6.22/arch/arm/mach-pxa/pm.c 3546Index: linux-2.6.22/arch/arm/mach-pxa/pm.c
3547=================================================================== 3547===================================================================
3548--- linux-2.6.22.orig/arch/arm/mach-pxa/pm.c 2007-07-23 15:55:49.000000000 +0100 3548--- linux-2.6.22.orig/arch/arm/mach-pxa/pm.c 2007-07-27 16:10:08.000000000 +0100
3549+++ linux-2.6.22/arch/arm/mach-pxa/pm.c 2007-07-23 15:56:10.000000000 +0100 3549+++ linux-2.6.22/arch/arm/mach-pxa/pm.c 2007-07-27 16:10:40.000000000 +0100
3550@@ -22,6 +22,7 @@ 3550@@ -22,6 +22,7 @@
3551 #include <asm/system.h> 3551 #include <asm/system.h>
3552 #include <asm/arch/pm.h> 3552 #include <asm/arch/pm.h>
@@ -3649,7 +3649,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pm.c
3649Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 3649Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
3650=================================================================== 3650===================================================================
3651--- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-09 00:32:17.000000000 +0100 3651--- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-09 00:32:17.000000000 +0100
3652+++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-23 15:56:10.000000000 +0100 3652+++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 2007-07-27 16:10:40.000000000 +0100
3653@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform 3653@@ -140,7 +140,7 @@ static int pxakbd_resume(struct platform
3654 KPREC = pdata->reg_kprec; 3654 KPREC = pdata->reg_kprec;
3655 3655
@@ -3662,7 +3662,7 @@ Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
3662Index: linux-2.6.22/drivers/leds/Kconfig 3662Index: linux-2.6.22/drivers/leds/Kconfig
3663=================================================================== 3663===================================================================
3664--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-07-09 00:32:17.000000000 +0100 3664--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-07-09 00:32:17.000000000 +0100
3665+++ linux-2.6.22/drivers/leds/Kconfig 2007-07-23 15:56:10.000000000 +0100 3665+++ linux-2.6.22/drivers/leds/Kconfig 2007-07-27 16:10:40.000000000 +0100
3666@@ -95,6 +95,13 @@ config LEDS_COBALT 3666@@ -95,6 +95,13 @@ config LEDS_COBALT
3667 help 3667 help
3668 This option enables support for the front LED on Cobalt Server 3668 This option enables support for the front LED on Cobalt Server
@@ -3680,7 +3680,7 @@ Index: linux-2.6.22/drivers/leds/Kconfig
3680Index: linux-2.6.22/drivers/leds/Makefile 3680Index: linux-2.6.22/drivers/leds/Makefile
3681=================================================================== 3681===================================================================
3682--- linux-2.6.22.orig/drivers/leds/Makefile 2007-07-09 00:32:17.000000000 +0100 3682--- linux-2.6.22.orig/drivers/leds/Makefile 2007-07-09 00:32:17.000000000 +0100
3683+++ linux-2.6.22/drivers/leds/Makefile 2007-07-23 15:56:10.000000000 +0100 3683+++ linux-2.6.22/drivers/leds/Makefile 2007-07-27 16:10:40.000000000 +0100
3684@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net4 3684@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net4
3685 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o 3685 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
3686 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o 3686 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
@@ -3692,7 +3692,7 @@ Index: linux-2.6.22/drivers/leds/Makefile
3692Index: linux-2.6.22/drivers/leds/leds-asic3.c 3692Index: linux-2.6.22/drivers/leds/leds-asic3.c
3693=================================================================== 3693===================================================================
3694--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3694--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3695+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-07-23 15:56:10.000000000 +0100 3695+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-07-27 16:10:40.000000000 +0100
3696@@ -0,0 +1,189 @@ 3696@@ -0,0 +1,189 @@
3697+/* 3697+/*
3698+ * LEDs support for HTC ASIC3 devices. 3698+ * LEDs support for HTC ASIC3 devices.
@@ -3885,8 +3885,8 @@ Index: linux-2.6.22/drivers/leds/leds-asic3.c
3885+MODULE_LICENSE("GPL"); 3885+MODULE_LICENSE("GPL");
3886Index: linux-2.6.22/drivers/mfd/Kconfig 3886Index: linux-2.6.22/drivers/mfd/Kconfig
3887=================================================================== 3887===================================================================
3888--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-07-23 15:55:45.000000000 +0100 3888--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-07-27 16:10:05.000000000 +0100
3889+++ linux-2.6.22/drivers/mfd/Kconfig 2007-07-23 15:56:10.000000000 +0100 3889+++ linux-2.6.22/drivers/mfd/Kconfig 2007-07-27 16:10:40.000000000 +0100
3890@@ -17,6 +17,9 @@ config MFD_SM501 3890@@ -17,6 +17,9 @@ config MFD_SM501
3891 3891
3892 endmenu 3892 endmenu
@@ -3899,8 +3899,8 @@ Index: linux-2.6.22/drivers/mfd/Kconfig
3899 3899
3900Index: linux-2.6.22/drivers/mfd/Makefile 3900Index: linux-2.6.22/drivers/mfd/Makefile
3901=================================================================== 3901===================================================================
3902--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-07-23 15:55:45.000000000 +0100 3902--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-07-27 16:10:05.000000000 +0100
3903+++ linux-2.6.22/drivers/mfd/Makefile 2007-07-23 15:56:10.000000000 +0100 3903+++ linux-2.6.22/drivers/mfd/Makefile 2007-07-27 16:10:40.000000000 +0100
3904@@ -2,6 +2,8 @@ 3904@@ -2,6 +2,8 @@
3905 # Makefile for multifunction miscellaneous devices 3905 # Makefile for multifunction miscellaneous devices
3906 # 3906 #
@@ -3913,7 +3913,7 @@ Index: linux-2.6.22/drivers/mfd/Makefile
3913Index: linux-2.6.22/drivers/mfd/asic3_base.c 3913Index: linux-2.6.22/drivers/mfd/asic3_base.c
3914=================================================================== 3914===================================================================
3915--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3915--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3916+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-07-23 15:56:10.000000000 +0100 3916+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-07-27 16:10:40.000000000 +0100
3917@@ -0,0 +1,1208 @@ 3917@@ -0,0 +1,1208 @@
3918+/* 3918+/*
3919+ * Driver interface to HTC "ASIC3" 3919+ * Driver interface to HTC "ASIC3"
@@ -5126,7 +5126,7 @@ Index: linux-2.6.22/drivers/mfd/asic3_base.c
5126Index: linux-2.6.22/drivers/mfd/soc-core.c 5126Index: linux-2.6.22/drivers/mfd/soc-core.c
5127=================================================================== 5127===================================================================
5128--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5128--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5129+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-07-23 15:56:10.000000000 +0100 5129+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-07-27 16:10:40.000000000 +0100
5130@@ -0,0 +1,106 @@ 5130@@ -0,0 +1,106 @@
5131+/* 5131+/*
5132+ * drivers/soc/soc-core.c 5132+ * drivers/soc/soc-core.c
@@ -5237,7 +5237,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.c
5237Index: linux-2.6.22/drivers/mfd/soc-core.h 5237Index: linux-2.6.22/drivers/mfd/soc-core.h
5238=================================================================== 5238===================================================================
5239--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5239--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5240+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-07-23 15:56:11.000000000 +0100 5240+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-07-27 16:10:40.000000000 +0100
5241@@ -0,0 +1,30 @@ 5241@@ -0,0 +1,30 @@
5242+/* 5242+/*
5243+ * drivers/soc/soc-core.h 5243+ * drivers/soc/soc-core.h
@@ -5272,7 +5272,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.h
5272Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h 5272Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5273=================================================================== 5273===================================================================
5274--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5274--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5275+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-07-23 15:56:11.000000000 +0100 5275+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-07-27 16:10:40.000000000 +0100
5276@@ -0,0 +1,27 @@ 5276@@ -0,0 +1,27 @@
5277+/* 5277+/*
5278+ * linux/include/asm-arm/arch-pxa/clock.h 5278+ * linux/include/asm-arm/arch-pxa/clock.h
@@ -5304,7 +5304,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5304Index: 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
5305=================================================================== 5305===================================================================
5306--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5306--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5307+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-07-23 15:56:11.000000000 +0100 5307+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-07-27 16:10:40.000000000 +0100
5308@@ -0,0 +1,213 @@ 5308@@ -0,0 +1,213 @@
5309+/* 5309+/*
5310+ * include/asm/arm/arch-pxa/htcuniversal-asic.h 5310+ * include/asm/arm/arch-pxa/htcuniversal-asic.h
@@ -5522,7 +5522,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
5522Index: 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
5523=================================================================== 5523===================================================================
5524--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5524--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5525+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-07-23 15:56:11.000000000 +0100 5525+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-07-27 16:10:40.000000000 +0100
5526@@ -0,0 +1,220 @@ 5526@@ -0,0 +1,220 @@
5527+/* 5527+/*
5528+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h 5528+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h
@@ -5747,7 +5747,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
5747Index: 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
5748=================================================================== 5748===================================================================
5749--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5749--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5750+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-07-23 15:56:11.000000000 +0100 5750+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-07-27 16:10:40.000000000 +0100
5751@@ -0,0 +1,14 @@ 5751@@ -0,0 +1,14 @@
5752+/* 5752+/*
5753+ * include/asm/arm/arch-pxa/htcuniversal-init.h 5753+ * include/asm/arm/arch-pxa/htcuniversal-init.h
@@ -5766,7 +5766,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
5766Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 5766Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
5767=================================================================== 5767===================================================================
5768--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5768--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5769+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-07-23 15:56:11.000000000 +0100 5769+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-07-27 16:10:40.000000000 +0100
5770@@ -0,0 +1,3 @@ 5770@@ -0,0 +1,3 @@
5771+#include <asm/arch/irqs.h> 5771+#include <asm/arch/irqs.h>
5772+ 5772+
@@ -5774,7 +5774,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
5774Index: 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
5775=================================================================== 5775===================================================================
5776--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5776--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5777+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-07-23 15:56:11.000000000 +0100 5777+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-07-27 16:10:40.000000000 +0100
5778@@ -0,0 +1,6 @@ 5778@@ -0,0 +1,6 @@
5779+struct pxa_ll_pm_ops { 5779+struct pxa_ll_pm_ops {
5780+ void (*suspend)(unsigned long); 5780+ void (*suspend)(unsigned long);
@@ -5785,7 +5785,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
5785Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 5785Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
5786=================================================================== 5786===================================================================
5787--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-09 00:32:17.000000000 +0100 5787--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-09 00:32:17.000000000 +0100
5788+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-07-23 15:56:11.000000000 +0100 5788+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-07-27 16:10:40.000000000 +0100
5789@@ -25,12 +25,6 @@ struct corgits_machinfo { 5789@@ -25,12 +25,6 @@ struct corgits_machinfo {
5790 /* 5790 /*
5791 * SharpSL Backlight 5791 * SharpSL Backlight
@@ -5802,7 +5802,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
5802Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 5802Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5803=================================================================== 5803===================================================================
5804--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5804--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5805+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-07-23 15:56:11.000000000 +0100 5805+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-07-27 16:10:40.000000000 +0100
5806@@ -0,0 +1,18 @@ 5806@@ -0,0 +1,18 @@
5807+#include <linux/input.h> 5807+#include <linux/input.h>
5808+ 5808+
@@ -5825,7 +5825,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5825Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 5825Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5826=================================================================== 5826===================================================================
5827--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5827--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5828+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-07-23 15:56:11.000000000 +0100 5828+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-07-27 16:10:40.000000000 +0100
5829@@ -0,0 +1,34 @@ 5829@@ -0,0 +1,34 @@
5830+/* 5830+/*
5831+ * LEDs support for HTC ASIC3 devices. 5831+ * LEDs support for HTC ASIC3 devices.
@@ -5864,7 +5864,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5864Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 5864Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
5865=================================================================== 5865===================================================================
5866--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5866--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5867+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-07-23 15:56:11.000000000 +0100 5867+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-07-27 16:10:40.000000000 +0100
5868@@ -0,0 +1,602 @@ 5868@@ -0,0 +1,602 @@
5869+/* 5869+/*
5870+ * 5870+ *
@@ -6471,7 +6471,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
6471Index: linux-2.6.22/include/linux/backlight.h 6471Index: linux-2.6.22/include/linux/backlight.h
6472=================================================================== 6472===================================================================
6473--- linux-2.6.22.orig/include/linux/backlight.h 2007-07-09 00:32:17.000000000 +0100 6473--- linux-2.6.22.orig/include/linux/backlight.h 2007-07-09 00:32:17.000000000 +0100
6474+++ linux-2.6.22/include/linux/backlight.h 2007-07-23 15:56:11.000000000 +0100 6474+++ linux-2.6.22/include/linux/backlight.h 2007-07-27 16:10:40.000000000 +0100
6475@@ -87,4 +87,11 @@ extern void backlight_device_unregister( 6475@@ -87,4 +87,11 @@ extern void backlight_device_unregister(
6476 6476
6477 #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)
@@ -6487,7 +6487,7 @@ Index: linux-2.6.22/include/linux/backlight.h
6487Index: linux-2.6.22/include/linux/gpiodev.h 6487Index: linux-2.6.22/include/linux/gpiodev.h
6488=================================================================== 6488===================================================================
6489--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6489--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6490+++ linux-2.6.22/include/linux/gpiodev.h 2007-07-23 15:56:11.000000000 +0100 6490+++ linux-2.6.22/include/linux/gpiodev.h 2007-07-27 16:10:40.000000000 +0100
6491@@ -0,0 +1,44 @@ 6491@@ -0,0 +1,44 @@
6492+#ifndef __GPIODEV_H 6492+#ifndef __GPIODEV_H
6493+#define __GPIODEV_H 6493+#define __GPIODEV_H
@@ -6536,7 +6536,7 @@ Index: linux-2.6.22/include/linux/gpiodev.h
6536Index: linux-2.6.22/include/linux/input_pda.h 6536Index: linux-2.6.22/include/linux/input_pda.h
6537=================================================================== 6537===================================================================
6538--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6538--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6539+++ linux-2.6.22/include/linux/input_pda.h 2007-07-23 15:56:11.000000000 +0100 6539+++ linux-2.6.22/include/linux/input_pda.h 2007-07-27 16:10:40.000000000 +0100
6540@@ -0,0 +1,47 @@ 6540@@ -0,0 +1,47 @@
6541+#ifndef _INPUT_PDA_H 6541+#ifndef _INPUT_PDA_H
6542+#define _INPUT_PDA_H 6542+#define _INPUT_PDA_H
@@ -6588,7 +6588,7 @@ Index: linux-2.6.22/include/linux/input_pda.h
6588Index: linux-2.6.22/include/linux/pda_power.h 6588Index: linux-2.6.22/include/linux/pda_power.h
6589=================================================================== 6589===================================================================
6590--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6590--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6591+++ linux-2.6.22/include/linux/pda_power.h 2007-07-23 15:56:11.000000000 +0100 6591+++ linux-2.6.22/include/linux/pda_power.h 2007-07-27 16:10:40.000000000 +0100
6592@@ -0,0 +1,31 @@ 6592@@ -0,0 +1,31 @@
6593+/* 6593+/*
6594+ * 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
@@ -6624,7 +6624,7 @@ Index: linux-2.6.22/include/linux/pda_power.h
6624Index: linux-2.6.22/include/linux/soc/asic3_base.h 6624Index: linux-2.6.22/include/linux/soc/asic3_base.h
6625=================================================================== 6625===================================================================
6626--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6626--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6627+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-07-23 15:56:11.000000000 +0100 6627+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-07-27 16:10:40.000000000 +0100
6628@@ -0,0 +1,104 @@ 6628@@ -0,0 +1,104 @@
6629+#include <asm/types.h> 6629+#include <asm/types.h>
6630+#include <linux/gpiodev.h> 6630+#include <linux/gpiodev.h>
@@ -6733,7 +6733,7 @@ Index: linux-2.6.22/include/linux/soc/asic3_base.h
6733Index: linux-2.6.22/include/linux/soc/tmio_mmc.h 6733Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6734=================================================================== 6734===================================================================
6735--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6735--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6736+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-07-23 15:56:11.000000000 +0100 6736+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-07-27 16:10:40.000000000 +0100
6737@@ -0,0 +1,17 @@ 6737@@ -0,0 +1,17 @@
6738+#include <linux/platform_device.h> 6738+#include <linux/platform_device.h>
6739+ 6739+
@@ -6754,8 +6754,8 @@ Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6754+}; 6754+};
6755Index: 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
6756=================================================================== 6756===================================================================
6757--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-23 15:56:00.000000000 +0100 6757--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-27 16:10:22.000000000 +0100
6758+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-23 15:56:11.000000000 +0100 6758+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-07-27 16:10:40.000000000 +0100
6759@@ -2063,6 +2063,8 @@ 6759@@ -2063,6 +2063,8 @@
6760 #define LDCMD_SOFINT (1 << 22) 6760 #define LDCMD_SOFINT (1 << 22)
6761 #define LDCMD_EOFINT (1 << 21) 6761 #define LDCMD_EOFINT (1 << 21)
@@ -6768,7 +6768,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
6768Index: linux-2.6.22/drivers/mmc/host/Kconfig 6768Index: linux-2.6.22/drivers/mmc/host/Kconfig
6769=================================================================== 6769===================================================================
6770--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-09 00:32:17.000000000 +0100 6770--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-09 00:32:17.000000000 +0100
6771+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-07-23 15:56:11.000000000 +0100 6771+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-07-27 16:10:40.000000000 +0100
6772@@ -99,4 +99,10 @@ config MMC_TIFM_SD 6772@@ -99,4 +99,10 @@ config MMC_TIFM_SD
6773 6773
6774 To compile this driver as a module, choose M here: the 6774 To compile this driver as a module, choose M here: the
@@ -6784,7 +6784,7 @@ Index: linux-2.6.22/drivers/mmc/host/Kconfig
6784Index: linux-2.6.22/drivers/mmc/host/Makefile 6784Index: linux-2.6.22/drivers/mmc/host/Makefile
6785=================================================================== 6785===================================================================
6786--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-09 00:32:17.000000000 +0100 6786--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-09 00:32:17.000000000 +0100
6787+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-07-23 15:56:11.000000000 +0100 6787+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-07-27 16:10:40.000000000 +0100
6788@@ -15,4 +15,4 @@ obj-$(CONFIG_MMC_AU1X) += au1xmmc.o 6788@@ -15,4 +15,4 @@ obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
6789 obj-$(CONFIG_MMC_OMAP) += omap.o 6789 obj-$(CONFIG_MMC_OMAP) += omap.o
6790 obj-$(CONFIG_MMC_AT91) += at91_mci.o 6790 obj-$(CONFIG_MMC_AT91) += at91_mci.o
@@ -6794,7 +6794,7 @@ Index: linux-2.6.22/drivers/mmc/host/Makefile
6794Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c 6794Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
6795=================================================================== 6795===================================================================
6796--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6796--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6797+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-07-23 15:56:11.000000000 +0100 6797+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-07-27 16:10:40.000000000 +0100
6798@@ -0,0 +1,900 @@ 6798@@ -0,0 +1,900 @@
6799+/* 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
6800+ * consider this code temporary. It works, though. 6800+ * consider this code temporary. It works, though.
@@ -7699,7 +7699,7 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
7699Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h 7699Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7700=================================================================== 7700===================================================================
7701--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7701--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7702+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-07-23 15:56:11.000000000 +0100 7702+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-07-27 16:10:40.000000000 +0100
7703@@ -0,0 +1,25 @@ 7703@@ -0,0 +1,25 @@
7704+#ifndef __ASIC3_MMC_H 7704+#ifndef __ASIC3_MMC_H
7705+#define __ASIC3_MMC_H 7705+#define __ASIC3_MMC_H
@@ -7729,7 +7729,7 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7729Index: linux-2.6.22/drivers/input/keyboard/Makefile 7729Index: linux-2.6.22/drivers/input/keyboard/Makefile
7730=================================================================== 7730===================================================================
7731--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-09 00:32:17.000000000 +0100 7731--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-09 00:32:17.000000000 +0100
7732+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-07-23 15:56:11.000000000 +0100 7732+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-07-27 16:10:41.000000000 +0100
7733@@ -21,4 +21,4 @@ obj-$(CONFIG_KEYBOARD_OMAP) += omap-key 7733@@ -21,4 +21,4 @@ obj-$(CONFIG_KEYBOARD_OMAP) += omap-key
7734 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o 7734 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o
7735 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o 7735 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o
@@ -7739,7 +7739,7 @@ Index: linux-2.6.22/drivers/input/keyboard/Makefile
7739Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c 7739Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7740=================================================================== 7740===================================================================
7741--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7741--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7742+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-07-23 15:56:11.000000000 +0100 7742+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-07-27 16:10:41.000000000 +0100
7743@@ -0,0 +1,131 @@ 7743@@ -0,0 +1,131 @@
7744+/* 7744+/*
7745+ * Generic buttons driver for ASIC3 SoC. 7745+ * Generic buttons driver for ASIC3 SoC.
@@ -7875,7 +7875,7 @@ Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7875Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 7875Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7876=================================================================== 7876===================================================================
7877--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-07-09 00:32:17.000000000 +0100 7877--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-07-09 00:32:17.000000000 +0100
7878+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-07-23 15:56:11.000000000 +0100 7878+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-07-27 16:10:41.000000000 +0100
7879@@ -178,6 +178,8 @@ 7879@@ -178,6 +178,8 @@
7880 defined(CONFIG_MACH_LOGICPD_PXA270) || \ 7880 defined(CONFIG_MACH_LOGICPD_PXA270) || \
7881 defined(CONFIG_MACH_MAINSTONE) 7881 defined(CONFIG_MACH_MAINSTONE)
@@ -7888,7 +7888,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7888Index: linux-2.6.22/include/linux/ioport.h 7888Index: linux-2.6.22/include/linux/ioport.h
7889=================================================================== 7889===================================================================
7890--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-09 00:32:17.000000000 +0100 7890--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-09 00:32:17.000000000 +0100
7891+++ linux-2.6.22/include/linux/ioport.h 2007-07-23 15:56:11.000000000 +0100 7891+++ linux-2.6.22/include/linux/ioport.h 2007-07-27 16:10:41.000000000 +0100
7892@@ -56,6 +56,7 @@ struct resource_list { 7892@@ -56,6 +56,7 @@ struct resource_list {
7893 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) 7893 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
7894 #define IORESOURCE_IRQ_LOWLEVEL (1<<3) 7894 #define IORESOURCE_IRQ_LOWLEVEL (1<<3)
@@ -7899,8 +7899,8 @@ Index: linux-2.6.22/include/linux/ioport.h
7899 #define IORESOURCE_DMA_TYPE_MASK (3<<0) 7899 #define IORESOURCE_DMA_TYPE_MASK (3<<0)
7900Index: linux-2.6.22/drivers/video/backlight/Kconfig 7900Index: linux-2.6.22/drivers/video/backlight/Kconfig
7901=================================================================== 7901===================================================================
7902--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-07-23 15:55:38.000000000 +0100 7902--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-07-27 16:10:00.000000000 +0100
7903+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-07-23 15:56:11.000000000 +0100 7903+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-07-27 16:10:41.000000000 +0100
7904@@ -34,7 +34,7 @@ config LCD_CLASS_DEVICE 7904@@ -34,7 +34,7 @@ config LCD_CLASS_DEVICE
7905 7905
7906 config BACKLIGHT_CORGI 7906 config BACKLIGHT_CORGI
@@ -7913,7 +7913,7 @@ Index: linux-2.6.22/drivers/video/backlight/Kconfig
7913Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c 7913Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7914=================================================================== 7914===================================================================
7915--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-09 00:32:17.000000000 +0100 7915--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-09 00:32:17.000000000 +0100
7916+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-07-23 15:56:11.000000000 +0100 7916+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-07-27 16:10:41.000000000 +0100
7917@@ -24,7 +24,7 @@ 7917@@ -24,7 +24,7 @@
7918 static int corgibl_intensity; 7918 static int corgibl_intensity;
7919 static struct backlight_properties corgibl_data; 7919 static struct backlight_properties corgibl_data;
@@ -7934,9 +7934,17 @@ Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7934 if (!machinfo->limit_mask) 7934 if (!machinfo->limit_mask)
7935Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c 7935Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
7936=================================================================== 7936===================================================================
7937--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c 2007-07-23 16:06:06.000000000 +0100 7937--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c 2007-07-27 16:10:13.000000000 +0100
7938+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c 2007-07-23 16:07:32.000000000 +0100 7938+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c 2007-07-27 16:13:54.000000000 +0100
7939@@ -142,7 +142,7 @@ struct corgissp_machinfo corgi_ssp_machi 7939@@ -20,6 +20,7 @@
7940 #include <linux/interrupt.h>
7941 #include <linux/mmc/host.h>
7942 #include <linux/pm.h>
7943+#include <linux/backlight.h>
7944
7945 #include <asm/setup.h>
7946 #include <asm/memory.h>
7947@@ -142,7 +143,7 @@ struct corgissp_machinfo corgi_ssp_machi
7940 /* 7948 /*
7941 * Corgi Backlight Device 7949 * Corgi Backlight Device
7942 */ 7950 */
@@ -7947,8 +7955,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
7947 .limit_mask = 0x0b, 7955 .limit_mask = 0x0b,
7948Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c 7956Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
7949=================================================================== 7957===================================================================
7950--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c 2007-07-23 16:06:03.000000000 +0100 7958--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c 2007-07-27 16:10:17.000000000 +0100
7951+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c 2007-07-23 16:06:43.000000000 +0100 7959+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c 2007-07-27 16:10:41.000000000 +0100
7952@@ -221,7 +221,7 @@ struct corgissp_machinfo spitz_ssp_machi 7960@@ -221,7 +221,7 @@ struct corgissp_machinfo spitz_ssp_machi
7953 /* 7961 /*
7954 * Spitz Backlight Device 7962 * Spitz Backlight Device
diff --git a/meta/packages/linux/linux-rp_2.6.22.bb b/meta/packages/linux/linux-rp_2.6.22.bb
index 41bec1542a..36bd3416b7 100644
--- a/meta/packages/linux/linux-rp_2.6.22.bb
+++ b/meta/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5# Handy URLs 5# Handy URLs
6# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 6# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 09:52:17 +0000