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
2026-04-21 21:32:12 +02:00 · 2008-01-20 21:53:21 +00:00
parent 2b726332b1
commit 2d426d0fd6
8 changed files with 353 additions and 2140 deletions
--- 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 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc6
-# Thu Jan 17 20:12:19 2008
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 18:52:49 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -77,6 +77,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -218,7 +219,8 @@ CONFIG_PCMCIA_SA1100=m
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 CONFIG_NODES_SHIFT=2
 CONFIG_SELECT_MEMORY_MODEL=y
@@ -243,7 +245,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=64M fbcon=rotate:1 dyntick=enable debug"
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M fbcon=rotate:1 dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -270,7 +272,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
-# CONFIG_ARTHUR is not set

 #
 # Power management options
@@ -323,6 +324,7 @@ CONFIG_INET_TCP_DIAG=m
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -375,6 +377,7 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
 # CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set

@@ -408,10 +411,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 # IPv6: Netfilter Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP6_NF_QUEUE is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
+# CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
@@ -1150,7 +1150,12 @@ CONFIG_EXT2_FS=m
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
 # CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=m
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -1220,7 +1225,6 @@ CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
--- 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 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc4
-# Wed Sep 26 17:55:32 2007
+# Linux kernel version: 2.6.24-rc8
+# Sun Jan 20 21:46:02 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -42,10 +42,15 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -66,13 +71,13 @@ CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -137,35 +142,21 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
+CONFIG_DMABOUNCE=y

 #
-# Intel PXA2xx Implementations
+# Intel PXA2xx/PXA3xx Implementations
 #
-# CONFIG_ARCH_LUBBOCK is not set
+CONFIG_ARCH_LUBBOCK=y
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 # CONFIG_MACH_EM_X270 is not set
-# CONFIG_MACH_HX2750 is not set
-CONFIG_MACH_HTCUNIVERSAL=y
-
-#
-# HTC Universal support
-#
-CONFIG_HTCUNIVERSAL_CORE=y
-CONFIG_HTCUNIVERSAL_UDC=y
-CONFIG_HTCUNIVERSAL_POWER=y
-CONFIG_HTCUNIVERSAL_BACKLIGHT=y
-CONFIG_HTCUNIVERSAL_LCD=y
-CONFIG_HTCUNIVERSAL_TS2=y
-CONFIG_HTCUNIVERSAL_BUTTONS=y
-CONFIG_HTCUNIVERSAL_BLUETOOTH=m
-CONFIG_HTCUNIVERSAL_ASIC3_LEDS=y
-CONFIG_HTCUNIVERSAL_PHONE=m
-# CONFIG_HTCUNIVERSAL_AK4641 is not set
-CONFIG_PXA27x=y
+# CONFIG_MACH_ZYLONITE is not set
+# CONFIG_MACH_ARMCORE is not set
+CONFIG_PXA25x=y
 # CONFIG_PXA_KEYS is not set

 #
@@ -196,16 +187,14 @@ CONFIG_ARM_THUMB=y
 # CONFIG_OUTER_CACHE is not set
 CONFIG_IWMMXT=y
 CONFIG_XSCALE_PMU=y
+CONFIG_SA1111=y
+CONFIG_FORCE_MAX_ZONEORDER=9

 #
 # Bus support
 #
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
 # CONFIG_PCCARD is not set

 #
@@ -214,6 +203,7 @@ CONFIG_XSCALE_PMU=y
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
@@ -226,11 +216,13 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
+# CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y

 #
@@ -242,6 +234,7 @@ CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
+CONFIG_CPU_FREQ_PXA25x=y

 #
 # CPU Frequency scaling
@@ -253,6 +246,8 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -283,6 +278,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
 # CONFIG_SUSPEND is not set
 CONFIG_APM_EMULATION=y

@@ -319,6 +315,7 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
@@ -354,7 +351,6 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
 # CONFIG_NETFILTER_XT_MATCH_MAC is not set
 # CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
 # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
 # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
@@ -363,6 +359,7 @@ CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 # CONFIG_NETFILTER_XT_MATCH_STRING is not set
 # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
 # CONFIG_NETFILTER_XT_MATCH_U32 is not set
 # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set

@@ -391,10 +388,20 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# QoS and/or fair queueing
-#
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
 # CONFIG_NET_SCHED is not set

 #
@@ -459,9 +466,11 @@ CONFIG_BT_HIDP=m
 #
 # Bluetooth device drivers
 #
+# CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set

@@ -482,6 +491,7 @@ CONFIG_WIRELESS_EXT=y
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -510,6 +520,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set

 #
 # RAM/ROM/Flash chip drivers
@@ -568,6 +579,8 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 # CONFIG_IDE is not set

 #
@@ -586,6 +599,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_VETH is not set
 # CONFIG_NET_ETHERNET is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
@@ -600,7 +614,6 @@ CONFIG_NET_RADIO=y
 CONFIG_ACX=m
 CONFIG_ACX_MEM=y
 # CONFIG_ACX_CS is not set
-CONFIG_ACX_HTCUNIVERSAL=m
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -632,7 +645,6 @@ CONFIG_INPUT=y
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 # CONFIG_INPUT_POWER is not set
@@ -647,7 +659,6 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_PXA27x=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_ASIC3=y
 CONFIG_INPUT_MOUSE=y
@@ -708,7 +719,6 @@ CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_R3964 is not set
@@ -780,8 +790,13 @@ CONFIG_PDA_POWER=y
 CONFIG_APM_POWER=y
 CONFIG_BATTERY_DS2760=y
 # CONFIG_HWMON is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set

 #
 # Multifunction device drivers
@@ -790,25 +805,6 @@ CONFIG_MISC_DEVICES=y
 CONFIG_HTC_ASIC3=y
 CONFIG_HTC_ASIC3_DS1WM=y

-#
-# Multi-Function Devices
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_ASIC3=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-
 #
 # Multimedia devices
 #
@@ -819,15 +815,6 @@ CONFIG_DAB=y
 #
 # Graphics support
 #
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CORGI=y
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
@@ -836,6 +823,7 @@ CONFIG_FB=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -858,6 +846,15 @@ CONFIG_FB_PXA_LCD_QVGA=y
 # CONFIG_FB_PXA_PARAMETERS is not set
 # CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CORGI=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set

 #
 # Console display driver support
@@ -883,9 +880,6 @@ CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_LOGO_OHAND_CLUT224=y
-# CONFIG_LOGO_OZ240_CLUT224 is not set
-# CONFIG_LOGO_OZ480_CLUT224 is not set
-# CONFIG_LOGO_OZ640_CLUT224 is not set

 #
 # Sound
@@ -938,6 +932,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
 # CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -956,12 +951,14 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
+CONFIG_USB_GADGET_PXA2XX=y
+CONFIG_USB_PXA2XX=y
+# CONFIG_USB_PXA2XX_SMALL is not set
 # CONFIG_USB_GADGET_M66592 is not set
-CONFIG_USB_GADGET_PXA27X=y
-CONFIG_USB_PXA27X=y
+# CONFIG_USB_GADGET_PXA27X is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
@@ -985,12 +982,28 @@ CONFIG_MMC_UNSAFE_RESUME=y
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set

 #
 # MMC/SD Host Controller Drivers
 #
 # CONFIG_MMC_PXA is not set
 CONFIG_MMC_ASIC3=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_ASIC3=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -1010,6 +1023,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
@@ -1039,19 +1053,6 @@ CONFIG_RTC_INTF_DEV=y
 #
 CONFIG_RTC_DRV_SA1100=y

-#
-# DMA Engine support
-#
-# CONFIG_DMA_ENGINE is not set
-
-#
-# DMA Clients
-#
-
-#
-# DMA Devices
-#
-
 #
 # File systems
 #
@@ -1062,7 +1063,6 @@ CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
@@ -1104,7 +1104,6 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set

 #
@@ -1125,10 +1124,7 @@ CONFIG_RAMFS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
@@ -1154,10 +1150,6 @@ CONFIG_SUNRPC=y
 #
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
@@ -1198,21 +1190,16 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
 # CONFIG_DLM is not set
-
-#
-# Profiling support
-#
+CONFIG_INSTRUMENTATION=y
 # CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set

 #
 # Kernel hacking
 #
 CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -1240,10 +1227,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_VM=y
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FORCED_INLINING=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
@@ -1254,6 +1244,7 @@ CONFIG_DEBUG_LL=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=m
@@ -1274,6 +1265,7 @@ CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_CBC is not set
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
@@ -1287,12 +1279,14 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_DEFLATE=y
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
 CONFIG_CRYPTO_HW=y

 #
--- 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
 #
 # Wireless
 #
-CONFIG_CFG80211=m
+CONFIG_CFG80211 is not set
 CONFIG_NL80211=y
 CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RCSIMPLE=y
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUG is not set
+# CONFIG_MAC80211 is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
--- 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
--- 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 @@
 drivers/net/wireless/acx/wlan_mgmt.h        |  582 ++
 25 files changed, 33355 insertions(+)

-Index: linux-2.6.22/drivers/net/wireless/acx/acx_config.h
+Index: linux-2.6.23/drivers/net/wireless/acx/acx_config.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/acx_config.h	2007-08-23 18:46:40.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/acx_config.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,50 @@
 +#define ACX_RELEASE "v0.3.36"
 +
@@ -81,10 +81,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_config.h
 +/* 0 - normal mode */
 +/* 1 - development/debug: probe for IEs on modprobe */
 +#define CMD_DISCOVERY 0
-Index: linux-2.6.22/drivers/net/wireless/acx/acx_func.h
+Index: linux-2.6.23/drivers/net/wireless/acx/acx_func.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/acx_func.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/acx_func.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,710 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -796,10 +796,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_func.h
 +#endif
 +int __init acx_cs_init(void);
 +void __exit acx_cs_cleanup(void);
-Index: linux-2.6.22/drivers/net/wireless/acx/acx.h
+Index: linux-2.6.23/drivers/net/wireless/acx/acx.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/acx.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/acx.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,14 @@
 +#if defined(CONFIG_ACX_MEM) && !defined(ACX_MEM)
 +#define ACX_MEM
@@ -815,10 +815,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx.h
 +#include "wlan_mgmt.h"
 +#include "acx_struct.h"
 +#include "acx_func.h"
-Index: linux-2.6.22/drivers/net/wireless/acx/acx_hw.h
+Index: linux-2.6.23/drivers/net/wireless/acx/acx_hw.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/acx_hw.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/acx_hw.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,18 @@
 +/*
 + * Interface for ACX slave memory driver
@@ -838,10 +838,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_hw.h
 +};
 +
 +#endif /* _ACX_HW_H */
-Index: linux-2.6.22/drivers/net/wireless/acx/acx_struct.h
+Index: linux-2.6.23/drivers/net/wireless/acx/acx_struct.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/acx_struct.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/acx_struct.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,2114 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -2957,10 +2957,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/acx_struct.h
 +};
 +
 +extern const struct iw_handler_def acx_ioctl_handler_def;
-Index: linux-2.6.22/drivers/net/wireless/acx/common.c
+Index: linux-2.6.23/drivers/net/wireless/acx/common.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/common.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/common.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,7388 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -10350,10 +10350,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/common.c
 +
 +module_init(acx_e_init_module)
 +module_exit(acx_e_cleanup_module)
-Index: linux-2.6.22/drivers/net/wireless/acx/conv.c
+Index: linux-2.6.23/drivers/net/wireless/acx/conv.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/conv.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/conv.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,504 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -10859,10 +10859,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/conv.c
 +	FN_EXIT1((int)NULL);
 +	return NULL;
 +}
-Index: linux-2.6.22/drivers/net/wireless/acx/cs.c
+Index: linux-2.6.23/drivers/net/wireless/acx/cs.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/cs.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/cs.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,5703 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -16567,10 +16567,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/cs.c
 +MODULE_DESCRIPTION( "ACX Cardbus Driver" );
 +MODULE_LICENSE( "GPL" );
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/htcsable_acx.c
+Index: linux-2.6.23/drivers/net/wireless/acx/htcsable_acx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/htcsable_acx.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/htcsable_acx.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,118 @@
 +/*
 + * WLAN (TI TNETW1100B) support in the HTC Sable
@@ -16690,10 +16690,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/htcsable_acx.c
 +MODULE_DESCRIPTION( "WLAN driver for HTC Sable" );
 +MODULE_LICENSE( "GPL" );
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/htcuniversal_acx.c
+Index: linux-2.6.23/drivers/net/wireless/acx/htcuniversal_acx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/htcuniversal_acx.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/htcuniversal_acx.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,108 @@
 +/*
 + * WLAN (TI TNETW1100B) support in the HTC Universal
@@ -16803,10 +16803,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/htcuniversal_acx.c
 +MODULE_DESCRIPTION( "WLAN driver for HTC Universal" );
 +MODULE_LICENSE( "GPL" );
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/hx4700_acx.c
+Index: linux-2.6.23/drivers/net/wireless/acx/hx4700_acx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/hx4700_acx.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/hx4700_acx.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,108 @@
 +/*
 + * WLAN (TI TNETW1100B) support in the hx470x.
@@ -16916,10 +16916,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/hx4700_acx.c
 +MODULE_DESCRIPTION( "WLAN driver for iPAQ hx4700" );
 +MODULE_LICENSE( "GPL" );
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/ioctl.c
+Index: linux-2.6.23/drivers/net/wireless/acx/ioctl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/ioctl.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/ioctl.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,2748 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -19669,10 +19669,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/ioctl.c
 +	.get_wireless_stats = acx_e_get_wireless_stats
 +#endif /* IW > 5 */
 +};
-Index: linux-2.6.22/drivers/net/wireless/acx/Kconfig
+Index: linux-2.6.23/drivers/net/wireless/acx/Kconfig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/Kconfig	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/Kconfig	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,113 @@
 +config ACX
 +	tristate "TI acx100/acx111 802.11b/g wireless chipsets"
@@ -19787,10 +19787,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/Kconfig
 +	---help---
 +	Include memory interface support in acx for the IPAQ RX3000.
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/Makefile
+Index: linux-2.6.23/drivers/net/wireless/acx/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/Makefile	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/Makefile	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,21 @@
 +#obj-m += acx.o
 +
@@ -19813,10 +19813,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/Makefile
 +acx-obj-$(CONFIG_ACX_CS) += cs.o
 +#
 +acx-objs := wlan.o conv.o ioctl.o common.o $(acx-obj-y)
-Index: linux-2.6.22/drivers/net/wireless/acx/mem.c
+Index: linux-2.6.23/drivers/net/wireless/acx/mem.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/mem.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/mem.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,5363 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -25181,10 +25181,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/mem.c
 +MODULE_DESCRIPTION( "ACX Slave Memory Driver" );
 +MODULE_LICENSE( "GPL" );
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/pci.c
+Index: linux-2.6.23/drivers/net/wireless/acx/pci.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/pci.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/pci.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,4234 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -29420,10 +29420,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/pci.c
 +
 +	FN_EXIT0;
 +}
-Index: linux-2.6.22/drivers/net/wireless/acx/rx3000_acx.c
+Index: linux-2.6.23/drivers/net/wireless/acx/rx3000_acx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/rx3000_acx.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/rx3000_acx.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,110 @@
 +/*
 + * 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
 +MODULE_DESCRIPTION("WLAN driver for HP iPAQ RX3000");
 +MODULE_LICENSE("GPL");
 +
-Index: linux-2.6.22/drivers/net/wireless/acx/setrate.c
+Index: linux-2.6.23/drivers/net/wireless/acx/setrate.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/setrate.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/setrate.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,213 @@
 +/* TODO: stop #including, move into wireless.c
 + * 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
 +		return -EINVAL;
 +	return 0;
 +}
-Index: linux-2.6.22/drivers/net/wireless/acx/usb.c
+Index: linux-2.6.23/drivers/net/wireless/acx/usb.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/usb.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/usb.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,1922 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -31680,10 +31680,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/usb.c
 +#endif /* UNUSED */
 +
 +#endif /* ACX_DEBUG */
-Index: linux-2.6.22/drivers/net/wireless/acx/wlan.c
+Index: linux-2.6.23/drivers/net/wireless/acx/wlan.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/wlan.c	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/wlan.c	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,424 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -32109,10 +32109,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan.c
 +
 +	/*-- Information elements */
 +}
-Index: linux-2.6.22/drivers/net/wireless/acx/wlan_compat.h
+Index: linux-2.6.23/drivers/net/wireless/acx/wlan_compat.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/wlan_compat.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/wlan_compat.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,260 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -32374,10 +32374,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan_compat.h
 +	u8	oui[WLAN_IEEE_OUI_LEN];
 +	u16	type;
 +} WLAN_PACKED wlan_snap_t;
-Index: linux-2.6.22/drivers/net/wireless/acx/wlan_hdr.h
+Index: linux-2.6.23/drivers/net/wireless/acx/wlan_hdr.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/wlan_hdr.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/wlan_hdr.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,497 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -32876,10 +32876,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan_hdr.h
 +#define WLANSNIFFFRM_rate	0x8041
 +#define WLANSNIFFFRM_istx	0x9041
 +#define WLANSNIFFFRM_frmlen	0xA041
-Index: linux-2.6.22/drivers/net/wireless/acx/wlan_mgmt.h
+Index: linux-2.6.23/drivers/net/wireless/acx/wlan_mgmt.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/net/wireless/acx/wlan_mgmt.h	2007-08-23 18:34:19.000000000 +0200
+++ linux-2.6.23/drivers/net/wireless/acx/wlan_mgmt.h	2008-01-20 21:13:40.000000000 +0000
@@ -0,0 +1,582 @@
 +/***********************************************************************
 +** Copyright (C) 2003  ACX100 Open Source Project
@@ -33463,10 +33463,10 @@ Index: linux-2.6.22/drivers/net/wireless/acx/wlan_mgmt.h
 +		ie->virt_bm[0] = 0;
 +	return p + len + 3 + 2;
 +}
-Index: linux-2.6.22/drivers/net/wireless/Kconfig
+Index: linux-2.6.23/drivers/net/wireless/Kconfig
 ===================================================================
--- linux-2.6.22.orig/drivers/net/wireless/Kconfig	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/net/wireless/Kconfig	2007-08-23 18:34:19.000000000 +0200
+--- linux-2.6.23.orig/drivers/net/wireless/Kconfig	2008-01-20 21:13:17.000000000 +0000
+++ linux-2.6.23/drivers/net/wireless/Kconfig	2008-01-20 21:15:12.000000000 +0000
@@ -5,6 +5,36 @@
 menu "Wireless LAN"
 	depends on !S390
@@ -33504,18 +33504,19 @@ Index: linux-2.6.22/drivers/net/wireless/Kconfig
 config WLAN_PRE80211
 	bool "Wireless LAN (pre-802.11)"
 	depends on NETDEVICES
-@@ -549,5 +579,6 @@
- source "drivers/net/wireless/hostap/Kconfig"
- source "drivers/net/wireless/bcm43xx/Kconfig"
- source "drivers/net/wireless/zd1211rw/Kconfig"
-+source "drivers/net/wireless/acx/Kconfig"
+@@ -650,6 +680,7 @@ config P54_PCI
 
- endmenu
-Index: linux-2.6.22/drivers/net/wireless/Makefile
+ source "drivers/net/wireless/iwlwifi/Kconfig"
+ source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/acx/Kconfig"
+ source "drivers/net/wireless/bcm43xx/Kconfig"
+ source "drivers/net/wireless/b43/Kconfig"
+ source "drivers/net/wireless/b43legacy/Kconfig"
+Index: linux-2.6.23/drivers/net/wireless/Makefile
 ===================================================================
--- linux-2.6.22.orig/drivers/net/wireless/Makefile	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/net/wireless/Makefile	2007-08-23 18:34:19.000000000 +0200
-@@ -34,6 +34,8 @@
+--- linux-2.6.23.orig/drivers/net/wireless/Makefile	2008-01-20 21:13:17.000000000 +0000
+++ linux-2.6.23/drivers/net/wireless/Makefile	2008-01-20 21:13:40.000000000 +0000
+@@ -34,6 +34,8 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel
 
 obj-$(CONFIG_PRISM54)		+= prism54/
 
@@ -33523,4 +33524,4 @@ Index: linux-2.6.22/drivers/net/wireless/Makefile
 +
 obj-$(CONFIG_HOSTAP)		+= hostap/
 obj-$(CONFIG_BCM43XX)		+= bcm43xx/
- obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+ obj-$(CONFIG_B43)		+= b43/
--- 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 @@
 arch/arm/Kconfig                                         |    2 
 arch/arm/mach-pxa/Kconfig                                |   89 +
 arch/arm/mach-pxa/Makefile                               |    1 
- arch/arm/mach-pxa/corgi.c                                |    3 
 arch/arm/mach-pxa/generic.c                              |   13 
 arch/arm/mach-pxa/htcuniversal/Makefile                  |   19 
 arch/arm/mach-pxa/htcuniversal/htcuniversal.c            |  468 +++++
@@ -22,9 +21,8 @@
 arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c        |  490 ++++++
 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c        |   71 
 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h              |   20 
- arch/arm/mach-pxa/spitz.c                                |    2 
 drivers/input/keyboard/Kconfig                           |    7 
- drivers/input/keyboard/Makefile                          |    2 
+ drivers/input/keyboard/Makefile                          |    1 
 drivers/input/keyboard/asic3_keys.c                      |  131 +
 drivers/leds/Kconfig                                     |    7 
 drivers/leds/Makefile                                    |    1 
@@ -35,12 +33,10 @@
 drivers/mfd/soc-core.c                                   |  106 +
 drivers/mfd/soc-core.h                                   |   30 
 drivers/mmc/host/Kconfig                                 |    6 
- drivers/mmc/host/Makefile                                |    2 
+ drivers/mmc/host/Makefile                                |    1 
 drivers/mmc/host/asic3_mmc.c                             |  900 +++++++++++
 drivers/mmc/host/asic3_mmc.h                             |   25 
 drivers/serial/pxa.c                                     |   22 
- drivers/video/backlight/Kconfig                          |    2 
- drivers/video/backlight/corgi_bl.c                       |    4 
 include/asm-arm/arch-pxa/clock.h                         |   27 
 include/asm-arm/arch-pxa/htcuniversal-asic.h             |  213 ++
 include/asm-arm/arch-pxa/htcuniversal-gpio.h             |  220 ++
@@ -50,7 +46,6 @@
 include/asm-arm/arch-pxa/pxa-pm_ll.h                     |    6 
 include/asm-arm/arch-pxa/pxa-regs.h                      |    2 
 include/asm-arm/arch-pxa/serial.h                        |   78 
- include/asm-arm/arch-pxa/sharpsl.h                       |    6 
 include/asm-arm/hardware/asic3_keys.h                    |   18 
 include/asm-arm/hardware/asic3_leds.h                    |   34 
 include/asm-arm/hardware/ipaq-asic3.h                    |  602 +++++++
@@ -60,12 +55,12 @@
 include/linux/ioport.h                                   |    1 
 include/linux/soc/asic3_base.h                           |  104 +
 include/linux/soc/tmio_mmc.h                             |   17 
- 61 files changed, 7475 insertions(+), 14 deletions(-)
+ 56 files changed, 7469 insertions(+), 1 deletion(-)

-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/Makefile	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,19 @@
 +#
 +# Makefile for HTC Universal
@@ -86,10 +81,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
 +obj-$(CONFIG_HTCUNIVERSAL_UDC)		+= htcuniversal_udc.o
 +
 +obj-$(CONFIG_HTCUNIVERSAL_AK4641)	+= htcuniversal_ak4641.o
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,468 @@
 +/*
 + * Hardware definitions for HTC Universal
@@ -559,10 +554,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
 +	.init_machine	= htcuniversal_init,
 +	.timer		= &pxa_timer,
 +MACHINE_END
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,917 @@
 +/*
 + * Audio support for codec Asahi Kasei AK4641
@@ -1481,10 +1476,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
 +MODULE_LICENSE("GPL");
 +
 +/* end {{ Module }} */
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,65 @@
 +/*
 + * Audio support for codec Asahi Kasei AK4641
@@ -1551,10 +1546,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
 +void snd_ak4641_hp_detected(struct snd_ak4641 *ak, int detected); /* atomic context */
 +
 +#endif /* __SOUND_AK4641_H */
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,143 @@
 +/*
 + * 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
 +MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>");
 +MODULE_DESCRIPTION("htcuniversal LEDs driver");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,61 @@
 +/*
 + * 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
 +MODULE_AUTHOR("Paul Sokolovsky <pmiscml@gmail.com>");
 +MODULE_DESCRIPTION("Backlight driver for HTC Universal");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,135 @@
 +/* Bluetooth interface driver for TI BRF6150 on HX4700
 + *
@@ -1905,10 +1900,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
 +
 +/* vim600: set noexpandtab sw=8 ts=8 :*/
 +
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,17 @@
 +/*
 + * 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
 +
 +
 +#endif
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,87 @@
 +/*
 + * Buttons driver for HTC Universal
@@ -2019,10 +2014,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
 +MODULE_AUTHOR ("Joshua Wise, Pawel Kolodziejski, Paul Sokolosvky");
 +MODULE_DESCRIPTION ("Buttons support for HTC Universal");
 +MODULE_LICENSE ("GPL");
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,226 @@
 +/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs)
 + *
@@ -2250,10 +2245,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
 +MODULE_LICENSE("GPL");
 +
 +/* vim600: set noexpandtab sw=8 ts=8 :*/
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,212 @@
 +/*
 + * 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
 +MODULE_DESCRIPTION("Framebuffer driver for HTC Universal");
 +MODULE_LICENSE("GPL");
 +
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,167 @@
 +
 +/* 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
 +MODULE_LICENSE("GPL");
 +
 +/* vim600: set noexpandtab sw=8 ts=8 :*/
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,16 @@
 +/*
 + * 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
 +};
 +
 +#endif
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,69 @@
 +/*
 + * 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
 +	pxa_pm_set_ll_ops(&htcuniversal_ll_pm_ops);
 +}
 +#endif /* CONFIG_PM */
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,97 @@
 +/*
 + * pda_power driver for HTC Universal
@@ -2836,10 +2831,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
 +
 +MODULE_DESCRIPTION("Power driver for HTC Universal");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,490 @@
 +/* Touch screen driver for the TI something-or-other
 + *
@@ -3331,10 +3326,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Aric Blumer, SDG Systems, LLC");
 +MODULE_DESCRIPTION("HTC Universal Touch Screen Driver");
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,71 @@
 +
 +/*
@@ -3407,10 +3402,10 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
 +
 +module_init(htcuniversal_udc_init);
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
+Index: linux-2.6.23/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,20 @@
 +/*
 + * temporary TSC2046 touchscreen hack
@@ -3432,11 +3427,11 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
 +#define TSC2046_SAMPLE_Y 0x90
 +
 +#endif
-Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
+Index: linux-2.6.23/arch/arm/mach-pxa/Kconfig
 ===================================================================
--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig	2007-09-11 12:53:33.000000000 +0200
-+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig	2007-09-11 12:53:37.000000000 +0200
-@@ -50,6 +50,14 @@
+--- linux-2.6.23.orig/arch/arm/mach-pxa/Kconfig	2008-01-20 18:59:41.000000000 +0000
+++ linux-2.6.23/arch/arm/mach-pxa/Kconfig	2008-01-20 18:59:46.000000000 +0000
+@@ -92,6 +92,14 @@ config MACH_HX2750
 	help
 	  This enables support for the HP iPAQ HX2750 handheld.
 
@@ -3450,8 +3445,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
 +
 endchoice
 
- if PXA_SHARPSL
-@@ -84,6 +92,86 @@
+ endif
+@@ -111,6 +119,86 @@ endchoice
 
 endif
 
@@ -3538,34 +3533,34 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
 endmenu
 
 config MACH_POODLE
-@@ -164,4 +252,3 @@
+@@ -196,4 +284,3 @@ config PXA_KEYS
 	depends on (PXA25x || PXA27x) && INPUT
 
 endif
 -
-Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
+Index: linux-2.6.23/arch/arm/mach-pxa/Makefile
 ===================================================================
--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile	2007-09-11 12:53:33.000000000 +0200
-+++ linux-2.6.22/arch/arm/mach-pxa/Makefile	2007-09-11 12:53:37.000000000 +0200
-@@ -20,6 +20,7 @@
- obj-$(CONFIG_MACH_TOSA)         += tosa.o
- obj-$(CONFIG_MACH_EM_X270) += em-x270.o
+--- linux-2.6.23.orig/arch/arm/mach-pxa/Makefile	2008-01-20 18:59:41.000000000 +0000
+++ linux-2.6.23/arch/arm/mach-pxa/Makefile	2008-01-20 18:59:46.000000000 +0000
+@@ -23,6 +23,7 @@ obj-$(CONFIG_MACH_POODLE)	+= poodle.o co
+ obj-$(CONFIG_MACH_TOSA)		+= tosa.o
+ obj-$(CONFIG_MACH_EM_X270)	+= em-x270.o
 obj-$(CONFIG_MACH_HX2750)	+= hx2750.o hx2750_test.o
 +obj-$(CONFIG_MACH_HTCUNIVERSAL) += htcuniversal/
 
- # Support for blinky lights
- led-y := leds.o
-Index: linux-2.6.22/drivers/leds/Kconfig
+ ifeq ($(CONFIG_MACH_ZYLONITE),y)
+   obj-y				+= zylonite.o
+Index: linux-2.6.23/drivers/leds/Kconfig
 ===================================================================
--- linux-2.6.22.orig/drivers/leds/Kconfig	2007-09-11 12:53:14.000000000 +0200
-+++ linux-2.6.22/drivers/leds/Kconfig	2007-09-11 12:53:37.000000000 +0200
-@@ -101,6 +101,13 @@
- 	  outputs. To be useful the particular board must have LEDs
- 	  and they must be connected to the GPIO lines.
+--- linux-2.6.23.orig/drivers/leds/Kconfig	2008-01-20 18:59:17.000000000 +0000
+++ linux-2.6.23/drivers/leds/Kconfig	2008-01-20 18:59:46.000000000 +0000
+@@ -114,6 +114,13 @@ config LEDS_CM_X270
+ 	help
+ 	  This option enables support for the CM-X270 LEDs.
 
 +config LEDS_ASIC3
 +	tristate "LED Support for the HTC ASIC3 chip"
-+	depends LEDS_CLASS && HTC_ASIC3
+	depends on LEDS_CLASS && HTC_ASIC3
 +	help
 +	  This option enables support for the LEDs connected to the
 +	  HTC ASIC3 chip.
@@ -3573,10 +3568,10 @@ Index: linux-2.6.22/drivers/leds/Kconfig
 comment "LED Triggers"
 
 config LEDS_TRIGGERS
-Index: linux-2.6.22/drivers/leds/leds-asic3.c
+Index: linux-2.6.23/drivers/leds/leds-asic3.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/leds/leds-asic3.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/leds/leds-asic3.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,189 @@
 +/*
 + * LEDs support for HTC ASIC3 devices.
@@ -3767,13 +3762,13 @@ Index: linux-2.6.22/drivers/leds/leds-asic3.c
 +MODULE_AUTHOR("Anton Vorontsov <cbou@mail.ru>");
 +MODULE_DESCRIPTION("HTC ASIC3 LEDs driver");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22/drivers/mfd/Kconfig
+Index: linux-2.6.23/drivers/mfd/Kconfig
 ===================================================================
--- linux-2.6.22.orig/drivers/mfd/Kconfig	2007-09-11 12:53:30.000000000 +0200
-+++ linux-2.6.22/drivers/mfd/Kconfig	2007-09-11 12:53:37.000000000 +0200
-@@ -15,6 +15,16 @@
- 	  interface. The device may be connected by PCI or local bus with
- 	  varying functions enabled.
+--- linux-2.6.23.orig/drivers/mfd/Kconfig	2008-01-20 18:59:38.000000000 +0000
+++ linux-2.6.23/drivers/mfd/Kconfig	2008-01-20 18:59:46.000000000 +0000
+@@ -21,6 +21,16 @@ config MFD_TSC2101
+ 	help
+ 	  Support for TI TSC2101 Touchscreen and Audio Codec
 
 +config HTC_ASIC3
 +        tristate "HTC ASIC3 (iPAQ h1900/h3900/h4000/hx4700/rx3000) support"
@@ -3788,10 +3783,10 @@ Index: linux-2.6.22/drivers/mfd/Kconfig
 endmenu
 
 menu "Multimedia Capabilities Port drivers"
-Index: linux-2.6.22/drivers/mfd/Makefile
+Index: linux-2.6.23/drivers/mfd/Makefile
 ===================================================================
--- linux-2.6.22.orig/drivers/mfd/Makefile	2007-09-11 12:53:30.000000000 +0200
-+++ linux-2.6.22/drivers/mfd/Makefile	2007-09-11 12:53:37.000000000 +0200
+--- linux-2.6.23.orig/drivers/mfd/Makefile	2008-01-20 18:59:38.000000000 +0000
+++ linux-2.6.23/drivers/mfd/Makefile	2008-01-20 18:59:46.000000000 +0000
@@ -2,6 +2,8 @@
 # Makefile for multifunction miscellaneous devices
 #
@@ -3801,10 +3796,10 @@ Index: linux-2.6.22/drivers/mfd/Makefile
 obj-$(CONFIG_MFD_SM501)		+= sm501.o
 
 obj-$(CONFIG_MCP)		+= mcp-core.o
-Index: linux-2.6.22/drivers/mfd/asic3_base.c
+Index: linux-2.6.23/drivers/mfd/asic3_base.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mfd/asic3_base.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/mfd/asic3_base.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,1208 @@
 +/*
 + * Driver interface to HTC "ASIC3"
@@ -5014,10 +5009,10 @@ Index: linux-2.6.22/drivers/mfd/asic3_base.c
 +MODULE_AUTHOR("Phil Blundell <pb@handhelds.org>");
 +MODULE_DESCRIPTION("Core driver for HTC ASIC3");
 +MODULE_SUPPORTED_DEVICE("asic3");
-Index: linux-2.6.22/drivers/mfd/soc-core.c
+Index: linux-2.6.23/drivers/mfd/soc-core.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mfd/soc-core.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/mfd/soc-core.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,106 @@
 +/*
 + * drivers/soc/soc-core.c
@@ -5125,10 +5120,10 @@ Index: linux-2.6.22/drivers/mfd/soc-core.c
 +	return NULL;
 +}
 +EXPORT_SYMBOL_GPL(soc_add_devices);
-Index: linux-2.6.22/drivers/mfd/soc-core.h
+Index: linux-2.6.23/drivers/mfd/soc-core.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mfd/soc-core.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/mfd/soc-core.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,30 @@
 +/*
 + * drivers/soc/soc-core.h
@@ -5160,10 +5155,10 @@ Index: linux-2.6.22/drivers/mfd/soc-core.h
 +
 +void soc_free_devices(struct platform_device *devices, int nr_devs);
 +
-Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/clock.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/clock.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,27 @@
 +/*
 + *  linux/include/asm-arm/arch-pxa/clock.h
@@ -5192,10 +5187,10 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
 +
 +extern int clk_register(struct clk *clk);
 +extern void clk_unregister(struct clk *clk);
-Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-asic.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-asic.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,213 @@
 +/*
 + * 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
 +
 +#endif /* _HTCUNIVERSAL_ASIC_H_ */
 +
-Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-gpio.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-gpio.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,220 @@
 +/*
 + * 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
 +#define GPIO_NR_HTCUNIVERSAL_I2C_SDA_MD			(118 | GPIO_ALT_FN_1_OUT)
 +
 +#endif /* _HTCUNIVERSAL_GPIO_H */
-Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-init.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal-init.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,14 @@
 +/*
 + * 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
 +
 +#endif /* _HTCUNIVERSAL_INIT_H_ */
 +
-Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/htcuniversal.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,3 @@
 +#include <asm/arch/irqs.h>
 +
 +#define HTCUNIVERSAL_ASIC3_IRQ_BASE IRQ_BOARD_START
-Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/pxa-pm_ll.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa-pm_ll.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,6 @@
 +struct pxa_ll_pm_ops {
 +	void (*suspend)(unsigned long);
@@ -5673,27 +5668,10 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
 +};
 +
 +extern struct pxa_ll_pm_ops *pxa_pm_set_ll_ops(struct pxa_ll_pm_ops *new_ops);
-Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
-===================================================================
--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h	2007-09-11 12:53:37.000000000 +0200
-@@ -25,12 +25,6 @@
- /*
-  * SharpSL Backlight
-  */
-struct corgibl_machinfo {
-	int max_intensity;
-	int default_intensity;
-	int limit_mask;
-	void (*set_bl_intensity)(int intensity);
-};
- extern void corgibl_limit_intensity(int limit);
- 
- 
-Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
+Index: linux-2.6.23/include/asm-arm/hardware/asic3_keys.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/hardware/asic3_keys.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,18 @@
 +#include <linux/input.h>
 +
@@ -5713,10 +5691,10 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
 +        struct input_dev *input;
 +        struct device *asic3_dev;
 +};
-Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
+Index: linux-2.6.23/include/asm-arm/hardware/asic3_leds.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/hardware/asic3_leds.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,34 @@
 +/*
 + * LEDs support for HTC ASIC3 devices.
@@ -5752,10 +5730,10 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
 +extern int asic3_leds_register(void);
 +extern void asic3_leds_unregister(void);
 +
-Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
+Index: linux-2.6.23/include/asm-arm/hardware/ipaq-asic3.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/hardware/ipaq-asic3.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,602 @@
 +/*
 + *
@@ -6359,26 +6337,10 @@ Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
 +#define IPAQ_ASIC3_MAP_SIZE	     0x2000
 +
 +#endif
-Index: linux-2.6.22/include/linux/backlight.h
-===================================================================
--- linux-2.6.22.orig/include/linux/backlight.h	2007-09-11 12:53:26.000000000 +0200
-+++ linux-2.6.22/include/linux/backlight.h	2007-09-11 12:53:37.000000000 +0200
-@@ -92,4 +92,11 @@
- 	return dev_get_drvdata(&bl_dev->dev);
- }
- 
-+struct generic_bl_info {
-+	int max_intensity;
-+	int default_intensity;
-+	int limit_mask;
-+	void (*set_bl_intensity)(int intensity);
-+};
-+
- #endif
-Index: linux-2.6.22/include/linux/gpiodev.h
+Index: linux-2.6.23/include/linux/gpiodev.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/gpiodev.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/linux/gpiodev.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,44 @@
 +#ifndef __GPIODEV_H
 +#define __GPIODEV_H
@@ -6424,10 +6386,10 @@ Index: linux-2.6.22/include/linux/gpiodev.h
 +}
 +
 +#endif /* __GPIODEV_H */
-Index: linux-2.6.22/include/linux/input_pda.h
+Index: linux-2.6.23/include/linux/input_pda.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/input_pda.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/linux/input_pda.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,47 @@
 +#ifndef _INPUT_PDA_H
 +#define _INPUT_PDA_H
@@ -6476,10 +6438,10 @@ Index: linux-2.6.22/include/linux/input_pda.h
 +#define _KEY_HOMEPAGE	_KEY_APP4
 +
 +#endif
-Index: linux-2.6.22/include/linux/soc/asic3_base.h
+Index: linux-2.6.23/include/linux/soc/asic3_base.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/soc/asic3_base.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/linux/soc/asic3_base.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,104 @@
 +#include <asm/types.h>
 +#include <linux/gpiodev.h>
@@ -6585,10 +6547,10 @@ Index: linux-2.6.22/include/linux/soc/asic3_base.h
 +
 +	struct tmio_mmc_hwconfig *tmio_mmc_hwconfig;
 +};
-Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
+Index: linux-2.6.23/include/linux/soc/tmio_mmc.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/soc/tmio_mmc.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/linux/soc/tmio_mmc.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,17 @@
 +#include <linux/platform_device.h>
 +
@@ -6607,11 +6569,11 @@ Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
 +	int (*mmc_get_ro)(struct platform_device *pdev);
 +	short address_shift;
 +};
-Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/pxa-regs.h
 ===================================================================
--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h	2007-09-11 12:53:34.000000000 +0200
-+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h	2007-09-11 12:53:37.000000000 +0200
-@@ -2043,6 +2043,8 @@
+--- linux-2.6.23.orig/include/asm-arm/arch-pxa/pxa-regs.h	2008-01-20 18:59:40.000000000 +0000
+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa-regs.h	2008-01-20 18:59:46.000000000 +0000
+@@ -2058,6 +2058,8 @@
 #define LDCMD_SOFINT	(1 << 22)
 #define LDCMD_EOFINT	(1 << 21)
 
@@ -6620,13 +6582,13 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
 
 #define LCCR5_SOFM1	(1<<0)		/* Start Of Frame Mask for Overlay 1 (channel 1) */
 #define LCCR5_SOFM2	(1<<1)		/* Start Of Frame Mask for Overlay 2 (channel 2) */
-Index: linux-2.6.22/drivers/mmc/host/Kconfig
+Index: linux-2.6.23/drivers/mmc/host/Kconfig
 ===================================================================
--- linux-2.6.22.orig/drivers/mmc/host/Kconfig	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/mmc/host/Kconfig	2007-09-11 12:53:37.000000000 +0200
-@@ -100,3 +100,9 @@
-           To compile this driver as a module, choose M here: the
- 	  module will be called tifm_sd.
+--- linux-2.6.23.orig/drivers/mmc/host/Kconfig	2008-01-20 18:59:18.000000000 +0000
+++ linux-2.6.23/drivers/mmc/host/Kconfig	2008-01-20 18:59:46.000000000 +0000
+@@ -130,3 +130,9 @@ config MMC_SPI
+ 
+ 	  If unsure, or if your system has no SPI master driver, say N.
 
 +config MMC_ASIC3
 +	tristate "HTC ASIC3 SD/MMC support"
@@ -6634,20 +6596,22 @@ Index: linux-2.6.22/drivers/mmc/host/Kconfig
 +	help
 +	  This provides support for the ASIC3 SD/MMC controller, used
 +	  in the iPAQ hx4700 and others.
-Index: linux-2.6.22/drivers/mmc/host/Makefile
+Index: linux-2.6.23/drivers/mmc/host/Makefile
 ===================================================================
--- linux-2.6.22.orig/drivers/mmc/host/Makefile	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/mmc/host/Makefile	2007-09-11 12:53:37.000000000 +0200
-@@ -15,4 +15,4 @@
+--- linux-2.6.23.orig/drivers/mmc/host/Makefile	2008-01-20 18:59:18.000000000 +0000
+++ linux-2.6.23/drivers/mmc/host/Makefile	2008-01-20 21:12:10.000000000 +0000
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o
+ obj-$(CONFIG_MMC_RICOH_MMC)	+= ricoh_mmc.o
+ obj-$(CONFIG_MMC_WBSD)		+= wbsd.o
+ obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
+obj-$(CONFIG_MMC_ASIC3)         += asic3_mmc.o
 obj-$(CONFIG_MMC_OMAP)		+= omap.o
 obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
 obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o
-
-+obj-$(CONFIG_MMC_ASIC3)         += asic3_mmc.o
-Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
+Index: linux-2.6.23/drivers/mmc/host/asic3_mmc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/mmc/host/asic3_mmc.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,900 @@
 +/* Note that this driver can likely be merged into the tmio driver, so
 + * consider this code temporary.  It works, though.
@@ -7549,10 +7513,10 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
 +MODULE_AUTHOR("Aric Blumer, SDG Systems, LLC");
 +MODULE_LICENSE("GPL");
 +
-Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
+Index: linux-2.6.23/drivers/mmc/host/asic3_mmc.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/mmc/host/asic3_mmc.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,25 @@
 +#ifndef __ASIC3_MMC_H
 +#define __ASIC3_MMC_H
@@ -7579,20 +7543,22 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
 +#define DONT_CARE_BUFFER_BITS ( SD_CTRL_INTMASKBUFFER_UNK7 | SD_CTRL_INTMASKBUFFER_CMD_BUSY )
 +
 +#endif // __ASIC3_MMC_H
-Index: linux-2.6.22/drivers/input/keyboard/Makefile
+Index: linux-2.6.23/drivers/input/keyboard/Makefile
 ===================================================================
--- linux-2.6.22.orig/drivers/input/keyboard/Makefile	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/input/keyboard/Makefile	2007-09-11 12:53:37.000000000 +0200
-@@ -21,4 +21,4 @@
- obj-$(CONFIG_KEYBOARD_PXA27x)		+= pxa27x_keyboard.o
- obj-$(CONFIG_KEYBOARD_AAED2000)		+= aaed2000_kbd.o
- obj-$(CONFIG_KEYBOARD_GPIO)		+= gpio_keys.o
-
+--- linux-2.6.23.orig/drivers/input/keyboard/Makefile	2008-01-20 18:59:16.000000000 +0000
+++ linux-2.6.23/drivers/input/keyboard/Makefile	2008-01-20 21:11:40.000000000 +0000
+@@ -15,6 +15,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON)		+= newton
+ obj-$(CONFIG_KEYBOARD_STOWAWAY)		+= stowaway.o
+ obj-$(CONFIG_KEYBOARD_CORGI)		+= corgikbd.o
+ obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
 +obj-$(CONFIG_KEYBOARD_ASIC3)		+= asic3_keys.o
-Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
+ obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
+ obj-$(CONFIG_KEYBOARD_HIL_OLD)		+= hilkbd.o
+ obj-$(CONFIG_KEYBOARD_OMAP)		+= omap-keypad.o
+Index: linux-2.6.23/drivers/input/keyboard/asic3_keys.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/drivers/input/keyboard/asic3_keys.c	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,131 @@
 +/*
 + * Generic buttons driver for ASIC3 SoC.
@@ -7725,11 +7691,11 @@ Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
 +MODULE_AUTHOR("Joshua Wise, Pawel Kolodziejski, Paul Sokolovsky");
 +MODULE_DESCRIPTION("Buttons driver for HTC ASIC3 SoC");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/irqs.h
 ===================================================================
--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h	2007-09-11 12:53:24.000000000 +0200
-+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h	2007-09-11 12:53:37.000000000 +0200
-@@ -172,6 +172,8 @@
+--- linux-2.6.23.orig/include/asm-arm/arch-pxa/irqs.h	2008-01-20 18:59:28.000000000 +0000
+++ linux-2.6.23/include/asm-arm/arch-pxa/irqs.h	2008-01-20 18:59:46.000000000 +0000
+@@ -182,6 +182,8 @@
       defined(CONFIG_MACH_LOGICPD_PXA270) || \
       defined(CONFIG_MACH_MAINSTONE)
 #define NR_IRQS			(IRQ_BOARD_END)
@@ -7738,11 +7704,11 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
 #else
 #define NR_IRQS			(IRQ_BOARD_START)
 #endif
-Index: linux-2.6.22/include/linux/ioport.h
+Index: linux-2.6.23/include/linux/ioport.h
 ===================================================================
--- linux-2.6.22.orig/include/linux/ioport.h	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/include/linux/ioport.h	2007-09-11 12:53:37.000000000 +0200
-@@ -56,6 +56,7 @@
+--- linux-2.6.23.orig/include/linux/ioport.h	2008-01-20 18:59:31.000000000 +0000
+++ linux-2.6.23/include/linux/ioport.h	2008-01-20 18:59:46.000000000 +0000
+@@ -56,6 +56,7 @@ struct resource_list {
 #define IORESOURCE_IRQ_HIGHLEVEL	(1<<2)
 #define IORESOURCE_IRQ_LOWLEVEL		(1<<3)
 #define IORESOURCE_IRQ_SHAREABLE	(1<<4)
@@ -7750,79 +7716,10 @@ Index: linux-2.6.22/include/linux/ioport.h
 
 /* ISA PnP DMA specific bits (IORESOURCE_BITS) */
 #define IORESOURCE_DMA_TYPE_MASK	(3<<0)
-Index: linux-2.6.22/drivers/video/backlight/Kconfig
-===================================================================
--- linux-2.6.22.orig/drivers/video/backlight/Kconfig	2007-09-11 12:53:30.000000000 +0200
-+++ linux-2.6.22/drivers/video/backlight/Kconfig	2007-09-11 12:53:37.000000000 +0200
-@@ -40,7 +40,7 @@
- 
- config BACKLIGHT_CORGI
- 	tristate "Sharp Corgi Backlight Driver (SL Series)"
-	depends on BACKLIGHT_CLASS_DEVICE && PXA_SHARPSL
-+	depends on BACKLIGHT_CLASS_DEVICE
- 	default y
- 	help
- 	  If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
-Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
-===================================================================
--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c	2007-09-11 12:53:37.000000000 +0200
-@@ -24,7 +24,7 @@
- static int corgibl_intensity;
- static struct backlight_properties corgibl_data;
- static struct backlight_device *corgi_backlight_device;
-static struct corgibl_machinfo *bl_machinfo;
-+static struct generic_bl_info *bl_machinfo;
- 
- static unsigned long corgibl_flags;
- #define CORGIBL_SUSPENDED     0x01
-@@ -107,7 +107,7 @@
- 
- static int corgibl_probe(struct platform_device *pdev)
- {
-	struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
-+	struct generic_bl_info *machinfo = pdev->dev.platform_data;
- 
- 	bl_machinfo = machinfo;
- 	if (!machinfo->limit_mask)
-Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
-===================================================================
--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c	2007-09-11 12:53:32.000000000 +0200
-+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c	2007-09-11 12:53:37.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <linux/interrupt.h>
- #include <linux/mmc/host.h>
- #include <linux/pm.h>
-+#include <linux/backlight.h>
- 
- #include <asm/setup.h>
- #include <asm/memory.h>
-@@ -143,7 +144,7 @@
- /*
-  * Corgi Backlight Device
-  */
-static struct corgibl_machinfo corgi_bl_machinfo = {
-+static struct generic_bl_info corgi_bl_machinfo = {
- 	.max_intensity = 0x2f,
- 	.default_intensity = 0x1f,
- 	.limit_mask = 0x0b,
-Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
-===================================================================
--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c	2007-09-11 12:53:33.000000000 +0200
-+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c	2007-09-11 12:53:37.000000000 +0200
-@@ -222,7 +222,7 @@
- /*
-  * Spitz Backlight Device
-  */
-static struct corgibl_machinfo spitz_bl_machinfo = {
-+static struct generic_bl_info spitz_bl_machinfo = {
- 	.default_intensity = 0x1f,
- 	.limit_mask = 0x0b,
- 	.max_intensity = 0x2f,
-Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h
+Index: linux-2.6.23/include/asm-arm/arch-pxa/serial.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/asm-arm/arch-pxa/serial.h	2007-09-11 12:53:37.000000000 +0200
+++ linux-2.6.23/include/asm-arm/arch-pxa/serial.h	2008-01-20 18:59:46.000000000 +0000
@@ -0,0 +1,78 @@
 +/*
 + *  linux/include/asm-arm/arch-pxa/serial.h
@@ -7902,11 +7799,11 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h
 +void pxa_set_btuart_info(struct platform_pxa_serial_funcs *btuart_funcs);
 +void pxa_set_stuart_info(struct platform_pxa_serial_funcs *stuart_funcs);
 +void pxa_set_hwuart_info(struct platform_pxa_serial_funcs *hwuart_funcs);
-Index: linux-2.6.22/drivers/serial/pxa.c
+Index: linux-2.6.23/drivers/serial/pxa.c
 ===================================================================
--- linux-2.6.22.orig/drivers/serial/pxa.c	2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.22/drivers/serial/pxa.c	2007-09-11 12:53:37.000000000 +0200
-@@ -46,6 +46,7 @@
+--- linux-2.6.23.orig/drivers/serial/pxa.c	2008-01-20 18:59:23.000000000 +0000
+++ linux-2.6.23/drivers/serial/pxa.c	2008-01-20 18:59:46.000000000 +0000
+@@ -47,6 +47,7 @@
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
@@ -7914,7 +7811,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
 #include <asm/arch/pxa-regs.h>
 
 
-@@ -59,6 +60,14 @@
+@@ -60,6 +61,14 @@ struct uart_pxa_port {
 	char			*name;
 };
 
@@ -7929,7 +7826,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
 static inline unsigned int serial_in(struct uart_pxa_port *up, int offset)
 {
 	offset <<= 2;
-@@ -346,6 +355,9 @@
+@@ -347,6 +356,9 @@ static int serial_pxa_startup(struct uar
 	unsigned long flags;
 	int retval;
 
@@ -7939,7 +7836,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
 	if (port->line == 3) /* HWUART */
 		up->mcr |= UART_MCR_AFE;
 	else
-@@ -401,6 +413,12 @@
+@@ -404,6 +416,12 @@ static int serial_pxa_startup(struct uar
 	(void) serial_in(up, UART_IIR);
 	(void) serial_in(up, UART_MSR);
 
@@ -7952,7 +7849,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
 	return 0;
 }
 
-@@ -409,6 +427,8 @@
+@@ -412,6 +430,8 @@ static void serial_pxa_shutdown(struct u
 	struct uart_pxa_port *up = (struct uart_pxa_port *)port;
 	unsigned long flags;
 
@@ -7961,7 +7858,7 @@ Index: linux-2.6.22/drivers/serial/pxa.c
 	free_irq(up->port.irq, up);
 
 	/*
-@@ -430,6 +450,8 @@
+@@ -433,6 +453,8 @@ static void serial_pxa_shutdown(struct u
 				  UART_FCR_CLEAR_RCVR |
 				  UART_FCR_CLEAR_XMIT);
 	serial_out(up, UART_FCR, 0);
@@ -7970,11 +7867,11 @@ Index: linux-2.6.22/drivers/serial/pxa.c
 }
 
 static void
-Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
+Index: linux-2.6.23/arch/arm/mach-pxa/generic.c
 ===================================================================
--- linux-2.6.22.orig/arch/arm/mach-pxa/generic.c	2007-09-11 12:53:11.000000000 +0200
-+++ linux-2.6.22/arch/arm/mach-pxa/generic.c	2007-09-11 12:53:37.000000000 +0200
-@@ -42,6 +42,7 @@
+--- linux-2.6.23.orig/arch/arm/mach-pxa/generic.c	2008-01-20 18:59:09.000000000 +0000
+++ linux-2.6.23/arch/arm/mach-pxa/generic.c	2008-01-20 18:59:46.000000000 +0000
+@@ -38,6 +38,7 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/i2c.h>
@@ -7982,8 +7879,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
 
 #include "devices.h"
 #include "generic.h"
-@@ -346,6 +347,18 @@
- 	.id		= 3,
+@@ -412,6 +413,18 @@ struct platform_device pxa_device_hwuart
+ 	.num_resources	= ARRAY_SIZE(pxa_resource_hwuart),
 };
 
 +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
 static struct resource pxai2c_resources[] = {
 	{
 		.start	= 0x40301680,
-Index: linux-2.6.22/drivers/leds/Makefile
+Index: linux-2.6.23/drivers/leds/Makefile
 ===================================================================
--- linux-2.6.22.orig/drivers/leds/Makefile	2007-09-11 12:53:14.000000000 +0200
-+++ linux-2.6.22/drivers/leds/Makefile	2007-09-11 12:53:37.000000000 +0200
-@@ -16,6 +16,7 @@
+--- linux-2.6.23.orig/drivers/leds/Makefile	2008-01-20 18:59:17.000000000 +0000
+++ linux-2.6.23/drivers/leds/Makefile	2008-01-20 21:10:45.000000000 +0000
+@@ -15,6 +15,7 @@ obj-$(CONFIG_LEDS_AMS_DELTA)		+= leds-am
+ obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o
 obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
 obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
-+obj-$(CONFIG_LEDS_ASIC3)                += leds-asic3.o
+obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o
+ obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o
+ obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
 obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
- 
- # LED Triggers
-Index: linux-2.6.22/arch/arm/Kconfig
+Index: linux-2.6.23/drivers/input/keyboard/Kconfig
 ===================================================================
--- linux-2.6.22.orig/arch/arm/Kconfig	2007-09-11 12:53:32.000000000 +0200
-+++ linux-2.6.22/arch/arm/Kconfig	2007-09-11 12:53:37.000000000 +0200
-@@ -1032,6 +1032,8 @@
- 
- source "drivers/w1/Kconfig"
- 
-+source "drivers/power/Kconfig"
-+
- source "drivers/hwmon/Kconfig"
- 
- #source "drivers/l3/Kconfig"
-Index: linux-2.6.22/drivers/input/keyboard/Kconfig
-===================================================================
--- linux-2.6.22.orig/drivers/input/keyboard/Kconfig	2007-09-11 14:28:45.000000000 +0200
-+++ linux-2.6.22/drivers/input/keyboard/Kconfig	2007-09-11 14:29:05.000000000 +0200
-@@ -253,4 +253,11 @@
+--- linux-2.6.23.orig/drivers/input/keyboard/Kconfig	2008-01-20 18:59:16.000000000 +0000
+++ linux-2.6.23/drivers/input/keyboard/Kconfig	2008-01-20 18:59:46.000000000 +0000
+@@ -293,4 +293,11 @@ config KEYBOARD_BFIN
 	  To compile this driver as a module, choose M here: the
- 	  module will be called gpio-keys.
+ 	  module will be called bf54x-keys.
 
 +config KEYBOARD_ASIC3
 +        tristate "Buttons on ASIC3 SoC GPIOs (iPaqs, etc.)"
--- 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
 #
 # Wireless
 #
-CONFIG_CFG80211=m
+# CONFIG_CFG80211 is not set
 CONFIG_WIRELESS_EXT=y
-CONFIG_MAC80211=m
-# CONFIG_MAC80211_LEDS is not set
-# CONFIG_MAC80211_DEBUG is not set
+# CONFIG_MAC80211 is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
--- 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 \
           file://pxa-serial-hack.patch;patch=1;status=hack \
           file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
           file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-#          file://htcuni.patch;patch=1 \
+           file://htcuni.patch;patch=1 \
           file://binutils-buildid-arm.patch;patch=1 \
           file://versatile-armv6.patch;patch=1 \
           file://defconfig-c7x0 \