diff options
author | Geoff Levand <geoff@infradead.org> | 2011-11-29 10:38:50 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 22:05:56 -0500 |
commit | 987706acf8e3a6e50445c5712e994b937cbdd83c (patch) | |
tree | 3171a56c71013edcb864b17bb52a1ebd2a01446e /arch/powerpc/configs | |
parent | b9ec60dc35bba431f0913f628bfd590cb4666ff7 (diff) |
powerpc/ps3: Update ps3_defconfig
Refresh ps3_defconfig to latest kernel sources and
change the options:
CONFIG_PPP=m to CONFIG_PPP=n.
CONFIG_NAMESPACES=y to CONFIG_NAMESPACES=n
CONFIG_NUMA=y to CONFIG_NUMA=n
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 185c292b0f1c..ded867871e97 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -6,10 +6,10 @@ CONFIG_NR_CPUS=2 | |||
6 | CONFIG_EXPERIMENTAL=y | 6 | CONFIG_EXPERIMENTAL=y |
7 | CONFIG_SYSVIPC=y | 7 | CONFIG_SYSVIPC=y |
8 | CONFIG_POSIX_MQUEUE=y | 8 | CONFIG_POSIX_MQUEUE=y |
9 | CONFIG_NAMESPACES=y | 9 | CONFIG_SPARSE_IRQ=y |
10 | CONFIG_BLK_DEV_INITRD=y | 10 | CONFIG_BLK_DEV_INITRD=y |
11 | CONFIG_EXPERT=y | 11 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
12 | CONFIG_KALLSYMS_EXTRA_PASS=y | 12 | CONFIG_EMBEDDED=y |
13 | # CONFIG_PERF_EVENTS is not set | 13 | # CONFIG_PERF_EVENTS is not set |
14 | # CONFIG_COMPAT_BRK is not set | 14 | # CONFIG_COMPAT_BRK is not set |
15 | CONFIG_SLAB=y | 15 | CONFIG_SLAB=y |
@@ -17,6 +17,7 @@ CONFIG_PROFILING=y | |||
17 | CONFIG_OPROFILE=m | 17 | CONFIG_OPROFILE=m |
18 | CONFIG_MODULES=y | 18 | CONFIG_MODULES=y |
19 | CONFIG_MODULE_UNLOAD=y | 19 | CONFIG_MODULE_UNLOAD=y |
20 | # CONFIG_PPC_POWERNV is not set | ||
20 | # CONFIG_PPC_PSERIES is not set | 21 | # CONFIG_PPC_PSERIES is not set |
21 | # CONFIG_PPC_PMAC is not set | 22 | # CONFIG_PPC_PMAC is not set |
22 | CONFIG_PPC_PS3=y | 23 | CONFIG_PPC_PS3=y |
@@ -27,14 +28,14 @@ CONFIG_PS3_VRAM=m | |||
27 | CONFIG_PS3_LPM=m | 28 | CONFIG_PS3_LPM=m |
28 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set | 29 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set |
29 | CONFIG_HIGH_RES_TIMERS=y | 30 | CONFIG_HIGH_RES_TIMERS=y |
31 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
30 | CONFIG_BINFMT_MISC=y | 32 | CONFIG_BINFMT_MISC=y |
31 | CONFIG_KEXEC=y | 33 | CONFIG_KEXEC=y |
32 | CONFIG_SPARSE_IRQ=y | ||
33 | # CONFIG_SPARSEMEM_VMEMMAP is not set | 34 | # CONFIG_SPARSEMEM_VMEMMAP is not set |
34 | CONFIG_SCHED_SMT=y | 35 | CONFIG_SCHED_SMT=y |
35 | CONFIG_CMDLINE_BOOL=y | 36 | CONFIG_CMDLINE_BOOL=y |
36 | CONFIG_CMDLINE="" | 37 | CONFIG_CMDLINE="" |
37 | CONFIG_PM=y | 38 | CONFIG_PM_RUNTIME=y |
38 | CONFIG_PM_DEBUG=y | 39 | CONFIG_PM_DEBUG=y |
39 | # CONFIG_SECCOMP is not set | 40 | # CONFIG_SECCOMP is not set |
40 | # CONFIG_PCI is not set | 41 | # CONFIG_PCI is not set |
@@ -81,20 +82,23 @@ CONFIG_SCSI_MULTI_LUN=y | |||
81 | CONFIG_MD=y | 82 | CONFIG_MD=y |
82 | CONFIG_BLK_DEV_DM=m | 83 | CONFIG_BLK_DEV_DM=m |
83 | CONFIG_NETDEVICES=y | 84 | CONFIG_NETDEVICES=y |
84 | CONFIG_NET_ETHERNET=y | 85 | # CONFIG_NET_VENDOR_BROADCOM is not set |
86 | # CONFIG_NET_VENDOR_CHELSIO is not set | ||
87 | # CONFIG_NET_VENDOR_INTEL is not set | ||
88 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
89 | # CONFIG_NET_VENDOR_MICREL is not set | ||
90 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
91 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
92 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
85 | CONFIG_GELIC_NET=y | 93 | CONFIG_GELIC_NET=y |
86 | CONFIG_GELIC_WIRELESS=y | 94 | CONFIG_GELIC_WIRELESS=y |
87 | # CONFIG_NETDEV_10000 is not set | 95 | # CONFIG_NET_VENDOR_XILINX is not set |
88 | CONFIG_USB_USBNET=m | 96 | CONFIG_USB_USBNET=m |
89 | # CONFIG_USB_NET_CDCETHER is not set | 97 | # CONFIG_USB_NET_CDCETHER is not set |
98 | # CONFIG_USB_NET_CDC_NCM is not set | ||
90 | # CONFIG_USB_NET_NET1080 is not set | 99 | # CONFIG_USB_NET_NET1080 is not set |
91 | # CONFIG_USB_NET_CDC_SUBSET is not set | 100 | # CONFIG_USB_NET_CDC_SUBSET is not set |
92 | # CONFIG_USB_NET_ZAURUS is not set | 101 | # CONFIG_USB_NET_ZAURUS is not set |
93 | CONFIG_PPP=m | ||
94 | CONFIG_PPP_MULTILINK=y | ||
95 | CONFIG_PPP_ASYNC=m | ||
96 | CONFIG_PPP_DEFLATE=m | ||
97 | CONFIG_PPPOE=m | ||
98 | CONFIG_INPUT_FF_MEMLESS=m | 102 | CONFIG_INPUT_FF_MEMLESS=m |
99 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 103 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
100 | CONFIG_INPUT_JOYDEV=m | 104 | CONFIG_INPUT_JOYDEV=m |
@@ -135,22 +139,21 @@ CONFIG_USB=m | |||
135 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | 139 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y |
136 | CONFIG_USB_DEVICEFS=y | 140 | CONFIG_USB_DEVICEFS=y |
137 | # CONFIG_USB_DEVICE_CLASS is not set | 141 | # CONFIG_USB_DEVICE_CLASS is not set |
142 | CONFIG_USB_SUSPEND=y | ||
138 | CONFIG_USB_MON=m | 143 | CONFIG_USB_MON=m |
139 | CONFIG_USB_EHCI_HCD=m | 144 | CONFIG_USB_EHCI_HCD=m |
140 | CONFIG_USB_EHCI_TT_NEWSCHED=y | ||
141 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 145 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
142 | CONFIG_USB_OHCI_HCD=m | 146 | CONFIG_USB_OHCI_HCD=m |
143 | CONFIG_USB_STORAGE=m | 147 | CONFIG_USB_STORAGE=m |
144 | CONFIG_RTC_CLASS=y | 148 | CONFIG_RTC_CLASS=y |
145 | CONFIG_RTC_DRV_PS3=m | 149 | CONFIG_RTC_DRV_PS3=y |
150 | # CONFIG_IOMMU_SUPPORT is not set | ||
146 | CONFIG_EXT2_FS=m | 151 | CONFIG_EXT2_FS=m |
147 | CONFIG_EXT3_FS=m | 152 | CONFIG_EXT3_FS=m |
148 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 153 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
149 | CONFIG_EXT4_FS=y | 154 | CONFIG_EXT4_FS=y |
150 | CONFIG_INOTIFY=y | ||
151 | CONFIG_QUOTA=y | 155 | CONFIG_QUOTA=y |
152 | CONFIG_QFMT_V2=y | 156 | CONFIG_QFMT_V2=y |
153 | CONFIG_AUTOFS_FS=m | ||
154 | CONFIG_AUTOFS4_FS=m | 157 | CONFIG_AUTOFS4_FS=m |
155 | CONFIG_ISO9660_FS=m | 158 | CONFIG_ISO9660_FS=m |
156 | CONFIG_JOLIET=y | 159 | CONFIG_JOLIET=y |
@@ -167,19 +170,17 @@ CONFIG_CIFS=m | |||
167 | CONFIG_NLS=y | 170 | CONFIG_NLS=y |
168 | CONFIG_NLS_CODEPAGE_437=y | 171 | CONFIG_NLS_CODEPAGE_437=y |
169 | CONFIG_NLS_ISO8859_1=y | 172 | CONFIG_NLS_ISO8859_1=y |
173 | CONFIG_CRC_CCITT=m | ||
170 | CONFIG_CRC_T10DIF=y | 174 | CONFIG_CRC_T10DIF=y |
171 | CONFIG_MAGIC_SYSRQ=y | 175 | CONFIG_MAGIC_SYSRQ=y |
172 | CONFIG_DEBUG_FS=y | 176 | CONFIG_DEBUG_FS=y |
173 | CONFIG_DEBUG_KERNEL=y | ||
174 | CONFIG_DETECT_HUNG_TASK=y | 177 | CONFIG_DETECT_HUNG_TASK=y |
175 | CONFIG_PROVE_LOCKING=y | 178 | CONFIG_PROVE_LOCKING=y |
176 | CONFIG_DEBUG_LOCKDEP=y | 179 | CONFIG_DEBUG_LOCKDEP=y |
177 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
178 | CONFIG_DEBUG_INFO=y | 180 | CONFIG_DEBUG_INFO=y |
179 | CONFIG_DEBUG_WRITECOUNT=y | 181 | CONFIG_DEBUG_WRITECOUNT=y |
180 | CONFIG_DEBUG_MEMORY_INIT=y | 182 | CONFIG_DEBUG_MEMORY_INIT=y |
181 | CONFIG_DEBUG_LIST=y | 183 | CONFIG_DEBUG_LIST=y |
182 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
183 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 184 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
184 | # CONFIG_FTRACE is not set | 185 | # CONFIG_FTRACE is not set |
185 | CONFIG_DEBUG_STACKOVERFLOW=y | 186 | CONFIG_DEBUG_STACKOVERFLOW=y |