ssb: sync with wireless-2.6

[openwrt.git] / target / linux / orion / config-default

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 10ec353..09d0a2c 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -155,7 +155,6 @@ CONFIG_MEDIA_TUNER_TEA5767=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set

-# CONFIG_MMC_TEST is not set

 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 CONFIG_MTD_PHYSMAP_LEN=0
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 CONFIG_MTD_PHYSMAP_LEN=0


@@ -202,15 +201,10 @@ CONFIG_SATA_PMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set

-# CONFIG_SND_ARM is not set
-# CONFIG_SND_AW2 is not set

 # CONFIG_SOC_CAMERA is not set
 # CONFIG_SOC_CAMERA is not set

-# CONFIG_SOUND is not set
-# CONFIG_SPI_ORION is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y

-# CONFIG_TUN is not set

 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_USBPCWATCHDOG is not set