x86: use libata in 2.6.30, fix pata support for sc1200 (used on wrap)

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

diff --git a/target/linux/etrax/config-2.6.25 b/target/linux/etrax/config-2.6.25
index e60fcc5..5a71d7d 100644 (file)
--- a/target/linux/etrax/config-2.6.25
+++ b/target/linux/etrax/config-2.6.25
@@ -14,7 +14,7 @@ CONFIG_ETRAX100LX_V2=y
 CONFIG_ETRAX_ARCH_V10=y
 # CONFIG_ETRAX_ARCH_V32 is not set
 CONFIG_ETRAX_AXISFLASHMAP=y
 CONFIG_ETRAX_ARCH_V10=y
 # CONFIG_ETRAX_ARCH_V32 is not set
 CONFIG_ETRAX_AXISFLASHMAP=y

-CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
+CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"

 # CONFIG_ETRAX_CSP0_LEDS is not set
 # CONFIG_ETRAX_DEBUG_PORT0 is not set
 # CONFIG_ETRAX_DEBUG_PORT1 is not set
 # CONFIG_ETRAX_CSP0_LEDS is not set
 # CONFIG_ETRAX_DEBUG_PORT0 is not set
 # CONFIG_ETRAX_DEBUG_PORT1 is not set


@@ -149,45 +149,28 @@ CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_OPROFILE is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set
 # CONFIG_HAVE_OPROFILE is not set
 # CONFIG_HW_RANDOM is not set
 # 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_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_MTDRAM_ABS_POS=0x0
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTDRAM_TOTAL_SIZE=0
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_MTDRAM_ABS_POS=0x0
 CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTDRAM_TOTAL_SIZE=0

-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_GEOMETRY is not set

 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CONCAT=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CONCAT=y

-CONFIG_MTD_JEDECPROBE=y

 CONFIG_MTD_MTDRAM=y
 # CONFIG_NETDEV_1000 is not set
 CONFIG_MTD_MTDRAM=y
 # CONFIG_NETDEV_1000 is not set

-CONFIG_NLS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y

 CONFIG_NO_IOPORT=y
 # CONFIG_OOM_REBOOT is not set
 # CONFIG_RTC is not set
 CONFIG_NO_IOPORT=y
 # CONFIG_OOM_REBOOT is not set
 # CONFIG_RTC is not set

-CONFIG_RWSEM_GENERIC_SPINLOCK=y

 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set

-CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SERIAL_8250 is not set
 CONFIG_SLABINFO=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SLABINFO=y

-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

 # CONFIG_SVINTO_SIM is not set
 # CONFIG_SYSTEM_PROFILER is not set
 # CONFIG_SVINTO_SIM is not set
 # CONFIG_SYSTEM_PROFILER is not set

-CONFIG_SYSVIPC_SYSCTL=y

 CONFIG_UID16=y
 CONFIG_USB=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 CONFIG_UID16=y
 CONFIG_USB=y
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set

-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y

 # CONFIG_VLAN_8021Q is not set
 # CONFIG_WLAN_80211 is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_WLAN_80211 is not set