[rdc] resync 2.6.32 support with changes in 2.6.30

[openwrt.git] / target / linux / at91 / config-2.6.25

diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index 5d16c2f..593dd42 100644 (file)
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -35,7 +35,6 @@ CONFIG_AT91_TIMER_HZ=128
 CONFIG_AT91_VLIO=y
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ATMEL_SSC is not set
-CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -61,7 +60,6 @@ CONFIG_CPU_CP15=y
 CONFIG_CPU_TLB_V4WBI=y
 # CONFIG_DATAFLASH_ALWAYS_ADD_DEVICE is not set
 CONFIG_DAVICOM_PHY=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DM9000 is not set
 CONFIG_DUMMY_CONSOLE=y
@@ -85,7 +83,6 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HZ=128
-# CONFIG_I2C is not set
 # CONFIG_IEEE80211_CRYPT_CCMP is not set
 # CONFIG_IEEE80211_CRYPT_TKIP is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
@@ -132,14 +129,9 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_NF_NAT_RTSP is not set
 # CONFIG_NF_NAT_TFTP is not set
 # CONFIG_NO_IOPORT is not set
-# CONFIG_NVRAM is not set
 # CONFIG_OUTER_CACHE is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PHYLIB=y
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPPOATM is not set
-# CONFIG_PPPOL2TP is not set
-# CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_SCSI_WAIT_SCAN is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250 is not set
@@ -157,7 +149,6 @@ CONFIG_SLABINFO=y
 # CONFIG_SPI_ATMEL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_TICK_ONESHOT=y
 CONFIG_UID16=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB is not set