X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fat91%2Fconfig-2.6.25;h=edac29badf3e1d29edbfb1c73f77ff35394b43df;hp=5b17448cdd76ffa51c4471d1ae55e4d9ef4903d3;hb=fcc67b55b1aeb7943f4cb3621d349da7764e4bbd;hpb=3b8ab3d52a7437ffb5c93e236083602540cc2b73

diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index 5b17448cdd..edac29badf 100644
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -45,7 +45,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4T=y
@@ -60,9 +59,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_V4WBI=y
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_DATAFLASH_ALWAYS_ADD_DEVICE is not set
 CONFIG_DAVICOM_PHY=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
@@ -90,10 +86,6 @@ CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HZ=128
 # CONFIG_I2C is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IEEE80211_CRYPT_CCMP is not set
 # CONFIG_IEEE80211_CRYPT_TKIP is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
@@ -105,7 +97,6 @@ CONFIG_LEDS_CPU=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_LLC2 is not set
-CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_LZO_COMPRESS is not set
 # CONFIG_LZO_DECOMPRESS is not set
 # CONFIG_MACH_AT91RM9200EK is not set
@@ -123,13 +114,6 @@ CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_MACH_SWEDATMS is not set
 # CONFIG_MACH_TT9200 is not set
 CONFIG_MACH_VLINK=y
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MMC is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_BLOCK is not set
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MTD_AT91_DATAFLASH=y
 CONFIG_MTD_AT91_PARTS=y
 # CONFIG_MTD_CFI is not set
@@ -139,7 +123,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set
-# CONFIG_NEW_LEDS is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
@@ -170,7 +153,6 @@ CONFIG_SERIO_RAW=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
-# CONFIG_SOUND is not set
 # CONFIG_SPI_AT91 is not set
 # CONFIG_SPI_ATMEL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096