[package] 6in4, 6to4: prevent starting the tunnel if kmod-sit is not yet loaded ...

[openwrt.git] / target / linux / mpc52xx / config-2.6.30

diff --git a/target/linux/mpc52xx/config-2.6.30 b/target/linux/mpc52xx/config-2.6.30
index fb97478..20f2702 100644 (file)
--- a/target/linux/mpc52xx/config-2.6.30
+++ b/target/linux/mpc52xx/config-2.6.30
@@ -2,7 +2,6 @@
 # CONFIG_44x is not set
 CONFIG_6xx=y
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_44x is not set
 CONFIG_6xx=y
 # CONFIG_ADVANCED_OPTIONS is not set

-# CONFIG_AGP is not set

 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y


@@ -55,7 +54,6 @@ CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y

-# CONFIG_EDAC is not set

 CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED6xx is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_ELF_CORE=y
 # CONFIG_EMBEDDED6xx is not set
 CONFIG_ENABLE_MUST_CHECK=y


@@ -130,13 +128,11 @@ CONFIG_IP_PNP=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y

-# CONFIG_ISDN is not set

 CONFIG_KERNEL_START=0xc0000000
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LXT_PHY=y
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTYS=y
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LXT_PHY=y

-# CONFIG_MACINTOSH_DRIVERS is not set

 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MMIO_NVRAM is not set
 CONFIG_MIGRATION=y
 # CONFIG_MII is not set
 # CONFIG_MMIO_NVRAM is not set


@@ -156,6 +152,8 @@ CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 # CONFIG_PARTITION_ADVANCED is not set

+# CONFIG_PATA_MPC52xx is not set
+CONFIG_PCI=y

 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_LEGACY=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_LEGACY=y