merge of 008eb71d2c280e1f5c511b697e1376dda71d5eef

     and 61329a2030536aebd4f09b262832d612b83a3f03

68 files changed, 80115 insertions, 1300 deletions

diff --git a/packages/linux/handhelds-pxa-2.6/24-hostap_cs_id.diff b/packages/linux/handhelds-pxa-2.6/24-hostap_cs_id.diff
new file mode 100644
index 0000000000..b90ead9e4f
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6/24-hostap_cs_id.diff
@@ -0,0 +1,107 @@
+Add more IDs for PCMCIA cards
+
+From: Pavel Roskin <proski@gnu.org>
+
+Add string IDs for cards that were covered by 0x0156,0x0002, which is no
+longer used in hostap_cs due to conflict with Orinoco cards.
+
+Also add more IDs for cards that are supported by linux-wlan-ng.  Thanks
+to Arnold Schulz <arnysch@gmx.net> for providing the list.
+
+Signed-off-by: Pavel Roskin <proski@gnu.org>
+---
+
+ drivers/net/wireless/hostap/hostap_cs.c |   46 +++++++++++++++++++++++++++++++
+ 1 files changed, 46 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
+index 55bed92..9ac1aec 100644
+--- a/drivers/net/wireless/hostap/hostap_cs.c
++++ b/drivers/net/wireless/hostap/hostap_cs.c
+@@ -832,9 +832,11 @@ static int hostap_cs_resume(struct pcmci
+ static struct pcmcia_device_id hostap_cs_ids[] = {
+ 	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
+ 	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
++	PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002),
+ 	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
+ 	PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
+ 	PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
++	PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008),
+ 	PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
+ 	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
+ 	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
+@@ -844,7 +846,10 @@ static struct pcmcia_device_id hostap_cs
+ 	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
+ 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
+ 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
++	PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021),
++	PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008),
+ 	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
++	PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),
+ 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
+ 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
+ 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
+@@ -862,22 +867,63 @@ static struct pcmcia_device_id hostap_cs
+ 		"Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
+ 		0xe6ec52ce, 0x08649af2, 0x4b74baa0),
+ 	PCMCIA_DEVICE_PROD_ID123(
++		"Belkin", "11Mbps Wireless Notebook Network Adapter",
++		"Version 01.02", 0x3805a391, 0xad4c7744, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
+ 		"D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
+ 		0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
+ 	PCMCIA_DEVICE_PROD_ID123(
+ 		"Instant Wireless ", " Network PC CARD", "Version 01.02",
+ 		0x11d901af, 0x6e9bd926, 0x4b74baa0),
+ 	PCMCIA_DEVICE_PROD_ID123(
++		"Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P",
++		0x4b801a17, 0xf222ec2d, 0x630d52b2),
++	PCMCIA_DEVICE_PROD_ID123(
++		"OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02",
++		0xfea54c90, 0x48f2bdd6, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
++		"Pretec", "CompactWLAN Card 802.11b", "2.5",
++		0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
++ 	PCMCIA_DEVICE_PROD_ID123(
+ 		"SMC", "SMC2632W", "Version 01.02",
+ 		0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID123(
++		"The Linksys Group, Inc.", "Instant Wireless Network PC Card",
++		"ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
++	PCMCIA_DEVICE_PROD_ID123(
++		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
++		0xc7b8df9d, 0x1700d087, 0x4b74baa0),
++	PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25",
++				0x78fc06ee, 0xdb9aa842),
++	PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25",
++				0x78fc06ee, 0x45a50c1e),
+ 	PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 
+ 				0x2decece3, 0x82067c18),
+ 	PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
+ 				0x54f7c49c, 0x15a75e5b),
++	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11",
++				0x5261440f, 0xa6405584),
++	PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11",
++				0x5261440f, 0xdf6115f9),
++	PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card",
++				0x71b18589, 0xf144e3ac),
++	PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100",
++				0xfdd73470, 0xe0b6f146),
+ 	PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
+ 				0x74c5e40d, 0xdb472a18),
++	PCMCIA_DEVICE_PROD_ID12("LeArtery",
++				"SYNCBYAIR 11Mbps Wireless LAN PC Card",
++				0x7e3b326a, 0x49893e92),
+ 	PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
+ 				0x0733cc81, 0x0c52f395),
++	PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card",
++				0xa37434e9, 0x9762e8f1),
++	PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card",
++				0x4ac44287, 0x235a6bed),
++	PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110",
++				0x209f40ab, 0xd9715264),
++	PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110",
++				0x209f40ab, 0x46263178),
+ 	PCMCIA_DEVICE_PROD_ID12(
+ 		"ZoomAir 11Mbps High", "Rate wireless Networking",
+ 		0x273fe3db, 0x32a1eaee),
diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
index adb05cd8e3..79187ffa99 100644
--- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig
+++ b/packages/linux/handhelds-pxa-2.6/h2200/defconfig
@@ -1,20 +1,18 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-hh1
-# Wed Feb 22 16:24:24 2006
+# Linux kernel version: 2.6.16-hh0
+# Thu May 11 10:23:12 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
-CONFIG_UID16=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -30,18 +28,20 @@ CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
+# CONFIG_IKCONFIG_PROC is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
 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
@@ -52,8 +52,10 @@ 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
@@ -90,7 +92,6 @@ CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IOP3XX is not set
@@ -109,6 +110,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
 
 #
 # Intel PXA2xx Implementations
@@ -121,7 +123,6 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_A716 is not set
 # CONFIG_ARCH_H1900 is not set
 CONFIG_ARCH_H2200=y
-CONFIG_H2200_PM=y
 # CONFIG_ARCH_H3900 is not set
 # CONFIG_MACH_H4000 is not set
 # CONFIG_MACH_H4700 is not set
@@ -136,10 +137,10 @@ CONFIG_H2200_PM=y
 # 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
+CONFIG_GPIO_KEYS=y
 
 #
 # Linux As Bootloader
@@ -161,6 +162,7 @@ CONFIG_CPU_TLB_V4WBI=y
 #
 CONFIG_ARM_THUMB=y
 CONFIG_XSCALE_PMU=y
+CONFIG_KEXEC=y
 
 #
 # Compaq/iPAQ Platforms
@@ -190,7 +192,6 @@ CONFIG_DMABOUNCE=y
 #
 # Bus support
 #
-CONFIG_ISA_DMA_API=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -212,6 +213,7 @@ CONFIG_PCMCIA_H2200=y
 #
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
+# CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -232,6 +234,14 @@ CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/mmcblk0p1"
 # CONFIG_XIP_KERNEL is not set
 
 #
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_PXA25x_ALTERNATE_FREQS=y
+
+#
 # Floating point emulation
 #
 
@@ -247,7 +257,7 @@ CONFIG_FPE_FASTFPE=y
 #
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=m
 # CONFIG_ARTHUR is not set
 
 #
@@ -266,7 +276,8 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=m
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
@@ -299,7 +310,7 @@ CONFIG_TCP_CONG_BIC=y
 # IP: Virtual Server Configuration
 #
 # CONFIG_IP_VS is not set
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -314,6 +325,7 @@ CONFIG_BRIDGE_NETFILTER=y
 # Core Netfilter Configuration
 #
 # CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_XTABLES is not set
 
 #
 # IP: Netfilter Configuration
@@ -330,85 +342,11 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP_NF_AMANDA is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_QUEUE is not set
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-# CONFIG_IP_NF_MATCH_IPRANGE is not set
-CONFIG_IP_NF_MATCH_MAC=m
-# CONFIG_IP_NF_MATCH_PKTTYPE is not set
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_DSCP is not set
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-# CONFIG_IP_NF_MATCH_HELPER is not set
-CONFIG_IP_NF_MATCH_STATE=m
-# CONFIG_IP_NF_MATCH_CONNTRACK is not set
-# CONFIG_IP_NF_MATCH_OWNER is not set
-# CONFIG_IP_NF_MATCH_PHYSDEV is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_REALM is not set
-# CONFIG_IP_NF_MATCH_SCTP is not set
-# CONFIG_IP_NF_MATCH_DCCP is not set
-# CONFIG_IP_NF_MATCH_COMMENT is not set
-# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# 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
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-# CONFIG_IP_NF_TARGET_NFQUEUE is not set
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_DSCP is not set
-CONFIG_IP_NF_TARGET_MARK=m
-# CONFIG_IP_NF_TARGET_CLASSIFY is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_RAW 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=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-# CONFIG_IP6_NF_MATCH_OWNER is not set
-CONFIG_IP6_NF_MATCH_MARK=m
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_AHESP is not set
-# CONFIG_IP6_NF_MATCH_LENGTH is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_PHYSDEV is not set
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
-# CONFIG_IP6_NF_TARGET_REJECT is not set
-# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_RAW is not set
 
 #
 # Bridge: Netfilter Configuration
@@ -424,6 +362,11 @@ CONFIG_IP6_NF_TARGET_MARK=m
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 # CONFIG_VLAN_8021Q is not set
@@ -493,13 +436,8 @@ CONFIG_IRPORT_SIR=m
 #
 # CONFIG_USB_IRDA is not set
 # CONFIG_SIGMATEL_FIR is not set
-# CONFIG_NSC_FIR is not set
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VIA_FIR is not set
 CONFIG_PXA_FICP=m
-CONFIG_BT=m
+CONFIG_BT=y
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
@@ -512,8 +450,9 @@ CONFIG_BT_HIDP=m
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIUSB is not set
-CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUSB=m
+# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBCM203X is not set
@@ -524,11 +463,11 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 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 is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_WEP=y
+CONFIG_IEEE80211_CRYPT_CCMP=y
+CONFIG_IEEE80211_CRYPT_TKIP=y
 
 #
 # Device Drivers
@@ -708,7 +647,7 @@ CONFIG_CHR_DEV_SG=m
 #
 # SCSI Transport Attributes
 #
-# CONFIG_SCSI_SPI_ATTRS is not set
+CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_SAS_ATTRS is not set
@@ -742,7 +681,6 @@ CONFIG_PCMCIA_AHA152X=m
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
 
 #
 # I2O device support
@@ -799,7 +737,6 @@ CONFIG_PCMCIA_RAYCS=m
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_AIRO is not set
 CONFIG_HERMES=m
 CONFIG_ATMEL=m
 
@@ -814,6 +751,7 @@ CONFIG_PCMCIA_WL3501=m
 CONFIG_HOSTAP=m
 # CONFIG_HOSTAP_FIRMWARE is not set
 CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -1015,6 +953,23 @@ CONFIG_SA1100_RTC=y
 # CONFIG_TELCLOCK is not set
 
 #
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+CONFIG_W1=y
+# 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_SAMCOP=y
+CONFIG_W1_DS2760=y
+
+#
 # Hardware Monitoring support
 #
 # CONFIG_HWMON is not set
@@ -1058,6 +1013,7 @@ CON