merge of 75f6e838caafacb9445ca7479d4abd0d053ac979

     and e488e05a801c89ca783a2c8ad4c0e30f9621864f

50 files changed, 1099 insertions, 152 deletions

diff --git a/packages/avahi/avahi_0.5.bb b/packages/avahi/avahi_0.5.bb
new file mode 100644
index 0000000000..dc1ff36f83
--- /dev/null
+++ b/packages/avahi/avahi_0.5.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
+LICENCE= "GPL"
+DEPENDS = "expat libdaemon dbus-0.50"
+RRECOMMENDS = "libnss-mdns"
+SECTION = "net"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz"
+
+PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+		      ${sysconfdir}/avahi/avahi-daemon.conf \
+		      ${sysconfdir}/avahi/services \
+		      ${sysconfdir}/dbus-1 \
+		      ${sysconfdir}/init.d/avahi-daemon \
+		      ${datadir}/avahi/introspection/*.introspect \
+		      ${datadir}/avahi/avahi-service.dtd \
+		      ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+			${sysconfdir}/avahi/avahi-dnsconfd.action \
+			${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+EXTRA_OECONF = "--with-distro=debian --disable-mono --disable-mono-docs --disable-gtk  --disable-qt3  --disable-qt4 --disable-python"
+inherit autotools
+inherit update-rc.d
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+pkg_postinst_avahi-daemon () {
+	grep avahi /etc/group || addgroup avahi
+	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+	/etc/init.d/dbus-1 force-reload
+}
+
+pkg_postrm_avahi-daemon () {
+	deluser avahi || true
+	delgroup avahi || true
+}
+
diff --git a/packages/gnuz/gnuz/intro_level.patch b/packages/gnuz/gnuz/intro_level.patch
deleted file mode 100644
index ad1a69dff0..0000000000
--- a/packages/gnuz/gnuz/intro_level.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../intro.conf.orig	2003-09-13 18:55:01 +0200
-+++ ../intro.conf	2004-10-12 23:35:18 +0200
-@@ -1,8 +1,9 @@
- LevelName=Welcome Screen
- LevelAuthor=WarCow
--LevelPicFilename=intro_new.png
--LevelMaskFilename=intro_new_mask.png
-+LevelPicFilename=intro.png
-+LevelMaskFilename=intro_mask.png
- LevelDifficulty=0
-+LevelParTime=0
- 
- GnuCount=23
- GnuMinSave=0
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
index 23a1832596..3e986cf398 100644
--- a/packages/gnuz/gnuz_0.3.bb
+++ b/packages/gnuz/gnuz_0.3.bb
@@ -5,49 +5,26 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-DEPENDS = "gnuz-levelmaker-native gnuz-package-native"
+PR = "r1"
+
+APPTYPE = "binary"
+APPNAME = "gnuz"
+APPDESKTOP = "${S}/data/"
 
 SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
-           http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3_levels.tar.gz \
-		   file://intro_level.patch;patch=1;pnum=0"
+           http://www.hrw.one.pl/_pliki/oe/files/gnuz-levels-0.3.tar.bz2"
 
 S = "${WORKDIR}/gnuz"
 
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST += "LIBS+=-lqpe"
-
-inherit palmtop
-
-do_compile_append() {
-
-	cd ${WORKDIR}
-	
-	for level in *.conf
-	do
-		if [ $level != 'intro.conf' ] ;then
-			${STAGING_BINDIR}/gnuz_levelmaker `basename $level .conf`.lvl $level
-		fi
-	done
-	${STAGING_BINDIR}/gnuz_levelmaker intro intro.conf
-	cd ${S}/data/
-	${STAGING_BINDIR}/gnuz_package guiimages.dat gui
-	${STAGING_BINDIR}/gnuz_package gnuimages.dat gnu
-	
-	
-}
-
-do_install() {
+inherit opie
 
-	install -d ${D}${palmtopdir}/apps/Games \
-			   ${D}${palmtopdir}/pics \
-			   ${D}${palmtopdir}/bin \
-			   ${D}${palmtopdir}/share/gnuz/levels
+do_install_append() {
 
-	install -m 0755 gnuz ${D}${palmtopdir}/bin/
-	install -m 0644 data/gnuz.desktop ${D}${palmtopdir}/apps/Games/
-	install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/*.lvl ${D}${palmtopdir}/share/gnuz/levels/
-	install -m 0644 ${WORKDIR}/intro ${D}${palmtopdir}/share/gnuz/levels/
-	install -m 0644 ${S}/data/*images.dat ${D}${palmtopdir}/share/gnuz/
+        install -d ${D}${palmtopdir}/apps/Games \
+                   ${D}${palmtopdir}/pics \
+                   ${D}${palmtopdir}/share/gnuz/levels
 
+        install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/levels/* ${D}${palmtopdir}/share/gnuz/levels/
+        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/*images.dat ${D}${palmtopdir}/share/gnuz/
 }
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
index 31781cc37d..82a674c752 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
@@ -4,7 +4,7 @@ PV = "0.17+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser"
 DESCRIPTION = "A lightweight webbrowser for the GPE platform"
 LICENSE = "GPL"
-DEPENDS = "sqlite osb-nrcit libgpewidget"
+DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget"
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/gpe-mini-browser"
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
index fd7a3eaff9..ef4de4449b 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -5,6 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
+           file://kernel_updates.patch;patch=1 \
            file://hostap_cs.conf "
 
 SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb
new file mode 100644
index 0000000000..d59eab3a61
--- /dev/null
+++ b/packages/ipkg/ipkg-native_0.99.154.bb
@@ -0,0 +1,2 @@
+include ipkg_${PV}.bb
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb
new file mode 100644
index 0000000000..1898c6656e
--- /dev/null
+++ b/packages/ipkg/ipkg_0.99.154.bb
@@ -0,0 +1 @@
+include ipkg.inc
diff --git a/packages/gnuz/gnuz/.mtn2git_empty b/packages/libcwd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnuz/gnuz/.mtn2git_empty
+++ b/packages/libcwd/.mtn2git_empty
diff --git a/packages/libcwd/libcwd_0.99.40.bb b/packages/libcwd/libcwd_0.99.40.bb
new file mode 100644
index 0000000000..a2650eec85
--- /dev/null
+++ b/packages/libcwd/libcwd_0.99.40.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Libcwd is a thread-safe, full-featured debugging support library for C++ developers. \
+It includes ostream-based debug output with custom debug channels and devices, \
+powerful memory allocation debugging support, as well as run-time support for \
+printing source line number information and demangled type names."
+SECTION = "devel/libs"
+LICENSE = "QPL"
+HOMEPAGE = "http://libcwd.sourceforge.net"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r0"
+
+SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "${PN}-config ${PN}-mt"
+FILES_${PN} = "${libdir}/libcwd.so*"
+FILES_${PN}-mt = "${libdir}/libcwd_r.so*"
+FILES_${PN}-config = "${datadir}"
+RRECOMMENDS_${PN} = "${PN}-config"
+RRECOMMENDS_${PN}-mt = "${PN}-config"
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
new file mode 100644
index 0000000000..1ecc553cf9
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
@@ -0,0 +1,25 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+LICENSE = "GPL"
+#
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')}"
+
+S = "${WORKDIR}/kernel26"
+
+inherit kernel
+
+K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+HHV     = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
+do_configure() {
+	install -m 0644 arch/arm/configs/ipaqpxa_defconfig .config
+        yes '' | oe_runmake oldconfig
+}
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-elpp-stuff.patch
index 04ab185f4f..04ab185f4f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0
index 542bedc9f6..9dd7c230e7 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0
@@ -695,15 +695,20 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle
index a0810f8381..a0810f8381 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz
index e61a999627..f838a497a3 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc5-mm1
-# Sun Aug 28 18:06:14 2005
+# Linux kernel version: 2.6.13-mm3
+# Fri Sep 16 13:04:01 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -22,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -32,6 +33,7 @@ CONFIG_SYSCTL=y
 CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -97,9 +99,10 @@ CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_PXA_SHARPSL_25x is not set
 CONFIG_PXA_SHARPSL_27x=y
-CONFIG_MACH_SPITZ=y
 CONFIG_MACH_AKITA=y
+CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
+# CONFIG_MACH_TOSA is not set
 CONFIG_PXA27x=y
 # CONFIG_PXA_KEYS is not set
 CONFIG_PXA_SHARP_Cxx00=y
@@ -145,7 +148,6 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 # Kernel Features
 #
-# CONFIG_SMP is not set
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -155,6 +157,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -162,7 +165,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3   debug"
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rw   debug"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -217,8 +220,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 
@@ -246,6 +249,7 @@ CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_QUEUE=m
@@ -271,8 +275,10 @@ CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_MATCH_SCTP=m
+# CONFIG_IP_NF_MATCH_DCCP is not set
 CONFIG_IP_NF_MATCH_COMMENT=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
 CONFIG_IP_NF_FILTER=m
 # CONFIG_IP_NF_TARGET_REJECT is not set
 CONFIG_IP_NF_TARGET_LOG=m
@@ -295,6 +301,7 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_DSCP is not set
 # CONFIG_IP_NF_TARGET_MARK is not set
 # CONFIG_IP_NF_TARGET_CLASSIFY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
 CONFIG_IP_NF_RAW=m
 # CONFIG_IP_NF_TARGET_NOTRACK is not set
 CONFIG_IP_NF_ARPTABLES=m
@@ -321,8 +328,10 @@ CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
 # CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP6_NF_TARGET_MARK is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_RAW=m
 
 #
@@ -432,7 +441,11 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
 
 #
 # Device Drivers
@@ -538,7 +551,6 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
 
 #
@@ -581,6 +593,7 @@ CONFIG_IDE_GENERIC=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
 CONFIG_SCSI_PROC_FS=y
 
@@ -608,10 +621,17 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+
+#
+# SCSI Transport Layers
+#
+# CONFIG_SAS_CLASS is not set
 
 #
 # SCSI low-level drivers
 #
+# CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 
@@ -696,15 +716,20 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -848,12 +873,12 @@ CONFIG_SA1100_RTC=y
 # I2C support
 #
 # CONFIG_I2C is not set
-# CONFIG_I2C_SENSOR is not set
 
 #
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -861,6 +886,10 @@ CONFIG_HWMON=y
 #
 
 #
+# Multimedia Capabilities Port drivers
+#
+
+#
 # SoC drivers
 #
 # CONFIG_SOC is not set
@@ -982,6 +1011,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
 
 #
 # USB Input Devices
@@ -1033,30 +1063,14 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_ZD1201 is not set
 CONFIG_USB_MON=y
 
@@ -1183,11 +1197,8 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_RE