8 files changed, 87 insertions, 14 deletions
diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile
index c17a1ef8a..404cc5bbd 100644
--- a/target/alix2d/Makefile
+++ b/target/alix2d/Makefile
@@ -18,12 +18,11 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 ifeq ($(FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
 	@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
 		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)	
 	@echo
 	@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
-	@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
-	@echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
+	@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
diff --git a/target/alix2d/files/etc/mdev.conf b/target/alix2d/files/etc/mdev.conf
index 5e2c73cf0..b1eda3c20 100644
--- a/target/alix2d/files/etc/mdev.conf
+++ b/target/alix2d/files/etc/mdev.conf
@@ -7,5 +7,11 @@ u?random 0:0 644
 console 0:0 0600
 ptmx 0:0 666
 ttyS* 0:0 640
+audio root:audio 660 >snd/audio
+dsp root:audio 660 >snd/dsp
+timer root:audio 660 >snd/timer
+controlC0 root:audio 660 >snd/controlC0
+pcmC0D0c root:audio 660 >snd/pcmC0D0c
+pcmC0D0p root:audio 660 >snd/pcmC0D0p
 msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
 .* 0:0 644 @/lib/mdev/init
diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config
index 434e2ad64..4948d9d56 100644
--- a/target/alix2d/kernel.config
+++ b/target/alix2d/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Sun Jan 10 11:31:53 2010
+# Fri Feb 12 18:59:57 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -68,7 +68,8 @@ CONFIG_KERNEL_LZMA=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
@@ -149,7 +150,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
-CONFIG_LBDAF=y
+# CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
 
@@ -336,7 +337,7 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-# CONFIG_GEODE_MFGPT_TIMER is not set
+CONFIG_GEODE_MFGPT_TIMER=y
 # CONFIG_OLPC is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -414,7 +415,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_CFG80211_DEFAULT_PS_VALUE=0
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -427,7 +437,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
@@ -754,7 +765,50 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+CONFIG_GEODE_WDT=y
+# CONFIG_SC520_WDT is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_ITCO_WDT is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_HP_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -895,16 +949,15 @@ CONFIG_EXT2_FS=y
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_AUFS_FS is not set
 CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
diff --git a/target/linux/Config.in b/target/linux/Config.in
index d7f1749b5..263b17a45 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -10,7 +10,7 @@ source target/linux/config/Config.in.ipvs
 source target/linux/config/Config.in.multimedia
 source target/linux/config/Config.in.crypto
 source target/linux/config/Config.in.bluetooth
-source target/linux/config/Config.in.isdn
+#source target/linux/config/Config.in.isdn
 source target/linux/config/Config.in.leds
 source target/linux/config/Config.in.misc
 source target/linux/config/Config.in.lib
diff --git a/target/linux/config/Config.in.leds b/target/linux/config/Config.in.leds
index 6a5410fc2..380193561 100644
--- a/target/linux/config/Config.in.leds
+++ b/target/linux/config/Config.in.leds
@@ -16,6 +16,7 @@ config ADK_KPACKAGE_KMOD_LEDS_CLASS
 config ADK_KERNEL_LEDS_TRIGGERS
 	bool
 	default n
+	select ADK_KERNEL_NEW_LEDS
 	help
 
 config ADK_KPACKAGE_KMOD_LEDS_TRIGGER_TIMER
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index b24ac2fa3..cb9de47af 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -27,6 +27,11 @@ config ADK_KPACKAGE_KMOD_SOUND
 	help
 	  Basic support for sound.
 
+config ADK_KPACKAGE_KMOD_SND_RAWMIDI
+	tristate
+	default n
+	help
+
 config ADK_KPACKAGE_KMOD_SND
 	prompt "kmod-sound-alsa................. ALSA sound support"
 	select ADK_KPACKAGE_KMOD_SOUND
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 19f09b05a..812a7073c 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -250,6 +250,7 @@ config ADK_KPACKAGE_KMOD_TUN
 config ADK_KPACKAGE_KMOD_BONDING
 	prompt "kmod-bonding...................... Bonding driver support"
 	tristate
+	select BUSYBOX_IFENSLAVE
 	default n
 	help
   	  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index c9bdb84cf..501e7cdec 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -258,6 +258,14 @@ config ADK_KPACKAGE_KMOD_USB_USBNET
 	default n
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 
+config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
+	prompt "kmod-snd-usb-audio................ USB sound adapter"
+	tristate
+	default n
+	select ADK_KPACKAGE_KMOD_SND
+	select ADK_KPACKAGE_KMOD_SND_RAWMIDI
+	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+
 config ADK_KPACKAGE_KMOD_USB_SISUSBVGA
         prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)"
 	tristate