move a few kconfig options from atheros to generic-2.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9273 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 19 insertions, 20 deletions

diff --git a/target/linux/atheros/config-2.6.23 b/target/linux/atheros/config-2.6.23
index 7a9ddd3f1d..99bf419dbe 100644
--- a/target/linux/atheros/config-2.6.23
+++ b/target/linux/atheros/config-2.6.23
@@ -127,11 +127,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_SPIFLASH=y
-# CONFIG_NETDEV_1000 is not set
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_SCH_FIFO=y
-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
diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23
index b74173153d..8442ca0eea 100644
--- a/target/linux/generic-2.6/config-2.6.23
+++ b/target/linux/generic-2.6/config-2.6.23
@@ -19,9 +19,9 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARPD=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA is not set
-# CONFIG_ATA_GENERIC is not set
 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATL1 is not set
 CONFIG_ATM=m
@@ -75,12 +75,12 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_CPQ_DA is not set
 CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
 # CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -93,8 +93,8 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
@@ -288,6 +288,7 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_DMA_ENGINE is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_DRM is not set
+# CONFIG_DS1682 is not set
 # CONFIG_DTLK is not set
 # CONFIG_DUMMY is not set
 # CONFIG_DVB is not set
@@ -406,8 +407,8 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
@@ -415,10 +416,10 @@ CONFIG_HZ_100=y
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
 # CONFIG_ICPLUS_PHY is not set
-CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_IDE_PROC_FS=y
+# CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
@@ -661,9 +662,9 @@ CONFIG_JOLIET=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set
@@ -681,9 +682,9 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_MAC80211=m
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_MAC80211_LEDS=y
+# CONFIG_MACVLAN is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MAC_PARTITION=y
-# CONFIG_MACVLAN is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MARVELL_PHY is not set
@@ -717,8 +718,9 @@ CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEBUG is not set
 CONFIG_NETDEVICES=y
-# CONFIG_NETDEV_10000 is not set
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
@@ -747,9 +749,9 @@ CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
 CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -771,7 +773,7 @@ CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_POLICE=y
 # CONFIG_NET_ACT_SIMP is not set
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_ACT=y
@@ -813,6 +815,7 @@ CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CLK_JIFFIES=y
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_ESFQ=m
+CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HTB=m
@@ -861,6 +864,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_SUPPORT=y
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CT_PROTO_GRE=m
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
 CONFIG_NF_NAT=y
@@ -870,6 +874,7 @@ CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_RTSP=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_SNMP_BASIC=m
@@ -992,6 +997,7 @@ CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_PCNET32 is not set
 # CONFIG_PD6729 is not set
+# CONFIG_PDC_ADMA is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONE is not set
 # CONFIG_PHYLIB is not set
@@ -1064,7 +1070,6 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_SATA_AHCI is not set
-# CONFIG_PDC_ADMA is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
@@ -1155,9 +1160,9 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
-# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_F71805F is not set
@@ -1182,17 +1187,16 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_TSL2550 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set