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

[openwrt.git] / target / linux / generic-2.6 / config-2.6.21

diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21
index bebdcb8..07933f8 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.21
+++ b/target/linux/generic-2.6/config-2.6.21
@@ -242,7 +242,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
 CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set

-CONFIG_CONFIGFS_FS=y
+# CONFIG_CONFIGFS_FS is not set

 # CONFIG_CONNECTOR is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRC16 is not set


@@ -378,8 +378,6 @@ CONFIG_HAMRADIO=y
 # CONFIG_HID_FF is not set
 # CONFIG_HIPPI is not set
 # CONFIG_HOSTAP_CS is not set
 # CONFIG_HID_FF is not set
 # CONFIG_HIPPI is not set
 # CONFIG_HOSTAP_CS is not set

-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_FIRMWARE=y

 # CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_HOSTAP_PLX is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_HOSTAP_PLX is not set


@@ -441,8 +439,8 @@ CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IFB is not set
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IFB is not set

-CONFIG_IKCONFIG_PROC=y
-CONFIG_IKCONFIG=y
+# CONFIG_IKCONFIG_PROC is not set
+# CONFIG_IKCONFIG is not set

 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y


@@ -531,7 +529,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IPMI_HANDLER is not set

-# CONFIG_IP_MROUTE is not set
+CONFIG_IP_MROUTE=y

 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_AMANDA is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_AMANDA is not set


@@ -604,6 +602,8 @@ CONFIG_IP_NF_TARGET_TCPMSS=y
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TFTP is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TFTP is not set

+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set

 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y


@@ -671,7 +671,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set

-# CONFIG_KMOD is not set
+CONFIG_KMOD=y

 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set


@@ -695,7 +695,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set

-CONFIG_MAC_PARTITION=y
+# CONFIG_MAC_PARTITION is not set

 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MARVELL_PHY is not set


@@ -981,6 +981,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET_MMAP=y
 CONFIG_PACKET=y
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET_MMAP=y
 CONFIG_PACKET=y

+# CONFIG_PAGE_SIZE_16KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set

 # CONFIG_PARPORT is not set
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_ALI is not set
 # CONFIG_PARPORT is not set
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_ALI is not set