aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/ppc44x_defconfig
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-04-05 19:02:31 -0400
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-04-05 19:02:31 -0400
commita07e387ae3a830106d0463ec254657f297b97ea0 (patch)
treea12b257968b391dc3584f076c124cc2b11a4348b /arch/powerpc/configs/ppc44x_defconfig
parentd0c8df6e4525ebd38a7643ba3dbfe3989dddf781 (diff)
[POWERPC] 4xx: Add Canyonlands and Yosemite to multi-board defconfig
Include the newly added Canyonlands and Yosemite ports in the mutli-board 440 defconfig. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/configs/ppc44x_defconfig')
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig14
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 57bd775ef777..12f9b5a80220 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.25-rc2 3# Linux kernel version: 2.6.25-rc6
4# Fri Feb 15 21:57:35 2008 4# Sat Apr 5 09:35:48 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y
79CONFIG_USER_SCHED=y 79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set 80# CONFIG_CGROUP_SCHED is not set
81CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
83# CONFIG_NAMESPACES is not set 84# CONFIG_NAMESPACES is not set
84CONFIG_BLK_DEV_INITRD=y 85CONFIG_BLK_DEV_INITRD=y
@@ -113,6 +114,7 @@ CONFIG_SLUB=y
113CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
114# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
115CONFIG_HAVE_KPROBES=y 116CONFIG_HAVE_KPROBES=y
117CONFIG_HAVE_KRETPROBES=y
116CONFIG_PROC_PAGE_MONITOR=y 118CONFIG_PROC_PAGE_MONITOR=y
117CONFIG_SLABINFO=y 119CONFIG_SLABINFO=y
118CONFIG_RT_MUTEXES=y 120CONFIG_RT_MUTEXES=y
@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y
143# CONFIG_DEFAULT_NOOP is not set 145# CONFIG_DEFAULT_NOOP is not set
144CONFIG_DEFAULT_IOSCHED="anticipatory" 146CONFIG_DEFAULT_IOSCHED="anticipatory"
145CONFIG_CLASSIC_RCU=y 147CONFIG_CLASSIC_RCU=y
146# CONFIG_PREEMPT_RCU is not set
147CONFIG_PPC4xx_PCI_EXPRESS=y 148CONFIG_PPC4xx_PCI_EXPRESS=y
148 149
149# 150#
@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y
161CONFIG_KATMAI=y 162CONFIG_KATMAI=y
162CONFIG_RAINIER=y 163CONFIG_RAINIER=y
163CONFIG_WARP=y 164CONFIG_WARP=y
165CONFIG_CANYONLANDS=y
166CONFIG_YOSEMITE=y
164CONFIG_440EP=y 167CONFIG_440EP=y
165CONFIG_440EPX=y 168CONFIG_440EPX=y
166CONFIG_440GRX=y 169CONFIG_440GRX=y
167CONFIG_440GP=y 170CONFIG_440GP=y
168CONFIG_440GX=y 171CONFIG_440GX=y
169CONFIG_440SPe=y 172CONFIG_440SPe=y
173CONFIG_460EX=y
170CONFIG_IBM440EP_ERR42=y 174CONFIG_IBM440EP_ERR42=y
171# CONFIG_IPIC is not set 175# CONFIG_IPIC is not set
172# CONFIG_MPIC is not set 176# CONFIG_MPIC is not set
@@ -199,7 +203,6 @@ CONFIG_HZ=250
199CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
200# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
201# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
202# CONFIG_RCU_TRACE is not set
203CONFIG_BINFMT_ELF=y 206CONFIG_BINFMT_ELF=y
204# CONFIG_BINFMT_MISC is not set 207# CONFIG_BINFMT_MISC is not set
205CONFIG_MATH_EMULATION=y 208CONFIG_MATH_EMULATION=y
@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y
232# 235#
233CONFIG_ZONE_DMA=y 236CONFIG_ZONE_DMA=y
234CONFIG_PPC_INDIRECT_PCI=y 237CONFIG_PPC_INDIRECT_PCI=y
238CONFIG_4xx_SOC=y
235CONFIG_PCI=y 239CONFIG_PCI=y
236CONFIG_PCI_DOMAINS=y 240CONFIG_PCI_DOMAINS=y
237CONFIG_PCI_SYSCALL=y 241CONFIG_PCI_SYSCALL=y
@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
678# CONFIG_INFINIBAND is not set 682# CONFIG_INFINIBAND is not set
679# CONFIG_EDAC is not set 683# CONFIG_EDAC is not set
680# CONFIG_RTC_CLASS is not set 684# CONFIG_RTC_CLASS is not set
685# CONFIG_DMADEVICES is not set
681 686
682# 687#
683# Userspace I/O 688# Userspace I/O
@@ -805,6 +810,7 @@ CONFIG_PLIST=y
805CONFIG_HAS_IOMEM=y 810CONFIG_HAS_IOMEM=y
806CONFIG_HAS_IOPORT=y 811CONFIG_HAS_IOPORT=y
807CONFIG_HAS_DMA=y 812CONFIG_HAS_DMA=y
813CONFIG_HAVE_LMB=y
808 814
809# 815#
810# Kernel hacking 816# Kernel hacking