kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches

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

diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index ee0dfe2..b20ba2b 100644 (file)
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -12,10 +12,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=m
 CONFIG_ARM=y
 # CONFIG_ARPD is not set
 CONFIG_ATA=m

-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y
-CONFIG_BASE_SMALL=0

 CONFIG_BITREVERSE=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_CACHE_FEROCEON_L2=y
 CONFIG_BITREVERSE=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_CACHE_FEROCEON_L2=y


@@ -37,7 +33,6 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_FEROCEON=y
 CONFIG_CRC16=y
 # CONFIG_DCB is not set
 CONFIG_CPU_TLB_FEROCEON=y
 CONFIG_CRC16=y
 # CONFIG_DCB is not set

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set


@@ -118,7 +113,6 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 CONFIG_MV643XX_ETH=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 CONFIG_MV643XX_ETH=y

-# CONFIG_NATSEMI is not set

 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
 CONFIG_NET_DSA_MV88E6131=y
 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
 CONFIG_NET_DSA_MV88E6131=y


@@ -130,15 +124,11 @@ CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA=y
 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NO_IOPORT is not set
 CONFIG_NET_DSA=y
 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NO_IOPORT is not set

-# CONFIG_NVRAM is not set

 CONFIG_OUTER_CACHE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PATA_ARTOP=m
 CONFIG_OUTER_CACHE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PATA_ARTOP=m

-# CONFIG_PATA_SCH is not set

 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_STUB is not set

-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y

 CONFIG_PHYLIB=y
 CONFIG_PLAT_ORION=y
 CONFIG_RTC_CLASS=y
 CONFIG_PHYLIB=y
 CONFIG_PLAT_ORION=y
 CONFIG_RTC_CLASS=y


@@ -151,7 +141,6 @@ CONFIG_SCSI=m
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SWAP=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SWAP=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-CONFIG_TICK_ONESHOT=y

 CONFIG_UID16=y
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_GPIO_VBUS is not set
 CONFIG_UID16=y
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_GPIO_VBUS is not set