[kernel] 2.6.26: sync IMQ patch with 2.6.25

[openwrt.git] / target / linux / generic-2.6 / config-2.6.23

diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23
index ce555f2..b2860f9 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.23
+++ b/target/linux/generic-2.6/config-2.6.23
@@ -5,6 +5,7 @@
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADFS_FS is not set

+# CONFIG_ADM6996_PHY is not set

 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFFS_FS is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_AF_RXRPC is not set


@@ -247,7 +248,7 @@ CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m

-CONFIG_CRYPTO_HW=n
+# CONFIG_CRYPTO_HW is not set

 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_MANAGER=m


@@ -363,6 +364,7 @@ CONFIG_HFS_FS=m
 # CONFIG_HID is not set
 # CONFIG_HID_DEBUG is not set
 # CONFIG_HID_FF is not set
 # CONFIG_HID is not set
 # CONFIG_HID_DEBUG is not set
 # CONFIG_HID_FF is not set

+# CONFIG_HID_SUPPORT is not set

 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m


@@ -726,11 +728,14 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y

+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set

 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set

+# CONFIG_MVSWITCH_PHY is not set

 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NCP_FS is not set


@@ -944,7 +949,7 @@ CONFIG_NLS_KOI8_R=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m

-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set

 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set


@@ -1000,7 +1005,7 @@ CONFIG_PATA_PLATFORM=m
 # CONFIG_PATA_WINBOND_VLB is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PATA_WINBOND_VLB is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set

-CONFIG_PCI=y
+# CONFIG_PCI is not set

 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA is not set
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA is not set


@@ -1203,6 +1208,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_LM63 is not set

+# CONFIG_SENSORS_LM70 is not set

 # CONFIG_SENSORS_LM75 is not set
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set
 # CONFIG_SENSORS_LM75 is not set
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set


@@ -1385,6 +1391,8 @@ CONFIG_SOUND=m
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set

+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_TLE62X0 is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_EMBEDDED is not set


@@ -1455,7 +1463,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set

-CONFIG_USB=m
+# CONFIG_USB is not set

 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set


@@ -1695,7 +1703,16 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set

-# CONFIG_W1 is not set
+CONFIG_W1=m
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set

 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set
 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set