merge of 46a3490245fc8234a2a3cf3dea9bf7c79bb7c851

     and 8183e5d9f7ede3a50afeceb17ef486ccbc630bec

15 files changed, 6931 insertions, 208 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index ea126d9032..0c743ef64f 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -58,6 +58,7 @@ ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
 ${PKGDIR}/packages/gphoto2/*.bb \
 ${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/groff/*.bb \
 ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hal/*.bb \
@@ -84,6 +85,7 @@ ${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
 ${PKGDIR}/packages/libgsm/*.bb \
+${PKGDIR}/packages/libiconv/*.bb \
 ${PKGDIR}/packages/libid3tag/*.bb \
 ${PKGDIR}/packages/liblockfile/*.bb \
 ${PKGDIR}/packages/libmad/*.bb \
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 22b041f521..1777135a0d 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,11 +3,11 @@
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "5.6-beta"
+DISTRO_VERSION = "6.2-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
+FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
 FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
 
 # pull in the frozen list of bbfiles
@@ -57,8 +57,9 @@ PREFERRED_VERSION_glibc-initial ?= "2.2.5"
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 
-PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29"
-PREFERRED_VERSION_unslung-rootfs         ?= "2.3r29"
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
-PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r29"
-PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r29"
+PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel"
+PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63"
+PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 973364ebf7..4dc502209a 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -9,17 +9,18 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 
-EXTRA_IMAGECMD_jffs2 = "--pad --no-cleanmarkers --pagesize=4096 --eraseblock=16384"
+EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384"
 
 ROOT_FLASH_SIZE = "32"
 
-BOOTSTRAP_EXTRA_DEPENDS_append = "h2200-bootloader handhelds-pxa-2.6 udev module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS_append = " h2200-bootloader handhelds-pxa-2.6 udev module-init-tools"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "h2200-bootloader ${@linux_module_packages('${H2200_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS = " h2200-bootloader kernel ${@linux_module_packages('${H2200_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
 #ship in rootfs:
-H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-pxa-i2sound-h2200 pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop "
+H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-pxa2xx-i2sound pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop "
+
 
 #autoload on boot:
 module_autoload_h2200_pm        = "h2200_pm"
@@ -33,7 +34,7 @@ module_autoload_w1_ds2760       = "w1_ds2760"
 module_autoload_h2200_battery   = "h2200_battery"
 module_autoload_hamcop_nand     = "hamcop_nand"
 module_autoload_pxa2xx_h2200    = "pxa2xx_h2200"
-module_autoload_snd_pxa_i2sound_h2200 = "snd-pxa-i2sound-h2200"
+module_autoload_snd-pxa2xx-i2sound= "snd-pxa2xx-i2sound"
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 
 SERIAL_CONSOLE = "115200 tts/0 vt100"
diff --git a/packages/cdstatus/cdstatus-0.96.05.bb b/packages/cdstatus/cdstatus-0.96.05.bb
index 1ae728f836..a2b3a0484a 100644
--- a/packages/cdstatus/cdstatus-0.96.05.bb
+++ b/packages/cdstatus/cdstatus-0.96.05.bb
@@ -1,6 +1,6 @@
 # cdstatus OE build file
 
-PR="r0"
+PR="r1"
 LICENSE="GPL"
 HOMEPAGE = "http://cdstatus.sourceforge.net/"
 FILES_${PN} += ${datadir}/cdstatus.cfg
@@ -12,8 +12,6 @@ S="${WORKDIR}/cdstatus-0.96.05"
 
 inherit autotools
 
-TARGET_LDFLAGS=""
-
 do_install() {
 	install -d 0755 ${D}/${bindir}
 	install -d 0755 ${D}/${datadir}
diff --git a/packages/groff/groff/Makefile.in.patch b/packages/groff/groff/Makefile.in.patch
new file mode 100644
index 0000000000..30aac8cbf0
--- /dev/null
+++ b/packages/groff/groff/Makefile.in.patch
@@ -0,0 +1,31 @@
+*** groff-1.19.2/Makefile.in.orig	Sun Aug  7 10:03:33 2005
+--- groff-1.19.2/Makefile.in	Sat Dec  3 16:44:50 2005
+***************
+*** 242,249 ****
+  
+  # The configure script checks whether all necessary utility programs for
+  # grohtml are available -- only then we can build the HTML documentation.
+! make_html=@make_html@
+! make_install_html=@make_install_html@
+  
+  # The configure script also checks whether all necessary utility programs
+  # for pdfroff are available -- only then we can build PDF documentation.
+--- 242,249 ----
+  
+  # The configure script checks whether all necessary utility programs for
+  # grohtml are available -- only then we can build the HTML documentation.
+! make_html=
+! make_install_html=
+  
+  # The configure script also checks whether all necessary utility programs
+  # for pdfroff are available -- only then we can build PDF documentation.
+***************
+*** 549,555 ****
+    contrib/pic2graph \
+    contrib/eqn2graph \
+    contrib/grap2graph \
+-   contrib/groffer \
+    contrib/mom \
+    contrib/pdfmark \
+    contrib/gdiffmk
+--- 549,554 ----
diff --git a/packages/groff/groff/Makefile.sub.patch b/packages/groff/groff/Makefile.sub.patch
new file mode 100644
index 0000000000..1b5a7dfac5
--- /dev/null
+++ b/packages/groff/groff/Makefile.sub.patch
@@ -0,0 +1,21 @@
+*** groff-1.19.2/src/include/Makefile.sub.orig	Thu Jun 23 13:27:53 2005
+--- groff-1.19.2/src/include/Makefile.sub	Sat Dec  3 18:35:40 2005
+***************
+*** 39,46 ****
+  	"DEVICE=\"$(DEVICE)\"" \
+  	"INSTALLPATH=\"$(prefix)\"" \
+  	"BINPATH=\"$(bindir)\"" \
+! 	"FONTPATH=\"$(fontpath)\"" \
+! 	"MACROPATH=\"$(tmacpath)\"" \
+  	"INDEX_SUFFIX=\"$(indexext)\"" \
+  	"COMMON_WORDS_FILE=\"$(common_words_file)\"" \
+  	"DEFAULT_INDEX_DIR=\"$(indexdir)\"" \
+--- 39,46 ----
+  	"DEVICE=\"$(DEVICE)\"" \
+  	"INSTALLPATH=\"$(prefix)\"" \
+  	"BINPATH=\"$(bindir)\"" \
+! 	"FONTPATH=\"/usr/share/groff/site-font:/usr/share/groff/1.19.2/font:/usr/lib/font\"" \
+! 	"MACROPATH=\"/usr/lib/groff/site-tmac:/usr/share/groff/site-tmac:/usr/share/groff/1.19.2/tmac\"" \
+  	"INDEX_SUFFIX=\"$(indexext)\"" \
+  	"COMMON_WORDS_FILE=\"$(common_words_file)\"" \
+  	"DEFAULT_INDEX_DIR=\"$(indexdir)\"" \
diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb
new file mode 100644
index 0000000000..7381bb3687
--- /dev/null
+++ b/packages/groff/groff_1.19.2.bb
@@ -0,0 +1,23 @@
+LICENSE = "GPL"
+SECTION = "base"
+DESCRIPTION = "GNU roff"
+RDEPENDS="libstdc++6"
+MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>"
+SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
+	           file://Makefile.in.patch;patch=1 \
+	           file://Makefile.sub.patch;patch=1 \
+	           file://groff.patch;patch=1"
+
+# prefix and exec-prefix are broken and the .in file is broken too 
+# and can't be autoreconf'ed, so specify every dir
+EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}/usr/bin --datadir=${D}/usr/share --mandir=${D}/usr/man --infodir=${D}/usr/share/info"
+inherit autotools
+
+do_configure () {
+	oe_runconf
+}
+
+#do_install() {
+#	oe_runmake 'PREFIX=${D}' install
+#}
+
diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
index ec023d90e3..58917ce083 100644
--- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig
+++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-hh2
-# Thu Aug  4 10:37:25 2005
+# Linux kernel version: 2.6.13-hh1
+# Wed Dec  7 15:00:54 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
 
 #
 # Code maturity level options
@@ -87,19 +86,20 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
 
 #
 # Intel PXA2xx Implementations
 #
-CONFIG_PXA25x=y
-# CONFIG_PXA27x is not set
 # CONFIG_ARCH_LUBBOCK is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
-CONFIG_PXA_KEYS=y
 # CONFIG_ARCH_ESERIES is not set
 # CONFIG_MACH_A620 is not set
 # CONFIG_MACH_A716 is not set
+# CONFIG_ARCH_H1900 is not set
+CONFIG_ARCH_H2200=y
+CONFIG_H2200_PM=m
 # CONFIG_ARCH_H3900 is not set
 # CONFIG_MACH_H4000 is not set
 # CONFIG_MACH_H4700 is not set
@@ -110,8 +110,11 @@ CONFIG_PXA_KEYS=y
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_ROVERP1 is not set
 # CONFIG_ARCH_ROVERP5P is not set
-CONFIG_ARCH_H2200=y
+# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_T3XSCALE is not set
 # CONFIG_PXA_SHARPSL is not set
+CONFIG_PXA25x=y
+CONFIG_PXA_KEYS=y
 # CONFIG_SA1100_H3100 is not set
 # CONFIG_SA1100_H3600 is not set
 # CONFIG_SA1100_H3800 is not set
@@ -142,7 +145,6 @@ CONFIG_XSCALE_PMU=y
 #
 # Compaq/iPAQ Platforms
 #
-CONFIG_H2200_PM=m
 CONFIG_PXA_IPAQ=y
 
 #
@@ -157,6 +159,7 @@ CONFIG_IPAQ_HANDHELD=y
 #
 # Compaq/HP iPAQ Drivers
 #
+CONFIG_IPAQ_CLOCKS=y
 # CONFIG_IPAQ_SLEEVE is not set
 # CONFIG_IPAQ_SAMCOP is not set
 CONFIG_IPAQ_HAMCOP=m
@@ -175,6 +178,8 @@ CONFIG_ISA_DMA_API=y
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
 
 #
 # PC-card bridges
@@ -186,9 +191,15 @@ CONFIG_PCMCIA_H2200=m
 #
 # Kernel Features
 #
-# CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_DISCONTIGMEM is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -208,7 +219,7 @@ CONFIG_CMDLINE="keepinitrd"
 #
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
+CONFIG_FPE_FASTFPE=y
 
 #
 # Userspace binary formats
@@ -225,6 +236,128 @@ CONFIG_PM=y
 CONFIG_APM=m
 
 #
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# 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=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# 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_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+# CONFIG_BT_SCO is not set
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_HIDP is not set
+
+#
+# Bluetooth device drivers
+#
+# CONFIG_BT_HCIUSB is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_BCSP_TXCRC is not set
+# 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 is not set
+# CONFIG_BT_HCIVHCI is not set
+
+#
 # Device Drivers
 #
 
@@ -233,7 +366,7 @@ CONFIG_APM=m
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 
 #
@@ -329,6 +462,7 @@ CONFIG_MTD_NAND_HAMCOP=m
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -361,6 +495,7 @@ 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
+# CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 
 #
@@ -375,125 +510,70 @@ CONFIG_IDE_GENERIC=m
 #
 # SCSI device support
 #
-# CONFIG_SCSI is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
 
 #
-# Multi-device support (RAID and LVM)
+# SCSI support type (disk, tape, CD-ROM)
 #
-# CONFIG_MD is not set
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
 
 #
-# Fusion MPT device support
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
 
 #
-# IEEE 1394 (FireWire) support
+# SCSI Transport Attributes
 #
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
 
 #
-# I2O device support
+# SCSI low-level drivers
 #
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_DEBUG is not set
 
 #
-# Networking support
+# PCMCIA SCSI adapter support
 #
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# 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_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
 
 #
-# IP: Virtual Server Configuration
+# Multi-device support (RAID and LVM)
 #
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
+# CONFIG_MD is not set
 
 #
-# IP: Netfilter Configuration
+# Fusion MPT device support
 #
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_FUSION is not set
 
 #
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP 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_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
+# IEEE 1394 (FireWire) support
 #
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 
 #
-# Network testing
+# I2O device support
 #
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-# CONFIG_BT_SCO is not set
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_HIDP is not set
 
 #
-# Bluetooth device drivers
+# Network device support
 #
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_BCSP_TXCRC is not set
-# CONFIG_BT_HCIDTL1 is not set
-# CONFIG_BT_HCIBT3C is not set
-# CONFIG_BT_HCIBLUECARD is not set
-# CONFIG_BT_HCIBTUART is not set
-# CONFIG_BT_HCIVHCI is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
@@ -520,7 +600,32 @@ CONFIG_NETDEVICES=y
 #
 # Wireless LAN (non-hamradio)
 #
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
+CONFIG_NET_WIRELESS=y
 # CONFIG_HOSTAP is not set
 
 #
@@ -532,10 +637,19 @@ CONFIG_NETDEVICES=y
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
+CONFIG_SHAPER=m
 # CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -596,7 +710,6 @@ CONFIG_HW_CONSOLE=y
 #
 # Non-8250 serial port support
 #
-# CONFIG_SERIAL_DZ is not set
 CONFIG_SERIAL_PXA=y
 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_PXA_COUNT=4
@@ -628,48 +741,19 @@ CONFIG_I2C_PXA=m
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set
-
-#
-# Hardware Sensors Chip support
-#
 # CONFIG_I2C_SENSOR is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
 
 #
-# Other I2C Chip support
+# Miscellaneous I2C Chip support
 #
 # CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -702,7 +786,6 @@ CONFIG_SA1100_RTC=m
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_DRM is not set
 
 #
 # PCMCIA character devices
@@ -715,6 +798,43 @@ CONFIG_SA1100_RTC=m
 #
 
 #
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
 # SoC drivers
 #
 CONFIG_SOC_MQ11XX=m
@@ -759,7 +879,6 @@ CONFIG_FB_SOFT_CURSOR=m
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_IMAGEON is not set
 # CONFIG_FB_PXA is not set
-# CONFIG_FB_W100 is not set
 CONFIG_FB_MQ1100=m
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -774,11 +893,13 @@ CONFIG_FONTS=y
 # CONFIG_FONT_8x8 is not set
 # CONFIG_FONT_8x16 is not set
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 CONFIG_FONT_MINI_4x6=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 
 #
 # Logo configuration
@@ -808,7 +929,6 @@ CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
-CONFIG_SND_GENERIC_PM=y
 
 #
 # Generic devices
@@ -821,11 +941,18 @@ CONFIG_SND_GENERIC_PM=y
 #
 # ALSA ARM devices
 #
+# CONFIG_SND_A716 is not set
+# CONFIG_SND_H1910 is not set
 CONFIG_SND_H2200=m
 # CONFIG_SND_HX4700 is not set
 # CONFIG_SND_PXA2XX_UDA1380 is not set
 # CONFIG_SND_H5XXX_AK4535 is not set
-# CONFIG_SND_PXA_AC97 is not set
+# CONFIG_SND_PXA2XX_AC97 is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
 
 #
 # PCMCIA devices
@@ -840,6 +967,7 @@ CONFIG_SND_H2200=m
 # Dallas's 1-wire bus
 #
 CONFIG_W1=m
+# CONFIG_W1_DS9490 is not set
 # CONFIG_W1_THERM is not set
 # CONFIG_W1_SMEM is not set
 CONFIG_W1_SAMCOP=m
@@ -851,13 +979,137 @@ CONFIG_W1_DS2760=m
 #
 CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+
+#
+# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
+#
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_ZD1201 is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_LD is not set
+
+#
+# USB DSL modem support
+#
 
 #
 # USB Gadget Support
 #
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 CONFIG_USB_GADGET_PXA2XX=y
 CONFIG_USB_PXA2XX=y
@@ -870,11 +1122,12 @@ CONFIG_USB_PXA2XX_SMALL=y
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
 # CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
-# CONFIG_USB_ETH_RNDIS is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
 # CONFIG_USB_G_CHAR is not set
 
 #
@@ -883,7 +1136,6 @@ CONFIG_USB_ETH=y
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BULKTRANSFER=y
 # CONFIG_MMC_PXA is not set
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMC_TMIO is not set
@@ -901,10 +1153,12 @@ CONFIG_LEDS_H2200=m
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
 # CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
 
 #
 # XFS support
@@ -912,6 +1166,7 @@ CONFIG_EXT2_FS=y
 # CONFIG_XFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -963,8 +1218,6 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
-# CONFIG_JFFS3_FS is not set
-# CONFIG_JFFS3_COMPRESSION_OPTIONS is not set