aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-28 14:13:30 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-28 14:13:30 +0000
commitdb765443d199726cb55639b310bb6ddd31f3227e (patch)
tree00d7e42669278fbf69fef5f644b8c465b427d694 /target
parentaa9bfe87fbf7c01b81630627924dc19f57b8b84c (diff)
downloadupstream-db765443d199726cb55639b310bb6ddd31f3227e.tar.gz
upstream-db765443d199726cb55639b310bb6ddd31f3227e.tar.bz2
upstream-db765443d199726cb55639b310bb6ddd31f3227e.zip
resync kernel configs
SVN-Revision: 11279
Diffstat (limited to 'target')
-rw-r--r--target/linux/adm5120/router_be/config-2.6.2523
-rw-r--r--target/linux/adm5120/router_be/config-default6
-rw-r--r--target/linux/adm5120/router_le/config-2.6.2518
-rw-r--r--target/linux/adm5120/router_le/config-default6
4 files changed, 14 insertions, 39 deletions
diff --git a/target/linux/adm5120/router_be/config-2.6.25 b/target/linux/adm5120/router_be/config-2.6.25
index 690f55b872..b61be5cfef 100644
--- a/target/linux/adm5120/router_be/config-2.6.25
+++ b/target/linux/adm5120/router_be/config-2.6.25
@@ -60,7 +60,6 @@ CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
-# CONFIG_E1000E is not set
# CONFIG_E1000E_ENABLED is not set
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
@@ -96,14 +95,12 @@ CONFIG_HZ_250=y
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_IDE is not set
-# CONFIG_IGB is not set
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_INPUT=m
# CONFIG_INPUT_EVDEV is not set
-# CONFIG_IP1000 is not set
CONFIG_IPV6_MIP6=m
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTE_INFO=y
@@ -189,7 +186,6 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_SLRAM is not set
CONFIG_MTD_TRXSPLIT=y
-CONFIG_NETDEV_1000=y
# CONFIG_NET_PCI is not set
# CONFIG_NET_PKTGEN is not set
# CONFIG_NET_VENDOR_3COM is not set
@@ -199,6 +195,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_ADM5120=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
@@ -238,7 +235,6 @@ CONFIG_SERIO_SERPORT=y
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
CONFIG_SLABINFO=y
-# CONFIG_SND_USB_AUDIO is not set
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -257,21 +253,16 @@ CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_TOSHIBA_RBTX4927 is not set
# CONFIG_TOSHIBA_RBTX4938 is not set
CONFIG_TRAD_SIGNALS=y
+CONFIG_USB=m
# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACM is not set
CONFIG_USB_ADM5120_HCD=m
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PRINTER is not set
+CONFIG_USB_DEBUG=y
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_HCD=m
# 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_VGASTATE is not set
CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VM_EVENT_COUNTERS=y
diff --git a/target/linux/adm5120/router_be/config-default b/target/linux/adm5120/router_be/config-default
index c1d3d699b5..3d0c41feea 100644
--- a/target/linux/adm5120/router_be/config-default
+++ b/target/linux/adm5120/router_be/config-default
@@ -103,7 +103,6 @@ CONFIG_IRQ_CPU=y
CONFIG_LEDS_ADM5120=m
# CONFIG_LEDS_ADM5120_DIAG is not set
# CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set
-# CONFIG_LEDS_ALIX is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
CONFIG_LEGACY_PTYS=y
@@ -185,8 +184,8 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI=y
+# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_ADM5120=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
@@ -243,8 +242,8 @@ CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_TOSHIBA_RBTX4927 is not set
# CONFIG_TOSHIBA_RBTX4938 is not set
CONFIG_TRAD_SIGNALS=y
-# CONFIG_USBPCWATCHDOG is not set
CONFIG_USB=m
+# CONFIG_USBPCWATCHDOG is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_ADM5120_HCD=m
# CONFIG_USB_ATM is not set
@@ -254,7 +253,6 @@ 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
diff --git a/target/linux/adm5120/router_le/config-2.6.25 b/target/linux/adm5120/router_le/config-2.6.25
index 677a984005..b1f70547bf 100644
--- a/target/linux/adm5120/router_le/config-2.6.25
+++ b/target/linux/adm5120/router_le/config-2.6.25
@@ -60,6 +60,7 @@ CONFIG_DEVPORT=y
# CONFIG_DM9000 is not set
CONFIG_DMA_NEED_PCI_MAP_STATE=y
CONFIG_DMA_NONCOHERENT=y
+# CONFIG_E1000E_ENABLED is not set
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
# CONFIG_EXT3_FS_POSIX_ACL is not set
@@ -205,6 +206,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PCI=y
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_ADM5120=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
@@ -244,9 +246,6 @@ CONFIG_SERIO_SERPORT=y
# CONFIG_SIBYTE_SENTOSA is not set
# CONFIG_SIBYTE_SWARM is not set
CONFIG_SLABINFO=y
-# CONFIG_SND_HIFIER is not set
-# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_VIRTUOSO is not set
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -265,29 +264,18 @@ CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_TOSHIBA_RBTX4927 is not set
# CONFIG_TOSHIBA_RBTX4938 is not set
CONFIG_TRAD_SIGNALS=y
+CONFIG_USB=m
# CONFIG_USBPCWATCHDOG is not set
CONFIG_USB_ADM5120_HCD=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-# CONFIG_USB_CATC is not set
CONFIG_USB_DEBUG=y
CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL is not set
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_VGASTATE is not set
CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L2_COMMON=m
CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_XFRM_STATISTICS is not set
CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/adm5120/router_le/config-default b/target/linux/adm5120/router_le/config-default
index ea84c137b9..cf4044a5db 100644
--- a/target/linux/adm5120/router_le/config-default
+++ b/target/linux/adm5120/router_le/config-default
@@ -101,7 +101,6 @@ CONFIG_IRQ_CPU=y
CONFIG_LEDS_ADM5120=m
# CONFIG_LEDS_ADM5120_DIAG is not set
# CONFIG_LEDS_ADM5120_EXPERIMENTAL is not set
-# CONFIG_LEDS_ALIX is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
CONFIG_LEGACY_PTYS=y
@@ -193,8 +192,8 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI=y
+# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_ADM5120=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
@@ -250,8 +249,8 @@ CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_TOSHIBA_RBTX4927 is not set
# CONFIG_TOSHIBA_RBTX4938 is not set
CONFIG_TRAD_SIGNALS=y
-# CONFIG_USBPCWATCHDOG is not set
CONFIG_USB=m
+# CONFIG_USBPCWATCHDOG is not set
CONFIG_USB_ADM5120_HCD=m
# CONFIG_USB_ALI_M5632 is not set
# CONFIG_USB_AN2720 is not set
@@ -268,7 +267,6 @@ CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_SERIAL is not set
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USER_NS is not set