[adm5120] add missing buttons device for RB-1xx boards, thanks to Christophe Lucas

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

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 07a4895..097b5a6 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -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


@@ -153,6 +154,7 @@ CONFIG_BRIDGE_EBT_LIMIT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_MARK_T=m

+CONFIG_BRIDGE_EBT_NFLOG=m

 CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m


@@ -319,6 +321,7 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_DVB_CORE is not set
 CONFIG_E100=m
 # CONFIG_E1000 is not set
 # CONFIG_DVB_CORE is not set
 CONFIG_E100=m
 # CONFIG_E1000 is not set

+# CONFIG_E1000E is not set

 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_EEPROM_93CX6=m
 # CONFIG_ECONET is not set
 # CONFIG_EEPRO100 is not set
 CONFIG_EEPROM_93CX6=m


@@ -464,9 +467,10 @@ CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IFB=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IFB=m

+# CONFIG_IGB is not set

 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set

-# CONFIG_IMQ is not set
+CONFIG_IMQ=m

 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y


@@ -524,6 +528,7 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y

+# CONFIG_IP1000 is not set

 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MANGLE=m


@@ -549,6 +554,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 CONFIG_IPV6=m
 # CONFIG_IPV6_MIP6 is not set
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 CONFIG_IPV6=m
 # CONFIG_IPV6_MIP6 is not set

+# CONFIG_IPV6_MROUTE is not set

 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_PRIVACY is not set


@@ -766,6 +772,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI 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_NAMESPACES is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set


@@ -776,7 +783,7 @@ CONFIG_NET=y
 # CONFIG_NETDEBUG is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_NETDEBUG is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set

-# CONFIG_NETDEV_1000 is not set
+CONFIG_NETDEV_1000=y

 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y


@@ -999,6 +1006,13 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set

+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_HIFNHIPP is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
+# CONFIG_OCF_OCFNULL is not set

 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y


@@ -1053,7 +1067,7 @@ CONFIG_PATA_PLATFORM=m
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set

-CONFIG_PCI=y
+# CONFIG_PCI is not set

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


@@ -1541,7 +1555,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