switch to 2.6.23

SVN-Revision: 9260

1 files changed, 13 insertions, 10 deletions

diff --git a/target/linux/adm5120/router_be/config-2.6.22 b/target/linux/adm5120/router_be/config-2.6.23
index 0fca8f8fb1..1c6b7e1f8d 100644
--- a/target/linux/adm5120/router_be/config-2.6.22
+++ b/target/linux/adm5120/router_be/config-2.6.23
@@ -1,6 +1,5 @@
 CONFIG_32BIT=y
 # CONFIG_64BIT is not set
-# CONFIG_64BIT_PHYS_ADDR is not set
 CONFIG_ADM5120_CPU_OVERRIDES=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -22,6 +21,7 @@ CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 CONFIG_CPU_HAS_SYNC=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
+# CONFIG_CPU_LOONGSON2 is not set
 CONFIG_CPU_MIPS32=y
 CONFIG_CPU_MIPS32_R1=y
 # CONFIG_CPU_MIPS32_R2 is not set
@@ -45,7 +45,7 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_DDB5477 is not set
+# CONFIG_CRYPTO_HW is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -61,11 +61,11 @@ CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_GEN_RTC is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
+CONFIG_HID_SUPPORT=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
@@ -81,7 +81,7 @@ CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_EVDEV is not set
-CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_TUNNEL=m
@@ -94,6 +94,7 @@ CONFIG_LEDS_ADM5120_DIAG=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
@@ -105,7 +106,6 @@ CONFIG_MIPS_ADM5120=y
 CONFIG_MIPS_ADM5120_ENET=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_EV64120 is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_MT_DISABLED=y
@@ -113,11 +113,7 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMTC is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_VPE_LOADER is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MOMENCO_OCELOT is not set
-# CONFIG_MOMENCO_OCELOT_3 is not set
-# CONFIG_MOMENCO_OCELOT_C is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_ADM5120=y
@@ -166,6 +162,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NETDEV_1000=y
+CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
@@ -173,6 +170,7 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_NAT_PROTO_GRE=m
+# CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
@@ -180,14 +178,17 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_ADM5120=y
+# CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNPACPI is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_RTC is not set
+# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SERIAL_ADM5120 is not set
 CONFIG_SERIAL_AMBA_PL010=y
@@ -240,11 +241,13 @@ CONFIG_USB_ADM5120_HCD=m
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set
+# CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_ZD1211RW is not set