cpmac: fix race condition (closes #3019)

[openwrt.git] / target / linux / ps3 / config-2.6.23

diff --git a/target/linux/ps3/config-2.6.23 b/target/linux/ps3/config-2.6.23
index 593ddbc..7da86f7 100644 (file)
--- a/target/linux/ps3/config-2.6.23
+++ b/target/linux/ps3/config-2.6.23
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23

-# Tue Oct 16 15:38:00 2007
+# Fri Oct 26 13:32:59 2007

 #
 CONFIG_PPC64=y
 
 #
 CONFIG_PPC64=y
 


@@ -69,7 +69,6 @@ CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_CPUSETS is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set

-CONFIG_BLK_DEV_INITRD=y

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y


@@ -141,13 +140,13 @@ CONFIG_PPC_PS3=y
 #
 # PS3 Platform Options
 #
 #
 # PS3 Platform Options
 #

-# CONFIG_PS3_ADVANCED is not set
+CONFIG_PS3_ADVANCED=y

 CONFIG_PS3_HTAB_SIZE=20
 # CONFIG_PS3_DYNAMIC_DMA is not set
 CONFIG_PS3_USE_LPAR_ADDR=y
 CONFIG_PS3_VUART=y
 CONFIG_PS3_PS3AV=y
 CONFIG_PS3_HTAB_SIZE=20
 # CONFIG_PS3_DYNAMIC_DMA is not set
 CONFIG_PS3_USE_LPAR_ADDR=y
 CONFIG_PS3_VUART=y
 CONFIG_PS3_PS3AV=y

-CONFIG_PS3_SYS_MANAGER=m
+CONFIG_PS3_SYS_MANAGER=y

 CONFIG_PS3_STORAGE=y
 CONFIG_PS3_DISK=y
 CONFIG_PS3_ROM=y
 CONFIG_PS3_STORAGE=y
 CONFIG_PS3_DISK=y
 CONFIG_PS3_ROM=y


@@ -222,7 +221,7 @@ CONFIG_ARCH_MEMORY_PROBE=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_SCHED_SMT is not set
 CONFIG_PROC_DEVICETREE=y
 CONFIG_CMDLINE_BOOL=y

-CONFIG_CMDLINE="root=/dev/ram0 video=ps3fb:mode:0"
+CONFIG_CMDLINE="root=/dev/ram0 video=0"

 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_WANT_DEVICE_TREE is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
 # CONFIG_WANT_DEVICE_TREE is not set