merge of 4052297c94828dc52bc0def5a0e710c9ac0d5446

     and 5e78d5593b39480d9f6ba5bbfc3b6073e7aa3232

2 files changed, 29 insertions, 21 deletions

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index de0cee56fa..3feed1c4ea 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -79,7 +79,7 @@ TARGET_OS = "linux"
 #<>
 BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \
                              e2tools e2fsprogs kernel-modules spectrum-fw keymaps \
-			     hotplug-ng orinoco-conf"
+			     hotplug-ng orinoco-conf wget"
 
 #<>
 #<>What Qte, libqte.. versions should we use.
diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime
index 277a2d92d9..4572f7cf9a 100644
--- a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime
+++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17
-# Tue Aug  1 11:50:57 2006
+# Sun Aug 13 16:30:04 2006
 #
 CONFIG_SUPERH=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -36,7 +36,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -425,7 +425,7 @@ CONFIG_WIRELESS_EXT=y
 # Generic Driver Options
 #
 CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 
 #
@@ -446,7 +446,13 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
-# CONFIG_PNP is not set
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG is not set
+
+#
+# Protocols
+#
+# CONFIG_ISAPNP is not set
 
 #
 # Block devices
@@ -483,6 +489,7 @@ CONFIG_BLK_DEV_IDECS=y
 # IDE chipset support/bugfixes
 #
 CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_IDE_SH=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
@@ -527,6 +534,7 @@ CONFIG_DUMMY=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+# CONFIG_NET_SB1000 is not set
 
 #
 # ARCnet devices
@@ -544,11 +552,7 @@ CONFIG_DUMMY=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_STNIC is not set
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_EL1 is not set
-# CONFIG_EL2 is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL3 is not set
+# CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_SMC91X is not set
 # CONFIG_NET_VENDOR_RACAL is not set
@@ -583,29 +587,33 @@ CONFIG_NET_WIRELESS_RTNETLINK=y
 #
 # CONFIG_STRIP is not set
 # CONFIG_ARLAN is not set
-# CONFIG_WAVELAN is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
+CONFIG_WAVELAN=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_PCMCIA_NETWAVE=m
 
 #
 # Wireless 802.11 Frequency Hopping cards support
 #
-# CONFIG_PCMCIA_RAYCS is not set
+CONFIG_PCMCIA_RAYCS=m
 
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-CONFIG_HERMES=y
-# CONFIG_ATMEL is not set
+CONFIG_HERMES=m
+CONFIG_ATMEL=m
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
-CONFIG_PCMCIA_HERMES=y
-# CONFIG_PCMCIA_SPECTRUM is not set
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_CS=m
 CONFIG_NET_WIRELESS=y
 
 #