summaryrefslogtreecommitdiffstats
path: root/meta/packages/linux
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-20 21:53:21 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-20 21:53:21 +0000
commit2d426d0fd64c8327b6a2f49ab7488bc887d1014c (patch)
tree68d7760d7b81566736350db74d63f34f34fcb7dc /meta/packages/linux
parent2b726332b1deff4f756bd7ba220f403a43116292 (diff)
downloadpoky-2d426d0fd64c8327b6a2f49ab7488bc887d1014c.tar.gz
linux-rp_2.6.23+2.6.24-rc8: Further defconfig refreshes and fix the htcuni patches so they at least apply
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3559 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux')
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie24
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal200
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle7
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa1665
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch119
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch468
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/defconfig-poodle6
-rw-r--r--meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb2
8 files changed, 352 insertions, 2139 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
index 79173b39ae..06b4d15ddb 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc6 3# Linux kernel version: 2.6.24-rc8
4# Thu Jan 17 20:12:19 2008 4# Sun Jan 20 18:52:49 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -77,6 +77,7 @@ CONFIG_VM_EVENT_COUNTERS=y
77CONFIG_SLAB=y 77CONFIG_SLAB=y
78# CONFIG_SLUB is not set 78# CONFIG_SLUB is not set
79# CONFIG_SLOB is not set 79# CONFIG_SLOB is not set
80CONFIG_SLABINFO=y
80CONFIG_RT_MUTEXES=y 81CONFIG_RT_MUTEXES=y
81# CONFIG_TINY_SHMEM is not set 82# CONFIG_TINY_SHMEM is not set
82CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
@@ -218,7 +219,8 @@ CONFIG_PCMCIA_SA1100=m
218CONFIG_PREEMPT=y 219CONFIG_PREEMPT=y
219CONFIG_NO_IDLE_HZ=y 220CONFIG_NO_IDLE_HZ=y
220CONFIG_HZ=100 221CONFIG_HZ=100
221# CONFIG_AEABI is not set 222CONFIG_AEABI=y
223CONFIG_OABI_COMPAT=y
222CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 224CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
223CONFIG_NODES_SHIFT=2 225CONFIG_NODES_SHIFT=2
224CONFIG_SELECT_MEMORY_MODEL=y 226CONFIG_SELECT_MEMORY_MODEL=y
@@ -243,7 +245,7 @@ CONFIG_ALIGNMENT_TRAP=y
243# 245#
244CONFIG_ZBOOT_ROM_TEXT=0x0 246CONFIG_ZBOOT_ROM_TEXT=0x0
245CONFIG_ZBOOT_ROM_BSS=0x0 247CONFIG_ZBOOT_ROM_BSS=0x0
246CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=64M fbcon=rotate:1 dyntick=enable debug" 248CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M fbcon=rotate:1 dyntick=enable debug"
247# CONFIG_XIP_KERNEL is not set 249# CONFIG_XIP_KERNEL is not set
248CONFIG_KEXEC=y 250CONFIG_KEXEC=y
249CONFIG_ATAGS_PROC=y 251CONFIG_ATAGS_PROC=y
@@ -270,7 +272,6 @@ CONFIG_FPE_NWFPE=y
270CONFIG_BINFMT_ELF=y 272CONFIG_BINFMT_ELF=y
271CONFIG_BINFMT_AOUT=m 273CONFIG_BINFMT_AOUT=m
272CONFIG_BINFMT_MISC=m 274CONFIG_BINFMT_MISC=m
273# CONFIG_ARTHUR is not set
274 275
275# 276#
276# Power management options 277# Power management options
@@ -323,6 +324,7 @@ CONFIG_INET_TCP_DIAG=m
323CONFIG_TCP_CONG_CUBIC=y 324CONFIG_TCP_CONG_CUBIC=y
324CONFIG_DEFAULT_TCP_CONG="cubic" 325CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_TCP_MD5SIG is not set 326# CONFIG_TCP_MD5SIG is not set
327# CONFIG_IP_VS is not set
326CONFIG_IPV6=m 328CONFIG_IPV6=m
327# CONFIG_IPV6_PRIVACY is not set 329# CONFIG_IPV6_PRIVACY is not set
328# CONFIG_IPV6_ROUTER_PREF is not set 330# CONFIG_IPV6_ROUTER_PREF is not set
@@ -375,6 +377,7 @@ CONFIG_NETFILTER_XTABLES=m
375# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 377# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
376# CONFIG_NETFILTER_XT_MATCH_STRING is not set 378# CONFIG_NETFILTER_XT_MATCH_STRING is not set
377# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 379# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
380# CONFIG_NETFILTER_XT_MATCH_TIME is not set
378# CONFIG_NETFILTER_XT_MATCH_U32 is not set 381# CONFIG_NETFILTER_XT_MATCH_U32 is not set
379# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 382# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
380 383
@@ -408,10 +411,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
408# IPv6: Netfilter Configuration (EXPERIMENTAL) 411# IPv6: Netfilter Configuration (EXPERIMENTAL)
409# 412#
410# CONFIG_IP6_NF_QUEUE is not set 413# CONFIG_IP6_NF_QUEUE is not set
411 414# CONFIG_IP6_NF_IPTABLES is not set
412#
413# DCCP Configuration (EXPERIMENTAL)
414#
415# CONFIG_IP_DCCP is not set 415# CONFIG_IP_DCCP is not set
416# CONFIG_IP_SCTP is not set 416# CONFIG_IP_SCTP is not set
417# CONFIG_TIPC is not set 417# CONFIG_TIPC is not set
@@ -1150,7 +1150,12 @@ CONFIG_EXT2_FS=m
1150# CONFIG_EXT2_FS_XATTR is not set 1150# CONFIG_EXT2_FS_XATTR is not set
1151# CONFIG_EXT2_FS_XIP is not set 1151# CONFIG_EXT2_FS_XIP is not set
1152CONFIG_EXT3_FS=m 1152CONFIG_EXT3_FS=m
1153CONFIG_EXT3_FS_XATTR=y
1154# CONFIG_EXT3_FS_POSIX_ACL is not set
1155# CONFIG_EXT3_FS_SECURITY is not set
1153# CONFIG_EXT4DEV_FS is not set 1156# CONFIG_EXT4DEV_FS is not set
1157CONFIG_JBD=m
1158CONFIG_FS_MBCACHE=m
1154# CONFIG_REISERFS_FS is not set 1159# CONFIG_REISERFS_FS is not set
1155# CONFIG_JFS_FS is not set 1160# CONFIG_JFS_FS is not set
1156# CONFIG_FS_POSIX_ACL is not set 1161# CONFIG_FS_POSIX_ACL is not set
@@ -1220,7 +1225,6 @@ CONFIG_CRAMFS=m
1220CONFIG_SQUASHFS=m 1225CONFIG_SQUASHFS=m
1221# CONFIG_SQUASHFS_EMBEDDED is not set 1226# CONFIG_SQUASHFS_EMBEDDED is not set
1222CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 1227CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1223# CONFIG_SQUASHFS_VMALLOC is not set
1224# CONFIG_VXFS_FS is not set 1228# CONFIG_VXFS_FS is not set
1225# CONFIG_HPFS_FS is not set 1229# CONFIG_HPFS_FS is not set
1226# CONFIG_QNX4FS_FS is not set 1230# CONFIG_QNX4FS_FS is not set
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
index ead49c2c8a..4478797265 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-htcuniversal
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc4 3# Linux kernel version: 2.6.24-rc8
4# Wed Sep 26 17:55:32 2007 4# Sun Jan 20 21:46:02 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -42,10 +42,15 @@ CONFIG_SYSVIPC_SYSCTL=y
42# CONFIG_BSD_PROCESS_ACCT is not set 42# CONFIG_BSD_PROCESS_ACCT is not set
43# CONFIG_TASKSTATS is not set 43# CONFIG_TASKSTATS is not set
44# CONFIG_USER_NS is not set 44# CONFIG_USER_NS is not set
45# CONFIG_PID_NS is not set
45# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
46CONFIG_IKCONFIG=y 47CONFIG_IKCONFIG=y
47CONFIG_IKCONFIG_PROC=y 48CONFIG_IKCONFIG_PROC=y
48CONFIG_LOG_BUF_SHIFT=16 49CONFIG_LOG_BUF_SHIFT=16
50# CONFIG_CGROUPS is not set
51CONFIG_FAIR_GROUP_SCHED=y
52CONFIG_FAIR_USER_SCHED=y
53# CONFIG_FAIR_CGROUP_SCHED is not set
49CONFIG_SYSFS_DEPRECATED=y 54CONFIG_SYSFS_DEPRECATED=y
50# CONFIG_RELAY is not set 55# CONFIG_RELAY is not set
51# CONFIG_BLK_DEV_INITRD is not set 56# CONFIG_BLK_DEV_INITRD is not set
@@ -66,13 +71,13 @@ CONFIG_FUTEX=y
66CONFIG_ANON_INODES=y 71CONFIG_ANON_INODES=y
67CONFIG_EPOLL=y 72CONFIG_EPOLL=y
68CONFIG_SIGNALFD=y 73CONFIG_SIGNALFD=y
69CONFIG_TIMERFD=y
70CONFIG_EVENTFD=y 74CONFIG_EVENTFD=y
71CONFIG_SHMEM=y 75CONFIG_SHMEM=y
72CONFIG_VM_EVENT_COUNTERS=y 76CONFIG_VM_EVENT_COUNTERS=y
73CONFIG_SLAB=y 77CONFIG_SLAB=y
74# CONFIG_SLUB is not set 78# CONFIG_SLUB is not set
75# CONFIG_SLOB is not set 79# CONFIG_SLOB is not set
80CONFIG_SLABINFO=y
76CONFIG_RT_MUTEXES=y 81CONFIG_RT_MUTEXES=y
77# CONFIG_TINY_SHMEM is not set 82# CONFIG_TINY_SHMEM is not set
78CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
@@ -137,35 +142,21 @@ CONFIG_ARCH_PXA=y
137# CONFIG_ARCH_LH7A40X is not set 142# CONFIG_ARCH_LH7A40X is not set
138# CONFIG_ARCH_DAVINCI is not set 143# CONFIG_ARCH_DAVINCI is not set
139# CONFIG_ARCH_OMAP is not set 144# CONFIG_ARCH_OMAP is not set
145CONFIG_DMABOUNCE=y
140 146
141# 147#
142# Intel PXA2xx Implementations 148# Intel PXA2xx/PXA3xx Implementations
143# 149#
144# CONFIG_ARCH_LUBBOCK is not set 150CONFIG_ARCH_LUBBOCK=y
145# CONFIG_MACH_LOGICPD_PXA270 is not set 151# CONFIG_MACH_LOGICPD_PXA270 is not set
146# CONFIG_MACH_MAINSTONE is not set 152# CONFIG_MACH_MAINSTONE is not set
147# CONFIG_ARCH_PXA_IDP is not set 153# CONFIG_ARCH_PXA_IDP is not set
148# CONFIG_PXA_SHARPSL is not set 154# CONFIG_PXA_SHARPSL is not set
149# CONFIG_MACH_TRIZEPS4 is not set 155# CONFIG_MACH_TRIZEPS4 is not set
150# CONFIG_MACH_EM_X270 is not set 156# CONFIG_MACH_EM_X270 is not set
151# CONFIG_MACH_HX2750 is not set 157# CONFIG_MACH_ZYLONITE is not set
152CONFIG_MACH_HTCUNIVERSAL=y 158# CONFIG_MACH_ARMCORE is not set
153 159CONFIG_PXA25x=y
154#
155# HTC Universal support
156#
157CONFIG_HTCUNIVERSAL_CORE=y
158CONFIG_HTCUNIVERSAL_UDC=y
159CONFIG_HTCUNIVERSAL_POWER=y
160CONFIG_HTCUNIVERSAL_BACKLIGHT=y
161CONFIG_HTCUNIVERSAL_LCD=y
162CONFIG_HTCUNIVERSAL_TS2=y
163CONFIG_HTCUNIVERSAL_BUTTONS=y
164CONFIG_HTCUNIVERSAL_BLUETOOTH=m
165CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y
166CONFIG_HTCUNIVERSAL_PHONE=m
167# CONFIG_HTCUNIVERSAL_AK4641 is not set
168CONFIG_PXA27x=y
169# CONFIG_PXA_KEYS is not set 160# CONFIG_PXA_KEYS is not set
170 161
171# 162#
@@ -196,16 +187,14 @@ CONFIG_ARM_THUMB=y
196# CONFIG_OUTER_CACHE is not set 187# CONFIG_OUTER_CACHE is not set
197CONFIG_IWMMXT=y 188CONFIG_IWMMXT=y
198CONFIG_XSCALE_PMU=y 189CONFIG_XSCALE_PMU=y
190CONFIG_SA1111=y
191CONFIG_FORCE_MAX_ZONEORDER=9
199 192
200# 193#
201# Bus support 194# Bus support
202# 195#
203# CONFIG_PCI_SYSCALL is not set 196# CONFIG_PCI_SYSCALL is not set
204# CONFIG_ARCH_SUPPORTS_MSI is not set 197# CONFIG_ARCH_SUPPORTS_MSI is not set
205
206#
207# PCCARD (PCMCIA/CardBus) support
208#
209# CONFIG_PCCARD is not set 198# CONFIG_PCCARD is not set
210 199
211# 200#
@@ -214,6 +203,7 @@ CONFIG_XSCALE_PMU=y
214# CONFIG_TICK_ONESHOT is not set 203# CONFIG_TICK_ONESHOT is not set
215# CONFIG_NO_HZ is not set 204# CONFIG_NO_HZ is not set
216# CONFIG_HIGH_RES_TIMERS is not set 205# CONFIG_HIGH_RES_TIMERS is not set
206CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
217CONFIG_PREEMPT=y 207CONFIG_PREEMPT=y
218CONFIG_HZ=100 208CONFIG_HZ=100
219CONFIG_AEABI=y 209CONFIG_AEABI=y
@@ -226,11 +216,13 @@ CONFIG_FLATMEM_MANUAL=y
226CONFIG_FLATMEM=y 216CONFIG_FLATMEM=y
227CONFIG_FLAT_NODE_MEM_MAP=y 217CONFIG_FLAT_NODE_MEM_MAP=y
228# CONFIG_SPARSEMEM_STATIC is not set 218# CONFIG_SPARSEMEM_STATIC is not set
219# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
229CONFIG_SPLIT_PTLOCK_CPUS=4096 220CONFIG_SPLIT_PTLOCK_CPUS=4096
230# CONFIG_RESOURCES_64BIT is not set 221# CONFIG_RESOURCES_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1 222CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 223CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 224CONFIG_VIRT_TO_BUS=y
225# CONFIG_LEDS is not set
234CONFIG_ALIGNMENT_TRAP=y 226CONFIG_ALIGNMENT_TRAP=y
235 227
236# 228#
@@ -242,6 +234,7 @@ CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2
242# CONFIG_XIP_KERNEL is not set 234# CONFIG_XIP_KERNEL is not set
243CONFIG_KEXEC=y 235CONFIG_KEXEC=y
244CONFIG_ATAGS_PROC=y 236CONFIG_ATAGS_PROC=y
237CONFIG_CPU_FREQ_PXA25x=y
245 238
246# 239#
247# CPU Frequency scaling 240# CPU Frequency scaling
@@ -253,6 +246,8 @@ CONFIG_CPU_FREQ_STAT=y
253CONFIG_CPU_FREQ_STAT_DETAILS=y 246CONFIG_CPU_FREQ_STAT_DETAILS=y
254# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set 247# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
255CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y 248CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
249# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
250# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
256CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 251CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
257# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set 252# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
258CONFIG_CPU_FREQ_GOV_USERSPACE=y 253CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -283,6 +278,7 @@ CONFIG_BINFMT_ELF=y
283CONFIG_PM=y 278CONFIG_PM=y
284# CONFIG_PM_LEGACY is not set 279# CONFIG_PM_LEGACY is not set
285# CONFIG_PM_DEBUG is not set 280# CONFIG_PM_DEBUG is not set
281CONFIG_SUSPEND_UP_POSSIBLE=y
286# CONFIG_SUSPEND is not set 282# CONFIG_SUSPEND is not set
287CONFIG_APM_EMULATION=y 283CONFIG_APM_EMULATION=y
288 284
@@ -319,6 +315,7 @@ CONFIG_IP_PNP=y
319# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 315# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
320# CONFIG_INET_XFRM_MODE_TUNNEL is not set 316# CONFIG_INET_XFRM_MODE_TUNNEL is not set
321# CONFIG_INET_XFRM_MODE_BEET is not set 317# CONFIG_INET_XFRM_MODE_BEET is not set
318# CONFIG_INET_LRO is not set
322# CONFIG_INET_DIAG is not set 319# CONFIG_INET_DIAG is not set
323# CONFIG_TCP_CONG_ADVANCED is not set 320# CONFIG_TCP_CONG_ADVANCED is not set
324CONFIG_TCP_CONG_CUBIC=y 321CONFIG_TCP_CONG_CUBIC=y
@@ -354,7 +351,6 @@ CONFIG_NETFILTER_XTABLES=m
354# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set 351# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
355# CONFIG_NETFILTER_XT_MATCH_MAC is not set 352# CONFIG_NETFILTER_XT_MATCH_MAC is not set
356# CONFIG_NETFILTER_XT_MATCH_MARK is not set 353# CONFIG_NETFILTER_XT_MATCH_MARK is not set
357# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
358# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set 354# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
359# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set 355# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
360# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 356# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
@@ -363,6 +359,7 @@ CONFIG_NETFILTER_XTABLES=m
363# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 359# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
364# CONFIG_NETFILTER_XT_MATCH_STRING is not set 360# CONFIG_NETFILTER_XT_MATCH_STRING is not set
365# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 361# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
362# CONFIG_NETFILTER_XT_MATCH_TIME is not set
366# CONFIG_NETFILTER_XT_MATCH_U32 is not set 363# CONFIG_NETFILTER_XT_MATCH_U32 is not set
367# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 364# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
368 365
@@ -391,10 +388,20 @@ CONFIG_IP_NF_RAW=m
391CONFIG_IP_NF_ARPTABLES=m 388CONFIG_IP_NF_ARPTABLES=m
392CONFIG_IP_NF_ARPFILTER=m 389CONFIG_IP_NF_ARPFILTER=m
393CONFIG_IP_NF_ARP_MANGLE=m 390CONFIG_IP_NF_ARP_MANGLE=m
394 391# CONFIG_IP_DCCP is not set
395# 392# CONFIG_IP_SCTP is not set
396# QoS and/or fair queueing 393# CONFIG_TIPC is not set
397# 394# CONFIG_ATM is not set
395# CONFIG_BRIDGE is not set
396# CONFIG_VLAN_8021Q is not set
397# CONFIG_DECNET is not set
398# CONFIG_LLC2 is not set
399# CONFIG_IPX is not set
400# CONFIG_ATALK is not set
401# CONFIG_X25 is not set
402# CONFIG_LAPB is not set
403# CONFIG_ECONET is not set
404# CONFIG_WAN_ROUTER is not set
398# CONFIG_NET_SCHED is not set 405# CONFIG_NET_SCHED is not set
399 406
400# 407#
@@ -459,9 +466,11 @@ CONFIG_BT_HIDP=m
459# 466#
460# Bluetooth device drivers 467# Bluetooth device drivers
461# 468#
469# CONFIG_BT_HCIBTSDIO is not set
462CONFIG_BT_HCIUART=m 470CONFIG_BT_HCIUART=m
463CONFIG_BT_HCIUART_H4=y 471CONFIG_BT_HCIUART_H4=y
464CONFIG_BT_HCIUART_BCSP=y 472CONFIG_BT_HCIUART_BCSP=y
473# CONFIG_BT_HCIUART_LL is not set
465# CONFIG_BT_HCIVHCI is not set 474# CONFIG_BT_HCIVHCI is not set
466# CONFIG_AF_RXRPC is not set 475# CONFIG_AF_RXRPC is not set
467 476
@@ -482,6 +491,7 @@ CONFIG_WIRELESS_EXT=y
482# 491#
483# Generic Driver Options 492# Generic Driver Options
484# 493#
494CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
485CONFIG_STANDALONE=y 495CONFIG_STANDALONE=y
486CONFIG_PREVENT_FIRMWARE_BUILD=y 496CONFIG_PREVENT_FIRMWARE_BUILD=y
487CONFIG_FW_LOADER=y 497CONFIG_FW_LOADER=y
@@ -510,6 +520,7 @@ CONFIG_MTD_PARTITIONS=y
510# CONFIG_INFTL is not set 520# CONFIG_INFTL is not set
511# CONFIG_RFD_FTL is not set 521# CONFIG_RFD_FTL is not set
512# CONFIG_SSFDC is not set 522# CONFIG_SSFDC is not set
523# CONFIG_MTD_OOPS is not set
513 524
514# 525#
515# RAM/ROM/Flash chip drivers 526# RAM/ROM/Flash chip drivers
@@ -568,6 +579,8 @@ CONFIG_BLK_DEV=y
568# CONFIG_BLK_DEV_RAM is not set 579# CONFIG_BLK_DEV_RAM is not set
569# CONFIG_CDROM_PKTCDVD is not set 580# CONFIG_CDROM_PKTCDVD is not set
570# CONFIG_ATA_OVER_ETH is not set 581# CONFIG_ATA_OVER_ETH is not set
582CONFIG_MISC_DEVICES=y
583# CONFIG_EEPROM_93CX6 is not set
571# CONFIG_IDE is not set 584# CONFIG_IDE is not set
572 585
573# 586#
@@ -586,6 +599,7 @@ CONFIG_NETDEVICES=y
586# CONFIG_MACVLAN is not set 599# CONFIG_MACVLAN is not set
587# CONFIG_EQUALIZER is not set 600# CONFIG_EQUALIZER is not set
588# CONFIG_TUN is not set 601# CONFIG_TUN is not set
602# CONFIG_VETH is not set
589# CONFIG_NET_ETHERNET is not set 603# CONFIG_NET_ETHERNET is not set
590# CONFIG_NETDEV_1000 is not set 604# CONFIG_NETDEV_1000 is not set
591# CONFIG_NETDEV_10000 is not set 605# CONFIG_NETDEV_10000 is not set
@@ -600,7 +614,6 @@ CONFIG_NET_RADIO=y
600CONFIG_ACX=m 614CONFIG_ACX=m
601CONFIG_ACX_MEM=y 615CONFIG_ACX_MEM=y
602# CONFIG_ACX_CS is not set 616# CONFIG_ACX_CS is not set
603CONFIG_ACX_HTCUNIVERSAL=m
604# CONFIG_WAN is not set 617# CONFIG_WAN is not set
605CONFIG_PPP=m 618CONFIG_PPP=m
606# CONFIG_PPP_MULTILINK is not set 619# CONFIG_PPP_MULTILINK is not set
@@ -632,7 +645,6 @@ CONFIG_INPUT=y
632# 645#
633# CONFIG_INPUT_MOUSEDEV is not set 646# CONFIG_INPUT_MOUSEDEV is not set
634# CONFIG_INPUT_JOYDEV is not set 647# CONFIG_INPUT_JOYDEV is not set
635# CONFIG_INPUT_TSDEV is not set
636CONFIG_INPUT_EVDEV=y 648CONFIG_INPUT_EVDEV=y
637# CONFIG_INPUT_EVBUG is not set 649# CONFIG_INPUT_EVBUG is not set
638# CONFIG_INPUT_POWER is not set 650# CONFIG_INPUT_POWER is not set
@@ -647,7 +659,6 @@ CONFIG_INPUT_KEYBOARD=y
647# CONFIG_KEYBOARD_XTKBD is not set 659# CONFIG_KEYBOARD_XTKBD is not set
648# CONFIG_KEYBOARD_NEWTON is not set 660# CONFIG_KEYBOARD_NEWTON is not set
649# CONFIG_KEYBOARD_STOWAWAY is not set 661# CONFIG_KEYBOARD_STOWAWAY is not set
650CONFIG_KEYBOARD_PXA27x=y
651CONFIG_KEYBOARD_GPIO=y 662CONFIG_KEYBOARD_GPIO=y
652CONFIG_KEYBOARD_ASIC3=y 663CONFIG_KEYBOARD_ASIC3=y
653CONFIG_INPUT_MOUSE=y 664CONFIG_INPUT_MOUSE=y
@@ -708,7 +719,6 @@ CONFIG_UNIX98_PTYS=y
708CONFIG_LEGACY_PTYS=y 719CONFIG_LEGACY_PTYS=y
709CONFIG_LEGACY_PTY_COUNT=32 720CONFIG_LEGACY_PTY_COUNT=32
710# CONFIG_IPMI_HANDLER is not set 721# CONFIG_IPMI_HANDLER is not set
711# CONFIG_WATCHDOG is not set
712# CONFIG_HW_RANDOM is not set 722# CONFIG_HW_RANDOM is not set
713# CONFIG_NVRAM is not set 723# CONFIG_NVRAM is not set
714# CONFIG_R3964 is not set 724# CONFIG_R3964 is not set
@@ -780,8 +790,13 @@ CONFIG_PDA_POWER=y
780CONFIG_APM_POWER=y 790CONFIG_APM_POWER=y
781CONFIG_BATTERY_DS2760=y 791CONFIG_BATTERY_DS2760=y
782# CONFIG_HWMON is not set 792# CONFIG_HWMON is not set
783CONFIG_MISC_DEVICES=y 793# CONFIG_WATCHDOG is not set
784# CONFIG_EEPROM_93CX6 is not set 794
795#
796# Sonics Silicon Backplane
797#
798CONFIG_SSB_POSSIBLE=y
799# CONFIG_SSB is not set
785 800
786# 801#
787# Multifunction device drivers 802# Multifunction device drivers
@@ -791,25 +806,6 @@ CONFIG_HTC_ASIC3=y
791CONFIG_HTC_ASIC3_DS1WM=y 806CONFIG_HTC_ASIC3_DS1WM=y
792 807
793# 808#
794# Multi-Function Devices
795#
796CONFIG_NEW_LEDS=y
797CONFIG_LEDS_CLASS=y
798
799#
800# LED drivers
801#
802# CONFIG_LEDS_GPIO is not set
803CONFIG_LEDS_ASIC3=y
804
805#
806# LED Triggers
807#
808CONFIG_LEDS_TRIGGERS=y
809CONFIG_LEDS_TRIGGER_TIMER=y
810# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
811
812#
813# Multimedia devices 809# Multimedia devices
814# 810#
815# CONFIG_VIDEO_DEV is not set 811# CONFIG_VIDEO_DEV is not set
@@ -819,15 +815,6 @@ CONFIG_DAB=y
819# 815#
820# Graphics support 816# Graphics support
821# 817#
822CONFIG_BACKLIGHT_LCD_SUPPORT=y
823CONFIG_LCD_CLASS_DEVICE=y
824CONFIG_BACKLIGHT_CLASS_DEVICE=y
825CONFIG_BACKLIGHT_CORGI=y
826
827#
828# Display device support
829#
830# CONFIG_DISPLAY_SUPPORT is not set
831# CONFIG_VGASTATE is not set 818# CONFIG_VGASTATE is not set
832CONFIG_VIDEO_OUTPUT_CONTROL=m 819CONFIG_VIDEO_OUTPUT_CONTROL=m
833CONFIG_FB=y 820CONFIG_FB=y
@@ -836,6 +823,7 @@ CONFIG_FB=y
836CONFIG_FB_CFB_FILLRECT=y 823CONFIG_FB_CFB_FILLRECT=y
837CONFIG_FB_CFB_COPYAREA=y 824CONFIG_FB_CFB_COPYAREA=y
838CONFIG_FB_CFB_IMAGEBLIT=y 825CONFIG_FB_CFB_IMAGEBLIT=y
826# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
839# CONFIG_FB_SYS_FILLRECT is not set 827# CONFIG_FB_SYS_FILLRECT is not set
840# CONFIG_FB_SYS_COPYAREA is not set 828# CONFIG_FB_SYS_COPYAREA is not set
841# CONFIG_FB_SYS_IMAGEBLIT is not set 829# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -858,6 +846,15 @@ CONFIG_FB_PXA_LCD_QVGA=y
858# CONFIG_FB_PXA_PARAMETERS is not set 846# CONFIG_FB_PXA_PARAMETERS is not set
859# CONFIG_FB_MBX is not set 847# CONFIG_FB_MBX is not set
860# CONFIG_FB_VIRTUAL is not set 848# CONFIG_FB_VIRTUAL is not set
849CONFIG_BACKLIGHT_LCD_SUPPORT=y
850CONFIG_LCD_CLASS_DEVICE=y
851CONFIG_BACKLIGHT_CLASS_DEVICE=y
852CONFIG_BACKLIGHT_CORGI=y
853
854#
855# Display device support
856#
857# CONFIG_DISPLAY_SUPPORT is not set
861 858
862# 859#
863# Console display driver support 860# Console display driver support
@@ -883,9 +880,6 @@ CONFIG_LOGO_LINUX_MONO=y
883CONFIG_LOGO_LINUX_VGA16=y 880CONFIG_LOGO_LINUX_VGA16=y
884# CONFIG_LOGO_LINUX_CLUT224 is not set 881# CONFIG_LOGO_LINUX_CLUT224 is not set
885CONFIG_LOGO_OHAND_CLUT224=y 882CONFIG_LOGO_OHAND_CLUT224=y
886# CONFIG_LOGO_OZ240_CLUT224 is not set
887# CONFIG_LOGO_OZ480_CLUT224 is not set
888# CONFIG_LOGO_OZ640_CLUT224 is not set
889 883
890# 884#
891# Sound 885# Sound
@@ -938,6 +932,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
938CONFIG_HID_SUPPORT=y 932CONFIG_HID_SUPPORT=y
939CONFIG_HID=m 933CONFIG_HID=m
940# CONFIG_HID_DEBUG is not set 934# CONFIG_HID_DEBUG is not set
935# CONFIG_HIDRAW is not set
941CONFIG_USB_SUPPORT=y 936CONFIG_USB_SUPPORT=y
942CONFIG_USB_ARCH_HAS_HCD=y 937CONFIG_USB_ARCH_HAS_HCD=y
943CONFIG_USB_ARCH_HAS_OHCI=y 938CONFIG_USB_ARCH_HAS_OHCI=y
@@ -956,12 +951,14 @@ CONFIG_USB_GADGET=y
956# CONFIG_USB_GADGET_DEBUG_FILES is not set 951# CONFIG_USB_GADGET_DEBUG_FILES is not set
957CONFIG_USB_GADGET_SELECTED=y 952CONFIG_USB_GADGET_SELECTED=y
958# CONFIG_USB_GADGET_AMD5536UDC is not set 953# CONFIG_USB_GADGET_AMD5536UDC is not set
954# CONFIG_USB_GADGET_ATMEL_USBA is not set
959# CONFIG_USB_GADGET_FSL_USB2 is not set 955# CONFIG_USB_GADGET_FSL_USB2 is not set
960# CONFIG_USB_GADGET_NET2280 is not set 956# CONFIG_USB_GADGET_NET2280 is not set
961# CONFIG_USB_GADGET_PXA2XX is not set 957CONFIG_USB_GADGET_PXA2XX=y
958CONFIG_USB_PXA2XX=y
959# CONFIG_USB_PXA2XX_SMALL is not set
962# CONFIG_USB_GADGET_M66592 is not set 960# CONFIG_USB_GADGET_M66592 is not set
963CONFIG_USB_GADGET_PXA27X=y 961# CONFIG_USB_GADGET_PXA27X is not set
964CONFIG_USB_PXA27X=y
965# CONFIG_USB_GADGET_GOKU is not set 962# CONFIG_USB_GADGET_GOKU is not set
966# CONFIG_USB_GADGET_LH7A40X is not set 963# CONFIG_USB_GADGET_LH7A40X is not set
967# CONFIG_USB_GADGET_OMAP is not set 964# CONFIG_USB_GADGET_OMAP is not set
@@ -985,12 +982,28 @@ CONFIG_MMC_UNSAFE_RESUME=y
985# 982#
986CONFIG_MMC_BLOCK=y 983CONFIG_MMC_BLOCK=y
987CONFIG_MMC_BLOCK_BOUNCE=y 984CONFIG_MMC_BLOCK_BOUNCE=y
985# CONFIG_SDIO_UART is not set
988 986
989# 987#
990# MMC/SD Host Controller Drivers 988# MMC/SD Host Controller Drivers
991# 989#
992# CONFIG_MMC_PXA is not set 990# CONFIG_MMC_PXA is not set
993CONFIG_MMC_ASIC3=y 991CONFIG_MMC_ASIC3=y
992CONFIG_NEW_LEDS=y
993CONFIG_LEDS_CLASS=y
994
995#
996# LED drivers
997#
998# CONFIG_LEDS_GPIO is not set
999CONFIG_LEDS_ASIC3=y
1000
1001#
1002# LED Triggers
1003#
1004CONFIG_LEDS_TRIGGERS=y
1005CONFIG_LEDS_TRIGGER_TIMER=y
1006# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
994CONFIG_RTC_LIB=y 1007CONFIG_RTC_LIB=y
995CONFIG_RTC_CLASS=y 1008CONFIG_RTC_CLASS=y
996CONFIG_RTC_HCTOSYS=y 1009CONFIG_RTC_HCTOSYS=y
@@ -1010,6 +1023,7 @@ CONFIG_RTC_INTF_DEV=y
1010# I2C RTC drivers 1023# I2C RTC drivers
1011# 1024#
1012# CONFIG_RTC_DRV_DS1307 is not set 1025# CONFIG_RTC_DRV_DS1307 is not set
1026# CONFIG_RTC_DRV_DS1374 is not set
1013# CONFIG_RTC_DRV_DS1672 is not set 1027# CONFIG_RTC_DRV_DS1672 is not set
1014# CONFIG_RTC_DRV_MAX6900 is not set 1028# CONFIG_RTC_DRV_MAX6900 is not set
1015# CONFIG_RTC_DRV_RS5C372 is not set 1029# CONFIG_RTC_DRV_RS5C372 is not set
@@ -1040,19 +1054,6 @@ CONFIG_RTC_INTF_DEV=y
1040CONFIG_RTC_DRV_SA1100=y 1054CONFIG_RTC_DRV_SA1100=y
1041 1055
1042# 1056#
1043# DMA Engine support
1044#
1045# CONFIG_DMA_ENGINE is not set
1046
1047#
1048# DMA Clients
1049#
1050
1051#
1052# DMA Devices
1053#
1054
1055#
1056# File systems 1057# File systems
1057# 1058#
1058CONFIG_EXT2_FS=y 1059CONFIG_EXT2_FS=y
@@ -1062,7 +1063,6 @@ CONFIG_EXT3_FS=y
1062# CONFIG_EXT3_FS_XATTR is not set 1063# CONFIG_EXT3_FS_XATTR is not set
1063# CONFIG_EXT4DEV_FS is not set 1064# CONFIG_EXT4DEV_FS is not set
1064CONFIG_JBD=y 1065CONFIG_JBD=y
1065# CONFIG_JBD_DEBUG is not set
1066# CONFIG_REISERFS_FS is not set 1066# CONFIG_REISERFS_FS is not set
1067# CONFIG_JFS_FS is not set 1067# CONFIG_JFS_FS is not set
1068# CONFIG_FS_POSIX_ACL is not set 1068# CONFIG_FS_POSIX_ACL is not set
@@ -1104,7 +1104,6 @@ CONFIG_SYSFS=y
1104CONFIG_TMPFS=y 1104CONFIG_TMPFS=y
1105# CONFIG_TMPFS_POSIX_ACL is not set 1105# CONFIG_TMPFS_POSIX_ACL is not set
1106# CONFIG_HUGETLB_PAGE is not set 1106# CONFIG_HUGETLB_PAGE is not set
1107CONFIG_RAMFS=y
1108# CONFIG_CONFIGFS_FS is not set 1107# CONFIG_CONFIGFS_FS is not set
1109 1108
1110# 1109#
@@ -1125,10 +1124,7 @@ CONFIG_RAMFS=y
1125# CONFIG_QNX4FS_FS is not set 1124# CONFIG_QNX4FS_FS is not set
1126# CONFIG_SYSV_FS is not set 1125# CONFIG_SYSV_FS is not set
1127# CONFIG_UFS_FS is not set 1126# CONFIG_UFS_FS is not set
1128 1127CONFIG_NETWORK_FILESYSTEMS=y
1129#
1130# Network File Systems
1131#
1132CONFIG_NFS_FS=y 1128CONFIG_NFS_FS=y
1133CONFIG_NFS_V3=y 1129CONFIG_NFS_V3=y
1134# CONFIG_NFS_V3_ACL is not set 1130# CONFIG_NFS_V3_ACL is not set
@@ -1154,10 +1150,6 @@ CONFIG_SUNRPC=y
1154# 1150#
1155# CONFIG_PARTITION_ADVANCED is not set 1151# CONFIG_PARTITION_ADVANCED is not set
1156CONFIG_MSDOS_PARTITION=y 1152CONFIG_MSDOS_PARTITION=y
1157
1158#
1159# Native Language Support
1160#
1161CONFIG_NLS=y 1153CONFIG_NLS=y
1162CONFIG_NLS_DEFAULT="iso8859-1" 1154CONFIG_NLS_DEFAULT="iso8859-1"
1163CONFIG_NLS_CODEPAGE_437=y 1155CONFIG_NLS_CODEPAGE_437=y
@@ -1198,21 +1190,16 @@ CONFIG_NLS_ISO8859_1=y
1198# CONFIG_NLS_KOI8_R is not set 1190# CONFIG_NLS_KOI8_R is not set
1199# CONFIG_NLS_KOI8_U is not set 1191# CONFIG_NLS_KOI8_U is not set
1200CONFIG_NLS_UTF8=y 1192CONFIG_NLS_UTF8=y
1201
1202#
1203# Distributed Lock Manager
1204#
1205# CONFIG_DLM is not set 1193# CONFIG_DLM is not set
1206 1194CONFIG_INSTRUMENTATION=y
1207#
1208# Profiling support
1209#
1210# CONFIG_PROFILING is not set 1195# CONFIG_PROFILING is not set
1196# CONFIG_MARKERS is not set
1211 1197
1212# 1198#
1213# Kernel hacking 1199# Kernel hacking
1214# 1200#
1215CONFIG_PRINTK_TIME=y 1201CONFIG_PRINTK_TIME=y
1202CONFIG_ENABLE_WARN_DEPRECATED=y
1216CONFIG_ENABLE_MUST_CHECK=y 1203CONFIG_ENABLE_MUST_CHECK=y
1217# CONFIG_MAGIC_SYSRQ is not set 1204# CONFIG_MAGIC_SYSRQ is not set
1218# CONFIG_UNUSED_SYMBOLS is not set 1205# CONFIG_UNUSED_SYMBOLS is not set
@@ -1240,10 +1227,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
1240# CONFIG_DEBUG_INFO is not set 1227# CONFIG_DEBUG_INFO is not set
1241CONFIG_DEBUG_VM=y 1228CONFIG_DEBUG_VM=y
1242# CONFIG_DEBUG_LIST is not set 1229# CONFIG_DEBUG_LIST is not set
1230# CONFIG_DEBUG_SG is not set
1243CONFIG_FRAME_POINTER=y 1231CONFIG_FRAME_POINTER=y
1244CONFIG_FORCED_INLINING=y 1232CONFIG_FORCED_INLINING=y
1233# CONFIG_BOOT_PRINTK_DELAY is not set
1245# CONFIG_RCU_TORTURE_TEST is not set 1234# CONFIG_RCU_TORTURE_TEST is not set
1246# CONFIG_FAULT_INJECTION is not set 1235# CONFIG_FAULT_INJECTION is not set
1236# CONFIG_SAMPLES is not set
1247CONFIG_DEBUG_USER=y 1237CONFIG_DEBUG_USER=y
1248CONFIG_DEBUG_ERRORS=y 1238CONFIG_DEBUG_ERRORS=y
1249CONFIG_DEBUG_LL=y 1239CONFIG_DEBUG_LL=y
@@ -1254,6 +1244,7 @@ CONFIG_DEBUG_LL=y
1254# 1244#
1255# CONFIG_KEYS is not set 1245# CONFIG_KEYS is not set
1256# CONFIG_SECURITY is not set 1246# CONFIG_SECURITY is not set
1247# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1257CONFIG_CRYPTO=y 1248CONFIG_CRYPTO=y
1258CONFIG_CRYPTO_ALGAPI=y 1249CONFIG_CRYPTO_ALGAPI=y
1259CONFIG_CRYPTO_BLKCIPHER=m 1250CONFIG_CRYPTO_BLKCIPHER=m
@@ -1274,6 +1265,7 @@ CONFIG_CRYPTO_ECB=m
1274# CONFIG_CRYPTO_CBC is not set 1265# CONFIG_CRYPTO_CBC is not set
1275CONFIG_CRYPTO_PCBC=m 1266CONFIG_CRYPTO_PCBC=m
1276# CONFIG_CRYPTO_LRW is not set 1267# CONFIG_CRYPTO_LRW is not set
1268# CONFIG_CRYPTO_XTS is not set
1277# CONFIG_CRYPTO_CRYPTD is not set 1269# CONFIG_CRYPTO_CRYPTD is not set
1278CONFIG_CRYPTO_DES=y 1270CONFIG_CRYPTO_DES=y
1279# CONFIG_CRYPTO_FCRYPT is not set 1271# CONFIG_CRYPTO_FCRYPT is not set
@@ -1287,12 +1279,14 @@ CONFIG_CRYPTO_DES=y
1287CONFIG_CRYPTO_ARC4=m 1279CONFIG_CRYPTO_ARC4=m
1288# CONFIG_CRYPTO_KHAZAD is not set 1280# CONFIG_CRYPTO_KHAZAD is not set
1289# CONFIG_CRYPTO_ANUBIS is not set 1281# CONFIG_CRYPTO_ANUBIS is not set
1282# CONFIG_CRYPTO_SEED is not set
1290CONFIG_CRYPTO_DEFLATE=y 1283CONFIG_CRYPTO_DEFLATE=y
1291# CONFIG_CRYPTO_LZO is not set 1284# CONFIG_CRYPTO_LZO is not set
1292# CONFIG_CRYPTO_MICHAEL_MIC is not set 1285# CONFIG_CRYPTO_MICHAEL_MIC is not set
1293# CONFIG_CRYPTO_CRC32C is not set 1286# CONFIG_CRYPTO_CRC32C is not set
1294# CONFIG_CRYPTO_CAMELLIA is not set 1287# CONFIG_CRYPTO_CAMELLIA is not set
1295# CONFIG_CRYPTO_TEST is not set 1288# CONFIG_CRYPTO_TEST is not set
1289# CONFIG_CRYPTO_AUTHENC is not set
1296CONFIG_CRYPTO_HW=y 1290CONFIG_CRYPTO_HW=y
1297 1291
1298# 1292#
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
index aec7c318b4..87fb5975dc 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-poodle
@@ -533,13 +533,10 @@ CONFIG_BT_HCIVHCI=m
533# 533#
534# Wireless 534# Wireless
535# 535#
536CONFIG_CFG80211=m 536CONFIG_CFG80211 is not set
537CONFIG_NL80211=y 537CONFIG_NL80211=y
538CONFIG_WIRELESS_EXT=y 538CONFIG_WIRELESS_EXT=y
539CONFIG_MAC80211=m 539# CONFIG_MAC80211 is not set
540CONFIG_MAC80211_RCSIMPLE=y
541# CONFIG_MAC80211_LEDS is not set
542# CONFIG_MAC80211_DEBUG is not set
543CONFIG_IEEE80211=m 540CONFIG_IEEE80211=m
544# CONFIG_IEEE80211_DEBUG is not set 541# CONFIG_IEEE80211_DEBUG is not set
545CONFIG_IEEE80211_CRYPT_WEP=m 542CONFIG_IEEE80211_CRYPT_WEP=m
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa
deleted file mode 100644
index 5173e242a8..0000000000
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-tosa
+++ /dev/null
@@ -1,1665 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc5-git5
4# Tue Mar 14 09:05:26 2006
5#
6CONFIG_ARM=y
7CONFIG_MMU=y
8CONFIG_RWSEM_GENERIC_SPINLOCK=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_ARCH_MTD_XIP=y
11
12#
13# Code maturity level options
14#
15CONFIG_EXPERIMENTAL=y
16CONFIG_BROKEN_ON_SMP=y
17CONFIG_LOCK_KERNEL=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19
20#
21# General setup
22#
23CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y
25CONFIG_SWAP=y
26CONFIG_SYSVIPC=y
27# CONFIG_POSIX_MQUEUE is not set
28CONFIG_BSD_PROCESS_ACCT=y
29CONFIG_BSD_PROCESS_ACCT_V3=y
30CONFIG_SYSCTL=y
31# CONFIG_AUDIT is not set
32# CONFIG_IKCONFIG is not set
33CONFIG_INITRAMFS_SOURCE=""
34CONFIG_UID16=y
35CONFIG_CC_OPTIMIZE_FOR_SIZE=y
36CONFIG_EMBEDDED=y
37CONFIG_KALLSYMS=y
38# CONFIG_KALLSYMS_ALL is not set
39# CONFIG_KALLSYMS_EXTRA_PASS is not set
40CONFIG_HOTPLUG=y
41CONFIG_PRINTK=y
42CONFIG_BUG=y
43CONFIG_ELF_CORE=y
44CONFIG_BASE_FULL=y
45CONFIG_FUTEX=y
46CONFIG_EPOLL=y
47CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0
49CONFIG_CC_ALIGN_LABELS=0
50CONFIG_CC_ALIGN_LOOPS=0
51CONFIG_CC_ALIGN_JUMPS=0
52CONFIG_SLAB=y
53# CONFIG_TINY_SHMEM is not set
54CONFIG_BASE_SMALL=0
55# CONFIG_SLOB is not set
56
57#
58# Loadable module support
59#
60CONFIG_MODULES=y
61CONFIG_MODULE_UNLOAD=y
62CONFIG_MODULE_FORCE_UNLOAD=y
63CONFIG_OBSOLETE_MODPARM=y
64# CONFIG_MODVERSIONS is not set
65# CONFIG_MODULE_SRCVERSION_ALL is not set
66CONFIG_KMOD=y
67
68#
69# Block layer
70#
71
72#
73# IO Schedulers
74#
75CONFIG_IOSCHED_NOOP=y
76CONFIG_IOSCHED_AS=y
77CONFIG_IOSCHED_DEADLINE=m
78CONFIG_IOSCHED_CFQ=m
79CONFIG_DEFAULT_AS=y
80# CONFIG_DEFAULT_DEADLINE is not set
81# CONFIG_DEFAULT_CFQ is not set
82# CONFIG_DEFAULT_NOOP is not set
83CONFIG_DEFAULT_IOSCHED="anticipatory"
84
85#
86# System Type
87#
88# CONFIG_ARCH_CLPS7500 is not set
89# CONFIG_ARCH_CLPS711X is not set
90# CONFIG_ARCH_CO285 is not set
91# CONFIG_ARCH_EBSA110 is not set
92# CONFIG_ARCH_FOOTBRIDGE is not set
93# CONFIG_ARCH_INTEGRATOR is not set
94# CONFIG_ARCH_IOP3XX is not set
95# CONFIG_ARCH_IXP4XX is not set
96# CONFIG_ARCH_IXP2000 is not set
97# CONFIG_ARCH_L7200 is not set
98CONFIG_ARCH_PXA=y
99# CONFIG_ARCH_RPC is not set
100# CONFIG_ARCH_SA1100 is not set
101# CONFIG_ARCH_S3C2410 is not set
102# CONFIG_ARCH_SHARK is not set
103# CONFIG_ARCH_LH7A40X is not set
104# CONFIG_ARCH_OMAP is not set
105# CONFIG_ARCH_VERSATILE is not set
106# CONFIG_ARCH_REALVIEW is not set
107# CONFIG_ARCH_IMX is not set
108# CONFIG_ARCH_H720X is not set
109# CONFIG_ARCH_AAEC2000 is not set
110# CONFIG_ARCH_AT91RM9200 is not set
111
112#
113# Intel PXA2xx Implementations
114#
115# CONFIG_ARCH_LUBBOCK is not set
116# CONFIG_MACH_MAINSTONE is not set
117# CONFIG_ARCH_PXA_IDP is not set
118CONFIG_PXA_SHARPSL=y
119# CONFIG_MACH_HX2750 is not set
120CONFIG_PXA_SHARPSL_25x=y
121# CONFIG_PXA_SHARPSL_27x is not set
122# CONFIG_MACH_POODLE is not set
123# CONFIG_MACH_CORGI is not set
124# CONFIG_MACH_SHEPHERD is not set
125# CONFIG_MACH_HUSKY is not set
126CONFIG_MACH_TOSA=y
127CONFIG_PXA25x=y
128# CONFIG_PXA_KEYS is not set
129
130#
131# Processor Type
132#
133CONFIG_CPU_32=y
134CONFIG_CPU_XSCALE=y
135CONFIG_CPU_32v5=y
136CONFIG_CPU_ABRT_EV5T=y
137CONFIG_CPU_CACHE_VIVT=y
138CONFIG_CPU_TLB_V4WBI=y
139
140#
141# Processor Features
142#
143CONFIG_ARM_THUMB=y
144CONFIG_XSCALE_PMU=y
145CONFIG_KEXEC=y
146CONFIG_ATAGS_PROC=y
147CONFIG_SHARP_PARAM=y
148CONFIG_SHARPSL_PM=y
149CONFIG_SHARP_SCOOP=y
150CONFIG_TOSHIBA_TC6393XB=y
151
152#
153# Bus support
154#
155
156#
157# PCCARD (PCMCIA/CardBus) support
158#
159CONFIG_PCCARD=y
160# CONFIG_PCMCIA_DEBUG is not set
161CONFIG_PCMCIA=y
162CONFIG_PCMCIA_LOAD_CIS=y
163CONFIG_PCMCIA_IOCTL=y
164
165#
166# PC-card bridges
167#
168CONFIG_PCMCIA_PXA2XX=y
169
170#
171# Kernel Features
172#
173CONFIG_PREEMPT=y
174CONFIG_NO_IDLE_HZ=y
175# CONFIG_AEABI is not set
176# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
177CONFIG_SELECT_MEMORY_MODEL=y
178CONFIG_FLATMEM_MANUAL=y
179# CONFIG_DISCONTIGMEM_MANUAL is not set
180# CONFIG_SPARSEMEM_MANUAL is not set
181CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set
184CONFIG_SPLIT_PTLOCK_CPUS=4096
185CONFIG_ALIGNMENT_TRAP=y
186
187#
188# Boot options
189#
190CONFIG_ZBOOT_ROM_TEXT=0x0
191CONFIG_ZBOOT_ROM_BSS=0x0
192# CONFIG_XIP_KERNEL is not set
193
194#
195# CPU Frequency scaling
196#
197CONFIG_CPU_FREQ=y
198CONFIG_CPU_FREQ_TABLE=y
199# CONFIG_CPU_FREQ_DEBUG is not set
200CONFIG_CPU_FREQ_STAT=y
201# CONFIG_CPU_FREQ_STAT_DETAILS is not set
202CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
203# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
204CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
205CONFIG_CPU_FREQ_GOV_POWERSAVE=m
206CONFIG_CPU_FREQ_GOV_USERSPACE=m
207CONFIG_CPU_FREQ_GOV_ONDEMAND=m
208CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
209CONFIG_CPU_FREQ_PXA25x=y
210
211#
212# Floating point emulation
213#
214
215#
216# At least one emulation must be selected
217#
218CONFIG_FPE_NWFPE=y
219# CONFIG_FPE_NWFPE_XP is not set
220# CONFIG_FPE_FASTFPE is not set
221
222#
223# Userspace binary formats
224#
225CONFIG_BINFMT_ELF=y
226CONFIG_BINFMT_AOUT=m
227CONFIG_BINFMT_MISC=m
228# CONFIG_ARTHUR is not set
229
230#
231# Power management options
232#
233CONFIG_PM=y
234# CONFIG_PM_LEGACY is not set
235# CONFIG_PM_DEBUG is not set
236CONFIG_APM=y
237
238#
239# Networking
240#
241CONFIG_NET=y
242
243#
244# Networking options
245#
246# CONFIG_NETDEBUG is not set
247CONFIG_PACKET=m
248CONFIG_PACKET_MMAP=y
249CONFIG_UNIX=y
250CONFIG_XFRM=y
251CONFIG_XFRM_USER=m
252CONFIG_NET_KEY=m
253CONFIG_INET=y
254# CONFIG_IP_MULTICAST is not set
255# CONFIG_IP_ADVANCED_ROUTER is not set
256CONFIG_IP_FIB_HASH=y
257# CONFIG_IP_PNP is not set
258# CONFIG_NET_IPIP is not set
259# CONFIG_NET_IPGRE is not set
260# CONFIG_ARPD is not set
261CONFIG_SYN_COOKIES=y
262# CONFIG_INET_AH is not set
263# CONFIG_INET_ESP is not set
264# CONFIG_INET_IPCOMP is not set
265# CONFIG_INET_TUNNEL is not set
266CONFIG_INET_XFRM_MODE_TRANSPORT=m
267CONFIG_INET_XFRM_MODE_TUNNEL=m
268CONFIG_INET_XFRM_MODE_BEET=m
269CONFIG_INET_DIAG=m
270CONFIG_INET_TCP_DIAG=m
271# CONFIG_TCP_CONG_ADVANCED is not set
272CONFIG_TCP_CONG_BIC=y
273
274#
275# IP: Virtual Server Configuration
276#
277# CONFIG_IP_VS is not set
278CONFIG_IPV6=m
279# CONFIG_IPV6_PRIVACY is not set
280CONFIG_INET6_AH=m
281CONFIG_INET6_ESP=m
282CONFIG_INET6_IPCOMP=m
283CONFIG_INET6_TUNNEL=m
284CONFIG_IPV6_TUNNEL=m
285CONFIG_NETFILTER=y
286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
291# CONFIG_NETFILTER_NETLINK is not set
292# CONFIG_NF_CONNTRACK_ENABLED is not set
293# CONFIG_NF_CONNTRACK is not set
294
295CONFIG_NETFILTER_XTABLES=m
296# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
297# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
298# CONFIG_NETFILTER_XT_TARGET_MARK is not set
299# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
300# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
301# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
302# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
303# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
304# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
305# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
306# CONFIG_NETFILTER_XT_MATCH_ESP is not set
307# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
308# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
309# CONFIG_NETFILTER_XT_MATCH_MAC is not set
310# CONFIG_NETFILTER_XT_MATCH_MARK is not set
311# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
312# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
313# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
314# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
315# CONFIG_NETFILTER_XT_MATCH_REALM is not set
316# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
317# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
318# CONFIG_NETFILTER_XT_MATCH_STRING is not set
319# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
320# CONFIG_NETFILTER_XT_MATCH_U32 is not set
321# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
322
323#
324# IP: Netfilter Configuration
325#
326CONFIG_IP_NF_QUEUE=m
327CONFIG_IP_NF_IPTABLES=m
328CONFIG_IP_NF_MATCH_IPRANGE=m
329CONFIG_IP_NF_MATCH_TOS=m
330CONFIG_IP_NF_MATCH_RECENT=m
331CONFIG_IP_NF_MATCH_ECN=m
332CONFIG_IP_NF_MATCH_AH=m
333CONFIG_IP_NF_MATCH_TTL=m
334CONFIG_IP_NF_MATCH_OWNER=m
335CONFIG_IP_NF_MATCH_ADDRTYPE=m
336CONFIG_IP_NF_FILTER=m
337CONFIG_IP_NF_TARGET_REJECT=m
338CONFIG_IP_NF_TARGET_LOG=m
339CONFIG_IP_NF_TARGET_ULOG=m
340CONFIG_IP_NF_MANGLE=m
341CONFIG_IP_NF_TARGET_TOS=m
342CONFIG_IP_NF_TARGET_ECN=m
343CONFIG_IP_NF_TARGET_TTL=m
344CONFIG_IP_NF_RAW=m
345CONFIG_IP_NF_ARPTABLES=m
346CONFIG_IP_NF_ARPFILTER=m
347CONFIG_IP_NF_ARP_MANGLE=m
348
349#
350
351#
352# IPv6: Netfilter Configuration (EXPERIMENTAL)
353#
354# CONFIG_IP6_NF_QUEUE is not set
355
356#
357# DCCP Configuration (EXPERIMENTAL)
358#
359# CONFIG_IP_DCCP is not set
360
361#
362# SCTP Configuration (EXPERIMENTAL)
363#
364# CONFIG_IP_SCTP is not set
365
366#
367# TIPC Configuration (EXPERIMENTAL)
368#
369# CONFIG_TIPC is not set
370# CONFIG_ATM is not set
371# CONFIG_BRIDGE is not set
372# CONFIG_VLAN_8021Q is not set
373# CONFIG_DECNET is not set
374# CONFIG_LLC2 is not set
375# CONFIG_IPX is not set
376# CONFIG_ATALK is not set
377# CONFIG_X25 is not set
378# CONFIG_LAPB is not set
379# CONFIG_NET_DIVERT is not set
380# CONFIG_ECONET is not set
381# CONFIG_WAN_ROUTER is not set
382
383#
384# QoS and/or fair queueing
385#
386# CONFIG_NET_SCHED is not set
387
388#
389# Network testing
390#
391# CONFIG_NET_PKTGEN is not set
392# CONFIG_HAMRADIO is not set
393CONFIG_IRDA=m
394
395#
396# IrDA protocols
397#
398CONFIG_IRLAN=m
399CONFIG_IRNET=m
400CONFIG_IRCOMM=m
401# CONFIG_IRDA_ULTRA is not set
402
403#
404# IrDA options
405#
406# CONFIG_IRDA_CACHE_LAST_LSAP is not set
407# CONFIG_IRDA_FAST_RR is not set
408# CONFIG_IRDA_DEBUG is not set
409
410#
411# Infrared-port device drivers
412#
413
414#
415# SIR device drivers
416#
417# CONFIG_IRTTY_SIR is not set
418
419#
420# Dongle support
421#
422
423#
424# Old SIR device drivers
425#
426# CONFIG_IRPORT_SIR is not set
427
428#
429# Old Serial dongle support
430#
431
432#
433# FIR device drivers
434#
435# CONFIG_USB_IRDA is not set
436# CONFIG_SIGMATEL_FIR is not set
437CONFIG_PXA_FICP=m
438CONFIG_BT=m
439CONFIG_BT_L2CAP=m
440CONFIG_BT_SCO=m
441CONFIG_BT_RFCOMM=m
442CONFIG_BT_RFCOMM_TTY=y
443CONFIG_BT_BNEP=m
444CONFIG_BT_BNEP_MC_FILTER=y
445CONFIG_BT_BNEP_PROTO_FILTER=y
446CONFIG_BT_HIDP=m
447
448#
449# Bluetooth device drivers
450#
451CONFIG_BT_HCIUSB=m
452# CONFIG_BT_HCIUSB_SCO is not set
453CONFIG_BT_HCIUART=m
454CONFIG_BT_HCIUART_H4=y
455CONFIG_BT_HCIUART_BCSP=y
456CONFIG_BT_HCIBCM203X=m
457CONFIG_BT_HCIBPA10X=m
458CONFIG_BT_HCIBFUSB=m
459CONFIG_BT_HCIDTL1=m
460CONFIG_BT_HCIBT3C=m
461CONFIG_BT_HCIBLUECARD=m
462CONFIG_BT_HCIBTUART=m
463CONFIG_BT_HCIVHCI=m
464CONFIG_IEEE80211=m
465# CONFIG_IEEE80211_DEBUG is not set
466CONFIG_IEEE80211_CRYPT_WEP=m
467CONFIG_IEEE80211_CRYPT_CCMP=m
468CONFIG_IEEE80211_CRYPT_TKIP=m
469
470#
471# Device Drivers
472#
473
474#
475# Generic Driver Options
476#
477CONFIG_STANDALONE=y
478CONFIG_PREVENT_FIRMWARE_BUILD=y
479CONFIG_FW_LOADER=m
480# CONFIG_DEBUG_DRIVER is not set
481
482#
483# Connector - unified userspace <-> kernelspace linker
484#
485# CONFIG_CONNECTOR is not set
486
487#
488# Memory Technology Devices (MTD)
489#
490CONFIG_MTD=y
491# CONFIG_MTD_DEBUG is not set
492# CONFIG_MTD_CONCAT is not set
493CONFIG_MTD_PARTITIONS=y
494# CONFIG_MTD_REDBOOT_PARTS is not set
495# CONFIG_MTD_CMDLINE_PARTS is not set
496# CONFIG_MTD_AFS_PARTS is not set
497
498#
499# User Modules And Translation Layers
500#
501CONFIG_MTD_CHAR=y
502CONFIG_MTD_BLOCK=y
503# CONFIG_FTL is not set
504# CONFIG_NFTL is not set
505# CONFIG_INFTL is not set
506# CONFIG_RFD_FTL is not set
507
508#
509# RAM/ROM/Flash chip drivers
510#
511# CONFIG_MTD_CFI is not set
512# CONFIG_MTD_JEDECPROBE is not set
513CONFIG_MTD_MAP_BANK_WIDTH_1=y
514CONFIG_MTD_MAP_BANK_WIDTH_2=y
515CONFIG_MTD_MAP_BANK_WIDTH_4=y
516# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
517# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
518# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
519CONFIG_MTD_CFI_I1=y
520CONFIG_MTD_CFI_I2=y
521# CONFIG_MTD_CFI_I4 is not set
522# CONFIG_MTD_CFI_I8 is not set
523# CONFIG_MTD_RAM is not set
524CONFIG_MTD_ROM=y
525# CONFIG_MTD_ABSENT is not set
526# CONFIG_MTD_OBSOLETE_CHIPS is not set
527
528#
529# Mapping drivers for chip access
530#
531# CONFIG_MTD_COMPLEX_MAPPINGS is not set
532CONFIG_MTD_SHARP_SL=y
533# CONFIG_MTD_PLATRAM is not set
534
535#
536# Self-contained MTD device drivers
537#
538# CONFIG_MTD_SLRAM is not set
539# CONFIG_MTD_PHRAM is not set
540# CONFIG_MTD_MTDRAM is not set
541# CONFIG_MTD_BLKMTD is not set
542# CONFIG_MTD_BLOCK2MTD is not set
543
544#
545# Disk-On-Chip Device Drivers
546#
547# CONFIG_MTD_DOC2000 is not set
548# CONFIG_MTD_DOC2001 is not set
549# CONFIG_MTD_DOC2001PLUS is not set
550
551#
552# NAND Flash Device Drivers
553#
554CONFIG_MTD_NAND=y
555CONFIG_MTD_NAND_VERIFY_WRITE=y
556# CONFIG_MTD_NAND_H1900 is not set
557CONFIG_MTD_NAND_TMIO=y
558CONFIG_MTD_NAND_IDS=y
559# CONFIG_MTD_NAND_DISKONCHIP is not set
560# CONFIG_MTD_NAND_SHARPSL is not set
561# CONFIG_MTD_NAND_NANDSIM is not set
562
563#
564# OneNAND Flash Device Drivers
565#
566# CONFIG_MTD_ONENAND is not set
567
568#
569# Parallel port support
570#
571# CONFIG_PARPORT is not set
572
573#
574# Plug and Play support
575#
576
577#
578# Block devices
579#
580# CONFIG_BLK_DEV_COW_COMMON is not set
581CONFIG_BLK_DEV_LOOP=m
582# CONFIG_BLK_DEV_CRYPTOLOOP is not set
583# CONFIG_BLK_DEV_NBD is not set
584# CONFIG_BLK_DEV_UB is not set
585# CONFIG_BLK_DEV_RAM is not set
586CONFIG_BLK_DEV_RAM_COUNT=16
587# CONFIG_CDROM_PKTCDVD is not set
588# CONFIG_ATA_OVER_ETH is not set
589
590#
591# ATA/ATAPI/MFM/RLL support
592#
593CONFIG_IDE=y
594CONFIG_BLK_DEV_IDE=y
595
596#
597# Please see Documentation/ide.txt for help/info on IDE drives
598#
599# CONFIG_BLK_DEV_IDE_SATA is not set
600CONFIG_BLK_DEV_IDEDISK=y
601# CONFIG_IDEDISK_MULTI_MODE is not set
602CONFIG_BLK_DEV_IDECS=y
603# CONFIG_BLK_DEV_IDECD is not set
604# CONFIG_BLK_DEV_IDETAPE is not set
605# CONFIG_BLK_DEV_IDEFLOPPY is not set
606# CONFIG_BLK_DEV_IDESCSI is not set
607# CONFIG_IDE_TASK_IOCTL is not set
608
609#
610# IDE chipset support/bugfixes
611#
612# CONFIG_IDE_GENERIC is not set
613# CONFIG_IDE_ARM is not set
614# CONFIG_BLK_DEV_IDEDMA is not set
615# CONFIG_IDEDMA_AUTO is not set
616# CONFIG_BLK_DEV_HD is not set
617
618#
619# SCSI device support
620#
621# CONFIG_RAID_ATTRS is not set
622CONFIG_SCSI=m
623CONFIG_SCSI_PROC_FS=y
624
625#
626# SCSI support type (disk, tape, CD-ROM)
627#
628CONFIG_BLK_DEV_SD=m
629CONFIG_CHR_DEV_ST=m
630CONFIG_CHR_DEV_OSST=m
631CONFIG_BLK_DEV_SR=m
632# CONFIG_BLK_DEV_SR_VENDOR is not set
633CONFIG_CHR_DEV_SG=m
634# CONFIG_CHR_DEV_SCH is not set
635
636#
637# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
638#
639CONFIG_SCSI_MULTI_LUN=y
640# CONFIG_SCSI_CONSTANTS is not set
641# CONFIG_SCSI_LOGGING is not set
642
643#
644# SCSI Transport Attributes
645#
646# CONFIG_SCSI_SPI_ATTRS is not set
647# CONFIG_SCSI_FC_ATTRS is not set
648# CONFIG_SCSI_ISCSI_ATTRS is not set
649# CONFIG_SCSI_SAS_ATTRS is not set
650
651#
652# SCSI low-level drivers
653#
654# CONFIG_ISCSI_TCP is not set
655# CONFIG_SCSI_SATA is not set
656# CONFIG_SCSI_DEBUG is not set
657
658#
659# PCMCIA SCSI adapter support
660#
661# CONFIG_PCMCIA_AHA152X is not set
662# CONFIG_PCMCIA_FDOMAIN is not set
663# CONFIG_PCMCIA_NINJA_SCSI is not set
664# CONFIG_PCMCIA_QLOGIC is not set
665# CONFIG_PCMCIA_SYM53C500 is not set
666
667#
668# Multi-device support (RAID and LVM)
669#
670CONFIG_MD=y
671CONFIG_BLK_DEV_DM=m
672CONFIG_DM_CRYPT=m
673CONFIG_DM_SNAPSHOT=m
674CONFIG_DM_MIRROR=m
675CONFIG_DM_ZERO=m
676CONFIG_DM_MULTIPATH=m
677CONFIG_DM_MULTIPATH_EMC=m
678
679#
680# Fusion MPT device support
681#
682# CONFIG_FUSION is not set
683
684#
685# IEEE 1394 (FireWire) support
686#
687
688#
689# I2O device support
690#
691
692#
693# Network device support
694#
695CONFIG_NETDEVICES=y
696# CONFIG_DUMMY is not set
697# CONFIG_BONDING is not set
698# CONFIG_EQUALIZER is not set
699CONFIG_TUN=m
700
701#
702# PHY device support
703#
704# CONFIG_PHYLIB is not set
705
706#
707# Ethernet (10 or 100Mbit)
708#
709CONFIG_NET_ETHERNET=y
710CONFIG_MII=m
711# CONFIG_SMC91X is not set
712# CONFIG_DM9000 is not set
713
714#
715# Ethernet (1000 Mbit)
716#
717
718#
719# Ethernet (10000 Mbit)
720#
721
722#
723# Token Ring devices
724#
725
726#
727# Wireless LAN (non-hamradio)
728#
729CONFIG_NET_RADIO=y
730
731#
732# Obsolete Wireless cards support (pre-802.11)
733#
734# CONFIG_STRIP is not set
735# CONFIG_PCMCIA_WAVELAN is not set
736# CONFIG_PCMCIA_NETWAVE is not set
737
738#
739# Wireless 802.11 Frequency Hopping cards support
740#
741# CONFIG_PCMCIA_RAYCS is not set
742
743#
744# Wireless 802.11b ISA/PCI cards support
745#
746CONFIG_HERMES=m
747# CONFIG_ATMEL is not set
748
749#
750# Wireless 802.11b Pcmcia/Cardbus cards support
751#
752CONFIG_PCMCIA_HERMES=m
753CONFIG_PCMCIA_SPECTRUM=m
754# CONFIG_AIRO_CS is not set
755# CONFIG_PCMCIA_WL3501 is not set
756CONFIG_HOSTAP=m
757CONFIG_HOSTAP_FIRMWARE=y
758# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
759CONFIG_HOSTAP_CS=m
760CONFIG_NET_WIRELESS=y
761
762#
763# PCMCIA network device support
764#
765CONFIG_NET_PCMCIA=y
766# CONFIG_PCMCIA_3C589 is not set
767# CONFIG_PCMCIA_3C574 is not set
768# CONFIG_PCMCIA_FMVJ18X is not set
769CONFIG_PCMCIA_PCNET=m
770# CONFIG_PCMCIA_NMCLAN is not set
771# CONFIG_PCMCIA_SMC91C92 is not set
772# CONFIG_PCMCIA_XIRC2PS is not set
773# CONFIG_PCMCIA_AXNET is not set
774
775#
776# Wan interfaces
777#
778# CONFIG_WAN is not set
779CONFIG_PPP=m
780# CONFIG_PPP_MULTILINK is not set
781# CONFIG_PPP_FILTER is not set
782CONFIG_PPP_ASYNC=m
783# CONFIG_PPP_SYNC_TTY is not set
784CONFIG_PPP_DEFLATE=m
785CONFIG_PPP_BSDCOMP=m
786# CONFIG_PPP_MPPE is not set
787# CONFIG_PPPOE is not set
788# CONFIG_SLIP is not set
789# CONFIG_SHAPER is not set
790# CONFIG_NETCONSOLE is not set
791# CONFIG_NETPOLL is not set
792# CONFIG_NET_POLL_CONTROLLER is not set
793
794#
795# ISDN subsystem
796#
797# CONFIG_ISDN is not set
798
799#
800# Input device support
801#
802CONFIG_INPUT=y
803
804#
805# Userland interfaces
806#
807CONFIG_INPUT_MOUSEDEV=m
808# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
809CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
810CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
811# CONFIG_INPUT_JOYDEV is not set
812# CONFIG_INPUT_TSDEV is not set
813CONFIG_INPUT_EVDEV=y
814# CONFIG_INPUT_EVBUG is not set
815CONFIG_INPUT_POWER=y
816
817#
818# Input Device Drivers
819#
820CONFIG_INPUT_KEYBOARD=y
821# CONFIG_KEYBOARD_ATKBD is not set
822# CONFIG_KEYBOARD_SUNKBD is not set
823# CONFIG_KEYBOARD_LKKBD is not set
824# CONFIG_KEYBOARD_XTKBD is not set
825# CONFIG_KEYBOARD_NEWTON is not set
826# CONFIG_KEYBOARD_CORGI is not set
827# CONFIG_KEYBOARD_SPITZ is not set
828CONFIG_KEYBOARD_TOSA=y
829# CONFIG_INPUT_MOUSE is not set
830# CONFIG_INPUT_JOYSTICK is not set
831CONFIG_INPUT_TOUCHSCREEN=y
832# CONFIG_TOUCHSCREEN_CORGI is not set
833# CONFIG_TOUCHSCREEN_GUNZE is not set
834# CONFIG_TOUCHSCREEN_ELO is not set
835# CONFIG_TOUCHSCREEN_MTOUCH is not set
836# CONFIG_TOUCHSCREEN_MK712 is not set
837CONFIG_TOUCHSCREEN_WM97XX=y
838# CONFIG_TOUCHSCREEN_WM9705 is not set
839CONFIG_TOUCHSCREEN_WM9712=y
840CONFIG_TOUCHSCREEN_TOSA=y
841# CONFIG_TOUCHSCREEN_WM9713 is not set
842# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set
843CONFIG_INPUT_MISC=y
844CONFIG_INPUT_UINPUT=m
845
846#
847# Hardware I/O ports
848#
849# CONFIG_SERIO is not set
850# CONFIG_GAMEPORT is not set
851
852#
853# Character devices
854#
855CONFIG_VT=y
856CONFIG_VT_CONSOLE=y
857CONFIG_HW_CONSOLE=y
858# CONFIG_SERIAL_NONSTANDARD is not set
859
860#
861# Serial drivers
862#
863CONFIG_SERIAL_8250=m
864CONFIG_SERIAL_8250_CS=m
865CONFIG_SERIAL_8250_NR_UARTS=4
866CONFIG_SERIAL_8250_RUNTIME_UARTS=4
867# CONFIG_SERIAL_8250_EXTENDED is not set
868
869#
870# Non-8250 serial port support
871#
872CONFIG_SERIAL_PXA=y
873CONFIG_SERIAL_PXA_CONSOLE=y
874CONFIG_SERIAL_CORE=y
875CONFIG_SERIAL_CORE_CONSOLE=y
876CONFIG_UNIX98_PTYS=y
877# CONFIG_LEGACY_PTYS is not set
878
879#
880# IPMI
881#
882# CONFIG_IPMI_HANDLER is not set
883
884#
885# Watchdog Cards
886#
887# CONFIG_WATCHDOG is not set
888# CONFIG_NVRAM is not set
889# CONFIG_DTLK is not set
890# CONFIG_R3964 is not set
891
892#
893# Ftape, the floppy tape device driver
894#
895
896#
897# PCMCIA character devices
898#
899# CONFIG_SYNCLINK_CS is not set
900# CONFIG_CARDMAN_4000 is not set
901# CONFIG_CARDMAN_4040 is not set
902# CONFIG_RAW_DRIVER is not set
903
904#
905# TPM devices
906#
907# CONFIG_TCG_TPM is not set
908# CONFIG_TELCLOCK is not set
909
910#
911# I2C support
912#
913CONFIG_I2C=y
914# CONFIG_I2C_CHARDEV is not set
915
916#
917# I2C Algorithms
918#
919# CONFIG_I2C_ALGOBIT is not set
920# CONFIG_I2C_ALGOPCF is not set
921# CONFIG_I2C_ALGOPCA is not set
922
923#
924# I2C Hardware Bus support
925#
926CONFIG_I2C_PXA=y
927# CONFIG_I2C_PXA_SLAVE is not set
928# CONFIG_I2C_PARPORT_LIGHT is not set
929# CONFIG_I2C_STUB is not set
930# CONFIG_I2C_PCA_ISA is not set
931
932#
933# Miscellaneous I2C Chip support
934#
935# CONFIG_SENSORS_DS1337 is not set
936# CONFIG_SENSORS_DS1374 is not set
937# CONFIG_SENSORS_EEPROM is not set
938# CONFIG_SENSORS_PCF8574 is not set
939# CONFIG_SENSORS_PCA9539 is not set
940# CONFIG_SENSORS_PCF8591 is not set
941# CONFIG_SENSORS_MAX6875 is not set
942# CONFIG_I2C_DEBUG_CORE is not set
943# CONFIG_I2C_DEBUG_ALGO is not set
944# CONFIG_I2C_DEBUG_BUS is not set
945# CONFIG_I2C_DEBUG_CHIP is not set
946
947#
948# SPI support
949#
950# CONFIG_SPI is not set
951# CONFIG_SPI_MASTER is not set
952
953#
954# Hardware Monitoring support
955#
956# CONFIG_HWMON is not set
957# CONFIG_HWMON_VID is not set
958
959#
960# Misc devices
961#
962
963#
964# Multimedia Capabilities Port drivers
965#
966
967#
968# Multi-Function Devices
969#
970
971#
972# LED devices
973#
974CONFIG_NEW_LEDS=y
975CONFIG_LEDS_CLASS=y
976CONFIG_LEDS_TRIGGERS=y
977CONFIG_LEDS_TOSA=y
978CONFIG_LEDS_TRIGGER_TIMER=m
979CONFIG_LEDS_TRIGGER_IDE_DISK=y
980
981#
982# Multimedia devices
983#
984CONFIG_VIDEO_DEV=m
985CONFIG_VIDEO_V4L1=y
986CONFIG_VIDEO_V4L1_COMPAT=y
987CONFIG_VIDEO_V4L2=y
988
989#
990# Video For Linux
991#
992
993#
994# Video Adapters
995#
996# CONFIG_VIDEO_ADV_DEBUG is not set
997# CONFIG_VIDEO_CPIA is not set
998# CONFIG_VIDEO_SAA5246A is not set
999# CONFIG_VIDEO_SAA5249 is not set
1000# CONFIG_TUNER_3036 is not set
1001# CONFIG_VIDEO_EM28XX is not set
1002# CONFIG_VIDEO_OVCAMCHIP is not set
1003# CONFIG_VIDEO_AUDIO_DECODER is not set
1004# CONFIG_VIDEO_DECODER is not set
1005
1006#
1007# Radio Adapters
1008#
1009# CONFIG_RADIO_MAESTRO is not set
1010
1011#
1012# Digital Video Broadcasting Devices
1013#
1014# CONFIG_DVB is not set
1015
1016#
1017# Graphics support
1018#
1019CONFIG_FB=y
1020CONFIG_FB_CFB_FILLRECT=y
1021CONFIG_FB_CFB_COPYAREA=y
1022CONFIG_FB_CFB_IMAGEBLIT=y
1023# CONFIG_FB_MACMODES is not set
1024# CONFIG_FB_MODE_HELPERS is not set
1025# CONFIG_FB_TILEBLITTING is not set
1026# CONFIG_FB_S1D13XXX is not set
1027# CONFIG_FB_PXA is not set
1028# CONFIG_FB_W100 is not set
1029CONFIG_FB_TMIO=y
1030# CONFIG_FB_VIRTUAL is not set
1031
1032#
1033# Console display driver support
1034#
1035# CONFIG_VGA_CONSOLE is not set
1036CONFIG_DUMMY_CONSOLE=y
1037CONFIG_FRAMEBUFFER_CONSOLE=y
1038# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1039CONFIG_FONTS=y
1040CONFIG_FONT_8x8=y
1041# CONFIG_FONT_8x16 is not set
1042# CONFIG_FONT_6x11 is not set
1043# CONFIG_FONT_7x14 is not set
1044# CONFIG_FONT_PEARL_8x8 is not set
1045# CONFIG_FONT_ACORN_8x8 is not set
1046# CONFIG_FONT_MINI_4x6 is not set
1047# CONFIG_FONT_SUN8x16 is not set
1048# CONFIG_FONT_SUN12x22 is not set
1049# CONFIG_FONT_10x18 is not set
1050
1051#
1052# Logo configuration
1053#
1054# CONFIG_LOGO is not set
1055# CONFIG_LOGO_LINUX_MONO is not set
1056# CONFIG_LOGO_LINUX_VGA16 is not set
1057# CONFIG_LOGO_LINUX_CLUT224 is not set
1058CONFIG_BACKLIGHT_LCD_SUPPORT=y
1059CONFIG_BACKLIGHT_CLASS_DEVICE=y
1060CONFIG_BACKLIGHT_DEVICE=y
1061# CONFIG_LCD_CLASS_DEVICE is not set
1062CONFIG_BACKLIGHT_CORGI=y
1063# CONFIG_BACKLIGHT_HP680 is not set
1064
1065#
1066# Sound
1067#
1068CONFIG_SOUND=y
1069
1070#
1071# Advanced Linux Sound Architecture
1072#
1073CONFIG_SND=y
1074CONFIG_SND_TIMER=y
1075CONFIG_SND_PCM=y
1076CONFIG_SND_HWDEP=m
1077CONFIG_SND_RAWMIDI=m
1078# CONFIG_SND_SEQUENCER is not set
1079CONFIG_SND_OSSEMUL=y
1080CONFIG_SND_MIXER_OSS=m
1081CONFIG_SND_PCM_OSS=m
1082# CONFIG_SND_DYNAMIC_MINORS is not set
1083# CONFIG_SND_SUPPORT_OLD_API is not set
1084# CONFIG_SND_VERBOSE_PRINTK is not set
1085# CONFIG_SND_DEBUG is not set
1086
1087#
1088# Generic devices
1089#
1090CONFIG_AC97_BUS=y
1091CONFIG_SND_DUMMY=m
1092# CONFIG_SND_MTPAV is not set
1093# CONFIG_SND_SERIAL_U16550 is not set
1094# CONFIG_SND_MPU401 is not set
1095
1096#
1097# ALSA ARM devices
1098#
1099# CONFIG_SND_PXA2XX_AC97 is not set
1100
1101#
1102# USB devices
1103#
1104CONFIG_SND_USB_AUDIO=m
1105
1106#
1107# PCMCIA devices
1108#
1109
1110#
1111# SoC audio support
1112#
1113CONFIG_SND_SOC=y
1114
1115#
1116# Soc Platforms
1117#
1118
1119#
1120# SoC Audio for the Intel PXA2xx
1121#
1122CONFIG_SND_PXA2XX_SOC=y
1123CONFIG_SND_PXA2XX_SOC_AC97=y
1124# CONFIG_SND_PXA2XX_SOC_MAINSTONE is not set
1125# CONFIG_SND_PXA2XX_SOC_MAINSTONE_WM8753 is not set
1126# CONFIG_SND_PXA2XX_SOC_MAINSTONE_WM9713 is not set
1127# CONFIG_SND_PXA2XX_SOC_MAINSTONE_WM9712 is not set
1128# CONFIG_SND_PXA2XX_SOC_CORGI is not set
1129# CONFIG_SND_PXA2XX_SOC_SPITZ is not set
1130CONFIG_SND_PXA2XX_SOC_TOSA=y
1131
1132#
1133# Soc Codecs
1134#
1135# CONFIG_SND_SOC_AC97_CODEC is not set
1136# CONFIG_SND_SOC_WM8731 is not set
1137# CONFIG_SND_SOC_WM8750 is not set
1138# CONFIG_SND_SOC_WM8753 is not set
1139# CONFIG_SND_SOC_WM8772 is not set
1140# CONFIG_SND_SOC_WM8971 is not set
1141# CONFIG_SND_SOC_WM9713 is not set
1142CONFIG_SND_SOC_WM9712=y
1143# CONFIG_SND_SOC_UDA1380 is not set
1144# CONFIG_SND_SOC_AK4535 is not set
1145
1146#
1147# Open Sound System
1148#
1149# CONFIG_SOUND_PRIME is not set
1150CONFIG_HID_SUPPORT=y
1151CONFIG_HID=m
1152
1153
1154#
1155# USB support
1156#
1157CONFIG_USB_ARCH_HAS_HCD=y
1158CONFIG_USB_ARCH_HAS_OHCI=y
1159CONFIG_USB=m
1160# CONFIG_USB_DEBUG is not set
1161
1162#
1163# Miscellaneous USB options
1164#
1165CONFIG_USB_DEVICEFS=y
1166# CONFIG_USB_BANDWIDTH is not set
1167# CONFIG_USB_DYNAMIC_MINORS is not set
1168# CONFIG_USB_SUSPEND is not set
1169# CONFIG_USB_OTG is not set
1170
1171#
1172# USB Host Controller Drivers
1173#
1174# CONFIG_USB_ISP116X_HCD is not set
1175CONFIG_USB_OHCI_HCD=m
1176# CONFIG_USB_OHCI_BIG_ENDIAN is not set
1177CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1178CONFIG_USB_SL811_HCD=m
1179CONFIG_USB_SL811_CS=m
1180
1181#
1182# USB Device Class drivers
1183#
1184# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1185CONFIG_USB_ACM=m
1186CONFIG_USB_PRINTER=m
1187
1188#
1189# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1190#
1191
1192#
1193# may also be needed; see USB_STORAGE Help for more information
1194#
1195CONFIG_USB_STORAGE=m
1196# CONFIG_USB_STORAGE_DEBUG is not set
1197# CONFIG_USB_STORAGE_DATAFAB is not set
1198# CONFIG_USB_STORAGE_FREECOM is not set
1199# CONFIG_USB_STORAGE_ISD200 is not set
1200# CONFIG_USB_STORAGE_DPCM is not set
1201# CONFIG_USB_STORAGE_USBAT is not set
1202# CONFIG_USB_STORAGE_SDDR09 is not set
1203# CONFIG_USB_STORAGE_SDDR55 is not set
1204# CONFIG_USB_STORAGE_JUMPSHOT is not set
1205# CONFIG_USB_STORAGE_ALAUDA is not set
1206# CONFIG_USB_LIBUSUAL is not set
1207
1208#
1209# USB Input Devices
1210#
1211CONFIG_USB_HID=m
1212CONFIG_USB_HIDINPUT=y
1213# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1214# CONFIG_HID_FF is not set
1215# CONFIG_USB_HIDDEV is not set
1216
1217#
1218# USB HID Boot Protocol drivers
1219#
1220CONFIG_USB_KBD=m
1221CONFIG_USB_MOUSE=m
1222CONFIG_USB_AIPTEK=m
1223CONFIG_USB_WACOM=m
1224# CONFIG_USB_ACECAD is not set
1225CONFIG_USB_KBTAB=m
1226CONFIG_USB_POWERMATE=m
1227CONFIG_USB_MTOUCH=m
1228# CONFIG_USB_ITMTOUCH is not set
1229CONFIG_USB_EGALAX=m
1230# CONFIG_USB_YEALINK is not set
1231CONFIG_USB_XPAD=m
1232CONFIG_USB_ATI_REMOTE=m
1233# CONFIG_USB_ATI_REMOTE2 is not set
1234# CONFIG_USB_KEYSPAN_REMOTE is not set
1235# CONFIG_USB_APPLETOUCH is not set
1236
1237#
1238# USB Imaging devices
1239#
1240CONFIG_USB_MDC800=m
1241CONFIG_USB_MICROTEK=m
1242
1243#
1244# USB Multimedia devices
1245#
1246CONFIG_USB_DABUSB=m
1247CONFIG_USB_VICAM=m
1248CONFIG_USB_DSBR=m
1249# CONFIG_USB_ET61X251 is not set
1250CONFIG_USB_IBMCAM=m
1251CONFIG_USB_KONICAWC=m
1252CONFIG_USB_OV511=m
1253CONFIG_USB_SE401=m
1254CONFIG_USB_SN9C102=m
1255CONFIG_USB_STV680=m
1256# CONFIG_USB_PWC is not set
1257
1258#
1259# USB Network Adapters
1260#
1261CONFIG_USB_CATC=m
1262CONFIG_USB_KAWETH=m
1263CONFIG_USB_PEGASUS=m
1264CONFIG_USB_RTL8150=m
1265CONFIG_USB_USBNET=m
1266CONFIG_USB_NET_AX8817X=m
1267CONFIG_USB_NET_CDCETHER=m
1268CONFIG_USB_NET_GL620A=m
1269CONFIG_USB_NET_NET1080=m
1270CONFIG_USB_NET_PLUSB=m
1271# CONFIG_USB_NET_RNDIS_HOST is not set
1272# CONFIG_USB_NET_CDC_SUBSET is not set
1273# CONFIG_USB_NET_ZAURUS is not set
1274# CONFIG_USB_ZD1201 is not set
1275CONFIG_USB_MON=y
1276
1277#
1278# USB port drivers
1279#
1280
1281#
1282# USB Serial Converter support
1283#
1284CONFIG_USB_SERIAL=m
1285CONFIG_USB_SERIAL_GENERIC=y
1286# CONFIG_USB_SERIAL_AIRPRIME is not set
1287# CONFIG_USB_SERIAL_ANYDATA is not set
1288CONFIG_USB_SERIAL_BELKIN=m
1289# CONFIG_USB_SERIAL_WHITEHEAT is not set
1290CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1291# CONFIG_USB_SERIAL_CP2101 is not set
1292CONFIG_USB_SERIAL_CYPRESS_M8=m
1293CONFIG_USB_SERIAL_EMPEG=m
1294CONFIG_USB_SERIAL_FTDI_SIO=m
1295CONFIG_USB_SERIAL_VISOR=m
1296CONFIG_USB_SERIAL_IPAQ=m
1297CONFIG_USB_SERIAL_IR=m
1298CONFIG_USB_SERIAL_EDGEPORT=m
1299CONFIG_USB_SERIAL_EDGEPORT_TI=m
1300CONFIG_USB_SERIAL_GARMIN=m
1301CONFIG_USB_SERIAL_IPW=m
1302CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1303CONFIG_USB_SERIAL_KEYSPAN=m
1304# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
1305# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
1306# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
1307# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
1308# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
1309# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
1310# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
1311# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
1312# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
1313# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
1314# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
1315# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
1316CONFIG_USB_SERIAL_KLSI=m
1317CONFIG_USB_SERIAL_KOBIL_SCT=m
1318CONFIG_USB_SERIAL_MCT_U232=m
1319CONFIG_USB_SERIAL_PL2303=m
1320# CONFIG_USB_SERIAL_HP4X is not set
1321CONFIG_USB_SERIAL_SAFE=m
1322# CONFIG_USB_SERIAL_SAFE_PADDED is not set
1323CONFIG_USB_SERIAL_TI=m
1324CONFIG_USB_SERIAL_CYBERJACK=m
1325CONFIG_USB_SERIAL_XIRCOM=m
1326# CONFIG_USB_SERIAL_OPTION is not set
1327CONFIG_USB_SERIAL_OMNINET=m
1328CONFIG_USB_EZUSB=y
1329
1330#
1331# USB Miscellaneous drivers
1332#
1333CONFIG_USB_EMI62=m
1334CONFIG_USB_EMI26=m
1335CONFIG_USB_AUERSWALD=m
1336CONFIG_USB_RIO500=m
1337CONFIG_USB_LEGOTOWER=m
1338CONFIG_USB_LCD=m
1339CONFIG_USB_LED=m
1340CONFIG_USB_CYTHERM=m
1341CONFIG_USB_PHIDGETKIT=m
1342CONFIG_USB_PHIDGETSERVO=m
1343CONFIG_USB_IDMOUSE=m
1344# CONFIG_USB_LD is not set
1345# CONFIG_USB_TEST is not set
1346
1347#
1348# USB DSL modem support
1349#
1350
1351#
1352# USB Gadget Support
1353#
1354CONFIG_USB_GADGET=m
1355# CONFIG_USB_GADGET_DEBUG_FILES is not set
1356CONFIG_USB_GADGET_SELECTED=y
1357# CONFIG_USB_GADGET_NET2280 is not set
1358CONFIG_USB_GADGET_PXA2XX=y
1359# CONFIG_USB_PXA2XX_SMALL is not set
1360# CONFIG_USB_GADGET_PXA27X is not set
1361# CONFIG_USB_GADGET_GOKU is not set
1362# CONFIG_USB_GADGET_LH7A40X is not set
1363# CONFIG_USB_GADGET_OMAP is not set
1364# CONFIG_USB_GADGET_DUMMY_HCD is not set
1365# CONFIG_USB_GADGET_DUALSPEED is not set
1366CONFIG_USB_ZERO=m
1367CONFIG_USB_ETH=m
1368CONFIG_USB_ETH_RNDIS=y
1369CONFIG_USB_GADGETFS=m
1370CONFIG_USB_FILE_STORAGE=m
1371# CONFIG_USB_FILE_STORAGE_TEST is not set
1372CONFIG_USB_G_SERIAL=m
1373
1374#
1375# MMC/SD Card support
1376#
1377CONFIG_MMC=y
1378# CONFIG_MMC_DEBUG is not set
1379CONFIG_MMC_BLOCK=y
1380CONFIG_MMC_PXA=y
1381CONFIG_MMC_UNSAFE_RESUME=y
1382
1383#
1384# Real Time Clock
1385#
1386CONFIG_RTC_CLASS=y
1387CONFIG_RTC_HCTOSYS=y
1388CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1389
1390#
1391# RTC interfaces
1392#
1393CONFIG_RTC_INTF_SYSFS=y
1394CONFIG_RTC_INTF_PROC=y
1395CONFIG_RTC_INTF_DEV=y
1396
1397#
1398# RTC drivers
1399#
1400# CONFIG_RTC_DRV_X1205 is not set
1401# CONFIG_RTC_DRV_DS1672 is not set
1402# CONFIG_RTC_DRV_PCF8563 is not set
1403# CONFIG_RTC_DRV_RS5C372 is not set
1404CONFIG_RTC_DRV_SA1100=y
1405# CONFIG_RTC_DRV_TEST is not set
1406
1407#
1408# File systems
1409#
1410CONFIG_EXT2_FS=y
1411# CONFIG_EXT2_FS_XATTR is not set
1412# CONFIG_EXT2_FS_XIP is not set
1413CONFIG_EXT3_FS=m
1414# CONFIG_REISERFS_FS is not set
1415# CONFIG_JFS_FS is not set
1416# CONFIG_FS_POSIX_ACL is not set
1417# CONFIG_XFS_FS is not set
1418# CONFIG_OCFS2_FS is not set
1419# CONFIG_MINIX_FS is not set
1420# CONFIG_ROMFS_FS is not set
1421CONFIG_INOTIFY=y
1422# CONFIG_QUOTA is not set
1423CONFIG_DNOTIFY=y
1424# CONFIG_AUTOFS_FS is not set
1425# CONFIG_AUTOFS4_FS is not set
1426CONFIG_FUSE_FS=m
1427
1428#
1429# CD-ROM/DVD Filesystems
1430#
1431CONFIG_ISO9660_FS=m
1432# CONFIG_UDF_FS is not set
1433
1434#
1435# DOS/FAT/NT Filesystems
1436#
1437CONFIG_FAT_FS=m
1438CONFIG_MSDOS_FS=m
1439CONFIG_VFAT_FS=m
1440CONFIG_FAT_DEFAULT_CODEPAGE=437
1441CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1442# CONFIG_NTFS_FS is not set
1443
1444#
1445# Pseudo filesystems
1446#
1447CONFIG_PROC_FS=y
1448CONFIG_SYSFS=y
1449CONFIG_TMPFS=y
1450# CONFIG_HUGETLB_PAGE is not set
1451# CONFIG_RAMFS is not set
1452# CONFIG_RELAYFS_FS is not set
1453# CONFIG_CONFIGFS_FS is not set
1454
1455#
1456# Miscellaneous filesystems
1457#
1458# CONFIG_ADFS_FS is not set
1459# CONFIG_AFFS_FS is not set
1460# CONFIG_HFS_FS is not set
1461# CONFIG_HFSPLUS_FS is not set
1462# CONFIG_BEFS_FS is not set
1463# CONFIG_BFS_FS is not set
1464# CONFIG_EFS_FS is not set
1465# CONFIG_JFFS_FS is not set
1466CONFIG_JFFS2_FS=y
1467CONFIG_JFFS2_FS_DEBUG=0
1468CONFIG_JFFS2_FS_WRITEBUFFER=y
1469CONFIG_JFFS2_SUMMARY=y
1470CONFIG_JFFS2_COMPRESSION_OPTIONS=y
1471CONFIG_JFFS2_ZLIB=y
1472CONFIG_JFFS2_RTIME=y
1473CONFIG_JFFS2_RUBIN=y
1474# CONFIG_JFFS2_CMODE_NONE is not set
1475CONFIG_JFFS2_CMODE_PRIORITY=y
1476# CONFIG_JFFS2_CMODE_SIZE is not set
1477CONFIG_CRAMFS=m
1478CONFIG_SQUASHFS=m
1479# CONFIG_SQUASHFS_EMBEDDED is not set
1480CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1481# CONFIG_SQUASHFS_VMALLOC is not set
1482# CONFIG_VXFS_FS is not set
1483# CONFIG_HPFS_FS is not set
1484# CONFIG_QNX4FS_FS is not set
1485# CONFIG_SYSV_FS is not set
1486# CONFIG_UFS_FS is not set
1487
1488#
1489# Network File Systems
1490#
1491CONFIG_NFS_FS=m
1492CONFIG_NFS_V3=y
1493# CONFIG_NFS_V3_ACL is not set
1494CONFIG_NFS_V4=y
1495# CONFIG_NFS_DIRECTIO is not set
1496# CONFIG_NFSD is not set
1497CONFIG_LOCKD=m
1498CONFIG_LOCKD_V4=y
1499CONFIG_NFS_COMMON=y
1500CONFIG_SUNRPC=m
1501CONFIG_SUNRPC_GSS=m
1502CONFIG_RPCSEC_GSS_KRB5=m
1503# CONFIG_RPCSEC_GSS_SPKM3 is not set
1504CONFIG_SMB_FS=m
1505CONFIG_SMB_NLS_DEFAULT=y
1506CONFIG_SMB_NLS_REMOTE="cp437"
1507CONFIG_CIFS=m
1508# CONFIG_CIFS_STATS is not set
1509# CONFIG_CIFS_XATTR is not set
1510# CONFIG_CIFS_EXPERIMENTAL is not set
1511# CONFIG_NCP_FS is not set
1512# CONFIG_CODA_FS is not set
1513# CONFIG_AFS_FS is not set
1514# CONFIG_9P_FS is not set
1515
1516#
1517# Partition Types
1518#
1519CONFIG_PARTITION_ADVANCED=y
1520# CONFIG_ACORN_PARTITION is not set
1521# CONFIG_OSF_PARTITION is not set
1522# CONFIG_AMIGA_PARTITION is not set
1523# CONFIG_ATARI_PARTITION is not set
1524# CONFIG_MAC_PARTITION is not set
1525CONFIG_MSDOS_PARTITION=y
1526# CONFIG_BSD_DISKLABEL is not set
1527# CONFIG_MINIX_SUBPARTITION is not set
1528# CONFIG_SOLARIS_X86_PARTITION is not set
1529# CONFIG_UNIXWARE_DISKLABEL is not set
1530# CONFIG_LDM_PARTITION is not set
1531# CONFIG_SGI_PARTITION is not set
1532# CONFIG_ULTRIX_PARTITION is not set
1533# CONFIG_SUN_PARTITION is not set
1534# CONFIG_KARMA_PARTITION is not set
1535# CONFIG_EFI_PARTITION is not set
1536
1537#
1538# Native Language Support
1539#
1540CONFIG_NLS=m
1541CONFIG_NLS_DEFAULT="cp437"
1542CONFIG_NLS_CODEPAGE_437=m
1543CONFIG_NLS_CODEPAGE_737=m
1544CONFIG_NLS_CODEPAGE_775=m
1545CONFIG_NLS_CODEPAGE_850=m
1546CONFIG_NLS_CODEPAGE_852=m
1547CONFIG_NLS_CODEPAGE_855=m
1548CONFIG_NLS_CODEPAGE_857=m
1549CONFIG_NLS_CODEPAGE_860=m
1550CONFIG_NLS_CODEPAGE_861=m
1551CONFIG_NLS_CODEPAGE_862=m
1552CONFIG_NLS_CODEPAGE_863=m
1553CONFIG_NLS_CODEPAGE_864=m
1554CONFIG_NLS_CODEPAGE_865=m
1555CONFIG_NLS_CODEPAGE_866=m
1556CONFIG_NLS_CODEPAGE_869=m
1557CONFIG_NLS_CODEPAGE_936=m
1558CONFIG_NLS_CODEPAGE_950=m
1559CONFIG_NLS_CODEPAGE_932=m
1560CONFIG_NLS_CODEPAGE_949=m
1561CONFIG_NLS_CODEPAGE_874=m
1562CONFIG_NLS_ISO8859_8=m
1563CONFIG_NLS_CODEPAGE_1250=m
1564CONFIG_NLS_CODEPAGE_1251=m
1565CONFIG_NLS_ASCII=m
1566CONFIG_NLS_ISO8859_1=m
1567CONFIG_NLS_ISO8859_2=m
1568CONFIG_NLS_ISO8859_3=m
1569CONFIG_NLS_ISO8859_4=m
1570CONFIG_NLS_ISO8859_5=m
1571CONFIG_NLS_ISO8859_6=m
1572CONFIG_NLS_ISO8859_7=m
1573CONFIG_NLS_ISO8859_9=m
1574CONFIG_NLS_ISO8859_13=m
1575CONFIG_NLS_ISO8859_14=m
1576CONFIG_NLS_ISO8859_15=m
1577CONFIG_NLS_KOI8_R=m
1578CONFIG_NLS_KOI8_U=m
1579CONFIG_NLS_UTF8=m
1580
1581#
1582# Profiling support
1583#
1584# CONFIG_PROFILING is not set
1585
1586#
1587# Kernel hacking
1588#
1589# CONFIG_PRINTK_TIME is not set
1590CONFIG_MAGIC_SYSRQ=y
1591CONFIG_DEBUG_KERNEL=y
1592CONFIG_LOG_BUF_SHIFT=14
1593CONFIG_DETECT_SOFTLOCKUP=y
1594CONFIG_TIMER_STATS=y
1595# CONFIG_SCHED_DEBUG is not set
1596# CONFIG_SCHEDSTATS is not set
1597# CONFIG_DEBUG_SLAB is not set
1598# CONFIG_DEBUG_PREEMPT is not set
1599# CONFIG_DEBUG_MUTEXES is not set
1600# CONFIG_DEBUG_SPINLOCK is not set
1601# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1602# CONFIG_DEBUG_KOBJECT is not set
1603# CONFIG_DEBUG_BUGVERBOSE is not set
1604# CONFIG_DEBUG_INFO is not set
1605# CONFIG_DEBUG_FS is not set
1606# CONFIG_DEBUG_VM is not set
1607CONFIG_FRAME_POINTER=y
1608# CONFIG_FORCED_INLINING is not set
1609# CONFIG_RCU_TORTURE_TEST is not set
1610# CONFIG_DEBUG_USER is not set
1611# CONFIG_DEBUG_WAITQ is not set
1612CONFIG_DEBUG_ERRORS=y
1613# CONFIG_DEBUG_LL is not set
1614
1615#
1616# Security options
1617#
1618# CONFIG_KEYS is not set
1619# CONFIG_SECURITY is not set
1620
1621#
1622# Cryptographic options
1623#
1624CONFIG_CRYPTO=y
1625CONFIG_CRYPTO_ALGAPI=m
1626CONFIG_CRYPTO_HMAC=m
1627CONFIG_CRYPTO_NULL=m
1628CONFIG_CRYPTO_MD4=m
1629CONFIG_CRYPTO_MD5=m
1630CONFIG_CRYPTO_SHA1=m
1631CONFIG_CRYPTO_SHA256=m
1632CONFIG_CRYPTO_SHA512=m
1633CONFIG_CRYPTO_WP512=m
1634# CONFIG_CRYPTO_TGR192 is not set
1635CONFIG_CRYPTO_DES=m
1636CONFIG_CRYPTO_BLOWFISH=m
1637CONFIG_CRYPTO_TWOFISH=m
1638CONFIG_CRYPTO_SERPENT=m
1639CONFIG_CRYPTO_AES=m
1640CONFIG_CRYPTO_CAST5=m
1641CONFIG_CRYPTO_CAST6=m
1642CONFIG_CRYPTO_TEA=m
1643CONFIG_CRYPTO_ARC4=m
1644CONFIG_CRYPTO_KHAZAD=m
1645CONFIG_CRYPTO_ANUBIS=m
1646CONFIG_CRYPTO_DEFLATE=m
1647CONFIG_CRYPTO_MICHAEL_MIC=m
1648CONFIG_CRYPTO_CRC32C=m
1649CONFIG_CRYPTO_TEST=m
1650
1651#
1652# Hardware crypto devices
1653#
1654
1655#
1656# Library routines
1657#
1658CONFIG_CRC_CCITT=m
1659# CONFIG_CRC16 is not set
1660CONFIG_CRC32=y
1661CONFIG_LIBCRC32C=m
1662CONFIG_ZLIB_INFLATE=y
1663CONFIG_ZLIB_DEFLATE=y
1664CONFIG_GENERIC_ALLOCATOR=y
1665# CONFIG_SHARPSL_RC is not set
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch
index 769674c935..1ccebddc8d 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni-acx.patch
@@ -26,10 +26,10 @@
26 drivers/net/wireless/acx/wlan_mgmt.h | 582 ++ 26 drivers/net/wireless/acx/wlan_mgmt.h | 582 ++
27 25 files changed, 33355 insertions(+) 27 25 files changed, 33355 insertions(+)
28 28
29Index: linux-2.6.22/drivers/net/wireless/acx/acx_config.h 29Index: linux-2.6.23/drivers/net/wireless/acx/acx_config.h
30=================================================================== 30===================================================================
31--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32+++ linux-2.6.22/drivers/net/wireless/acx/acx_config.h 2007-08-23 18:46:40.000000000 +0200 32+++ linux-2.6.23/drivers/net/wireless/acx/acx_config.h 2008-01-20 21:13:40.000000000 +0000
33@@ -0,0 +1,50 @@ 33@@ -0,0 +1,50 @@
34+#define ACX_RELEASE "v0.3.36" 34+#define ACX_RELEASE "v0.3.36"
35+ 35+
@@ -81,10 +81,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_config.h
81+/* 0 - normal mode */ 81+/* 0 - normal mode */
82+/* 1 - development/debug: probe for IEs on modprobe */ 82+/* 1 - development/debug: probe for IEs on modprobe */
83+#define CMD_DISCOVERY 0 83+#define CMD_DISCOVERY 0
84Index: linux-2.6.22/drivers/net/wireless/acx/acx_func.h 84Index: linux-2.6.23/drivers/net/wireless/acx/acx_func.h
85=================================================================== 85===================================================================
86--- /dev/null 1970-01-01 00:00:00.000000000 +0000 86--- /dev/null 1970-01-01 00:00:00.000000000 +0000
87+++ linux-2.6.22/drivers/net/wireless/acx/acx_func.h 2007-08-23 18:34:19.000000000 +0200 87+++ linux-2.6.23/drivers/net/wireless/acx/acx_func.h 2008-01-20 21:13:40.000000000 +0000
88@@ -0,0 +1,710 @@ 88@@ -0,0 +1,710 @@
89+/*********************************************************************** 89+/***********************************************************************
90+** Copyright (C) 2003 ACX100 Open Source Project 90+** Copyright (C) 2003 ACX100 Open Source Project
@@ -796,10 +796,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_func.h
796+#endif 796+#endif
797+int __init acx_cs_init(void); 797+int __init acx_cs_init(void);
798+void __exit acx_cs_cleanup(void); 798+void __exit acx_cs_cleanup(void);
799Index: linux-2.6.22/drivers/net/wireless/acx/acx.h 799Index: linux-2.6.23/drivers/net/wireless/acx/acx.h
800=================================================================== 800===================================================================
801--- /dev/null 1970-01-01 00:00:00.000000000 +0000 801--- /dev/null 1970-01-01 00:00:00.000000000 +0000
802+++ linux-2.6.22/drivers/net/wireless/acx/acx.h 2007-08-23 18:34:19.000000000 +0200 802+++ linux-2.6.23/drivers/net/wireless/acx/acx.h 2008-01-20 21:13:40.000000000 +0000
803@@ -0,0 +1,14 @@ 803@@ -0,0 +1,14 @@
804+#if defined(CONFIG_ACX_MEM) && !defined(ACX_MEM) 804+#if defined(CONFIG_ACX_MEM) && !defined(ACX_MEM)
805+#define ACX_MEM 805+#define ACX_MEM
@@ -815,10 +815,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx.h
815+#include "wlan_mgmt.h" 815+#include "wlan_mgmt.h"
816+#include "acx_struct.h" 816+#include "acx_struct.h"
817+#include "acx_func.h" 817+#include "acx_func.h"
818Index: linux-2.6.22/drivers/net/wireless/acx/acx_hw.h 818Index: linux-2.6.23/drivers/net/wireless/acx/acx_hw.h
819=================================================================== 819===================================================================
820--- /dev/null 1970-01-01 00:00:00.000000000 +0000 820--- /dev/null 1970-01-01 00:00:00.000000000 +0000
821+++ linux-2.6.22/drivers/net/wireless/acx/acx_hw.h 2007-08-23 18:34:19.000000000 +0200 821+++ linux-2.6.23/drivers/net/wireless/acx/acx_hw.h 2008-01-20 21:13:40.000000000 +0000
822@@ -0,0 +1,18 @@ 822@@ -0,0 +1,18 @@
823+/* 823+/*
824+ * Interface for ACX slave memory driver 824+ * Interface for ACX slave memory driver
@@ -838,10 +838,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_hw.h
838+}; 838+};
839+ 839+
840+#endif /* _ACX_HW_H */ 840+#endif /* _ACX_HW_H */
841Index: linux-2.6.22/drivers/net/wireless/acx/acx_struct.h 841Index: linux-2.6.23/drivers/net/wireless/acx/acx_struct.h
842=================================================================== 842===================================================================
843--- /dev/null 1970-01-01 00:00:00.000000000 +0000 843--- /dev/null 1970-01-01 00:00:00.000000000 +0000
844+++ linux-2.6.22/drivers/net/wireless/acx/acx_struct.h 2007-08-23 18:34:19.000000000 +0200 844+++ linux-2.6.23/drivers/net/wireless/acx/acx_struct.h 2008-01-20 21:13:40.000000000 +0000
845@@ -0,0 +1,2114 @@ 845@@ -0,0 +1,2114 @@
846+/*********************************************************************** 846+/***********************************************************************
847+** Copyright (C) 2003 ACX100 Open Source Project 847+** Copyright (C) 2003 ACX100 Open Source Project
@@ -2957,10 +2957,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_struct.h
2957+}; 2957+};
2958+ 2958+
2959+extern const struct iw_handler_def acx_ioctl_handler_def; 2959+extern const struct iw_handler_def acx_ioctl_handler_def;
2960Index: linux-2.6.22/drivers/net/wireless/acx/common.c 2960Index: linux-2.6.23/drivers/net/wireless/acx/common.c
2961=================================================================== 2961===================================================================
2962--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2962--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2963+++ linux-2.6.22/drivers/net/wireless/acx/common.c 2007-08-23 18:34:19.000000000 +0200 2963+++ linux-2.6.23/drivers/net/wireless/acx/common.c 2008-01-20 21:13:40.000000000 +0000
2964@@ -0,0 +1,7388 @@ 2964@@ -0,0 +1,7388 @@
2965+/*********************************************************************** 2965+/***********************************************************************
2966+** Copyright (C) 2003 ACX100 Open Source Project 2966+** Copyright (C) 2003 ACX100 Open Source Project
@@ -10350,10 +10350,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/common.c
10350+ 10350+
10351+module_init(acx_e_init_module) 10351+module_init(acx_e_init_module)
10352+module_exit(acx_e_cleanup_module) 10352+module_exit(acx_e_cleanup_module)
10353Index: linux-2.6.22/drivers/net/wireless/acx/conv.c 10353Index: linux-2.6.23/drivers/net/wireless/acx/conv.c
10354=================================================================== 10354===================================================================
10355--- /dev/null 1970-01-01 00:00:00.000000000 +0000 10355--- /dev/null 1970-01-01 00:00:00.000000000 +0000
10356+++ linux-2.6.22/drivers/net/wireless/acx/conv.c 2007-08-23 18:34:19.000000000 +0200 10356+++ linux-2.6.23/drivers/net/wireless/acx/conv.c 2008-01-20 21:13:40.000000000 +0000
10357@@ -0,0 +1,504 @@ 10357@@ -0,0 +1,504 @@
10358+/*********************************************************************** 10358+/***********************************************************************
10359+** Copyright (C) 2003 ACX100 Open Source Project 10359+** Copyright (C) 2003 ACX100 Open Source Project
@@ -10859,10 +10859,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/conv.c
10859+ FN_EXIT1((int)NULL); 10859+ FN_EXIT1((int)NULL);
10860+ return NULL; 10860+ return NULL;
10861+} 10861+}
10862Index: linux-2.6.22/drivers/net/wireless/acx/cs.c 10862Index: linux-2.6.23/drivers/net/wireless/acx/cs.c
10863=================================================================== 10863===================================================================
10864--- /dev/null 1970-01-01 00:00:00.000000000 +0000 10864--- /dev/null 1970-01-01 00:00:00.000000000 +0000
10865+++ linux-2.6.22/drivers/net/wireless/acx/cs.c 2007-08-23 18:34:19.000000000 +0200 10865+++ linux-2.6.23/drivers/net/wireless/acx/cs.c 2008-01-20 21:13:40.000000000 +0000
10866@@ -0,0 +1,5703 @@ 10866@@ -0,0 +1,5703 @@
10867+/*********************************************************************** 10867+/***********************************************************************
10868+** Copyright (C) 2003 ACX100 Open Source Project 10868+** Copyright (C) 2003 ACX100 Open Source Project
@@ -16567,10 +16567,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/cs.c
16567+MODULE_DESCRIPTION( "ACX Cardbus Driver" ); 16567+MODULE_DESCRIPTION( "ACX Cardbus Driver" );
16568+MODULE_LICENSE( "GPL" ); 16568+MODULE_LICENSE( "GPL" );
16569+ 16569+
16570Index: linux-2.6.22/drivers/net/wireless/acx/htcsable_acx.c 16570Index: linux-2.6.23/drivers/net/wireless/acx/htcsable_acx.c
16571=================================================================== 16571===================================================================
16572--- /dev/null 1970-01-01 00:00:00.000000000 +0000 16572--- /dev/null 1970-01-01 00:00:00.000000000 +0000
16573+++ linux-2.6.22/drivers/net/wireless/acx/htcsable_acx.c 2007-08-23 18:34:19.000000000 +0200 16573+++ linux-2.6.23/drivers/net/wireless/acx/htcsable_acx.c 2008-01-20 21:13:40.000000000 +0000
16574@@ -0,0 +1,118 @@ 16574@@ -0,0 +1,118 @@
16575+/* 16575+/*
16576+ * WLAN (TI TNETW1100B) support in the HTC Sable 16576+ * WLAN (TI TNETW1100B) support in the HTC Sable
@@ -16690,10 +16690,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/htcsable_acx.c
16690+MODULE_DESCRIPTION( "WLAN driver for HTC Sable" ); 16690+MODULE_DESCRIPTION( "WLAN driver for HTC Sable" );
16691+MODULE_LICENSE( "GPL" ); 16691+MODULE_LICENSE( "GPL" );
16692+ 16692+
16693Index: linux-2.6.22/drivers/net/wireless/acx/htcuniversal_acx.c 16693Index: linux-2.6.23/drivers/net/wireless/acx/htcuniversal_acx.c
16694=================================================================== 16694===================================================================
16695--- /dev/null 1970-01-01 00:00:00.000000000 +0000 16695--- /dev/null 1970-01-01 00:00:00.000000000 +0000
16696+++ linux-2.6.22/drivers/net/wireless/acx/htcuniversal_acx.c 2007-08-23 18:34:19.000000000 +0200 16696+++ linux-2.6.23/drivers/net/wireless/acx/htcuniversal_acx.c 2008-01-20 21:13:40.000000000 +0000
16697@@ -0,0 +1,108 @@ 16697@@ -0,0 +1,108 @@
16698+/* 16698+/*
16699+ * WLAN (TI TNETW1100B) support in the HTC Universal 16699+ * WLAN (TI TNETW1100B) support in the HTC Universal
@@ -16803,10 +16803,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/htcuniversal_acx.c
16803+MODULE_DESCRIPTION( "WLAN driver for HTC Universal" ); 16803+MODULE_DESCRIPTION( "WLAN driver for HTC Universal" );
16804+MODULE_LICENSE( "GPL" ); 16804+MODULE_LICENSE( "GPL" );
16805+ 16805+
16806Index: linux-2.6.22/drivers/net/wireless/acx/hx4700_acx.c 16806Index: linux-2.6.23/drivers/net/wireless/acx/hx4700_acx.c
16807=================================================================== 16807===================================================================
16808--- /dev/null 1970-01-01 00:00:00.000000000 +0000 16808--- /dev/null 1970-01-01 00:00:00.000000000 +0000
16809+++ linux-2.6.22/drivers/net/wireless/acx/hx4700_acx.c 2007-08-23 18:34:19.000000000 +0200 16809+++ linux-2.6.23/drivers/net/wireless/acx/hx4700_acx.c 2008-01-20 21:13:40.000000000 +0000
16810@@ -0,0 +1,108 @@ 16810@@ -0,0 +1,108 @@
16811+/* 16811+/*
16812+ * WLAN (TI TNETW1100B) support in the hx470x. 16812+ * WLAN (TI TNETW1100B) support in the hx470x.
@@ -16916,10 +16916,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/hx4700_acx.c
16916+MODULE_DESCRIPTION( "WLAN driver for iPAQ hx4700" ); 16916+MODULE_DESCRIPTION( "WLAN driver for iPAQ hx4700" );
16917+MODULE_LICENSE( "GPL" ); 16917+MODULE_LICENSE( "GPL" );
16918+ 16918+
16919Index: linux-2.6.22/drivers/net/wireless/acx/ioctl.c 16919Index: linux-2.6.23/drivers/net/wireless/acx/ioctl.c
16920=================================================================== 16920===================================================================
16921--- /dev/null 1970-01-01 00:00:00.000000000 +0000 16921--- /dev/null 1970-01-01 00:00:00.000000000 +0000
16922+++ linux-2.6.22/drivers/net/wireless/acx/ioctl.c 2007-08-23 18:34:19.000000000 +0200 16922+++ linux-2.6.23/drivers/net/wireless/acx/ioctl.c 2008-01-20 21:13:40.000000000 +0000
16923@@ -0,0 +1,2748 @@ 16923@@ -0,0 +1,2748 @@
16924+/*********************************************************************** 16924+/***********************************************************************
16925+** Copyright (C) 2003 ACX100 Open Source Project 16925+** Copyright (C) 2003 ACX100 Open Source Project
@@ -19669,10 +19669,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/ioctl.c
19669+ .get_wireless_stats = acx_e_get_wireless_stats 19669+ .get_wireless_stats = acx_e_get_wireless_stats
19670+#endif /* IW > 5 */ 19670+#endif /* IW > 5 */
19671+}; 19671+};
19672Index: linux-2.6.22/drivers/net/wireless/acx/Kconfig 19672Index: linux-2.6.23/drivers/net/wireless/acx/Kconfig
19673=================================================================== 19673===================================================================
19674--- /dev/null 1970-01-01 00:00:00.000000000 +0000 19674--- /dev/null 1970-01-01 00:00:00.000000000 +0000
19675+++ linux-2.6.22/drivers/net/wireless/acx/Kconfig 2007-08-23 18:34:19.000000000 +0200 19675+++ linux-2.6.23/drivers/net/wireless/acx/Kconfig 2008-01-20 21:13:40.000000000 +0000
19676@@ -0,0 +1,113 @@ 19676@@ -0,0 +1,113 @@
19677+config ACX 19677+config ACX
19678+ tristate "TI acx100/acx111 802.11b/g wireless chipsets" 19678+ tristate "TI acx100/acx111 802.11b/g wireless chipsets"
@@ -19787,10 +19787,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/Kconfig
19787+ ---help--- 19787+ ---help---
19788+ Include memory interface support in acx for the IPAQ RX3000. 19788+ Include memory interface support in acx for the IPAQ RX3000.
19789+ 19789+
19790Index: linux-2.6.22/drivers/net/wireless/acx/Makefile 19790Index: linux-2.6.23/drivers/net/wireless/acx/Makefile
19791=================================================================== 19791===================================================================
19792--- /dev/null 1970-01-01 00:00:00.000000000 +0000 19792--- /dev/null 1970-01-01 00:00:00.000000000 +0000
19793+++ linux-2.6.22/drivers/net/wireless/acx/Makefile 2007-08-23 18:34:19.000000000 +0200 19793+++ linux-2.6.23/drivers/net/wireless/acx/Makefile 2008-01-20 21:13:40.000000000 +0000
19794@@ -0,0 +1,21 @@ 19794@@ -0,0 +1,21 @@
19795+#obj-m += acx.o 19795+#obj-m += acx.o
19796+ 19796+
@@ -19813,10 +19813,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/Makefile
19813+acx-obj-$(CONFIG_ACX_CS) += cs.o 19813+acx-obj-$(CONFIG_ACX_CS) += cs.o
19814+# 19814+#
19815+acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y) 19815+acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
19816Index: linux-2.6.22/drivers/net/wireless/acx/mem.c 19816Index: linux-2.6.23/drivers/net/wireless/acx/mem.c
19817=================================================================== 19817===================================================================
19818--- /dev/null 1970-01-01 00:00:00.000000000 +0000 19818--- /dev/null 1970-01-01 00:00:00.000000000 +0000
19819+++ linux-2.6.22/drivers/net/wireless/acx/mem.c 2007-08-23 18:34:19.000000000 +0200 19819+++ linux-2.6.23/drivers/net/wireless/acx/mem.c 2008-01-20 21:13:40.000000000 +0000
19820@@ -0,0 +1,5363 @@ 19820@@ -0,0 +1,5363 @@
19821+/*********************************************************************** 19821+/***********************************************************************
19822+** Copyright (C) 2003 ACX100 Open Source Project 19822+** Copyright (C) 2003 ACX100 Open Source Project
@@ -25181,10 +25181,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/mem.c
25181+MODULE_DESCRIPTION( "ACX Slave Memory Driver" ); 25181+MODULE_DESCRIPTION( "ACX Slave Memory Driver" );
25182+MODULE_LICENSE( "GPL" ); 25182+MODULE_LICENSE( "GPL" );
25183+ 25183+
25184Index: linux-2.6.22/drivers/net/wireless/acx/pci.c 25184Index: linux-2.6.23/drivers/net/wireless/acx/pci.c
25185=================================================================== 25185===================================================================
25186--- /dev/null 1970-01-01 00:00:00.000000000 +0000 25186--- /dev/null 1970-01-01 00:00:00.000000000 +0000
25187+++ linux-2.6.22/drivers/net/wireless/acx/pci.c 2007-08-23 18:34:19.000000000 +0200 25187+++ linux-2.6.23/drivers/net/wireless/acx/pci.c 2008-01-20 21:13:40.000000000 +0000
25188@@ -0,0 +1,4234 @@ 25188@@ -0,0 +1,4234 @@
25189+/*********************************************************************** 25189+/***********************************************************************
25190+** Copyright (C) 2003 ACX100 Open Source Project 25190+** Copyright (C) 2003 ACX100 Open Source Project
@@ -29420,10 +29420,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/pci.c
29420+ 29420+
29421+ FN_EXIT0; 29421+ FN_EXIT0;
29422+} 29422+}
29423Index: linux-2.6.22/drivers/net/wireless/acx/rx3000_acx.c 29423Index: linux-2.6.23/drivers/net/wireless/acx/rx3000_acx.c
29424=================================================================== 29424===================================================================
29425--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29425--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29426+++ linux-2.6.22/drivers/net/wireless/acx/rx3000_acx.c 2007-08-23 18:34:19.000000000 +0200 29426+++ linux-2.6.23/drivers/net/wireless/acx/rx3000_acx.c 2008-01-20 21:13:40.000000000 +0000
29427@@ -0,0 +1,110 @@ 29427@@ -0,0 +1,110 @@
29428+/* 29428+/*
29429+ * WLAN (TI TNETW1100B) support in the HP iPAQ RX3000 29429+ * WLAN (TI TNETW1100B) support in the HP iPAQ RX3000
@@ -29535,10 +29535,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/rx3000_acx.c
29535+MODULE_DESCRIPTION("WLAN driver for HP iPAQ RX3000"); 29535+MODULE_DESCRIPTION("WLAN driver for HP iPAQ RX3000");
29536+MODULE_LICENSE("GPL"); 29536+MODULE_LICENSE("GPL");
29537+ 29537+
29538Index: linux-2.6.22/drivers/net/wireless/acx/setrate.c 29538Index: linux-2.6.23/drivers/net/wireless/acx/setrate.c
29539=================================================================== 29539===================================================================
29540--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29540--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29541+++ linux-2.6.22/drivers/net/wireless/acx/setrate.c 2007-08-23 18:34:19.000000000 +0200 29541+++ linux-2.6.23/drivers/net/wireless/acx/setrate.c 2008-01-20 21:13:40.000000000 +0000
29542@@ -0,0 +1,213 @@ 29542@@ -0,0 +1,213 @@
29543+/* TODO: stop #including, move into wireless.c 29543+/* TODO: stop #including, move into wireless.c
29544+ * until then, keep in sync copies in prism54/ and acx/ dirs 29544+ * until then, keep in sync copies in prism54/ and acx/ dirs
@@ -29753,10 +29753,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/setrate.c
29753+ return -EINVAL; 29753+ return -EINVAL;
29754+ return 0; 29754+ return 0;
29755+} 29755+}
29756Index: linux-2.6.22/drivers/net/wireless/acx/usb.c 29756Index: linux-2.6.23/drivers/net/wireless/acx/usb.c
29757=================================================================== 29757===================================================================
29758--- /dev/null 1970-01-01 00:00:00.000000000 +0000 29758--- /dev/null 1970-01-01 00:00:00.000000000 +0000
29759+++ linux-2.6.22/drivers/net/wireless/acx/usb.c 2007-08-23 18:34:19.000000000 +0200 29759+++ linux-2.6.23/drivers/net/wireless/acx/usb.c 2008-01-20 21:13:40.000000000 +0000
29760@@ -0,0 +1,1922 @@ 29760@@ -0,0 +1,1922 @@
29761+/*********************************************************************** 29761+/***********************************************************************
29762+** Copyright (C) 2003 ACX100 Open Source Project 29762+** Copyright (C) 2003 ACX100 Open Source Project
@@ -31680,10 +31680,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/usb.c
31680+#endif /* UNUSED */ 31680+#endif /* UNUSED */
31681+ 31681+
31682+#endif /* ACX_DEBUG */ 31682+#endif /* ACX_DEBUG */
31683Index: linux-2.6.22/drivers/net/wireless/acx/wlan.c 31683Index: linux-2.6.23/drivers/net/wireless/acx/wlan.c
31684=================================================================== 31684===================================================================
31685--- /dev/null 1970-01-01 00:00:00.000000000 +0000 31685--- /dev/null 1970-01-01 00:00:00.000000000 +0000
31686+++ linux-2.6.22/drivers/net/wireless/acx/wlan.c 2007-08-23 18:34:19.000000000 +0200 31686+++ linux-2.6.23/drivers/net/wireless/acx/wlan.c 2008-01-20 21:13:40.000000000 +0000
31687@@ -0,0 +1,424 @@ 31687@@ -0,0 +1,424 @@
31688+/*********************************************************************** 31688+/***********************************************************************
31689+** Copyright (C) 2003 ACX100 Open Source Project 31689+** Copyright (C) 2003 ACX100 Open Source Project
@@ -32109,10 +32109,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan.c
32109+ 32109+
32110+ /*-- Information elements */ 32110+ /*-- Information elements */
32111+} 32111+}
32112Index: linux-2.6.22/drivers/net/wireless/acx/wlan_compat.h 32112Index: linux-2.6.23/drivers/net/wireless/acx/wlan_compat.h
32113=================================================================== 32113===================================================================
32114--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32114--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32115+++ linux-2.6.22/drivers/net/wireless/acx/wlan_compat.h 2007-08-23 18:34:19.000000000 +0200 32115+++ linux-2.6.23/drivers/net/wireless/acx/wlan_compat.h 2008-01-20 21:13:40.000000000 +0000
32116@@ -0,0 +1,260 @@ 32116@@ -0,0 +1,260 @@
32117+/*********************************************************************** 32117+/***********************************************************************
32118+** Copyright (C) 2003 ACX100 Open Source Project 32118+** Copyright (C) 2003 ACX100 Open Source Project
@@ -32374,10 +32374,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan_compat.h
32374+ u8 oui[WLAN_IEEE_OUI_LEN]; 32374+ u8 oui[WLAN_IEEE_OUI_LEN];
32375+ u16 type; 32375+ u16 type;
32376+} WLAN_PACKED wlan_snap_t; 32376+} WLAN_PACKED wlan_snap_t;
32377Index: linux-2.6.22/drivers/net/wireless/acx/wlan_hdr.h 32377Index: linux-2.6.23/drivers/net/wireless/acx/wlan_hdr.h
32378=================================================================== 32378===================================================================
32379--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32379--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32380+++ linux-2.6.22/drivers/net/wireless/acx/wlan_hdr.h 2007-08-23 18:34:19.000000000 +0200 32380+++ linux-2.6.23/drivers/net/wireless/acx/wlan_hdr.h 2008-01-20 21:13:40.000000000 +0000
32381@@ -0,0 +1,497 @@ 32381@@ -0,0 +1,497 @@
32382+/*********************************************************************** 32382+/***********************************************************************
32383+** Copyright (C) 2003 ACX100 Open Source Project 32383+** Copyright (C) 2003 ACX100 Open Source Project
@@ -32876,10 +32876,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan_hdr.h
32876+#define WLANSNIFFFRM_rate 0x8041 32876+#define WLANSNIFFFRM_rate 0x8041
32877+#define WLANSNIFFFRM_istx 0x9041 32877+#define WLANSNIFFFRM_istx 0x9041
32878+#define WLANSNIFFFRM_frmlen 0xA041 32878+#define WLANSNIFFFRM_frmlen 0xA041
32879Index: linux-2.6.22/drivers/net/wireless/acx/wlan_mgmt.h 32879Index: linux-2.6.23/drivers/net/wireless/acx/wlan_mgmt.h
32880=================================================================== 32880===================================================================
32881--- /dev/null 1970-01-01 00:00:00.000000000 +0000 32881--- /dev/null 1970-01-01 00:00:00.000000000 +0000
32882+++ linux-2.6.22/drivers/net/wireless/acx/wlan_mgmt.h 2007-08-23 18:34:19.000000000 +0200 32882+++ linux-2.6.23/drivers/net/wireless/acx/wlan_mgmt.h 2008-01-20 21:13:40.000000000 +0000
32883@@ -0,0 +1,582 @@ 32883@@ -0,0 +1,582 @@
32884+/*********************************************************************** 32884+/***********************************************************************
32885+** Copyright (C) 2003 ACX100 Open Source Project 32885+** Copyright (C) 2003 ACX100 Open Source Project
@@ -33463,10 +33463,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan_mgmt.h
33463+ ie->virt_bm[0] = 0; 33463+ ie->virt_bm[0] = 0;
33464+ return p + len + 3 + 2; 33464+ return p + len + 3 + 2;
33465+} 33465+}
33466Index: linux-2.6.22/drivers/net/wireless/Kconfig 33466Index: linux-2.6.23/drivers/net/wireless/Kconfig
33467=================================================================== 33467===================================================================
33468--- linux-2.6.22.orig/drivers/net/wireless/Kconfig 2007-07-09 01:32:17.000000000 +0200 33468--- linux-2.6.23.orig/drivers/net/wireless/Kconfig 2008-01-20 21:13:17.000000000 +0000
33469+++ linux-2.6.22/drivers/net/wireless/Kconfig 2007-08-23 18:34:19.000000000 +0200 33469+++ linux-2.6.23/drivers/net/wireless/Kconfig 2008-01-20 21:15:12.000000000 +0000
33470@@ -5,6 +5,36 @@ 33470@@ -5,6 +5,36 @@
33471 menu "Wireless LAN" 33471 menu "Wireless LAN"
33472 depends on !S390 33472 depends on !S390
@@ -33504,18 +33504,19 @@ Index: linux-2.6.22/drivers/net/wireless/Kconfig
33504 config WLAN_PRE80211 33504 config WLAN_PRE80211
33505 bool "Wireless LAN (pre-802.11)" 33505 bool "Wireless LAN (pre-802.11)"
33506 depends on NETDEVICES 33506 depends on NETDEVICES
33507@@ -549,5 +579,6 @@ 33507@@ -650,6 +680,7 @@ config P54_PCI
33508
33509 source "drivers/net/wireless/iwlwifi/Kconfig"
33508 source "drivers/net/wireless/hostap/Kconfig" 33510 source "drivers/net/wireless/hostap/Kconfig"
33509 source "drivers/net/wireless/bcm43xx/Kconfig"
33510 source "drivers/net/wireless/zd1211rw/Kconfig"
33511+source "drivers/net/wireless/acx/Kconfig" 33511+source "drivers/net/wireless/acx/Kconfig"
33512 33512 source "drivers/net/wireless/bcm43xx/Kconfig"
33513 endmenu 33513 source "drivers/net/wireless/b43/Kconfig"
33514Index: linux-2.6.22/drivers/net/wireless/Makefile 33514 source "drivers/net/wireless/b43legacy/Kconfig"
33515Index: linux-2.6.23/drivers/net/wireless/Makefile
33515=================================================================== 33516===================================================================
33516--- linux-2.6.22.orig/drivers/net/wireless/Makefile 2007-07-09 01:32:17.000000000 +0200 33517--- linux-2.6.23.orig/drivers/net/wireless/Makefile 2008-01-20 21:13:17.000000000 +0000
33517+++ linux-2.6.22/drivers/net/wireless/Makefile 2007-08-23 18:34:19.000000000 +0200 33518+++ linux-2.6.23/drivers/net/wireless/Makefile 2008-01-20 21:13:40.000000000 +0000
33518@@ -34,6 +34,8 @@ 33519@@ -34,6 +34,8 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel
33519 33520
33520 obj-$(CONFIG_PRISM54) += prism54/ 33521 obj-$(CONFIG_PRISM54) += prism54/
33521 33522
@@ -33523,4 +33524,4 @@ Index: linux-2.6.22/drivers/net/wireless/Makefile
33523+ 33524+
33524 obj-$(CONFIG_HOSTAP) += hostap/ 33525 obj-$(CONFIG_HOSTAP) += hostap/
33525 obj-$(CONFIG_BCM43XX) += bcm43xx/ 33526 obj-$(CONFIG_BCM43XX) += bcm43xx/
33526 obj-$(CONFIG_ZD1211RW) += zd1211rw/ 33527 obj-$(CONFIG_B43) += b43/
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch
index 4d746749c5..f462650566 100644
--- a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc8/htcuni.patch
@@ -2,7 +2,6 @@
2 arch/arm/Kconfig | 2 2 arch/arm/Kconfig | 2
3 arch/arm/mach-pxa/Kconfig | 89 + 3 arch/arm/mach-pxa/Kconfig | 89 +
4 arch/arm/mach-pxa/Makefile | 1 4 arch/arm/mach-pxa/Makefile | 1
5 arch/arm/mach-pxa/corgi.c | 3
6 arch/arm/mach-pxa/generic.c | 13 5 arch/arm/mach-pxa/generic.c | 13
7 arch/arm/mach-pxa/htcuniversal/Makefile | 19 6 arch/arm/mach-pxa/htcuniversal/Makefile | 19
8 arch/arm/mach-pxa/htcuniversal/htcuniversal.c | 468 +++++ 7 arch/arm/mach-pxa/htcuniversal/htcuniversal.c | 468 +++++
@@ -22,9 +21,8 @@
22 arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c | 490 ++++++ 21 arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c | 490 ++++++
23 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c | 71 22 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c | 71
24 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h | 20 23 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h | 20
25 arch/arm/mach-pxa/spitz.c | 2
26 drivers/input/keyboard/Kconfig | 7 24 drivers/input/keyboard/Kconfig | 7
27 drivers/input/keyboard/Makefile | 2 25 drivers/input/keyboard/Makefile | 1
28 drivers/input/keyboard/asic3_keys.c | 131 + 26 drivers/input/keyboard/asic3_keys.c | 131 +
29 drivers/leds/Kconfig | 7 27 drivers/leds/Kconfig | 7
30 drivers/leds/Makefile | 1 28 drivers/leds/Makefile | 1
@@ -35,12 +33,10 @@
35 drivers/mfd/soc-core.c | 106 + 33 drivers/mfd/soc-core.c | 106 +
36 drivers/mfd/soc-core.h | 30 34 drivers/mfd/soc-core.h | 30
37 drivers/mmc/host/Kconfig | 6 35 drivers/mmc/host/Kconfig | 6
38 drivers/mmc/host/Makefile | 2 36 drivers/mmc/host/Makefile | 1
39 drivers/mmc/host/asic3_mmc.c | 900 +++++++++++ 37 drivers/mmc/host/asic3_mmc.c | 900 +++++++++++
40 drivers/mmc/host/asic3_mmc.h | 25 38 drivers/mmc/host/asic3_mmc.h | 25
41 drivers/serial/pxa.c | 22 39 drivers/serial/pxa.c | 22
42 drivers/video/backlight/Kconfig | 2
43 drivers/video/backlight/corgi_bl.c | 4
44 include/asm-arm/arch-pxa/clock.h | 27 40 include/asm-arm/arch-pxa/clock.h | 27
45 include/asm-arm/arch-pxa/htcuniversal-asic.h | 213 ++ 41 include/asm-arm/arch-pxa/htcuniversal-asic.h | 213 ++
46 include/asm-arm/arch-pxa/htcuniversal-gpio.h | 220 ++ 42 include/asm-arm/arch-pxa/htcuniversal-gpio.h | 220 ++
@@ -50,7 +46,6 @@
50 include/asm-arm/arch-pxa/pxa-pm_ll.h | 6 46 include/asm-arm/arch-pxa/pxa-pm_ll.h | 6
51 include/asm-arm/arch-pxa/pxa-regs.h | 2 47 include/asm-arm/arch-pxa/pxa-regs.h | 2
52 include/asm-arm/arch-pxa/serial.h | 78 48 include/asm-arm/arch-pxa/serial.h | 78
53 include/asm-arm/arch-pxa/sharpsl.h | 6
54 include/asm-arm/hardware/asic3_keys.h | 18 49 include/asm-arm/hardware/asic3_keys.h | 18
55 include/asm-arm/hardware/asic3_leds.h | 34 50 include/asm-arm/hardware/asic3_leds.h | 34
56 include/asm-arm/hardware/ipaq-asic3.h | 602 +++++++ 51 include/asm-arm/hardware/ipaq-asic3.h | 602 +++++++
@@ -60,12 +55,12 @@
60 include/linux/ioport.h | 1 55 include/linux/ioport.h | 1
61 include/linux/soc/asic3_base.h | 104 + 56 include/linux/soc/asic3_base.h | 104 +
62 include/linux/soc/tmio_mmc.h | 17 57 include/linux/soc/tmio_mmc.h | 17
63 61 files changed, 7475 insertions(+), 14 deletions(-) 58 56 files changed, 7469 insertions(+), 1 deletion(-)
64 59
65Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 60Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/Makefile
66=================================================================== 61===================================================================
67--- /dev/null 1970-01-01 00:00:00.000000000 +0000 62--- /dev/null 1970-01-01 00:00:00.000000000 +0000
68+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-09-11 12:53:37.000000000 +0200 63+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/Makefile 2008-01-20 18:59:46.000000000 +0000
69@@ -0,0 +1,19 @@ 64@@ -0,0 +1,19 @@
70+# 65+#
71+# Makefile for HTC Universal 66+# Makefile for HTC Universal
@@ -86,10 +81,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
86+obj-$(CONFIG_HTCUNIVERSAL_UDC) += htcuniversal_udc.o 81+obj-$(CONFIG_HTCUNIVERSAL_UDC) += htcuniversal_udc.o
87+ 82+
88+obj-$(CONFIG_HTCUNIVERSAL_AK4641) += htcuniversal_ak4641.o 83+obj-$(CONFIG_HTCUNIVERSAL_AK4641) += htcuniversal_ak4641.o
89Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 84Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
90=================================================================== 85===================================================================
91--- /dev/null 1970-01-01 00:00:00.000000000 +0000 86--- /dev/null 1970-01-01 00:00:00.000000000 +0000
92+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-09-11 12:53:37.000000000 +0200 87+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2008-01-20 18:59:46.000000000 +0000
93@@ -0,0 +1,468 @@ 88@@ -0,0 +1,468 @@
94+/* 89+/*
95+ * Hardware definitions for HTC Universal 90+ * Hardware definitions for HTC Universal
@@ -559,10 +554,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
559+ .init_machine = htcuniversal_init, 554+ .init_machine = htcuniversal_init,
560+ .timer = &pxa_timer, 555+ .timer = &pxa_timer,
561+MACHINE_END 556+MACHINE_END
562Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 557Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
563=================================================================== 558===================================================================
564--- /dev/null 1970-01-01 00:00:00.000000000 +0000 559--- /dev/null 1970-01-01 00:00:00.000000000 +0000
565+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-09-11 12:53:37.000000000 +0200 560+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2008-01-20 18:59:46.000000000 +0000
566@@ -0,0 +1,917 @@ 561@@ -0,0 +1,917 @@
567+/* 562+/*
568+ * Audio support for codec Asahi Kasei AK4641 563+ * Audio support for codec Asahi Kasei AK4641
@@ -1481,10 +1476,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
1481+MODULE_LICENSE("GPL"); 1476+MODULE_LICENSE("GPL");
1482+ 1477+
1483+/* end {{ Module }} */ 1478+/* end {{ Module }} */
1484Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 1479Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1485=================================================================== 1480===================================================================
1486--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1481--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1487+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-09-11 12:53:37.000000000 +0200 1482+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2008-01-20 18:59:46.000000000 +0000
1488@@ -0,0 +1,65 @@ 1483@@ -0,0 +1,65 @@
1489+/* 1484+/*
1490+ * Audio support for codec Asahi Kasei AK4641 1485+ * Audio support for codec Asahi Kasei AK4641
@@ -1551,10 +1546,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1551+void snd_ak4641_hp_detected(struct snd_ak4641 *ak, int detected); /* atomic context */ 1546+void snd_ak4641_hp_detected(struct snd_ak4641 *ak, int detected); /* atomic context */
1552+ 1547+
1553+#endif /* __SOUND_AK4641_H */ 1548+#endif /* __SOUND_AK4641_H */
1554Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 1549Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
1555=================================================================== 1550===================================================================
1556--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1551--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1557+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-09-11 12:53:37.000000000 +0200 1552+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2008-01-20 18:59:46.000000000 +0000
1558@@ -0,0 +1,143 @@ 1553@@ -0,0 +1,143 @@
1559+/* 1554+/*
1560+ * LEDs support for the HP iPaq hx4700 1555+ * LEDs support for the HP iPaq hx4700
@@ -1699,10 +1694,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
1699+MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>"); 1694+MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>");
1700+MODULE_DESCRIPTION("htcuniversal LEDs driver"); 1695+MODULE_DESCRIPTION("htcuniversal LEDs driver");
1701+MODULE_LICENSE("GPL"); 1696+MODULE_LICENSE("GPL");
1702Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 1697Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
1703=================================================================== 1698===================================================================
1704--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1699--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1705+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-09-11 12:53:37.000000000 +0200 1700+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2008-01-20 18:59:46.000000000 +0000
1706@@ -0,0 +1,61 @@ 1701@@ -0,0 +1,61 @@
1707+/* 1702+/*
1708+ * Use consistent with the GNU GPL is permitted, 1703+ * Use consistent with the GNU GPL is permitted,
@@ -1765,10 +1760,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
1765+MODULE_AUTHOR("Paul Sokolovsky <pmiscml@gmail.com>"); 1760+MODULE_AUTHOR("Paul Sokolovsky <pmiscml@gmail.com>");
1766+MODULE_DESCRIPTION("Backlight driver for HTC Universal"); 1761+MODULE_DESCRIPTION("Backlight driver for HTC Universal");
1767+MODULE_LICENSE("GPL"); 1762+MODULE_LICENSE("GPL");
1768Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 1763Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1769=================================================================== 1764===================================================================
1770--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1765--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1771+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-09-11 12:53:37.000000000 +0200 1766+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2008-01-20 18:59:46.000000000 +0000
1772@@ -0,0 +1,135 @@ 1767@@ -0,0 +1,135 @@
1773+/* Bluetooth interface driver for TI BRF6150 on HX4700 1768+/* Bluetooth interface driver for TI BRF6150 on HX4700
1774+ * 1769+ *
@@ -1905,10 +1900,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1905+ 1900+
1906+/* vim600: set noexpandtab sw=8 ts=8 :*/ 1901+/* vim600: set noexpandtab sw=8 ts=8 :*/
1907+ 1902+
1908Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 1903Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
1909=================================================================== 1904===================================================================
1910--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1905--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1911+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-09-11 12:53:37.000000000 +0200 1906+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2008-01-20 18:59:46.000000000 +0000
1912@@ -0,0 +1,17 @@ 1907@@ -0,0 +1,17 @@
1913+/* 1908+/*
1914+ * Bluetooth support file for calling bluetooth configuration functions 1909+ * Bluetooth support file for calling bluetooth configuration functions
@@ -1927,10 +1922,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
1927+ 1922+
1928+ 1923+
1929+#endif 1924+#endif
1930Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 1925Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
1931=================================================================== 1926===================================================================
1932--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1927--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1933+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-09-11 12:53:37.000000000 +0200 1928+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2008-01-20 18:59:46.000000000 +0000
1934@@ -0,0 +1,87 @@ 1929@@ -0,0 +1,87 @@
1935+/* 1930+/*
1936+ * Buttons driver for HTC Universal 1931+ * Buttons driver for HTC Universal
@@ -2019,10 +2014,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
2019+MODULE_AUTHOR ("Joshua Wise, Pawel Kolodziejski, Paul Sokolosvky"); 2014+MODULE_AUTHOR ("Joshua Wise, Pawel Kolodziejski, Paul Sokolosvky");
2020+MODULE_DESCRIPTION ("Buttons support for HTC Universal"); 2015+MODULE_DESCRIPTION ("Buttons support for HTC Universal");
2021+MODULE_LICENSE ("GPL"); 2016+MODULE_LICENSE ("GPL");
2022Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2017Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2023=================================================================== 2018===================================================================
2024--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2019--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2025+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-09-11 12:53:37.000000000 +0200 2020+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2008-01-20 18:59:46.000000000 +0000
2026@@ -0,0 +1,226 @@ 2021@@ -0,0 +1,226 @@
2027+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs) 2022+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs)
2028+ * 2023+ *
@@ -2250,10 +2245,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2250+MODULE_LICENSE("GPL"); 2245+MODULE_LICENSE("GPL");
2251+ 2246+
2252+/* vim600: set noexpandtab sw=8 ts=8 :*/ 2247+/* vim600: set noexpandtab sw=8 ts=8 :*/
2253Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2248Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
2254=================================================================== 2249===================================================================
2255--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2250--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2256+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-09-11 12:53:37.000000000 +0200 2251+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2008-01-20 18:59:46.000000000 +0000
2257@@ -0,0 +1,212 @@ 2252@@ -0,0 +1,212 @@
2258+/* 2253+/*
2259+ * Use consistent with the GNU GPL is permitted, 2254+ * Use consistent with the GNU GPL is permitted,
@@ -2467,10 +2462,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
2467+MODULE_DESCRIPTION("Framebuffer driver for HTC Universal"); 2462+MODULE_DESCRIPTION("Framebuffer driver for HTC Universal");
2468+MODULE_LICENSE("GPL"); 2463+MODULE_LICENSE("GPL");
2469+ 2464+
2470Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2465Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
2471=================================================================== 2466===================================================================
2472--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2467--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2473+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-09-11 12:53:37.000000000 +0200 2468+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2008-01-20 18:59:46.000000000 +0000
2474@@ -0,0 +1,167 @@ 2469@@ -0,0 +1,167 @@
2475+ 2470+
2476+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal 2471+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal
@@ -2639,10 +2634,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
2639+MODULE_LICENSE("GPL"); 2634+MODULE_LICENSE("GPL");
2640+ 2635+
2641+/* vim600: set noexpandtab sw=8 ts=8 :*/ 2636+/* vim600: set noexpandtab sw=8 ts=8 :*/
2642Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2637Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
2643=================================================================== 2638===================================================================
2644--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2639--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2645+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-09-11 12:53:37.000000000 +0200 2640+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2008-01-20 18:59:46.000000000 +0000
2646@@ -0,0 +1,16 @@ 2641@@ -0,0 +1,16 @@
2647+/* 2642+/*
2648+ * Bluetooth support file for calling bluetooth configuration functions 2643+ * Bluetooth support file for calling bluetooth configuration functions
@@ -2660,10 +2655,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
2660+}; 2655+};
2661+ 2656+
2662+#endif 2657+#endif
2663Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2658Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
2664=================================================================== 2659===================================================================
2665--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2660--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2666+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-09-11 12:53:37.000000000 +0200 2661+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2008-01-20 18:59:46.000000000 +0000
2667@@ -0,0 +1,69 @@ 2662@@ -0,0 +1,69 @@
2668+/* 2663+/*
2669+ * MyPal 716 power management support for the original HTC IPL in DoC G3 2664+ * MyPal 716 power management support for the original HTC IPL in DoC G3
@@ -2734,10 +2729,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
2734+ pxa_pm_set_ll_ops(&htcuniversal_ll_pm_ops); 2729+ pxa_pm_set_ll_ops(&htcuniversal_ll_pm_ops);
2735+} 2730+}
2736+#endif /* CONFIG_PM */ 2731+#endif /* CONFIG_PM */
2737Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2732Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2738=================================================================== 2733===================================================================
2739--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2734--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2740+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-09-11 12:53:37.000000000 +0200 2735+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2008-01-20 18:59:46.000000000 +0000
2741@@ -0,0 +1,97 @@ 2736@@ -0,0 +1,97 @@
2742+/* 2737+/*
2743+ * pda_power driver for HTC Universal 2738+ * pda_power driver for HTC Universal
@@ -2836,10 +2831,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2836+ 2831+
2837+MODULE_DESCRIPTION("Power driver for HTC Universal"); 2832+MODULE_DESCRIPTION("Power driver for HTC Universal");
2838+MODULE_LICENSE("GPL"); 2833+MODULE_LICENSE("GPL");
2839Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2834Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
2840=================================================================== 2835===================================================================
2841--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2836--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2842+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-09-11 12:53:37.000000000 +0200 2837+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2008-01-20 18:59:46.000000000 +0000
2843@@ -0,0 +1,490 @@ 2838@@ -0,0 +1,490 @@
2844+/* Touch screen driver for the TI something-or-other 2839+/* Touch screen driver for the TI something-or-other
2845+ * 2840+ *
@@ -3331,10 +3326,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
3331+MODULE_LICENSE("GPL"); 3326+MODULE_LICENSE("GPL");
3332+MODULE_AUTHOR("Aric Blumer, SDG Systems, LLC"); 3327+MODULE_AUTHOR("Aric Blumer, SDG Systems, LLC");
3333+MODULE_DESCRIPTION("HTC Universal Touch Screen Driver"); 3328+MODULE_DESCRIPTION("HTC Universal Touch Screen Driver");
3334Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 3329Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3335=================================================================== 3330===================================================================
3336--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3331--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3337+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-09-11 12:53:37.000000000 +0200 3332+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2008-01-20 18:59:46.000000000 +0000
3338@@ -0,0 +1,71 @@ 3333@@ -0,0 +1,71 @@
3339+ 3334+
3340+/* 3335+/*
@@ -3407,10 +3402,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3407+ 3402+
3408+module_init(htcuniversal_udc_init); 3403+module_init(htcuniversal_udc_init);
3409+MODULE_LICENSE("GPL"); 3404+MODULE_LICENSE("GPL");
3410Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 3405Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3411=================================================================== 3406===================================================================
3412--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3407--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3413+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-09-11 12:53:37.000000000 +0200 3408+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2008-01-20 18:59:46.000000000 +0000
3414@@ -0,0 +1,20 @@ 3409@@ -0,0 +1,20 @@
3415+/* 3410+/*
3416+ * temporary TSC2046 touchscreen hack 3411+ * temporary TSC2046 touchscreen hack
@@ -3432,11 +3427,11 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3432+#define TSC2046_SAMPLE_Y 0x90 3427+#define TSC2046_SAMPLE_Y 0x90
3433+ 3428+
3434+#endif 3429+#endif
3435Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig 3430Index: linux-2.6.23/arch/arm/mach-pxa/Kconfig
3436=================================================================== 3431===================================================================
3437--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-09-11 12:53:33.000000000 +0200 3432--- linux-2.6.23.orig/arch/arm/mach-pxa/Kconfig 2008-01-20 18:59:41.000000000 +0000
3438+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-09-11 12:53:37.000000000 +0200 3433+++ linux-2.6.23/arch/arm/mach-pxa/Kconfig 2008-01-20 18:59:46.000000000 +0000
3439@@ -50,6 +50,14 @@ 3434@@ -92,6 +92,14 @@ config MACH_HX2750
3440 help 3435 help
3441 This enables support for the HP iPAQ HX2750 handheld. 3436 This enables support for the HP iPAQ HX2750 handheld.
3442 3437
@@ -3450,8 +3445,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3450+ 3445+
3451 endchoice 3446 endchoice
3452 3447
3453 if PXA_SHARPSL 3448 endif
3454@@ -84,6 +92,86 @@ 3449@@ -111,6 +119,86 @@ endchoice
3455 3450
3456 endif 3451 endif
3457 3452
@@ -3538,34 +3533,34 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3538 endmenu 3533 endmenu
3539 3534
3540 config MACH_POODLE 3535 config MACH_POODLE
3541@@ -164,4 +252,3 @@ 3536@@ -196,4 +284,3 @@ config PXA_KEYS
3542 depends on (PXA25x || PXA27x) && INPUT 3537 depends on (PXA25x || PXA27x) && INPUT
3543 3538
3544 endif 3539 endif
3545- 3540-
3546Index: linux-2.6.22/arch/arm/mach-pxa/Makefile 3541Index: linux-2.6.23/arch/arm/mach-pxa/Makefile
3547=================================================================== 3542===================================================================
3548--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-09-11 12:53:33.000000000 +0200 3543--- linux-2.6.23.orig/arch/arm/mach-pxa/Makefile 2008-01-20 18:59:41.000000000 +0000
3549+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-09-11 12:53:37.000000000 +0200 3544+++ linux-2.6.23/arch/arm/mach-pxa/Makefile 2008-01-20 18:59:46.000000000 +0000
3550@@ -20,6 +20,7 @@ 3545@@ -23,6 +23,7 @@ obj-$(CONFIG_MACH_POODLE) += poodle.o co
3551 obj-$(CONFIG_MACH_TOSA) += tosa.o 3546 obj-$(CONFIG_MACH_TOSA) += tosa.o
3552 obj-$(CONFIG_MACH_EM_X270) += em-x270.o 3547 obj-$(CONFIG_MACH_EM_X270) += em-x270.o
3553 obj-$(CONFIG_MACH_HX2750) += hx2750.o hx2750_test.o 3548 obj-$(CONFIG_MACH_HX2750) += hx2750.o hx2750_test.o
3554+obj-$(CONFIG_MACH_HTCUNIVERSAL) += htcuniversal/ 3549+obj-$(CONFIG_MACH_HTCUNIVERSAL) += htcuniversal/
3555 3550
3556 # Support for blinky lights 3551 ifeq ($(CONFIG_MACH_ZYLONITE),y)
3557 led-y := leds.o 3552 obj-y += zylonite.o
3558Index: linux-2.6.22/drivers/leds/Kconfig 3553Index: linux-2.6.23/drivers/leds/Kconfig
3559=================================================================== 3554===================================================================
3560--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-09-11 12:53:14.000000000 +0200 3555--- linux-2.6.23.orig/drivers/leds/Kconfig 2008-01-20 18:59:17.000000000 +0000
3561+++ linux-2.6.22/drivers/leds/Kconfig 2007-09-11 12:53:37.000000000 +0200 3556+++ linux-2.6.23/drivers/leds/Kconfig 2008-01-20 18:59:46.000000000 +0000
3562@@ -101,6 +101,13 @@ 3557@@ -114,6 +114,13 @@ config LEDS_CM_X270
3563 outputs. To be useful the particular board must have LEDs 3558 help
3564 and they must be connected to the GPIO lines. 3559 This option enables support for the CM-X270 LEDs.
3565 3560
3566+config LEDS_ASIC3 3561+config LEDS_ASIC3
3567+ tristate "LED Support for the HTC ASIC3 chip" 3562+ tristate "LED Support for the HTC ASIC3 chip"
3568+ depends LEDS_CLASS && HTC_ASIC3 3563+ depends on LEDS_CLASS && HTC_ASIC3
3569+ help 3564+ help
3570+ This option enables support for the LEDs connected to the 3565+ This option enables support for the LEDs connected to the
3571+ HTC ASIC3 chip. 3566+ HTC ASIC3 chip.
@@ -3573,10 +3568,10 @@ Index: linux-2.6.22/drivers/leds/Kconfig
3573 comment "LED Triggers" 3568 comment "LED Triggers"
3574 3569
3575 config LEDS_TRIGGERS 3570 config LEDS_TRIGGERS
3576Index: linux-2.6.22/drivers/leds/leds-asic3.c 3571Index: linux-2.6.23/drivers/leds/leds-asic3.c
3577=================================================================== 3572===================================================================
3578--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3573--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3579+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-09-11 12:53:37.000000000 +0200 3574+++ linux-2.6.23/drivers/leds/leds-asic3.c 2008-01-20 18:59:46.000000000 +0000
3580@@ -0,0 +1,189 @@ 3575@@ -0,0 +1,189 @@
3581+/* 3576+/*
3582+ * LEDs support for HTC ASIC3 devices. 3577+ * LEDs support for HTC ASIC3 devices.
@@ -3767,13 +3762,13 @@ Index: linux-2.6.22/drivers/leds/leds-asic3.c
3767+MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>"); 3762+MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>");
3768+MODULE_DESCRIPTION("HTC ASIC3 LEDs driver"); 3763+MODULE_DESCRIPTION("HTC ASIC3 LEDs driver");
3769+MODULE_LICENSE("GPL"); 3764+MODULE_LICENSE("GPL");
3770Index: linux-2.6.22/drivers/mfd/Kconfig 3765Index: linux-2.6.23/drivers/mfd/Kconfig
3771=================================================================== 3766===================================================================
3772--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-09-11 12:53:30.000000000 +0200 3767--- linux-2.6.23.orig/drivers/mfd/Kconfig 2008-01-20 18:59:38.000000000 +0000
3773+++ linux-2.6.22/drivers/mfd/Kconfig 2007-09-11 12:53:37.000000000 +0200 3768+++ linux-2.6.23/drivers/mfd/Kconfig 2008-01-20 18:59:46.000000000 +0000
3774@@ -15,6 +15,16 @@ 3769@@ -21,6 +21,16 @@ config MFD_TSC2101
3775 interface. The device may be connected by PCI or local bus with 3770 help
3776 varying functions enabled. 3771 Support for TI TSC2101 Touchscreen and Audio Codec
3777 3772
3778+config HTC_ASIC3 3773+config HTC_ASIC3
3779+ tristate "HTC ASIC3 (iPAQ h1900/h3900/h4000/hx4700/rx3000) support" 3774+ tristate "HTC ASIC3 (iPAQ h1900/h3900/h4000/hx4700/rx3000) support"
@@ -3788,10 +3783,10 @@ Index: linux-2.6.22/drivers/mfd/Kconfig
3788 endmenu 3783 endmenu
3789 3784
3790 menu "Multimedia Capabilities Port drivers" 3785 menu "Multimedia Capabilities Port drivers"
3791Index: linux-2.6.22/drivers/mfd/Makefile 3786Index: linux-2.6.23/drivers/mfd/Makefile
3792=================================================================== 3787===================================================================
3793--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-09-11 12:53:30.000000000 +0200 3788--- linux-2.6.23.orig/drivers/mfd/Makefile 2008-01-20 18:59:38.000000000 +0000
3794+++ linux-2.6.22/drivers/mfd/Makefile 2007-09-11 12:53:37.000000000 +0200 3789+++ linux-2.6.23/drivers/mfd/Makefile 2008-01-20 18:59:46.000000000 +0000
3795@@ -2,6 +2,8 @@ 3790@@ -2,6 +2,8 @@
3796 # Makefile for multifunction miscellaneous devices 3791 # Makefile for multifunction miscellaneous devices
3797 # 3792 #
@@ -3801,10 +3796,10 @@ Index: linux-2.6.22/drivers/mfd/Makefile
3801 obj-$(CONFIG_MFD_SM501) += sm501.o 3796 obj-$(CONFIG_MFD_SM501) += sm501.o
3802 3797
3803 obj-$(CONFIG_MCP) += mcp-core.o 3798 obj-$(CONFIG_MCP) += mcp-core.o
3804Index: linux-2.6.22/drivers/mfd/asic3_base.c 3799Index: linux-2.6.23/drivers/mfd/asic3_base.c
3805=================================================================== 3800===================================================================
3806--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3801--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3807+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-09-11 12:53:37.000000000 +0200 3802+++ linux-2.6.23/drivers/mfd/asic3_base.c 2008-01-20 18:59:46.000000000 +0000
3808@@ -0,0 +1,1208 @@ 3803@@ -0,0 +1,1208 @@
3809+/* 3804+/*
3810+ * Driver interface to HTC "ASIC3" 3805+ * Driver interface to HTC "ASIC3"
@@ -5014,10 +5009,10 @@ Index: linux-2.6.22/drivers/mfd/asic3_base.c
5014+MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>"); 5009+MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>");
5015+MODULE_DESCRIPTION("Core driver for HTC ASIC3"); 5010+MODULE_DESCRIPTION("Core driver for HTC ASIC3");
5016+MODULE_SUPPORTED_DEVICE("asic3"); 5011+MODULE_SUPPORTED_DEVICE("asic3");
5017Index: linux-2.6.22/drivers/mfd/soc-core.c 5012Index: linux-2.6.23/drivers/mfd/soc-core.c
5018=================================================================== 5013===================================================================
5019--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5014--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5020+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-09-11 12:53:37.000000000 +0200 5015+++ linux-2.6.23/drivers/mfd/soc-core.c 2008-01-20 18:59:46.000000000 +0000
5021@@ -0,0 +1,106 @@ 5016@@ -0,0 +1,106 @@
5022+/* 5017+/*
5023+ * drivers/soc/soc-core.c 5018+ * drivers/soc/soc-core.c
@@ -5125,10 +5120,10 @@ Index: linux-2.6.22/drivers/mfd/soc-core.c
5125+ return NULL; 5120+ return NULL;
5126+} 5121+}
5127+EXPORT_SYMBOL_GPL(soc_add_devices); 5122+EXPORT_SYMBOL_GPL(soc_add_devices);
5128Index: linux-2.6.22/drivers/mfd/soc-core.h 5123Index: linux-2.6.23/drivers/mfd/soc-core.h
5129=================================================================== 5124===================================================================
5130--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5125--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5131+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-09-11 12:53:37.000000000 +0200 5126+++ linux-2.6.23/drivers/mfd/soc-core.h 2008-01-20 18:59:46.000000000 +0000
5132@@ -0,0 +1,30 @@ 5127@@ -0,0 +1,30 @@
5133+/* 5128+/*
5134+ * drivers/soc/soc-core.h 5129+ * drivers/soc/soc-core.h
@@ -5160,10 +5155,10 @@ Index: linux-2.6.22/drivers/mfd/soc-core.h
5160+ 5155+
5161+void soc_free_devices(struct platform_device *devices, int nr_devs); 5156+void soc_free_devices(struct platform_device *devices, int nr_devs);
5162+ 5157+
5163Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h 5158Index: linux-2.6.23/include/asm-arm/arch-pxa/clock.h
5164=================================================================== 5159===================================================================
5165--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5160--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5166+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-09-11 12:53:37.000000000 +0200 5161+++ linux-2.6.23/include/asm-arm/arch-pxa/clock.h 2008-01-20 18:59:46.000000000 +0000
5167@@ -0,0 +1,27 @@ 5162@@ -0,0 +1,27 @@
5168+/* 5163+/*
5169+ * linux/include/asm-arm/arch-pxa/clock.h 5164+ * linux/include/asm-arm/arch-pxa/clock.h
@@ -5192,10 +5187,10 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5192+ 5187+
5193+extern int clk_register(struct clk *clk); 5188+extern int clk_register(struct clk *clk);
5194+extern void clk_unregister(struct clk *clk); 5189+extern void clk_unregister(struct clk *clk);
5195Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 5190Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-asic.h
5196=================================================================== 5191===================================================================
5197--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5192--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5198+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-09-11 12:53:37.000000000 +0200 5193+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-asic.h 2008-01-20 18:59:46.000000000 +0000
5199@@ -0,0 +1,213 @@ 5194@@ -0,0 +1,213 @@
5200+/* 5195+/*
5201+ * include/asm/arm/arch-pxa/htcuniversal-asic.h 5196+ * include/asm/arm/arch-pxa/htcuniversal-asic.h
@@ -5410,10 +5405,10 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
5410+ 5405+
5411+#endif /* _HTCUNIVERSAL_ASIC_H_ */ 5406+#endif /* _HTCUNIVERSAL_ASIC_H_ */
5412+ 5407+
5413Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 5408Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-gpio.h
5414=================================================================== 5409===================================================================
5415--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5410--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5416+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-09-11 12:53:37.000000000 +0200 5411+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2008-01-20 18:59:46.000000000 +0000
5417@@ -0,0 +1,220 @@ 5412@@ -0,0 +1,220 @@
5418+/* 5413+/*
5419+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h 5414+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h
@@ -5635,10 +5630,10 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
5635+#define GPIO_NR_HTCUNIVERSAL_I2C_SDA_MD (118 | GPIO_ALT_FN_1_OUT) 5630+#define GPIO_NR_HTCUNIVERSAL_I2C_SDA_MD (118 | GPIO_ALT_FN_1_OUT)
5636+ 5631+
5637+#endif /* _HTCUNIVERSAL_GPIO_H */ 5632+#endif /* _HTCUNIVERSAL_GPIO_H */
5638Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 5633Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-init.h
5639=================================================================== 5634===================================================================
5640--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5635--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5641+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-09-11 12:53:37.000000000 +0200 5636+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-init.h 2008-01-20 18:59:46.000000000 +0000
5642@@ -0,0 +1,14 @@ 5637@@ -0,0 +1,14 @@
5643+/* 5638+/*
5644+ * include/asm/arm/arch-pxa/htcuniversal-init.h 5639+ * include/asm/arm/arch-pxa/htcuniversal-init.h
@@ -5654,18 +5649,18 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
5654+ 5649+
5655+#endif /* _HTCUNIVERSAL_INIT_H_ */ 5650+#endif /* _HTCUNIVERSAL_INIT_H_ */
5656+ 5651+
5657Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 5652Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal.h
5658=================================================================== 5653===================================================================
5659--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5654--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5660+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-09-11 12:53:37.000000000 +0200 5655+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal.h 2008-01-20 18:59:46.000000000 +0000
5661@@ -0,0 +1,3 @@ 5656@@ -0,0 +1,3 @@
5662+#include <asm/arch/irqs.h> 5657+#include <asm/arch/irqs.h>
5663+ 5658+
5664+#define HTCUNIVERSAL_ASIC3_IRQ_BASE IRQ_BOARD_START 5659+#define HTCUNIVERSAL_ASIC3_IRQ_BASE IRQ_BOARD_START
5665Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 5660Index: linux-2.6.23/include/asm-arm/arch-pxa/pxa-pm_ll.h
5666=================================================================== 5661===================================================================
5667--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5662--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5668+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-09-11 12:53:37.000000000 +0200 5663+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa-pm_ll.h 2008-01-20 18:59:46.000000000 +0000
5669@@ -0,0 +1,6 @@ 5664@@ -0,0 +1,6 @@
5670+struct pxa_ll_pm_ops { 5665+struct pxa_ll_pm_ops {
5671+ void (*suspend)(unsigned long); 5666+ void (*suspend)(unsigned long);
@@ -5673,27 +5668,10 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
5673+}; 5668+};
5674+ 5669+
5675+extern struct pxa_ll_pm_ops *pxa_pm_set_ll_ops(struct pxa_ll_pm_ops *new_ops); 5670+extern struct pxa_ll_pm_ops *pxa_pm_set_ll_ops(struct pxa_ll_pm_ops *new_ops);
5676Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 5671Index: linux-2.6.23/include/asm-arm/hardware/asic3_keys.h
5677===================================================================
5678--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-09 01:32:17.000000000 +0200
5679+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-09-11 12:53:37.000000000 +0200
5680@@ -25,12 +25,6 @@
5681 /*
5682 * SharpSL Backlight
5683 */
5684-struct corgibl_machinfo {
5685- int max_intensity;
5686- int default_intensity;
5687- int limit_mask;
5688- void (*set_bl_intensity)(int intensity);
5689-};
5690 extern void corgibl_limit_intensity(int limit);
5691
5692
5693Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5694=================================================================== 5672===================================================================
5695--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5673--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5696+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-09-11 12:53:37.000000000 +0200 5674+++ linux-2.6.23/include/asm-arm/hardware/asic3_keys.h 2008-01-20 18:59:46.000000000 +0000
5697@@ -0,0 +1,18 @@ 5675@@ -0,0 +1,18 @@
5698+#include <linux/input.h> 5676+#include <linux/input.h>
5699+ 5677+
@@ -5713,10 +5691,10 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5713+ struct input_dev *input; 5691+ struct input_dev *input;
5714+ struct device *asic3_dev; 5692+ struct device *asic3_dev;
5715+}; 5693+};
5716Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 5694Index: linux-2.6.23/include/asm-arm/hardware/asic3_leds.h
5717=================================================================== 5695===================================================================
5718--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5696--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5719+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-09-11 12:53:37.000000000 +0200 5697+++ linux-2.6.23/include/asm-arm/hardware/asic3_leds.h 2008-01-20 18:59:46.000000000 +0000
5720@@ -0,0 +1,34 @@ 5698@@ -0,0 +1,34 @@
5721+/* 5699+/*
5722+ * LEDs support for HTC ASIC3 devices. 5700+ * LEDs support for HTC ASIC3 devices.
@@ -5752,10 +5730,10 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5752+extern int asic3_leds_register(void); 5730+extern int asic3_leds_register(void);
5753+extern void asic3_leds_unregister(void); 5731+extern void asic3_leds_unregister(void);
5754+ 5732+
5755Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 5733Index: linux-2.6.23/include/asm-arm/hardware/ipaq-asic3.h
5756=================================================================== 5734===================================================================
5757--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5735--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5758+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-09-11 12:53:37.000000000 +0200 5736+++ linux-2.6.23/include/asm-arm/hardware/ipaq-asic3.h 2008-01-20 18:59:46.000000000 +0000
5759@@ -0,0 +1,602 @@ 5737@@ -0,0 +1,602 @@
5760+/* 5738+/*
5761+ * 5739+ *
@@ -6359,26 +6337,10 @@ Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
6359+#define IPAQ_ASIC3_MAP_SIZE 0x2000 6337+#define IPAQ_ASIC3_MAP_SIZE 0x2000
6360+ 6338+
6361+#endif 6339+#endif
6362Index: linux-2.6.22/include/linux/backlight.h 6340Index: linux-2.6.23/include/linux/gpiodev.h
6363===================================================================
6364--- linux-2.6.22.orig/include/linux/backlight.h 2007-09-11 12:53:26.000000000 +0200
6365+++ linux-2.6.22/include/linux/backlight.h 2007-09-11 12:53:37.000000000 +0200
6366@@ -92,4 +92,11 @@
6367 return dev_get_drvdata(&bl_dev->dev);
6368 }
6369
6370+struct generic_bl_info {
6371+ int max_intensity;
6372+ int default_intensity;
6373+ int limit_mask;
6374+ void (*set_bl_intensity)(int intensity);
6375+};
6376+
6377 #endif
6378Index: linux-2.6.22/include/linux/gpiodev.h
6379=================================================================== 6341===================================================================
6380--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6342--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6381+++ linux-2.6.22/include/linux/gpiodev.h 2007-09-11 12:53:37.000000000 +0200 6343+++ linux-2.6.23/include/linux/gpiodev.h 2008-01-20 18:59:46.000000000 +0000
6382@@ -0,0 +1,44 @@ 6344@@ -0,0 +1,44 @@
6383+#ifndef __GPIODEV_H 6345+#ifndef __GPIODEV_H
6384+#define __GPIODEV_H 6346+#define __GPIODEV_H
@@ -6424,10 +6386,10 @@ Index: linux-2.6.22/include/linux/gpiodev.h
6424+} 6386+}
6425+ 6387+
6426+#endif /* __GPIODEV_H */ 6388+#endif /* __GPIODEV_H */
6427Index: linux-2.6.22/include/linux/input_pda.h 6389Index: linux-2.6.23/include/linux/input_pda.h
6428=================================================================== 6390===================================================================
6429--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6391--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6430+++ linux-2.6.22/include/linux/input_pda.h 2007-09-11 12:53:37.000000000 +0200 6392+++ linux-2.6.23/include/linux/input_pda.h 2008-01-20 18:59:46.000000000 +0000
6431@@ -0,0 +1,47 @@ 6393@@ -0,0 +1,47 @@
6432+#ifndef _INPUT_PDA_H 6394+#ifndef _INPUT_PDA_H
6433+#define _INPUT_PDA_H 6395+#define _INPUT_PDA_H
@@ -6476,10 +6438,10 @@ Index: linux-2.6.22/include/linux/input_pda.h
6476+#define _KEY_HOMEPAGE _KEY_APP4 6438+#define _KEY_HOMEPAGE _KEY_APP4
6477+ 6439+
6478+#endif 6440+#endif
6479Index: linux-2.6.22/include/linux/soc/asic3_base.h 6441Index: linux-2.6.23/include/linux/soc/asic3_base.h
6480=================================================================== 6442===================================================================
6481--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6443--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6482+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-09-11 12:53:37.000000000 +0200 6444+++ linux-2.6.23/include/linux/soc/asic3_base.h 2008-01-20 18:59:46.000000000 +0000
6483@@ -0,0 +1,104 @@ 6445@@ -0,0 +1,104 @@
6484+#include <asm/types.h> 6446+#include <asm/types.h>
6485+#include <linux/gpiodev.h> 6447+#include <linux/gpiodev.h>
@@ -6585,10 +6547,10 @@ Index: linux-2.6.22/include/linux/soc/asic3_base.h
6585+ 6547+
6586+ struct tmio_mmc_hwconfig *tmio_mmc_hwconfig; 6548+ struct tmio_mmc_hwconfig *tmio_mmc_hwconfig;
6587+}; 6549+};
6588Index: linux-2.6.22/include/linux/soc/tmio_mmc.h 6550Index: linux-2.6.23/include/linux/soc/tmio_mmc.h
6589=================================================================== 6551===================================================================
6590--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6552--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6591+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-09-11 12:53:37.000000000 +0200 6553+++ linux-2.6.23/include/linux/soc/tmio_mmc.h 2008-01-20 18:59:46.000000000 +0000
6592@@ -0,0 +1,17 @@ 6554@@ -0,0 +1,17 @@
6593+#include <linux/platform_device.h> 6555+#include <linux/platform_device.h>
6594+ 6556+
@@ -6607,11 +6569,11 @@ Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6607+ int (*mmc_get_ro)(struct platform_device *pdev); 6569+ int (*mmc_get_ro)(struct platform_device *pdev);
6608+ short address_shift; 6570+ short address_shift;
6609+}; 6571+};
6610Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 6572Index: linux-2.6.23/include/asm-arm/arch-pxa/pxa-regs.h
6611=================================================================== 6573===================================================================
6612--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-11 12:53:34.000000000 +0200 6574--- linux-2.6.23.orig/include/asm-arm/arch-pxa/pxa-regs.h 2008-01-20 18:59:40.000000000 +0000
6613+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-11 12:53:37.000000000 +0200 6575+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa-regs.h 2008-01-20 18:59:46.000000000 +0000
6614@@ -2043,6 +2043,8 @@ 6576@@ -2058,6 +2058,8 @@
6615 #define LDCMD_SOFINT (1 << 22) 6577 #define LDCMD_SOFINT (1 << 22)
6616 #define LDCMD_EOFINT (1 << 21) 6578 #define LDCMD_EOFINT (1 << 21)
6617 6579
@@ -6620,13 +6582,13 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
6620 6582
6621 #define LCCR5_SOFM1 (1<<0) /* Start Of Frame Mask for Overlay 1 (channel 1) */ 6583 #define LCCR5_SOFM1 (1<<0) /* Start Of Frame Mask for Overlay 1 (channel 1) */
6622 #define LCCR5_SOFM2 (1<<1) /* Start Of Frame Mask for Overlay 2 (channel 2) */ 6584 #define LCCR5_SOFM2 (1<<1) /* Start Of Frame Mask for Overlay 2 (channel 2) */
6623Index: linux-2.6.22/drivers/mmc/host/Kconfig 6585Index: linux-2.6.23/drivers/mmc/host/Kconfig
6624=================================================================== 6586===================================================================
6625--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-09 01:32:17.000000000 +0200 6587--- linux-2.6.23.orig/drivers/mmc/host/Kconfig 2008-01-20 18:59:18.000000000 +0000
6626+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-09-11 12:53:37.000000000 +0200 6588+++ linux-2.6.23/drivers/mmc/host/Kconfig 2008-01-20 18:59:46.000000000 +0000
6627@@ -100,3 +100,9 @@ 6589@@ -130,3 +130,9 @@ config MMC_SPI
6628 To compile this driver as a module, choose M here: the 6590
6629 module will be called tifm_sd. 6591 If unsure, or if your system has no SPI master driver, say N.
6630 6592
6631+config MMC_ASIC3 6593+config MMC_ASIC3
6632+ tristate "HTC ASIC3 SD/MMC support" 6594+ tristate "HTC ASIC3 SD/MMC support"
@@ -6634,20 +6596,22 @@ Index: linux-2.6.22/drivers/mmc/host/Kconfig
6634+ help 6596+ help
6635+ This provides support for the ASIC3 SD/MMC controller, used 6597+ This provides support for the ASIC3 SD/MMC controller, used
6636+ in the iPAQ hx4700 and others. 6598+ in the iPAQ hx4700 and others.
6637Index: linux-2.6.22/drivers/mmc/host/Makefile 6599Index: linux-2.6.23/drivers/mmc/host/Makefile
6638=================================================================== 6600===================================================================
6639--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-09 01:32:17.000000000 +0200 6601--- linux-2.6.23.orig/drivers/mmc/host/Makefile 2008-01-20 18:59:18.000000000 +0000
6640+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-09-11 12:53:37.000000000 +0200 6602+++ linux-2.6.23/drivers/mmc/host/Makefile 2008-01-20 21:12:10.000000000 +0000
6641@@ -15,4 +15,4 @@ 6603@@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI) += sdhci.o
6604 obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o
6605 obj-$(CONFIG_MMC_WBSD) += wbsd.o
6606 obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
6607+obj-$(CONFIG_MMC_ASIC3) += asic3_mmc.o
6642 obj-$(CONFIG_MMC_OMAP) += omap.o 6608 obj-$(CONFIG_MMC_OMAP) += omap.o
6643 obj-$(CONFIG_MMC_AT91) += at91_mci.o 6609 obj-$(CONFIG_MMC_AT91) += at91_mci.o
6644 obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o 6610 obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
6645- 6611Index: linux-2.6.23/drivers/mmc/host/asic3_mmc.c
6646+obj-$(CONFIG_MMC_ASIC3) += asic3_mmc.o
6647Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
6648=================================================================== 6612===================================================================
6649--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6613--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6650+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-09-11 12:53:37.000000000 +0200 6614+++ linux-2.6.23/drivers/mmc/host/asic3_mmc.c 2008-01-20 18:59:46.000000000 +0000
6651@@ -0,0 +1,900 @@ 6615@@ -0,0 +1,900 @@
6652+/* Note that this driver can likely be merged into the tmio driver, so 6616+/* Note that this driver can likely be merged into the tmio driver, so
6653+ * consider this code temporary. It works, though. 6617+ * consider this code temporary. It works, though.
@@ -7549,10 +7513,10 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
7549+MODULE_AUTHOR("Aric Blumer, SDG Systems, LLC"); 7513+MODULE_AUTHOR("Aric Blumer, SDG Systems, LLC");
7550+MODULE_LICENSE("GPL"); 7514+MODULE_LICENSE("GPL");
7551+ 7515+
7552Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h 7516Index: linux-2.6.23/drivers/mmc/host/asic3_mmc.h
7553=================================================================== 7517===================================================================
7554--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7518--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7555+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-09-11 12:53:37.000000000 +0200 7519+++ linux-2.6.23/drivers/mmc/host/asic3_mmc.h 2008-01-20 18:59:46.000000000 +0000
7556@@ -0,0 +1,25 @@ 7520@@ -0,0 +1,25 @@
7557+#ifndef __ASIC3_MMC_H 7521+#ifndef __ASIC3_MMC_H
7558+#define __ASIC3_MMC_H 7522+#define __ASIC3_MMC_H
@@ -7579,20 +7543,22 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7579+#define DONT_CARE_BUFFER_BITS ( SD_CTRL_INTMASKBUFFER_UNK7 | SD_CTRL_INTMASKBUFFER_CMD_BUSY ) 7543+#define DONT_CARE_BUFFER_BITS ( SD_CTRL_INTMASKBUFFER_UNK7 | SD_CTRL_INTMASKBUFFER_CMD_BUSY )
7580+ 7544+
7581+#endif // __ASIC3_MMC_H 7545+#endif // __ASIC3_MMC_H
7582Index: linux-2.6.22/drivers/input/keyboard/Makefile 7546Index: linux-2.6.23/drivers/input/keyboard/Makefile
7583=================================================================== 7547===================================================================
7584--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-09 01:32:17.000000000 +0200 7548--- linux-2.6.23.orig/drivers/input/keyboard/Makefile 2008-01-20 18:59:16.000000000 +0000
7585+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-09-11 12:53:37.000000000 +0200 7549+++ linux-2.6.23/drivers/input/keyboard/Makefile 2008-01-20 21:11:40.000000000 +0000
7586@@ -21,4 +21,4 @@ 7550@@ -15,6 +15,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON) += newton
7587 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o 7551 obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
7588 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o 7552 obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o
7589 obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o 7553 obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o
7590-
7591+obj-$(CONFIG_KEYBOARD_ASIC3) += asic3_keys.o 7554+obj-$(CONFIG_KEYBOARD_ASIC3) += asic3_keys.o
7592Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c 7555 obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
7556 obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
7557 obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o
7558Index: linux-2.6.23/drivers/input/keyboard/asic3_keys.c
7593=================================================================== 7559===================================================================
7594--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7560--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7595+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-09-11 12:53:37.000000000 +0200 7561+++ linux-2.6.23/drivers/input/keyboard/asic3_keys.c 2008-01-20 18:59:46.000000000 +0000
7596@@ -0,0 +1,131 @@ 7562@@ -0,0 +1,131 @@
7597+/* 7563+/*
7598+ * Generic buttons driver for ASIC3 SoC. 7564+ * Generic buttons driver for ASIC3 SoC.
@@ -7725,11 +7691,11 @@ Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7725+MODULE_AUTHOR("Joshua Wise, Pawel Kolodziejski, Paul Sokolovsky"); 7691+MODULE_AUTHOR("Joshua Wise, Pawel Kolodziejski, Paul Sokolovsky");
7726+MODULE_DESCRIPTION("Buttons driver for HTC ASIC3 SoC"); 7692+MODULE_DESCRIPTION("Buttons driver for HTC ASIC3 SoC");
7727+MODULE_LICENSE("GPL"); 7693+MODULE_LICENSE("GPL");
7728Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 7694Index: linux-2.6.23/include/asm-arm/arch-pxa/irqs.h
7729=================================================================== 7695===================================================================
7730--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-09-11 12:53:24.000000000 +0200 7696--- linux-2.6.23.orig/include/asm-arm/arch-pxa/irqs.h 2008-01-20 18:59:28.000000000 +0000
7731+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-09-11 12:53:37.000000000 +0200 7697+++ linux-2.6.23/include/asm-arm/arch-pxa/irqs.h 2008-01-20 18:59:46.000000000 +0000
7732@@ -172,6 +172,8 @@ 7698@@ -182,6 +182,8 @@
7733 defined(CONFIG_MACH_LOGICPD_PXA270) || \ 7699 defined(CONFIG_MACH_LOGICPD_PXA270) || \
7734 defined(CONFIG_MACH_MAINSTONE) 7700 defined(CONFIG_MACH_MAINSTONE)
7735 #define NR_IRQS (IRQ_BOARD_END) 7701 #define NR_IRQS (IRQ_BOARD_END)
@@ -7738,11 +7704,11 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7738 #else 7704 #else
7739 #define NR_IRQS (IRQ_BOARD_START) 7705 #define NR_IRQS (IRQ_BOARD_START)
7740 #endif 7706 #endif
7741Index: linux-2.6.22/include/linux/ioport.h 7707Index: linux-2.6.23/include/linux/ioport.h
7742=================================================================== 7708===================================================================
7743--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-09 01:32:17.000000000 +0200 7709--- linux-2.6.23.orig/include/linux/ioport.h 2008-01-20 18:59:31.000000000 +0000
7744+++ linux-2.6.22/include/linux/ioport.h 2007-09-11 12:53:37.000000000 +0200 7710+++ linux-2.6.23/include/linux/ioport.h 2008-01-20 18:59:46.000000000 +0000
7745@@ -56,6 +56,7 @@ 7711@@ -56,6 +56,7 @@ struct resource_list {
7746 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) 7712 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
7747 #define IORESOURCE_IRQ_LOWLEVEL (1<<3) 7713 #define IORESOURCE_IRQ_LOWLEVEL (1<<3)
7748 #define IORESOURCE_IRQ_SHAREABLE (1<<4) 7714 #define IORESOURCE_IRQ_SHAREABLE (1<<4)
@@ -7750,79 +7716,10 @@ Index: linux-2.6.22/include/linux/ioport.h
7750 7716
7751 /* ISA PnP DMA specific bits (IORESOURCE_BITS) */ 7717 /* ISA PnP DMA specific bits (IORESOURCE_BITS) */
7752 #define IORESOURCE_DMA_TYPE_MASK (3<<0) 7718 #define IORESOURCE_DMA_TYPE_MASK (3<<0)
7753Index: linux-2.6.22/drivers/video/backlight/Kconfig 7719Index: linux-2.6.23/include/asm-arm/arch-pxa/serial.h
7754===================================================================
7755--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-09-11 12:53:30.000000000 +0200
7756+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-09-11 12:53:37.000000000 +0200
7757@@ -40,7 +40,7 @@
7758
7759 config BACKLIGHT_CORGI
7760 tristate "Sharp Corgi Backlight Driver (SL Series)"
7761- depends on BACKLIGHT_CLASS_DEVICE && PXA_SHARPSL
7762+ depends on BACKLIGHT_CLASS_DEVICE
7763 default y
7764 help
7765 If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
7766Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7767===================================================================
7768--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-09 01:32:17.000000000 +0200
7769+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-09-11 12:53:37.000000000 +0200
7770@@ -24,7 +24,7 @@
7771 static int corgibl_intensity;
7772 static struct backlight_properties corgibl_data;
7773 static struct backlight_device *corgi_backlight_device;
7774-static struct corgibl_machinfo *bl_machinfo;
7775+static struct generic_bl_info *bl_machinfo;
7776
7777 static unsigned long corgibl_flags;
7778 #define CORGIBL_SUSPENDED 0x01
7779@@ -107,7 +107,7 @@
7780
7781 static int corgibl_probe(struct platform_device *pdev)
7782 {
7783- struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
7784+ struct generic_bl_info *machinfo = pdev->dev.platform_data;
7785
7786 bl_machinfo = machinfo;
7787 if (!machinfo->limit_mask)
7788Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
7789===================================================================
7790--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c 2007-09-11 12:53:32.000000000 +0200
7791+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c 2007-09-11 12:53:37.000000000 +0200
7792@@ -20,6 +20,7 @@
7793 #include <linux/interrupt.h>
7794 #include <linux/mmc/host.h>
7795 #include <linux/pm.h>
7796+#include <linux/backlight.h>
7797
7798 #include <asm/setup.h>
7799 #include <asm/memory.h>
7800@@ -143,7 +144,7 @@
7801 /*
7802 * Corgi Backlight Device
7803 */
7804-static struct corgibl_machinfo corgi_bl_machinfo = {
7805+static struct generic_bl_info corgi_bl_machinfo = {
7806 .max_intensity = 0x2f,
7807 .default_intensity = 0x1f,
7808 .limit_mask = 0x0b,
7809Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
7810===================================================================
7811--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c 2007-09-11 12:53:33.000000000 +0200
7812+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c 2007-09-11 12:53:37.000000000 +0200
7813@@ -222,7 +222,7 @@
7814 /*
7815 * Spitz Backlight Device
7816 */
7817-static struct corgibl_machinfo spitz_bl_machinfo = {
7818+static struct generic_bl_info spitz_bl_machinfo = {
7819 .default_intensity = 0x1f,
7820 .limit_mask = 0x0b,
7821 .max_intensity = 0x2f,
7822Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h
7823=================================================================== 7720===================================================================
7824--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7721--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7825+++ linux-2.6.22/include/asm-arm/arch-pxa/serial.h 2007-09-11 12:53:37.000000000 +0200 7722+++ linux-2.6.23/include/asm-arm/arch-pxa/serial.h 2008-01-20 18:59:46.000000000 +0000
7826@@ -0,0 +1,78 @@ 7723@@ -0,0 +1,78 @@
7827+/* 7724+/*
7828+ * linux/include/asm-arm/arch-pxa/serial.h 7725+ * linux/include/asm-arm/arch-pxa/serial.h
@@ -7902,11 +7799,11 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h
7902+void pxa_set_btuart_info(struct platform_pxa_serial_funcs *btuart_funcs); 7799+void pxa_set_btuart_info(struct platform_pxa_serial_funcs *btuart_funcs);
7903+void pxa_set_stuart_info(struct platform_pxa_serial_funcs *stuart_funcs); 7800+void pxa_set_stuart_info(struct platform_pxa_serial_funcs *stuart_funcs);
7904+void pxa_set_hwuart_info(struct platform_pxa_serial_funcs *hwuart_funcs); 7801+void pxa_set_hwuart_info(struct platform_pxa_serial_funcs *hwuart_funcs);
7905Index: linux-2.6.22/drivers/serial/pxa.c 7802Index: linux-2.6.23/drivers/serial/pxa.c
7906=================================================================== 7803===================================================================
7907--- linux-2.6.22.orig/drivers/serial/pxa.c 2007-07-09 01:32:17.000000000 +0200 7804--- linux-2.6.23.orig/drivers/serial/pxa.c 2008-01-20 18:59:23.000000000 +0000
7908+++ linux-2.6.22/drivers/serial/pxa.c 2007-09-11 12:53:37.000000000 +0200 7805+++ linux-2.6.23/drivers/serial/pxa.c 2008-01-20 18:59:46.000000000 +0000
7909@@ -46,6 +46,7 @@ 7806@@ -47,6 +47,7 @@
7910 #include <asm/io.h> 7807 #include <asm/io.h>
7911 #include <asm/hardware.h> 7808 #include <asm/hardware.h>
7912 #include <asm/irq.h> 7809 #include <asm/irq.h>
@@ -7914,7 +7811,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7914 #include <asm/arch/pxa-regs.h> 7811 #include <asm/arch/pxa-regs.h>
7915 7812
7916 7813
7917@@ -59,6 +60,14 @@ 7814@@ -60,6 +61,14 @@ struct uart_pxa_port {
7918 char *name; 7815 char *name;
7919 }; 7816 };
7920 7817
@@ -7929,7 +7826,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7929 static inline unsigned int serial_in(struct uart_pxa_port *up, int offset) 7826 static inline unsigned int serial_in(struct uart_pxa_port *up, int offset)
7930 { 7827 {
7931 offset <<= 2; 7828 offset <<= 2;
7932@@ -346,6 +355,9 @@ 7829@@ -347,6 +356,9 @@ static int serial_pxa_startup(struct uar
7933 unsigned long flags; 7830 unsigned long flags;
7934 int retval; 7831 int retval;
7935 7832
@@ -7939,7 +7836,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7939 if (port->line == 3) /* HWUART */ 7836 if (port->line == 3) /* HWUART */
7940 up->mcr |= UART_MCR_AFE; 7837 up->mcr |= UART_MCR_AFE;
7941 else 7838 else
7942@@ -401,6 +413,12 @@ 7839@@ -404,6 +416,12 @@ static int serial_pxa_startup(struct uar
7943 (void) serial_in(up, UART_IIR); 7840 (void) serial_in(up, UART_IIR);
7944 (void) serial_in(up, UART_MSR); 7841 (void) serial_in(up, UART_MSR);
7945 7842
@@ -7952,7 +7849,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7952 return 0; 7849 return 0;
7953 } 7850 }
7954 7851
7955@@ -409,6 +427,8 @@ 7852@@ -412,6 +430,8 @@ static void serial_pxa_shutdown(struct u
7956 struct uart_pxa_port *up = (struct uart_pxa_port *)port; 7853 struct uart_pxa_port *up = (struct uart_pxa_port *)port;
7957 unsigned long flags; 7854 unsigned long flags;
7958 7855
@@ -7961,7 +7858,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7961 free_irq(up->port.irq, up); 7858 free_irq(up->port.irq, up);
7962 7859
7963 /* 7860 /*
7964@@ -430,6 +450,8 @@ 7861@@ -433,6 +453,8 @@ static void serial_pxa_shutdown(struct u
7965 UART_FCR_CLEAR_RCVR | 7862 UART_FCR_CLEAR_RCVR |
7966 UART_FCR_CLEAR_XMIT); 7863 UART_FCR_CLEAR_XMIT);
7967 serial_out(up, UART_FCR, 0); 7864 serial_out(up, UART_FCR, 0);
@@ -7970,11 +7867,11 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7970 } 7867 }
7971 7868
7972 static void 7869 static void
7973Index: linux-2.6.22/arch/arm/mach-pxa/generic.c 7870Index: linux-2.6.23/arch/arm/mach-pxa/generic.c
7974=================================================================== 7871===================================================================
7975--- linux-2.6.22.orig/arch/arm/mach-pxa/generic.c 2007-09-11 12:53:11.000000000 +0200 7872--- linux-2.6.23.orig/arch/arm/mach-pxa/generic.c 2008-01-20 18:59:09.000000000 +0000
7976+++ linux-2.6.22/arch/arm/mach-pxa/generic.c 2007-09-11 12:53:37.000000000 +0200 7873+++ linux-2.6.23/arch/arm/mach-pxa/generic.c 2008-01-20 18:59:46.000000000 +0000
7977@@ -42,6 +42,7 @@ 7874@@ -38,6 +38,7 @@
7978 #include <asm/arch/mmc.h> 7875 #include <asm/arch/mmc.h>
7979 #include <asm/arch/irda.h> 7876 #include <asm/arch/irda.h>
7980 #include <asm/arch/i2c.h> 7877 #include <asm/arch/i2c.h>
@@ -7982,8 +7879,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
7982 7879
7983 #include "devices.h" 7880 #include "devices.h"
7984 #include "generic.h" 7881 #include "generic.h"
7985@@ -346,6 +347,18 @@ 7882@@ -412,6 +413,18 @@ struct platform_device pxa_device_hwuart
7986 .id = 3, 7883 .num_resources = ARRAY_SIZE(pxa_resource_hwuart),
7987 }; 7884 };
7988 7885
7989+void __init pxa_set_ffuart_info(struct platform_pxa_serial_funcs *info) 7886+void __init pxa_set_ffuart_info(struct platform_pxa_serial_funcs *info)
@@ -8001,38 +7898,25 @@ Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
8001 static struct resource pxai2c_resources[] = { 7898 static struct resource pxai2c_resources[] = {
8002 { 7899 {
8003 .start = 0x40301680, 7900 .start = 0x40301680,
8004Index: linux-2.6.22/drivers/leds/Makefile 7901Index: linux-2.6.23/drivers/leds/Makefile
8005=================================================================== 7902===================================================================
8006--- linux-2.6.22.orig/drivers/leds/Makefile 2007-09-11 12:53:14.000000000 +0200 7903--- linux-2.6.23.orig/drivers/leds/Makefile 2008-01-20 18:59:17.000000000 +0000
8007+++ linux-2.6.22/drivers/leds/Makefile 2007-09-11 12:53:37.000000000 +0200 7904+++ linux-2.6.23/drivers/leds/Makefile 2008-01-20 21:10:45.000000000 +0000
8008@@ -16,6 +16,7 @@ 7905@@ -15,6 +15,7 @@ obj-$(CONFIG_LEDS_AMS_DELTA) += leds-am
7906 obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
8009 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o 7907 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
8010 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o 7908 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
8011 obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o 7909+obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o
8012+obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o 7910 obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o
7911 obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
8013 obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o 7912 obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
8014 7913Index: linux-2.6.23/drivers/input/keyboard/Kconfig
8015 # LED Triggers
8016Index: linux-2.6.22/arch/arm/Kconfig
8017===================================================================
8018--- linux-2.6.22.orig/arch/arm/Kconfig 2007-09-11 12:53:32.000000000 +0200
8019+++ linux-2.6.22/arch/arm/Kconfig 2007-09-11 12:53:37.000000000 +0200
8020@@ -1032,6 +1032,8 @@
8021
8022 source "drivers/w1/Kconfig"
8023
8024+source "drivers/power/Kconfig"
8025+
8026 source "drivers/hwmon/Kconfig"
8027
8028 #source "drivers/l3/Kconfig"
8029Index: linux-2.6.22/drivers/input/keyboard/Kconfig
8030=================================================================== 7914===================================================================
8031--- linux-2.6.22.orig/drivers/input/keyboard/Kconfig 2007-09-11 14:28:45.000000000 +0200 7915--- linux-2.6.23.orig/drivers/input/keyboard/Kconfig 2008-01-20 18:59:16.000000000 +0000
8032+++ linux-2.6.22/drivers/input/keyboard/Kconfig 2007-09-11 14:29:05.000000000 +0200 7916+++ linux-2.6.23/drivers/input/keyboard/Kconfig 2008-01-20 18:59:46.000000000 +0000
8033@@ -253,4 +253,11 @@ 7917@@ -293,4 +293,11 @@ config KEYBOARD_BFIN
8034 To compile this driver as a module, choose M here: the 7918 To compile this driver as a module, choose M here: the
8035 module will be called gpio-keys. 7919 module will be called bf54x-keys.
8036 7920
8037+config KEYBOARD_ASIC3 7921+config KEYBOARD_ASIC3
8038+ tristate "Buttons on ASIC3 SoC GPIOs (iPaqs, etc.)" 7922+ tristate "Buttons on ASIC3 SoC GPIOs (iPaqs, etc.)"
diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
index 0f29f18573..210997df4a 100644
--- a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle
@@ -523,11 +523,9 @@ CONFIG_BT_HCIVHCI=m
523# 523#
524# Wireless 524# Wireless
525# 525#
526CONFIG_CFG80211=m 526# CONFIG_CFG80211 is not set
527CONFIG_WIRELESS_EXT=y 527CONFIG_WIRELESS_EXT=y
528CONFIG_MAC80211=m 528# CONFIG_MAC80211 is not set
529# CONFIG_MAC80211_LEDS is not set
530# CONFIG_MAC80211_DEBUG is not set
531CONFIG_IEEE80211=m 529CONFIG_IEEE80211=m
532# CONFIG_IEEE80211_DEBUG is not set 530# CONFIG_IEEE80211_DEBUG is not set
533CONFIG_IEEE80211_CRYPT_WEP=m 531CONFIG_IEEE80211_CRYPT_WEP=m
diff --git a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
index f7b20f895a..d9631e78b0 100644
--- a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
+++ b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
@@ -52,7 +52,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
52 file://pxa-serial-hack.patch;patch=1;status=hack \ 52 file://pxa-serial-hack.patch;patch=1;status=hack \
53 file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ 53 file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
54 file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \ 54 file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
55# file://htcuni.patch;patch=1 \ 55 file://htcuni.patch;patch=1 \
56 file://binutils-buildid-arm.patch;patch=1 \ 56 file://binutils-buildid-arm.patch;patch=1 \
57 file://versatile-armv6.patch;patch=1 \ 57 file://versatile-armv6.patch;patch=1 \
58 file://defconfig-c7x0 \ 58 file://defconfig-c7x0 \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 07:48:13 +0000