merge of c07983d563d6bb267abbabb4971b40387f9e16f4

     and df0016306331c3dc82088b0c31109e7841171b48

55 files changed, 1373 insertions, 76907 deletions

diff --git a/packages/linux/linux-ezx/old/.mtn2git_empty b/packages/base-files/base-files/amsdelta/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-ezx/old/.mtn2git_empty
+++ b/packages/base-files/base-files/amsdelta/.mtn2git_empty
diff --git a/packages/base-files/base-files/amsdelta/fstab b/packages/base-files/base-files/amsdelta/fstab
new file mode 100644
index 0000000000..bf87f5f11b
--- /dev/null
+++ b/packages/base-files/base-files/amsdelta/fstab
@@ -0,0 +1,6 @@
+/dev/mtdblock4	/ 	jffs2	defaults	1  1 
+proc            /proc   proc    defaults        0  0
+tmpfs		/var	tmpfs	defaults	0  0
+
+# we use a non-volatile ramdisk, see /etc/init.d/ramdisk
+tmpfs		/media/ram	tmpfs	defaults	0  0
diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.23.bb
index 4574b8eb4c..4c1f6bc482 100644
--- a/packages/directfb/++dfb_0.9.23.bb
+++ b/packages/directfb/++dfb_0.9.23.bb
@@ -1,30 +1,19 @@
 DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
 HOMEPAGE = "http://directfb.org"
 SECTION = "libs"
-PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "directfb"
 LICENSE = "LGPL"
 
-# needs a g++4 patch
-BROKEN = "1"
-
 SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz"
 S = "${WORKDIR}/++DFB-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-                          'DESTDIR=${STAGING_LIBDIR}/..' \
-                          install-dfbppincludeHEADERS
-        oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-              'DESTDIR=${STAGING_LIBDIR}/..' \
-              install-libLTLIBRARIES
+	autotools_stage_all
 }
 
-
 do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
diff --git a/packages/directfb/dfb++_0.9.23.bb b/packages/directfb/dfb++_0.9.23.bb
deleted file mode 100644
index 0e0772da94..0000000000
--- a/packages/directfb/dfb++_0.9.23.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
-HOMEPAGE = "http://directfb.org"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "directfb"
-LICENSE = "LGPL"
-
-# needs a g++4 patch
-BROKEN = "1"
-
-SRC_URI = "http://www.directfb.org/downloads/Extras/DFB++-${PV}.tar.gz"
-S = "${WORKDIR}/DFB++-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
-        oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-                          'DESTDIR=${STAGING_LIBDIR}/..' \
-                          install-dfbppincludeHEADERS
-        oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \
-                          'oldincludedir=/include' 'datadir=/share' \
-              'DESTDIR=${STAGING_LIBDIR}/..' \
-              install-libLTLIBRARIES
-}
-
-
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
diff --git a/packages/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.23.bb
index 423e888fd8..5357b55b6d 100644
--- a/packages/directfb/directfb-examples_0.9.23.bb
+++ b/packages/directfb/directfb-examples_0.9.23.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "DirectFB examples"
 DEPENDS = "directfb"
 SECTION = "devel/examples"
 LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
 
 SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz"
 S = "${WORKDIR}/DirectFB-examples-${PV}"
diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.25.1.bb
index 9d5566405a..76e849d14b 100644
--- a/packages/directfb/directfb_0.9.25.1.bb
+++ b/packages/directfb/directfb_0.9.25.1.bb
@@ -5,14 +5,14 @@ translucent windows and multiple display layers on top of the \
 Linux framebuffer device."
 SECTION = "libs"
 LICENSE = "LGPL"
-PRIORITY = "optional"
 HOMEPAGE = "http://directfb.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "jpeg libpng freetype zlib"
 PR = "r1"
 RV = "0.9.25"
 
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz"
+SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+           file://fix-pkgconfig-specs.patch;patch=1"
 S = "${WORKDIR}/DirectFB-${PV}"
 
 inherit autotools pkgconfig
@@ -31,5 +31,5 @@ do_install() {
 FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
                           ${libdir}/directfb-${RV}/inputdrivers/*.so \
                           ${libdir}/directfb-${RV}/interfaces/*/*.so \
-			  ${libdir}/directfb-${RV}/wm/*.so \
+                          ${libdir}/directfb-${RV}/wm/*.so \
                           ${datadir}/directfb-${RV}"
diff --git a/packages/directfb/files/.mtn2git_empty b/packages/directfb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/directfb/files/.mtn2git_empty
diff --git a/packages/directfb/files/fix-pkgconfig-specs.patch b/packages/directfb/files/fix-pkgconfig-specs.patch
new file mode 100644
index 0000000000..401d7fa443
--- /dev/null
+++ b/packages/directfb/files/fix-pkgconfig-specs.patch
@@ -0,0 +1,13 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- DirectFB-0.9.25.1/directfb.pc.in~fix-pkgconfig-specs	2005-10-19 01:14:04.000000000 +0200
++++ DirectFB-0.9.25.1/directfb.pc.in	2006-05-20 01:02:37.000000000 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
+-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb
index b3bbe54b02..56ffea86dd 100644
--- a/packages/expat/expat_2.0.0.bb
+++ b/packages/expat/expat_2.0.0.bb
@@ -1,8 +1,8 @@
-SECTION = "libs"
 DESCRIPTION = "Jim Clarkes XML parser library."
 HOMEPAGE = "http://expat.sourceforge.net/"
+SECTION = "libs"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
 	   file://autotools.patch;patch=1"
@@ -11,18 +11,19 @@ S = "${WORKDIR}/expat-${PV}"
 inherit autotools lib_package
 export LTCC = "${CC}"
 
-do_configure () {
+do_configure() {
 	rm -f ${S}/conftools/libtool.m4
+	touch ${S}/conftools/libtool.m4
 	autotools_do_configure
 }
 
-do_stage () {
+do_stage() {
 	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
 	install -m 0644 ${S}/lib/expat_external.h ${STAGING_INCDIR}/
 	oe_libinstall -so libexpat ${STAGING_LIBDIR}
 }
 
-do_install () {
+do_install() {
 	oe_runmake prefix="${D}${prefix}" \
 		bindir="${D}${bindir}" \
 		libdir="${D}${libdir}" \
diff --git a/packages/ezx/ezx-gpiotool_svn.bb b/packages/ezx/ezx-gpiotool_svn.bb
new file mode 100644
index 0000000000..e483c4091c
--- /dev/null
+++ b/packages/ezx/ezx-gpiotool_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Gpiotool can read/write gpio configuration as well as individual gpio pins from userspace."
+SECTION = "devel"
+LICENSE = "GPL"
+HOMEPAGE = "http://openezx.org"
+AUTHOR = "Harald Welte"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src;module=gpiotool;proto=http"
+S = "${WORKDIR}/gpiotool"
+
+do_compile() {
+	for i in mmio.c gpiotool.c gpio.c
+	do
+		${CC} ${CFLAGS} -c $i
+	done
+	${CC} ${CFLAGS} -o ezx-gpiotool mmio.o gpiotool.o gpio.o
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 0755 ezx-gpiotool ${D}${sbindir}
+}
diff --git a/packages/gpe-mixer/gpe-mixer/.mtn2git_empty b/packages/gpe-mixer/gpe-mixer/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-mixer/gpe-mixer/.mtn2git_empty
diff --git a/packages/gpe-mixer/gpe-mixer/gpemixer-no-host-includes.patch b/packages/gpe-mixer/gpe-mixer/gpemixer-no-host-includes.patch
new file mode 100644
index 0000000000..888c42f3e2
--- /dev/null
+++ b/packages/gpe-mixer/gpe-mixer/gpemixer-no-host-includes.patch
@@ -0,0 +1,10 @@
+--- /tmp/Makefile	2006-05-20 15:44:18.249491416 +0200
++++ gpe-mixer-0.42/Makefile	2006-05-20 15:44:38.710380888 +0200
+@@ -22,7 +22,6 @@
+ PACKAGE_LDFLAGS += -L../libgpewidget
+ BUILD = ../build
+ else
+-PACKAGE_CFLAGS += -I/usr/include/gpe
+ BUILD = build
+ endif
+ PACKAGE_LDFLAGS += $(GPELIBS) $(GTKLIBS)
diff --git a/packages/gpe-mixer/gpe-mixer_0.42.bb b/packages/gpe-mixer/gpe-mixer_0.42.bb
index 3d3ef98917..5fe0e98c82 100644
--- a/packages/gpe-mixer/gpe-mixer_0.42.bb
+++ b/packages/gpe-mixer/gpe-mixer_0.42.bb
@@ -1,8 +1,10 @@
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit gpe pkgconfig
 
+SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1"
+
 DESCRIPTION = "GPE audio mixer"
 DEPENDS = "gtk+ libgpewidget"
 SECTION = "gpe"
diff --git a/packages/gpe-plucker/gpe-plucker/plucker-no-host-includes.patch b/packages/gpe-plucker/gpe-plucker/plucker-no-host-includes.patch
new file mode 100644
index 0000000000..2e2423b829
--- /dev/null
+++ b/packages/gpe-plucker/gpe-plucker/plucker-no-host-includes.patch
@@ -0,0 +1,10 @@
+--- /tmp/Makefile	2006-05-20 14:04:09.557951376 +0200
++++ gpe-plucker-0.4/Makefile	2006-05-20 14:04:35.687979008 +0200
+@@ -26,7 +26,6 @@
+ PACKAGE_LDFLAGS += -L../libgpewidget
+ BUILD = ../build
+ else
+-PACKAGE_CFLAGS += -I/usr/include/gpe
+ BUILD = build
+ endif
+ PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck/ -lunpluck -lz
diff --git a/packages/gpe-plucker/gpe-plucker_0.4.bb b/packages/gpe-plucker/gpe-plucker_0.4.bb
index 18f7b92c02..238b1c13d6 100644
--- a/packages/gpe-plucker/gpe-plucker_0.4.bb
+++ b/packages/gpe-plucker/gpe-plucker_0.4.bb
@@ -5,6 +5,8 @@ DEPENDS = "gtk+ libgpewidget"
 SECTION = "gpe"
 PRIORITY = "optional"
 
+SRC_URI += " file://plucker-no-host-includes.patch;patch=1"
 PARALLEL_MAKE=""
 
+PR = "r1"
 
diff --git a/packages/libfribidi/libfribidi_0.10.4.bb b/packages/libfribidi/libfribidi_0.10.4.bb
index 7c2b70d7cc..57aaf48bed 100644
--- a/packages/libfribidi/libfribidi_0.10.4.bb
+++ b/packages/libfribidi/libfribidi_0.10.4.bb
@@ -8,7 +8,7 @@ PR = "r0"
 
 S = "${WORKDIR}/fribidi-${PV}"
 
-SRC_URI = "http://download.sourceforge.net/fribidi/fribidi-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/fribidi/fribidi-${PV}.tar.bz2 \
            file://libtool-update.patch;patch=1"
 
 #PACKAGES += " ${PN}-bin"
diff --git a/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty
diff --git a/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/defconfig b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/defconfig
new file mode 100644
index 0000000000..175cd6d8da
--- /dev/null
+++ b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/defconfig
@@ -0,0 +1,1210 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-omap2
+# Sat Apr  8 14:54:06 2006
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_FIQ=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=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
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+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
+
+#
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 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_L7200 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+
+#
+# TI OMAP Implementations
+#
+CONFIG_ARCH_OMAP1=y
+# CONFIG_ARCH_OMAP2 is not set
+
+#
+# OMAP Feature Selections
+#
+# CONFIG_OMAP_RESET_CLOCKS is not set
+# CONFIG_OMAP_BOOT_TAG is not set
+# CONFIG_OMAP_GPIO_SWITCH is not set
+CONFIG_OMAP_MUX=y
+# CONFIG_OMAP_MUX_DEBUG is not set
+CONFIG_OMAP_MUX_WARNINGS=y
+CONFIG_OMAP_MPU_TIMER=y
+# CONFIG_OMAP_32K_TIMER is not set
+CONFIG_OMAP_LL_DEBUG_UART1=y
+# CONFIG_OMAP_LL_DEBUG_UART2 is not set
+# CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_SERIAL_WAKE=y
+
+#
+# OMAP Core Type
+#
+# CONFIG_ARCH_OMAP730 is not set
+CONFIG_ARCH_OMAP15XX=y
+# CONFIG_ARCH_OMAP16XX is not set
+
+#
+# OMAP Board Type
+#
+# CONFIG_MACH_OMAP_INNOVATOR is not set
+# CONFIG_MACH_VOICEBLUE is not set
+# CONFIG_MACH_OMAP_PALMTE is not set
+CONFIG_MACH_AMS_DELTA=y
+CONFIG_AMS_DELTA_FIQ=y
+# CONFIG_MACH_OMAP_GENERIC is not set
+
+#
+# OMAP CPU Speed
+#
+# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set
+# CONFIG_OMAP_ARM_168MHZ is not set
+CONFIG_OMAP_ARM_150MHZ=y
+# CONFIG_OMAP_ARM_120MHZ is not set
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_OMAP_ARM_30MHZ is not set
+# CONFIG_OMAP_DSP is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM925T=y
+CONFIG_CPU_32v4=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_CPU_DCACHE_WRITETHROUGH=y
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_AEABI 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_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 initrd=0x11c00000,4M"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE 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_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFI