fix 2.6.31 compile with union mounts disabled

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

diff --git a/target/linux/ppc40x/config-2.6.30 b/target/linux/ppc40x/config-2.6.30
index b650877..f420c1c 100644 (file)
--- a/target/linux/ppc40x/config-2.6.30
+++ b/target/linux/ppc40x/config-2.6.30
@@ -24,7 +24,7 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y

-# CONFIG_BOOKE_WDT is not set
+CONFIG_BOOKE_WDT=y

 CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
 CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"


@@ -85,7 +85,6 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_HCU4 is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 # CONFIG_HCU4 is not set

-# CONFIG_HVC_UDBG is not set

 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set


@@ -133,7 +132,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PCI=y
 CONFIG_PCIEAER=y

-# CONFIG_PCIEASPM is not set

 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y


@@ -145,10 +143,6 @@ CONFIG_PPC32=y
 CONFIG_PPC40x_SIMPLE=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PPC64 is not set
 CONFIG_PPC40x_SIMPLE=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PPC64 is not set

-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set

 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC_970_NAP is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC_970_NAP is not set


@@ -183,8 +177,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_OF_PLATFORM=y

-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SIMPLE_GPIO is not set

 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y
 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y