disapproval of revision '032fe15bf3fd23dc5d753a8cd906ce2402067a78'

41 files changed, 389 insertions, 526 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 624722bf24..504707e37b 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -730,7 +730,7 @@ def base_after_parse(d):
         local = bb.data.expand(bb.fetch.localpath(s, d), d)
         for mp in paths:
             if local.startswith(mp):
-                bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch))
+                #bb.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch))
                 bb.data.setVar('PACKAGE_ARCH', mach_arch, d)
                 return
 
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0669b09f1f..b1855b0ea7 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -73,7 +73,6 @@ FEED_URIS += " \
 PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9"
 PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
-PREFERRED_VERSION_linux-handhelds-2.6_magician = "2.6.19-hh7+cvs${SRCDATE}"
 
 
 SRCDATE_gconf-dbus = "20060719"
@@ -108,7 +107,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_VERSION_gtk+ = "2.10.7"
+PREFERRED_VERSION_gtk+ = "2.10.6"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
@@ -186,7 +185,7 @@ PREFERRED_VERSION_busybox = "1.2.1"
 PCMCIA_MANAGER = "pcmciautils"
 
 PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib ?= "0.71"
 
 PREFERRED_VERSION_gstreamer ?= "0.10.11"
 
@@ -214,7 +213,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace devmem2 procps",d)}'
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
 
 #this should go away soon
 EXTRA_STUFF ?= ""
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index 1f38c9f767..bf00aa8d01 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -6,7 +6,7 @@
 PREFERRED_PROVIDER_gconf="gconf-dbus"
 PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
 
-#PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
+PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 
 # - the GPE roadmap doesn't state any versions for 2.8 yet
 #   http://www.handhelds.org/moin/moin.cgi/GPERoadmap
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 47df4867c9..f73fa22e34 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -45,7 +45,7 @@ SRCDATE_libmimedir ?= "20060804"
 SRCDATE_gpesyncd ?= "20061128"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20060723"
+SRCDATE_gconf-dbus ?= "20060719"
 SRCDATE_gnome-vfs-dbus ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf
index 5394ae5bdf..8376faca74 100644
--- a/conf/machine/include/tune-iwmmxt.conf
+++ b/conf/machine/include/tune-iwmmxt.conf
@@ -4,6 +4,3 @@ TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
 PACKAGE_ARCH = "iwmmxt"
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
 
-# HACK: don't build iwmmxt glibc because qemu doesn't support it
-TARGET_CC_ARCH_pn-glibc = "-march=armv5te -mtune=xscale"
-PACKAGE_ARCH_pn-glibc = "armv5te"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 3edf53ca6b..4e6c9a625a 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -34,16 +34,6 @@ MACHINE_EXTRA_RRECOMMENDS = " \
 	kernel-module-pxaficp-ir \
 	kernel-module-uinput \
 	kernel-module-hci-usb \
-	kernel-module-magician-flash \
-	kernel-module-magician-ds1wm \
-	kernel-module-magician-battery \
-	kernel-module-magician-phone \
-	kernel-module-snd-soc-magician \
-	mplayer \
-	gpe-scap \
-	alsa-utils-alsamixer \
-	alsa-utils-aplay \
-	minicom \
 	"
 
 #
@@ -54,11 +44,6 @@ module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
-module_autoload_magician_ds1wm = "magician_ds1wm"
-module_autoload_magician-battery = "magician-battery"
-module_autoload_magician_phone = "magician_phone"
-module_autoload_snd-soc-magician = "snd-soc-magician"
-module_autoload_hci_usb = "hci_usb"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 36c2aefab8..c7ac97d2e5 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -10,10 +10,10 @@ PACKAGES = "\
     angstrom-gpe-task-settings \
     angstrom-gpe-task-pim \
     angstrom-gpe-task-apps \
-    angstrom-gpe-task-games"
-#    angstrom-task-office \
-#    angstrom-task-printing \
-#    angstrom-task-sectest"
+    angstrom-gpe-task-games \
+    angstrom-task-office \
+    angstrom-task-printing \
+    angstrom-task-sectest"
 
 RDEPENDS_angstrom-x11-base-depends := "\
     virtual/libx11 \
diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab
index 087b469bdb..3dfde917e6 100644
--- a/packages/base-files/base-files/hx4700/fstab
+++ b/packages/base-files/base-files/hx4700/fstab
@@ -1,15 +1,9 @@
-# HP iPAQ hx4700 fstab - for rootfs on flash partition 2
+/dev/mtdblock2 	/		jffs2	defaults		1  1		
+/dev/mtdblock3 	/home   jffs2   defaults        1  1
 
-rootfs               /                    auto       defaults              1  1
-proc                 /proc                proc       defaults              0  0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
-usbdevfs             /proc/bus/usb        usbdevfs   noauto                0  0
-tmpfs                /var                 tmpfs      defaults              0  0
-tmpfs                /media/ram           tmpfs      defaults              0  0
-sys                  /sys                 sysfs      defaults              0  0
-#/dev/mtdblock2      /                    jffs2      defaults              1  1
-#/dev/mtdblock3       /home                jffs2      defaults              1  1
+proc            /proc		proc    defaults        0  0
+sys             /sys        sysfs	defaults        0  0
 
-# SD/MMC slot and CF slot
-/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto,noatime      0  0
-/dev/hda1            /media/cf            auto       defaults,noauto,noatime,exec,suid 0  0
+/dev/hda1		/media/cf	auto	defaults,noauto,noatime,exec,suid	0  0
+tmpfs			/var		tmpfs	defaults	0  0
+tmpfs			/media/ram	tmpfs	defaults	0  0
diff --git a/packages/base-files/base-files/magician/.mtn2git_empty b/packages/base-files/base-files/magician/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/base-files/base-files/magician/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb
index 49e6ded250..40aabaab50 100644
--- a/packages/bluez/bluez-utils_3.1.bb
+++ b/packages/bluez/bluez-utils_3.1.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
 SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} dbus"
-PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
-RCONFLICTS_${PN} = "bluez-utils-nodbus"
+RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus"
 LICENSE = "GPL"
 PR = "r1"
 
diff --git a/packages/gaim/gaim_svn.bb b/packages/gaim/gaim_svn.bb
index 4533d8a07c..8ef83c4b50 100644
--- a/packages/gaim/gaim_svn.bb
+++ b/packages/gaim/gaim_svn.bb
@@ -1,6 +1,6 @@
 PR = "r0"
 #Remove the dash below when 2.0 changes in PV
-#DEFAULT_PREFERENCE = "-100000"
+DEFAULT_PREFERENCE = "-100000"
 PV = "1.9+2.0beta3cvs-${SRCDATE}"
 
 SRC_URI = "svn://svn.sourceforge.net/svnroot/gaim;module=trunk;proto=https \
diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb
index 21bfc1a86d..c4b2ae7c2c 100644
--- a/packages/gpe-nmf/gpe-nmf_0.22.bb
+++ b/packages/gpe-nmf/gpe-nmf_0.22.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 inherit gpe pkgconfig
 
 DESCRIPTION = "GPE audio player"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
 RDEPENDS = "esd \
 	gst-plugins \
 	gst-plugin-audio \
diff --git a/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch b/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch
deleted file mode 100644
index 4bc164b646..0000000000
--- a/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-session-scripts-0.67/gpe-auto-bluetooth.sh.orig	2006-08-31 10:12:25.000000000 +0200
-+++ gpe-session-scripts-0.67/gpe-auto-bluetooth.sh	2006-08-31 10:14:27.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- # start gpe-bluetooth if hardware is built in
--if [ -f /etc/sysconfig/bluetooth ]; then
-+if [ -f /etc/sysconfig/bluetooth -a -x /usr/bin/gpe-bluetooth ]; then
-   . /etc/sysconfig/bluetooth
-   if [ "$BLUETOOTH" = "yes" ]; then
-     exec gpe-bluetooth
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index ada40a899c..2cf63737bd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -6,11 +6,10 @@ SECTION = "gpe"
 PRIORITY = "optional"
 RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
 
 SRC_URI += "file://matchbox-session \
-	file://disable-composite.xsettings \
-	file://gpe-bluetooth-optional.patch;patch=1"
+	file://disable-composite.xsettings"
 
 PR = "r4"
 
diff --git a/packages/libxslt/libxslt_1.1.15.bb b/packages/libxslt/libxslt_1.1.15.bb
deleted file mode 100644
index a360578f93..0000000000
--- a/packages/libxslt/libxslt_1.1.15.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-PR = "r0"
-DESCRIPTION = "GNOME XSLT library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "libxml2"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug"
-
-xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
-               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
-               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
-               xsltexports.h xsltutils.h"
-exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
-
-do_stage () {
-	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
-	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libxslt
-	for i in ${xsltheaders}; do
-		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
-	done
-	mkdir -p ${STAGING_INCDIR}/libexslt
-	for i in ${exsltheaders}; do
-		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
-	done
-
-	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
-	chmod a+rx ${STAGING_BINDIR}/xslt-config
-	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig
index 7d1a138c64..7fadc7ae3a 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig
@@ -1,15 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-hh0
-# Tue Aug 29 11:45:12 2006
+# Linux kernel version: 2.6.16-hh5
+# Thu Aug 10 16:39:20 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_MTD_XIP=y
-CONFIG_VECTORS_BASE=0xffff0000
 
 #
 # Code maturity level options
@@ -33,7 +31,6 @@ CONFIG_SYSCTL=y
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
 CONFIG_IKCONFIG_PROC=y
-# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -51,6 +48,10 @@ CONFIG_EPOLL=y
 CONFIG_SHMEM=y
 # CONFIG_USELIB is not set
 CONFIG_CORE_DUMP=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
@@ -63,6 +64,7 @@ CONFIG_OBSOLETE_INTERMODULE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
@@ -70,20 +72,19 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
-# CONFIG_BLK_DEV_IO_TRACE is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_AS=y
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="anticipatory"
 
 #
 # System Type
@@ -92,13 +93,11 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IOP3XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
@@ -118,7 +117,6 @@ CONFIG_ARCH_PXA=y
 # Intel PXA2xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
-# CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_ARCH_ESERIES is not set
@@ -136,7 +134,6 @@ CONFIG_HX4700_BLUETOOTH=y
 CONFIG_HX4700_PCMCIA=y
 CONFIG_HX4700_LCD=y
 CONFIG_HX4700_LEDS=y
-CONFIG_HX4700_VOLTAGE=m
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_ARCH_H5400 is not set
 # CONFIG_MACH_HIMALAYA is not set
@@ -227,7 +224,6 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
-CONFIG_HZ=100
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -322,7 +318,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
@@ -335,15 +330,14 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
@@ -365,7 +359,6 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP_NF_TFTP is not set
 # CONFIG_IP_NF_AMANDA is not set
 # CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
 # CONFIG_IP_NF_QUEUE is not set
 
 #
@@ -374,6 +367,11 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP6_NF_QUEUE is not set
 
 #
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
 # DCCP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_DCCP is not set
@@ -388,7 +386,7 @@ CONFIG_IP_NF_IRC=m
 #
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=m
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
@@ -454,6 +452,8 @@ CONFIG_IRPORT_SIR=m
 #
 # FIR device drivers
 #
+# CONFIG_USB_IRDA is not set
+# CONFIG_SIGMATEL_FIR is not set
 # CONFIG_PXA_FICP is not set
 CONFIG_BT=y
 CONFIG_BT_L2CAP=m
@@ -468,21 +468,23 @@ CONFIG_BT_HIDP=m
 #
 # Bluetooth device drivers
 #
+# CONFIG_BT_HCIUSB is not set
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIDTL1 is not set
 # CONFIG_BT_HCIBT3C is not set
 # CONFIG_BT_HCIBLUECARD is not set
 CONFIG_BT_HCIBTUART=m
 # CONFIG_BT_HCIVHCI is not set
-CONFIG_IEEE80211=m
+CONFIG_IEEE80211=y
 # CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-# CONFIG_IEEE80211_SOFTMAC is not set
-CONFIG_WIRELESS_EXT=y
+CONFIG_IEEE80211_CRYPT_WEP=y
+CONFIG_IEEE80211_CRYPT_CCMP=y
+CONFIG_IEEE80211_CRYPT_TKIP=y
 
 #
 # Device Drivers
@@ -570,6 +572,7 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
 #
@@ -605,24 +608,28 @@ CONFIG_MTD_CFI_UTIL=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
 
 #
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
+CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=y
+CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -721,6 +728,7 @@ CONFIG_TUN=m
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+CONFIG_MII=m
 
 #
 # Ethernet (1000 Mbit)
@@ -738,7 +746,6 @@ CONFIG_TUN=m
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -770,6 +777,7 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 CONFIG_ACX=y
+# CONFIG_ACX_USB is not set
 CONFIG_ACX_MEM=y
 CONFIG_ACX_HX4700=m
 CONFIG_NET_WIRELESS=y
@@ -917,7 +925,9 @@ CONFIG_I2C_PXA=m
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCA9535 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
 # CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -949,6 +959,11 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_SA1100_WATCHDOG=m
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 # CONFIG_NVRAM is not set
 CONFIG_SA1100_RTC=y
 # CONFIG_DTLK is not set
@@ -982,18 +997,10 @@ CONFIG_SA1100_RTC=y
 # Dallas's 1-wire bus
 #
 CONFIG_W1=y
-
-#
-# 1-wire Bus Masters
-#
-# CONFIG_W1_MASTER_DS2482 is not set
-
-#
-# 1-wire Slaves
-#
-# CONFIG_W1_SLAVE_THERM is not set
-# CONFIG_W1_SLAVE_SMEM is not set
-# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_DS9490 is not set
+# CONFIG_W1_THERM is not set
+# CONFIG_W1_SMEM is not set
+# CONFIG_W1_DS2433 is not set
 CONFIG_W1_DS2760=y
 
 #
@@ -1058,53 +1065,30 @@ CONFIG_BATTERY_MONITOR=y
 # CONFIG_MCP is not set
 
 #
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
+# Multimedia Capabilities Port drivers
 #
 
 #
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
 
 #
-# Video Capture Adapters
+# Video For Linux
 #
 
 #
-# Video Capture Adapters
+# Video Adapters
 #
 # CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_EM28XX is not set
 # CONFIG_VIDEO_OVCAMCHIP is not set
-
-#
-# Encoders and Decoders
-#
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_CX25840 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_AUDIO_DECODER is not set
+# CONFIG_VIDEO_DECODER is not set
 
 #
 # Radio Adapters
@@ -1124,7 +1108,6 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_FIRMWARE_EDID is not set