[Astlinux-commits] SF.net SVN: astlinux: [434] trunk

[<kr...@us...>]

Revision: 434
          http://svn.sourceforge.net/astlinux/?rev=434&view=rev
Author:   krisk84
Date:     2006-11-02 09:00:14 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
update to Linux 2.6.18

Modified Paths:
--------------
    trunk/package/astmanproxy/astmanproxy.mk
    trunk/package/lmsensors/lmsensors.mk
    trunk/package/madwifi/madwifi.mk
    trunk/package/wanpipe/wanpipe.mk
    trunk/package/zaptel/zaptel.mk
    trunk/target/device/geni586/linux.config
    trunk/target/device/geni586/linux.mk
    trunk/target/device/net4801/linux.config
    trunk/target/device/net4801/linux.mk
    trunk/target/device/via/linux.config
    trunk/target/device/via/linux.mk
    trunk/target/device/wrap/linux.config
    trunk/target/device/wrap/linux.mk

Removed Paths:
-------------
    trunk/target/device/net4801/kernel-patches/linux_natsemi.patch
    trunk/target/device/net4801/kernel-patches/linux_scx200-hr-timer.patch
    trunk/target/device/wrap/kernel-patches/linux_natsemi.patch
    trunk/target/device/wrap/kernel-patches/linux_scx200-hr-timer.patch

Modified: trunk/package/astmanproxy/astmanproxy.mk
===================================================================
--- trunk/package/astmanproxy/astmanproxy.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/package/astmanproxy/astmanproxy.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -11,7 +11,7 @@
 ASTMANPROXY_BINARY:=astmanproxy
 ASTMANPROXY_TARGET_BINARY:=usr/sbin/$(ASTMANPROXY_BINARY)
 
-LINUX_VER=2.6.16.12
+LINUX_VER=2.6.18
 
 $(DL_DIR)/$(ASTMANPROXY_SOURCE):
 	$(WGET) -P $(DL_DIR) $(ASTMANPROXY_SITE)/$(ASTMANPROXY_SOURCE)

Modified: trunk/package/lmsensors/lmsensors.mk
===================================================================
--- trunk/package/lmsensors/lmsensors.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/package/lmsensors/lmsensors.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -10,7 +10,7 @@
 LMSENSORS_BINARY := prog/sensors/sensors
 LMSENSORS_TARGET_BINARY := usr/bin/sensors
 
-LINUX_VER=2.6.16.12
+LINUX_VER=2.6.18
 
 $(DL_DIR)/$(LMSENSORS_SOURCE):
 	$(WGET) -P $(DL_DIR) $(LMSENSORS_SITE)/$(LMSENSORS_SOURCE)

Modified: trunk/package/madwifi/madwifi.mk
===================================================================
--- trunk/package/madwifi/madwifi.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/package/madwifi/madwifi.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -3,14 +3,14 @@
 # madwifi
 #
 ##############################################################
-MADWIFI_VERSION := r1497-20060407
+MADWIFI_VERSION := r1784-20061027
 MADWIFI_SOURCE := madwifi-ng-$(MADWIFI_VERSION).tar.gz
 MADWIFI_SITE := http://snapshots.madwifi.org/madwifi-ng
 MADWIFI_DIR := $(BUILD_DIR)/madwifi-ng-$(MADWIFI_VERSION)
 MADWIFI_BINARY := tools/wlanconfig
 MADWIFI_TARGET_BINARY := usr/bin/wlanconfig
 
-LINUX_VER=2.6.16.12
+LINUX_VER=2.6.18
 
 $(DL_DIR)/$(MADWIFI_SOURCE):
 	$(WGET) -P $(DL_DIR) $(MADWIFI_SITE)/$(MADWIFI_SOURCE)

Modified: trunk/package/wanpipe/wanpipe.mk
===================================================================
--- trunk/package/wanpipe/wanpipe.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/package/wanpipe/wanpipe.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -12,7 +12,7 @@
 WANPIPE_TARGET_DIR:=usr/sbin
 WANPIPE_TARGET_BINARY:=$(WANPIPE_TARGET_DIR)/wancfg
 
-LINUX_VER=2.6.16.12
+LINUX_VER=2.6.18
 
 $(DL_DIR)/$(WANPIPE_SOURCE):
 	$(WGET) -P $(DL_DIR) $(WANPIPE_SITE)/$(WANPIPE_SOURCE)

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/package/zaptel/zaptel.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -18,7 +18,7 @@
 #LINUX_VER=$(subst ",, $(strip $(BR2_PACKAGE_LINUX_VERSION)))
 #"
 
-LINUX_VER=2.6.16.12
+LINUX_VER=2.6.18
 
 ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
 		-e 's/i.86/i386/' \

Modified: trunk/target/device/geni586/linux.config
===================================================================
--- trunk/target/device/geni586/linux.config	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/geni586/linux.config	2006-11-02 17:00:14 UTC (rev 434)
@@ -1,16 +1,21 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.12
-# Fri Sep 15 23:21:03 2006
+# Linux kernel version: 2.6.18
+# Thu Nov  2 11:47:57 2006
 #
 CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
@@ -29,16 +34,17 @@
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
+# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
-CONFIG_VM86=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -49,11 +55,9 @@
 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_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -64,7 +68,6 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
@@ -74,6 +77,8 @@
 # Block layer
 #
 # CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_LSF=y
 
 #
 # IO Schedulers
@@ -91,6 +96,7 @@
 #
 # Processor type and features
 #
+CONFIG_SMP=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -141,9 +147,9 @@
 CONFIG_X86_TSC=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_SMP=y
 CONFIG_NR_CPUS=4
 CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -153,6 +159,7 @@
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set
 # CONFIG_X86_MCE_P4THERMAL is not set
+CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 CONFIG_X86_REBOOTFIXUPS=y
@@ -169,10 +176,6 @@
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -186,6 +189,7 @@
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
 # CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
@@ -201,7 +205,8 @@
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_DOUBLEFAULT=y
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 
 #
 # Power management options (ACPI, APM)
@@ -220,6 +225,7 @@
 # CONFIG_ACPI_VIDEO is not set
 # CONFIG_ACPI_HOTKEY is not set
 # CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_PROCESSOR is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_IBM is not set
@@ -231,6 +237,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 # CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_SBS is not set
 
 #
 # APM (Advanced Power Management) BIOS Support
@@ -255,7 +262,6 @@
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY_PROC=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@@ -314,7 +320,10 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -325,6 +334,9 @@
 #
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_BRIDGE_NETFILTER is not set
@@ -341,20 +353,27 @@
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -364,6 +383,7 @@
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
@@ -373,20 +393,20 @@
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
@@ -404,6 +424,8 @@
 CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_H323=m
+CONFIG_IP_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -438,12 +460,12 @@
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # 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
 
@@ -531,6 +553,9 @@
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
 
 #
 # Device Drivers
@@ -542,6 +567,7 @@
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -590,6 +616,7 @@
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -708,6 +735,7 @@
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
@@ -719,6 +747,7 @@
 # CONFIG_SCSI_SATA_MV is not set
 CONFIG_SCSI_SATA_NV=y
 # CONFIG_SCSI_PDC_ADMA is not set
+# CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_SATA_QSTOR is not set
 CONFIG_SCSI_SATA_PROMISE=y
 CONFIG_SCSI_SATA_SX4=y
@@ -746,7 +775,6 @@
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PSI240I is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_LPFC is not set
@@ -886,6 +914,7 @@
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_NAPI=y
 
 #
 # Ethernet (1000 Mbit)
@@ -916,6 +945,7 @@
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
 
 #
 # Token Ring devices
@@ -926,6 +956,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -941,6 +972,10 @@
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
@@ -955,11 +990,21 @@
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
 CONFIG_PRISM54=m
+# CONFIG_USB_ZD1201 is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -971,7 +1016,6 @@
 # CONFIG_DSCC4 is not set
 CONFIG_LANMEDIA=m
 # CONFIG_SEALEVEL_4021 is not set
-# CONFIG_SYNCLINK_SYNCPPP is not set
 CONFIG_HDLC=m
 CONFIG_HDLC_RAW=y
 CONFIG_HDLC_RAW_ETH=y
@@ -1099,6 +1143,7 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -1106,7 +1151,8 @@
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -1182,7 +1228,11 @@
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
-CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
 # CONFIG_DTLK is not set
@@ -1196,6 +1246,8 @@
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 # CONFIG_MWAVE is not set
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
@@ -1232,6 +1284,7 @@
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
@@ -1254,9 +1307,7 @@
 # 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_RTC_X1205_I2C is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1271,13 +1322,13 @@
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
 #
 CONFIG_HWMON=m
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -1306,10 +1357,12 @@
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
@@ -1323,31 +1376,32 @@
 # CONFIG_IBM_ASM is not set
 
 #
-# Multimedia Capabilities Port drivers
-#
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
+# CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB is not set
-# CONFIG_VIDEO_SELECT is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_VIDEO_SELECT is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -1359,6 +1413,7 @@
 #
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
 
@@ -1377,6 +1432,7 @@
 CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1423,9 +1479,7 @@
 # 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_TOUCHSCREEN is not set
 # CONFIG_USB_YEALINK is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_ATI_REMOTE is not set
@@ -1440,15 +1494,6 @@
 # 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
@@ -1456,7 +1501,6 @@
 # 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 is not set
 
 #
@@ -1478,10 +1522,12 @@
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 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_APPLEDISPLAY is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
@@ -1501,6 +1547,19 @@
 # CONFIG_MMC is not set
 
 #
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
 # InfiniBand support
 #
 # CONFIG_INFINIBAND is not set
@@ -1511,6 +1570,51 @@
 # CONFIG_EDAC is not set
 
 #
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_TEST=m
+CONFIG_RTC_DRV_V3020=m
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1564,7 +1668,6 @@
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1673,14 +1776,19 @@
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_MAGIC_SYSRQ is not set
+CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_UNWIND_INFO is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
+CONFIG_DOUBLEFAULT=y
 
 #
 # Security options
@@ -1737,6 +1845,7 @@
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y

Modified: trunk/target/device/geni586/linux.mk
===================================================================
--- trunk/target/device/geni586/linux.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/geni586/linux.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -22,10 +22,10 @@
 ifneq ($(filter $(TARGETS),linux),)
 
 # Version of Linux to download and then apply patches to
-DOWNLOAD_LINUX_VERSION=2.6.16.12
+DOWNLOAD_LINUX_VERSION=2.6.18
 # Version of Linux AFTER patches
-#LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-astlinux
-LINUX_VERSION=2.6.16.12
+LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-astlinux
+#LINUX_VERSION=2.6.18
 
 DEVICE_DIR=$(BASE_DIR)/target/device/geni586
 

Deleted: trunk/target/device/net4801/kernel-patches/linux_natsemi.patch
===================================================================
--- trunk/target/device/net4801/kernel-patches/linux_natsemi.patch	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/net4801/kernel-patches/linux_natsemi.patch	2006-11-02 17:00:14 UTC (rev 434)
@@ -1,299 +0,0 @@
-===================================================================
---- linux-2.6.15.2.orig/drivers/net/natsemi.c	2006-01-31 06:25:07.000000000 +0000
-+++ linux-2.6.15.2/drivers/net/natsemi.c	2006-02-01 22:59:29.000000000 +0000
-@@ -3,6 +3,7 @@
- 	Written/copyright 1999-2001 by Donald Becker.
- 	Portions copyright (c) 2001,2002 Sun Microsystems (th...@su...)
- 	Portions copyright 2001,2002 Manfred Spraul (ma...@co...)
-+	Portions copyright 2004 Harald Welte <la...@gn...>
- 
- 	This software may be used and distributed according to the terms of
- 	the GNU General Public License (GPL), incorporated herein by reference.
-@@ -135,8 +136,6 @@
- 
- 	TODO:
- 	* big endian support with CFG:BEM instead of cpu_to_le32
--	* support for an external PHY
--	* NAPI
- */
- 
- #include <linux/config.h>
-@@ -160,6 +159,7 @@
- #include <linux/mii.h>
- #include <linux/crc32.h>
- #include <linux/bitops.h>
-+#include <linux/prefetch.h>
- #include <asm/processor.h>	/* Processor type for cache alignment. */
- #include <asm/io.h>
- #include <asm/irq.h>
-@@ -183,8 +183,6 @@
- 				 NETIF_MSG_TX_ERR)
- static int debug = -1;
- 
--/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
--static int max_interrupt_work = 20;
- static int mtu;
- 
- /* Maximum number of multicast addresses to filter (vs. rx-all-multicast).
-@@ -251,14 +249,11 @@ MODULE_AUTHOR("Donald Becker <becker@scy
- MODULE_DESCRIPTION("National Semiconductor DP8381x series PCI Ethernet driver");
- MODULE_LICENSE("GPL");
- 
--module_param(max_interrupt_work, int, 0);
- module_param(mtu, int, 0);
- module_param(debug, int, 0);
- module_param(rx_copybreak, int, 0);
- module_param_array(options, int, NULL, 0);
- module_param_array(full_duplex, int, NULL, 0);
--MODULE_PARM_DESC(max_interrupt_work, 
--	"DP8381x maximum events handled per interrupt");
- MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)");
- MODULE_PARM_DESC(debug, "DP8381x default debug level");
- MODULE_PARM_DESC(rx_copybreak, 
-@@ -691,6 +686,8 @@ struct netdev_private {
- 	/* Based on MTU+slack. */
- 	unsigned int rx_buf_sz;
- 	int oom;
-+	/* Interrupt status */
-+	u32 intr_status;
- 	/* Do not touch the nic registers */
- 	int hands_off;
- 	/* external phy that is used: only valid if dev->if_port != PORT_TP */
-@@ -748,7 +745,8 @@ static void init_registers(struct net_de
- static int start_tx(struct sk_buff *skb, struct net_device *dev);
- static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *regs);
- static void netdev_error(struct net_device *dev, int intr_status);
--static void netdev_rx(struct net_device *dev);
-+static int natsemi_poll(struct net_device *dev, int *budget);
-+static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do);
- static void netdev_tx_done(struct net_device *dev);
- static int natsemi_change_mtu(struct net_device *dev, int new_mtu);
- #ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -776,6 +774,18 @@ static inline void __iomem *ns_ioaddr(st
- 	return (void __iomem *) dev->base_addr;
- }
- 
-+static inline void natsemi_irq_enable(struct net_device *dev)
-+{
-+	writel(1, ns_ioaddr(dev) + IntrEnable);
-+	readl(ns_ioaddr(dev) + IntrEnable);
-+}
-+
-+static inline void natsemi_irq_disable(struct net_device *dev)
-+{
-+	writel(0, ns_ioaddr(dev) + IntrEnable);
-+	readl(ns_ioaddr(dev) + IntrEnable);
-+}
-+
- static void move_int_phy(struct net_device *dev, int addr)
- {
- 	struct netdev_private *np = netdev_priv(dev);
-@@ -879,6 +889,7 @@ static int __devinit natsemi_probe1 (str
- 	spin_lock_init(&np->lock);
- 	np->msg_enable = (debug >= 0) ? (1<<debug)-1 : NATSEMI_DEF_MSG;
- 	np->hands_off = 0;
-+	np->intr_status = 0;
- 
- 	/* Initial port:
- 	 * - If the nic was configured to use an external phy and if find_mii
-@@ -932,6 +943,9 @@ static int __devinit natsemi_probe1 (str
- 	dev->do_ioctl = &netdev_ioctl;
- 	dev->tx_timeout = &tx_timeout;
- 	dev->watchdog_timeo = TX_TIMEOUT;
-+	dev->poll = natsemi_poll;
-+	dev->weight = 64;
-+
- #ifdef CONFIG_NET_POLL_CONTROLLER
- 	dev->poll_controller = &natsemi_poll_controller;
- #endif
-@@ -2158,68 +2172,92 @@ static void netdev_tx_done(struct net_de
- 	}
- }
- 
--/* The interrupt handler does all of the Rx thread work and cleans up
--   after the Tx thread. */
-+/* The interrupt handler doesn't actually handle interrupts itself, it
-+ * schedules a NAPI poll if there is anything to do. */
- static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs)
- {
- 	struct net_device *dev = dev_instance;
- 	struct netdev_private *np = netdev_priv(dev);
- 	void __iomem * ioaddr = ns_ioaddr(dev);
--	int boguscnt = max_interrupt_work;
--	unsigned int handled = 0;
- 
- 	if (np->hands_off)
- 		return IRQ_NONE;
--	do {
--		/* Reading automatically acknowledges all int sources. */
--		u32 intr_status = readl(ioaddr + IntrStatus);
-+	
-+	/* Reading automatically acknowledges. */
-+	np->intr_status = readl(ioaddr + IntrStatus);
- 
--		if (netif_msg_intr(np))
--			printk(KERN_DEBUG
--				"%s: Interrupt, status %#08x, mask %#08x.\n",
--				dev->name, intr_status,
--				readl(ioaddr + IntrMask));
-+	if (netif_msg_intr(np))
-+		printk(KERN_DEBUG
-+		       "%s: Interrupt, status %#08x, mask %#08x.\n",
-+		       dev->name, np->intr_status,
-+		       readl(ioaddr + IntrMask));
- 
--		if (intr_status == 0)
--			break;
--		handled = 1;
-+	if (!np->intr_status) 
-+		return IRQ_NONE;
- 
--		if (intr_status &
--		   (IntrRxDone | IntrRxIntr | RxStatusFIFOOver |
--		    IntrRxErr | IntrRxOverrun)) {
--			netdev_rx(dev);
--		}
-+	prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]);
-+
-+	if (netif_rx_schedule_prep(dev)) {
-+		/* Disable interrupts and register for poll */
-+		natsemi_irq_disable(dev);
-+		__netif_rx_schedule(dev);
-+	}
-+	return IRQ_HANDLED;
-+}
- 
--		if (intr_status &
--		   (IntrTxDone | IntrTxIntr | IntrTxIdle | IntrTxErr)) {
-+/* This is the NAPI poll routine.  As well as the standard RX handling
-+ * it also handles all other interrupts that the chip might raise.
-+ */
-+static int natsemi_poll(struct net_device *dev, int *budget)
-+{
-+	struct netdev_private *np = netdev_priv(dev);
-+	void __iomem * ioaddr = ns_ioaddr(dev);
-+
-+	int work_to_do = min(*budget, dev->quota);
-+	int work_done = 0;
-+
-+	do {
-+		if (np->intr_status &
-+		    (IntrTxDone | IntrTxIntr | IntrTxIdle | IntrTxErr)) {
- 			spin_lock(&np->lock);
- 			netdev_tx_done(dev);
- 			spin_unlock(&np->lock);
- 		}
- 
- 		/* Abnormal error summary/uncommon events handlers. */
--		if (intr_status & IntrAbnormalSummary)
--			netdev_error(dev, intr_status);
--
--		if (--boguscnt < 0) {
--			if (netif_msg_intr(np))
--				printk(KERN_WARNING
--					"%s: Too much work at interrupt, "
--					"status=%#08x.\n",
--					dev->name, intr_status);
--			break;
-+		if (np->intr_status & IntrAbnormalSummary)
-+			netdev_error(dev, np->intr_status);
-+		
-+		if (np->intr_status &
-+		    (IntrRxDone | IntrRxIntr | RxStatusFIFOOver |
-+		     IntrRxErr | IntrRxOverrun)) {
-+			netdev_rx(dev, &work_done, work_to_do);
- 		}
--	} while (1);
-+		
-+		*budget -= work_done;
-+		dev->quota -= work_done;
- 
--	if (netif_msg_intr(np))
--		printk(KERN_DEBUG "%s: exiting interrupt.\n", dev->name);
-+		if (work_done >= work_to_do)
-+			return 1;
-+
-+		np->intr_status = readl(ioaddr + IntrStatus);
-+	} while (np->intr_status);
- 
--	return IRQ_RETVAL(handled);
-+	netif_rx_complete(dev);
-+
-+	/* Reenable interrupts providing nothing is trying to shut
-+	 * the chip down. */
-+	spin_lock(&np->lock);
-+	if (!np->hands_off && netif_running(dev))
-+		natsemi_irq_enable(dev);
-+	spin_unlock(&np->lock);
-+
-+	return 0;
- }
- 
- /* This routine is logically part of the interrupt handler, but separated
-    for clarity and better register allocation. */
--static void netdev_rx(struct net_device *dev)
-+static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do)
- {
- 	struct netdev_private *np = netdev_priv(dev);
- 	int entry = np->cur_rx % RX_RING_SIZE;
-@@ -2237,6 +2275,12 @@ static void netdev_rx(struct net_device 
- 				entry, desc_status);
- 		if (--boguscnt < 0)
- 			break;
-+
-+		if (*work_done >= work_to_do)
-+			break;
-+
-+		(*work_done)++;
-+
- 		pkt_len = (desc_status & DescSizeMask) - 4;
- 		if ((desc_status&(DescMore|DescPktOK|DescRxLong)) != DescPktOK){
- 			if (desc_status & DescMore) {
-@@ -2293,7 +2337,7 @@ static void netdev_rx(struct net_device 
- 				np->rx_skbuff[entry] = NULL;
- 			}
- 			skb->protocol = eth_type_trans(skb, dev);
--			netif_rx(skb);
-+			netif_receive_skb(skb);
- 			dev->last_rx = jiffies;
- 			np->stats.rx_packets++;
- 			np->stats.rx_bytes += pkt_len;
-@@ -3074,9 +3118,7 @@ static int netdev_close(struct net_devic
- 	del_timer_sync(&np->timer);
- 	disable_irq(dev->irq);
- 	spin_lock_irq(&np->lock);
--	/* Disable interrupts, and flush posted writes */
--	writel(0, ioaddr + IntrEnable);
--	readl(ioaddr + IntrEnable);
-+	natsemi_irq_disable(dev);
- 	np->hands_off = 1;
- 	spin_unlock_irq(&np->lock);
- 	enable_irq(dev->irq);
-@@ -3158,6 +3200,9 @@ static void __devexit natsemi_remove1 (s
-  *	* netdev_timer: timer stopped by natsemi_suspend.
-  *	* intr_handler: doesn't acquire the spinlock. suspend calls
-  *		disable_irq() to enforce synchronization.
-+ *      * natsemi_poll: checks before reenabling interrupts.  suspend
-+ *              sets hands_off, disables interrupts and then waits with
-+ *              netif_poll_disable().
-  *
-  * Interrupts must be disabled, otherwise hands_off can cause irq storms.
-  */
-@@ -3183,6 +3228,8 @@ static int natsemi_suspend (struct pci_d
- 		spin_unlock_irq(&np->lock);
- 		enable_irq(dev->irq);
- 
-+		netif_poll_disable(dev);
-+
- 		/* Update the error counts. */
- 		__get_stats(dev);
- 
-@@ -3235,6 +3282,7 @@ static int natsemi_resume (struct pci_de
- 		mod_timer(&np->timer, jiffies + 1*HZ);
- 	}
- 	netif_device_attach(dev);
-+	netif_poll_enable(dev);
- out:
- 	rtnl_unlock();
- 	return 0;
-

Deleted: trunk/target/device/net4801/kernel-patches/linux_scx200-hr-timer.patch
===================================================================
--- trunk/target/device/net4801/kernel-patches/linux_scx200-hr-timer.patch	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/net4801/kernel-patches/linux_scx200-hr-timer.patch	2006-11-02 17:00:14 UTC (rev 434)
@@ -1,317 +0,0 @@
-diff -Naurp linux-2.6.12-rc6.orig/arch/i386/Kconfig linux-2.6.12-rc6/arch/i386/Kconfig
---- linux-2.6.12-rc6.orig/arch/i386/Kconfig	2005-06-07 14:56:02.000000000 +0100
-+++ linux-2.6.12-rc6/arch/i386/Kconfig	2005-06-07 16:43:19.000000000 +0100
-@@ -458,6 +458,17 @@ config HPET_EMULATE_RTC
- 	bool "Provide RTC interrupt"
- 	depends on HPET_TIMER && RTC=y
- 
-+config SCx200HR_TIMER
-+	bool "NatSemi SCx200 27MHz High-Resolution Timer Support"
-+	help
-+	  Some of the AMD (formerly National Semiconductor) Geode
-+	  processors, notably the SC1100, suffer from a buggy time
-+	  stamp counter which causes them to lose time when the
-+	  processor is sleeping.  Enable this option to use the
-+	  on-board 27Mz high-resolution timer to keep time instead.
-+	depends on (SCx200)
-+	default n
-+
- config SMP
- 	bool "Symmetric multi-processing support"
- 	---help---
-diff -Naurp linux-2.6.12-rc6.orig/arch/i386/kernel/scx200.c linux-2.6.12-rc6/arch/i386/kernel/scx200.c
---- linux-2.6.12-rc6.orig/arch/i386/kernel/scx200.c	2005-06-07 14:56:02.000000000 +0100
-+++ linux-2.6.12-rc6/arch/i386/kernel/scx200.c	2005-06-07 16:43:19.000000000 +0100
-@@ -27,6 +27,10 @@ long scx200_gpio_shadow[2];
- 
- unsigned scx200_cb_base = 0;
- 
-+#ifdef CONFIG_SCx200HR_TIMER
-+extern void __devinit scx200hr_timer_enable(void);
-+#endif
-+
- static struct pci_device_id scx200_tbl[] = {
- 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
-@@ -83,6 +87,9 @@ static int __devinit scx200_probe(struct
- 		printk(KERN_INFO NAME ": Configuration Block base 0x%x\n", scx200_cb_base);
- 	}
- 
-+#ifdef CONFIG_SCx200HR_TIMER
-+	scx200hr_timer_enable();
-+#endif
- 	return 0;
- }
- 
-diff -Naurp linux-2.6.12-rc6.orig/arch/i386/kernel/timers/Makefile linux-2.6.12-rc6/arch/i386/kernel/timers/Makefile
---- linux-2.6.12-rc6.orig/arch/i386/kernel/timers/Makefile	2004-03-11 18:21:13.000000000 +0000
-+++ linux-2.6.12-rc6/arch/i386/kernel/timers/Makefile	2005-06-07 16:43:19.000000000 +0100
-@@ -5,5 +5,6 @@
- obj-y := timer.o timer_none.o timer_tsc.o timer_pit.o common.o
- 
- obj-$(CONFIG_X86_CYCLONE_TIMER)	+= timer_cyclone.o
-+obj-$(CONFIG_SCx200HR_TIMER)	+= timer_scx200hr.o
- obj-$(CONFIG_HPET_TIMER)	+= timer_hpet.o
- obj-$(CONFIG_X86_PM_TIMER)	+= timer_pm.o
-diff -Naurp linux-2.6.12-rc6.orig/arch/i386/kernel/timers/timer.c linux-2.6.12-rc6/arch/i386/kernel/timers/timer.c
---- linux-2.6.12-rc6.orig/arch/i386/kernel/timers/timer.c	2004-12-26 14:07:37.000000000 +0000
-+++ linux-2.6.12-rc6/arch/i386/kernel/timers/timer.c	2005-06-07 16:43:19.000000000 +0100
-@@ -13,6 +13,9 @@
- #endif
- /* list of timers, ordered by preference, NULL terminated */
- static struct init_timer_opts* __initdata timers[] = {
-+#ifdef CONFIG_SCx200HR_TIMER
-+	&timer_scx200hr_init,
-+#endif
- #ifdef CONFIG_X86_CYCLONE_TIMER
- 	&timer_cyclone_init,
- #endif
-diff -Naurp linux-2.6.12-rc6.orig/arch/i386/kernel/timers/timer_scx200hr.c linux-2.6.12-rc6/arch/i386/kernel/timers/timer_scx200hr.c
---- linux-2.6.12-rc6.orig/arch/i386/kernel/timers/timer_scx200hr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.12-rc6/arch/i386/kernel/timers/timer_scx200hr.c	2005-06-07 16:43:19.000000000 +0100
-@@ -0,0 +1,220 @@
-+/*
-+ * Copyright (C) 2005 Ted Phelps
-+ *
-+ * This is a clock driver for the Geode SCx200's 27MHz high-resolution
-+ * timer as the system clock replacing its buggy time stamp counter.
-+ *
-+ * Based on parts of timer_hpet.c, timer_tsc.c and timer_pit.c.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ */
-+
-+#include <asm/timer.h>
-+#include <linux/init.h>
-+#include <linux/pci.h>
-+#include <linux/seq_file.h>
-+#include <linux/scx200.h>
-+
-+#define NAME "scx200hr"
-+
-+/* Read the clock */
-+#define SCx200HR_CLOCK() inl(scx200_cb_base + SCx200_TIMER_OFFSET)
-+
-+/* High-resolution timer configuration address */
-+#define SCx200_TMCNFG_OFFSET (SCx200_TIMER_OFFSET + 5)
-+
-+/* Set this bit to disable the 27 MHz input clock */
-+#define HR_TM27MPD (1 << 2)
-+
-+/* Set this bit to update the count-up timer once per cycle of the
-+ * 27MHz timer, clear it to update the timer once every 27 cycles
-+ * (effectively producing a 1MHz counter) */
-+#define HR_TMCLKSEL (1 << 1)
-+
-+/* Set this bit to enable the high-resolution timer interrupt */
-+#define HR_TMEN (1 << 0)
-+
-+/* The frequency of the timer.	Change this to 27000000 and set
-+ * HR_TMCLKSEL in scx200hr_enable to run at the faster clock rate.  At
-+ * this point in time there is no point in doing so since times are
-+ * recorded in usec except for the monotonic clock, which is only used
-+ * by the hangcheck-timer. */
-+#define HR_FREQ 1000000
-+
-+/* The number of cycles of the high-resolution timer we expect to see
-+ * in a single tick.  Note that the result is <<8 for greater precision*/
-+#define HR_CYCLES_PER_TICK \
-+    (SH_DIV(HR_FREQ / 1000000 * TICK_NSEC, 1000, 8))
-+
-+/* The number of cycles of the high-resolution timer we expect to see
-+ * in one microsecond, <<8 */
-+#define HR_CYCLES_PER_US ((HR_FREQ / 1000000) << 8)
-+
-+
-+/* The value of the timer at the last interrupt */
-+static u32 clock_at_last_interrupt;
-+
-+/* The number of high-resolution clock cycles beyond what we would
-+ have expected that the last tick occurred, <<8 for greater precision */
-+static long clock_delay;
-+
-+/* The total number of timer nanoseconds between the time the timer
-+ * went live and the most recent tick. */
-+static unsigned long long total_ns;
-+
-+/* A lock to guard access to the monotonic clock-related variables
-+ * (total_ns and clocal_at_last_interrupt).  Note that these are also
-+ * protected by the xtime lock. */
-+static seqlock_t hr_lock = SEQLOCK_UNLOCKED;
-+
-+/* Nonzero if the timer has been selected */
-+static int enable_scx200hr;
-+
-+static int __init scx200hr_init(char *override)
-+{
-+	/* Watch for a command-line clock= override */
-+	if (override[0] && strncmp(override, NAME, sizeof(NAME) - 1) != 0) {
-+		return -ENODEV;
-+	}
-+
-+        /* Note that we should try to enable this timer once the
-+         * configuration block address is known */
-+        printk(KERN_WARNING NAME ": timer not yet accessible; will probe later.\n");
-+	enable_scx200hr = 1;
-+	return -EAGAIN;
-+}
-+
-+/* Called by the timer interrupt.  The xtime_lock will be held. */
-+static void mark_offset_scx200hr(void)
-+{
-+	u32 now, delta;
-+
-+	/* Avoid races between the interrupt handler and monotonic_clock */
-+	write_seqlock(&hr_lock);
-+
-+	/* Determine how many cycles have elapsed since the last interrupt */
-+	now = SCx200HR_CLOCK();
-+	delta = (now - clock_at_last_interrupt) << 8;
-+	clock_at_last_interrupt = now;
-+
-+	/* Update the total us count and remainder */
-+	total_ns += (delta * 1000) / HR_CYCLES_PER_US;
-+
-+	/* The monotonic clock is safe now */
-+	write_sequnlock(&hr_lock);
-+
-+	/* Adjust for interrupt handling delay */
-+	delta += clock_delay;
-+
-+	/* The high-resolution timer is driven by a different crystal
-+	 * to the main CPU, so there's no guarantee that the 1KHz
-+	 * interrupt rate will coincide with the timer.  This keeps
-+	 * the jiffies count in line with the high-resolution timer,
-+	 * which makes it possible for NTP to do its magic */
-+	if (delta < HR_CYCLES_PER_TICK) {
-+#if 1
-+		/* Didn't go over 1000us: decrement jiffies to balance
-+		 * out increment in do_timer.  This will cause some
-+		 * jitter if the frequency offset is large, as that
-+		 * adjustment will be applied about 1ms late. */
-+		jiffies_64--;
-+		clock_delay = delta;
-+#else /* !1 */
-+                clock_delay = 0;
-+#endif /* 1 */
-+	} else if (delta < (HR_CYCLES_PER_TICK << 1) + (HR_CYCLES_PER_TICK >> 1)) {
-+		clock_delay = delta - HR_CYCLES_PER_TICK;
-+	} else {
-+		jiffies_64 += delta / HR_CYCLES_PER_TICK - 2;
-+		clock_delay = HR_CYCLES_PER_TICK + delta % HR_CYCLES_PER_TICK;
-+	}
-+}
-+
-+/* Called by gettimeofday().  Returns the number of microseconds since
-+ * the last interrupt.	This is called with the xtime_lock held.*/
-+static unsigned long get_offset_scx200hr(void)
-+{
-+	u32 delta;
-+
-+	/* Get the time now and determine how many cycles have
-+	 * transpired since the interrupt, adjusting for timer
-+	 * interrupt jitter. */
-+	delta = ((SCx200HR_CLOCK() - clock_at_last_interrupt) << 8) + clock_delay;
-+
-+	/* Convert from cycles<<8 to microseconds */
-+	return delta / HR_CYCLES_PER_US;
-+}
-+
-+/* Returns the number of nanoseconds since the init of the timer. */
-+static unsigned long long monotonic_clock_scx200hr(void)
-+{
-+	u32 delta, seq;
-+	unsigned long long ns;
-+
-+	/* This function is *not* called with xtime_lock held, so we
-+	 * need to get the hr_lock to ensure we're not competing with
-+	 * mark_offset_scx200hr. */
-+	do {
-+		seq = read_seqbegin(&hr_lock);
-+		ns = total_ns;
-+		delta = SCx200HR_CLOCK() - clock_at_last_interrupt;
-+	} while (read_seqretry(&hr_lock, seq));
-+
-+	/* Convert cycles to microseconds and add. */
-+	return ns + delta * 1000 / HR_CYCLES_PER_US;
-+}
-+
-+/* scx200hr timer_opts struct */
-+struct timer_opts timer_scx200hr = {
-+	.name = NAME,
-+	.mark_offset = mark_offset_scx200hr, 
-+	.get_offset = get_offset_scx200hr,
-+	.monotonic_clock = monotonic_clock_scx200hr,
-+	.delay = NULL
-+};
-+
-+/* And the init_timer struct */
-+struct init_timer_opts __devinitdata timer_scx200hr_init = {
-+	.init = scx200hr_init,
-+	.opts = &timer_scx200hr
-+};
-+
-+
-+/* Switch from the original timer to the high-resolution timer */
-+void __devinit scx200hr_timer_enable(void)
-+{
-+        /* Make sure the timer was requested and that the
-+         * configuration block is present */
-+	if (!enable_scx200hr || !scx200_cb_present()) {
-+		return;
-+	}
-+
-+	/* Reserve the timer region for ourselves */
-+	if (!request_region(scx200_cb_base + SCx200_TIMER_OFFSET,
-+			    SCx200_TIMER_SIZE,
-+			    "NatSemi SCx200 High-Resolution Timer")) {
-+		printk(KERN_WARNING NAME ": unable to lock timer region\n");
-+		return;
-+	}
-+
-+	/* Configure the timer */
-+	outb(0, scx200_cb_base + SCx200_TMCNFG_OFFSET);
-+
-+	/* Record the current value of the timer. */
-+	clock_at_last_interrupt = SCx200HR_CLOCK();
-+
-+        /* Get the current value of the monotonic clock */
-+	total_ns = cur_timer->monotonic_clock();
-+
-+        /* Switch from the original timer functions to ours, but keep
-+         * the current delay function since loops_per_jiffy will have
-+         * been computed using that */
-+        timer_scx200hr.delay = cur_timer->delay;
-+	cur_timer = &timer_scx200hr;
-+
-+	printk(KERN_INFO "switching to scx200 high-resolution timer (%lu cpt)\n",
-+                HR_CYCLES_PER_TICK);
-+}
-diff -Naurp linux-2.6.12-rc6.orig/include/asm-i386/timer.h linux-2.6.12-rc6/include/asm-i386/timer.h
---- linux-2.6.12-rc6.orig/include/asm-i386/timer.h	2005-06-07 14:56:11.000000000 +0100
-+++ linux-2.6.12-rc6/include/asm-i386/timer.h	2005-06-07 16:43:19.000000000 +0100
-@@ -50,6 +50,9 @@ extern struct init_timer_opts timer_tsc_
- #ifdef CONFIG_X86_CYCLONE_TIMER
- extern struct init_timer_opts timer_cyclone_init;
- #endif
-+#ifdef CONFIG_SCx200HR_TIMER
-+extern struct init_timer_opts timer_scx200hr_init;
-+#endif
- 
- extern unsigned long calibrate_tsc(void);
- extern void init_cpu_khz(void);
-diff -Naurp linux-2.6.12-rc6.orig/include/linux/scx200.h linux-2.6.12-rc6/include/linux/scx200.h
---- linux-2.6.12-rc6.orig/include/linux/scx200.h	2005-06-07 14:56:11.000000000 +0100
-+++ linux-2.6.12-rc6/include/linux/scx200.h	2005-06-07 16:43:19.000000000 +0100
-@@ -32,7 +32,7 @@ extern unsigned scx200_cb_base;
- 
- /* High Resolution Timer */
- #define SCx200_TIMER_OFFSET 0x08
--#define SCx200_TIMER_SIZE 0x05
-+#define SCx200_TIMER_SIZE 0x06
- 
- /* Clock Generators */
- #define SCx200_CLOCKGEN_OFFSET 0x10

Modified: trunk/target/device/net4801/linux.config
===================================================================
--- trunk/target/device/net4801/linux.config	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/net4801/linux.config	2006-11-02 17:00:14 UTC (rev 434)
@@ -1,16 +1,21 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.12
-# Fri Sep 15 22:36:06 2006
+# Linux kernel version: 2.6.18
+# Thu Nov  2 11:04:52 2006
 #
 CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
@@ -30,15 +35,16 @@
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
-CONFIG_VM86=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -49,11 +55,9 @@
 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_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -64,7 +68,6 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
@@ -73,6 +76,8 @@
 # Block layer
 #
 # CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_LSF=y
 
 #
 # IO Schedulers
@@ -90,6 +95,7 @@
 #
 # Processor type and features
 #
+# CONFIG_SMP is not set
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -136,8 +142,6 @@
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_TSC=y
 # CONFIG_HPET_TIMER is not set
-CONFIG_SCx200HR_TIMER=y
-# CONFIG_SMP is not set
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -145,6 +149,7 @@
 # CONFIG_X86_UP_APIC is not set
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set
+CONFIG_VM86=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_I8K is not set
 CONFIG_X86_REBOOTFIXUPS=y
@@ -161,10 +166,6 @@
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -177,6 +178,7 @@
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_REGPARM is not set
@@ -187,7 +189,7 @@
 CONFIG_HZ=1000
 CONFIG_KEXEC=y
 CONFIG_PHYSICAL_START=0x100000
-CONFIG_DOUBLEFAULT=y
+# CONFIG_COMPAT_VDSO is not set
 
 #
 # Power management options (ACPI, APM)
@@ -223,12 +225,12 @@
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 # CONFIG_PCIEPORTBUS is not set
-CONFIG_PCI_LEGACY_PROC=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
 CONFIG_SCx200=y
+CONFIG_SCx200HR_TIMER=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -282,7 +284,10 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -293,6 +298,9 @@
 #
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_BRIDGE_NETFILTER is not set
@@ -309,20 +317,27 @@
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 
@@ -332,6 +347,7 @@
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
@@ -341,20 +357,20 @@
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
@@ -372,6 +388,8 @@
 CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_NAT_AMANDA=m
 CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_H323=m
+CONFIG_IP_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -411,12 +429,12 @@
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # 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
 
@@ -510,6 +528,9 @@
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+CONFIG_WIRELESS_EXT=y
 
 #
 # Device Drivers
@@ -521,6 +542,7 @@
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -568,6 +590,7 @@
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -685,11 +708,13 @@
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
 # CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_DTC3280 is not set
@@ -707,7 +732,6 @@
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_PSI240I is not set
 # CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_LPFC is not set
@@ -837,6 +861,7 @@
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 # CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
 
 #
 # Token Ring devices
@@ -847,6 +872,7 @@
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -862,6 +888,10 @@
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
@@ -876,11 +906,21 @@
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
 CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_BCM43XX_DMA=y
+CONFIG_BCM43XX_PIO=y
+CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -892,7 +932,6 @@
 # CONFIG_DSCC4 is not set
 CONFIG_LANMEDIA=m
 # CONFIG_SEALEVEL_4021 is not set
-CONFIG_SYNCLINK_SYNCPPP=m
 CONFIG_HDLC=m
 CONFIG_HDLC_RAW=y
 CONFIG_HDLC_RAW_ETH=y
@@ -1020,6 +1059,7 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -1027,6 +1067,8 @@
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -1103,7 +1145,11 @@
 # USB-based Watchdog Cards
 #
 # CONFIG_USBPCWATCHDOG is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+CONFIG_HW_RANDOM_GEODE=m
+# CONFIG_HW_RANDOM_VIA is not set
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
 # CONFIG_DTLK is not set
@@ -1119,6 +1165,8 @@
 # CONFIG_DRM is not set
 # CONFIG_MWAVE is not set
 CONFIG_SCx200_GPIO=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HANGCHECK_TIMER is not set
@@ -1156,6 +1204,7 @@
 # CONFIG_I2C_PIIX4 is not set
 CONFIG_I2C_ISA=m
 # CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
@@ -1179,9 +1228,7 @@
 # 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_RTC_X1205_I2C is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1196,13 +1243,13 @@
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
 #
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
+# CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -1231,10 +1278,12 @@
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
 # CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
@@ -1248,31 +1297,32 @@
 # CONFIG_IBM_ASM is not set
 
 #
-# Multimedia Capabilities Port drivers
-#
-
-#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+# CONFIG_USB_DABUSB is not set
 
 #
 # Graphics support
 #
+# CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB is not set
-# CONFIG_VIDEO_SELECT is not set
 
 #
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_VIDEO_SELECT is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -1284,6 +1334,7 @@
 #
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
 
@@ -1348,9 +1399,7 @@
 # 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_TOUCHSCREEN is not set
 # CONFIG_USB_YEALINK is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_ATI_REMOTE is not set
@@ -1365,15 +1414,6 @@
 # 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=m
@@ -1394,7 +1434,6 @@
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_ZD1201=m
 # CONFIG_USB_MON is not set
 
 #
@@ -1416,10 +1455,12 @@
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 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_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TEST is not set
 
@@ -1438,6 +1479,19 @@
 # CONFIG_MMC is not set
 
 #
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+
+#
 # InfiniBand support
 #
 # CONFIG_INFINIBAND is not set
@@ -1448,6 +1502,51 @@
 # CONFIG_EDAC is not set
 
 #
+# Real Time Clock
+#
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1497,7 +1596,6 @@
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
 # CONFIG_CONFIGFS_FS is not set
 
 #
@@ -1604,12 +1702,17 @@
 #
 # Kernel hacking
 #
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_MAGIC_SYSRQ is not set
+CONFIG_UNUSED_SYMBOLS=y
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_UNWIND_INFO is not set
 CONFIG_EARLY_PRINTK=y
+CONFIG_DOUBLEFAULT=y
 
 #
 # Security options
@@ -1665,6 +1768,7 @@
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_X86_BIOS_REBOOT=y

Modified: trunk/target/device/net4801/linux.mk
===================================================================
--- trunk/target/device/net4801/linux.mk	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/net4801/linux.mk	2006-11-02 17:00:14 UTC (rev 434)
@@ -22,10 +22,10 @@
 ifneq ($(filter $(TARGETS),linux),)
 
 # Version of Linux to download and then apply patches to
-DOWNLOAD_LINUX_VERSION=2.6.16.12
+DOWNLOAD_LINUX_VERSION=2.6.18
 # Version of Linux AFTER patches
-#LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-astlinux
-LINUX_VERSION=2.6.16.12
+LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-astlinux
+#LINUX_VERSION=2.6.18
 
 DEVICE_DIR=$(BASE_DIR)/target/device/net4801
 

Modified: trunk/target/device/via/linux.config
===================================================================
--- trunk/target/device/via/linux.config	2006-11-01 16:14:05 UTC (rev 433)
+++ trunk/target/device/via/linux.config	2006-11-02 17:00:14 UTC (rev 434)
@@ -1,16 +1,21 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.12
-# Tue Aug 15 19:36:25 2006
+# Linux kernel version: 2.6.18
+# Thu Nov  2 11:52:13 2006
 #
 CONFIG_X86_32=y
+CONFIG_GENERIC_TIME=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_DMI=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
@@ -29,16 +34,17 @@
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set...
 
[truncated message content]