x86: do no overwrite CONFIG_SCSI_LOWLEVEL

[openwrt.git] / target / linux / atheros / config-2.6.31

diff --git a/target/linux/atheros/config-2.6.31 b/target/linux/atheros/config-2.6.31
index 6c7ef0d..6307a55 100644 (file)
--- a/target/linux/atheros/config-2.6.31
+++ b/target/linux/atheros/config-2.6.31
@@ -17,16 +17,13 @@ CONFIG_ATHEROS_AR2315_PCI=y
 CONFIG_ATHEROS_AR231X=y
 CONFIG_ATHEROS_AR5312=y
 CONFIG_ATHEROS_WDT=y
 CONFIG_ATHEROS_AR231X=y
 CONFIG_ATHEROS_AR5312=y
 CONFIG_ATHEROS_WDT=y

-CONFIG_BASE_SMALL=0

 # CONFIG_BCM47XX is not set
 # CONFIG_BCM47XX is not set

-# CONFIG_BINARY_PRINTF is not set

 CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
 CONFIG_BITREVERSE=y
 # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
 # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"

-CONFIG_CONSTRUCTORS=y

 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CPU_HAS_LLSC=y


@@ -65,6 +62,7 @@ CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y

+CONFIG_EARLY_PRINTK=y

 # CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_FSNOTIFY is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y


@@ -81,17 +79,12 @@ CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_IDE=y

-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y

 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y

-# CONFIG_I2C is not set
-# CONFIG_IMAGE_CMDLINE_HACK is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP175C_PHY=y
 CONFIG_IRQ_CPU=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP175C_PHY=y
 CONFIG_IRQ_CPU=y

-# CONFIG_ISDN is not set

 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEMOTE_FULONG is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEMOTE_FULONG is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=0


@@ -104,7 +97,6 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set

-# CONFIG_MIPS_FPU_EMU is not set

 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set


@@ -128,7 +120,6 @@ CONFIG_MVSWITCH_PHY=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y

-# CONFIG_PCSPKR_PLATFORM is not set

 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set


@@ -152,14 +143,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set

-# CONFIG_SLOW_WORK is not set

 CONFIG_SWCONFIG=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SWCONFIG=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y

+CONFIG_SYS_HAS_EARLY_PRINTK=y

 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y

-CONFIG_TICK_ONESHOT=y
-CONFIG_TRACING_SUPPORT=y

 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_SUPPORT=y
 CONFIG_ZONE_DMA_FLAG=0