aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-09-09 21:04:36 -0400
committerPaul Mackerras <paulus@samba.org>2006-09-09 21:04:36 -0400
commitfb7d527c1aec5e224fb3a0772337f8b5e59eecd0 (patch)
tree5bbb2da58ef0d4bdb29abe3a37047dcd29d19969 /arch/powerpc/configs
parent10387e5eb45c6e48d67102b88229f5bc6037461c (diff)
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/cell_defconfig58
-rw-r--r--arch/powerpc/configs/chrp32_defconfig31
-rw-r--r--arch/powerpc/configs/g5_defconfig9
-rw-r--r--arch/powerpc/configs/iseries_defconfig7
-rw-r--r--arch/powerpc/configs/maple_defconfig129
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig64
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig20
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig104
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig84
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig75
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig62
-rw-r--r--arch/powerpc/configs/pmac32_defconfig18
-rw-r--r--arch/powerpc/configs/ppc64_defconfig198
-rw-r--r--arch/powerpc/configs/pseries_defconfig8
14 files changed, 662 insertions, 205 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index e028a2ecb8a3..6fd9e7acec29 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc6 3# Linux kernel version: 2.6.18-rc6
4# Thu Jun 22 15:28:36 2006 4# Sun Sep 10 10:20:32 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -35,6 +36,7 @@ CONFIG_PPC_STD_MMU=y
35CONFIG_VIRT_CPU_ACCOUNTING=y 36CONFIG_VIRT_CPU_ACCOUNTING=y
36CONFIG_SMP=y 37CONFIG_SMP=y
37CONFIG_NR_CPUS=4 38CONFIG_NR_CPUS=4
39CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
38 40
39# 41#
40# Code maturity level options 42# Code maturity level options
@@ -52,6 +54,7 @@ CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
53# CONFIG_POSIX_MQUEUE is not set 55# CONFIG_POSIX_MQUEUE is not set
54# CONFIG_BSD_PROCESS_ACCT is not set 56# CONFIG_BSD_PROCESS_ACCT is not set
57# CONFIG_TASKSTATS is not set
55CONFIG_SYSCTL=y 58CONFIG_SYSCTL=y
56# CONFIG_AUDIT is not set 59# CONFIG_AUDIT is not set
57CONFIG_IKCONFIG=y 60CONFIG_IKCONFIG=y
@@ -69,10 +72,12 @@ CONFIG_PRINTK=y
69CONFIG_BUG=y 72CONFIG_BUG=y
70CONFIG_ELF_CORE=y 73CONFIG_ELF_CORE=y
71CONFIG_BASE_FULL=y 74CONFIG_BASE_FULL=y
75CONFIG_RT_MUTEXES=y
72CONFIG_FUTEX=y 76CONFIG_FUTEX=y
73CONFIG_EPOLL=y 77CONFIG_EPOLL=y
74CONFIG_SHMEM=y 78CONFIG_SHMEM=y
75CONFIG_SLAB=y 79CONFIG_SLAB=y
80CONFIG_VM_EVENT_COUNTERS=y
76# CONFIG_TINY_SHMEM is not set 81# CONFIG_TINY_SHMEM is not set
77CONFIG_BASE_SMALL=0 82CONFIG_BASE_SMALL=0
78# CONFIG_SLOB is not set 83# CONFIG_SLOB is not set
@@ -119,7 +124,7 @@ CONFIG_PPC_MULTIPLATFORM=y
119CONFIG_PPC_CELL=y 124CONFIG_PPC_CELL=y
120CONFIG_PPC_CELL_NATIVE=y 125CONFIG_PPC_CELL_NATIVE=y
121CONFIG_PPC_IBM_CELL_BLADE=y 126CONFIG_PPC_IBM_CELL_BLADE=y
122CONFIG_PPC_SYSTEMSIM=y 127CONFIG_UDBG_RTAS_CONSOLE=y
123# CONFIG_U3_DART is not set 128# CONFIG_U3_DART is not set
124CONFIG_PPC_RTAS=y 129CONFIG_PPC_RTAS=y
125# CONFIG_RTAS_ERROR_LOGGING is not set 130# CONFIG_RTAS_ERROR_LOGGING is not set
@@ -130,6 +135,7 @@ CONFIG_MMIO_NVRAM=y
130# CONFIG_PPC_970_NAP is not set 135# CONFIG_PPC_970_NAP is not set
131# CONFIG_CPU_FREQ is not set 136# CONFIG_CPU_FREQ is not set
132# CONFIG_WANT_EARLY_SERIAL is not set 137# CONFIG_WANT_EARLY_SERIAL is not set
138# CONFIG_MPIC is not set
133 139
134# 140#
135# Cell Broadband Engine options 141# Cell Broadband Engine options
@@ -154,6 +160,7 @@ CONFIG_BINFMT_ELF=y
154CONFIG_BINFMT_MISC=m 160CONFIG_BINFMT_MISC=m
155CONFIG_FORCE_MAX_ZONEORDER=13 161CONFIG_FORCE_MAX_ZONEORDER=13
156# CONFIG_IOMMU_VMERGE is not set 162# CONFIG_IOMMU_VMERGE is not set
163CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
157CONFIG_KEXEC=y 164CONFIG_KEXEC=y
158# CONFIG_CRASH_DUMP is not set 165# CONFIG_CRASH_DUMP is not set
159CONFIG_IRQ_ALL_CPUS=y 166CONFIG_IRQ_ALL_CPUS=y
@@ -173,6 +180,7 @@ CONFIG_SPARSEMEM_EXTREME=y
173CONFIG_MEMORY_HOTPLUG=y 180CONFIG_MEMORY_HOTPLUG=y
174CONFIG_SPLIT_PTLOCK_CPUS=4 181CONFIG_SPLIT_PTLOCK_CPUS=4
175CONFIG_MIGRATION=y 182CONFIG_MIGRATION=y
183CONFIG_RESOURCES_64BIT=y
176CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 184CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
177CONFIG_ARCH_MEMORY_PROBE=y 185CONFIG_ARCH_MEMORY_PROBE=y
178# CONFIG_PPC_64K_PAGES is not set 186# CONFIG_PPC_64K_PAGES is not set
@@ -187,6 +195,7 @@ CONFIG_ISA_DMA_API=y
187# Bus options 195# Bus options
188# 196#
189CONFIG_GENERIC_ISA_DMA=y 197CONFIG_GENERIC_ISA_DMA=y
198# CONFIG_MPIC_WEIRD is not set
190# CONFIG_PPC_I8259 is not set 199# CONFIG_PPC_I8259 is not set
191# CONFIG_PPC_INDIRECT_PCI is not set 200# CONFIG_PPC_INDIRECT_PCI is not set
192CONFIG_PCI=y 201CONFIG_PCI=y
@@ -235,6 +244,8 @@ CONFIG_SYN_COOKIES=y
235# CONFIG_INET_IPCOMP is not set 244# CONFIG_INET_IPCOMP is not set
236# CONFIG_INET_XFRM_TUNNEL is not set 245# CONFIG_INET_XFRM_TUNNEL is not set
237CONFIG_INET_TUNNEL=y 246CONFIG_INET_TUNNEL=y
247CONFIG_INET_XFRM_MODE_TRANSPORT=y
248CONFIG_INET_XFRM_MODE_TUNNEL=y
238CONFIG_INET_DIAG=y 249CONFIG_INET_DIAG=y
239CONFIG_INET_TCP_DIAG=y 250CONFIG_INET_TCP_DIAG=y
240# CONFIG_TCP_CONG_ADVANCED is not set 251# CONFIG_TCP_CONG_ADVANCED is not set
@@ -252,7 +263,10 @@ CONFIG_INET6_ESP=m
252CONFIG_INET6_IPCOMP=m 263CONFIG_INET6_IPCOMP=m
253CONFIG_INET6_XFRM_TUNNEL=m 264CONFIG_INET6_XFRM_TUNNEL=m
254CONFIG_INET6_TUNNEL=m 265CONFIG_INET6_TUNNEL=m
266CONFIG_INET6_XFRM_MODE_TRANSPORT=y
267CONFIG_INET6_XFRM_MODE_TUNNEL=y
255CONFIG_IPV6_TUNNEL=m 268CONFIG_IPV6_TUNNEL=m
269# CONFIG_NETWORK_SECMARK is not set
256CONFIG_NETFILTER=y 270CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 271# CONFIG_NETFILTER_DEBUG is not set
258 272
@@ -277,6 +291,7 @@ CONFIG_IP_NF_TFTP=m
277CONFIG_IP_NF_AMANDA=m 291CONFIG_IP_NF_AMANDA=m
278# CONFIG_IP_NF_PPTP is not set 292# CONFIG_IP_NF_PPTP is not set
279# CONFIG_IP_NF_H323 is not set 293# CONFIG_IP_NF_H323 is not set
294# CONFIG_IP_NF_SIP is not set
280CONFIG_IP_NF_QUEUE=m 295CONFIG_IP_NF_QUEUE=m
281 296
282# 297#
@@ -336,6 +351,7 @@ CONFIG_STANDALONE=y
336CONFIG_PREVENT_FIRMWARE_BUILD=y 351CONFIG_PREVENT_FIRMWARE_BUILD=y
337CONFIG_FW_LOADER=y 352CONFIG_FW_LOADER=y
338# CONFIG_DEBUG_DRIVER is not set 353# CONFIG_DEBUG_DRIVER is not set
354# CONFIG_SYS_HYPERVISOR is not set
339 355
340# 356#
341# Connector - unified userspace <-> kernelspace linker 357# Connector - unified userspace <-> kernelspace linker
@@ -372,6 +388,7 @@ CONFIG_BLK_DEV_LOOP=y
372CONFIG_BLK_DEV_RAM=y 388CONFIG_BLK_DEV_RAM=y
373CONFIG_BLK_DEV_RAM_COUNT=16 389CONFIG_BLK_DEV_RAM_COUNT=16
374CONFIG_BLK_DEV_RAM_SIZE=131072 390CONFIG_BLK_DEV_RAM_SIZE=131072
391CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
375CONFIG_BLK_DEV_INITRD=y 392CONFIG_BLK_DEV_INITRD=y
376# CONFIG_CDROM_PKTCDVD is not set 393# CONFIG_CDROM_PKTCDVD is not set
377# CONFIG_ATA_OVER_ETH is not set 394# CONFIG_ATA_OVER_ETH is not set
@@ -449,8 +466,7 @@ CONFIG_MD_LINEAR=m
449CONFIG_MD_RAID0=m 466CONFIG_MD_RAID0=m
450CONFIG_MD_RAID1=m 467CONFIG_MD_RAID1=m
451# CONFIG_MD_RAID10 is not set 468# CONFIG_MD_RAID10 is not set
452# CONFIG_MD_RAID5 is not set 469# CONFIG_MD_RAID456 is not set
453# CONFIG_MD_RAID6 is not set
454# CONFIG_MD_MULTIPATH is not set 470# CONFIG_MD_MULTIPATH is not set
455# CONFIG_MD_FAULTY is not set 471# CONFIG_MD_FAULTY is not set
456CONFIG_BLK_DEV_DM=m 472CONFIG_BLK_DEV_DM=m
@@ -544,6 +560,7 @@ CONFIG_SPIDER_NET=m
544# CONFIG_CHELSIO_T1 is not set 560# CONFIG_CHELSIO_T1 is not set
545# CONFIG_IXGB is not set 561# CONFIG_IXGB is not set
546# CONFIG_S2IO is not set 562# CONFIG_S2IO is not set
563# CONFIG_MYRI10GE is not set
547 564
548# 565#
549# Token Ring devices 566# Token Ring devices
@@ -620,6 +637,7 @@ CONFIG_SERIO_SERPORT=y
620CONFIG_VT=y 637CONFIG_VT=y
621CONFIG_VT_CONSOLE=y 638CONFIG_VT_CONSOLE=y
622CONFIG_HW_CONSOLE=y 639CONFIG_HW_CONSOLE=y
640# CONFIG_VT_HW_CONSOLE_BINDING is not set
623CONFIG_SERIAL_NONSTANDARD=y 641CONFIG_SERIAL_NONSTANDARD=y
624# CONFIG_COMPUTONE is not set 642# CONFIG_COMPUTONE is not set
625# CONFIG_ROCKETPORT is not set 643# CONFIG_ROCKETPORT is not set
@@ -680,6 +698,7 @@ CONFIG_WATCHDOG_RTAS=y
680# 698#
681# CONFIG_PCIPCWATCHDOG is not set 699# CONFIG_PCIPCWATCHDOG is not set
682# CONFIG_WDTPCI is not set 700# CONFIG_WDTPCI is not set
701# CONFIG_HW_RANDOM is not set
683CONFIG_GEN_RTC=y 702CONFIG_GEN_RTC=y
684# CONFIG_GEN_RTC_X is not set 703# CONFIG_GEN_RTC_X is not set
685# CONFIG_DTLK is not set 704# CONFIG_DTLK is not set
@@ -725,6 +744,7 @@ CONFIG_I2C_ALGOBIT=y
725# CONFIG_I2C_I810 is not set 744# CONFIG_I2C_I810 is not set
726# CONFIG_I2C_PIIX4 is not set 745# CONFIG_I2C_PIIX4 is not set
727# CONFIG_I2C_NFORCE2 is not set 746# CONFIG_I2C_NFORCE2 is not set
747# CONFIG_I2C_OCORES is not set
728# CONFIG_I2C_PARPORT_LIGHT is not set 748# CONFIG_I2C_PARPORT_LIGHT is not set
729# CONFIG_I2C_PROSAVAGE is not set 749# CONFIG_I2C_PROSAVAGE is not set
730# CONFIG_I2C_SAVAGE4 is not set 750# CONFIG_I2C_SAVAGE4 is not set
@@ -761,7 +781,6 @@ CONFIG_I2C_ALGOBIT=y
761# 781#
762# Dallas's 1-wire bus 782# Dallas's 1-wire bus
763# 783#
764# CONFIG_W1 is not set
765 784
766# 785#
767# Hardware Monitoring support 786# Hardware Monitoring support
@@ -787,6 +806,7 @@ CONFIG_VIDEO_V4L2=y
787# 806#
788# Graphics support 807# Graphics support
789# 808#
809CONFIG_FIRMWARE_EDID=y
790# CONFIG_FB is not set 810# CONFIG_FB is not set
791 811
792# 812#
@@ -794,6 +814,7 @@ CONFIG_VIDEO_V4L2=y
794# 814#
795# CONFIG_VGA_CONSOLE is not set 815# CONFIG_VGA_CONSOLE is not set
796CONFIG_DUMMY_CONSOLE=y 816CONFIG_DUMMY_CONSOLE=y
817# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
797 818
798# 819#
799# Sound 820# Sound
@@ -841,6 +862,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
841CONFIG_INFINIBAND=y 862CONFIG_INFINIBAND=y
842CONFIG_INFINIBAND_USER_MAD=m 863CONFIG_INFINIBAND_USER_MAD=m
843CONFIG_INFINIBAND_USER_ACCESS=m 864CONFIG_INFINIBAND_USER_ACCESS=m
865CONFIG_INFINIBAND_ADDR_TRANS=y
844CONFIG_INFINIBAND_MTHCA=m 866CONFIG_INFINIBAND_MTHCA=m
845CONFIG_INFINIBAND_MTHCA_DEBUG=y 867CONFIG_INFINIBAND_MTHCA_DEBUG=y
846CONFIG_INFINIBAND_IPOIB=m 868CONFIG_INFINIBAND_IPOIB=m
@@ -857,6 +879,19 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
857# CONFIG_RTC_CLASS is not set 879# CONFIG_RTC_CLASS is not set
858 880
859# 881#
882# DMA Engine support
883#
884# CONFIG_DMA_ENGINE is not set
885
886#
887# DMA Clients
888#
889
890#
891# DMA Devices
892#
893
894#
860# File systems 895# File systems
861# 896#
862CONFIG_EXT2_FS=y 897CONFIG_EXT2_FS=y
@@ -877,6 +912,7 @@ CONFIG_FS_POSIX_ACL=y
877# CONFIG_MINIX_FS is not set 912# CONFIG_MINIX_FS is not set
878# CONFIG_ROMFS_FS is not set 913# CONFIG_ROMFS_FS is not set
879CONFIG_INOTIFY=y 914CONFIG_INOTIFY=y
915CONFIG_INOTIFY_USER=y
880# CONFIG_QUOTA is not set 916# CONFIG_QUOTA is not set
881CONFIG_DNOTIFY=y 917CONFIG_DNOTIFY=y
882# CONFIG_AUTOFS_FS is not set 918# CONFIG_AUTOFS_FS is not set
@@ -1034,6 +1070,9 @@ CONFIG_CRC32=y
1034# CONFIG_LIBCRC32C is not set 1070# CONFIG_LIBCRC32C is not set
1035CONFIG_ZLIB_INFLATE=m 1071CONFIG_ZLIB_INFLATE=m
1036CONFIG_ZLIB_DEFLATE=m 1072CONFIG_ZLIB_DEFLATE=m
1073CONFIG_TEXTSEARCH=y
1074CONFIG_TEXTSEARCH_KMP=m
1075CONFIG_PLIST=y
1037 1076
1038# 1077#
1039# Instrumentation Support 1078# Instrumentation Support
@@ -1046,14 +1085,19 @@ CONFIG_ZLIB_DEFLATE=m
1046# 1085#
1047# CONFIG_PRINTK_TIME is not set 1086# CONFIG_PRINTK_TIME is not set
1048CONFIG_MAGIC_SYSRQ=y 1087CONFIG_MAGIC_SYSRQ=y
1088# CONFIG_UNUSED_SYMBOLS is not set
1049CONFIG_DEBUG_KERNEL=y 1089CONFIG_DEBUG_KERNEL=y
1050CONFIG_LOG_BUF_SHIFT=15 1090CONFIG_LOG_BUF_SHIFT=15
1051CONFIG_DETECT_SOFTLOCKUP=y 1091CONFIG_DETECT_SOFTLOCKUP=y
1052# CONFIG_SCHEDSTATS is not set 1092# CONFIG_SCHEDSTATS is not set
1053# CONFIG_DEBUG_SLAB is not set 1093# CONFIG_DEBUG_SLAB is not set
1054CONFIG_DEBUG_MUTEXES=y 1094# CONFIG_DEBUG_RT_MUTEXES is not set
1095# CONFIG_RT_MUTEX_TESTER is not set
1055# CONFIG_DEBUG_SPINLOCK is not set 1096# CONFIG_DEBUG_SPINLOCK is not set
1097CONFIG_DEBUG_MUTEXES=y
1098# CONFIG_DEBUG_RWSEMS is not set
1056CONFIG_DEBUG_SPINLOCK_SLEEP=y 1099CONFIG_DEBUG_SPINLOCK_SLEEP=y
1100# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1057# CONFIG_DEBUG_KOBJECT is not set 1101# CONFIG_DEBUG_KOBJECT is not set
1058# CONFIG_DEBUG_INFO is not set 1102# CONFIG_DEBUG_INFO is not set
1059CONFIG_DEBUG_FS=y 1103CONFIG_DEBUG_FS=y
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 0fa010a63a8e..bbf2b5f8a8cb 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17 3# Linux kernel version: 2.6.18-rc6
4# Mon Jul 3 12:08:41 2006 4# Sun Sep 10 10:22:54 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -42,6 +43,7 @@ CONFIG_PPC_STD_MMU=y
42CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
43CONFIG_SMP=y 44CONFIG_SMP=y
44CONFIG_NR_CPUS=4 45CONFIG_NR_CPUS=4
46CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
45 47
46# 48#
47# Code maturity level options 49# Code maturity level options
@@ -59,6 +61,7 @@ CONFIG_SWAP=y
59CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
60CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
61# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set
62CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
63# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
64CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
@@ -76,10 +79,12 @@ CONFIG_PRINTK=y
76CONFIG_BUG=y 79CONFIG_BUG=y
77CONFIG_ELF_CORE=y 80CONFIG_ELF_CORE=y
78CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
82CONFIG_RT_MUTEXES=y
79CONFIG_FUTEX=y 83CONFIG_FUTEX=y
80CONFIG_EPOLL=y 84CONFIG_EPOLL=y
81CONFIG_SHMEM=y 85CONFIG_SHMEM=y
82CONFIG_SLAB=y 86CONFIG_SLAB=y
87CONFIG_VM_EVENT_COUNTERS=y
83# CONFIG_TINY_SHMEM is not set 88# CONFIG_TINY_SHMEM is not set
84CONFIG_BASE_SMALL=0 89CONFIG_BASE_SMALL=0
85# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
@@ -126,7 +131,7 @@ CONFIG_PPC_CHRP=y
126# CONFIG_PPC_PMAC is not set 131# CONFIG_PPC_PMAC is not set
127# CONFIG_PPC_CELL is not set 132# CONFIG_PPC_CELL is not set
128# CONFIG_PPC_CELL_NATIVE is not set 133# CONFIG_PPC_CELL_NATIVE is not set
129CONFIG_MPIC=y 134# CONFIG_UDBG_RTAS_CONSOLE is not set
130CONFIG_PPC_RTAS=y 135CONFIG_PPC_RTAS=y
131# CONFIG_RTAS_ERROR_LOGGING is not set 136# CONFIG_RTAS_ERROR_LOGGING is not set
132CONFIG_RTAS_PROC=y 137CONFIG_RTAS_PROC=y
@@ -136,6 +141,7 @@ CONFIG_PPC_MPC106=y
136# CONFIG_CPU_FREQ is not set 141# CONFIG_CPU_FREQ is not set
137# CONFIG_TAU is not set 142# CONFIG_TAU is not set
138# CONFIG_WANT_EARLY_SERIAL is not set 143# CONFIG_WANT_EARLY_SERIAL is not set
144CONFIG_MPIC=y
139 145
140# 146#
141# Kernel options 147# Kernel options
@@ -151,6 +157,7 @@ CONFIG_PREEMPT_NONE=y
151CONFIG_PREEMPT_BKL=y 157CONFIG_PREEMPT_BKL=y
152CONFIG_BINFMT_ELF=y 158CONFIG_BINFMT_ELF=y
153CONFIG_BINFMT_MISC=y 159CONFIG_BINFMT_MISC=y
160CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
154# CONFIG_KEXEC is not set 161# CONFIG_KEXEC is not set
155CONFIG_IRQ_ALL_CPUS=y 162CONFIG_IRQ_ALL_CPUS=y
156CONFIG_ARCH_FLATMEM_ENABLE=y 163CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -162,6 +169,7 @@ CONFIG_FLATMEM=y
162CONFIG_FLAT_NODE_MEM_MAP=y 169CONFIG_FLAT_NODE_MEM_MAP=y
163# CONFIG_SPARSEMEM_STATIC is not set 170# CONFIG_SPARSEMEM_STATIC is not set
164CONFIG_SPLIT_PTLOCK_CPUS=4 171CONFIG_SPLIT_PTLOCK_CPUS=4
172# CONFIG_RESOURCES_64BIT is not set
165CONFIG_PROC_DEVICETREE=y 173CONFIG_PROC_DEVICETREE=y
166# CONFIG_CMDLINE_BOOL is not set 174# CONFIG_CMDLINE_BOOL is not set
167# CONFIG_PM is not set 175# CONFIG_PM is not set
@@ -173,6 +181,7 @@ CONFIG_ISA_DMA_API=y
173# 181#
174CONFIG_ISA=y 182CONFIG_ISA=y
175CONFIG_GENERIC_ISA_DMA=y 183CONFIG_GENERIC_ISA_DMA=y
184# CONFIG_MPIC_WEIRD is not set
176CONFIG_PPC_I8259=y 185CONFIG_PPC_I8259=y
177CONFIG_PPC_INDIRECT_PCI=y 186CONFIG_PPC_INDIRECT_PCI=y
178CONFIG_PCI=y 187CONFIG_PCI=y
@@ -366,6 +375,7 @@ CONFIG_BLK_DEV_LOOP=y
366CONFIG_BLK_DEV_RAM=y 375CONFIG_BLK_DEV_RAM=y
367CONFIG_BLK_DEV_RAM_COUNT=16 376CONFIG_BLK_DEV_RAM_COUNT=16
368CONFIG_BLK_DEV_RAM_SIZE=4096 377CONFIG_BLK_DEV_RAM_SIZE=4096
378CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
369CONFIG_BLK_DEV_INITRD=y 379CONFIG_BLK_DEV_INITRD=y
370# CONFIG_CDROM_PKTCDVD is not set 380# CONFIG_CDROM_PKTCDVD is not set
371# CONFIG_ATA_OVER_ETH is not set 381# CONFIG_ATA_OVER_ETH is not set
@@ -622,6 +632,7 @@ CONFIG_8139TOO=y
622# CONFIG_TLAN is not set 632# CONFIG_TLAN is not set
623CONFIG_VIA_RHINE=y 633CONFIG_VIA_RHINE=y
624# CONFIG_VIA_RHINE_MMIO is not set 634# CONFIG_VIA_RHINE_MMIO is not set
635# CONFIG_VIA_RHINE_NAPI is not set
625 636
626# 637#
627# Ethernet (1000 Mbit) 638# Ethernet (1000 Mbit)
@@ -751,6 +762,7 @@ CONFIG_SERIO_LIBPS2=y
751CONFIG_VT=y 762CONFIG_VT=y
752CONFIG_VT_CONSOLE=y 763CONFIG_VT_CONSOLE=y
753CONFIG_HW_CONSOLE=y 764CONFIG_HW_CONSOLE=y
765# CONFIG_VT_HW_CONSOLE_BINDING is not set
754# CONFIG_SERIAL_NONSTANDARD is not set 766# CONFIG_SERIAL_NONSTANDARD is not set
755 767
756# 768#
@@ -783,6 +795,7 @@ CONFIG_LEGACY_PTY_COUNT=256
783# Watchdog Cards 795# Watchdog Cards
784# 796#
785# CONFIG_WATCHDOG is not set 797# CONFIG_WATCHDOG is not set
798# CONFIG_HW_RANDOM is not set
786CONFIG_NVRAM=y 799CONFIG_NVRAM=y
787CONFIG_GEN_RTC=y 800CONFIG_GEN_RTC=y
788# CONFIG_GEN_RTC_X is not set 801# CONFIG_GEN_RTC_X is not set
@@ -894,12 +907,12 @@ CONFIG_VIDEO_V4L2=y
894# 907#
895# Graphics support 908# Graphics support
896# 909#
910CONFIG_FIRMWARE_EDID=y
897CONFIG_FB=y 911CONFIG_FB=y
898CONFIG_FB_CFB_FILLRECT=y 912CONFIG_FB_CFB_FILLRECT=y
899CONFIG_FB_CFB_COPYAREA=y 913CONFIG_FB_CFB_COPYAREA=y
900CONFIG_FB_CFB_IMAGEBLIT=y 914CONFIG_FB_CFB_IMAGEBLIT=y
901CONFIG_FB_MACMODES=y 915CONFIG_FB_MACMODES=y
902CONFIG_FB_FIRMWARE_EDID=y
903# CONFIG_FB_BACKLIGHT is not set 916# CONFIG_FB_BACKLIGHT is not set
904CONFIG_FB_MODE_HELPERS=y 917CONFIG_FB_MODE_HELPERS=y
905CONFIG_FB_TILEBLITTING=y 918CONFIG_FB_TILEBLITTING=y
@@ -1079,7 +1092,7 @@ CONFIG_USB_MON=y
1079# CONFIG_USB_LEGOTOWER is not set 1092# CONFIG_USB_LEGOTOWER is not set
1080# CONFIG_USB_LCD is not set 1093# CONFIG_USB_LCD is not set
1081# CONFIG_USB_LED is not set 1094# CONFIG_USB_LED is not set
1082# CONFIG_USB_CY7C63 is not set 1095# CONFIG_USB_CYPRESS_CY7C63 is not set
1083# CONFIG_USB_CYTHERM is not set 1096# CONFIG_USB_CYTHERM is not set
1084# CONFIG_USB_PHIDGETKIT is not set 1097# CONFIG_USB_PHIDGETKIT is not set
1085# CONFIG_USB_PHIDGETSERVO is not set 1098# CONFIG_USB_PHIDGETSERVO is not set
@@ -1305,6 +1318,7 @@ CONFIG_ZLIB_INFLATE=m
1305CONFIG_ZLIB_DEFLATE=m 1318CONFIG_ZLIB_DEFLATE=m
1306CONFIG_TEXTSEARCH=y 1319CONFIG_TEXTSEARCH=y
1307CONFIG_TEXTSEARCH_KMP=m 1320CONFIG_TEXTSEARCH_KMP=m
1321CONFIG_PLIST=y
1308 1322
1309# 1323#
1310# Instrumentation Support 1324# Instrumentation Support
@@ -1316,14 +1330,19 @@ CONFIG_TEXTSEARCH_KMP=m
1316# 1330#
1317# CONFIG_PRINTK_TIME is not set 1331# CONFIG_PRINTK_TIME is not set
1318CONFIG_MAGIC_SYSRQ=y 1332CONFIG_MAGIC_SYSRQ=y
1333# CONFIG_UNUSED_SYMBOLS is not set
1319CONFIG_DEBUG_KERNEL=y 1334CONFIG_DEBUG_KERNEL=y
1320CONFIG_LOG_BUF_SHIFT=15 1335CONFIG_LOG_BUF_SHIFT=15
1321CONFIG_DETECT_SOFTLOCKUP=y 1336CONFIG_DETECT_SOFTLOCKUP=y
1322# CONFIG_SCHEDSTATS is not set 1337# CONFIG_SCHEDSTATS is not set
1323# CONFIG_DEBUG_SLAB is not set 1338# CONFIG_DEBUG_SLAB is not set
1324CONFIG_DEBUG_MUTEXES=y 1339# CONFIG_DEBUG_RT_MUTEXES is not set
1340# CONFIG_RT_MUTEX_TESTER is not set
1325# CONFIG_DEBUG_SPINLOCK is not set 1341# CONFIG_DEBUG_SPINLOCK is not set
1342CONFIG_DEBUG_MUTEXES=y
1343# CONFIG_DEBUG_RWSEMS is not set
1326CONFIG_DEBUG_SPINLOCK_SLEEP=y 1344CONFIG_DEBUG_SPINLOCK_SLEEP=y
1345# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1327# CONFIG_DEBUG_KOBJECT is not set 1346# CONFIG_DEBUG_KOBJECT is not set
1328# CONFIG_DEBUG_HIGHMEM is not set 1347# CONFIG_DEBUG_HIGHMEM is not set
1329# CONFIG_DEBUG_INFO is not set 1348# CONFIG_DEBUG_INFO is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 8c6bd17c6929..4b9c2ed925f5 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_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.18-rc3 3# Linux kernel version: 2.6.18-rc6
4# Tue Aug 8 09:12:29 2006 4# Sun Sep 10 10:22:55 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -126,7 +126,6 @@ CONFIG_PPC_PMAC64=y
126# CONFIG_PPC_IBM_CELL_BLADE is not set 126# CONFIG_PPC_IBM_CELL_BLADE is not set
127# CONFIG_UDBG_RTAS_CONSOLE is not set 127# CONFIG_UDBG_RTAS_CONSOLE is not set
128CONFIG_U3_DART=y 128CONFIG_U3_DART=y
129CONFIG_MPIC=y
130# CONFIG_PPC_RTAS is not set 129# CONFIG_PPC_RTAS is not set
131# CONFIG_MMIO_NVRAM is not set 130# CONFIG_MMIO_NVRAM is not set
132CONFIG_MPIC_BROKEN_U3=y 131CONFIG_MPIC_BROKEN_U3=y
@@ -146,6 +145,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
146# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 145# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
147CONFIG_CPU_FREQ_PMAC64=y 146CONFIG_CPU_FREQ_PMAC64=y
148# CONFIG_WANT_EARLY_SERIAL is not set 147# CONFIG_WANT_EARLY_SERIAL is not set
148CONFIG_MPIC=y
149 149
150# 150#
151# Kernel options 151# Kernel options
@@ -192,6 +192,7 @@ CONFIG_ISA_DMA_API=y
192# Bus options 192# Bus options
193# 193#
194CONFIG_GENERIC_ISA_DMA=y 194CONFIG_GENERIC_ISA_DMA=y
195# CONFIG_MPIC_WEIRD is not set
195# CONFIG_PPC_I8259 is not set 196# CONFIG_PPC_I8259 is not set
196# CONFIG_PPC_INDIRECT_PCI is not set 197# CONFIG_PPC_INDIRECT_PCI is not set
197CONFIG_PCI=y 198CONFIG_PCI=y
@@ -772,7 +773,6 @@ CONFIG_HW_CONSOLE=y
772CONFIG_UNIX98_PTYS=y 773CONFIG_UNIX98_PTYS=y
773CONFIG_LEGACY_PTYS=y 774CONFIG_LEGACY_PTYS=y
774CONFIG_LEGACY_PTY_COUNT=256 775CONFIG_LEGACY_PTY_COUNT=256
775# CONFIG_BRIQ_PANEL is not set
776 776
777# 777#
778# IPMI 778# IPMI
@@ -1195,7 +1195,6 @@ CONFIG_USB_MON=y
1195CONFIG_USB_SERIAL=m 1195CONFIG_USB_SERIAL=m
1196CONFIG_USB_SERIAL_GENERIC=y 1196CONFIG_USB_SERIAL_GENERIC=y
1197# CONFIG_USB_SERIAL_AIRPRIME is not set 1197# CONFIG_USB_SERIAL_AIRPRIME is not set
1198# CONFIG_USB_SERIAL_ANYDATA is not set
1199# CONFIG_USB_SERIAL_ARK3116 is not set 1198# CONFIG_USB_SERIAL_ARK3116 is not set
1200CONFIG_USB_SERIAL_BELKIN=m 1199CONFIG_USB_SERIAL_BELKIN=m
1201# CONFIG_USB_SERIAL_WHITEHEAT is not set 1200# CONFIG_USB_SERIAL_WHITEHEAT is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 72ed95b3ead6..eb0885ea0731 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_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.18-rc3 3# Linux kernel version: 2.6.18-rc6
4# Tue Aug 8 09:15:46 2006 4# Sun Sep 10 10:22:57 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -129,6 +129,7 @@ CONFIG_IBMVIO=y
129# CONFIG_PPC_970_NAP is not set 129# CONFIG_PPC_970_NAP is not set
130# CONFIG_CPU_FREQ is not set 130# CONFIG_CPU_FREQ is not set
131# CONFIG_WANT_EARLY_SERIAL is not set 131# CONFIG_WANT_EARLY_SERIAL is not set
132# CONFIG_MPIC is not set
132 133
133# 134#
134# Kernel options 135# Kernel options
@@ -172,6 +173,7 @@ CONFIG_ISA_DMA_API=y
172# Bus options 173# Bus options
173# 174#
174CONFIG_GENERIC_ISA_DMA=y 175CONFIG_GENERIC_ISA_DMA=y
176# CONFIG_MPIC_WEIRD is not set
175# CONFIG_PPC_I8259 is not set 177# CONFIG_PPC_I8259 is not set
176# CONFIG_PPC_INDIRECT_PCI is not set 178# CONFIG_PPC_INDIRECT_PCI is not set
177CONFIG_PCI=y 179CONFIG_PCI=y
@@ -716,7 +718,6 @@ CONFIG_SERIAL_ICOM=m
716CONFIG_UNIX98_PTYS=y 718CONFIG_UNIX98_PTYS=y
717CONFIG_LEGACY_PTYS=y 719CONFIG_LEGACY_PTYS=y
718CONFIG_LEGACY_PTY_COUNT=256 720CONFIG_LEGACY_PTY_COUNT=256
719# CONFIG_BRIQ_PANEL is not set
720 721
721# 722#
722# IPMI 723# IPMI
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 80a0db43aeb7..2860be106f4f 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,15 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc6 3# Linux kernel version: 2.6.18-rc6
4# Wed Mar 15 16:19:54 2006 4# Sun Sep 10 10:24:55 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_PPC=y 16CONFIG_PPC=y
14CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
15CONFIG_COMPAT=y 18CONFIG_COMPAT=y
@@ -29,8 +32,10 @@ CONFIG_POWER4=y
29CONFIG_PPC_FPU=y 32CONFIG_PPC_FPU=y
30# CONFIG_ALTIVEC is not set 33# CONFIG_ALTIVEC is not set
31CONFIG_PPC_STD_MMU=y 34CONFIG_PPC_STD_MMU=y
35CONFIG_VIRT_CPU_ACCOUNTING=y
32CONFIG_SMP=y 36CONFIG_SMP=y
33CONFIG_NR_CPUS=2 37CONFIG_NR_CPUS=2
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34 39
35# 40#
36# Code maturity level options 41# Code maturity level options
@@ -48,11 +53,13 @@ CONFIG_SWAP=y
48CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
49CONFIG_POSIX_MQUEUE=y 54CONFIG_POSIX_MQUEUE=y
50# CONFIG_BSD_PROCESS_ACCT is not set 55# CONFIG_BSD_PROCESS_ACCT is not set
56# CONFIG_TASKSTATS is not set
51CONFIG_SYSCTL=y 57CONFIG_SYSCTL=y
52# CONFIG_AUDIT is not set 58# CONFIG_AUDIT is not set
53CONFIG_IKCONFIG=y 59CONFIG_IKCONFIG=y
54CONFIG_IKCONFIG_PROC=y 60CONFIG_IKCONFIG_PROC=y
55# CONFIG_CPUSETS is not set 61# CONFIG_CPUSETS is not set
62# CONFIG_RELAY is not set
56CONFIG_INITRAMFS_SOURCE="" 63CONFIG_INITRAMFS_SOURCE=""
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 64CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58# CONFIG_EMBEDDED is not set 65# CONFIG_EMBEDDED is not set
@@ -64,14 +71,12 @@ CONFIG_PRINTK=y
64CONFIG_BUG=y 71CONFIG_BUG=y
65CONFIG_ELF_CORE=y 72CONFIG_ELF_CORE=y
66CONFIG_BASE_FULL=y 73CONFIG_BASE_FULL=y
74CONFIG_RT_MUTEXES=y
67CONFIG_FUTEX=y 75CONFIG_FUTEX=y
68CONFIG_EPOLL=y 76CONFIG_EPOLL=y
69CONFIG_SHMEM=y 77CONFIG_SHMEM=y
70CONFIG_CC_ALIGN_FUNCTIONS=0
71CONFIG_CC_ALIGN_LABELS=0
72CONFIG_CC_ALIGN_LOOPS=0
73CONFIG_CC_ALIGN_JUMPS=0
74CONFIG_SLAB=y 78CONFIG_SLAB=y
79CONFIG_VM_EVENT_COUNTERS=y
75# CONFIG_TINY_SHMEM is not set 80# CONFIG_TINY_SHMEM is not set
76CONFIG_BASE_SMALL=0 81CONFIG_BASE_SMALL=0
77# CONFIG_SLOB is not set 82# CONFIG_SLOB is not set
@@ -82,7 +87,6 @@ CONFIG_BASE_SMALL=0
82CONFIG_MODULES=y 87CONFIG_MODULES=y
83CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
85CONFIG_OBSOLETE_MODPARM=y
86CONFIG_MODVERSIONS=y 90CONFIG_MODVERSIONS=y
87CONFIG_MODULE_SRCVERSION_ALL=y 91CONFIG_MODULE_SRCVERSION_ALL=y
88CONFIG_KMOD=y 92CONFIG_KMOD=y
@@ -91,6 +95,7 @@ CONFIG_STOP_MACHINE=y
91# 95#
92# Block layer 96# Block layer
93# 97#
98# CONFIG_BLK_DEV_IO_TRACE is not set
94 99
95# 100#
96# IO Schedulers 101# IO Schedulers
@@ -116,14 +121,18 @@ CONFIG_PPC_MULTIPLATFORM=y
116# CONFIG_PPC_PMAC is not set 121# CONFIG_PPC_PMAC is not set
117CONFIG_PPC_MAPLE=y 122CONFIG_PPC_MAPLE=y
118# CONFIG_PPC_CELL is not set 123# CONFIG_PPC_CELL is not set
124# CONFIG_PPC_CELL_NATIVE is not set
125# CONFIG_PPC_IBM_CELL_BLADE is not set
126# CONFIG_UDBG_RTAS_CONSOLE is not set
119CONFIG_U3_DART=y 127CONFIG_U3_DART=y
120CONFIG_MPIC=y
121# CONFIG_PPC_RTAS is not set 128# CONFIG_PPC_RTAS is not set
122# CONFIG_MMIO_NVRAM is not set 129# CONFIG_MMIO_NVRAM is not set
123CONFIG_MPIC_BROKEN_U3=y 130CONFIG_MPIC_BROKEN_U3=y
124# CONFIG_PPC_MPC106 is not set 131# CONFIG_PPC_MPC106 is not set
132CONFIG_PPC_970_NAP=y
125# CONFIG_CPU_FREQ is not set 133# CONFIG_CPU_FREQ is not set
126# CONFIG_WANT_EARLY_SERIAL is not set 134# CONFIG_WANT_EARLY_SERIAL is not set
135CONFIG_MPIC=y
127 136
128# 137#
129# Kernel options 138# Kernel options
@@ -140,6 +149,7 @@ CONFIG_BINFMT_ELF=y
140# CONFIG_BINFMT_MISC is not set 149# CONFIG_BINFMT_MISC is not set
141CONFIG_FORCE_MAX_ZONEORDER=13 150CONFIG_FORCE_MAX_ZONEORDER=13
142CONFIG_IOMMU_VMERGE=y 151CONFIG_IOMMU_VMERGE=y
152CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
143CONFIG_KEXEC=y 153CONFIG_KEXEC=y
144# CONFIG_CRASH_DUMP is not set 154# CONFIG_CRASH_DUMP is not set
145CONFIG_IRQ_ALL_CPUS=y 155CONFIG_IRQ_ALL_CPUS=y
@@ -155,6 +165,7 @@ CONFIG_FLATMEM=y
155CONFIG_FLAT_NODE_MEM_MAP=y 165CONFIG_FLAT_NODE_MEM_MAP=y
156# CONFIG_SPARSEMEM_STATIC is not set 166# CONFIG_SPARSEMEM_STATIC is not set
157CONFIG_SPLIT_PTLOCK_CPUS=4 167CONFIG_SPLIT_PTLOCK_CPUS=4
168CONFIG_RESOURCES_64BIT=y
158# CONFIG_PPC_64K_PAGES is not set 169# CONFIG_PPC_64K_PAGES is not set
159# CONFIG_SCHED_SMT is not set 170# CONFIG_SCHED_SMT is not set
160CONFIG_PROC_DEVICETREE=y 171CONFIG_PROC_DEVICETREE=y
@@ -167,11 +178,12 @@ CONFIG_ISA_DMA_API=y
167# Bus options 178# Bus options
168# 179#
169CONFIG_GENERIC_ISA_DMA=y 180CONFIG_GENERIC_ISA_DMA=y
181# CONFIG_MPIC_WEIRD is not set
170# CONFIG_PPC_I8259 is not set 182# CONFIG_PPC_I8259 is not set
171# CONFIG_PPC_INDIRECT_PCI is not set 183# CONFIG_PPC_INDIRECT_PCI is not set
172CONFIG_PCI=y 184CONFIG_PCI=y
173CONFIG_PCI_DOMAINS=y 185CONFIG_PCI_DOMAINS=y
174CONFIG_PCI_LEGACY_PROC=y 186# CONFIG_PCIEPORTBUS is not set
175# CONFIG_PCI_DEBUG is not set 187# CONFIG_PCI_DEBUG is not set
176 188
177# 189#
@@ -197,6 +209,8 @@ CONFIG_NET=y
197CONFIG_PACKET=y 209CONFIG_PACKET=y
198CONFIG_PACKET_MMAP=y 210CONFIG_PACKET_MMAP=y
199CONFIG_UNIX=y 211CONFIG_UNIX=y
212CONFIG_XFRM=y
213CONFIG_XFRM_USER=m
200# CONFIG_NET_KEY is not set 214# CONFIG_NET_KEY is not set
201CONFIG_INET=y 215CONFIG_INET=y
202CONFIG_IP_MULTICAST=y 216CONFIG_IP_MULTICAST=y
@@ -214,12 +228,18 @@ CONFIG_IP_PNP_DHCP=y
214# CONFIG_INET_AH is not set 228# CONFIG_INET_AH is not set
215# CONFIG_INET_ESP is not set 229# CONFIG_INET_ESP is not set
216# CONFIG_INET_IPCOMP is not set 230# CONFIG_INET_IPCOMP is not set
231# CONFIG_INET_XFRM_TUNNEL is not set
217# CONFIG_INET_TUNNEL is not set 232# CONFIG_INET_TUNNEL is not set
233CONFIG_INET_XFRM_MODE_TRANSPORT=y
234CONFIG_INET_XFRM_MODE_TUNNEL=y
218CONFIG_INET_DIAG=y 235CONFIG_INET_DIAG=y
219CONFIG_INET_TCP_DIAG=y 236CONFIG_INET_TCP_DIAG=y
220# CONFIG_TCP_CONG_ADVANCED is not set 237# CONFIG_TCP_CONG_ADVANCED is not set
221CONFIG_TCP_CONG_BIC=y 238CONFIG_TCP_CONG_BIC=y
222# CONFIG_IPV6 is not set 239# CONFIG_IPV6 is not set
240# CONFIG_INET6_XFRM_TUNNEL is not set
241# CONFIG_INET6_TUNNEL is not set
242# CONFIG_NETWORK_SECMARK is not set
223# CONFIG_NETFILTER is not set 243# CONFIG_NETFILTER is not set
224 244
225# 245#
@@ -274,6 +294,7 @@ CONFIG_STANDALONE=y
274CONFIG_PREVENT_FIRMWARE_BUILD=y 294CONFIG_PREVENT_FIRMWARE_BUILD=y
275# CONFIG_FW_LOADER is not set 295# CONFIG_FW_LOADER is not set
276# CONFIG_DEBUG_DRIVER is not set 296# CONFIG_DEBUG_DRIVER is not set
297# CONFIG_SYS_HYPERVISOR is not set
277 298
278# 299#
279# Connector - unified userspace <-> kernelspace linker 300# Connector - unified userspace <-> kernelspace linker
@@ -310,6 +331,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
310CONFIG_BLK_DEV_RAM=y 331CONFIG_BLK_DEV_RAM=y
311CONFIG_BLK_DEV_RAM_COUNT=16 332CONFIG_BLK_DEV_RAM_COUNT=16
312CONFIG_BLK_DEV_RAM_SIZE=8192 333CONFIG_BLK_DEV_RAM_SIZE=8192
334CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
313# CONFIG_BLK_DEV_INITRD is not set 335# CONFIG_BLK_DEV_INITRD is not set
314# CONFIG_CDROM_PKTCDVD is not set 336# CONFIG_CDROM_PKTCDVD is not set
315# CONFIG_ATA_OVER_ETH is not set 337# CONFIG_ATA_OVER_ETH is not set
@@ -484,6 +506,7 @@ CONFIG_E1000=y
484# CONFIG_CHELSIO_T1 is not set 506# CONFIG_CHELSIO_T1 is not set
485# CONFIG_IXGB is not set 507# CONFIG_IXGB is not set
486# CONFIG_S2IO is not set 508# CONFIG_S2IO is not set
509# CONFIG_MYRI10GE is not set
487 510
488# 511#
489# Token Ring devices 512# Token Ring devices
@@ -556,6 +579,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
556CONFIG_VT=y 579CONFIG_VT=y
557CONFIG_VT_CONSOLE=y 580CONFIG_VT_CONSOLE=y
558CONFIG_HW_CONSOLE=y 581CONFIG_HW_CONSOLE=y
582# CONFIG_VT_HW_CONSOLE_BINDING is not set
559# CONFIG_SERIAL_NONSTANDARD is not set 583# CONFIG_SERIAL_NONSTANDARD is not set
560 584
561# 585#
@@ -563,6 +587,7 @@ CONFIG_HW_CONSOLE=y
563# 587#
564CONFIG_SERIAL_8250=y 588CONFIG_SERIAL_8250=y
565CONFIG_SERIAL_8250_CONSOLE=y 589CONFIG_SERIAL_8250_CONSOLE=y
590CONFIG_SERIAL_8250_PCI=y
566CONFIG_SERIAL_8250_NR_UARTS=4 591CONFIG_SERIAL_8250_NR_UARTS=4
567CONFIG_SERIAL_8250_RUNTIME_UARTS=4 592CONFIG_SERIAL_8250_RUNTIME_UARTS=4
568# CONFIG_SERIAL_8250_EXTENDED is not set 593# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -586,7 +611,7 @@ CONFIG_LEGACY_PTY_COUNT=256
586# Watchdog Cards 611# Watchdog Cards
587# 612#
588# CONFIG_WATCHDOG is not set 613# CONFIG_WATCHDOG is not set
589# CONFIG_RTC is not set 614# CONFIG_HW_RANDOM is not set
590CONFIG_GEN_RTC=y 615CONFIG_GEN_RTC=y
591# CONFIG_GEN_RTC_X is not set 616# CONFIG_GEN_RTC_X is not set
592# CONFIG_DTLK is not set 617# CONFIG_DTLK is not set
@@ -632,10 +657,10 @@ CONFIG_I2C_AMD8111=y
632# CONFIG_I2C_I810 is not set 657# CONFIG_I2C_I810 is not set
633# CONFIG_I2C_PIIX4 is not set 658# CONFIG_I2C_PIIX4 is not set
634# CONFIG_I2C_NFORCE2 is not set 659# CONFIG_I2C_NFORCE2 is not set
660# CONFIG_I2C_OCORES is not set
635# CONFIG_I2C_PARPORT_LIGHT is not set 661# CONFIG_I2C_PARPORT_LIGHT is not set
636# CONFIG_I2C_PROSAVAGE is not set 662# CONFIG_I2C_PROSAVAGE is not set
637# CONFIG_I2C_SAVAGE4 is not set 663# CONFIG_I2C_SAVAGE4 is not set
638# CONFIG_SCx200_ACB is not set
639# CONFIG_I2C_SIS5595 is not set 664# CONFIG_I2C_SIS5595 is not set
640# CONFIG_I2C_SIS630 is not set 665# CONFIG_I2C_SIS630 is not set
641# CONFIG_I2C_SIS96X is not set 666# CONFIG_I2C_SIS96X is not set
@@ -654,9 +679,7 @@ CONFIG_I2C_AMD8111=y
654# CONFIG_SENSORS_PCF8574 is not set 679# CONFIG_SENSORS_PCF8574 is not set
655# CONFIG_SENSORS_PCA9539 is not set 680# CONFIG_SENSORS_PCA9539 is not set
656# CONFIG_SENSORS_PCF8591 is not set 681# CONFIG_SENSORS_PCF8591 is not set
657# CONFIG_SENSORS_RTC8564 is not set
658# CONFIG_SENSORS_MAX6875 is not set 682# CONFIG_SENSORS_MAX6875 is not set
659# CONFIG_RTC_X1205_I2C is not set
660# CONFIG_I2C_DEBUG_CORE is not set 683# CONFIG_I2C_DEBUG_CORE is not set
661# CONFIG_I2C_DEBUG_ALGO is not set 684# CONFIG_I2C_DEBUG_ALGO is not set
662# CONFIG_I2C_DEBUG_BUS is not set 685# CONFIG_I2C_DEBUG_BUS is not set
@@ -671,7 +694,6 @@ CONFIG_I2C_AMD8111=y
671# 694#
672# Dallas's 1-wire bus 695# Dallas's 1-wire bus
673# 696#
674# CONFIG_W1 is not set
675 697
676# 698#
677# Hardware Monitoring support 699# Hardware Monitoring support
@@ -684,22 +706,21 @@ CONFIG_I2C_AMD8111=y
684# 706#
685 707
686# 708#
687# Multimedia Capabilities Port drivers
688#
689
690#
691# Multimedia devices 709# Multimedia devices
692# 710#
693# CONFIG_VIDEO_DEV is not set 711# CONFIG_VIDEO_DEV is not set
712CONFIG_VIDEO_V4L2=y
694 713
695# 714#
696# Digital Video Broadcasting Devices 715# Digital Video Broadcasting Devices
697# 716#
698# CONFIG_DVB is not set 717# CONFIG_DVB is not set
718# CONFIG_USB_DABUSB is not set
699 719
700# 720#
701# Graphics support 721# Graphics support
702# 722#
723CONFIG_FIRMWARE_EDID=y
703# CONFIG_FB is not set 724# CONFIG_FB is not set
704 725
705# 726#
@@ -707,6 +728,7 @@ CONFIG_I2C_AMD8111=y
707# 728#
708# CONFIG_VGA_CONSOLE is not set 729# CONFIG_VGA_CONSOLE is not set
709CONFIG_DUMMY_CONSOLE=y 730CONFIG_DUMMY_CONSOLE=y
731# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710 732
711# 733#
712# Sound 734# Sound
@@ -718,6 +740,7 @@ CONFIG_DUMMY_CONSOLE=y
718# 740#
719CONFIG_USB_ARCH_HAS_HCD=y 741CONFIG_USB_ARCH_HAS_HCD=y
720CONFIG_USB_ARCH_HAS_OHCI=y 742CONFIG_USB_ARCH_HAS_OHCI=y
743CONFIG_USB_ARCH_HAS_EHCI=y
721CONFIG_USB=y 744CONFIG_USB=y
722# CONFIG_USB_DEBUG is not set 745# CONFIG_USB_DEBUG is not set
723 746
@@ -735,6 +758,7 @@ CONFIG_USB_DEVICEFS=y
735CONFIG_USB_EHCI_HCD=y 758CONFIG_USB_EHCI_HCD=y
736CONFIG_USB_EHCI_SPLIT_ISO=y 759CONFIG_USB_EHCI_SPLIT_ISO=y
737CONFIG_USB_EHCI_ROOT_HUB_TT=y 760CONFIG_USB_EHCI_ROOT_HUB_TT=y
761# CONFIG_USB_EHCI_TT_NEWSCHED is not set
738# CONFIG_USB_ISP116X_HCD is not set 762# CONFIG_USB_ISP116X_HCD is not set
739CONFIG_USB_OHCI_HCD=y 763CONFIG_USB_OHCI_HCD=y
740# CONFIG_USB_OHCI_BIG_ENDIAN is not set 764# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -771,9 +795,7 @@ CONFIG_USB_HIDINPUT=y
771# CONFIG_USB_ACECAD is not set 795# CONFIG_USB_ACECAD is not set
772# CONFIG_USB_KBTAB is not set 796# CONFIG_USB_KBTAB is not set
773# CONFIG_USB_POWERMATE is not set 797# CONFIG_USB_POWERMATE is not set
774# CONFIG_USB_MTOUCH is not set 798# CONFIG_USB_TOUCHSCREEN is not set
775# CONFIG_USB_ITMTOUCH is not set
776# CONFIG_USB_EGALAX is not set
777# CONFIG_USB_YEALINK is not set 799# CONFIG_USB_YEALINK is not set
778# CONFIG_USB_XPAD is not set 800# CONFIG_USB_XPAD is not set
779# CONFIG_USB_ATI_REMOTE is not set 801# CONFIG_USB_ATI_REMOTE is not set
@@ -787,15 +809,6 @@ CONFIG_USB_HIDINPUT=y
787# CONFIG_USB_MDC800 is not set 809# CONFIG_USB_MDC800 is not set
788 810
789# 811#
790# USB Multimedia devices
791#
792# CONFIG_USB_DABUSB is not set
793
794#
795# Video4Linux support is needed for USB Multimedia device support
796#
797
798#
799# USB Network Adapters 812# USB Network Adapters
800# 813#
801# CONFIG_USB_CATC is not set 814# CONFIG_USB_CATC is not set
@@ -816,7 +829,7 @@ CONFIG_USB_SERIAL=y
816# CONFIG_USB_SERIAL_CONSOLE is not set 829# CONFIG_USB_SERIAL_CONSOLE is not set
817CONFIG_USB_SERIAL_GENERIC=y 830CONFIG_USB_SERIAL_GENERIC=y
818# CONFIG_USB_SERIAL_AIRPRIME is not set 831# CONFIG_USB_SERIAL_AIRPRIME is not set
819# CONFIG_USB_SERIAL_ANYDATA is not set 832# CONFIG_USB_SERIAL_ARK3116 is not set
820# CONFIG_USB_SERIAL_BELKIN is not set 833# CONFIG_USB_SERIAL_BELKIN is not set
821# CONFIG_USB_SERIAL_WHITEHEAT is not set 834# CONFIG_USB_SERIAL_WHITEHEAT is not set
822# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 835# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
@@ -824,6 +837,7 @@ CONFIG_USB_SERIAL_GENERIC=y
824CONFIG_USB_SERIAL_CYPRESS_M8=m 837CONFIG_USB_SERIAL_CYPRESS_M8=m
825# CONFIG_USB_SERIAL_EMPEG is not set 838# CONFIG_USB_SERIAL_EMPEG is not set
826# CONFIG_USB_SERIAL_FTDI_SIO is not set 839# CONFIG_USB_SERIAL_FTDI_SIO is not set
840# CONFIG_USB_SERIAL_FUNSOFT is not set
827# CONFIG_USB_SERIAL_VISOR is not set 841# CONFIG_USB_SERIAL_VISOR is not set
828# CONFIG_USB_SERIAL_IPAQ is not set 842# CONFIG_USB_SERIAL_IPAQ is not set
829# CONFIG_USB_SERIAL_IR is not set 843# CONFIG_USB_SERIAL_IR is not set
@@ -848,12 +862,15 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
848# CONFIG_USB_SERIAL_KLSI is not set 862# CONFIG_USB_SERIAL_KLSI is not set
849# CONFIG_USB_SERIAL_KOBIL_SCT is not set 863# CONFIG_USB_SERIAL_KOBIL_SCT is not set
850# CONFIG_USB_SERIAL_MCT_U232 is not set 864# CONFIG_USB_SERIAL_MCT_U232 is not set
865# CONFIG_USB_SERIAL_NAVMAN is not set
851# CONFIG_USB_SERIAL_PL2303 is not set 866# CONFIG_USB_SERIAL_PL2303 is not set
852# CONFIG_USB_SERIAL_HP4X is not set 867# CONFIG_USB_SERIAL_HP4X is not set
853# CONFIG_USB_SERIAL_SAFE is not set 868# CONFIG_USB_SERIAL_SAFE is not set
869# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
854CONFIG_USB_SERIAL_TI=m 870CONFIG_USB_SERIAL_TI=m
855# CONFIG_USB_SERIAL_CYBERJACK is not set 871# CONFIG_USB_SERIAL_CYBERJACK is not set
856# CONFIG_USB_SERIAL_XIRCOM is not set 872# CONFIG_USB_SERIAL_XIRCOM is not set
873# CONFIG_USB_SERIAL_OPTION is not set
857# CONFIG_USB_SERIAL_OMNINET is not set 874# CONFIG_USB_SERIAL_OMNINET is not set
858CONFIG_USB_EZUSB=y 875CONFIG_USB_EZUSB=y
859 876
@@ -867,10 +884,12 @@ CONFIG_USB_EZUSB=y
867# CONFIG_USB_LEGOTOWER is not set 884# CONFIG_USB_LEGOTOWER is not set
868# CONFIG_USB_LCD is not set 885# CONFIG_USB_LCD is not set
869# CONFIG_USB_LED is not set 886# CONFIG_USB_LED is not set
887# CONFIG_USB_CYPRESS_CY7C63 is not set
870# CONFIG_USB_CYTHERM is not set 888# CONFIG_USB_CYTHERM is not set
871# CONFIG_USB_PHIDGETKIT is not set 889# CONFIG_USB_PHIDGETKIT is not set
872# CONFIG_USB_PHIDGETSERVO is not set 890# CONFIG_USB_PHIDGETSERVO is not set
873# CONFIG_USB_IDMOUSE is not set 891# CONFIG_USB_IDMOUSE is not set
892# CONFIG_USB_APPLEDISPLAY is not set
874# CONFIG_USB_SISUSBVGA is not set 893# CONFIG_USB_SISUSBVGA is not set
875# CONFIG_USB_LD is not set 894# CONFIG_USB_LD is not set
876# CONFIG_USB_TEST is not set 895# CONFIG_USB_TEST is not set
@@ -890,6 +909,19 @@ CONFIG_USB_EZUSB=y
890# CONFIG_MMC is not set 909# CONFIG_MMC is not set
891 910
892# 911#
912# LED devices
913#
914# CONFIG_NEW_LEDS is not set
915
916#
917# LED drivers
918#
919
920#
921# LED Triggers
922#
923
924#
893# InfiniBand support 925# InfiniBand support
894# 926#
895# CONFIG_INFINIBAND is not set 927# CONFIG_INFINIBAND is not set
@@ -899,6 +931,24 @@ CONFIG_USB_EZUSB=y
899# 931#
900 932
901# 933#
934# Real Time Clock
935#
936# CONFIG_RTC_CLASS is not set
937
938#
939# DMA Engine support
940#
941# CONFIG_DMA_ENGINE is not set
942
943#
944# DMA Clients
945#
946
947#
948# DMA Devices
949#
950
951#
902# File systems 952# File systems
903# 953#
904CONFIG_EXT2_FS=y 954CONFIG_EXT2_FS=y
@@ -917,6 +967,7 @@ CONFIG_FS_POSIX_ACL=y
917# CONFIG_MINIX_FS is not set 967# CONFIG_MINIX_FS is not set
918# CONFIG_ROMFS_FS is not set 968# CONFIG_ROMFS_FS is not set
919CONFIG_INOTIFY=y 969CONFIG_INOTIFY=y
970CONFIG_INOTIFY_USER=y
920# CONFIG_QUOTA is not set 971# CONFIG_QUOTA is not set
921CONFIG_DNOTIFY=y 972CONFIG_DNOTIFY=y
922# CONFIG_AUTOFS_FS is not set 973# CONFIG_AUTOFS_FS is not set
@@ -949,7 +1000,6 @@ CONFIG_TMPFS=y
949CONFIG_HUGETLBFS=y 1000CONFIG_HUGETLBFS=y
950CONFIG_HUGETLB_PAGE=y 1001CONFIG_HUGETLB_PAGE=y
951CONFIG_RAMFS=y 1002CONFIG_RAMFS=y
952# CONFIG_RELAYFS_FS is not set
953# CONFIG_CONFIGFS_FS is not set 1003# CONFIG_CONFIGFS_FS is not set
954 1004
955# 1005#
@@ -1067,6 +1117,7 @@ CONFIG_CRC_CCITT=y
1067CONFIG_CRC32=y 1117CONFIG_CRC32=y
1068# CONFIG_LIBCRC32C is not set 1118# CONFIG_LIBCRC32C is not set
1069CONFIG_ZLIB_INFLATE=y 1119CONFIG_ZLIB_INFLATE=y
1120CONFIG_PLIST=y
1070 1121
1071# 1122#
1072# Instrumentation Support 1123# Instrumentation Support
@@ -1079,14 +1130,20 @@ CONFIG_ZLIB_INFLATE=y
1079# 1130#
1080# CONFIG_PRINTK_TIME is not set 1131# CONFIG_PRINTK_TIME is not set
1081CONFIG_MAGIC_SYSRQ=y 1132CONFIG_MAGIC_SYSRQ=y
1133# CONFIG_UNUSED_SYMBOLS is not set
1082CONFIG_DEBUG_KERNEL=y 1134CONFIG_DEBUG_KERNEL=y
1083CONFIG_LOG_BUF_SHIFT=17 1135CONFIG_LOG_BUF_SHIFT=17
1084CONFIG_DETECT_SOFTLOCKUP=y 1136CONFIG_DETECT_SOFTLOCKUP=y
1085# CONFIG_SCHEDSTATS is not set 1137# CONFIG_SCHEDSTATS is not set
1086CONFIG_DEBUG_SLAB=y 1138CONFIG_DEBUG_SLAB=y
1087# CONFIG_DEBUG_MUTEXES is not set 1139# CONFIG_DEBUG_SLAB_LEAK is not set
1140# CONFIG_DEBUG_RT_MUTEXES is not set
1141# CONFIG_RT_MUTEX_TESTER is not set
1088# CONFIG_DEBUG_SPINLOCK is not set 1142# CONFIG_DEBUG_SPINLOCK is not set
1143# CONFIG_DEBUG_MUTEXES is not set
1144# CONFIG_DEBUG_RWSEMS is not set
1089CONFIG_DEBUG_SPINLOCK_SLEEP=y 1145CONFIG_DEBUG_SPINLOCK_SLEEP=y
1146# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1090# CONFIG_DEBUG_KOBJECT is not set 1147# CONFIG_DEBUG_KOBJECT is not set
1091# CONFIG_DEBUG_INFO is not set 1148# CONFIG_DEBUG_INFO is not set
1092CONFIG_DEBUG_FS=y 1149CONFIG_DEBUG_FS=y
@@ -1100,11 +1157,7 @@ CONFIG_XMON=y
1100CONFIG_XMON_DEFAULT=y 1157CONFIG_XMON_DEFAULT=y
1101# CONFIG_IRQSTACKS is not set 1158# CONFIG_IRQSTACKS is not set
1102CONFIG_BOOTX_TEXT=y 1159CONFIG_BOOTX_TEXT=y
1103# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1160# CONFIG_PPC_EARLY_DEBUG is not set
1104# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1105# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1106# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1107# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1108 1161
1109# 1162#
1110# Security options 1163# Security options
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 15a50f4ceb1f..719fba4eb421 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc4 3# Linux kernel version: 2.6.18-rc6
4# Sat May 27 18:45:55 2006 4# Sun Sep 10 10:26:55 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_CLASSIC32=y
29# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
30# CONFIG_PPC_83xx is not set 32# CONFIG_PPC_83xx is not set
31# CONFIG_PPC_85xx is not set 33# CONFIG_PPC_85xx is not set
34# CONFIG_PPC_86xx is not set
32# CONFIG_40x is not set 35# CONFIG_40x is not set
33# CONFIG_44x is not set 36# CONFIG_44x is not set
34# CONFIG_8xx is not set 37# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_PPC_FPU=y
39CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
40CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
41# CONFIG_SMP is not set 44# CONFIG_SMP is not set
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42 46
43# 47#
44# Code maturity level options 48# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
58# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
59CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
60# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
61# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -70,10 +75,12 @@ CONFIG_PRINTK=y
70CONFIG_BUG=y 75CONFIG_BUG=y
71CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
72CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
78CONFIG_RT_MUTEXES=y
73CONFIG_FUTEX=y 79CONFIG_FUTEX=y
74CONFIG_EPOLL=y 80CONFIG_EPOLL=y
75CONFIG_SHMEM=y 81CONFIG_SHMEM=y
76CONFIG_SLAB=y 82CONFIG_SLAB=y
83CONFIG_VM_EVENT_COUNTERS=y
77# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
78CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
79# CONFIG_SLOB is not set 86# CONFIG_SLOB is not set
@@ -110,13 +117,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
110# CONFIG_PPC_ISERIES is not set 117# CONFIG_PPC_ISERIES is not set
111CONFIG_EMBEDDED6xx=y 118CONFIG_EMBEDDED6xx=y
112# CONFIG_APUS is not set 119# CONFIG_APUS is not set
113CONFIG_MPIC=y 120# CONFIG_PPC_CELL is not set
121# CONFIG_PPC_CELL_NATIVE is not set
122# CONFIG_UDBG_RTAS_CONSOLE is not set
114# CONFIG_PPC_RTAS is not set 123# CONFIG_PPC_RTAS is not set
115# CONFIG_MMIO_NVRAM is not set 124# CONFIG_MMIO_NVRAM is not set
116# CONFIG_PPC_MPC106 is not set 125# CONFIG_PPC_MPC106 is not set
117# CONFIG_PPC_970_NAP is not set 126# CONFIG_PPC_970_NAP is not set
118# CONFIG_CPU_FREQ is not set 127# CONFIG_CPU_FREQ is not set
119# CONFIG_TAU is not set 128# CONFIG_TAU is not set
129# CONFIG_PPC_TODC is not set
120# CONFIG_KATANA is not set 130# CONFIG_KATANA is not set
121# CONFIG_WILLOW is not set 131# CONFIG_WILLOW is not set
122# CONFIG_CPCI690 is not set 132# CONFIG_CPCI690 is not set
@@ -146,6 +156,7 @@ CONFIG_MPC7448HPC2=y
146# CONFIG_EV64360 is not set 156# CONFIG_EV64360 is not set
147CONFIG_TSI108_BRIDGE=y 157CONFIG_TSI108_BRIDGE=y
148# CONFIG_WANT_EARLY_SERIAL is not set 158# CONFIG_WANT_EARLY_SERIAL is not set
159CONFIG_MPIC=y
149 160
150# 161#
151# Kernel options 162# Kernel options
@@ -160,6 +171,7 @@ CONFIG_PREEMPT_NONE=y
160# CONFIG_PREEMPT is not set 171# CONFIG_PREEMPT is not set
161CONFIG_BINFMT_ELF=y 172CONFIG_BINFMT_ELF=y
162CONFIG_BINFMT_MISC=y 173CONFIG_BINFMT_MISC=y
174CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
163CONFIG_ARCH_FLATMEM_ENABLE=y 175CONFIG_ARCH_FLATMEM_ENABLE=y
164CONFIG_SELECT_MEMORY_MODEL=y 176CONFIG_SELECT_MEMORY_MODEL=y
165CONFIG_FLATMEM_MANUAL=y 177CONFIG_FLATMEM_MANUAL=y
@@ -169,10 +181,10 @@ CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 181CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 182# CONFIG_SPARSEMEM_STATIC is not set
171CONFIG_SPLIT_PTLOCK_CPUS=4 183CONFIG_SPLIT_PTLOCK_CPUS=4
184# CONFIG_RESOURCES_64BIT is not set
172CONFIG_PROC_DEVICETREE=y 185CONFIG_PROC_DEVICETREE=y
173# CONFIG_CMDLINE_BOOL is not set 186# CONFIG_CMDLINE_BOOL is not set
174# CONFIG_PM is not set 187# CONFIG_PM is not set
175# CONFIG_SOFTWARE_SUSPEND is not set
176# CONFIG_SECCOMP is not set 188# CONFIG_SECCOMP is not set
177CONFIG_ISA_DMA_API=y 189CONFIG_ISA_DMA_API=y
178 190
@@ -180,10 +192,12 @@ CONFIG_ISA_DMA_API=y
180# Bus options 192# Bus options
181# 193#
182CONFIG_GENERIC_ISA_DMA=y 194CONFIG_GENERIC_ISA_DMA=y
195CONFIG_MPIC_WEIRD=y
183# CONFIG_PPC_I8259 is not set 196# CONFIG_PPC_I8259 is not set
184# CONFIG_PPC_INDIRECT_PCI is not set 197# CONFIG_PPC_INDIRECT_PCI is not set
185CONFIG_PCI=y 198CONFIG_PCI=y
186CONFIG_PCI_DOMAINS=y 199CONFIG_PCI_DOMAINS=y
200# CONFIG_PCIEPORTBUS is not set
187 201
188# 202#
189# PCCARD (PCMCIA/CardBus) support 203# PCCARD (PCMCIA/CardBus) support
@@ -221,6 +235,8 @@ CONFIG_NET=y
221CONFIG_PACKET=y 235CONFIG_PACKET=y
222# CONFIG_PACKET_MMAP is not set 236# CONFIG_PACKET_MMAP is not set
223CONFIG_UNIX=y 237CONFIG_UNIX=y
238CONFIG_XFRM=y
239CONFIG_XFRM_USER=y
224# CONFIG_NET_KEY is not set 240# CONFIG_NET_KEY is not set
225CONFIG_INET=y 241CONFIG_INET=y
226CONFIG_IP_MULTICAST=y 242CONFIG_IP_MULTICAST=y
@@ -240,6 +256,8 @@ CONFIG_SYN_COOKIES=y
240# CONFIG_INET_IPCOMP is not set 256# CONFIG_INET_IPCOMP is not set
241# CONFIG_INET_XFRM_TUNNEL is not set 257# CONFIG_INET_XFRM_TUNNEL is not set
242# CONFIG_INET_TUNNEL is not set 258# CONFIG_INET_TUNNEL is not set
259CONFIG_INET_XFRM_MODE_TRANSPORT=y
260CONFIG_INET_XFRM_MODE_TUNNEL=y
243CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
244CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
245# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
@@ -247,6 +265,7 @@ CONFIG_TCP_CONG_BIC=y
247# CONFIG_IPV6 is not set 265# CONFIG_IPV6 is not set
248# CONFIG_INET6_XFRM_TUNNEL is not set 266# CONFIG_INET6_XFRM_TUNNEL is not set
249# CONFIG_INET6_TUNNEL is not set 267# CONFIG_INET6_TUNNEL is not set
268# CONFIG_NETWORK_SECMARK is not set
250# CONFIG_NETFILTER is not set 269# CONFIG_NETFILTER is not set
251 270
252# 271#
@@ -300,6 +319,7 @@ CONFIG_TCP_CONG_BIC=y
300CONFIG_STANDALONE=y 319CONFIG_STANDALONE=y
301CONFIG_PREVENT_FIRMWARE_BUILD=y 320CONFIG_PREVENT_FIRMWARE_BUILD=y
302# CONFIG_FW_LOADER is not set 321# CONFIG_FW_LOADER is not set
322# CONFIG_SYS_HYPERVISOR is not set
303 323
304# 324#
305# Connector - unified userspace <-> kernelspace linker 325# Connector - unified userspace <-> kernelspace linker
@@ -336,6 +356,7 @@ CONFIG_BLK_DEV_LOOP=y
336CONFIG_BLK_DEV_RAM=y 356CONFIG_BLK_DEV_RAM=y
337CONFIG_BLK_DEV_RAM_COUNT=16 357CONFIG_BLK_DEV_RAM_COUNT=16
338CONFIG_BLK_DEV_RAM_SIZE=131072 358CONFIG_BLK_DEV_RAM_SIZE=131072
359CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
339CONFIG_BLK_DEV_INITRD=y 360CONFIG_BLK_DEV_INITRD=y
340# CONFIG_CDROM_PKTCDVD is not set 361# CONFIG_CDROM_PKTCDVD is not set
341# CONFIG_ATA_OVER_ETH is not set 362# CONFIG_ATA_OVER_ETH is not set
@@ -399,6 +420,7 @@ CONFIG_SCSI_SATA=y
399CONFIG_SCSI_SATA_MV=y 420CONFIG_SCSI_SATA_MV=y
400# CONFIG_SCSI_SATA_NV is not set 421# CONFIG_SCSI_SATA_NV is not set
401# CONFIG_SCSI_PDC_ADMA is not set 422# CONFIG_SCSI_PDC_ADMA is not set
423# CONFIG_SCSI_HPTIOP is not set
402# CONFIG_SCSI_SATA_QSTOR is not set 424# CONFIG_SCSI_SATA_QSTOR is not set
403# CONFIG_SCSI_SATA_PROMISE is not set 425# CONFIG_SCSI_SATA_PROMISE is not set
404# CONFIG_SCSI_SATA_SX4 is not set 426# CONFIG_SCSI_SATA_SX4 is not set
@@ -481,6 +503,9 @@ CONFIG_PHYLIB=y
481# CONFIG_QSEMI_PHY is not set 503# CONFIG_QSEMI_PHY is not set
482# CONFIG_LXT_PHY is not set 504# CONFIG_LXT_PHY is not set
483# CONFIG_CICADA_PHY is not set 505# CONFIG_CICADA_PHY is not set
506# CONFIG_VITESSE_PHY is not set
507# CONFIG_SMSC_PHY is not set
508# CONFIG_FIXED_PHY is not set
484 509
485# 510#
486# Ethernet (10 or 100Mbit) 511# Ethernet (10 or 100Mbit)
@@ -538,7 +563,6 @@ CONFIG_8139TOO=y
538# CONFIG_VIA_VELOCITY is not set 563# CONFIG_VIA_VELOCITY is not set
539# CONFIG_TIGON3 is not set 564# CONFIG_TIGON3 is not set
540# CONFIG_BNX2 is not set 565# CONFIG_BNX2 is not set
541CONFIG_TSI108_ETH=y
542 566
543# 567#
544# Ethernet (10000 Mbit) 568# Ethernet (10000 Mbit)
@@ -546,6 +570,7 @@ CONFIG_TSI108_ETH=y
546# CONFIG_CHELSIO_T1 is not set 570# CONFIG_CHELSIO_T1 is not set
547# CONFIG_IXGB is not set 571# CONFIG_IXGB is not set
548# CONFIG_S2IO is not set 572# CONFIG_S2IO is not set
573# CONFIG_MYRI10GE is not set
549 574
550# 575#
551# Token Ring devices 576# Token Ring devices
@@ -645,6 +670,7 @@ CONFIG_LEGACY_PTY_COUNT=256
645# Watchdog Cards 670# Watchdog Cards
646# 671#
647# CONFIG_WATCHDOG is not set 672# CONFIG_WATCHDOG is not set
673# CONFIG_HW_RANDOM is not set
648# CONFIG_NVRAM is not set 674# CONFIG_NVRAM is not set
649CONFIG_GEN_RTC=y 675CONFIG_GEN_RTC=y
650# CONFIG_GEN_RTC_X is not set 676# CONFIG_GEN_RTC_X is not set
@@ -679,13 +705,13 @@ CONFIG_GEN_RTC=y
679# 705#
680# Dallas's 1-wire bus 706# Dallas's 1-wire bus
681# 707#
682# CONFIG_W1 is not set
683 708
684# 709#
685# Hardware Monitoring support 710# Hardware Monitoring support
686# 711#
687CONFIG_HWMON=y 712CONFIG_HWMON=y
688# CONFIG_HWMON_VID is not set 713# CONFIG_HWMON_VID is not set
714# CONFIG_SENSORS_ABITUGURU is not set
689# CONFIG_SENSORS_F71805F is not set 715# CONFIG_SENSORS_F71805F is not set
690# CONFIG_HWMON_DEBUG_CHIP is not set 716# CONFIG_HWMON_DEBUG_CHIP is not set
691 717
@@ -697,6 +723,7 @@ CONFIG_HWMON=y
697# Multimedia devices 723# Multimedia devices
698# 724#
699# CONFIG_VIDEO_DEV is not set 725# CONFIG_VIDEO_DEV is not set
726CONFIG_VIDEO_V4L2=y
700 727
701# 728#
702# Digital Video Broadcasting Devices 729# Digital Video Broadcasting Devices
@@ -706,7 +733,9 @@ CONFIG_HWMON=y
706# 733#
707# Graphics support 734# Graphics support
708# 735#
736CONFIG_FIRMWARE_EDID=y
709# CONFIG_FB is not set 737# CONFIG_FB is not set
738# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710 739
711# 740#
712# Sound 741# Sound
@@ -763,6 +792,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
763# CONFIG_RTC_CLASS is not set 792# CONFIG_RTC_CLASS is not set
764 793
765# 794#
795# DMA Engine support
796#
797# CONFIG_DMA_ENGINE is not set
798
799#
800# DMA Clients
801#
802
803#
804# DMA Devices
805#
806
807#
766# File systems 808# File systems
767# 809#
768CONFIG_EXT2_FS=y 810CONFIG_EXT2_FS=y
@@ -783,6 +825,7 @@ CONFIG_FS_MBCACHE=y
783# CONFIG_MINIX_FS is not set 825# CONFIG_MINIX_FS is not set
784# CONFIG_ROMFS_FS is not set 826# CONFIG_ROMFS_FS is not set
785CONFIG_INOTIFY=y 827CONFIG_INOTIFY=y
828CONFIG_INOTIFY_USER=y
786# CONFIG_QUOTA is not set 829# CONFIG_QUOTA is not set
787CONFIG_DNOTIFY=y 830CONFIG_DNOTIFY=y
788# CONFIG_AUTOFS_FS is not set 831# CONFIG_AUTOFS_FS is not set
@@ -884,6 +927,7 @@ CONFIG_MSDOS_PARTITION=y
884# CONFIG_CRC16 is not set 927# CONFIG_CRC16 is not set
885CONFIG_CRC32=y 928CONFIG_CRC32=y
886# CONFIG_LIBCRC32C is not set 929# CONFIG_LIBCRC32C is not set
930CONFIG_PLIST=y
887 931
888# 932#
889# Instrumentation Support 933# Instrumentation Support
@@ -895,17 +939,13 @@ CONFIG_CRC32=y
895# 939#
896# CONFIG_PRINTK_TIME is not set 940# CONFIG_PRINTK_TIME is not set
897# CONFIG_MAGIC_SYSRQ is not set 941# CONFIG_MAGIC_SYSRQ is not set
942# CONFIG_UNUSED_SYMBOLS is not set
898# CONFIG_DEBUG_KERNEL is not set 943# CONFIG_DEBUG_KERNEL is not set
899CONFIG_LOG_BUF_SHIFT=14 944CONFIG_LOG_BUF_SHIFT=14
900# CONFIG_DEBUG_FS is not set 945# CONFIG_DEBUG_FS is not set
901# CONFIG_UNWIND_INFO is not set 946# CONFIG_UNWIND_INFO is not set
902# CONFIG_BOOTX_TEXT is not set 947# CONFIG_BOOTX_TEXT is not set
903# CONFIG_SERIAL_TEXT_DEBUG is not set 948# CONFIG_PPC_EARLY_DEBUG is not set
904# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
905# CONFIG_PPC_EARLY_DEBUG_G5 is not set
906# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
907# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
908# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
909 949
910# 950#
911# Security options 951# Security options
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index fc2d9789adc8..8da6a47f0339 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_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.17 3# Linux kernel version: 2.6.18-rc6
4# Fri Jun 30 17:53:25 2006 4# Sun Sep 10 10:28:05 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -60,6 +60,7 @@ CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
61# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
63CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
64# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
65# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -78,6 +79,7 @@ CONFIG_FUTEX=y
78# CONFIG_EPOLL is not set 79# CONFIG_EPOLL is not set
79CONFIG_SHMEM=y 80CONFIG_SHMEM=y
80CONFIG_SLAB=y 81CONFIG_SLAB=y
82CONFIG_VM_EVENT_COUNTERS=y
81# CONFIG_TINY_SHMEM is not set 83# CONFIG_TINY_SHMEM is not set
82CONFIG_BASE_SMALL=0 84CONFIG_BASE_SMALL=0
83# CONFIG_SLOB is not set 85# CONFIG_SLOB is not set
@@ -120,6 +122,7 @@ CONFIG_PPC_GEN550=y
120# CONFIG_MPC834x_SYS is not set 122# CONFIG_MPC834x_SYS is not set
121CONFIG_MPC834x_ITX=y 123CONFIG_MPC834x_ITX=y
122CONFIG_MPC834x=y 124CONFIG_MPC834x=y
125# CONFIG_MPIC is not set
123 126
124# 127#
125# Kernel options 128# Kernel options
@@ -148,7 +151,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
148CONFIG_PROC_DEVICETREE=y 151CONFIG_PROC_DEVICETREE=y
149# CONFIG_CMDLINE_BOOL is not set 152# CONFIG_CMDLINE_BOOL is not set
150# CONFIG_PM is not set 153# CONFIG_PM is not set
151# CONFIG_SOFTWARE_SUSPEND is not set
152CONFIG_SECCOMP=y 154CONFIG_SECCOMP=y
153CONFIG_ISA_DMA_API=y 155CONFIG_ISA_DMA_API=y
154 156
@@ -156,6 +158,7 @@ CONFIG_ISA_DMA_API=y
156# Bus options 158# Bus options
157# 159#
158CONFIG_GENERIC_ISA_DMA=y 160CONFIG_GENERIC_ISA_DMA=y
161# CONFIG_MPIC_WEIRD is not set
159# CONFIG_PPC_I8259 is not set 162# CONFIG_PPC_I8259 is not set
160CONFIG_PPC_INDIRECT_PCI=y 163CONFIG_PPC_INDIRECT_PCI=y
161CONFIG_FSL_SOC=y 164CONFIG_FSL_SOC=y
@@ -401,6 +404,7 @@ CONFIG_BLK_DEV_LOOP=y
401CONFIG_BLK_DEV_RAM=y 404CONFIG_BLK_DEV_RAM=y
402CONFIG_BLK_DEV_RAM_COUNT=16 405CONFIG_BLK_DEV_RAM_COUNT=16
403CONFIG_BLK_DEV_RAM_SIZE=32768 406CONFIG_BLK_DEV_RAM_SIZE=32768
407CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
404CONFIG_BLK_DEV_INITRD=y 408CONFIG_BLK_DEV_INITRD=y
405# CONFIG_CDROM_PKTCDVD is not set 409# CONFIG_CDROM_PKTCDVD is not set
406# CONFIG_ATA_OVER_ETH is not set 410# CONFIG_ATA_OVER_ETH is not set
@@ -561,6 +565,7 @@ CONFIG_PHYLIB=y
561CONFIG_CICADA_PHY=y 565CONFIG_CICADA_PHY=y
562# CONFIG_VITESSE_PHY is not set 566# CONFIG_VITESSE_PHY is not set
563# CONFIG_SMSC_PHY is not set 567# CONFIG_SMSC_PHY is not set
568# CONFIG_FIXED_PHY is not set
564 569
565# 570#
566# Ethernet (10 or 100Mbit) 571# Ethernet (10 or 100Mbit)
@@ -905,6 +910,7 @@ CONFIG_VIDEO_V4L2=y
905# 910#
906CONFIG_FIRMWARE_EDID=y 911CONFIG_FIRMWARE_EDID=y
907# CONFIG_FB is not set 912# CONFIG_FB is not set
913# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
908 914
909# 915#
910# Sound 916# Sound
@@ -1025,7 +1031,7 @@ CONFIG_USB_MON=y
1025# CONFIG_USB_LEGOTOWER is not set 1031# CONFIG_USB_LEGOTOWER is not set
1026# CONFIG_USB_LCD is not set 1032# CONFIG_USB_LCD is not set
1027# CONFIG_USB_LED is not set 1033# CONFIG_USB_LED is not set
1028# CONFIG_USB_CY7C63 is not set 1034# CONFIG_USB_CYPRESS_CY7C63 is not set
1029# CONFIG_USB_CYTHERM is not set 1035# CONFIG_USB_CYTHERM is not set
1030# CONFIG_USB_PHIDGETKIT is not set 1036# CONFIG_USB_PHIDGETKIT is not set
1031# CONFIG_USB_PHIDGETSERVO is not set 1037# CONFIG_USB_PHIDGETSERVO is not set
@@ -1110,6 +1116,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1110# CONFIG_RTC_DRV_X1205 is not set 1116# CONFIG_RTC_DRV_X1205 is not set
1111CONFIG_RTC_DRV_DS1307=y 1117CONFIG_RTC_DRV_DS1307=y
1112# CONFIG_RTC_DRV_DS1553 is not set 1118# CONFIG_RTC_DRV_DS1553 is not set
1119# CONFIG_RTC_DRV_ISL1208 is not set
1113# CONFIG_RTC_DRV_DS1672 is not set 1120# CONFIG_RTC_DRV_DS1672 is not set
1114# CONFIG_RTC_DRV_DS1742 is not set 1121# CONFIG_RTC_DRV_DS1742 is not set
1115# CONFIG_RTC_DRV_PCF8563 is not set 1122# CONFIG_RTC_DRV_PCF8563 is not set
@@ -1226,7 +1233,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1226# CONFIG_RPCSEC_GSS_SPKM3 is not set 1233# CONFIG_RPCSEC_GSS_SPKM3 is not set
1227# CONFIG_SMB_FS is not set 1234# CONFIG_SMB_FS is not set
1228# CONFIG_CIFS is not set 1235# CONFIG_CIFS is not set
1229# CONFIG_CIFS_DEBUG2 is not set
1230# CONFIG_NCP_FS is not set 1236# CONFIG_NCP_FS is not set
1231# CONFIG_CODA_FS is not set 1237# CONFIG_CODA_FS is not set
1232# CONFIG_AFS_FS is not set 1238# CONFIG_AFS_FS is not set
@@ -1279,11 +1285,13 @@ CONFIG_LOG_BUF_SHIFT=17
1279CONFIG_DETECT_SOFTLOCKUP=y 1285CONFIG_DETECT_SOFTLOCKUP=y
1280# CONFIG_SCHEDSTATS is not set 1286# CONFIG_SCHEDSTATS is not set
1281# CONFIG_DEBUG_SLAB is not set 1287# CONFIG_DEBUG_SLAB is not set
1282# CONFIG_DEBUG_MUTEXES is not set
1283# CONFIG_DEBUG_RT_MUTEXES is not set 1288# CONFIG_DEBUG_RT_MUTEXES is not set
1284# CONFIG_RT_MUTEX_TESTER is not set 1289# CONFIG_RT_MUTEX_TESTER is not set
1285# CONFIG_DEBUG_SPINLOCK is not set 1290# CONFIG_DEBUG_SPINLOCK is not set
1291# CONFIG_DEBUG_MUTEXES is not set
1292# CONFIG_DEBUG_RWSEMS is not set
1286# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1293# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1294# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1287# CONFIG_DEBUG_KOBJECT is not set 1295# CONFIG_DEBUG_KOBJECT is not set
1288CONFIG_DEBUG_INFO=y 1296CONFIG_DEBUG_INFO=y
1289# CONFIG_DEBUG_FS is not set 1297# CONFIG_DEBUG_FS is not set
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 5078b0441d61..9eefab967898 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_defconfig
@@ -1,15 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc6 3# Linux kernel version: 2.6.18-rc6
4# Wed Mar 15 16:19:56 2006 4# Sun Sep 10 10:28:54 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_PPC=y 16CONFIG_PPC=y
14CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
15CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -27,17 +30,19 @@ CONFIG_DEFAULT_UIMAGE=y
27# CONFIG_PPC_52xx is not set 30# CONFIG_PPC_52xx is not set
28# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
29CONFIG_PPC_83xx=y 32CONFIG_PPC_83xx=y
33# CONFIG_PPC_85xx is not set
34# CONFIG_PPC_86xx is not set
30# CONFIG_40x is not set 35# CONFIG_40x is not set
31# CONFIG_44x is not set 36# CONFIG_44x is not set
32# CONFIG_8xx is not set 37# CONFIG_8xx is not set
33# CONFIG_E200 is not set 38# CONFIG_E200 is not set
34# CONFIG_E500 is not set
35CONFIG_6xx=y 39CONFIG_6xx=y
36CONFIG_83xx=y 40CONFIG_83xx=y
37CONFIG_PPC_FPU=y 41CONFIG_PPC_FPU=y
38CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
39CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
40# CONFIG_SMP is not set 44# CONFIG_SMP is not set
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
41 46
42# 47#
43# Code maturity level options 48# Code maturity level options
@@ -55,9 +60,11 @@ CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
56# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
57# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
58CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
59# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
60# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
67# CONFIG_RELAY is not set
61CONFIG_INITRAMFS_SOURCE="" 68CONFIG_INITRAMFS_SOURCE=""
62# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
63CONFIG_EMBEDDED=y 70CONFIG_EMBEDDED=y
@@ -67,14 +74,12 @@ CONFIG_PRINTK=y
67CONFIG_BUG=y 74CONFIG_BUG=y
68CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
69CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
77CONFIG_RT_MUTEXES=y
70CONFIG_FUTEX=y 78CONFIG_FUTEX=y
71# CONFIG_EPOLL is not set 79# CONFIG_EPOLL is not set
72CONFIG_SHMEM=y 80CONFIG_SHMEM=y
73CONFIG_CC_ALIGN_FUNCTIONS=0
74CONFIG_CC_ALIGN_LABELS=0
75CONFIG_CC_ALIGN_LOOPS=0
76CONFIG_CC_ALIGN_JUMPS=0
77CONFIG_SLAB=y 81CONFIG_SLAB=y
82CONFIG_VM_EVENT_COUNTERS=y
78# CONFIG_TINY_SHMEM is not set 83# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 84CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set 85# CONFIG_SLOB is not set
@@ -85,7 +90,6 @@ CONFIG_BASE_SMALL=0
85CONFIG_MODULES=y 90CONFIG_MODULES=y
86CONFIG_MODULE_UNLOAD=y 91CONFIG_MODULE_UNLOAD=y
87# CONFIG_MODULE_FORCE_UNLOAD is not set 92# CONFIG_MODULE_FORCE_UNLOAD is not set
88CONFIG_OBSOLETE_MODPARM=y
89# CONFIG_MODVERSIONS is not set 93# CONFIG_MODVERSIONS is not set
90# CONFIG_MODULE_SRCVERSION_ALL is not set 94# CONFIG_MODULE_SRCVERSION_ALL is not set
91# CONFIG_KMOD is not set 95# CONFIG_KMOD is not set
@@ -94,6 +98,8 @@ CONFIG_OBSOLETE_MODPARM=y
94# Block layer 98# Block layer
95# 99#
96# CONFIG_LBD is not set 100# CONFIG_LBD is not set
101# CONFIG_BLK_DEV_IO_TRACE is not set
102# CONFIG_LSF is not set
97 103
98# 104#
99# IO Schedulers 105# IO Schedulers
@@ -114,7 +120,9 @@ CONFIG_PPC_GEN550=y
114# Platform support 120# Platform support
115# 121#
116CONFIG_MPC834x_SYS=y 122CONFIG_MPC834x_SYS=y
123# CONFIG_MPC834x_ITX is not set
117CONFIG_MPC834x=y 124CONFIG_MPC834x=y
125# CONFIG_MPIC is not set
118 126
119# 127#
120# Kernel options 128# Kernel options
@@ -129,6 +137,7 @@ CONFIG_PREEMPT_NONE=y
129# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
130CONFIG_BINFMT_ELF=y 138CONFIG_BINFMT_ELF=y
131# CONFIG_BINFMT_MISC is not set 139# CONFIG_BINFMT_MISC is not set
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
132CONFIG_ARCH_FLATMEM_ENABLE=y 141CONFIG_ARCH_FLATMEM_ENABLE=y
133CONFIG_SELECT_MEMORY_MODEL=y 142CONFIG_SELECT_MEMORY_MODEL=y
134CONFIG_FLATMEM_MANUAL=y 143CONFIG_FLATMEM_MANUAL=y
@@ -138,10 +147,10 @@ CONFIG_FLATMEM=y
138CONFIG_FLAT_NODE_MEM_MAP=y 147CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 149CONFIG_SPLIT_PTLOCK_CPUS=4
150# CONFIG_RESOURCES_64BIT is not set
141CONFIG_PROC_DEVICETREE=y 151CONFIG_PROC_DEVICETREE=y
142# CONFIG_CMDLINE_BOOL is not set 152# CONFIG_CMDLINE_BOOL is not set
143# CONFIG_PM is not set 153# CONFIG_PM is not set
144# CONFIG_SOFTWARE_SUSPEND is not set
145CONFIG_SECCOMP=y 154CONFIG_SECCOMP=y
146CONFIG_ISA_DMA_API=y 155CONFIG_ISA_DMA_API=y
147 156
@@ -149,12 +158,13 @@ CONFIG_ISA_DMA_API=y
149# Bus options 158# Bus options
150# 159#
151CONFIG_GENERIC_ISA_DMA=y 160CONFIG_GENERIC_ISA_DMA=y
161# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set 162# CONFIG_PPC_I8259 is not set
153CONFIG_PPC_INDIRECT_PCI=y 163CONFIG_PPC_INDIRECT_PCI=y
154CONFIG_FSL_SOC=y 164CONFIG_FSL_SOC=y
155CONFIG_PCI=y 165CONFIG_PCI=y
156CONFIG_PCI_DOMAINS=y 166CONFIG_PCI_DOMAINS=y
157# CONFIG_PCI_LEGACY_PROC is not set 167# CONFIG_PCIEPORTBUS is not set
158 168
159# 169#
160# PCCARD (PCMCIA/CardBus) support 170# PCCARD (PCMCIA/CardBus) support
@@ -192,6 +202,8 @@ CONFIG_NET=y
192CONFIG_PACKET=y 202CONFIG_PACKET=y
193# CONFIG_PACKET_MMAP is not set 203# CONFIG_PACKET_MMAP is not set
194CONFIG_UNIX=y 204CONFIG_UNIX=y
205CONFIG_XFRM=y
206CONFIG_XFRM_USER=m
195# CONFIG_NET_KEY is not set 207# CONFIG_NET_KEY is not set
196CONFIG_INET=y 208CONFIG_INET=y
197CONFIG_IP_MULTICAST=y 209CONFIG_IP_MULTICAST=y
@@ -209,12 +221,18 @@ CONFIG_SYN_COOKIES=y
209# CONFIG_INET_AH is not set 221# CONFIG_INET_AH is not set
210# CONFIG_INET_ESP is not set 222# CONFIG_INET_ESP is not set
211# CONFIG_INET_IPCOMP is not set 223# CONFIG_INET_IPCOMP is not set
224# CONFIG_INET_XFRM_TUNNEL is not set
212# CONFIG_INET_TUNNEL is not set 225# CONFIG_INET_TUNNEL is not set
226CONFIG_INET_XFRM_MODE_TRANSPORT=y
227CONFIG_INET_XFRM_MODE_TUNNEL=y
213CONFIG_INET_DIAG=y 228CONFIG_INET_DIAG=y
214CONFIG_INET_TCP_DIAG=y 229CONFIG_INET_TCP_DIAG=y
215# CONFIG_TCP_CONG_ADVANCED is not set 230# CONFIG_TCP_CONG_ADVANCED is not set
216CONFIG_TCP_CONG_BIC=y 231CONFIG_TCP_CONG_BIC=y
217# CONFIG_IPV6 is not set 232# CONFIG_IPV6 is not set
233# CONFIG_INET6_XFRM_TUNNEL is not set
234# CONFIG_INET6_TUNNEL is not set
235# CONFIG_NETWORK_SECMARK is not set
218# CONFIG_NETFILTER is not set 236# CONFIG_NETFILTER is not set
219 237
220# 238#
@@ -268,6 +286,7 @@ CONFIG_TCP_CONG_BIC=y
268CONFIG_STANDALONE=y 286CONFIG_STANDALONE=y
269CONFIG_PREVENT_FIRMWARE_BUILD=y 287CONFIG_PREVENT_FIRMWARE_BUILD=y
270# CONFIG_FW_LOADER is not set 288# CONFIG_FW_LOADER is not set
289# CONFIG_SYS_HYPERVISOR is not set
271 290
272# 291#
273# Connector - unified userspace <-> kernelspace linker 292# Connector - unified userspace <-> kernelspace linker
@@ -304,6 +323,7 @@ CONFIG_BLK_DEV_LOOP=y
304CONFIG_BLK_DEV_RAM=y 323CONFIG_BLK_DEV_RAM=y
305CONFIG_BLK_DEV_RAM_COUNT=16 324CONFIG_BLK_DEV_RAM_COUNT=16
306CONFIG_BLK_DEV_RAM_SIZE=32768 325CONFIG_BLK_DEV_RAM_SIZE=32768
326CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
307CONFIG_BLK_DEV_INITRD=y 327CONFIG_BLK_DEV_INITRD=y
308# CONFIG_CDROM_PKTCDVD is not set 328# CONFIG_CDROM_PKTCDVD is not set
309# CONFIG_ATA_OVER_ETH is not set 329# CONFIG_ATA_OVER_ETH is not set
@@ -371,6 +391,9 @@ CONFIG_MARVELL_PHY=y
371# CONFIG_QSEMI_PHY is not set 391# CONFIG_QSEMI_PHY is not set
372# CONFIG_LXT_PHY is not set 392# CONFIG_LXT_PHY is not set
373# CONFIG_CICADA_PHY is not set 393# CONFIG_CICADA_PHY is not set
394# CONFIG_VITESSE_PHY is not set
395# CONFIG_SMSC_PHY is not set
396# CONFIG_FIXED_PHY is not set
374 397
375# 398#
376# Ethernet (10 or 100Mbit) 399# Ethernet (10 or 100Mbit)
@@ -433,6 +456,7 @@ CONFIG_GIANFAR=y
433# CONFIG_CHELSIO_T1 is not set 456# CONFIG_CHELSIO_T1 is not set
434# CONFIG_IXGB is not set 457# CONFIG_IXGB is not set
435# CONFIG_S2IO is not set 458# CONFIG_S2IO is not set
459# CONFIG_MYRI10GE is not set
436 460
437# 461#
438# Token Ring devices 462# Token Ring devices
@@ -507,6 +531,7 @@ CONFIG_INPUT=y
507# 531#
508CONFIG_SERIAL_8250=y 532CONFIG_SERIAL_8250=y
509CONFIG_SERIAL_8250_CONSOLE=y 533CONFIG_SERIAL_8250_CONSOLE=y
534CONFIG_SERIAL_8250_PCI=y
510CONFIG_SERIAL_8250_NR_UARTS=4 535CONFIG_SERIAL_8250_NR_UARTS=4
511CONFIG_SERIAL_8250_RUNTIME_UARTS=4 536CONFIG_SERIAL_8250_RUNTIME_UARTS=4
512# CONFIG_SERIAL_8250_EXTENDED is not set 537# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -543,6 +568,7 @@ CONFIG_83xx_WDT=y
543# 568#
544# CONFIG_PCIPCWATCHDOG is not set 569# CONFIG_PCIPCWATCHDOG is not set
545# CONFIG_WDTPCI is not set 570# CONFIG_WDTPCI is not set
571# CONFIG_HW_RANDOM is not set
546# CONFIG_NVRAM is not set 572# CONFIG_NVRAM is not set
547CONFIG_GEN_RTC=y 573CONFIG_GEN_RTC=y
548# CONFIG_GEN_RTC_X is not set 574# CONFIG_GEN_RTC_X is not set
@@ -589,10 +615,10 @@ CONFIG_I2C_CHARDEV=y
589# CONFIG_I2C_PIIX4 is not set 615# CONFIG_I2C_PIIX4 is not set
590CONFIG_I2C_MPC=y 616CONFIG_I2C_MPC=y
591# CONFIG_I2C_NFORCE2 is not set 617# CONFIG_I2C_NFORCE2 is not set
618# CONFIG_I2C_OCORES is not set
592# CONFIG_I2C_PARPORT_LIGHT is not set 619# CONFIG_I2C_PARPORT_LIGHT is not set
593# CONFIG_I2C_PROSAVAGE is not set 620# CONFIG_I2C_PROSAVAGE is not set
594# CONFIG_I2C_SAVAGE4 is not set 621# CONFIG_I2C_SAVAGE4 is not set
595# CONFIG_SCx200_ACB is not set
596# CONFIG_I2C_SIS5595 is not set 622# CONFIG_I2C_SIS5595 is not set
597# CONFIG_I2C_SIS630 is not set 623# CONFIG_I2C_SIS630 is not set
598# CONFIG_I2C_SIS96X is not set 624# CONFIG_I2C_SIS96X is not set
@@ -611,10 +637,8 @@ CONFIG_I2C_MPC=y
611# CONFIG_SENSORS_PCF8574 is not set 637# CONFIG_SENSORS_PCF8574 is not set
612# CONFIG_SENSORS_PCA9539 is not set 638# CONFIG_SENSORS_PCA9539 is not set
613# CONFIG_SENSORS_PCF8591 is not set 639# CONFIG_SENSORS_PCF8591 is not set
614# CONFIG_SENSORS_RTC8564 is not set
615# CONFIG_SENSORS_M41T00 is not set 640# CONFIG_SENSORS_M41T00 is not set
616# CONFIG_SENSORS_MAX6875 is not set 641# CONFIG_SENSORS_MAX6875 is not set
617# CONFIG_RTC_X1205_I2C is not set
618# CONFIG_I2C_DEBUG_CORE is not set 642# CONFIG_I2C_DEBUG_CORE is not set
619# CONFIG_I2C_DEBUG_ALGO is not set 643# CONFIG_I2C_DEBUG_ALGO is not set
620# CONFIG_I2C_DEBUG_BUS is not set 644# CONFIG_I2C_DEBUG_BUS is not set
@@ -629,13 +653,13 @@ CONFIG_I2C_MPC=y
629# 653#
630# Dallas's 1-wire bus 654# Dallas's 1-wire bus
631# 655#
632# CONFIG_W1 is not set
633 656
634# 657#
635# Hardware Monitoring support 658# Hardware Monitoring support
636# 659#
637CONFIG_HWMON=y 660CONFIG_HWMON=y
638# CONFIG_HWMON_VID is not set 661# CONFIG_HWMON_VID is not set
662# CONFIG_SENSORS_ABITUGURU is not set
639# CONFIG_SENSORS_ADM1021 is not set 663# CONFIG_SENSORS_ADM1021 is not set
640# CONFIG_SENSORS_ADM1025 is not set 664# CONFIG_SENSORS_ADM1025 is not set
641# CONFIG_SENSORS_ADM1026 is not set 665# CONFIG_SENSORS_ADM1026 is not set
@@ -664,10 +688,12 @@ CONFIG_HWMON=y
664# CONFIG_SENSORS_PC87360 is not set 688# CONFIG_SENSORS_PC87360 is not set
665# CONFIG_SENSORS_SIS5595 is not set 689# CONFIG_SENSORS_SIS5595 is not set
666# CONFIG_SENSORS_SMSC47M1 is not set 690# CONFIG_SENSORS_SMSC47M1 is not set
691# CONFIG_SENSORS_SMSC47M192 is not set
667# CONFIG_SENSORS_SMSC47B397 is not set 692# CONFIG_SENSORS_SMSC47B397 is not set
668# CONFIG_SENSORS_VIA686A is not set 693# CONFIG_SENSORS_VIA686A is not set
669# CONFIG_SENSORS_VT8231 is not set 694# CONFIG_SENSORS_VT8231 is not set
670# CONFIG_SENSORS_W83781D is not set 695# CONFIG_SENSORS_W83781D is not set
696# CONFIG_SENSORS_W83791D is not set
671# CONFIG_SENSORS_W83792D is not set 697# CONFIG_SENSORS_W83792D is not set
672# CONFIG_SENSORS_W83L785TS is not set 698# CONFIG_SENSORS_W83L785TS is not set
673# CONFIG_SENSORS_W83627HF is not set 699# CONFIG_SENSORS_W83627HF is not set
@@ -679,13 +705,10 @@ CONFIG_HWMON=y
679# 705#
680 706
681# 707#
682# Multimedia Capabilities Port drivers
683#
684
685#
686# Multimedia devices 708# Multimedia devices
687# 709#
688# CONFIG_VIDEO_DEV is not set 710# CONFIG_VIDEO_DEV is not set
711CONFIG_VIDEO_V4L2=y
689 712
690# 713#
691# Digital Video Broadcasting Devices 714# Digital Video Broadcasting Devices
@@ -695,7 +718,9 @@ CONFIG_HWMON=y
695# 718#
696# Graphics support 719# Graphics support
697# 720#
721CONFIG_FIRMWARE_EDID=y
698# CONFIG_FB is not set 722# CONFIG_FB is not set
723# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
699 724
700# 725#
701# Sound 726# Sound
@@ -707,6 +732,7 @@ CONFIG_HWMON=y
707# 732#
708CONFIG_USB_ARCH_HAS_HCD=y 733CONFIG_USB_ARCH_HAS_HCD=y
709CONFIG_USB_ARCH_HAS_OHCI=y 734CONFIG_USB_ARCH_HAS_OHCI=y
735CONFIG_USB_ARCH_HAS_EHCI=y
710# CONFIG_USB is not set 736# CONFIG_USB is not set
711 737
712# 738#
@@ -724,6 +750,19 @@ CONFIG_USB_ARCH_HAS_OHCI=y
724# CONFIG_MMC is not set 750# CONFIG_MMC is not set
725 751
726# 752#
753# LED devices
754#
755# CONFIG_NEW_LEDS is not set
756
757#
758# LED drivers
759#
760
761#
762# LED Triggers
763#
764
765#
727# InfiniBand support 766# InfiniBand support
728# 767#
729# CONFIG_INFINIBAND is not set 768# CONFIG_INFINIBAND is not set
@@ -733,6 +772,24 @@ CONFIG_USB_ARCH_HAS_OHCI=y
733# 772#
734 773
735# 774#
775# Real Time Clock
776#
777# CONFIG_RTC_CLASS is not set
778
779#
780# DMA Engine support
781#
782# CONFIG_DMA_ENGINE is not set
783
784#
785# DMA Clients
786#
787
788#
789# DMA Devices
790#
791
792#
736# File systems 793# File systems
737# 794#
738CONFIG_EXT2_FS=y 795CONFIG_EXT2_FS=y
@@ -753,6 +810,7 @@ CONFIG_FS_MBCACHE=y
753# CONFIG_MINIX_FS is not set 810# CONFIG_MINIX_FS is not set
754# CONFIG_ROMFS_FS is not set 811# CONFIG_ROMFS_FS is not set
755CONFIG_INOTIFY=y 812CONFIG_INOTIFY=y
813CONFIG_INOTIFY_USER=y
756# CONFIG_QUOTA is not set 814# CONFIG_QUOTA is not set
757CONFIG_DNOTIFY=y 815CONFIG_DNOTIFY=y
758# CONFIG_AUTOFS_FS is not set 816# CONFIG_AUTOFS_FS is not set
@@ -781,7 +839,6 @@ CONFIG_SYSFS=y
781CONFIG_TMPFS=y 839CONFIG_TMPFS=y
782# CONFIG_HUGETLB_PAGE is not set 840# CONFIG_HUGETLB_PAGE is not set
783CONFIG_RAMFS=y 841CONFIG_RAMFS=y
784# CONFIG_RELAYFS_FS is not set
785# CONFIG_CONFIGFS_FS is not set 842# CONFIG_CONFIGFS_FS is not set
786 843
787# 844#
@@ -854,6 +911,7 @@ CONFIG_PARTITION_ADVANCED=y
854# CONFIG_CRC16 is not set 911# CONFIG_CRC16 is not set
855CONFIG_CRC32=y 912CONFIG_CRC32=y
856# CONFIG_LIBCRC32C is not set 913# CONFIG_LIBCRC32C is not set
914CONFIG_PLIST=y
857 915
858# 916#
859# Instrumentation Support 917# Instrumentation Support
@@ -865,15 +923,13 @@ CONFIG_CRC32=y
865# 923#
866# CONFIG_PRINTK_TIME is not set 924# CONFIG_PRINTK_TIME is not set
867# CONFIG_MAGIC_SYSRQ is not set 925# CONFIG_MAGIC_SYSRQ is not set
926# CONFIG_UNUSED_SYMBOLS is not set
868# CONFIG_DEBUG_KERNEL is not set 927# CONFIG_DEBUG_KERNEL is not set
869CONFIG_LOG_BUF_SHIFT=14 928CONFIG_LOG_BUF_SHIFT=14
929# CONFIG_DEBUG_FS is not set
870# CONFIG_BOOTX_TEXT is not set 930# CONFIG_BOOTX_TEXT is not set
871# CONFIG_SERIAL_TEXT_DEBUG is not set 931# CONFIG_SERIAL_TEXT_DEBUG is not set
872# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 932# CONFIG_PPC_EARLY_DEBUG is not set
873# CONFIG_PPC_EARLY_DEBUG_G5 is not set
874# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
875# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
876# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
877 933
878# 934#
879# Security options 935# Security options
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 7f0780f1aa39..67e7d0b5793d 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16 3# Linux kernel version: 2.6.18-rc6
4# Mon Mar 27 23:37:36 2006 4# Sun Sep 10 10:29:23 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_DEFAULT_UIMAGE=y
29# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
30# CONFIG_PPC_83xx is not set 32# CONFIG_PPC_83xx is not set
31CONFIG_PPC_85xx=y 33CONFIG_PPC_85xx=y
34# CONFIG_PPC_86xx is not set
32# CONFIG_40x is not set 35# CONFIG_40x is not set
33# CONFIG_44x is not set 36# CONFIG_44x is not set
34# CONFIG_8xx is not set 37# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_BOOKE=y
39CONFIG_FSL_BOOKE=y 42CONFIG_FSL_BOOKE=y
40# CONFIG_PHYS_64BIT is not set 43# CONFIG_PHYS_64BIT is not set
41CONFIG_SPE=y 44CONFIG_SPE=y
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42 46
43# 47#
44# Code maturity level options 48# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
58# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
59CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
60# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
61# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -71,10 +76,12 @@ CONFIG_PRINTK=y
71CONFIG_BUG=y 76CONFIG_BUG=y
72CONFIG_ELF_CORE=y 77CONFIG_ELF_CORE=y
73CONFIG_BASE_FULL=y 78CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
74CONFIG_FUTEX=y 80CONFIG_FUTEX=y
75CONFIG_EPOLL=y 81CONFIG_EPOLL=y
76CONFIG_SHMEM=y 82CONFIG_SHMEM=y
77CONFIG_SLAB=y 83CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y
78# CONFIG_TINY_SHMEM is not set 85# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 86CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set 87# CONFIG_SLOB is not set
@@ -103,15 +110,16 @@ CONFIG_DEFAULT_AS=y
103# CONFIG_DEFAULT_CFQ is not set 110# CONFIG_DEFAULT_CFQ is not set
104# CONFIG_DEFAULT_NOOP is not set 111# CONFIG_DEFAULT_NOOP is not set
105CONFIG_DEFAULT_IOSCHED="anticipatory" 112CONFIG_DEFAULT_IOSCHED="anticipatory"
106CONFIG_MPIC=y
107# CONFIG_WANT_EARLY_SERIAL is not set 113# CONFIG_WANT_EARLY_SERIAL is not set
108 114
109# 115#
110# Platform support 116# Platform support
111# 117#
112CONFIG_MPC8540_ADS=y 118CONFIG_MPC8540_ADS=y
119# CONFIG_MPC85xx_CDS is not set
113CONFIG_MPC8540=y 120CONFIG_MPC8540=y
114CONFIG_PPC_INDIRECT_PCI_BE=y 121CONFIG_PPC_INDIRECT_PCI_BE=y
122CONFIG_MPIC=y
115 123
116# 124#
117# Kernel options 125# Kernel options
@@ -127,6 +135,7 @@ CONFIG_PREEMPT_NONE=y
127CONFIG_BINFMT_ELF=y 135CONFIG_BINFMT_ELF=y
128CONFIG_BINFMT_MISC=y 136CONFIG_BINFMT_MISC=y
129CONFIG_MATH_EMULATION=y 137CONFIG_MATH_EMULATION=y
138CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
130CONFIG_ARCH_FLATMEM_ENABLE=y 139CONFIG_ARCH_FLATMEM_ENABLE=y
131CONFIG_SELECT_MEMORY_MODEL=y 140CONFIG_SELECT_MEMORY_MODEL=y
132CONFIG_FLATMEM_MANUAL=y 141CONFIG_FLATMEM_MANUAL=y
@@ -136,16 +145,17 @@ CONFIG_FLATMEM=y
136CONFIG_FLAT_NODE_MEM_MAP=y 145CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set
139CONFIG_PROC_DEVICETREE=y 149CONFIG_PROC_DEVICETREE=y
140# CONFIG_CMDLINE_BOOL is not set 150# CONFIG_CMDLINE_BOOL is not set
141# CONFIG_PM is not set 151# CONFIG_PM is not set
142# CONFIG_SOFTWARE_SUSPEND is not set
143# CONFIG_SECCOMP is not set 152# CONFIG_SECCOMP is not set
144CONFIG_ISA_DMA_API=y 153CONFIG_ISA_DMA_API=y
145 154
146# 155#
147# Bus options 156# Bus options
148# 157#
158# CONFIG_MPIC_WEIRD is not set
149# CONFIG_PPC_I8259 is not set 159# CONFIG_PPC_I8259 is not set
150CONFIG_PPC_INDIRECT_PCI=y 160CONFIG_PPC_INDIRECT_PCI=y
151CONFIG_FSL_SOC=y 161CONFIG_FSL_SOC=y
@@ -187,6 +197,8 @@ CONFIG_NET=y
187CONFIG_PACKET=y 197CONFIG_PACKET=y
188# CONFIG_PACKET_MMAP is not set 198# CONFIG_PACKET_MMAP is not set
189CONFIG_UNIX=y 199CONFIG_UNIX=y
200CONFIG_XFRM=y
201CONFIG_XFRM_USER=y
190# CONFIG_NET_KEY is not set 202# CONFIG_NET_KEY is not set
191CONFIG_INET=y 203CONFIG_INET=y
192CONFIG_IP_MULTICAST=y 204CONFIG_IP_MULTICAST=y
@@ -204,12 +216,18 @@ CONFIG_SYN_COOKIES=y
204# CONFIG_INET_AH is not set 216# CONFIG_INET_AH is not set
205# CONFIG_INET_ESP is not set 217# CONFIG_INET_ESP is not set
206# CONFIG_INET_IPCOMP is not set 218# CONFIG_INET_IPCOMP is not set
219# CONFIG_INET_XFRM_TUNNEL is not set
207# CONFIG_INET_TUNNEL is not set 220# CONFIG_INET_TUNNEL is not set
221CONFIG_INET_XFRM_MODE_TRANSPORT=y
222CONFIG_INET_XFRM_MODE_TUNNEL=y
208CONFIG_INET_DIAG=y 223CONFIG_INET_DIAG=y
209CONFIG_INET_TCP_DIAG=y 224CONFIG_INET_TCP_DIAG=y
210# CONFIG_TCP_CONG_ADVANCED is not set 225# CONFIG_TCP_CONG_ADVANCED is not set
211CONFIG_TCP_CONG_BIC=y 226CONFIG_TCP_CONG_BIC=y
212# CONFIG_IPV6 is not set 227# CONFIG_IPV6 is not set
228# CONFIG_INET6_XFRM_TUNNEL is not set
229# CONFIG_INET6_TUNNEL is not set
230# CONFIG_NETWORK_SECMARK is not set
213# CONFIG_NETFILTER is not set 231# CONFIG_NETFILTER is not set
214 232
215# 233#
@@ -264,6 +282,7 @@ CONFIG_STANDALONE=y
264CONFIG_PREVENT_FIRMWARE_BUILD=y 282CONFIG_PREVENT_FIRMWARE_BUILD=y
265# CONFIG_FW_LOADER is not set 283# CONFIG_FW_LOADER is not set
266# CONFIG_DEBUG_DRIVER is not set 284# CONFIG_DEBUG_DRIVER is not set
285# CONFIG_SYS_HYPERVISOR is not set
267 286
268# 287#
269# Connector - unified userspace <-> kernelspace linker 288# Connector - unified userspace <-> kernelspace linker
@@ -295,6 +314,7 @@ CONFIG_BLK_DEV_LOOP=y
295CONFIG_BLK_DEV_RAM=y 314CONFIG_BLK_DEV_RAM=y
296CONFIG_BLK_DEV_RAM_COUNT=16 315CONFIG_BLK_DEV_RAM_COUNT=16
297CONFIG_BLK_DEV_RAM_SIZE=32768 316CONFIG_BLK_DEV_RAM_SIZE=32768
317CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
298CONFIG_BLK_DEV_INITRD=y 318CONFIG_BLK_DEV_INITRD=y
299# CONFIG_CDROM_PKTCDVD is not set 319# CONFIG_CDROM_PKTCDVD is not set
300# CONFIG_ATA_OVER_ETH is not set 320# CONFIG_ATA_OVER_ETH is not set
@@ -355,6 +375,9 @@ CONFIG_PHYLIB=y
355# CONFIG_QSEMI_PHY is not set 375# CONFIG_QSEMI_PHY is not set
356# CONFIG_LXT_PHY is not set 376# CONFIG_LXT_PHY is not set
357# CONFIG_CICADA_PHY is not set 377# CONFIG_CICADA_PHY is not set
378# CONFIG_VITESSE_PHY is not set
379# CONFIG_SMSC_PHY is not set
380# CONFIG_FIXED_PHY is not set
358 381
359# 382#
360# Ethernet (10 or 100Mbit) 383# Ethernet (10 or 100Mbit)
@@ -464,6 +487,7 @@ CONFIG_LEGACY_PTY_COUNT=256
464# Watchdog Cards 487# Watchdog Cards
465# 488#
466# CONFIG_WATCHDOG is not set 489# CONFIG_WATCHDOG is not set
490# CONFIG_HW_RANDOM is not set
467# CONFIG_NVRAM is not set 491# CONFIG_NVRAM is not set
468CONFIG_GEN_RTC=y 492CONFIG_GEN_RTC=y
469# CONFIG_GEN_RTC_X is not set 493# CONFIG_GEN_RTC_X is not set
@@ -473,7 +497,6 @@ CONFIG_GEN_RTC=y
473# 497#
474# Ftape, the floppy tape device driver 498# Ftape, the floppy tape device driver
475# 499#
476# CONFIG_AGP is not set
477# CONFIG_RAW_DRIVER is not set 500# CONFIG_RAW_DRIVER is not set
478 501
479# 502#
@@ -496,13 +519,13 @@ CONFIG_GEN_RTC=y
496# 519#
497# Dallas's 1-wire bus 520# Dallas's 1-wire bus
498# 521#
499# CONFIG_W1 is not set
500 522
501# 523#
502# Hardware Monitoring support 524# Hardware Monitoring support
503# 525#
504CONFIG_HWMON=y 526CONFIG_HWMON=y
505# CONFIG_HWMON_VID is not set 527# CONFIG_HWMON_VID is not set
528# CONFIG_SENSORS_ABITUGURU is not set
506# CONFIG_SENSORS_F71805F is not set 529# CONFIG_SENSORS_F71805F is not set
507# CONFIG_HWMON_DEBUG_CHIP is not set 530# CONFIG_HWMON_DEBUG_CHIP is not set
508 531
@@ -514,6 +537,7 @@ CONFIG_HWMON=y
514# Multimedia devices 537# Multimedia devices
515# 538#
516# CONFIG_VIDEO_DEV is not set 539# CONFIG_VIDEO_DEV is not set
540CONFIG_VIDEO_V4L2=y
517 541
518# 542#
519# Digital Video Broadcasting Devices 543# Digital Video Broadcasting Devices
@@ -523,7 +547,9 @@ CONFIG_HWMON=y
523# 547#
524# Graphics support 548# Graphics support
525# 549#
550CONFIG_FIRMWARE_EDID=y
526# CONFIG_FB is not set 551# CONFIG_FB is not set
552# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
527 553
528# 554#
529# Sound 555# Sound
@@ -552,6 +578,19 @@ CONFIG_HWMON=y
552# CONFIG_MMC is not set 578# CONFIG_MMC is not set
553 579
554# 580#
581# LED devices
582#
583# CONFIG_NEW_LEDS is not set
584
585#
586# LED drivers
587#
588
589#
590# LED Triggers
591#
592
593#
555# InfiniBand support 594# InfiniBand support
556# 595#
557 596
@@ -560,6 +599,24 @@ CONFIG_HWMON=y
560# 599#
561 600
562# 601#
602# Real Time Clock
603#
604# CONFIG_RTC_CLASS is not set
605
606#
607# DMA Engine support
608#
609# CONFIG_DMA_ENGINE is not set
610
611#
612# DMA Clients
613#
614
615#
616# DMA Devices
617#
618
619#
563# File systems 620# File systems
564# 621#
565CONFIG_EXT2_FS=y 622CONFIG_EXT2_FS=y
@@ -580,6 +637,7 @@ CONFIG_FS_MBCACHE=y
580# CONFIG_MINIX_FS is not set 637# CONFIG_MINIX_FS is not set
581# CONFIG_ROMFS_FS is not set 638# CONFIG_ROMFS_FS is not set
582CONFIG_INOTIFY=y 639CONFIG_INOTIFY=y
640CONFIG_INOTIFY_USER=y
583# CONFIG_QUOTA is not set 641# CONFIG_QUOTA is not set
584CONFIG_DNOTIFY=y 642CONFIG_DNOTIFY=y
585# CONFIG_AUTOFS_FS is not set 643# CONFIG_AUTOFS_FS is not set
@@ -677,6 +735,7 @@ CONFIG_PARTITION_ADVANCED=y
677# CONFIG_CRC16 is not set 735# CONFIG_CRC16 is not set
678CONFIG_CRC32=y 736CONFIG_CRC32=y
679# CONFIG_LIBCRC32C is not set 737# CONFIG_LIBCRC32C is not set
738CONFIG_PLIST=y
680 739
681# 740#
682# Instrumentation Support 741# Instrumentation Support
@@ -688,14 +747,19 @@ CONFIG_CRC32=y
688# 747#
689# CONFIG_PRINTK_TIME is not set 748# CONFIG_PRINTK_TIME is not set
690# CONFIG_MAGIC_SYSRQ is not set 749# CONFIG_MAGIC_SYSRQ is not set
750# CONFIG_UNUSED_SYMBOLS is not set
691CONFIG_DEBUG_KERNEL=y 751CONFIG_DEBUG_KERNEL=y
692CONFIG_LOG_BUF_SHIFT=14 752CONFIG_LOG_BUF_SHIFT=14
693CONFIG_DETECT_SOFTLOCKUP=y 753CONFIG_DETECT_SOFTLOCKUP=y
694# CONFIG_SCHEDSTATS is not set 754# CONFIG_SCHEDSTATS is not set
695# CONFIG_DEBUG_SLAB is not set 755# CONFIG_DEBUG_SLAB is not set
696CONFIG_DEBUG_MUTEXES=y 756# CONFIG_DEBUG_RT_MUTEXES is not set
757# CONFIG_RT_MUTEX_TESTER is not set
697# CONFIG_DEBUG_SPINLOCK is not set 758# CONFIG_DEBUG_SPINLOCK is not set
759CONFIG_DEBUG_MUTEXES=y
760# CONFIG_DEBUG_RWSEMS is not set
698# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 761# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
762# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
699# CONFIG_DEBUG_KOBJECT is not set 763# CONFIG_DEBUG_KOBJECT is not set
700# CONFIG_DEBUG_INFO is not set 764# CONFIG_DEBUG_INFO is not set
701# CONFIG_DEBUG_FS is not set 765# CONFIG_DEBUG_FS is not set
@@ -706,11 +770,7 @@ CONFIG_FORCED_INLINING=y
706# CONFIG_DEBUGGER is not set 770# CONFIG_DEBUGGER is not set
707# CONFIG_BDI_SWITCH is not set 771# CONFIG_BDI_SWITCH is not set
708# CONFIG_BOOTX_TEXT is not set 772# CONFIG_BOOTX_TEXT is not set
709# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 773# CONFIG_PPC_EARLY_DEBUG is not set
710# CONFIG_PPC_EARLY_DEBUG_G5 is not set
711# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
712# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
713# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
714 774
715# 775#
716# Security options 776# Security options
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index 9bb022a523fe..72edf9f66829 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16 3# Linux kernel version: 2.6.18-rc6
4# Sun Apr 2 11:23:42 2006 4# Sun Sep 10 10:29:49 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -19,7 +21,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
19CONFIG_PPC_OF=y 21CONFIG_PPC_OF=y
20CONFIG_PPC_UDBG_16550=y 22CONFIG_PPC_UDBG_16550=y
21# CONFIG_GENERIC_TBSYNC is not set 23# CONFIG_GENERIC_TBSYNC is not set
22# CONFIG_DEFAULT_UIMAGE is not set 24CONFIG_DEFAULT_UIMAGE=y
23 25
24# 26#
25# Processor support 27# Processor support
@@ -29,6 +31,7 @@ CONFIG_PPC_UDBG_16550=y
29# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
30# CONFIG_PPC_83xx is not set 32# CONFIG_PPC_83xx is not set
31CONFIG_PPC_85xx=y 33CONFIG_PPC_85xx=y
34# CONFIG_PPC_86xx is not set
32# CONFIG_40x is not set 35# CONFIG_40x is not set
33# CONFIG_44x is not set 36# CONFIG_44x is not set
34# CONFIG_8xx is not set 37# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_BOOKE=y
39CONFIG_FSL_BOOKE=y 42CONFIG_FSL_BOOKE=y
40# CONFIG_PHYS_64BIT is not set 43# CONFIG_PHYS_64BIT is not set
41CONFIG_SPE=y 44CONFIG_SPE=y
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42 46
43# 47#
44# Code maturity level options 48# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
58# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
59CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
60# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
61# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -71,10 +76,12 @@ CONFIG_PRINTK=y
71CONFIG_BUG=y 76CONFIG_BUG=y
72CONFIG_ELF_CORE=y 77CONFIG_ELF_CORE=y
73CONFIG_BASE_FULL=y 78CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
74CONFIG_FUTEX=y 80CONFIG_FUTEX=y
75CONFIG_EPOLL=y 81CONFIG_EPOLL=y
76CONFIG_SHMEM=y 82CONFIG_SHMEM=y
77CONFIG_SLAB=y 83CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y
78# CONFIG_TINY_SHMEM is not set 85# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 86CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set 87# CONFIG_SLOB is not set
@@ -103,7 +110,6 @@ CONFIG_DEFAULT_AS=y
103# CONFIG_DEFAULT_CFQ is not set 110# CONFIG_DEFAULT_CFQ is not set
104# CONFIG_DEFAULT_NOOP is not set 111# CONFIG_DEFAULT_NOOP is not set
105CONFIG_DEFAULT_IOSCHED="anticipatory" 112CONFIG_DEFAULT_IOSCHED="anticipatory"
106CONFIG_MPIC=y
107# CONFIG_WANT_EARLY_SERIAL is not set 113# CONFIG_WANT_EARLY_SERIAL is not set
108 114
109# 115#
@@ -113,6 +119,7 @@ CONFIG_MPIC=y
113CONFIG_MPC85xx_CDS=y 119CONFIG_MPC85xx_CDS=y
114CONFIG_MPC8540=y 120CONFIG_MPC8540=y
115CONFIG_PPC_INDIRECT_PCI_BE=y 121CONFIG_PPC_INDIRECT_PCI_BE=y
122CONFIG_MPIC=y
116 123
117# 124#
118# Kernel options 125# Kernel options
@@ -128,6 +135,7 @@ CONFIG_PREEMPT_NONE=y
128CONFIG_BINFMT_ELF=y 135CONFIG_BINFMT_ELF=y
129CONFIG_BINFMT_MISC=y 136CONFIG_BINFMT_MISC=y
130CONFIG_MATH_EMULATION=y 137CONFIG_MATH_EMULATION=y
138CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
131CONFIG_ARCH_FLATMEM_ENABLE=y 139CONFIG_ARCH_FLATMEM_ENABLE=y
132CONFIG_SELECT_MEMORY_MODEL=y 140CONFIG_SELECT_MEMORY_MODEL=y
133CONFIG_FLATMEM_MANUAL=y 141CONFIG_FLATMEM_MANUAL=y
@@ -137,21 +145,23 @@ CONFIG_FLATMEM=y
137CONFIG_FLAT_NODE_MEM_MAP=y 145CONFIG_FLAT_NODE_MEM_MAP=y
138# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
139CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set
140CONFIG_PROC_DEVICETREE=y 149CONFIG_PROC_DEVICETREE=y
141# CONFIG_CMDLINE_BOOL is not set 150# CONFIG_CMDLINE_BOOL is not set
142# CONFIG_PM is not set 151# CONFIG_PM is not set
143# CONFIG_SOFTWARE_SUSPEND is not set
144# CONFIG_SECCOMP is not set 152# CONFIG_SECCOMP is not set
145CONFIG_ISA_DMA_API=y 153CONFIG_ISA_DMA_API=y
146 154
147# 155#
148# Bus options 156# Bus options
149# 157#
150CONFIG_PPC_I8259=y 158# CONFIG_MPIC_WEIRD is not set
159# CONFIG_PPC_I8259 is not set
151CONFIG_PPC_INDIRECT_PCI=y 160CONFIG_PPC_INDIRECT_PCI=y
152CONFIG_FSL_SOC=y 161CONFIG_FSL_SOC=y
153CONFIG_PCI=y 162CONFIG_PCI=y
154CONFIG_PCI_DOMAINS=y 163CONFIG_PCI_DOMAINS=y
164# CONFIG_PCIEPORTBUS is not set
155# CONFIG_PCI_DEBUG is not set 165# CONFIG_PCI_DEBUG is not set
156 166
157# 167#
@@ -190,6 +200,8 @@ CONFIG_NET=y
190CONFIG_PACKET=y 200CONFIG_PACKET=y
191# CONFIG_PACKET_MMAP is not set 201# CONFIG_PACKET_MMAP is not set
192CONFIG_UNIX=y 202CONFIG_UNIX=y
203CONFIG_XFRM=y
204CONFIG_XFRM_USER=y
193# CONFIG_NET_KEY is not set 205# CONFIG_NET_KEY is not set
194CONFIG_INET=y 206CONFIG_INET=y
195CONFIG_IP_MULTICAST=y 207CONFIG_IP_MULTICAST=y
@@ -209,6 +221,8 @@ CONFIG_SYN_COOKIES=y
209# CONFIG_INET_IPCOMP is not set 221# CONFIG_INET_IPCOMP is not set
210# CONFIG_INET_XFRM_TUNNEL is not set 222# CONFIG_INET_XFRM_TUNNEL is not set
211# CONFIG_INET_TUNNEL is not set 223# CONFIG_INET_TUNNEL is not set
224CONFIG_INET_XFRM_MODE_TRANSPORT=y
225CONFIG_INET_XFRM_MODE_TUNNEL=y
212CONFIG_INET_DIAG=y 226CONFIG_INET_DIAG=y
213CONFIG_INET_TCP_DIAG=y 227CONFIG_INET_TCP_DIAG=y
214# CONFIG_TCP_CONG_ADVANCED is not set 228# CONFIG_TCP_CONG_ADVANCED is not set
@@ -216,6 +230,7 @@ CONFIG_TCP_CONG_BIC=y
216# CONFIG_IPV6 is not set 230# CONFIG_IPV6 is not set
217# CONFIG_INET6_XFRM_TUNNEL is not set 231# CONFIG_INET6_XFRM_TUNNEL is not set
218# CONFIG_INET6_TUNNEL is not set 232# CONFIG_INET6_TUNNEL is not set
233# CONFIG_NETWORK_SECMARK is not set
219# CONFIG_NETFILTER is not set 234# CONFIG_NETFILTER is not set
220 235
221# 236#
@@ -270,6 +285,7 @@ CONFIG_STANDALONE=y
270CONFIG_PREVENT_FIRMWARE_BUILD=y 285CONFIG_PREVENT_FIRMWARE_BUILD=y
271# CONFIG_FW_LOADER is not set 286# CONFIG_FW_LOADER is not set
272# CONFIG_DEBUG_DRIVER is not set 287# CONFIG_DEBUG_DRIVER is not set
288# CONFIG_SYS_HYPERVISOR is not set
273 289
274# 290#
275# Connector - unified userspace <-> kernelspace linker 291# Connector - unified userspace <-> kernelspace linker
@@ -306,6 +322,7 @@ CONFIG_BLK_DEV_LOOP=y
306CONFIG_BLK_DEV_RAM=y 322CONFIG_BLK_DEV_RAM=y
307CONFIG_BLK_DEV_RAM_COUNT=16 323CONFIG_BLK_DEV_RAM_COUNT=16
308CONFIG_BLK_DEV_RAM_SIZE=32768 324CONFIG_BLK_DEV_RAM_SIZE=32768
325CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
309CONFIG_BLK_DEV_INITRD=y 326CONFIG_BLK_DEV_INITRD=y
310# CONFIG_CDROM_PKTCDVD is not set 327# CONFIG_CDROM_PKTCDVD is not set
311# CONFIG_ATA_OVER_ETH is not set 328# CONFIG_ATA_OVER_ETH is not set
@@ -425,6 +442,9 @@ CONFIG_PHYLIB=y
425# CONFIG_QSEMI_PHY is not set 442# CONFIG_QSEMI_PHY is not set
426# CONFIG_LXT_PHY is not set 443# CONFIG_LXT_PHY is not set
427# CONFIG_CICADA_PHY is not set 444# CONFIG_CICADA_PHY is not set
445# CONFIG_VITESSE_PHY is not set
446# CONFIG_SMSC_PHY is not set
447# CONFIG_FIXED_PHY is not set
428 448
429# 449#
430# Ethernet (10 or 100Mbit) 450# Ethernet (10 or 100Mbit)
@@ -470,6 +490,7 @@ CONFIG_GFAR_NAPI=y
470# CONFIG_CHELSIO_T1 is not set 490# CONFIG_CHELSIO_T1 is not set
471# CONFIG_IXGB is not set 491# CONFIG_IXGB is not set
472# CONFIG_S2IO is not set 492# CONFIG_S2IO is not set
493# CONFIG_MYRI10GE is not set
473 494
474# 495#
475# Token Ring devices 496# Token Ring devices
@@ -568,6 +589,7 @@ CONFIG_LEGACY_PTY_COUNT=256
568# Watchdog Cards 589# Watchdog Cards
569# 590#
570# CONFIG_WATCHDOG is not set 591# CONFIG_WATCHDOG is not set
592# CONFIG_HW_RANDOM is not set
571# CONFIG_NVRAM is not set 593# CONFIG_NVRAM is not set
572CONFIG_GEN_RTC=y 594CONFIG_GEN_RTC=y
573# CONFIG_GEN_RTC_X is not set 595# CONFIG_GEN_RTC_X is not set
@@ -602,13 +624,13 @@ CONFIG_GEN_RTC=y
602# 624#
603# Dallas's 1-wire bus 625# Dallas's 1-wire bus
604# 626#
605# CONFIG_W1 is not set
606 627
607# 628#
608# Hardware Monitoring support 629# Hardware Monitoring support
609# 630#
610CONFIG_HWMON=y 631CONFIG_HWMON=y
611# CONFIG_HWMON_VID is not set 632# CONFIG_HWMON_VID is not set
633# CONFIG_SENSORS_ABITUGURU is not set
612# CONFIG_SENSORS_F71805F is not set 634# CONFIG_SENSORS_F71805F is not set
613# CONFIG_HWMON_DEBUG_CHIP is not set 635# CONFIG_HWMON_DEBUG_CHIP is not set
614 636
@@ -620,6 +642,7 @@ CONFIG_HWMON=y
620# Multimedia devices 642# Multimedia devices
621# 643#
622# CONFIG_VIDEO_DEV is not set 644# CONFIG_VIDEO_DEV is not set
645CONFIG_VIDEO_V4L2=y
623 646
624# 647#
625# Digital Video Broadcasting Devices 648# Digital Video Broadcasting Devices
@@ -629,7 +652,9 @@ CONFIG_HWMON=y
629# 652#
630# Graphics support 653# Graphics support
631# 654#
655CONFIG_FIRMWARE_EDID=y
632# CONFIG_FB is not set 656# CONFIG_FB is not set
657# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
633 658
634# 659#
635# Sound 660# Sound
@@ -664,6 +689,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
664# CONFIG_NEW_LEDS is not set 689# CONFIG_NEW_LEDS is not set
665 690
666# 691#
692# LED drivers
693#
694
695#
696# LED Triggers
697#
698
699#
667# InfiniBand support 700# InfiniBand support
668# 701#
669# CONFIG_INFINIBAND is not set 702# CONFIG_INFINIBAND is not set
@@ -678,6 +711,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
678# CONFIG_RTC_CLASS is not set 711# CONFIG_RTC_CLASS is not set
679 712
680# 713#
714# DMA Engine support
715#
716# CONFIG_DMA_ENGINE is not set
717
718#
719# DMA Clients
720#
721
722#
723# DMA Devices
724#
725
726#
681# File systems 727# File systems
682# 728#
683CONFIG_EXT2_FS=y 729CONFIG_EXT2_FS=y
@@ -698,6 +744,7 @@ CONFIG_FS_MBCACHE=y
698# CONFIG_MINIX_FS is not set 744# CONFIG_MINIX_FS is not set
699# CONFIG_ROMFS_FS is not set 745# CONFIG_ROMFS_FS is not set
700CONFIG_INOTIFY=y 746CONFIG_INOTIFY=y
747CONFIG_INOTIFY_USER=y
701# CONFIG_QUOTA is not set 748# CONFIG_QUOTA is not set
702CONFIG_DNOTIFY=y 749CONFIG_DNOTIFY=y
703# CONFIG_AUTOFS_FS is not set 750# CONFIG_AUTOFS_FS is not set
@@ -795,6 +842,7 @@ CONFIG_PARTITION_ADVANCED=y
795# CONFIG_CRC16 is not set 842# CONFIG_CRC16 is not set
796CONFIG_CRC32=y 843CONFIG_CRC32=y
797# CONFIG_LIBCRC32C is not set 844# CONFIG_LIBCRC32C is not set
845CONFIG_PLIST=y
798 846
799# 847#
800# Instrumentation Support 848# Instrumentation Support
@@ -806,14 +854,19 @@ CONFIG_CRC32=y
806# 854#
807# CONFIG_PRINTK_TIME is not set 855# CONFIG_PRINTK_TIME is not set
808# CONFIG_MAGIC_SYSRQ is not set 856# CONFIG_MAGIC_SYSRQ is not set
857# CONFIG_UNUSED_SYMBOLS is not set
809CONFIG_DEBUG_KERNEL=y 858CONFIG_DEBUG_KERNEL=y
810CONFIG_LOG_BUF_SHIFT=14 859CONFIG_LOG_BUF_SHIFT=14
811CONFIG_DETECT_SOFTLOCKUP=y 860CONFIG_DETECT_SOFTLOCKUP=y
812# CONFIG_SCHEDSTATS is not set 861# CONFIG_SCHEDSTATS is not set
813# CONFIG_DEBUG_SLAB is not set 862# CONFIG_DEBUG_SLAB is not set
814CONFIG_DEBUG_MUTEXES=y 863# CONFIG_DEBUG_RT_MUTEXES is not set
864# CONFIG_RT_MUTEX_TESTER is not set
815# CONFIG_DEBUG_SPINLOCK is not set 865# CONFIG_DEBUG_SPINLOCK is not set
866CONFIG_DEBUG_MUTEXES=y
867# CONFIG_DEBUG_RWSEMS is not set
816# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 868# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
869# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
817# CONFIG_DEBUG_KOBJECT is not set 870# CONFIG_DEBUG_KOBJECT is not set
818# CONFIG_DEBUG_INFO is not set 871# CONFIG_DEBUG_INFO is not set
819# CONFIG_DEBUG_FS is not set 872# CONFIG_DEBUG_FS is not set
@@ -824,11 +877,7 @@ CONFIG_FORCED_INLINING=y
824# CONFIG_DEBUGGER is not set 877# CONFIG_DEBUGGER is not set
825# CONFIG_BDI_SWITCH is not set 878# CONFIG_BDI_SWITCH is not set
826# CONFIG_BOOTX_TEXT is not set 879# CONFIG_BOOTX_TEXT is not set
827# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 880# CONFIG_PPC_EARLY_DEBUG is not set
828# CONFIG_PPC_EARLY_DEBUG_G5 is not set
829# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
830# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
831# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
832 881
833# 882#
834# Security options 883# Security options
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index d7a30f9bc535..92a527fccf83 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc3 3# Linux kernel version: 2.6.18-rc6
4# Fri Jun 16 10:47:09 2006 4# Sun Sep 10 10:30:15 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -41,6 +43,7 @@ CONFIG_PPC_STD_MMU=y
41CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
42CONFIG_SMP=y 44CONFIG_SMP=y
43CONFIG_NR_CPUS=2 45CONFIG_NR_CPUS=2
46CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
44 47
45# 48#
46# Code maturity level options 49# Code maturity level options
@@ -58,6 +61,7 @@ CONFIG_LOCALVERSION=""
58# CONFIG_SYSVIPC is not set 61# CONFIG_SYSVIPC is not set
59# CONFIG_POSIX_MQUEUE is not set 62# CONFIG_POSIX_MQUEUE is not set
60# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set
61CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
62# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
63CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
@@ -75,10 +79,12 @@ CONFIG_PRINTK=y
75CONFIG_BUG=y 79CONFIG_BUG=y
76# CONFIG_ELF_CORE is not set 80# CONFIG_ELF_CORE is not set
77CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
82CONFIG_RT_MUTEXES=y
78CONFIG_FUTEX=y 83CONFIG_FUTEX=y
79CONFIG_EPOLL=y 84CONFIG_EPOLL=y
80CONFIG_SHMEM=y 85CONFIG_SHMEM=y
81# CONFIG_SLAB is not set 86# CONFIG_SLAB is not set
87CONFIG_VM_EVENT_COUNTERS=y
82# CONFIG_TINY_SHMEM is not set 88# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 89CONFIG_BASE_SMALL=0
84CONFIG_SLOB=y 90CONFIG_SLOB=y
@@ -107,9 +113,9 @@ CONFIG_DEFAULT_DEADLINE=y
107# CONFIG_DEFAULT_CFQ is not set 113# CONFIG_DEFAULT_CFQ is not set
108# CONFIG_DEFAULT_NOOP is not set 114# CONFIG_DEFAULT_NOOP is not set
109CONFIG_DEFAULT_IOSCHED="deadline" 115CONFIG_DEFAULT_IOSCHED="deadline"
110CONFIG_MPIC=y
111# CONFIG_WANT_EARLY_SERIAL is not set 116# CONFIG_WANT_EARLY_SERIAL is not set
112CONFIG_PPC_INDIRECT_PCI_BE=y 117CONFIG_PPC_INDIRECT_PCI_BE=y
118CONFIG_MPIC=y
113 119
114# 120#
115# Platform Support 121# Platform Support
@@ -131,6 +137,7 @@ CONFIG_PREEMPT_NONE=y
131CONFIG_PREEMPT_BKL=y 137CONFIG_PREEMPT_BKL=y
132CONFIG_BINFMT_ELF=y 138CONFIG_BINFMT_ELF=y
133# CONFIG_BINFMT_MISC is not set 139# CONFIG_BINFMT_MISC is not set
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
134# CONFIG_IRQ_ALL_CPUS is not set 141# CONFIG_IRQ_ALL_CPUS is not set
135CONFIG_ARCH_FLATMEM_ENABLE=y 142CONFIG_ARCH_FLATMEM_ENABLE=y
136CONFIG_SELECT_MEMORY_MODEL=y 143CONFIG_SELECT_MEMORY_MODEL=y
@@ -141,6 +148,7 @@ CONFIG_FLATMEM=y
141CONFIG_FLAT_NODE_MEM_MAP=y 148CONFIG_FLAT_NODE_MEM_MAP=y
142# CONFIG_SPARSEMEM_STATIC is not set 149# CONFIG_SPARSEMEM_STATIC is not set
143CONFIG_SPLIT_PTLOCK_CPUS=4 150CONFIG_SPLIT_PTLOCK_CPUS=4
151# CONFIG_RESOURCES_64BIT is not set
144CONFIG_PROC_DEVICETREE=y 152CONFIG_PROC_DEVICETREE=y
145# CONFIG_CMDLINE_BOOL is not set 153# CONFIG_CMDLINE_BOOL is not set
146# CONFIG_PM is not set 154# CONFIG_PM is not set
@@ -151,11 +159,13 @@ CONFIG_ISA_DMA_API=y
151# Bus options 159# Bus options
152# 160#
153CONFIG_GENERIC_ISA_DMA=y 161CONFIG_GENERIC_ISA_DMA=y
162# CONFIG_MPIC_WEIRD is not set
154CONFIG_PPC_I8259=y 163CONFIG_PPC_I8259=y
155CONFIG_PPC_INDIRECT_PCI=y 164CONFIG_PPC_INDIRECT_PCI=y
156CONFIG_FSL_SOC=y 165CONFIG_FSL_SOC=y
157CONFIG_PCI=y 166CONFIG_PCI=y
158CONFIG_PCI_DOMAINS=y 167CONFIG_PCI_DOMAINS=y
168# CONFIG_PCIEPORTBUS is not set
159# CONFIG_PCI_DEBUG is not set 169# CONFIG_PCI_DEBUG is not set
160 170
161# 171#
@@ -194,6 +204,8 @@ CONFIG_NET=y
194CONFIG_PACKET=y 204CONFIG_PACKET=y
195# CONFIG_PACKET_MMAP is not set 205# CONFIG_PACKET_MMAP is not set
196CONFIG_UNIX=y 206CONFIG_UNIX=y
207CONFIG_XFRM=y
208CONFIG_XFRM_USER=y
197# CONFIG_NET_KEY is not set 209# CONFIG_NET_KEY is not set
198CONFIG_INET=y 210CONFIG_INET=y
199# CONFIG_IP_MULTICAST is not set 211# CONFIG_IP_MULTICAST is not set
@@ -212,6 +224,8 @@ CONFIG_IP_PNP_RARP=y
212# CONFIG_INET_IPCOMP is not set 224# CONFIG_INET_IPCOMP is not set
213# CONFIG_INET_XFRM_TUNNEL is not set 225# CONFIG_INET_XFRM_TUNNEL is not set
214# CONFIG_INET_TUNNEL is not set 226# CONFIG_INET_TUNNEL is not set
227CONFIG_INET_XFRM_MODE_TRANSPORT=y
228CONFIG_INET_XFRM_MODE_TUNNEL=y
215CONFIG_INET_DIAG=y 229CONFIG_INET_DIAG=y
216CONFIG_INET_TCP_DIAG=y 230CONFIG_INET_TCP_DIAG=y
217# CONFIG_TCP_CONG_ADVANCED is not set 231# CONFIG_TCP_CONG_ADVANCED is not set
@@ -224,7 +238,10 @@ CONFIG_IPV6=y
224# CONFIG_INET6_IPCOMP is not set 238# CONFIG_INET6_IPCOMP is not set
225# CONFIG_INET6_XFRM_TUNNEL is not set 239# CONFIG_INET6_XFRM_TUNNEL is not set
226# CONFIG_INET6_TUNNEL is not set 240# CONFIG_INET6_TUNNEL is not set
241CONFIG_INET6_XFRM_MODE_TRANSPORT=y
242CONFIG_INET6_XFRM_MODE_TUNNEL=y
227# CONFIG_IPV6_TUNNEL is not set 243# CONFIG_IPV6_TUNNEL is not set
244# CONFIG_NETWORK_SECMARK is not set
228# CONFIG_NETFILTER is not set 245# CONFIG_NETFILTER is not set
229 246
230# 247#
@@ -279,6 +296,7 @@ CONFIG_STANDALONE=y
279CONFIG_PREVENT_FIRMWARE_BUILD=y 296CONFIG_PREVENT_FIRMWARE_BUILD=y
280CONFIG_FW_LOADER=y 297CONFIG_FW_LOADER=y
281# CONFIG_DEBUG_DRIVER is not set 298# CONFIG_DEBUG_DRIVER is not set
299# CONFIG_SYS_HYPERVISOR is not set
282 300
283# 301#
284# Connector - unified userspace <-> kernelspace linker 302# Connector - unified userspace <-> kernelspace linker
@@ -315,6 +333,7 @@ CONFIG_BLK_DEV_LOOP=y
315CONFIG_BLK_DEV_RAM=y 333CONFIG_BLK_DEV_RAM=y
316CONFIG_BLK_DEV_RAM_COUNT=16 334CONFIG_BLK_DEV_RAM_COUNT=16
317CONFIG_BLK_DEV_RAM_SIZE=131072 335CONFIG_BLK_DEV_RAM_SIZE=131072
336CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
318CONFIG_BLK_DEV_INITRD=y 337CONFIG_BLK_DEV_INITRD=y
319# CONFIG_CDROM_PKTCDVD is not set 338# CONFIG_CDROM_PKTCDVD is not set
320# CONFIG_ATA_OVER_ETH is not set 339# CONFIG_ATA_OVER_ETH is not set
@@ -383,6 +402,8 @@ CONFIG_PHYLIB=y
383# CONFIG_LXT_PHY is not set 402# CONFIG_LXT_PHY is not set
384# CONFIG_CICADA_PHY is not set 403# CONFIG_CICADA_PHY is not set
385CONFIG_VITESSE_PHY=y 404CONFIG_VITESSE_PHY=y
405# CONFIG_SMSC_PHY is not set
406# CONFIG_FIXED_PHY is not set
386 407
387# 408#
388# Ethernet (10 or 100Mbit) 409# Ethernet (10 or 100Mbit)
@@ -426,6 +447,7 @@ CONFIG_GIANFAR=y
426# CONFIG_CHELSIO_T1 is not set 447# CONFIG_CHELSIO_T1 is not set
427# CONFIG_IXGB is not set 448# CONFIG_IXGB is not set
428# CONFIG_S2IO is not set 449# CONFIG_S2IO is not set
450# CONFIG_MYRI10GE is not set
429 451
430# 452#
431# Token Ring devices 453# Token Ring devices
@@ -500,6 +522,7 @@ CONFIG_SERIO_LIBPS2=y
500CONFIG_VT=y 522CONFIG_VT=y
501CONFIG_VT_CONSOLE=y 523CONFIG_VT_CONSOLE=y
502CONFIG_HW_CONSOLE=y 524CONFIG_HW_CONSOLE=y
525# CONFIG_VT_HW_CONSOLE_BINDING is not set
503# CONFIG_SERIAL_NONSTANDARD is not set 526# CONFIG_SERIAL_NONSTANDARD is not set
504 527
505# 528#
@@ -534,6 +557,7 @@ CONFIG_UNIX98_PTYS=y
534# Watchdog Cards 557# Watchdog Cards
535# 558#
536# CONFIG_WATCHDOG is not set 559# CONFIG_WATCHDOG is not set
560# CONFIG_HW_RANDOM is not set
537# CONFIG_NVRAM is not set 561# CONFIG_NVRAM is not set
538# CONFIG_GEN_RTC is not set 562# CONFIG_GEN_RTC is not set
539# CONFIG_DTLK is not set 563# CONFIG_DTLK is not set
@@ -579,6 +603,7 @@ CONFIG_I2C=y
579# CONFIG_I2C_PIIX4 is not set 603# CONFIG_I2C_PIIX4 is not set
580CONFIG_I2C_MPC=y 604CONFIG_I2C_MPC=y
581# CONFIG_I2C_NFORCE2 is not set 605# CONFIG_I2C_NFORCE2 is not set
606# CONFIG_I2C_OCORES is not set
582# CONFIG_I2C_PARPORT_LIGHT is not set 607# CONFIG_I2C_PARPORT_LIGHT is not set
583# CONFIG_I2C_PROSAVAGE is not set 608# CONFIG_I2C_PROSAVAGE is not set
584# CONFIG_I2C_SAVAGE4 is not set 609# CONFIG_I2C_SAVAGE4 is not set
@@ -615,7 +640,6 @@ CONFIG_SENSORS_EEPROM=y
615# 640#
616# Dallas's 1-wire bus 641# Dallas's 1-wire bus
617# 642#
618# CONFIG_W1 is not set
619 643
620# 644#
621# Hardware Monitoring support 645# Hardware Monitoring support
@@ -631,6 +655,7 @@ CONFIG_SENSORS_EEPROM=y
631# Multimedia devices 655# Multimedia devices
632# 656#
633# CONFIG_VIDEO_DEV is not set 657# CONFIG_VIDEO_DEV is not set
658CONFIG_VIDEO_V4L2=y
634 659
635# 660#
636# Digital Video Broadcasting Devices 661# Digital Video Broadcasting Devices
@@ -640,6 +665,7 @@ CONFIG_SENSORS_EEPROM=y
640# 665#
641# Graphics support 666# Graphics support
642# 667#
668CONFIG_FIRMWARE_EDID=y
643# CONFIG_FB is not set 669# CONFIG_FB is not set
644 670
645# 671#
@@ -648,6 +674,7 @@ CONFIG_SENSORS_EEPROM=y
648CONFIG_VGA_CONSOLE=y 674CONFIG_VGA_CONSOLE=y
649# CONFIG_VGACON_SOFT_SCROLLBACK is not set 675# CONFIG_VGACON_SOFT_SCROLLBACK is not set
650CONFIG_DUMMY_CONSOLE=y 676CONFIG_DUMMY_CONSOLE=y
677# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
651 678
652# 679#
653# Sound 680# Sound
@@ -704,6 +731,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
704# CONFIG_RTC_CLASS is not set 731# CONFIG_RTC_CLASS is not set
705 732
706# 733#
734# DMA Engine support
735#
736# CONFIG_DMA_ENGINE is not set
737
738#
739# DMA Clients
740#
741
742#
743# DMA Devices
744#
745
746#
707# File systems 747# File systems
708# 748#
709CONFIG_EXT2_FS=y 749CONFIG_EXT2_FS=y
@@ -870,6 +910,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
870# CONFIG_CRC16 is not set 910# CONFIG_CRC16 is not set
871CONFIG_CRC32=y 911CONFIG_CRC32=y
872# CONFIG_LIBCRC32C is not set 912# CONFIG_LIBCRC32C is not set
913CONFIG_PLIST=y
873 914
874# 915#
875# Instrumentation Support 916# Instrumentation Support
@@ -881,13 +922,18 @@ CONFIG_CRC32=y
881# 922#
882# CONFIG_PRINTK_TIME is not set 923# CONFIG_PRINTK_TIME is not set
883# CONFIG_MAGIC_SYSRQ is not set 924# CONFIG_MAGIC_SYSRQ is not set
925# CONFIG_UNUSED_SYMBOLS is not set
884CONFIG_DEBUG_KERNEL=y 926CONFIG_DEBUG_KERNEL=y
885CONFIG_LOG_BUF_SHIFT=14 927CONFIG_LOG_BUF_SHIFT=14
886CONFIG_DETECT_SOFTLOCKUP=y 928CONFIG_DETECT_SOFTLOCKUP=y
887# CONFIG_SCHEDSTATS is not set 929# CONFIG_SCHEDSTATS is not set
888# CONFIG_DEBUG_MUTEXES is not set 930# CONFIG_DEBUG_RT_MUTEXES is not set
931# CONFIG_RT_MUTEX_TESTER is not set
889# CONFIG_DEBUG_SPINLOCK is not set 932# CONFIG_DEBUG_SPINLOCK is not set
933# CONFIG_DEBUG_MUTEXES is not set
934# CONFIG_DEBUG_RWSEMS is not set
890# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 935# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
936# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
891# CONFIG_DEBUG_KOBJECT is not set 937# CONFIG_DEBUG_KOBJECT is not set
892# CONFIG_DEBUG_HIGHMEM is not set 938# CONFIG_DEBUG_HIGHMEM is not set
893# CONFIG_DEBUG_INFO is not set 939# CONFIG_DEBUG_INFO is not set
@@ -899,11 +945,7 @@ CONFIG_FORCED_INLINING=y
899# CONFIG_DEBUGGER is not set 945# CONFIG_DEBUGGER is not set
900# CONFIG_BDI_SWITCH is not set 946# CONFIG_BDI_SWITCH is not set
901# CONFIG_BOOTX_TEXT is not set 947# CONFIG_BOOTX_TEXT is not set
902# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 948# CONFIG_PPC_EARLY_DEBUG is not set
903# CONFIG_PPC_EARLY_DEBUG_G5 is not set
904# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
905# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
906# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
907 949
908# 950#
909# Security options 951# Security options
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 3545af9896af..6861dde7d77b 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_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.17 3# Linux kernel version: 2.6.18-rc6
4# Mon Jul 3 14:20:49 2006 4# Sun Sep 10 10:30:23 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -60,6 +60,7 @@ CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
61CONFIG_POSIX_MQUEUE=y 61CONFIG_POSIX_MQUEUE=y
62# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
63CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
64# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
65CONFIG_IKCONFIG=y 66CONFIG_IKCONFIG=y
@@ -128,7 +129,6 @@ CONFIG_PPC_PMAC=y
128# CONFIG_PPC_CELL is not set 129# CONFIG_PPC_CELL is not set
129# CONFIG_PPC_CELL_NATIVE is not set 130# CONFIG_PPC_CELL_NATIVE is not set
130# CONFIG_UDBG_RTAS_CONSOLE is not set 131# CONFIG_UDBG_RTAS_CONSOLE is not set
131CONFIG_MPIC=y
132# CONFIG_PPC_RTAS is not set 132# CONFIG_PPC_RTAS is not set
133# CONFIG_MMIO_NVRAM is not set 133# CONFIG_MMIO_NVRAM is not set
134CONFIG_PPC_MPC106=y 134CONFIG_PPC_MPC106=y
@@ -149,6 +149,7 @@ CONFIG_CPU_FREQ_PMAC=y
149CONFIG_PPC601_SYNC_FIX=y 149CONFIG_PPC601_SYNC_FIX=y
150# CONFIG_TAU is not set 150# CONFIG_TAU is not set
151# CONFIG_WANT_EARLY_SERIAL is not set 151# CONFIG_WANT_EARLY_SERIAL is not set
152CONFIG_MPIC=y
152 153
153# 154#
154# Kernel options 155# Kernel options
@@ -189,6 +190,7 @@ CONFIG_ISA_DMA_API=y
189# Bus options 190# Bus options
190# 191#
191CONFIG_GENERIC_ISA_DMA=y 192CONFIG_GENERIC_ISA_DMA=y
193# CONFIG_MPIC_WEIRD is not set
192# CONFIG_PPC_I8259 is not set 194# CONFIG_PPC_I8259 is not set
193CONFIG_PPC_INDIRECT_PCI=y 195CONFIG_PPC_INDIRECT_PCI=y
194CONFIG_PCI=y 196CONFIG_PCI=y
@@ -559,6 +561,7 @@ CONFIG_BLK_DEV_UB=m
559CONFIG_BLK_DEV_RAM=y 561CONFIG_BLK_DEV_RAM=y
560CONFIG_BLK_DEV_RAM_COUNT=16 562CONFIG_BLK_DEV_RAM_COUNT=16
561CONFIG_BLK_DEV_RAM_SIZE=4096 563CONFIG_BLK_DEV_RAM_SIZE=4096
564CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
562CONFIG_BLK_DEV_INITRD=y 565CONFIG_BLK_DEV_INITRD=y
563# CONFIG_CDROM_PKTCDVD is not set 566# CONFIG_CDROM_PKTCDVD is not set
564# CONFIG_ATA_OVER_ETH is not set 567# CONFIG_ATA_OVER_ETH is not set
@@ -1502,7 +1505,6 @@ CONFIG_USB_MON=y
1502CONFIG_USB_SERIAL=m 1505CONFIG_USB_SERIAL=m
1503# CONFIG_USB_SERIAL_GENERIC is not set 1506# CONFIG_USB_SERIAL_GENERIC is not set
1504# CONFIG_USB_SERIAL_AIRPRIME is not set 1507# CONFIG_USB_SERIAL_AIRPRIME is not set
1505# CONFIG_USB_SERIAL_ANYDATA is not set
1506# CONFIG_USB_SERIAL_ARK3116 is not set 1508# CONFIG_USB_SERIAL_ARK3116 is not set
1507# CONFIG_USB_SERIAL_BELKIN is not set 1509# CONFIG_USB_SERIAL_BELKIN is not set
1508# CONFIG_USB_SERIAL_WHITEHEAT is not set 1510# CONFIG_USB_SERIAL_WHITEHEAT is not set
@@ -1540,6 +1542,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1540# CONFIG_USB_SERIAL_PL2303 is not set 1542# CONFIG_USB_SERIAL_PL2303 is not set
1541# CONFIG_USB_SERIAL_HP4X is not set 1543# CONFIG_USB_SERIAL_HP4X is not set
1542# CONFIG_USB_SERIAL_SAFE is not set 1544# CONFIG_USB_SERIAL_SAFE is not set
1545# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1543# CONFIG_USB_SERIAL_TI is not set 1546# CONFIG_USB_SERIAL_TI is not set
1544# CONFIG_USB_SERIAL_CYBERJACK is not set 1547# CONFIG_USB_SERIAL_CYBERJACK is not set
1545# CONFIG_USB_SERIAL_XIRCOM is not set 1548# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -1557,7 +1560,7 @@ CONFIG_USB_EZUSB=y
1557# CONFIG_USB_LEGOTOWER is not set 1560# CONFIG_USB_LEGOTOWER is not set
1558# CONFIG_USB_LCD is not set 1561# CONFIG_USB_LCD is not set
1559# CONFIG_USB_LED is not set 1562# CONFIG_USB_LED is not set
1560# CONFIG_USB_CY7C63 is not set 1563# CONFIG_USB_CYPRESS_CY7C63 is not set
1561# CONFIG_USB_CYTHERM is not set 1564# CONFIG_USB_CYTHERM is not set
1562# CONFIG_USB_PHIDGETKIT is not set 1565# CONFIG_USB_PHIDGETKIT is not set
1563# CONFIG_USB_PHIDGETSERVO is not set 1566# CONFIG_USB_PHIDGETSERVO is not set
@@ -1728,7 +1731,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1728CONFIG_SMB_FS=m 1731CONFIG_SMB_FS=m
1729# CONFIG_SMB_NLS_DEFAULT is not set 1732# CONFIG_SMB_NLS_DEFAULT is not set
1730# CONFIG_CIFS is not set 1733# CONFIG_CIFS is not set
1731# CONFIG_CIFS_DEBUG2 is not set
1732# CONFIG_NCP_FS is not set 1734# CONFIG_NCP_FS is not set
1733# CONFIG_CODA_FS is not set 1735# CONFIG_CODA_FS is not set
1734# CONFIG_AFS_FS is not set 1736# CONFIG_AFS_FS is not set
@@ -1831,11 +1833,13 @@ CONFIG_LOG_BUF_SHIFT=14
1831CONFIG_DETECT_SOFTLOCKUP=y 1833CONFIG_DETECT_SOFTLOCKUP=y
1832# CONFIG_SCHEDSTATS is not set 1834# CONFIG_SCHEDSTATS is not set
1833# CONFIG_DEBUG_SLAB is not set 1835# CONFIG_DEBUG_SLAB is not set
1834# CONFIG_DEBUG_MUTEXES is not set
1835# CONFIG_DEBUG_RT_MUTEXES is not set 1836# CONFIG_DEBUG_RT_MUTEXES is not set
1836# CONFIG_RT_MUTEX_TESTER is not set 1837# CONFIG_RT_MUTEX_TESTER is not set
1837# CONFIG_DEBUG_SPINLOCK is not set 1838# CONFIG_DEBUG_SPINLOCK is not set
1839# CONFIG_DEBUG_MUTEXES is not set
1840# CONFIG_DEBUG_RWSEMS is not set
1838# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1841# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1842# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1839# CONFIG_DEBUG_KOBJECT is not set 1843# CONFIG_DEBUG_KOBJECT is not set
1840# CONFIG_DEBUG_INFO is not set 1844# CONFIG_DEBUG_INFO is not set
1841# CONFIG_DEBUG_FS is not set 1845# CONFIG_DEBUG_FS is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 395e49847788..7517d0c5303f 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,15 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc2 3# Linux kernel version: 2.6.18-rc6
4# Fri Feb 10 17:32:14 2006 4# Sun Sep 10 10:45:11 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_PPC=y 16CONFIG_PPC=y
14CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
15CONFIG_COMPAT=y 18CONFIG_COMPAT=y
@@ -30,8 +33,10 @@ CONFIG_POWER4=y
30CONFIG_PPC_FPU=y 33CONFIG_PPC_FPU=y
31CONFIG_ALTIVEC=y 34CONFIG_ALTIVEC=y
32CONFIG_PPC_STD_MMU=y 35CONFIG_PPC_STD_MMU=y
36CONFIG_VIRT_CPU_ACCOUNTING=y
33CONFIG_SMP=y 37CONFIG_SMP=y
34CONFIG_NR_CPUS=32 38CONFIG_NR_CPUS=32
39CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35 40
36# 41#
37# Code maturity level options 42# Code maturity level options
@@ -49,11 +54,14 @@ CONFIG_SWAP=y
49CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
50CONFIG_POSIX_MQUEUE=y 55CONFIG_POSIX_MQUEUE=y
51# CONFIG_BSD_PROCESS_ACCT is not set 56# CONFIG_BSD_PROCESS_ACCT is not set
57CONFIG_TASKSTATS=y
58CONFIG_TASK_DELAY_ACCT=y
52CONFIG_SYSCTL=y 59CONFIG_SYSCTL=y
53# CONFIG_AUDIT is not set 60# CONFIG_AUDIT is not set
54CONFIG_IKCONFIG=y 61CONFIG_IKCONFIG=y
55CONFIG_IKCONFIG_PROC=y 62CONFIG_IKCONFIG_PROC=y
56CONFIG_CPUSETS=y 63CONFIG_CPUSETS=y
64CONFIG_RELAY=y
57CONFIG_INITRAMFS_SOURCE="" 65CONFIG_INITRAMFS_SOURCE=""
58CONFIG_CC_OPTIMIZE_FOR_SIZE=y 66CONFIG_CC_OPTIMIZE_FOR_SIZE=y
59# CONFIG_EMBEDDED is not set 67# CONFIG_EMBEDDED is not set
@@ -65,14 +73,12 @@ CONFIG_PRINTK=y
65CONFIG_BUG=y 73CONFIG_BUG=y
66CONFIG_ELF_CORE=y 74CONFIG_ELF_CORE=y
67CONFIG_BASE_FULL=y 75CONFIG_BASE_FULL=y
76CONFIG_RT_MUTEXES=y
68CONFIG_FUTEX=y 77CONFIG_FUTEX=y
69CONFIG_EPOLL=y 78CONFIG_EPOLL=y
70CONFIG_SHMEM=y 79CONFIG_SHMEM=y
71CONFIG_CC_ALIGN_FUNCTIONS=0
72CONFIG_CC_ALIGN_LABELS=0
73CONFIG_CC_ALIGN_LOOPS=0
74CONFIG_CC_ALIGN_JUMPS=0
75CONFIG_SLAB=y 80CONFIG_SLAB=y
81CONFIG_VM_EVENT_COUNTERS=y
76# CONFIG_TINY_SHMEM is not set 82# CONFIG_TINY_SHMEM is not set
77CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
78# CONFIG_SLOB is not set 84# CONFIG_SLOB is not set
@@ -83,7 +89,6 @@ CONFIG_BASE_SMALL=0
83CONFIG_MODULES=y 89CONFIG_MODULES=y
84CONFIG_MODULE_UNLOAD=y 90CONFIG_MODULE_UNLOAD=y
85# CONFIG_MODULE_FORCE_UNLOAD is not set 91# CONFIG_MODULE_FORCE_UNLOAD is not set
86CONFIG_OBSOLETE_MODPARM=y
87CONFIG_MODVERSIONS=y 92CONFIG_MODVERSIONS=y
88CONFIG_MODULE_SRCVERSION_ALL=y 93CONFIG_MODULE_SRCVERSION_ALL=y
89CONFIG_KMOD=y 94CONFIG_KMOD=y
@@ -92,6 +97,7 @@ CONFIG_STOP_MACHINE=y
92# 97#
93# Block layer 98# Block layer
94# 99#
100CONFIG_BLK_DEV_IO_TRACE=y
95 101
96# 102#
97# IO Schedulers 103# IO Schedulers
@@ -117,19 +123,22 @@ CONFIG_PPC_PSERIES=y
117CONFIG_PPC_PMAC=y 123CONFIG_PPC_PMAC=y
118CONFIG_PPC_PMAC64=y 124CONFIG_PPC_PMAC64=y
119CONFIG_PPC_MAPLE=y 125CONFIG_PPC_MAPLE=y
120# CONFIG_PPC_CELL is not set 126CONFIG_PPC_CELL=y
127CONFIG_PPC_CELL_NATIVE=y
128CONFIG_PPC_IBM_CELL_BLADE=y
129CONFIG_UDBG_RTAS_CONSOLE=y
121CONFIG_XICS=y 130CONFIG_XICS=y
122CONFIG_U3_DART=y 131CONFIG_U3_DART=y
123CONFIG_MPIC=y
124CONFIG_PPC_RTAS=y 132CONFIG_PPC_RTAS=y
125CONFIG_RTAS_ERROR_LOGGING=y 133CONFIG_RTAS_ERROR_LOGGING=y
126CONFIG_RTAS_PROC=y 134CONFIG_RTAS_PROC=y
127CONFIG_RTAS_FLASH=m 135CONFIG_RTAS_FLASH=m
128# CONFIG_MMIO_NVRAM is not set 136CONFIG_MMIO_NVRAM=y
129CONFIG_MPIC_BROKEN_U3=y 137CONFIG_MPIC_BROKEN_U3=y
130CONFIG_IBMVIO=y 138CONFIG_IBMVIO=y
131# CONFIG_IBMEBUS is not set 139# CONFIG_IBMEBUS is not set
132# CONFIG_PPC_MPC106 is not set 140# CONFIG_PPC_MPC106 is not set
141CONFIG_PPC_970_NAP=y
133CONFIG_CPU_FREQ=y 142CONFIG_CPU_FREQ=y
134CONFIG_CPU_FREQ_TABLE=y 143CONFIG_CPU_FREQ_TABLE=y
135# CONFIG_CPU_FREQ_DEBUG is not set 144# CONFIG_CPU_FREQ_DEBUG is not set
@@ -144,6 +153,15 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
144# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 153# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
145CONFIG_CPU_FREQ_PMAC64=y 154CONFIG_CPU_FREQ_PMAC64=y
146# CONFIG_WANT_EARLY_SERIAL is not set 155# CONFIG_WANT_EARLY_SERIAL is not set
156CONFIG_MPIC=y
157
158#
159# Cell Broadband Engine options
160#
161CONFIG_SPU_FS=m
162CONFIG_SPU_BASE=y
163CONFIG_SPUFS_MMAP=y
164CONFIG_CBE_RAS=y
147 165
148# 166#
149# Kernel options 167# Kernel options
@@ -161,6 +179,7 @@ CONFIG_BINFMT_MISC=m
161CONFIG_FORCE_MAX_ZONEORDER=13 179CONFIG_FORCE_MAX_ZONEORDER=13
162CONFIG_IOMMU_VMERGE=y 180CONFIG_IOMMU_VMERGE=y
163CONFIG_HOTPLUG_CPU=y 181CONFIG_HOTPLUG_CPU=y
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
164CONFIG_KEXEC=y 183CONFIG_KEXEC=y
165# CONFIG_CRASH_DUMP is not set 184# CONFIG_CRASH_DUMP is not set
166CONFIG_IRQ_ALL_CPUS=y 185CONFIG_IRQ_ALL_CPUS=y
@@ -181,9 +200,10 @@ CONFIG_SPARSEMEM=y
181CONFIG_HAVE_MEMORY_PRESENT=y 200CONFIG_HAVE_MEMORY_PRESENT=y
182# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
183CONFIG_SPARSEMEM_EXTREME=y 202CONFIG_SPARSEMEM_EXTREME=y
184# CONFIG_MEMORY_HOTPLUG is not set 203CONFIG_MEMORY_HOTPLUG=y
185CONFIG_SPLIT_PTLOCK_CPUS=4 204CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_MIGRATION=y 205CONFIG_RESOURCES_64BIT=y
206CONFIG_ARCH_MEMORY_PROBE=y
187# CONFIG_PPC_64K_PAGES is not set 207# CONFIG_PPC_64K_PAGES is not set
188# CONFIG_SCHED_SMT is not set 208# CONFIG_SCHED_SMT is not set
189CONFIG_PROC_DEVICETREE=y 209CONFIG_PROC_DEVICETREE=y
@@ -196,11 +216,12 @@ CONFIG_ISA_DMA_API=y
196# Bus options 216# Bus options
197# 217#
198CONFIG_GENERIC_ISA_DMA=y 218CONFIG_GENERIC_ISA_DMA=y
219# CONFIG_MPIC_WEIRD is not set
199CONFIG_PPC_I8259=y 220CONFIG_PPC_I8259=y
200# CONFIG_PPC_INDIRECT_PCI is not set 221# CONFIG_PPC_INDIRECT_PCI is not set
201CONFIG_PCI=y 222CONFIG_PCI=y
202CONFIG_PCI_DOMAINS=y 223CONFIG_PCI_DOMAINS=y
203# CONFIG_PCI_LEGACY_PROC is not set 224# CONFIG_PCIEPORTBUS is not set
204# CONFIG_PCI_DEBUG is not set 225# CONFIG_PCI_DEBUG is not set
205 226
206# 227#
@@ -247,7 +268,10 @@ CONFIG_SYN_COOKIES=y
247CONFIG_INET_AH=m 268CONFIG_INET_AH=m
248CONFIG_INET_ESP=m 269CONFIG_INET_ESP=m
249CONFIG_INET_IPCOMP=m 270CONFIG_INET_IPCOMP=m
271CONFIG_INET_XFRM_TUNNEL=m
250CONFIG_INET_TUNNEL=y 272CONFIG_INET_TUNNEL=y
273CONFIG_INET_XFRM_MODE_TRANSPORT=y
274CONFIG_INET_XFRM_MODE_TUNNEL=y
251CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
252CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
253# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
@@ -258,6 +282,9 @@ CONFIG_TCP_CONG_BIC=y
258# 282#
259# CONFIG_IP_VS is not set 283# CONFIG_IP_VS is not set
260# CONFIG_IPV6 is not set 284# CONFIG_IPV6 is not set
285# CONFIG_INET6_XFRM_TUNNEL is not set
286# CONFIG_INET6_TUNNEL is not set
287# CONFIG_NETWORK_SECMARK is not set
261CONFIG_NETFILTER=y 288CONFIG_NETFILTER=y
262# CONFIG_NETFILTER_DEBUG is not set 289# CONFIG_NETFILTER_DEBUG is not set
263 290
@@ -284,6 +311,8 @@ CONFIG_IP_NF_IRC=m
284CONFIG_IP_NF_TFTP=m 311CONFIG_IP_NF_TFTP=m
285CONFIG_IP_NF_AMANDA=m 312CONFIG_IP_NF_AMANDA=m
286# CONFIG_IP_NF_PPTP is not set 313# CONFIG_IP_NF_PPTP is not set
314# CONFIG_IP_NF_H323 is not set
315CONFIG_IP_NF_SIP=m
287CONFIG_IP_NF_QUEUE=m 316CONFIG_IP_NF_QUEUE=m
288 317
289# 318#
@@ -339,6 +368,7 @@ CONFIG_STANDALONE=y
339CONFIG_PREVENT_FIRMWARE_BUILD=y 368CONFIG_PREVENT_FIRMWARE_BUILD=y
340CONFIG_FW_LOADER=y 369CONFIG_FW_LOADER=y
341# CONFIG_DEBUG_DRIVER is not set 370# CONFIG_DEBUG_DRIVER is not set
371# CONFIG_SYS_HYPERVISOR is not set
342 372
343# 373#
344# Connector - unified userspace <-> kernelspace linker 374# Connector - unified userspace <-> kernelspace linker
@@ -376,6 +406,7 @@ CONFIG_BLK_DEV_NBD=m
376CONFIG_BLK_DEV_RAM=y 406CONFIG_BLK_DEV_RAM=y
377CONFIG_BLK_DEV_RAM_COUNT=16 407CONFIG_BLK_DEV_RAM_COUNT=16
378CONFIG_BLK_DEV_RAM_SIZE=65536 408CONFIG_BLK_DEV_RAM_SIZE=65536
409CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
379CONFIG_BLK_DEV_INITRD=y 410CONFIG_BLK_DEV_INITRD=y
380# CONFIG_CDROM_PKTCDVD is not set 411# CONFIG_CDROM_PKTCDVD is not set
381# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
@@ -436,7 +467,6 @@ CONFIG_BLK_DEV_AMD74XX=y
436CONFIG_BLK_DEV_IDE_PMAC=y 467CONFIG_BLK_DEV_IDE_PMAC=y
437CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 468CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
438CONFIG_BLK_DEV_IDEDMA_PMAC=y 469CONFIG_BLK_DEV_IDEDMA_PMAC=y
439# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set
440# CONFIG_IDE_ARM is not set 470# CONFIG_IDE_ARM is not set
441CONFIG_BLK_DEV_IDEDMA=y 471CONFIG_BLK_DEV_IDEDMA=y
442# CONFIG_IDEDMA_IVB is not set 472# CONFIG_IDEDMA_IVB is not set
@@ -497,6 +527,7 @@ CONFIG_SCSI_SATA_SVW=y
497# CONFIG_SCSI_SATA_MV is not set 527# CONFIG_SCSI_SATA_MV is not set
498# CONFIG_SCSI_SATA_NV is not set 528# CONFIG_SCSI_SATA_NV is not set
499# CONFIG_SCSI_PDC_ADMA is not set 529# CONFIG_SCSI_PDC_ADMA is not set
530# CONFIG_SCSI_HPTIOP is not set
500# CONFIG_SCSI_SATA_QSTOR is not set 531# CONFIG_SCSI_SATA_QSTOR is not set
501# CONFIG_SCSI_SATA_PROMISE is not set 532# CONFIG_SCSI_SATA_PROMISE is not set
502# CONFIG_SCSI_SATA_SX4 is not set 533# CONFIG_SCSI_SATA_SX4 is not set
@@ -519,11 +550,10 @@ CONFIG_SCSI_SYM53C8XX_2=y
519CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 550CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
520CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 551CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
521CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 552CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
522# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 553CONFIG_SCSI_SYM53C8XX_MMIO=y
523CONFIG_SCSI_IPR=y 554CONFIG_SCSI_IPR=y
524CONFIG_SCSI_IPR_TRACE=y 555CONFIG_SCSI_IPR_TRACE=y
525CONFIG_SCSI_IPR_DUMP=y 556CONFIG_SCSI_IPR_DUMP=y
526# CONFIG_SCSI_QLOGIC_FC is not set
527# CONFIG_SCSI_QLOGIC_1280 is not set 557# CONFIG_SCSI_QLOGIC_1280 is not set
528# CONFIG_SCSI_QLA_FC is not set 558# CONFIG_SCSI_QLA_FC is not set
529CONFIG_SCSI_LPFC=m 559CONFIG_SCSI_LPFC=m
@@ -540,8 +570,8 @@ CONFIG_MD_LINEAR=y
540CONFIG_MD_RAID0=y 570CONFIG_MD_RAID0=y
541CONFIG_MD_RAID1=y 571CONFIG_MD_RAID1=y
542CONFIG_MD_RAID10=y 572CONFIG_MD_RAID10=y
543CONFIG_MD_RAID5=y 573CONFIG_MD_RAID456=y
544CONFIG_MD_RAID6=m 574CONFIG_MD_RAID5_RESHAPE=y
545CONFIG_MD_MULTIPATH=m 575CONFIG_MD_MULTIPATH=m
546CONFIG_MD_FAULTY=m 576CONFIG_MD_FAULTY=m
547CONFIG_BLK_DEV_DM=y 577CONFIG_BLK_DEV_DM=y
@@ -585,7 +615,6 @@ CONFIG_IEEE1394_OHCI1394=y
585# 615#
586CONFIG_IEEE1394_VIDEO1394=m 616CONFIG_IEEE1394_VIDEO1394=m
587CONFIG_IEEE1394_SBP2=m 617CONFIG_IEEE1394_SBP2=m
588# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
589CONFIG_IEEE1394_ETH1394=m 618CONFIG_IEEE1394_ETH1394=m
590CONFIG_IEEE1394_DV1394=m 619CONFIG_IEEE1394_DV1394=m
591CONFIG_IEEE1394_RAWIO=y 620CONFIG_IEEE1394_RAWIO=y
@@ -599,6 +628,7 @@ CONFIG_IEEE1394_RAWIO=y
599# Macintosh device drivers 628# Macintosh device drivers
600# 629#
601CONFIG_ADB_PMU=y 630CONFIG_ADB_PMU=y
631# CONFIG_ADB_PMU_LED is not set
602CONFIG_PMAC_SMU=y 632CONFIG_PMAC_SMU=y
603CONFIG_THERM_PM72=y 633CONFIG_THERM_PM72=y
604CONFIG_WINDFARM=y 634CONFIG_WINDFARM=y
@@ -682,6 +712,7 @@ CONFIG_E1000=y
682# CONFIG_VIA_VELOCITY is not set 712# CONFIG_VIA_VELOCITY is not set
683CONFIG_TIGON3=y 713CONFIG_TIGON3=y
684# CONFIG_BNX2 is not set 714# CONFIG_BNX2 is not set
715CONFIG_SPIDER_NET=m
685# CONFIG_MV643XX_ETH is not set 716# CONFIG_MV643XX_ETH is not set
686 717
687# 718#
@@ -691,6 +722,7 @@ CONFIG_TIGON3=y
691CONFIG_IXGB=m 722CONFIG_IXGB=m
692# CONFIG_IXGB_NAPI is not set 723# CONFIG_IXGB_NAPI is not set
693# CONFIG_S2IO is not set 724# CONFIG_S2IO is not set
725# CONFIG_MYRI10GE is not set
694 726
695# 727#
696# Token Ring devices 728# Token Ring devices
@@ -792,6 +824,7 @@ CONFIG_SERIO_LIBPS2=y
792CONFIG_VT=y 824CONFIG_VT=y
793CONFIG_VT_CONSOLE=y 825CONFIG_VT_CONSOLE=y
794CONFIG_HW_CONSOLE=y 826CONFIG_HW_CONSOLE=y
827# CONFIG_VT_HW_CONSOLE_BINDING is not set
795# CONFIG_SERIAL_NONSTANDARD is not set 828# CONFIG_SERIAL_NONSTANDARD is not set
796 829
797# 830#
@@ -799,6 +832,7 @@ CONFIG_HW_CONSOLE=y
799# 832#
800CONFIG_SERIAL_8250=y 833CONFIG_SERIAL_8250=y
801CONFIG_SERIAL_8250_CONSOLE=y 834CONFIG_SERIAL_8250_CONSOLE=y
835CONFIG_SERIAL_8250_PCI=y
802CONFIG_SERIAL_8250_NR_UARTS=4 836CONFIG_SERIAL_8250_NR_UARTS=4
803CONFIG_SERIAL_8250_RUNTIME_UARTS=4 837CONFIG_SERIAL_8250_RUNTIME_UARTS=4
804# CONFIG_SERIAL_8250_EXTENDED is not set 838# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -814,7 +848,9 @@ CONFIG_SERIAL_ICOM=m
814CONFIG_UNIX98_PTYS=y 848CONFIG_UNIX98_PTYS=y
815CONFIG_LEGACY_PTYS=y 849CONFIG_LEGACY_PTYS=y
816CONFIG_LEGACY_PTY_COUNT=256 850CONFIG_LEGACY_PTY_COUNT=256
851CONFIG_HVC_DRIVER=y
817CONFIG_HVC_CONSOLE=y 852CONFIG_HVC_CONSOLE=y
853CONFIG_HVC_RTAS=y
818CONFIG_HVCS=m 854CONFIG_HVCS=m
819 855
820# 856#
@@ -826,7 +862,7 @@ CONFIG_HVCS=m
826# Watchdog Cards 862# Watchdog Cards
827# 863#
828# CONFIG_WATCHDOG is not set 864# CONFIG_WATCHDOG is not set
829# CONFIG_RTC is not set 865# CONFIG_HW_RANDOM is not set
830CONFIG_GEN_RTC=y 866CONFIG_GEN_RTC=y
831# CONFIG_GEN_RTC_X is not set 867# CONFIG_GEN_RTC_X is not set
832# CONFIG_DTLK is not set 868# CONFIG_DTLK is not set
@@ -874,10 +910,10 @@ CONFIG_I2C_AMD8111=y
874# CONFIG_I2C_PIIX4 is not set 910# CONFIG_I2C_PIIX4 is not set
875CONFIG_I2C_POWERMAC=y 911CONFIG_I2C_POWERMAC=y
876# CONFIG_I2C_NFORCE2 is not set 912# CONFIG_I2C_NFORCE2 is not set
913# CONFIG_I2C_OCORES is not set
877# CONFIG_I2C_PARPORT_LIGHT is not set 914# CONFIG_I2C_PARPORT_LIGHT is not set
878# CONFIG_I2C_PROSAVAGE is not set 915# CONFIG_I2C_PROSAVAGE is not set
879# CONFIG_I2C_SAVAGE4 is not set 916# CONFIG_I2C_SAVAGE4 is not set
880# CONFIG_SCx200_ACB is not set
881# CONFIG_I2C_SIS5595 is not set 917# CONFIG_I2C_SIS5595 is not set
882# CONFIG_I2C_SIS630 is not set 918# CONFIG_I2C_SIS630 is not set
883# CONFIG_I2C_SIS96X is not set 919# CONFIG_I2C_SIS96X is not set
@@ -896,9 +932,7 @@ CONFIG_I2C_POWERMAC=y
896# CONFIG_SENSORS_PCF8574 is not set 932# CONFIG_SENSORS_PCF8574 is not set
897# CONFIG_SENSORS_PCA9539 is not set 933# CONFIG_SENSORS_PCA9539 is not set
898# CONFIG_SENSORS_PCF8591 is not set 934# CONFIG_SENSORS_PCF8591 is not set
899# CONFIG_SENSORS_RTC8564 is not set
900# CONFIG_SENSORS_MAX6875 is not set 935# CONFIG_SENSORS_MAX6875 is not set
901# CONFIG_RTC_X1205_I2C is not set
902# CONFIG_I2C_DEBUG_CORE is not set 936# CONFIG_I2C_DEBUG_CORE is not set
903# CONFIG_I2C_DEBUG_ALGO is not set 937# CONFIG_I2C_DEBUG_ALGO is not set
904# CONFIG_I2C_DEBUG_BUS is not set 938# CONFIG_I2C_DEBUG_BUS is not set
@@ -913,7 +947,6 @@ CONFIG_I2C_POWERMAC=y
913# 947#
914# Dallas's 1-wire bus 948# Dallas's 1-wire bus
915# 949#
916# CONFIG_W1 is not set
917 950
918# 951#
919# Hardware Monitoring support 952# Hardware Monitoring support
@@ -926,37 +959,33 @@ CONFIG_I2C_POWERMAC=y
926# 959#
927 960
928# 961#
929# Multimedia Capabilities Port drivers
930#
931
932#
933# Multimedia devices 962# Multimedia devices
934# 963#
935# CONFIG_VIDEO_DEV is not set 964# CONFIG_VIDEO_DEV is not set
965CONFIG_VIDEO_V4L2=y
936 966
937# 967#
938# Digital Video Broadcasting Devices 968# Digital Video Broadcasting Devices
939# 969#
940# CONFIG_DVB is not set 970# CONFIG_DVB is not set
971# CONFIG_USB_DABUSB is not set
941 972
942# 973#
943# Graphics support 974# Graphics support
944# 975#
976CONFIG_FIRMWARE_EDID=y
945CONFIG_FB=y 977CONFIG_FB=y
946CONFIG_FB_CFB_FILLRECT=y 978CONFIG_FB_CFB_FILLRECT=y
947CONFIG_FB_CFB_COPYAREA=y 979CONFIG_FB_CFB_COPYAREA=y
948CONFIG_FB_CFB_IMAGEBLIT=y 980CONFIG_FB_CFB_IMAGEBLIT=y
949CONFIG_FB_MACMODES=y 981CONFIG_FB_MACMODES=y
982# CONFIG_FB_BACKLIGHT is not set
950CONFIG_FB_MODE_HELPERS=y 983CONFIG_FB_MODE_HELPERS=y
951CONFIG_FB_TILEBLITTING=y 984CONFIG_FB_TILEBLITTING=y
952# CONFIG_FB_CIRRUS is not set 985# CONFIG_FB_CIRRUS is not set
953# CONFIG_FB_PM2 is not set 986# CONFIG_FB_PM2 is not set
954# CONFIG_FB_CYBER2000 is not set 987# CONFIG_FB_CYBER2000 is not set
955CONFIG_FB_OF=y 988CONFIG_FB_OF=y
956# CONFIG_FB_CONTROL is not set
957# CONFIG_FB_PLATINUM is not set
958# CONFIG_FB_VALKYRIE is not set
959# CONFIG_FB_CT65550 is not set
960# CONFIG_FB_ASILIANT is not set 989# CONFIG_FB_ASILIANT is not set
961# CONFIG_FB_IMSTT is not set 990# CONFIG_FB_IMSTT is not set
962# CONFIG_FB_VGA16 is not set 991# CONFIG_FB_VGA16 is not set
@@ -970,7 +999,6 @@ CONFIG_FB_MATROX_G=y
970CONFIG_FB_MATROX_I2C=m 999CONFIG_FB_MATROX_I2C=m
971CONFIG_FB_MATROX_MAVEN=m 1000CONFIG_FB_MATROX_MAVEN=m
972CONFIG_FB_MATROX_MULTIHEAD=y 1001CONFIG_FB_MATROX_MULTIHEAD=y
973# CONFIG_FB_RADEON_OLD is not set
974CONFIG_FB_RADEON=y 1002CONFIG_FB_RADEON=y
975CONFIG_FB_RADEON_I2C=y 1003CONFIG_FB_RADEON_I2C=y
976# CONFIG_FB_RADEON_DEBUG is not set 1004# CONFIG_FB_RADEON_DEBUG is not set
@@ -1025,9 +1053,11 @@ CONFIG_SND_SEQ_DUMMY=m
1025CONFIG_SND_OSSEMUL=y 1053CONFIG_SND_OSSEMUL=y
1026CONFIG_SND_MIXER_OSS=m 1054CONFIG_SND_MIXER_OSS=m
1027CONFIG_SND_PCM_OSS=m 1055CONFIG_SND_PCM_OSS=m
1056CONFIG_SND_PCM_OSS_PLUGINS=y
1028CONFIG_SND_SEQUENCER_OSS=y 1057CONFIG_SND_SEQUENCER_OSS=y
1029# CONFIG_SND_DYNAMIC_MINORS is not set 1058# CONFIG_SND_DYNAMIC_MINORS is not set
1030CONFIG_SND_SUPPORT_OLD_API=y 1059CONFIG_SND_SUPPORT_OLD_API=y
1060CONFIG_SND_VERBOSE_PROCFS=y
1031# CONFIG_SND_VERBOSE_PRINTK is not set 1061# CONFIG_SND_VERBOSE_PRINTK is not set
1032# CONFIG_SND_DEBUG is not set 1062# CONFIG_SND_DEBUG is not set
1033 1063
@@ -1044,6 +1074,7 @@ CONFIG_SND_SUPPORT_OLD_API=y
1044# PCI devices 1074# PCI devices
1045# 1075#
1046# CONFIG_SND_AD1889 is not set 1076# CONFIG_SND_AD1889 is not set
1077# CONFIG_SND_ALS300 is not set
1047# CONFIG_SND_ALS4000 is not set 1078# CONFIG_SND_ALS4000 is not set
1048# CONFIG_SND_ALI5451 is not set 1079# CONFIG_SND_ALI5451 is not set
1049# CONFIG_SND_ATIIXP is not set 1080# CONFIG_SND_ATIIXP is not set
@@ -1057,6 +1088,18 @@ CONFIG_SND_SUPPORT_OLD_API=y
1057# CONFIG_SND_CMIPCI is not set 1088# CONFIG_SND_CMIPCI is not set
1058# CONFIG_SND_CS4281 is not set 1089# CONFIG_SND_CS4281 is not set
1059# CONFIG_SND_CS46XX is not set 1090# CONFIG_SND_CS46XX is not set
1091# CONFIG_SND_DARLA20 is not set
1092# CONFIG_SND_GINA20 is not set
1093# CONFIG_SND_LAYLA20 is not set
1094# CONFIG_SND_DARLA24 is not set
1095# CONFIG_SND_GINA24 is not set
1096# CONFIG_SND_LAYLA24 is not set
1097# CONFIG_SND_MONA is not set
1098# CONFIG_SND_MIA is not set
1099# CONFIG_SND_ECHO3G is not set
1100# CONFIG_SND_INDIGO is not set
1101# CONFIG_SND_INDIGOIO is not set
1102# CONFIG_SND_INDIGODJ is not set
1060# CONFIG_SND_EMU10K1 is not set 1103# CONFIG_SND_EMU10K1 is not set
1061# CONFIG_SND_EMU10K1X is not set 1104# CONFIG_SND_EMU10K1X is not set
1062# CONFIG_SND_ENS1370 is not set 1105# CONFIG_SND_ENS1370 is not set
@@ -1076,6 +1119,7 @@ CONFIG_SND_SUPPORT_OLD_API=y
1076# CONFIG_SND_MIXART is not set 1119# CONFIG_SND_MIXART is not set
1077# CONFIG_SND_NM256 is not set 1120# CONFIG_SND_NM256 is not set
1078# CONFIG_SND_PCXHR is not set 1121# CONFIG_SND_PCXHR is not set
1122# CONFIG_SND_RIPTIDE is not set
1079# CONFIG_SND_RME32 is not set 1123# CONFIG_SND_RME32 is not set
1080# CONFIG_SND_RME96 is not set 1124# CONFIG_SND_RME96 is not set
1081# CONFIG_SND_RME9652 is not set 1125# CONFIG_SND_RME9652 is not set
@@ -1093,6 +1137,17 @@ CONFIG_SND_POWERMAC=m
1093CONFIG_SND_POWERMAC_AUTO_DRC=y 1137CONFIG_SND_POWERMAC_AUTO_DRC=y
1094 1138
1095# 1139#
1140# Apple Onboard Audio driver
1141#
1142CONFIG_SND_AOA=m
1143CONFIG_SND_AOA_FABRIC_LAYOUT=m
1144CONFIG_SND_AOA_ONYX=m
1145CONFIG_SND_AOA_TAS=m
1146CONFIG_SND_AOA_TOONIE=m
1147CONFIG_SND_AOA_SOUNDBUS=m
1148CONFIG_SND_AOA_SOUNDBUS_I2S=m
1149
1150#
1096# USB devices 1151# USB devices
1097# 1152#
1098# CONFIG_SND_USB_AUDIO is not set 1153# CONFIG_SND_USB_AUDIO is not set
@@ -1108,6 +1163,7 @@ CONFIG_SND_POWERMAC_AUTO_DRC=y
1108# 1163#
1109CONFIG_USB_ARCH_HAS_HCD=y 1164CONFIG_USB_ARCH_HAS_HCD=y
1110CONFIG_USB_ARCH_HAS_OHCI=y 1165CONFIG_USB_ARCH_HAS_OHCI=y
1166CONFIG_USB_ARCH_HAS_EHCI=y
1111CONFIG_USB=y 1167CONFIG_USB=y
1112# CONFIG_USB_DEBUG is not set 1168# CONFIG_USB_DEBUG is not set
1113 1169
@@ -1125,6 +1181,7 @@ CONFIG_USB_DEVICEFS=y
1125CONFIG_USB_EHCI_HCD=y 1181CONFIG_USB_EHCI_HCD=y
1126# CONFIG_USB_EHCI_SPLIT_ISO is not set 1182# CONFIG_USB_EHCI_SPLIT_ISO is not set
1127# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1183# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1184CONFIG_USB_EHCI_TT_NEWSCHED=y
1128# CONFIG_USB_ISP116X_HCD is not set 1185# CONFIG_USB_ISP116X_HCD is not set
1129CONFIG_USB_OHCI_HCD=y 1186CONFIG_USB_OHCI_HCD=y
1130# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1187# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1135,7 +1192,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1135# 1192#
1136# USB Device Class drivers 1193# USB Device Class drivers
1137# 1194#
1138# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1139# CONFIG_USB_ACM is not set 1195# CONFIG_USB_ACM is not set
1140# CONFIG_USB_PRINTER is not set 1196# CONFIG_USB_PRINTER is not set
1141 1197
@@ -1173,9 +1229,7 @@ CONFIG_USB_HIDDEV=y
1173# CONFIG_USB_ACECAD is not set 1229# CONFIG_USB_ACECAD is not set
1174# CONFIG_USB_KBTAB is not set 1230# CONFIG_USB_KBTAB is not set
1175# CONFIG_USB_POWERMATE is not set 1231# CONFIG_USB_POWERMATE is not set
1176# CONFIG_USB_MTOUCH is not set 1232# CONFIG_USB_TOUCHSCREEN is not set
1177# CONFIG_USB_ITMTOUCH is not set
1178# CONFIG_USB_EGALAX is not set
1179# CONFIG_USB_YEALINK is not set 1233# CONFIG_USB_YEALINK is not set
1180# CONFIG_USB_XPAD is not set 1234# CONFIG_USB_XPAD is not set
1181# CONFIG_USB_ATI_REMOTE is not set 1235# CONFIG_USB_ATI_REMOTE is not set
@@ -1190,15 +1244,6 @@ CONFIG_USB_HIDDEV=y
1190# CONFIG_USB_MICROTEK is not set 1244# CONFIG_USB_MICROTEK is not set
1191 1245
1192# 1246#
1193# USB Multimedia devices
1194#
1195# CONFIG_USB_DABUSB is not set
1196
1197#
1198# Video4Linux support is needed for USB Multimedia device support
1199#
1200
1201#
1202# USB Network Adapters 1247# USB Network Adapters
1203# 1248#
1204# CONFIG_USB_CATC is not set 1249# CONFIG_USB_CATC is not set
@@ -1227,10 +1272,12 @@ CONFIG_USB_HIDDEV=y
1227# CONFIG_USB_LEGOTOWER is not set 1272# CONFIG_USB_LEGOTOWER is not set
1228# CONFIG_USB_LCD is not set 1273# CONFIG_USB_LCD is not set
1229# CONFIG_USB_LED is not set 1274# CONFIG_USB_LED is not set
1275# CONFIG_USB_CYPRESS_CY7C63 is not set
1230# CONFIG_USB_CYTHERM is not set 1276# CONFIG_USB_CYTHERM is not set
1231# CONFIG_USB_PHIDGETKIT is not set 1277# CONFIG_USB_PHIDGETKIT is not set
1232# CONFIG_USB_PHIDGETSERVO is not set 1278# CONFIG_USB_PHIDGETSERVO is not set
1233# CONFIG_USB_IDMOUSE is not set 1279# CONFIG_USB_IDMOUSE is not set
1280CONFIG_USB_APPLEDISPLAY=m
1234# CONFIG_USB_SISUSBVGA is not set 1281# CONFIG_USB_SISUSBVGA is not set
1235# CONFIG_USB_LD is not set 1282# CONFIG_USB_LD is not set
1236# CONFIG_USB_TEST is not set 1283# CONFIG_USB_TEST is not set
@@ -1250,23 +1297,53 @@ CONFIG_USB_HIDDEV=y
1250# CONFIG_MMC is not set 1297# CONFIG_MMC is not set
1251 1298
1252# 1299#
1300# LED devices
1301#
1302# CONFIG_NEW_LEDS is not set
1303
1304#
1305# LED drivers
1306#
1307
1308#
1309# LED Triggers
1310#
1311
1312#
1253# InfiniBand support 1313# InfiniBand support
1254# 1314#
1255CONFIG_INFINIBAND=m 1315CONFIG_INFINIBAND=m
1256# CONFIG_INFINIBAND_USER_MAD is not set 1316# CONFIG_INFINIBAND_USER_MAD is not set
1257# CONFIG_INFINIBAND_USER_ACCESS is not set 1317# CONFIG_INFINIBAND_USER_ACCESS is not set
1318CONFIG_INFINIBAND_ADDR_TRANS=y
1258CONFIG_INFINIBAND_MTHCA=m 1319CONFIG_INFINIBAND_MTHCA=m
1259# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1320CONFIG_INFINIBAND_MTHCA_DEBUG=y
1260CONFIG_INFINIBAND_IPOIB=m 1321CONFIG_INFINIBAND_IPOIB=m
1261# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1322CONFIG_INFINIBAND_IPOIB_DEBUG=y
1323# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1262# CONFIG_INFINIBAND_SRP is not set 1324# CONFIG_INFINIBAND_SRP is not set
1325CONFIG_INFINIBAND_ISER=m
1263 1326
1264# 1327#
1265# SN Devices 1328# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1266# 1329#
1267 1330
1268# 1331#
1269# EDAC - error detection and reporting (RAS) 1332# Real Time Clock
1333#
1334# CONFIG_RTC_CLASS is not set
1335
1336#
1337# DMA Engine support
1338#
1339# CONFIG_DMA_ENGINE is not set
1340
1341#
1342# DMA Clients
1343#
1344
1345#
1346# DMA Devices
1270# 1347#
1271 1348
1272# 1349#
@@ -1298,7 +1375,6 @@ CONFIG_JFS_SECURITY=y
1298# CONFIG_JFS_STATISTICS is not set 1375# CONFIG_JFS_STATISTICS is not set
1299CONFIG_FS_POSIX_ACL=y 1376CONFIG_FS_POSIX_ACL=y
1300CONFIG_XFS_FS=m 1377CONFIG_XFS_FS=m
1301CONFIG_XFS_EXPORT=y
1302# CONFIG_XFS_QUOTA is not set 1378# CONFIG_XFS_QUOTA is not set
1303CONFIG_XFS_SECURITY=y 1379CONFIG_XFS_SECURITY=y
1304CONFIG_XFS_POSIX_ACL=y 1380CONFIG_XFS_POSIX_ACL=y
@@ -1307,6 +1383,7 @@ CONFIG_XFS_POSIX_ACL=y
1307# CONFIG_MINIX_FS is not set 1383# CONFIG_MINIX_FS is not set
1308# CONFIG_ROMFS_FS is not set 1384# CONFIG_ROMFS_FS is not set
1309CONFIG_INOTIFY=y 1385CONFIG_INOTIFY=y
1386CONFIG_INOTIFY_USER=y
1310# CONFIG_QUOTA is not set 1387# CONFIG_QUOTA is not set
1311CONFIG_DNOTIFY=y 1388CONFIG_DNOTIFY=y
1312CONFIG_AUTOFS_FS=y 1389CONFIG_AUTOFS_FS=y
@@ -1342,7 +1419,6 @@ CONFIG_TMPFS=y
1342CONFIG_HUGETLBFS=y 1419CONFIG_HUGETLBFS=y
1343CONFIG_HUGETLB_PAGE=y 1420CONFIG_HUGETLB_PAGE=y
1344CONFIG_RAMFS=y 1421CONFIG_RAMFS=y
1345# CONFIG_RELAYFS_FS is not set
1346# CONFIG_CONFIGFS_FS is not set 1422# CONFIG_CONFIGFS_FS is not set
1347 1423
1348# 1424#
@@ -1388,8 +1464,10 @@ CONFIG_RPCSEC_GSS_SPKM3=m
1388# CONFIG_SMB_FS is not set 1464# CONFIG_SMB_FS is not set
1389CONFIG_CIFS=m 1465CONFIG_CIFS=m
1390# CONFIG_CIFS_STATS is not set 1466# CONFIG_CIFS_STATS is not set
1467# CONFIG_CIFS_WEAK_PW_HASH is not set
1391CONFIG_CIFS_XATTR=y 1468CONFIG_CIFS_XATTR=y
1392CONFIG_CIFS_POSIX=y 1469CONFIG_CIFS_POSIX=y
1470# CONFIG_CIFS_DEBUG2 is not set
1393# CONFIG_CIFS_EXPERIMENTAL is not set 1471# CONFIG_CIFS_EXPERIMENTAL is not set
1394# CONFIG_NCP_FS is not set 1472# CONFIG_NCP_FS is not set
1395# CONFIG_CODA_FS is not set 1473# CONFIG_CODA_FS is not set
@@ -1470,6 +1548,9 @@ CONFIG_CRC32=y
1470CONFIG_LIBCRC32C=m 1548CONFIG_LIBCRC32C=m
1471CONFIG_ZLIB_INFLATE=y 1549CONFIG_ZLIB_INFLATE=y
1472CONFIG_ZLIB_DEFLATE=m 1550CONFIG_ZLIB_DEFLATE=m
1551CONFIG_TEXTSEARCH=y
1552CONFIG_TEXTSEARCH_KMP=m
1553CONFIG_PLIST=y
1473 1554
1474# 1555#
1475# Instrumentation Support 1556# Instrumentation Support
@@ -1483,14 +1564,19 @@ CONFIG_OPROFILE=y
1483# 1564#
1484# CONFIG_PRINTK_TIME is not set 1565# CONFIG_PRINTK_TIME is not set
1485CONFIG_MAGIC_SYSRQ=y 1566CONFIG_MAGIC_SYSRQ=y
1567# CONFIG_UNUSED_SYMBOLS is not set
1486CONFIG_DEBUG_KERNEL=y 1568CONFIG_DEBUG_KERNEL=y
1487CONFIG_LOG_BUF_SHIFT=17 1569CONFIG_LOG_BUF_SHIFT=17
1488CONFIG_DETECT_SOFTLOCKUP=y 1570CONFIG_DETECT_SOFTLOCKUP=y
1489# CONFIG_SCHEDSTATS is not set 1571# CONFIG_SCHEDSTATS is not set
1490# CONFIG_DEBUG_SLAB is not set 1572# CONFIG_DEBUG_SLAB is not set
1491CONFIG_DEBUG_MUTEXES=y 1573# CONFIG_DEBUG_RT_MUTEXES is not set
1574# CONFIG_RT_MUTEX_TESTER is not set
1492# CONFIG_DEBUG_SPINLOCK is not set 1575# CONFIG_DEBUG_SPINLOCK is not set
1576CONFIG_DEBUG_MUTEXES=y
1577# CONFIG_DEBUG_RWSEMS is not set
1493# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1578# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1579# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1494# CONFIG_DEBUG_KOBJECT is not set 1580# CONFIG_DEBUG_KOBJECT is not set
1495# CONFIG_DEBUG_INFO is not set 1581# CONFIG_DEBUG_INFO is not set
1496CONFIG_DEBUG_FS=y 1582CONFIG_DEBUG_FS=y
@@ -1504,11 +1590,7 @@ CONFIG_XMON=y
1504# CONFIG_XMON_DEFAULT is not set 1590# CONFIG_XMON_DEFAULT is not set
1505CONFIG_IRQSTACKS=y 1591CONFIG_IRQSTACKS=y
1506CONFIG_BOOTX_TEXT=y 1592CONFIG_BOOTX_TEXT=y
1507# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1593# CONFIG_PPC_EARLY_DEBUG is not set
1508# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1509# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1510# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1511# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1512 1594
1513# 1595#
1514# Security options 1596# Security options
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index c18e8600d78f..a8cdf312e1b0 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_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.18-rc3 3# Linux kernel version: 2.6.18-rc6
4# Tue Aug 8 09:14:48 2006 4# Sun Sep 10 10:45:12 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -128,7 +128,6 @@ CONFIG_PPC_PSERIES=y
128# CONFIG_UDBG_RTAS_CONSOLE is not set 128# CONFIG_UDBG_RTAS_CONSOLE is not set
129CONFIG_XICS=y 129CONFIG_XICS=y
130# CONFIG_U3_DART is not set 130# CONFIG_U3_DART is not set
131CONFIG_MPIC=y
132CONFIG_PPC_RTAS=y 131CONFIG_PPC_RTAS=y
133CONFIG_RTAS_ERROR_LOGGING=y 132CONFIG_RTAS_ERROR_LOGGING=y
134CONFIG_RTAS_PROC=y 133CONFIG_RTAS_PROC=y
@@ -140,6 +139,7 @@ CONFIG_IBMEBUS=y
140# CONFIG_PPC_970_NAP is not set 139# CONFIG_PPC_970_NAP is not set
141# CONFIG_CPU_FREQ is not set 140# CONFIG_CPU_FREQ is not set
142# CONFIG_WANT_EARLY_SERIAL is not set 141# CONFIG_WANT_EARLY_SERIAL is not set
142CONFIG_MPIC=y
143 143
144# 144#
145# Kernel options 145# Kernel options
@@ -196,6 +196,7 @@ CONFIG_ISA_DMA_API=y
196# Bus options 196# Bus options
197# 197#
198CONFIG_GENERIC_ISA_DMA=y 198CONFIG_GENERIC_ISA_DMA=y
199# CONFIG_MPIC_WEIRD is not set
199CONFIG_PPC_I8259=y 200CONFIG_PPC_I8259=y
200# CONFIG_PPC_INDIRECT_PCI is not set 201# CONFIG_PPC_INDIRECT_PCI is not set
201CONFIG_PCI=y 202CONFIG_PCI=y
@@ -790,7 +791,6 @@ CONFIG_SERIAL_JSM=m
790CONFIG_UNIX98_PTYS=y 791CONFIG_UNIX98_PTYS=y
791CONFIG_LEGACY_PTYS=y 792CONFIG_LEGACY_PTYS=y
792CONFIG_LEGACY_PTY_COUNT=256 793CONFIG_LEGACY_PTY_COUNT=256
793# CONFIG_BRIQ_PANEL is not set
794# CONFIG_PRINTER is not set 794# CONFIG_PRINTER is not set
795# CONFIG_PPDEV is not set 795# CONFIG_PPDEV is not set
796# CONFIG_TIPAR is not set 796# CONFIG_TIPAR is not set
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-19 12:29:56 -0500