aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-22 12:21:02 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-22 12:21:02 -0500
commitb4a2c87dada12010239b4d5f8f9bc0eb964a614f (patch)
treeb33903197ae17defc3d61b8d8d744a3e87c22686 /arch
parente45521a8d44da2c4efd17fc8e853f7917e99b57a (diff)
parente89debcd18a3ef74b27894e479d6b9e658fc6de6 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update defconfigs [POWERPC] atomic_dec_if_positive sign extension fix [POWERPC] Fix OF node refcnt underflow in 836x and 832x platform code [POWERPC] Make it blatantly clear; mpc5200 device tree is not yet stable [POWERPC] Fix broken DMA on non-LPAR pSeries [POWERPC] Fix cell's mmio nvram to properly parse device tree [POWERPC] Remove bogus sanity check in pci -> OF node code
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/dts/lite5200.dts6
-rw-r--r--arch/powerpc/boot/dts/lite5200b.dts6
-rw-r--r--arch/powerpc/configs/cell_defconfig6
-rw-r--r--arch/powerpc/configs/chrp32_defconfig161
-rw-r--r--arch/powerpc/configs/g5_defconfig237
-rw-r--r--arch/powerpc/configs/iseries_defconfig132
-rw-r--r--arch/powerpc/configs/linkstation_defconfig111
-rw-r--r--arch/powerpc/configs/lite5200_defconfig39
-rw-r--r--arch/powerpc/configs/maple_defconfig91
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig175
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig187
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig97
-rw-r--r--arch/powerpc/configs/mpc8360emds_defconfig105
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig89
-rw-r--r--arch/powerpc/configs/mpc8560_ads_defconfig96
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig96
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig98
-rw-r--r--arch/powerpc/configs/pmac32_defconfig202
-rw-r--r--arch/powerpc/configs/ppc64_defconfig5
-rw-r--r--arch/powerpc/configs/ps3_defconfig39
-rw-r--r--arch/powerpc/configs/pseries_defconfig224
-rw-r--r--arch/powerpc/kernel/pci_32.c5
-rw-r--r--arch/powerpc/platforms/83xx/mpc832x_mds.c2
-rw-r--r--arch/powerpc/platforms/83xx/mpc8360e_pb.c2
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c3
-rw-r--r--arch/powerpc/sysdev/mmio_nvram.c40
26 files changed, 1687 insertions, 567 deletions
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index a8efb59f5dd7..186870704ad9 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -10,6 +10,12 @@
10 * option) any later version. 10 * option) any later version.
11 */ 11 */
12 12
13/*
14 * WARNING: Do not depend on this tree layout remaining static just yet.
15 * The MPC5200 device tree conventions are still in flux
16 * Keep an eye on the linuxppc-dev mailing list for more details
17 */
18
13/ { 19/ {
14 model = "Lite5200"; 20 model = "Lite5200";
15 compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx"; 21 compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx";
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 1aabee432d86..5bb2760d7c30 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -10,6 +10,12 @@
10 * option) any later version. 10 * option) any later version.
11 */ 11 */
12 12
13/*
14 * WARNING: Do not depend on this tree layout remaining static just yet.
15 * The MPC5200 device tree conventions are still in flux
16 * Keep an eye on the linuxppc-dev mailing list for more details
17 */
18
13/ { 19/ {
14 model = "Lite5200b"; 20 model = "Lite5200b";
15 compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx"; 21 compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx";
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index d1d25152f74f..e956548da00c 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_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.20-rc1 3# Linux kernel version: 2.6.20-rc5
4# Tue Dec 19 14:59:53 2006 4# Mon Jan 22 22:12:56 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -245,7 +245,6 @@ CONFIG_GENERIC_ISA_DMA=y
245CONFIG_PCI=y 245CONFIG_PCI=y
246CONFIG_PCI_DOMAINS=y 246CONFIG_PCI_DOMAINS=y
247CONFIG_PCIEPORTBUS=y 247CONFIG_PCIEPORTBUS=y
248# CONFIG_PCI_MULTITHREAD_PROBE is not set
249# CONFIG_PCI_DEBUG is not set 248# CONFIG_PCI_DEBUG is not set
250 249
251# 250#
@@ -854,7 +853,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
854CONFIG_SERIAL_CORE=y 853CONFIG_SERIAL_CORE=y
855CONFIG_SERIAL_CORE_CONSOLE=y 854CONFIG_SERIAL_CORE_CONSOLE=y
856# CONFIG_SERIAL_JSM is not set 855# CONFIG_SERIAL_JSM is not set
857CONFIG_SERIAL_OF_PLATFORM=y
858CONFIG_UNIX98_PTYS=y 856CONFIG_UNIX98_PTYS=y
859# CONFIG_LEGACY_PTYS is not set 857# CONFIG_LEGACY_PTYS is not set
860CONFIG_HVC_DRIVER=y 858CONFIG_HVC_DRIVER=y
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index fee72f8a2fb7..029c9a0e730c 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:22:54 2006 4# Mon Jan 22 22:12:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23CONFIG_GENERIC_TBSYNC=y 24CONFIG_GENERIC_TBSYNC=y
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24# CONFIG_DEFAULT_UIMAGE is not set 27# CONFIG_DEFAULT_UIMAGE is not set
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29CONFIG_CLASSIC32=y 32CONFIG_CLASSIC32=y
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -38,6 +40,8 @@ CONFIG_CLASSIC32=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_6xx=y 41CONFIG_6xx=y
40CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41# CONFIG_ALTIVEC is not set 45# CONFIG_ALTIVEC is not set
42CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
@@ -59,18 +63,22 @@ CONFIG_LOCALVERSION=""
59# CONFIG_LOCALVERSION_AUTO is not set 63# CONFIG_LOCALVERSION_AUTO is not set
60CONFIG_SWAP=y 64CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
62CONFIG_POSIX_MQUEUE=y 67CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
65CONFIG_SYSCTL=y 70# CONFIG_UTS_NS is not set
66# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
69# CONFIG_CPUSETS is not set 74# CONFIG_CPUSETS is not set
75CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
71CONFIG_INITRAMFS_SOURCE="" 77CONFIG_INITRAMFS_SOURCE=""
72# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 78# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
79CONFIG_SYSCTL=y
73# CONFIG_EMBEDDED is not set 80# CONFIG_EMBEDDED is not set
81CONFIG_SYSCTL_SYSCALL=y
74CONFIG_KALLSYMS=y 82CONFIG_KALLSYMS=y
75# CONFIG_KALLSYMS_ALL is not set 83# CONFIG_KALLSYMS_ALL is not set
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 84# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -79,12 +87,12 @@ CONFIG_PRINTK=y
79CONFIG_BUG=y 87CONFIG_BUG=y
80CONFIG_ELF_CORE=y 88CONFIG_ELF_CORE=y
81CONFIG_BASE_FULL=y 89CONFIG_BASE_FULL=y
82CONFIG_RT_MUTEXES=y
83CONFIG_FUTEX=y 90CONFIG_FUTEX=y
84CONFIG_EPOLL=y 91CONFIG_EPOLL=y
85CONFIG_SHMEM=y 92CONFIG_SHMEM=y
86CONFIG_SLAB=y 93CONFIG_SLAB=y
87CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
95CONFIG_RT_MUTEXES=y
88# CONFIG_TINY_SHMEM is not set 96# CONFIG_TINY_SHMEM is not set
89CONFIG_BASE_SMALL=0 97CONFIG_BASE_SMALL=0
90# CONFIG_SLOB is not set 98# CONFIG_SLOB is not set
@@ -103,6 +111,7 @@ CONFIG_STOP_MACHINE=y
103# 111#
104# Block layer 112# Block layer
105# 113#
114CONFIG_BLOCK=y
106CONFIG_LBD=y 115CONFIG_LBD=y
107# CONFIG_BLK_DEV_IO_TRACE is not set 116# CONFIG_BLK_DEV_IO_TRACE is not set
108# CONFIG_LSF is not set 117# CONFIG_LSF is not set
@@ -124,13 +133,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
124# Platform support 133# Platform support
125# 134#
126CONFIG_PPC_MULTIPLATFORM=y 135CONFIG_PPC_MULTIPLATFORM=y
127# CONFIG_PPC_ISERIES is not set
128# CONFIG_EMBEDDED6xx is not set 136# CONFIG_EMBEDDED6xx is not set
129# CONFIG_APUS is not set 137# CONFIG_APUS is not set
130CONFIG_PPC_CHRP=y 138CONFIG_PPC_CHRP=y
139# CONFIG_PPC_MPC52xx is not set
140# CONFIG_PPC_EFIKA is not set
141# CONFIG_PPC_LITE5200 is not set
131# CONFIG_PPC_PMAC is not set 142# CONFIG_PPC_PMAC is not set
132# CONFIG_PPC_CELL is not set 143# CONFIG_PPC_CELL is not set
133# CONFIG_PPC_CELL_NATIVE is not set 144# CONFIG_PPC_CELL_NATIVE is not set
145CONFIG_PPC_NATIVE=y
134# CONFIG_UDBG_RTAS_CONSOLE is not set 146# CONFIG_UDBG_RTAS_CONSOLE is not set
135CONFIG_PPC_RTAS=y 147CONFIG_PPC_RTAS=y
136# CONFIG_RTAS_ERROR_LOGGING is not set 148# CONFIG_RTAS_ERROR_LOGGING is not set
@@ -138,6 +150,8 @@ CONFIG_RTAS_PROC=y
138# CONFIG_MMIO_NVRAM is not set 150# CONFIG_MMIO_NVRAM is not set
139CONFIG_PPC_MPC106=y 151CONFIG_PPC_MPC106=y
140# CONFIG_PPC_970_NAP is not set 152# CONFIG_PPC_970_NAP is not set
153# CONFIG_PPC_INDIRECT_IO is not set
154# CONFIG_GENERIC_IOMAP is not set
141# CONFIG_CPU_FREQ is not set 155# CONFIG_CPU_FREQ is not set
142# CONFIG_TAU is not set 156# CONFIG_TAU is not set
143# CONFIG_WANT_EARLY_SERIAL is not set 157# CONFIG_WANT_EARLY_SERIAL is not set
@@ -149,6 +163,7 @@ CONFIG_MPIC=y
149CONFIG_HIGHMEM=y 163CONFIG_HIGHMEM=y
150# CONFIG_HZ_100 is not set 164# CONFIG_HZ_100 is not set
151CONFIG_HZ_250=y 165CONFIG_HZ_250=y
166# CONFIG_HZ_300 is not set
152# CONFIG_HZ_1000 is not set 167# CONFIG_HZ_1000 is not set
153CONFIG_HZ=250 168CONFIG_HZ=250
154CONFIG_PREEMPT_NONE=y 169CONFIG_PREEMPT_NONE=y
@@ -161,6 +176,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
161# CONFIG_KEXEC is not set 176# CONFIG_KEXEC is not set
162CONFIG_IRQ_ALL_CPUS=y 177CONFIG_IRQ_ALL_CPUS=y
163CONFIG_ARCH_FLATMEM_ENABLE=y 178CONFIG_ARCH_FLATMEM_ENABLE=y
179CONFIG_ARCH_POPULATES_NODE_MAP=y
164CONFIG_SELECT_MEMORY_MODEL=y 180CONFIG_SELECT_MEMORY_MODEL=y
165CONFIG_FLATMEM_MANUAL=y 181CONFIG_FLATMEM_MANUAL=y
166# CONFIG_DISCONTIGMEM_MANUAL is not set 182# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -243,10 +259,13 @@ CONFIG_SYN_COOKIES=y
243# CONFIG_INET_TUNNEL is not set 259# CONFIG_INET_TUNNEL is not set
244# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 260# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
245# CONFIG_INET_XFRM_MODE_TUNNEL is not set 261# CONFIG_INET_XFRM_MODE_TUNNEL is not set
262# CONFIG_INET_XFRM_MODE_BEET is not set
246CONFIG_INET_DIAG=y 263CONFIG_INET_DIAG=y
247CONFIG_INET_TCP_DIAG=y 264CONFIG_INET_TCP_DIAG=y
248# CONFIG_TCP_CONG_ADVANCED is not set 265# CONFIG_TCP_CONG_ADVANCED is not set
249CONFIG_TCP_CONG_BIC=y 266CONFIG_TCP_CONG_CUBIC=y
267CONFIG_DEFAULT_TCP_CONG="cubic"
268# CONFIG_TCP_MD5SIG is not set
250 269
251# 270#
252# IP: Virtual Server Configuration 271# IP: Virtual Server Configuration
@@ -263,24 +282,29 @@ CONFIG_NETFILTER=y
263# Core Netfilter Configuration 282# Core Netfilter Configuration
264# 283#
265# CONFIG_NETFILTER_NETLINK is not set 284# CONFIG_NETFILTER_NETLINK is not set
285CONFIG_NF_CONNTRACK_ENABLED=m
286CONFIG_NF_CONNTRACK_SUPPORT=y
287# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
288CONFIG_NF_CONNTRACK=m
289# CONFIG_NF_CT_ACCT is not set
290# CONFIG_NF_CONNTRACK_MARK is not set
291# CONFIG_NF_CONNTRACK_EVENTS is not set
292# CONFIG_NF_CT_PROTO_SCTP is not set
293# CONFIG_NF_CONNTRACK_AMANDA is not set
294CONFIG_NF_CONNTRACK_FTP=m
295# CONFIG_NF_CONNTRACK_H323 is not set
296CONFIG_NF_CONNTRACK_IRC=m
297# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
298# CONFIG_NF_CONNTRACK_PPTP is not set
299CONFIG_NF_CONNTRACK_SIP=m
300CONFIG_NF_CONNTRACK_TFTP=m
266# CONFIG_NETFILTER_XTABLES is not set 301# CONFIG_NETFILTER_XTABLES is not set
267 302
268# 303#
269# IP: Netfilter Configuration 304# IP: Netfilter Configuration
270# 305#
271CONFIG_IP_NF_CONNTRACK=m 306CONFIG_NF_CONNTRACK_IPV4=m
272# CONFIG_IP_NF_CT_ACCT is not set 307CONFIG_NF_CONNTRACK_PROC_COMPAT=y
273# CONFIG_IP_NF_CONNTRACK_MARK is not set
274# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
275# CONFIG_IP_NF_CT_PROTO_SCTP is not set
276CONFIG_IP_NF_FTP=m
277CONFIG_IP_NF_IRC=m
278# CONFIG_IP_NF_NETBIOS_NS is not set
279CONFIG_IP_NF_TFTP=m
280CONFIG_IP_NF_AMANDA=m
281# CONFIG_IP_NF_PPTP is not set
282# CONFIG_IP_NF_H323 is not set
283# CONFIG_IP_NF_SIP is not set
284# CONFIG_IP_NF_QUEUE is not set 308# CONFIG_IP_NF_QUEUE is not set
285 309
286# 310#
@@ -306,7 +330,6 @@ CONFIG_IP_NF_AMANDA=m
306# CONFIG_ATALK is not set 330# CONFIG_ATALK is not set
307# CONFIG_X25 is not set 331# CONFIG_X25 is not set
308# CONFIG_LAPB is not set 332# CONFIG_LAPB is not set
309# CONFIG_NET_DIVERT is not set
310# CONFIG_ECONET is not set 333# CONFIG_ECONET is not set
311# CONFIG_WAN_ROUTER is not set 334# CONFIG_WAN_ROUTER is not set
312 335
@@ -381,6 +404,12 @@ CONFIG_BLK_DEV_INITRD=y
381# CONFIG_ATA_OVER_ETH is not set 404# CONFIG_ATA_OVER_ETH is not set
382 405
383# 406#
407# Misc devices
408#
409# CONFIG_SGI_IOC4 is not set
410# CONFIG_TIFM_CORE is not set
411
412#
384# ATA/ATAPI/MFM/RLL support 413# ATA/ATAPI/MFM/RLL support
385# 414#
386CONFIG_IDE=y 415CONFIG_IDE=y
@@ -407,7 +436,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
407# CONFIG_BLK_DEV_OFFBOARD is not set 436# CONFIG_BLK_DEV_OFFBOARD is not set
408CONFIG_BLK_DEV_GENERIC=y 437CONFIG_BLK_DEV_GENERIC=y
409# CONFIG_BLK_DEV_OPTI621 is not set 438# CONFIG_BLK_DEV_OPTI621 is not set
410CONFIG_BLK_DEV_SL82C105=y
411CONFIG_BLK_DEV_IDEDMA_PCI=y 439CONFIG_BLK_DEV_IDEDMA_PCI=y
412# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 440# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
413CONFIG_IDEDMA_PCI_AUTO=y 441CONFIG_IDEDMA_PCI_AUTO=y
@@ -422,6 +450,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
422# CONFIG_BLK_DEV_CS5530 is not set 450# CONFIG_BLK_DEV_CS5530 is not set
423# CONFIG_BLK_DEV_HPT34X is not set 451# CONFIG_BLK_DEV_HPT34X is not set
424# CONFIG_BLK_DEV_HPT366 is not set 452# CONFIG_BLK_DEV_HPT366 is not set
453# CONFIG_BLK_DEV_JMICRON is not set
425# CONFIG_BLK_DEV_SC1200 is not set 454# CONFIG_BLK_DEV_SC1200 is not set
426# CONFIG_BLK_DEV_PIIX is not set 455# CONFIG_BLK_DEV_PIIX is not set
427# CONFIG_BLK_DEV_IT821X is not set 456# CONFIG_BLK_DEV_IT821X is not set
@@ -430,6 +459,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
430# CONFIG_BLK_DEV_PDC202XX_NEW is not set 459# CONFIG_BLK_DEV_PDC202XX_NEW is not set
431# CONFIG_BLK_DEV_SVWKS is not set 460# CONFIG_BLK_DEV_SVWKS is not set
432# CONFIG_BLK_DEV_SIIMAGE is not set 461# CONFIG_BLK_DEV_SIIMAGE is not set
462CONFIG_BLK_DEV_SL82C105=y
433# CONFIG_BLK_DEV_SLC90E66 is not set 463# CONFIG_BLK_DEV_SLC90E66 is not set
434# CONFIG_BLK_DEV_TRM290 is not set 464# CONFIG_BLK_DEV_TRM290 is not set
435CONFIG_BLK_DEV_VIA82CXXX=y 465CONFIG_BLK_DEV_VIA82CXXX=y
@@ -445,6 +475,8 @@ CONFIG_IDEDMA_AUTO=y
445# 475#
446# CONFIG_RAID_ATTRS is not set 476# CONFIG_RAID_ATTRS is not set
447CONFIG_SCSI=y 477CONFIG_SCSI=y
478# CONFIG_SCSI_TGT is not set
479# CONFIG_SCSI_NETLINK is not set
448CONFIG_SCSI_PROC_FS=y 480CONFIG_SCSI_PROC_FS=y
449 481
450# 482#
@@ -464,14 +496,16 @@ CONFIG_CHR_DEV_SG=y
464# CONFIG_SCSI_MULTI_LUN is not set 496# CONFIG_SCSI_MULTI_LUN is not set
465CONFIG_SCSI_CONSTANTS=y 497CONFIG_SCSI_CONSTANTS=y
466# CONFIG_SCSI_LOGGING is not set 498# CONFIG_SCSI_LOGGING is not set
499# CONFIG_SCSI_SCAN_ASYNC is not set
467 500
468# 501#
469# SCSI Transport Attributes 502# SCSI Transports
470# 503#
471CONFIG_SCSI_SPI_ATTRS=y 504CONFIG_SCSI_SPI_ATTRS=y
472# CONFIG_SCSI_FC_ATTRS is not set 505# CONFIG_SCSI_FC_ATTRS is not set
473# CONFIG_SCSI_ISCSI_ATTRS is not set 506# CONFIG_SCSI_ISCSI_ATTRS is not set
474# CONFIG_SCSI_SAS_ATTRS is not set 507# CONFIG_SCSI_SAS_ATTRS is not set
508# CONFIG_SCSI_SAS_LIBSAS is not set
475 509
476# 510#
477# SCSI low-level drivers 511# SCSI low-level drivers
@@ -487,12 +521,13 @@ CONFIG_SCSI_SPI_ATTRS=y
487# CONFIG_SCSI_AIC7XXX is not set 521# CONFIG_SCSI_AIC7XXX is not set
488# CONFIG_SCSI_AIC7XXX_OLD is not set 522# CONFIG_SCSI_AIC7XXX_OLD is not set
489# CONFIG_SCSI_AIC79XX is not set 523# CONFIG_SCSI_AIC79XX is not set
524# CONFIG_SCSI_AIC94XX is not set
490# CONFIG_SCSI_DPT_I2O is not set 525# CONFIG_SCSI_DPT_I2O is not set
491# CONFIG_SCSI_IN2000 is not set 526# CONFIG_SCSI_IN2000 is not set
527# CONFIG_SCSI_ARCMSR is not set
492# CONFIG_MEGARAID_NEWGEN is not set 528# CONFIG_MEGARAID_NEWGEN is not set
493# CONFIG_MEGARAID_LEGACY is not set 529# CONFIG_MEGARAID_LEGACY is not set
494# CONFIG_MEGARAID_SAS is not set 530# CONFIG_MEGARAID_SAS is not set
495# CONFIG_ATA is not set
496# CONFIG_SCSI_HPTIOP is not set 531# CONFIG_SCSI_HPTIOP is not set
497# CONFIG_SCSI_BUSLOGIC is not set 532# CONFIG_SCSI_BUSLOGIC is not set
498# CONFIG_SCSI_DMX3191D is not set 533# CONFIG_SCSI_DMX3191D is not set
@@ -506,17 +541,18 @@ CONFIG_SCSI_SPI_ATTRS=y
506# CONFIG_SCSI_INITIO is not set 541# CONFIG_SCSI_INITIO is not set
507# CONFIG_SCSI_INIA100 is not set 542# CONFIG_SCSI_INIA100 is not set
508# CONFIG_SCSI_NCR53C406A is not set 543# CONFIG_SCSI_NCR53C406A is not set
544# CONFIG_SCSI_STEX is not set
509CONFIG_SCSI_SYM53C8XX_2=y 545CONFIG_SCSI_SYM53C8XX_2=y
510CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 546CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
511CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 547CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
512CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 548CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
513CONFIG_SCSI_SYM53C8XX_MMIO=y 549CONFIG_SCSI_SYM53C8XX_MMIO=y
514# CONFIG_SCSI_IPR is not set
515# CONFIG_SCSI_PAS16 is not set 550# CONFIG_SCSI_PAS16 is not set
516# CONFIG_SCSI_PSI240I is not set 551# CONFIG_SCSI_PSI240I is not set
517# CONFIG_SCSI_QLOGIC_FAS is not set 552# CONFIG_SCSI_QLOGIC_FAS is not set
518# CONFIG_SCSI_QLOGIC_1280 is not set 553# CONFIG_SCSI_QLOGIC_1280 is not set
519# CONFIG_SCSI_QLA_FC is not set 554# CONFIG_SCSI_QLA_FC is not set
555# CONFIG_SCSI_QLA_ISCSI is not set
520# CONFIG_SCSI_LPFC is not set 556# CONFIG_SCSI_LPFC is not set
521# CONFIG_SCSI_SYM53C416 is not set 557# CONFIG_SCSI_SYM53C416 is not set
522# CONFIG_SCSI_DC395x is not set 558# CONFIG_SCSI_DC395x is not set
@@ -525,6 +561,12 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
525# CONFIG_SCSI_U14_34F is not set 561# CONFIG_SCSI_U14_34F is not set
526# CONFIG_SCSI_NSP32 is not set 562# CONFIG_SCSI_NSP32 is not set
527# CONFIG_SCSI_DEBUG is not set 563# CONFIG_SCSI_DEBUG is not set
564# CONFIG_SCSI_SRP is not set
565
566#
567# Serial ATA (prod) and Parallel ATA (experimental) drivers
568#
569# CONFIG_ATA is not set
528 570
529# 571#
530# Old CD-ROM drivers (not SCSI, not IDE) 572# Old CD-ROM drivers (not SCSI, not IDE)
@@ -557,6 +599,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
557# 599#
558# Macintosh device drivers 600# Macintosh device drivers
559# 601#
602# CONFIG_MAC_EMUMOUSEBTN is not set
560# CONFIG_WINDFARM is not set 603# CONFIG_WINDFARM is not set
561 604
562# 605#
@@ -607,6 +650,7 @@ CONFIG_DE4X5=y
607# CONFIG_NET_ISA is not set 650# CONFIG_NET_ISA is not set
608CONFIG_NET_PCI=y 651CONFIG_NET_PCI=y
609CONFIG_PCNET32=y 652CONFIG_PCNET32=y
653# CONFIG_PCNET32_NAPI is not set
610# CONFIG_AMD8111_ETH is not set 654# CONFIG_AMD8111_ETH is not set
611# CONFIG_ADAPTEC_STARFIRE is not set 655# CONFIG_ADAPTEC_STARFIRE is not set
612# CONFIG_AC3200 is not set 656# CONFIG_AC3200 is not set
@@ -655,6 +699,7 @@ CONFIG_MV643XX_ETH=y
655# CONFIG_MV643XX_ETH_0 is not set 699# CONFIG_MV643XX_ETH_0 is not set
656# CONFIG_MV643XX_ETH_1 is not set 700# CONFIG_MV643XX_ETH_1 is not set
657# CONFIG_MV643XX_ETH_2 is not set 701# CONFIG_MV643XX_ETH_2 is not set
702# CONFIG_QLA3XXX is not set
658 703
659# 704#
660# Ethernet (10000 Mbit) 705# Ethernet (10000 Mbit)
@@ -663,6 +708,7 @@ CONFIG_MV643XX_ETH=y
663# CONFIG_IXGB is not set 708# CONFIG_IXGB is not set
664# CONFIG_S2IO is not set 709# CONFIG_S2IO is not set
665# CONFIG_MYRI10GE is not set 710# CONFIG_MYRI10GE is not set
711# CONFIG_NETXEN_NIC is not set
666 712
667# 713#
668# Token Ring devices 714# Token Ring devices
@@ -690,6 +736,7 @@ CONFIG_PPP_BSDCOMP=m
690CONFIG_PPP_MPPE=m 736CONFIG_PPP_MPPE=m
691CONFIG_PPPOE=m 737CONFIG_PPPOE=m
692# CONFIG_SLIP is not set 738# CONFIG_SLIP is not set
739CONFIG_SLHC=m
693# CONFIG_NET_FC is not set 740# CONFIG_NET_FC is not set
694# CONFIG_SHAPER is not set 741# CONFIG_SHAPER is not set
695# CONFIG_NETCONSOLE is not set 742# CONFIG_NETCONSOLE is not set
@@ -710,6 +757,7 @@ CONFIG_PPPOE=m
710# Input device support 757# Input device support
711# 758#
712CONFIG_INPUT=y 759CONFIG_INPUT=y
760# CONFIG_INPUT_FF_MEMLESS is not set
713 761
714# 762#
715# Userland interfaces 763# Userland interfaces
@@ -732,6 +780,7 @@ CONFIG_KEYBOARD_ATKBD=y
732# CONFIG_KEYBOARD_LKKBD is not set 780# CONFIG_KEYBOARD_LKKBD is not set
733# CONFIG_KEYBOARD_XTKBD is not set 781# CONFIG_KEYBOARD_XTKBD is not set
734# CONFIG_KEYBOARD_NEWTON is not set 782# CONFIG_KEYBOARD_NEWTON is not set
783# CONFIG_KEYBOARD_STOWAWAY is not set
735CONFIG_INPUT_MOUSE=y 784CONFIG_INPUT_MOUSE=y
736CONFIG_MOUSE_PS2=y 785CONFIG_MOUSE_PS2=y
737# CONFIG_MOUSE_SERIAL is not set 786# CONFIG_MOUSE_SERIAL is not set
@@ -778,12 +827,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
778# 827#
779# Non-8250 serial port support 828# Non-8250 serial port support
780# 829#
830# CONFIG_SERIAL_UARTLITE is not set
781CONFIG_SERIAL_CORE=y 831CONFIG_SERIAL_CORE=y
782CONFIG_SERIAL_CORE_CONSOLE=y 832CONFIG_SERIAL_CORE_CONSOLE=y
783# CONFIG_SERIAL_JSM is not set 833# CONFIG_SERIAL_JSM is not set
784CONFIG_UNIX98_PTYS=y 834CONFIG_UNIX98_PTYS=y
785CONFIG_LEGACY_PTYS=y 835CONFIG_LEGACY_PTYS=y
786CONFIG_LEGACY_PTY_COUNT=256 836CONFIG_LEGACY_PTY_COUNT=256
837CONFIG_BRIQ_PANEL=m
787# CONFIG_HVC_RTAS is not set 838# CONFIG_HVC_RTAS is not set
788 839
789# 840#
@@ -802,10 +853,6 @@ CONFIG_GEN_RTC=y
802# CONFIG_DTLK is not set 853# CONFIG_DTLK is not set
803# CONFIG_R3964 is not set 854# CONFIG_R3964 is not set
804# CONFIG_APPLICOM is not set 855# CONFIG_APPLICOM is not set
805
806#
807# Ftape, the floppy tape device driver
808#
809# CONFIG_AGP is not set 856# CONFIG_AGP is not set
810# CONFIG_DRM is not set 857# CONFIG_DRM is not set
811# CONFIG_RAW_DRIVER is not set 858# CONFIG_RAW_DRIVER is not set
@@ -814,7 +861,6 @@ CONFIG_GEN_RTC=y
814# TPM devices 861# TPM devices
815# 862#
816# CONFIG_TCG_TPM is not set 863# CONFIG_TCG_TPM is not set
817# CONFIG_TELCLOCK is not set
818 864
819# 865#
820# I2C support 866# I2C support
@@ -881,6 +927,7 @@ CONFIG_I2C_ALGOBIT=y
881# 927#
882# Dallas's 1-wire bus 928# Dallas's 1-wire bus
883# 929#
930# CONFIG_W1 is not set
884 931
885# 932#
886# Hardware Monitoring support 933# Hardware Monitoring support
@@ -889,14 +936,9 @@ CONFIG_I2C_ALGOBIT=y
889# CONFIG_HWMON_VID is not set 936# CONFIG_HWMON_VID is not set
890 937
891# 938#
892# Misc devices
893#
894
895#
896# Multimedia devices 939# Multimedia devices
897# 940#
898# CONFIG_VIDEO_DEV is not set 941# CONFIG_VIDEO_DEV is not set
899CONFIG_VIDEO_V4L2=y
900 942
901# 943#
902# Digital Video Broadcasting Devices 944# Digital Video Broadcasting Devices
@@ -909,6 +951,7 @@ CONFIG_VIDEO_V4L2=y
909# 951#
910CONFIG_FIRMWARE_EDID=y 952CONFIG_FIRMWARE_EDID=y
911CONFIG_FB=y 953CONFIG_FB=y
954CONFIG_FB_DDC=y
912CONFIG_FB_CFB_FILLRECT=y 955CONFIG_FB_CFB_FILLRECT=y
913CONFIG_FB_CFB_COPYAREA=y 956CONFIG_FB_CFB_COPYAREA=y
914CONFIG_FB_CFB_IMAGEBLIT=y 957CONFIG_FB_CFB_IMAGEBLIT=y
@@ -949,6 +992,7 @@ CONFIG_FB_3DFX=y
949# CONFIG_FB_3DFX_ACCEL is not set 992# CONFIG_FB_3DFX_ACCEL is not set
950# CONFIG_FB_VOODOO1 is not set 993# CONFIG_FB_VOODOO1 is not set
951# CONFIG_FB_TRIDENT is not set 994# CONFIG_FB_TRIDENT is not set
995# CONFIG_FB_IBM_GXT4500 is not set
952# CONFIG_FB_VIRTUAL is not set 996# CONFIG_FB_VIRTUAL is not set
953 997
954# 998#
@@ -979,6 +1023,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
979# CONFIG_SOUND is not set 1023# CONFIG_SOUND is not set
980 1024
981# 1025#
1026# HID Devices
1027#
1028CONFIG_HID=y
1029
1030#
982# USB support 1031# USB support
983# 1032#
984CONFIG_USB_ARCH_HAS_HCD=y 1033CONFIG_USB_ARCH_HAS_HCD=y
@@ -993,6 +1042,7 @@ CONFIG_USB=y
993CONFIG_USB_DEVICEFS=y 1042CONFIG_USB_DEVICEFS=y
994# CONFIG_USB_BANDWIDTH is not set 1043# CONFIG_USB_BANDWIDTH is not set
995# CONFIG_USB_DYNAMIC_MINORS is not set 1044# CONFIG_USB_DYNAMIC_MINORS is not set
1045# CONFIG_USB_MULTITHREAD_PROBE is not set
996# CONFIG_USB_OTG is not set 1046# CONFIG_USB_OTG is not set
997 1047
998# 1048#
@@ -1034,13 +1084,13 @@ CONFIG_USB_STORAGE=m
1034# CONFIG_USB_STORAGE_JUMPSHOT is not set 1084# CONFIG_USB_STORAGE_JUMPSHOT is not set
1035# CONFIG_USB_STORAGE_ALAUDA is not set 1085# CONFIG_USB_STORAGE_ALAUDA is not set
1036# CONFIG_USB_STORAGE_ONETOUCH is not set 1086# CONFIG_USB_STORAGE_ONETOUCH is not set
1087# CONFIG_USB_STORAGE_KARMA is not set
1037# CONFIG_USB_LIBUSUAL is not set 1088# CONFIG_USB_LIBUSUAL is not set
1038 1089
1039# 1090#
1040# USB Input Devices 1091# USB Input Devices
1041# 1092#
1042CONFIG_USB_HID=y 1093CONFIG_USB_HID=y
1043CONFIG_USB_HIDINPUT=y
1044# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1094# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1045# CONFIG_HID_FF is not set 1095# CONFIG_HID_FF is not set
1046# CONFIG_USB_HIDDEV is not set 1096# CONFIG_USB_HIDDEV is not set
@@ -1070,6 +1120,7 @@ CONFIG_USB_HIDINPUT=y
1070# CONFIG_USB_KAWETH is not set 1120# CONFIG_USB_KAWETH is not set
1071# CONFIG_USB_PEGASUS is not set 1121# CONFIG_USB_PEGASUS is not set
1072# CONFIG_USB_RTL8150 is not set 1122# CONFIG_USB_RTL8150 is not set
1123# CONFIG_USB_USBNET_MII is not set
1073# CONFIG_USB_USBNET is not set 1124# CONFIG_USB_USBNET is not set
1074CONFIG_USB_MON=y 1125CONFIG_USB_MON=y
1075 1126
@@ -1087,6 +1138,7 @@ CONFIG_USB_MON=y
1087# 1138#
1088# CONFIG_USB_EMI62 is not set 1139# CONFIG_USB_EMI62 is not set
1089# CONFIG_USB_EMI26 is not set 1140# CONFIG_USB_EMI26 is not set
1141# CONFIG_USB_ADUTUX is not set
1090# CONFIG_USB_AUERSWALD is not set 1142# CONFIG_USB_AUERSWALD is not set
1091# CONFIG_USB_RIO500 is not set 1143# CONFIG_USB_RIO500 is not set
1092# CONFIG_USB_LEGOTOWER is not set 1144# CONFIG_USB_LEGOTOWER is not set
@@ -1094,12 +1146,13 @@ CONFIG_USB_MON=y
1094# CONFIG_USB_LED is not set 1146# CONFIG_USB_LED is not set
1095# CONFIG_USB_CYPRESS_CY7C63 is not set 1147# CONFIG_USB_CYPRESS_CY7C63 is not set
1096# CONFIG_USB_CYTHERM is not set 1148# CONFIG_USB_CYTHERM is not set
1097# CONFIG_USB_PHIDGETKIT is not set 1149# CONFIG_USB_PHIDGET is not set
1098# CONFIG_USB_PHIDGETSERVO is not set
1099# CONFIG_USB_IDMOUSE is not set 1150# CONFIG_USB_IDMOUSE is not set
1151# CONFIG_USB_FTDI_ELAN is not set
1100# CONFIG_USB_APPLEDISPLAY is not set 1152# CONFIG_USB_APPLEDISPLAY is not set
1101# CONFIG_USB_SISUSBVGA is not set 1153# CONFIG_USB_SISUSBVGA is not set
1102# CONFIG_USB_LD is not set 1154# CONFIG_USB_LD is not set
1155# CONFIG_USB_TRANCEVIBRATOR is not set
1103# CONFIG_USB_TEST is not set 1156# CONFIG_USB_TEST is not set
1104 1157
1105# 1158#
@@ -1157,6 +1210,10 @@ CONFIG_USB_MON=y
1157# 1210#
1158 1211
1159# 1212#
1213# Virtualization
1214#
1215
1216#
1160# File systems 1217# File systems
1161# 1218#
1162CONFIG_EXT2_FS=y 1219CONFIG_EXT2_FS=y
@@ -1166,6 +1223,7 @@ CONFIG_EXT3_FS=y
1166CONFIG_EXT3_FS_XATTR=y 1223CONFIG_EXT3_FS_XATTR=y
1167# CONFIG_EXT3_FS_POSIX_ACL is not set 1224# CONFIG_EXT3_FS_POSIX_ACL is not set
1168# CONFIG_EXT3_FS_SECURITY is not set 1225# CONFIG_EXT3_FS_SECURITY is not set
1226# CONFIG_EXT4DEV_FS is not set
1169CONFIG_JBD=y 1227CONFIG_JBD=y
1170# CONFIG_JBD_DEBUG is not set 1228# CONFIG_JBD_DEBUG is not set
1171CONFIG_FS_MBCACHE=y 1229CONFIG_FS_MBCACHE=y
@@ -1173,6 +1231,7 @@ CONFIG_FS_MBCACHE=y
1173# CONFIG_JFS_FS is not set 1231# CONFIG_JFS_FS is not set
1174# CONFIG_FS_POSIX_ACL is not set 1232# CONFIG_FS_POSIX_ACL is not set
1175# CONFIG_XFS_FS is not set 1233# CONFIG_XFS_FS is not set
1234# CONFIG_GFS2_FS is not set
1176# CONFIG_OCFS2_FS is not set 1235# CONFIG_OCFS2_FS is not set
1177# CONFIG_MINIX_FS is not set 1236# CONFIG_MINIX_FS is not set
1178# CONFIG_ROMFS_FS is not set 1237# CONFIG_ROMFS_FS is not set
@@ -1207,8 +1266,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1207# 1266#
1208CONFIG_PROC_FS=y 1267CONFIG_PROC_FS=y
1209CONFIG_PROC_KCORE=y 1268CONFIG_PROC_KCORE=y
1269CONFIG_PROC_SYSCTL=y
1210CONFIG_SYSFS=y 1270CONFIG_SYSFS=y
1211CONFIG_TMPFS=y 1271CONFIG_TMPFS=y
1272# CONFIG_TMPFS_POSIX_ACL is not set
1212# CONFIG_HUGETLB_PAGE is not set 1273# CONFIG_HUGETLB_PAGE is not set
1213CONFIG_RAMFS=y 1274CONFIG_RAMFS=y
1214# CONFIG_CONFIGFS_FS is not set 1275# CONFIG_CONFIGFS_FS is not set
@@ -1308,17 +1369,22 @@ CONFIG_NLS_ISO8859_1=m
1308# CONFIG_NLS_UTF8 is not set 1369# CONFIG_NLS_UTF8 is not set
1309 1370
1310# 1371#
1372# Distributed Lock Manager
1373#
1374# CONFIG_DLM is not set
1375
1376#
1311# Library routines 1377# Library routines
1312# 1378#
1379CONFIG_BITREVERSE=y
1313CONFIG_CRC_CCITT=m 1380CONFIG_CRC_CCITT=m
1314# CONFIG_CRC16 is not set 1381# CONFIG_CRC16 is not set
1315CONFIG_CRC32=y 1382CONFIG_CRC32=y
1316# CONFIG_LIBCRC32C is not set 1383# CONFIG_LIBCRC32C is not set
1317CONFIG_ZLIB_INFLATE=m 1384CONFIG_ZLIB_INFLATE=m
1318CONFIG_ZLIB_DEFLATE=m 1385CONFIG_ZLIB_DEFLATE=m
1319CONFIG_TEXTSEARCH=y
1320CONFIG_TEXTSEARCH_KMP=m
1321CONFIG_PLIST=y 1386CONFIG_PLIST=y
1387CONFIG_IOMAP_COPY=y
1322 1388
1323# 1389#
1324# Instrumentation Support 1390# Instrumentation Support
@@ -1329,8 +1395,11 @@ CONFIG_PLIST=y
1329# Kernel hacking 1395# Kernel hacking
1330# 1396#
1331# CONFIG_PRINTK_TIME is not set 1397# CONFIG_PRINTK_TIME is not set
1398CONFIG_ENABLE_MUST_CHECK=y
1332CONFIG_MAGIC_SYSRQ=y 1399CONFIG_MAGIC_SYSRQ=y
1333# CONFIG_UNUSED_SYMBOLS is not set 1400# CONFIG_UNUSED_SYMBOLS is not set
1401# CONFIG_DEBUG_FS is not set
1402# CONFIG_HEADERS_CHECK is not set
1334CONFIG_DEBUG_KERNEL=y 1403CONFIG_DEBUG_KERNEL=y
1335CONFIG_LOG_BUF_SHIFT=15 1404CONFIG_LOG_BUF_SHIFT=15
1336CONFIG_DETECT_SOFTLOCKUP=y 1405CONFIG_DETECT_SOFTLOCKUP=y
@@ -1345,14 +1414,16 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
1345# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1414# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1346# CONFIG_DEBUG_KOBJECT is not set 1415# CONFIG_DEBUG_KOBJECT is not set
1347# CONFIG_DEBUG_HIGHMEM is not set 1416# CONFIG_DEBUG_HIGHMEM is not set
1417CONFIG_DEBUG_BUGVERBOSE=y
1348# CONFIG_DEBUG_INFO is not set 1418# CONFIG_DEBUG_INFO is not set
1349# CONFIG_DEBUG_FS is not set
1350# CONFIG_DEBUG_VM is not set 1419# CONFIG_DEBUG_VM is not set
1420# CONFIG_DEBUG_LIST is not set
1351CONFIG_FORCED_INLINING=y 1421CONFIG_FORCED_INLINING=y
1352# CONFIG_RCU_TORTURE_TEST is not set 1422# CONFIG_RCU_TORTURE_TEST is not set
1353CONFIG_DEBUGGER=y 1423CONFIG_DEBUGGER=y
1354CONFIG_XMON=y 1424CONFIG_XMON=y
1355CONFIG_XMON_DEFAULT=y 1425CONFIG_XMON_DEFAULT=y
1426CONFIG_XMON_DISASSEMBLY=y
1356# CONFIG_BDI_SWITCH is not set 1427# CONFIG_BDI_SWITCH is not set
1357# CONFIG_BOOTX_TEXT is not set 1428# CONFIG_BOOTX_TEXT is not set
1358# CONFIG_PPC_EARLY_DEBUG is not set 1429# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1367,7 +1438,11 @@ CONFIG_XMON_DEFAULT=y
1367# Cryptographic options 1438# Cryptographic options
1368# 1439#
1369CONFIG_CRYPTO=y 1440CONFIG_CRYPTO=y
1441CONFIG_CRYPTO_ALGAPI=m
1442CONFIG_CRYPTO_BLKCIPHER=m
1443CONFIG_CRYPTO_MANAGER=m
1370# CONFIG_CRYPTO_HMAC is not set 1444# CONFIG_CRYPTO_HMAC is not set
1445# CONFIG_CRYPTO_XCBC is not set
1371# CONFIG_CRYPTO_NULL is not set 1446# CONFIG_CRYPTO_NULL is not set
1372# CONFIG_CRYPTO_MD4 is not set 1447# CONFIG_CRYPTO_MD4 is not set
1373# CONFIG_CRYPTO_MD5 is not set 1448# CONFIG_CRYPTO_MD5 is not set
@@ -1376,6 +1451,10 @@ CONFIG_CRYPTO_SHA1=m
1376# CONFIG_CRYPTO_SHA512 is not set 1451# CONFIG_CRYPTO_SHA512 is not set
1377# CONFIG_CRYPTO_WP512 is not set 1452# CONFIG_CRYPTO_WP512 is not set
1378# CONFIG_CRYPTO_TGR192 is not set 1453# CONFIG_CRYPTO_TGR192 is not set
1454# CONFIG_CRYPTO_GF128MUL is not set
1455CONFIG_CRYPTO_ECB=m
1456CONFIG_CRYPTO_CBC=m
1457# CONFIG_CRYPTO_LRW is not set
1379# CONFIG_CRYPTO_DES is not set 1458# CONFIG_CRYPTO_DES is not set
1380# CONFIG_CRYPTO_BLOWFISH is not set 1459# CONFIG_CRYPTO_BLOWFISH is not set
1381# CONFIG_CRYPTO_TWOFISH is not set 1460# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 92d0a9dd0b8f..7724847f702a 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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:22:55 2006 4# Mon Jan 22 22:15:04 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_ARCH_HAS_ILOG2_U64=y
13CONFIG_GENERIC_HWEIGHT=y 15CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 17CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,6 +24,8 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 24CONFIG_PPC_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 25# CONFIG_PPC_UDBG_16550 is not set
24CONFIG_GENERIC_TBSYNC=y 26CONFIG_GENERIC_TBSYNC=y
27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y
25# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
26 30
27# 31#
@@ -30,6 +34,9 @@ CONFIG_GENERIC_TBSYNC=y
30CONFIG_POWER4_ONLY=y 34CONFIG_POWER4_ONLY=y
31CONFIG_POWER4=y 35CONFIG_POWER4=y
32CONFIG_PPC_FPU=y 36CONFIG_PPC_FPU=y
37# CONFIG_PPC_DCR_NATIVE is not set
38# CONFIG_PPC_DCR_MMIO is not set
39# CONFIG_PPC_OF_PLATFORM_PCI is not set
33CONFIG_ALTIVEC=y 40CONFIG_ALTIVEC=y
34CONFIG_PPC_STD_MMU=y 41CONFIG_PPC_STD_MMU=y
35CONFIG_VIRT_CPU_ACCOUNTING=y 42CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -51,18 +58,22 @@ CONFIG_LOCALVERSION=""
51CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
52CONFIG_SWAP=y 59CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
61# CONFIG_IPC_NS is not set
54CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
55# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
56# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
57CONFIG_SYSCTL=y 65# CONFIG_UTS_NS is not set
58# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
59CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
60CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
61# CONFIG_CPUSETS is not set 69# CONFIG_CPUSETS is not set
70CONFIG_SYSFS_DEPRECATED=y
62# CONFIG_RELAY is not set 71# CONFIG_RELAY is not set
63CONFIG_INITRAMFS_SOURCE="" 72CONFIG_INITRAMFS_SOURCE=""
64CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
74CONFIG_SYSCTL=y
65# CONFIG_EMBEDDED is not set 75# CONFIG_EMBEDDED is not set
76CONFIG_SYSCTL_SYSCALL=y
66CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
67# CONFIG_KALLSYMS_ALL is not set 78# CONFIG_KALLSYMS_ALL is not set
68# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -71,12 +82,12 @@ CONFIG_PRINTK=y
71CONFIG_BUG=y 82CONFIG_BUG=y
72CONFIG_ELF_CORE=y 83CONFIG_ELF_CORE=y
73CONFIG_BASE_FULL=y 84CONFIG_BASE_FULL=y
74CONFIG_RT_MUTEXES=y
75CONFIG_FUTEX=y 85CONFIG_FUTEX=y
76CONFIG_EPOLL=y 86CONFIG_EPOLL=y
77CONFIG_SHMEM=y 87CONFIG_SHMEM=y
78CONFIG_SLAB=y 88CONFIG_SLAB=y
79CONFIG_VM_EVENT_COUNTERS=y 89CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_RT_MUTEXES=y
80# CONFIG_TINY_SHMEM is not set 91# CONFIG_TINY_SHMEM is not set
81CONFIG_BASE_SMALL=0 92CONFIG_BASE_SMALL=0
82# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
@@ -95,6 +106,7 @@ CONFIG_STOP_MACHINE=y
95# 106#
96# Block layer 107# Block layer
97# 108#
109CONFIG_BLOCK=y
98# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_IO_TRACE is not set
99 111
100# 112#
@@ -114,23 +126,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
114# Platform support 126# Platform support
115# 127#
116CONFIG_PPC_MULTIPLATFORM=y 128CONFIG_PPC_MULTIPLATFORM=y
117# CONFIG_PPC_ISERIES is not set
118# CONFIG_EMBEDDED6xx is not set 129# CONFIG_EMBEDDED6xx is not set
119# CONFIG_APUS is not set 130# CONFIG_APUS is not set
120# CONFIG_PPC_PSERIES is not set 131# CONFIG_PPC_PSERIES is not set
132# CONFIG_PPC_ISERIES is not set
133# CONFIG_PPC_MPC52xx is not set
121CONFIG_PPC_PMAC=y 134CONFIG_PPC_PMAC=y
122CONFIG_PPC_PMAC64=y 135CONFIG_PPC_PMAC64=y
123# CONFIG_PPC_MAPLE is not set 136# CONFIG_PPC_MAPLE is not set
137# CONFIG_PPC_PASEMI is not set
124# CONFIG_PPC_CELL is not set 138# CONFIG_PPC_CELL is not set
125# CONFIG_PPC_CELL_NATIVE is not set 139# CONFIG_PPC_CELL_NATIVE is not set
126# CONFIG_PPC_IBM_CELL_BLADE is not set 140# CONFIG_PPC_IBM_CELL_BLADE is not set
127# CONFIG_UDBG_RTAS_CONSOLE is not set 141# CONFIG_PPC_PS3 is not set
142CONFIG_PPC_NATIVE=y
128CONFIG_U3_DART=y 143CONFIG_U3_DART=y
129# CONFIG_PPC_RTAS is not set 144# CONFIG_PPC_RTAS is not set
130# CONFIG_MMIO_NVRAM is not set 145# CONFIG_MMIO_NVRAM is not set
131CONFIG_MPIC_BROKEN_U3=y 146CONFIG_MPIC_BROKEN_U3=y
132# CONFIG_PPC_MPC106 is not set 147# CONFIG_PPC_MPC106 is not set
133CONFIG_PPC_970_NAP=y 148CONFIG_PPC_970_NAP=y
149# CONFIG_PPC_INDIRECT_IO is not set
150# CONFIG_GENERIC_IOMAP is not set
134CONFIG_CPU_FREQ=y 151CONFIG_CPU_FREQ=y
135CONFIG_CPU_FREQ_TABLE=y 152CONFIG_CPU_FREQ_TABLE=y
136# CONFIG_CPU_FREQ_DEBUG is not set 153# CONFIG_CPU_FREQ_DEBUG is not set
@@ -152,6 +169,7 @@ CONFIG_MPIC=y
152# 169#
153# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
154CONFIG_HZ_250=y 171CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set
155# CONFIG_HZ_1000 is not set 173# CONFIG_HZ_1000 is not set
156CONFIG_HZ=250 174CONFIG_HZ=250
157CONFIG_PREEMPT_NONE=y 175CONFIG_PREEMPT_NONE=y
@@ -171,6 +189,7 @@ CONFIG_IRQ_ALL_CPUS=y
171CONFIG_ARCH_SELECT_MEMORY_MODEL=y 189CONFIG_ARCH_SELECT_MEMORY_MODEL=y
172CONFIG_ARCH_FLATMEM_ENABLE=y 190CONFIG_ARCH_FLATMEM_ENABLE=y
173CONFIG_ARCH_SPARSEMEM_ENABLE=y 191CONFIG_ARCH_SPARSEMEM_ENABLE=y
192CONFIG_ARCH_POPULATES_NODE_MAP=y
174CONFIG_SELECT_MEMORY_MODEL=y 193CONFIG_SELECT_MEMORY_MODEL=y
175CONFIG_FLATMEM_MANUAL=y 194CONFIG_FLATMEM_MANUAL=y
176# CONFIG_DISCONTIGMEM_MANUAL is not set 195# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -225,6 +244,7 @@ CONFIG_PACKET=y
225CONFIG_UNIX=y 244CONFIG_UNIX=y
226CONFIG_XFRM=y 245CONFIG_XFRM=y
227CONFIG_XFRM_USER=m 246CONFIG_XFRM_USER=m
247# CONFIG_XFRM_SUB_POLICY is not set
228CONFIG_NET_KEY=m 248CONFIG_NET_KEY=m
229CONFIG_INET=y 249CONFIG_INET=y
230CONFIG_IP_MULTICAST=y 250CONFIG_IP_MULTICAST=y
@@ -243,10 +263,13 @@ CONFIG_INET_XFRM_TUNNEL=m
243CONFIG_INET_TUNNEL=y 263CONFIG_INET_TUNNEL=y
244CONFIG_INET_XFRM_MODE_TRANSPORT=y 264CONFIG_INET_XFRM_MODE_TRANSPORT=y
245CONFIG_INET_XFRM_MODE_TUNNEL=y 265CONFIG_INET_XFRM_MODE_TUNNEL=y
266CONFIG_INET_XFRM_MODE_BEET=y
246CONFIG_INET_DIAG=y 267CONFIG_INET_DIAG=y
247CONFIG_INET_TCP_DIAG=y 268CONFIG_INET_TCP_DIAG=y
248# CONFIG_TCP_CONG_ADVANCED is not set 269# CONFIG_TCP_CONG_ADVANCED is not set
249CONFIG_TCP_CONG_BIC=y 270CONFIG_TCP_CONG_CUBIC=y
271CONFIG_DEFAULT_TCP_CONG="cubic"
272# CONFIG_TCP_MD5SIG is not set
250 273
251# 274#
252# IP: Virtual Server Configuration 275# IP: Virtual Server Configuration
@@ -263,24 +286,29 @@ CONFIG_NETFILTER=y
263# Core Netfilter Configuration 286# Core Netfilter Configuration
264# 287#
265# CONFIG_NETFILTER_NETLINK is not set 288# CONFIG_NETFILTER_NETLINK is not set
289CONFIG_NF_CONNTRACK_ENABLED=m
290CONFIG_NF_CONNTRACK_SUPPORT=y
291# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
292CONFIG_NF_CONNTRACK=m
293# CONFIG_NF_CT_ACCT is not set
294CONFIG_NF_CONNTRACK_MARK=y
295CONFIG_NF_CONNTRACK_EVENTS=y
296# CONFIG_NF_CT_PROTO_SCTP is not set
297# CONFIG_NF_CONNTRACK_AMANDA is not set
298CONFIG_NF_CONNTRACK_FTP=m
299# CONFIG_NF_CONNTRACK_H323 is not set
300CONFIG_NF_CONNTRACK_IRC=m
301# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
302# CONFIG_NF_CONNTRACK_PPTP is not set
303# CONFIG_NF_CONNTRACK_SIP is not set
304CONFIG_NF_CONNTRACK_TFTP=m
266# CONFIG_NETFILTER_XTABLES is not set 305# CONFIG_NETFILTER_XTABLES is not set
267 306
268# 307#
269# IP: Netfilter Configuration 308# IP: Netfilter Configuration
270# 309#
271CONFIG_IP_NF_CONNTRACK=m 310CONFIG_NF_CONNTRACK_IPV4=m
272CONFIG_IP_NF_CT_ACCT=y 311CONFIG_NF_CONNTRACK_PROC_COMPAT=y
273CONFIG_IP_NF_CONNTRACK_MARK=y
274CONFIG_IP_NF_CONNTRACK_EVENTS=y
275CONFIG_IP_NF_CT_PROTO_SCTP=m
276CONFIG_IP_NF_FTP=m
277CONFIG_IP_NF_IRC=m
278# CONFIG_IP_NF_NETBIOS_NS is not set
279CONFIG_IP_NF_TFTP=m
280CONFIG_IP_NF_AMANDA=m
281# CONFIG_IP_NF_PPTP is not set
282# CONFIG_IP_NF_H323 is not set
283# CONFIG_IP_NF_SIP is not set
284CONFIG_IP_NF_QUEUE=m 312CONFIG_IP_NF_QUEUE=m
285 313
286# 314#
@@ -307,7 +335,6 @@ CONFIG_LLC=y
307# CONFIG_ATALK is not set 335# CONFIG_ATALK is not set
308# CONFIG_X25 is not set 336# CONFIG_X25 is not set
309# CONFIG_LAPB is not set 337# CONFIG_LAPB is not set
310# CONFIG_NET_DIVERT is not set
311# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
312# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
313 340
@@ -382,6 +409,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
382# CONFIG_ATA_OVER_ETH is not set 409# CONFIG_ATA_OVER_ETH is not set
383 410
384# 411#
412# Misc devices
413#
414# CONFIG_SGI_IOC4 is not set
415# CONFIG_TIFM_CORE is not set
416
417#
385# ATA/ATAPI/MFM/RLL support 418# ATA/ATAPI/MFM/RLL support
386# 419#
387CONFIG_IDE=y 420CONFIG_IDE=y
@@ -408,7 +441,6 @@ CONFIG_BLK_DEV_IDEPCI=y
408# CONFIG_BLK_DEV_OFFBOARD is not set 441# CONFIG_BLK_DEV_OFFBOARD is not set
409# CONFIG_BLK_DEV_GENERIC is not set 442# CONFIG_BLK_DEV_GENERIC is not set
410# CONFIG_BLK_DEV_OPTI621 is not set 443# CONFIG_BLK_DEV_OPTI621 is not set
411# CONFIG_BLK_DEV_SL82C105 is not set
412CONFIG_BLK_DEV_IDEDMA_PCI=y 444CONFIG_BLK_DEV_IDEDMA_PCI=y
413# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 445# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
414CONFIG_IDEDMA_PCI_AUTO=y 446CONFIG_IDEDMA_PCI_AUTO=y
@@ -423,6 +455,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
423# CONFIG_BLK_DEV_CS5530 is not set 455# CONFIG_BLK_DEV_CS5530 is not set
424# CONFIG_BLK_DEV_HPT34X is not set 456# CONFIG_BLK_DEV_HPT34X is not set
425# CONFIG_BLK_DEV_HPT366 is not set 457# CONFIG_BLK_DEV_HPT366 is not set
458# CONFIG_BLK_DEV_JMICRON is not set
426# CONFIG_BLK_DEV_SC1200 is not set 459# CONFIG_BLK_DEV_SC1200 is not set
427# CONFIG_BLK_DEV_PIIX is not set 460# CONFIG_BLK_DEV_PIIX is not set
428# CONFIG_BLK_DEV_IT821X is not set 461# CONFIG_BLK_DEV_IT821X is not set
@@ -431,6 +464,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
431# CONFIG_BLK_DEV_PDC202XX_NEW is not set 464# CONFIG_BLK_DEV_PDC202XX_NEW is not set
432# CONFIG_BLK_DEV_SVWKS is not set 465# CONFIG_BLK_DEV_SVWKS is not set
433# CONFIG_BLK_DEV_SIIMAGE is not set 466# CONFIG_BLK_DEV_SIIMAGE is not set
467# CONFIG_BLK_DEV_SL82C105 is not set
434# CONFIG_BLK_DEV_SLC90E66 is not set 468# CONFIG_BLK_DEV_SLC90E66 is not set
435# CONFIG_BLK_DEV_TRM290 is not set 469# CONFIG_BLK_DEV_TRM290 is not set
436# CONFIG_BLK_DEV_VIA82CXXX is not set 470# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -448,6 +482,8 @@ CONFIG_IDEDMA_AUTO=y
448# 482#
449# CONFIG_RAID_ATTRS is not set 483# CONFIG_RAID_ATTRS is not set
450CONFIG_SCSI=y 484CONFIG_SCSI=y
485# CONFIG_SCSI_TGT is not set
486# CONFIG_SCSI_NETLINK is not set
451CONFIG_SCSI_PROC_FS=y 487CONFIG_SCSI_PROC_FS=y
452 488
453# 489#
@@ -467,14 +503,16 @@ CONFIG_CHR_DEV_SG=y
467CONFIG_SCSI_MULTI_LUN=y 503CONFIG_SCSI_MULTI_LUN=y
468CONFIG_SCSI_CONSTANTS=y 504CONFIG_SCSI_CONSTANTS=y
469# CONFIG_SCSI_LOGGING is not set 505# CONFIG_SCSI_LOGGING is not set
506# CONFIG_SCSI_SCAN_ASYNC is not set
470 507
471# 508#
472# SCSI Transport Attributes 509# SCSI Transports
473# 510#
474CONFIG_SCSI_SPI_ATTRS=y 511CONFIG_SCSI_SPI_ATTRS=y
475# CONFIG_SCSI_FC_ATTRS is not set 512# CONFIG_SCSI_FC_ATTRS is not set
476# CONFIG_SCSI_ISCSI_ATTRS is not set 513# CONFIG_SCSI_ISCSI_ATTRS is not set
477# CONFIG_SCSI_SAS_ATTRS is not set 514# CONFIG_SCSI_SAS_ATTRS is not set
515# CONFIG_SCSI_SAS_LIBSAS is not set
478 516
479# 517#
480# SCSI low-level drivers 518# SCSI low-level drivers
@@ -487,26 +525,12 @@ CONFIG_SCSI_SPI_ATTRS=y
487# CONFIG_SCSI_AIC7XXX is not set 525# CONFIG_SCSI_AIC7XXX is not set
488# CONFIG_SCSI_AIC7XXX_OLD is not set 526# CONFIG_SCSI_AIC7XXX_OLD is not set
489# CONFIG_SCSI_AIC79XX is not set 527# CONFIG_SCSI_AIC79XX is not set
528# CONFIG_SCSI_AIC94XX is not set
529# CONFIG_SCSI_ARCMSR is not set
490# CONFIG_MEGARAID_NEWGEN is not set 530# CONFIG_MEGARAID_NEWGEN is not set
491# CONFIG_MEGARAID_LEGACY is not set 531# CONFIG_MEGARAID_LEGACY is not set
492# CONFIG_MEGARAID_SAS is not set 532# CONFIG_MEGARAID_SAS is not set
493CONFIG_ATA=y
494# CONFIG_SATA_AHCI is not set
495CONFIG_SATA_SVW=y
496# CONFIG_SCSI_ATA_PIIX is not set
497# CONFIG_SATA_MV is not set
498# CONFIG_SATA_NV is not set
499# CONFIG_SCSI_PDC_ADMA is not set
500# CONFIG_SCSI_HPTIOP is not set 533# CONFIG_SCSI_HPTIOP is not set
501# CONFIG_SATA_QSTOR is not set
502# CONFIG_SATA_PROMISE is not set
503# CONFIG_SATA_SX4 is not set
504# CONFIG_SATA_SIL is not set
505# CONFIG_SATA_SIL24 is not set
506# CONFIG_SATA_SIS is not set
507# CONFIG_SATA_ULI is not set
508# CONFIG_SATA_VIA is not set
509# CONFIG_SATA_VITESSE is not set
510# CONFIG_SCSI_BUSLOGIC is not set 534# CONFIG_SCSI_BUSLOGIC is not set
511# CONFIG_SCSI_DMX3191D is not set 535# CONFIG_SCSI_DMX3191D is not set
512# CONFIG_SCSI_EATA is not set 536# CONFIG_SCSI_EATA is not set
@@ -515,14 +539,71 @@ CONFIG_SATA_SVW=y
515# CONFIG_SCSI_IPS is not set 539# CONFIG_SCSI_IPS is not set
516# CONFIG_SCSI_INITIO is not set 540# CONFIG_SCSI_INITIO is not set
517# CONFIG_SCSI_INIA100 is not set 541# CONFIG_SCSI_INIA100 is not set
542# CONFIG_SCSI_STEX is not set
518# CONFIG_SCSI_SYM53C8XX_2 is not set 543# CONFIG_SCSI_SYM53C8XX_2 is not set
519# CONFIG_SCSI_IPR is not set 544# CONFIG_SCSI_IPR is not set
520# CONFIG_SCSI_QLOGIC_1280 is not set 545# CONFIG_SCSI_QLOGIC_1280 is not set
521# CONFIG_SCSI_QLA_FC is not set 546# CONFIG_SCSI_QLA_FC is not set
547# CONFIG_SCSI_QLA_ISCSI is not set
522# CONFIG_SCSI_LPFC is not set 548# CONFIG_SCSI_LPFC is not set
523# CONFIG_SCSI_DC395x is not set 549# CONFIG_SCSI_DC395x is not set
524# CONFIG_SCSI_DC390T is not set 550# CONFIG_SCSI_DC390T is not set
525# CONFIG_SCSI_DEBUG is not set 551# CONFIG_SCSI_DEBUG is not set
552# CONFIG_SCSI_SRP is not set
553
554#
555# Serial ATA (prod) and Parallel ATA (experimental) drivers
556#
557CONFIG_ATA=y
558# CONFIG_SATA_AHCI is not set
559CONFIG_SATA_SVW=y
560# CONFIG_ATA_PIIX is not set
561# CONFIG_SATA_MV is not set
562# CONFIG_SATA_NV is not set
563# CONFIG_PDC_ADMA is not set
564# CONFIG_SATA_QSTOR is not set
565# CONFIG_SATA_PROMISE is not set
566# CONFIG_SATA_SX4 is not set
567# CONFIG_SATA_SIL is not set
568# CONFIG_SATA_SIL24 is not set
569# CONFIG_SATA_SIS is not set
570# CONFIG_SATA_ULI is not set
571# CONFIG_SATA_VIA is not set
572# CONFIG_SATA_VITESSE is not set
573# CONFIG_PATA_ALI is not set
574# CONFIG_PATA_AMD is not set
575# CONFIG_PATA_ARTOP is not set
576# CONFIG_PATA_ATIIXP is not set
577# CONFIG_PATA_CMD64X is not set
578# CONFIG_PATA_CS5520 is not set
579# CONFIG_PATA_CS5530 is not set
580# CONFIG_PATA_CYPRESS is not set
581# CONFIG_PATA_EFAR is not set
582# CONFIG_ATA_GENERIC is not set
583# CONFIG_PATA_HPT366 is not set
584# CONFIG_PATA_HPT37X is not set
585# CONFIG_PATA_HPT3X2N is not set
586# CONFIG_PATA_HPT3X3 is not set
587# CONFIG_PATA_IT821X is not set
588# CONFIG_PATA_JMICRON is not set
589# CONFIG_PATA_TRIFLEX is not set
590# CONFIG_PATA_MARVELL is not set
591# CONFIG_PATA_MPIIX is not set
592# CONFIG_PATA_OLDPIIX is not set
593# CONFIG_PATA_NETCELL is not set
594# CONFIG_PATA_NS87410 is not set
595# CONFIG_PATA_OPTI is not set
596# CONFIG_PATA_OPTIDMA is not set
597# CONFIG_PATA_PDC_OLD is not set
598# CONFIG_PATA_RADISYS is not set
599# CONFIG_PATA_RZ1000 is not set
600# CONFIG_PATA_SC1200 is not set
601# CONFIG_PATA_SERVERWORKS is not set
602# CONFIG_PATA_PDC2027X is not set
603# CONFIG_PATA_SIL680 is not set
604# CONFIG_PATA_SIS is not set
605# CONFIG_PATA_VIA is not set
606# CONFIG_PATA_WINBOND is not set
526 607
527# 608#
528# Multi-device support (RAID and LVM) 609# Multi-device support (RAID and LVM)
@@ -537,6 +618,7 @@ CONFIG_MD_RAID10=m
537CONFIG_MD_MULTIPATH=m 618CONFIG_MD_MULTIPATH=m
538CONFIG_MD_FAULTY=m 619CONFIG_MD_FAULTY=m
539CONFIG_BLK_DEV_DM=y 620CONFIG_BLK_DEV_DM=y
621# CONFIG_DM_DEBUG is not set
540CONFIG_DM_CRYPT=m 622CONFIG_DM_CRYPT=m
541CONFIG_DM_SNAPSHOT=m 623CONFIG_DM_SNAPSHOT=m
542CONFIG_DM_MIRROR=m 624CONFIG_DM_MIRROR=m
@@ -591,11 +673,13 @@ CONFIG_IEEE1394_RAWIO=y
591CONFIG_ADB_PMU=y 673CONFIG_ADB_PMU=y
592# CONFIG_ADB_PMU_LED is not set 674# CONFIG_ADB_PMU_LED is not set
593CONFIG_PMAC_SMU=y 675CONFIG_PMAC_SMU=y
676CONFIG_MAC_EMUMOUSEBTN=y
594CONFIG_THERM_PM72=y 677CONFIG_THERM_PM72=y
595CONFIG_WINDFARM=y 678CONFIG_WINDFARM=y
596CONFIG_WINDFARM_PM81=y 679CONFIG_WINDFARM_PM81=y
597CONFIG_WINDFARM_PM91=y 680CONFIG_WINDFARM_PM91=y
598CONFIG_WINDFARM_PM112=y 681CONFIG_WINDFARM_PM112=y
682# CONFIG_PMAC_RACKMETER is not set
599 683
600# 684#
601# Network device support 685# Network device support
@@ -652,7 +736,7 @@ CONFIG_E1000=y
652# CONFIG_SK98LIN is not set 736# CONFIG_SK98LIN is not set
653CONFIG_TIGON3=y 737CONFIG_TIGON3=y
654# CONFIG_BNX2 is not set 738# CONFIG_BNX2 is not set
655# CONFIG_MV643XX_ETH is not set 739# CONFIG_QLA3XXX is not set
656 740
657# 741#
658# Ethernet (10000 Mbit) 742# Ethernet (10000 Mbit)
@@ -661,6 +745,7 @@ CONFIG_TIGON3=y
661# CONFIG_IXGB is not set 745# CONFIG_IXGB is not set
662# CONFIG_S2IO is not set 746# CONFIG_S2IO is not set
663# CONFIG_MYRI10GE is not set 747# CONFIG_MYRI10GE is not set
748# CONFIG_NETXEN_NIC is not set
664 749
665# 750#
666# Token Ring devices 751# Token Ring devices
@@ -691,6 +776,7 @@ CONFIG_PPP_BSDCOMP=m
691# CONFIG_PPP_MPPE is not set 776# CONFIG_PPP_MPPE is not set
692CONFIG_PPPOE=m 777CONFIG_PPPOE=m
693# CONFIG_SLIP is not set 778# CONFIG_SLIP is not set
779CONFIG_SLHC=m
694# CONFIG_NET_FC is not set 780# CONFIG_NET_FC is not set
695# CONFIG_SHAPER is not set 781# CONFIG_SHAPER is not set
696# CONFIG_NETCONSOLE is not set 782# CONFIG_NETCONSOLE is not set
@@ -711,6 +797,7 @@ CONFIG_PPPOE=m
711# Input device support 797# Input device support
712# 798#
713CONFIG_INPUT=y 799CONFIG_INPUT=y
800CONFIG_INPUT_FF_MEMLESS=y
714 801
715# 802#
716# Userland interfaces 803# Userland interfaces
@@ -733,6 +820,7 @@ CONFIG_INPUT_KEYBOARD=y
733# CONFIG_KEYBOARD_LKKBD is not set 820# CONFIG_KEYBOARD_LKKBD is not set
734# CONFIG_KEYBOARD_XTKBD is not set 821# CONFIG_KEYBOARD_XTKBD is not set
735# CONFIG_KEYBOARD_NEWTON is not set 822# CONFIG_KEYBOARD_NEWTON is not set
823# CONFIG_KEYBOARD_STOWAWAY is not set
736CONFIG_INPUT_MOUSE=y 824CONFIG_INPUT_MOUSE=y
737# CONFIG_MOUSE_PS2 is not set 825# CONFIG_MOUSE_PS2 is not set
738# CONFIG_MOUSE_SERIAL is not set 826# CONFIG_MOUSE_SERIAL is not set
@@ -789,13 +877,7 @@ CONFIG_GEN_RTC=y
789# CONFIG_DTLK is not set 877# CONFIG_DTLK is not set
790# CONFIG_R3964 is not set 878# CONFIG_R3964 is not set
791# CONFIG_APPLICOM is not set 879# CONFIG_APPLICOM is not set
792
793#
794# Ftape, the floppy tape device driver
795#
796CONFIG_AGP=m 880CONFIG_AGP=m
797# CONFIG_AGP_SIS is not set
798# CONFIG_AGP_VIA is not set
799CONFIG_AGP_UNINORTH=m 881CONFIG_AGP_UNINORTH=m
800# CONFIG_DRM is not set 882# CONFIG_DRM is not set
801CONFIG_RAW_DRIVER=y 883CONFIG_RAW_DRIVER=y
@@ -806,7 +888,6 @@ CONFIG_MAX_RAW_DEVS=256
806# TPM devices 888# TPM devices
807# 889#
808# CONFIG_TCG_TPM is not set 890# CONFIG_TCG_TPM is not set
809# CONFIG_TELCLOCK is not set
810 891
811# 892#
812# I2C support 893# I2C support
@@ -871,6 +952,7 @@ CONFIG_I2C_POWERMAC=y
871# 952#
872# Dallas's 1-wire bus 953# Dallas's 1-wire bus
873# 954#
955# CONFIG_W1 is not set
874 956
875# 957#
876# Hardware Monitoring support 958# Hardware Monitoring support
@@ -879,14 +961,9 @@ CONFIG_I2C_POWERMAC=y
879# CONFIG_HWMON_VID is not set 961# CONFIG_HWMON_VID is not set
880 962
881# 963#
882# Misc devices
883#
884
885#
886# Multimedia devices 964# Multimedia devices
887# 965#
888# CONFIG_VIDEO_DEV is not set 966# CONFIG_VIDEO_DEV is not set
889CONFIG_VIDEO_V4L2=y
890 967
891# 968#
892# Digital Video Broadcasting Devices 969# Digital Video Broadcasting Devices
@@ -899,6 +976,7 @@ CONFIG_VIDEO_V4L2=y
899# 976#
900CONFIG_FIRMWARE_EDID=y 977CONFIG_FIRMWARE_EDID=y
901CONFIG_FB=y 978CONFIG_FB=y
979CONFIG_FB_DDC=y
902CONFIG_FB_CFB_FILLRECT=y 980CONFIG_FB_CFB_FILLRECT=y
903CONFIG_FB_CFB_COPYAREA=y 981CONFIG_FB_CFB_COPYAREA=y
904CONFIG_FB_CFB_IMAGEBLIT=y 982CONFIG_FB_CFB_IMAGEBLIT=y
@@ -930,6 +1008,7 @@ CONFIG_FB_RADEON_I2C=y
930# CONFIG_FB_3DFX is not set 1008# CONFIG_FB_3DFX is not set
931# CONFIG_FB_VOODOO1 is not set 1009# CONFIG_FB_VOODOO1 is not set
932# CONFIG_FB_TRIDENT is not set 1010# CONFIG_FB_TRIDENT is not set
1011# CONFIG_FB_IBM_GXT4500 is not set
933# CONFIG_FB_VIRTUAL is not set 1012# CONFIG_FB_VIRTUAL is not set
934 1013
935# 1014#
@@ -1080,6 +1159,11 @@ CONFIG_SND_USB_AUDIO=m
1080# CONFIG_SOUND_PRIME is not set 1159# CONFIG_SOUND_PRIME is not set
1081 1160
1082# 1161#
1162# HID Devices
1163#
1164CONFIG_HID=y
1165
1166#
1083# USB support 1167# USB support
1084# 1168#
1085CONFIG_USB_ARCH_HAS_HCD=y 1169CONFIG_USB_ARCH_HAS_HCD=y
@@ -1094,6 +1178,7 @@ CONFIG_USB=y
1094CONFIG_USB_DEVICEFS=y 1178CONFIG_USB_DEVICEFS=y
1095# CONFIG_USB_BANDWIDTH is not set 1179# CONFIG_USB_BANDWIDTH is not set
1096# CONFIG_USB_DYNAMIC_MINORS is not set 1180# CONFIG_USB_DYNAMIC_MINORS is not set
1181# CONFIG_USB_MULTITHREAD_PROBE is not set
1097# CONFIG_USB_OTG is not set 1182# CONFIG_USB_OTG is not set
1098 1183
1099# 1184#
@@ -1135,18 +1220,19 @@ CONFIG_USB_STORAGE_SDDR55=y
1135CONFIG_USB_STORAGE_JUMPSHOT=y 1220CONFIG_USB_STORAGE_JUMPSHOT=y
1136# CONFIG_USB_STORAGE_ALAUDA is not set 1221# CONFIG_USB_STORAGE_ALAUDA is not set
1137# CONFIG_USB_STORAGE_ONETOUCH is not set 1222# CONFIG_USB_STORAGE_ONETOUCH is not set
1223# CONFIG_USB_STORAGE_KARMA is not set
1138# CONFIG_USB_LIBUSUAL is not set 1224# CONFIG_USB_LIBUSUAL is not set
1139 1225
1140# 1226#
1141# USB Input Devices 1227# USB Input Devices
1142# 1228#
1143CONFIG_USB_HID=y 1229CONFIG_USB_HID=y
1144CONFIG_USB_HIDINPUT=y
1145# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1230# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1146CONFIG_HID_FF=y 1231CONFIG_HID_FF=y
1147CONFIG_HID_PID=y 1232CONFIG_HID_PID=y
1148CONFIG_LOGITECH_FF=y 1233CONFIG_LOGITECH_FF=y
1149CONFIG_THRUSTMASTER_FF=y 1234CONFIG_THRUSTMASTER_FF=y
1235# CONFIG_ZEROPLUS_FF is not set
1150CONFIG_USB_HIDDEV=y 1236CONFIG_USB_HIDDEV=y
1151# CONFIG_USB_AIPTEK is not set 1237# CONFIG_USB_AIPTEK is not set
1152# CONFIG_USB_WACOM is not set 1238# CONFIG_USB_WACOM is not set
@@ -1174,12 +1260,14 @@ CONFIG_USB_CATC=m
1174CONFIG_USB_KAWETH=m 1260CONFIG_USB_KAWETH=m
1175CONFIG_USB_PEGASUS=m 1261CONFIG_USB_PEGASUS=m
1176CONFIG_USB_RTL8150=m 1262CONFIG_USB_RTL8150=m
1263# CONFIG_USB_USBNET_MII is not set
1177CONFIG_USB_USBNET=m 1264CONFIG_USB_USBNET=m
1178# CONFIG_USB_NET_AX8817X is not set 1265# CONFIG_USB_NET_AX8817X is not set
1179CONFIG_USB_NET_CDCETHER=m 1266CONFIG_USB_NET_CDCETHER=m
1180# CONFIG_USB_NET_GL620A is not set 1267# CONFIG_USB_NET_GL620A is not set
1181# CONFIG_USB_NET_NET1080 is not set 1268# CONFIG_USB_NET_NET1080 is not set
1182# CONFIG_USB_NET_PLUSB is not set 1269# CONFIG_USB_NET_PLUSB is not set
1270# CONFIG_USB_NET_MCS7830 is not set
1183# CONFIG_USB_NET_RNDIS_HOST is not set 1271# CONFIG_USB_NET_RNDIS_HOST is not set
1184# CONFIG_USB_NET_CDC_SUBSET is not set 1272# CONFIG_USB_NET_CDC_SUBSET is not set
1185# CONFIG_USB_NET_ZAURUS is not set 1273# CONFIG_USB_NET_ZAURUS is not set
@@ -1194,6 +1282,7 @@ CONFIG_USB_MON=y
1194# 1282#
1195CONFIG_USB_SERIAL=m 1283CONFIG_USB_SERIAL=m
1196CONFIG_USB_SERIAL_GENERIC=y 1284CONFIG_USB_SERIAL_GENERIC=y
1285# CONFIG_USB_SERIAL_AIRCABLE is not set
1197# CONFIG_USB_SERIAL_AIRPRIME is not set 1286# CONFIG_USB_SERIAL_AIRPRIME is not set
1198# CONFIG_USB_SERIAL_ARK3116 is not set 1287# CONFIG_USB_SERIAL_ARK3116 is not set
1199CONFIG_USB_SERIAL_BELKIN=m 1288CONFIG_USB_SERIAL_BELKIN=m
@@ -1228,6 +1317,8 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1228CONFIG_USB_SERIAL_KLSI=m 1317CONFIG_USB_SERIAL_KLSI=m
1229CONFIG_USB_SERIAL_KOBIL_SCT=m 1318CONFIG_USB_SERIAL_KOBIL_SCT=m
1230CONFIG_USB_SERIAL_MCT_U232=m 1319CONFIG_USB_SERIAL_MCT_U232=m
1320# CONFIG_USB_SERIAL_MOS7720 is not set
1321# CONFIG_USB_SERIAL_MOS7840 is not set
1231# CONFIG_USB_SERIAL_NAVMAN is not set 1322# CONFIG_USB_SERIAL_NAVMAN is not set
1232CONFIG_USB_SERIAL_PL2303=m 1323CONFIG_USB_SERIAL_PL2303=m
1233# CONFIG_USB_SERIAL_HP4X is not set 1324# CONFIG_USB_SERIAL_HP4X is not set
@@ -1239,6 +1330,7 @@ CONFIG_USB_SERIAL_CYBERJACK=m
1239CONFIG_USB_SERIAL_XIRCOM=m 1330CONFIG_USB_SERIAL_XIRCOM=m
1240# CONFIG_USB_SERIAL_OPTION is not set 1331# CONFIG_USB_SERIAL_OPTION is not set
1241CONFIG_USB_SERIAL_OMNINET=m 1332CONFIG_USB_SERIAL_OMNINET=m
1333# CONFIG_USB_SERIAL_DEBUG is not set
1242CONFIG_USB_EZUSB=y 1334CONFIG_USB_EZUSB=y
1243 1335
1244# 1336#
@@ -1246,6 +1338,7 @@ CONFIG_USB_EZUSB=y
1246# 1338#
1247# CONFIG_USB_EMI62 is not set 1339# CONFIG_USB_EMI62 is not set
1248# CONFIG_USB_EMI26 is not set 1340# CONFIG_USB_EMI26 is not set
1341# CONFIG_USB_ADUTUX is not set
1249# CONFIG_USB_AUERSWALD is not set 1342# CONFIG_USB_AUERSWALD is not set
1250# CONFIG_USB_RIO500 is not set 1343# CONFIG_USB_RIO500 is not set
1251# CONFIG_USB_LEGOTOWER is not set 1344# CONFIG_USB_LEGOTOWER is not set
@@ -1253,12 +1346,13 @@ CONFIG_USB_EZUSB=y
1253# CONFIG_USB_LED is not set 1346# CONFIG_USB_LED is not set
1254# CONFIG_USB_CYPRESS_CY7C63 is not set 1347# CONFIG_USB_CYPRESS_CY7C63 is not set
1255# CONFIG_USB_CYTHERM is not set 1348# CONFIG_USB_CYTHERM is not set
1256# CONFIG_USB_PHIDGETKIT is not set 1349# CONFIG_USB_PHIDGET is not set
1257# CONFIG_USB_PHIDGETSERVO is not set
1258# CONFIG_USB_IDMOUSE is not set 1350# CONFIG_USB_IDMOUSE is not set
1351# CONFIG_USB_FTDI_ELAN is not set
1259CONFIG_USB_APPLEDISPLAY=m 1352CONFIG_USB_APPLEDISPLAY=m
1260# CONFIG_USB_SISUSBVGA is not set 1353# CONFIG_USB_SISUSBVGA is not set
1261# CONFIG_USB_LD is not set 1354# CONFIG_USB_LD is not set
1355# CONFIG_USB_TRANCEVIBRATOR is not set
1262# CONFIG_USB_TEST is not set 1356# CONFIG_USB_TEST is not set
1263 1357
1264# 1358#
@@ -1316,6 +1410,10 @@ CONFIG_USB_APPLEDISPLAY=m
1316# 1410#
1317 1411
1318# 1412#
1413# Virtualization
1414#
1415
1416#
1319# File systems 1417# File systems
1320# 1418#
1321CONFIG_EXT2_FS=y 1419CONFIG_EXT2_FS=y
@@ -1328,6 +1426,7 @@ CONFIG_EXT3_FS=y
1328CONFIG_EXT3_FS_XATTR=y 1426CONFIG_EXT3_FS_XATTR=y
1329CONFIG_EXT3_FS_POSIX_ACL=y 1427CONFIG_EXT3_FS_POSIX_ACL=y
1330CONFIG_EXT3_FS_SECURITY=y 1428CONFIG_EXT3_FS_SECURITY=y
1429# CONFIG_EXT4DEV_FS is not set
1331CONFIG_JBD=y 1430CONFIG_JBD=y
1332# CONFIG_JBD_DEBUG is not set 1431# CONFIG_JBD_DEBUG is not set
1333CONFIG_FS_MBCACHE=y 1432CONFIG_FS_MBCACHE=y
@@ -1344,6 +1443,7 @@ CONFIG_XFS_FS=m
1344CONFIG_XFS_SECURITY=y 1443CONFIG_XFS_SECURITY=y
1345CONFIG_XFS_POSIX_ACL=y 1444CONFIG_XFS_POSIX_ACL=y
1346# CONFIG_XFS_RT is not set 1445# CONFIG_XFS_RT is not set
1446# CONFIG_GFS2_FS is not set
1347# CONFIG_OCFS2_FS is not set 1447# CONFIG_OCFS2_FS is not set
1348# CONFIG_MINIX_FS is not set 1448# CONFIG_MINIX_FS is not set
1349# CONFIG_ROMFS_FS is not set 1449# CONFIG_ROMFS_FS is not set
@@ -1380,8 +1480,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1380# 1480#
1381CONFIG_PROC_FS=y 1481CONFIG_PROC_FS=y
1382CONFIG_PROC_KCORE=y 1482CONFIG_PROC_KCORE=y
1483CONFIG_PROC_SYSCTL=y
1383CONFIG_SYSFS=y 1484CONFIG_SYSFS=y
1384CONFIG_TMPFS=y 1485CONFIG_TMPFS=y
1486# CONFIG_TMPFS_POSIX_ACL is not set
1385CONFIG_HUGETLBFS=y 1487CONFIG_HUGETLBFS=y
1386CONFIG_HUGETLB_PAGE=y 1488CONFIG_HUGETLB_PAGE=y
1387CONFIG_RAMFS=y 1489CONFIG_RAMFS=y
@@ -1505,17 +1607,22 @@ CONFIG_NLS_ISO8859_15=y
1505CONFIG_NLS_UTF8=y 1607CONFIG_NLS_UTF8=y
1506 1608
1507# 1609#
1610# Distributed Lock Manager
1611#
1612# CONFIG_DLM is not set
1613
1614#
1508# Library routines 1615# Library routines
1509# 1616#
1617CONFIG_BITREVERSE=y
1510CONFIG_CRC_CCITT=m 1618CONFIG_CRC_CCITT=m
1511# CONFIG_CRC16 is not set 1619# CONFIG_CRC16 is not set
1512CONFIG_CRC32=y 1620CONFIG_CRC32=y
1513CONFIG_LIBCRC32C=m 1621CONFIG_LIBCRC32C=m
1514CONFIG_ZLIB_INFLATE=y 1622CONFIG_ZLIB_INFLATE=y
1515CONFIG_ZLIB_DEFLATE=m 1623CONFIG_ZLIB_DEFLATE=m
1516CONFIG_TEXTSEARCH=y
1517CONFIG_TEXTSEARCH_KMP=m
1518CONFIG_PLIST=y 1624CONFIG_PLIST=y
1625CONFIG_IOMAP_COPY=y
1519 1626
1520# 1627#
1521# Instrumentation Support 1628# Instrumentation Support
@@ -1528,8 +1635,11 @@ CONFIG_OPROFILE=y
1528# Kernel hacking 1635# Kernel hacking
1529# 1636#
1530# CONFIG_PRINTK_TIME is not set 1637# CONFIG_PRINTK_TIME is not set
1638CONFIG_ENABLE_MUST_CHECK=y
1531CONFIG_MAGIC_SYSRQ=y 1639CONFIG_MAGIC_SYSRQ=y
1532# CONFIG_UNUSED_SYMBOLS is not set 1640# CONFIG_UNUSED_SYMBOLS is not set
1641CONFIG_DEBUG_FS=y
1642# CONFIG_HEADERS_CHECK is not set
1533CONFIG_DEBUG_KERNEL=y 1643CONFIG_DEBUG_KERNEL=y
1534CONFIG_LOG_BUF_SHIFT=17 1644CONFIG_LOG_BUF_SHIFT=17
1535CONFIG_DETECT_SOFTLOCKUP=y 1645CONFIG_DETECT_SOFTLOCKUP=y
@@ -1543,9 +1653,10 @@ CONFIG_DEBUG_MUTEXES=y
1543# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1653# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1544# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1654# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1545# CONFIG_DEBUG_KOBJECT is not set 1655# CONFIG_DEBUG_KOBJECT is not set
1656CONFIG_DEBUG_BUGVERBOSE=y
1546# CONFIG_DEBUG_INFO is not set 1657# CONFIG_DEBUG_INFO is not set
1547CONFIG_DEBUG_FS=y
1548# CONFIG_DEBUG_VM is not set 1658# CONFIG_DEBUG_VM is not set
1659# CONFIG_DEBUG_LIST is not set
1549CONFIG_FORCED_INLINING=y 1660CONFIG_FORCED_INLINING=y
1550# CONFIG_RCU_TORTURE_TEST is not set 1661# CONFIG_RCU_TORTURE_TEST is not set
1551# CONFIG_DEBUG_STACKOVERFLOW is not set 1662# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -1565,7 +1676,12 @@ CONFIG_BOOTX_TEXT=y
1565# Cryptographic options 1676# Cryptographic options
1566# 1677#
1567CONFIG_CRYPTO=y 1678CONFIG_CRYPTO=y
1679CONFIG_CRYPTO_ALGAPI=y
1680CONFIG_CRYPTO_BLKCIPHER=y
1681CONFIG_CRYPTO_HASH=y
1682CONFIG_CRYPTO_MANAGER=y
1568CONFIG_CRYPTO_HMAC=y 1683CONFIG_CRYPTO_HMAC=y
1684# CONFIG_CRYPTO_XCBC is not set
1569CONFIG_CRYPTO_NULL=m 1685CONFIG_CRYPTO_NULL=m
1570CONFIG_CRYPTO_MD4=m 1686CONFIG_CRYPTO_MD4=m
1571CONFIG_CRYPTO_MD5=y 1687CONFIG_CRYPTO_MD5=y
@@ -1574,9 +1690,14 @@ CONFIG_CRYPTO_SHA256=m
1574CONFIG_CRYPTO_SHA512=m 1690CONFIG_CRYPTO_SHA512=m
1575CONFIG_CRYPTO_WP512=m 1691CONFIG_CRYPTO_WP512=m
1576# CONFIG_CRYPTO_TGR192 is not set 1692# CONFIG_CRYPTO_TGR192 is not set
1693# CONFIG_CRYPTO_GF128MUL is not set
1694CONFIG_CRYPTO_ECB=m
1695CONFIG_CRYPTO_CBC=y
1696# CONFIG_CRYPTO_LRW is not set
1577CONFIG_CRYPTO_DES=y 1697CONFIG_CRYPTO_DES=y
1578CONFIG_CRYPTO_BLOWFISH=m 1698CONFIG_CRYPTO_BLOWFISH=m
1579CONFIG_CRYPTO_TWOFISH=m 1699CONFIG_CRYPTO_TWOFISH=m
1700CONFIG_CRYPTO_TWOFISH_COMMON=m
1580CONFIG_CRYPTO_SERPENT=m 1701CONFIG_CRYPTO_SERPENT=m
1581CONFIG_CRYPTO_AES=m 1702CONFIG_CRYPTO_AES=m
1582CONFIG_CRYPTO_CAST5=m 1703CONFIG_CRYPTO_CAST5=m
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index b5005506c2f8..5fc87448704c 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.19-rc1 3# Linux kernel version: 2.6.20-rc5
4# Fri Oct 6 13:25:04 2006 4# Mon Jan 22 22:16:44 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_ARCH_HAS_ILOG2_U64=y
13CONFIG_GENERIC_HWEIGHT=y 15CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 17CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -23,6 +25,7 @@ CONFIG_PPC_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 25# CONFIG_PPC_UDBG_16550 is not set
24# CONFIG_GENERIC_TBSYNC is not set 26# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y
26# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
27 30
28# 31#
@@ -32,6 +35,9 @@ CONFIG_AUDIT_ARCH=y
32CONFIG_POWER3=y 35CONFIG_POWER3=y
33CONFIG_POWER4=y 36CONFIG_POWER4=y
34CONFIG_PPC_FPU=y 37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set
39# CONFIG_PPC_DCR_MMIO is not set
40# CONFIG_PPC_OF_PLATFORM_PCI is not set
35# CONFIG_ALTIVEC is not set 41# CONFIG_ALTIVEC is not set
36CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
37CONFIG_VIRT_CPU_ACCOUNTING=y 43CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -63,12 +69,13 @@ CONFIG_AUDITSYSCALL=y
63CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
64CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
65# CONFIG_CPUSETS is not set 71# CONFIG_CPUSETS is not set
72CONFIG_SYSFS_DEPRECATED=y
66# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
67CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
68CONFIG_CC_OPTIMIZE_FOR_SIZE=y 75CONFIG_CC_OPTIMIZE_FOR_SIZE=y
69CONFIG_SYSCTL=y 76CONFIG_SYSCTL=y
70# CONFIG_EMBEDDED is not set 77# CONFIG_EMBEDDED is not set
71# CONFIG_SYSCTL_SYSCALL is not set 78CONFIG_SYSCTL_SYSCALL=y
72CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
73# CONFIG_KALLSYMS_ALL is not set 80# CONFIG_KALLSYMS_ALL is not set
74# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -125,18 +132,22 @@ CONFIG_PPC_MULTIPLATFORM=y
125# CONFIG_APUS is not set 132# CONFIG_APUS is not set
126# CONFIG_PPC_PSERIES is not set 133# CONFIG_PPC_PSERIES is not set
127CONFIG_PPC_ISERIES=y 134CONFIG_PPC_ISERIES=y
135# CONFIG_PPC_MPC52xx is not set
128# CONFIG_PPC_PMAC is not set 136# CONFIG_PPC_PMAC is not set
129# CONFIG_PPC_MAPLE is not set 137# CONFIG_PPC_MAPLE is not set
130# CONFIG_PPC_PASEMI is not set 138# CONFIG_PPC_PASEMI is not set
131# CONFIG_PPC_CELL is not set 139# CONFIG_PPC_CELL is not set
132# CONFIG_PPC_CELL_NATIVE is not set 140# CONFIG_PPC_CELL_NATIVE is not set
133# CONFIG_PPC_IBM_CELL_BLADE is not set 141# CONFIG_PPC_IBM_CELL_BLADE is not set
142# CONFIG_PPC_PS3 is not set
134# CONFIG_U3_DART is not set 143# CONFIG_U3_DART is not set
135# CONFIG_PPC_RTAS is not set 144# CONFIG_PPC_RTAS is not set
136# CONFIG_MMIO_NVRAM is not set 145# CONFIG_MMIO_NVRAM is not set
137CONFIG_IBMVIO=y 146CONFIG_IBMVIO=y
138# CONFIG_PPC_MPC106 is not set 147# CONFIG_PPC_MPC106 is not set
139# CONFIG_PPC_970_NAP is not set 148# CONFIG_PPC_970_NAP is not set
149CONFIG_PPC_INDIRECT_IO=y
150CONFIG_GENERIC_IOMAP=y
140# CONFIG_CPU_FREQ is not set 151# CONFIG_CPU_FREQ is not set
141# CONFIG_WANT_EARLY_SERIAL is not set 152# CONFIG_WANT_EARLY_SERIAL is not set
142# CONFIG_MPIC is not set 153# CONFIG_MPIC is not set
@@ -146,6 +157,7 @@ CONFIG_IBMVIO=y
146# 157#
147# CONFIG_HZ_100 is not set 158# CONFIG_HZ_100 is not set
148CONFIG_HZ_250=y 159CONFIG_HZ_250=y
160# CONFIG_HZ_300 is not set
149# CONFIG_HZ_1000 is not set 161# CONFIG_HZ_1000 is not set
150CONFIG_HZ=250 162CONFIG_HZ=250
151CONFIG_PREEMPT_NONE=y 163CONFIG_PREEMPT_NONE=y
@@ -178,6 +190,7 @@ CONFIG_RESOURCES_64BIT=y
178# CONFIG_PPC_64K_PAGES is not set 190# CONFIG_PPC_64K_PAGES is not set
179# CONFIG_SCHED_SMT is not set 191# CONFIG_SCHED_SMT is not set
180CONFIG_PROC_DEVICETREE=y 192CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set
181# CONFIG_PM is not set 194# CONFIG_PM is not set
182CONFIG_SECCOMP=y 195CONFIG_SECCOMP=y
183CONFIG_ISA_DMA_API=y 196CONFIG_ISA_DMA_API=y
@@ -192,7 +205,6 @@ CONFIG_GENERIC_ISA_DMA=y
192CONFIG_PCI=y 205CONFIG_PCI=y
193CONFIG_PCI_DOMAINS=y 206CONFIG_PCI_DOMAINS=y
194# CONFIG_PCIEPORTBUS is not set 207# CONFIG_PCIEPORTBUS is not set
195# CONFIG_PCI_MULTITHREAD_PROBE is not set
196# CONFIG_PCI_DEBUG is not set 208# CONFIG_PCI_DEBUG is not set
197 209
198# 210#
@@ -245,6 +257,7 @@ CONFIG_INET_TCP_DIAG=y
245# CONFIG_TCP_CONG_ADVANCED is not set 257# CONFIG_TCP_CONG_ADVANCED is not set
246CONFIG_TCP_CONG_CUBIC=y 258CONFIG_TCP_CONG_CUBIC=y
247CONFIG_DEFAULT_TCP_CONG="cubic" 259CONFIG_DEFAULT_TCP_CONG="cubic"
260# CONFIG_TCP_MD5SIG is not set
248 261
249# 262#
250# IP: Virtual Server Configuration 263# IP: Virtual Server Configuration
@@ -261,21 +274,37 @@ CONFIG_NETFILTER=y
261# Core Netfilter Configuration 274# Core Netfilter Configuration
262# 275#
263# CONFIG_NETFILTER_NETLINK is not set 276# CONFIG_NETFILTER_NETLINK is not set
277CONFIG_NF_CONNTRACK_ENABLED=m
278CONFIG_NF_CONNTRACK_SUPPORT=y
279# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
280CONFIG_NF_CONNTRACK=m
281# CONFIG_NF_CT_ACCT is not set
282CONFIG_NF_CONNTRACK_MARK=y
283CONFIG_NF_CONNTRACK_EVENTS=y
284# CONFIG_NF_CT_PROTO_SCTP is not set
285# CONFIG_NF_CONNTRACK_AMANDA is not set
286CONFIG_NF_CONNTRACK_FTP=m
287# CONFIG_NF_CONNTRACK_H323 is not set
288CONFIG_NF_CONNTRACK_IRC=m
289# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
290# CONFIG_NF_CONNTRACK_PPTP is not set
291# CONFIG_NF_CONNTRACK_SIP is not set
292CONFIG_NF_CONNTRACK_TFTP=m
264CONFIG_NETFILTER_XTABLES=m 293CONFIG_NETFILTER_XTABLES=m
265CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 294CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
266CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 295CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
267CONFIG_NETFILTER_XT_TARGET_DSCP=m 296CONFIG_NETFILTER_XT_TARGET_DSCP=m
268CONFIG_NETFILTER_XT_TARGET_MARK=m 297CONFIG_NETFILTER_XT_TARGET_MARK=m
269CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 298CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
270CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 299# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
300# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
271CONFIG_NETFILTER_XT_MATCH_COMMENT=m 301CONFIG_NETFILTER_XT_MATCH_COMMENT=m
272CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
273CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 302CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
274CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 303CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
275# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 304# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
276CONFIG_NETFILTER_XT_MATCH_DSCP=m 305CONFIG_NETFILTER_XT_MATCH_DSCP=m
277# CONFIG_NETFILTER_XT_MATCH_ESP is not set 306# CONFIG_NETFILTER_XT_MATCH_ESP is not set
278CONFIG_NETFILTER_XT_MATCH_HELPER=m 307# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
279CONFIG_NETFILTER_XT_MATCH_LENGTH=m 308CONFIG_NETFILTER_XT_MATCH_LENGTH=m
280CONFIG_NETFILTER_XT_MATCH_LIMIT=m 309CONFIG_NETFILTER_XT_MATCH_LIMIT=m
281CONFIG_NETFILTER_XT_MATCH_MAC=m 310CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -286,27 +315,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
286# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 315# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
287CONFIG_NETFILTER_XT_MATCH_REALM=m 316CONFIG_NETFILTER_XT_MATCH_REALM=m
288CONFIG_NETFILTER_XT_MATCH_SCTP=m 317CONFIG_NETFILTER_XT_MATCH_SCTP=m
289CONFIG_NETFILTER_XT_MATCH_STATE=m 318# CONFIG_NETFILTER_XT_MATCH_STATE is not set
290# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 319# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
291CONFIG_NETFILTER_XT_MATCH_STRING=m 320CONFIG_NETFILTER_XT_MATCH_STRING=m
292CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 321CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
322# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
293 323
294# 324#
295# IP: Netfilter Configuration 325# IP: Netfilter Configuration
296# 326#
297CONFIG_IP_NF_CONNTRACK=m 327CONFIG_NF_CONNTRACK_IPV4=m
298CONFIG_IP_NF_CT_ACCT=y 328CONFIG_NF_CONNTRACK_PROC_COMPAT=y
299CONFIG_IP_NF_CONNTRACK_MARK=y
300CONFIG_IP_NF_CONNTRACK_EVENTS=y
301CONFIG_IP_NF_CT_PROTO_SCTP=m
302CONFIG_IP_NF_FTP=m
303CONFIG_IP_NF_IRC=m
304# CONFIG_IP_NF_NETBIOS_NS is not set
305CONFIG_IP_NF_TFTP=m
306CONFIG_IP_NF_AMANDA=m
307# CONFIG_IP_NF_PPTP is not set
308# CONFIG_IP_NF_H323 is not set
309# CONFIG_IP_NF_SIP is not set
310CONFIG_IP_NF_QUEUE=m 329CONFIG_IP_NF_QUEUE=m
311CONFIG_IP_NF_IPTABLES=m 330CONFIG_IP_NF_IPTABLES=m
312CONFIG_IP_NF_MATCH_IPRANGE=m 331CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -317,23 +336,25 @@ CONFIG_IP_NF_MATCH_ECN=m
317CONFIG_IP_NF_MATCH_TTL=m 336CONFIG_IP_NF_MATCH_TTL=m
318CONFIG_IP_NF_MATCH_OWNER=m 337CONFIG_IP_NF_MATCH_OWNER=m
319CONFIG_IP_NF_MATCH_ADDRTYPE=m 338CONFIG_IP_NF_MATCH_ADDRTYPE=m
320CONFIG_IP_NF_MATCH_HASHLIMIT=m
321CONFIG_IP_NF_FILTER=m 339CONFIG_IP_NF_FILTER=m
322CONFIG_IP_NF_TARGET_REJECT=m 340CONFIG_IP_NF_TARGET_REJECT=m
323CONFIG_IP_NF_TARGET_LOG=m 341CONFIG_IP_NF_TARGET_LOG=m
324CONFIG_IP_NF_TARGET_ULOG=m 342CONFIG_IP_NF_TARGET_ULOG=m
325CONFIG_IP_NF_TARGET_TCPMSS=m 343CONFIG_IP_NF_TARGET_TCPMSS=m
326CONFIG_IP_NF_NAT=m 344CONFIG_NF_NAT=m
327CONFIG_IP_NF_NAT_NEEDED=y 345CONFIG_NF_NAT_NEEDED=y
328CONFIG_IP_NF_TARGET_MASQUERADE=m 346CONFIG_IP_NF_TARGET_MASQUERADE=m
329CONFIG_IP_NF_TARGET_REDIRECT=m 347CONFIG_IP_NF_TARGET_REDIRECT=m
330CONFIG_IP_NF_TARGET_NETMAP=m 348CONFIG_IP_NF_TARGET_NETMAP=m
331CONFIG_IP_NF_TARGET_SAME=m 349CONFIG_IP_NF_TARGET_SAME=m
332CONFIG_IP_NF_NAT_SNMP_BASIC=m 350# CONFIG_NF_NAT_SNMP_BASIC is not set
333CONFIG_IP_NF_NAT_IRC=m 351CONFIG_NF_NAT_FTP=m
334CONFIG_IP_NF_NAT_FTP=m 352CONFIG_NF_NAT_IRC=m
335CONFIG_IP_NF_NAT_TFTP=m 353CONFIG_NF_NAT_TFTP=m
336CONFIG_IP_NF_NAT_AMANDA=m 354# CONFIG_NF_NAT_AMANDA is not set
355# CONFIG_NF_NAT_PPTP is not set
356# CONFIG_NF_NAT_H323 is not set
357# CONFIG_NF_NAT_SIP is not set
337CONFIG_IP_NF_MANGLE=m 358CONFIG_IP_NF_MANGLE=m
338CONFIG_IP_NF_TARGET_TOS=m 359CONFIG_IP_NF_TARGET_TOS=m
339CONFIG_IP_NF_TARGET_ECN=m 360CONFIG_IP_NF_TARGET_ECN=m
@@ -440,6 +461,12 @@ CONFIG_BLK_DEV_INITRD=y
440# CONFIG_ATA_OVER_ETH is not set 461# CONFIG_ATA_OVER_ETH is not set
441 462
442# 463#
464# Misc devices
465#
466# CONFIG_SGI_IOC4 is not set
467# CONFIG_TIFM_CORE is not set
468
469#
443# ATA/ATAPI/MFM/RLL support 470# ATA/ATAPI/MFM/RLL support
444# 471#
445# CONFIG_IDE is not set 472# CONFIG_IDE is not set
@@ -449,6 +476,7 @@ CONFIG_BLK_DEV_INITRD=y
449# 476#
450# CONFIG_RAID_ATTRS is not set 477# CONFIG_RAID_ATTRS is not set
451CONFIG_SCSI=y 478CONFIG_SCSI=y
479# CONFIG_SCSI_TGT is not set
452CONFIG_SCSI_NETLINK=y 480CONFIG_SCSI_NETLINK=y
453CONFIG_SCSI_PROC_FS=y 481CONFIG_SCSI_PROC_FS=y
454 482
@@ -469,6 +497,7 @@ CONFIG_CHR_DEV_SG=y
469CONFIG_SCSI_MULTI_LUN=y 497CONFIG_SCSI_MULTI_LUN=y
470CONFIG_SCSI_CONSTANTS=y 498CONFIG_SCSI_CONSTANTS=y
471# CONFIG_SCSI_LOGGING is not set 499# CONFIG_SCSI_LOGGING is not set
500# CONFIG_SCSI_SCAN_ASYNC is not set
472 501
473# 502#
474# SCSI Transports 503# SCSI Transports
@@ -515,6 +544,7 @@ CONFIG_SCSI_IBMVSCSI=m
515# CONFIG_SCSI_DC395x is not set 544# CONFIG_SCSI_DC395x is not set
516# CONFIG_SCSI_DC390T is not set 545# CONFIG_SCSI_DC390T is not set
517# CONFIG_SCSI_DEBUG is not set 546# CONFIG_SCSI_DEBUG is not set
547# CONFIG_SCSI_SRP is not set
518 548
519# 549#
520# Serial ATA (prod) and Parallel ATA (experimental) drivers 550# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -562,6 +592,7 @@ CONFIG_DM_ZERO=m
562# 592#
563# Macintosh device drivers 593# Macintosh device drivers
564# 594#
595# CONFIG_MAC_EMUMOUSEBTN is not set
565# CONFIG_WINDFARM is not set 596# CONFIG_WINDFARM is not set
566 597
567# 598#
@@ -647,6 +678,7 @@ CONFIG_E1000=m
647# CONFIG_IXGB is not set 678# CONFIG_IXGB is not set
648# CONFIG_S2IO is not set 679# CONFIG_S2IO is not set
649# CONFIG_MYRI10GE is not set 680# CONFIG_MYRI10GE is not set
681# CONFIG_NETXEN_NIC is not set
650 682
651# 683#
652# Token Ring devices 684# Token Ring devices
@@ -765,10 +797,6 @@ CONFIG_GEN_RTC=y
765# CONFIG_DTLK is not set 797# CONFIG_DTLK is not set
766# CONFIG_R3964 is not set 798# CONFIG_R3964 is not set
767# CONFIG_APPLICOM is not set 799# CONFIG_APPLICOM is not set
768
769#
770# Ftape, the floppy tape device driver
771#
772# CONFIG_AGP is not set 800# CONFIG_AGP is not set
773# CONFIG_DRM is not set 801# CONFIG_DRM is not set
774CONFIG_RAW_DRIVER=y 802CONFIG_RAW_DRIVER=y
@@ -779,7 +807,6 @@ CONFIG_MAX_RAW_DEVS=256
779# TPM devices 807# TPM devices
780# 808#
781# CONFIG_TCG_TPM is not set 809# CONFIG_TCG_TPM is not set
782# CONFIG_TELCLOCK is not set
783 810
784# 811#
785# I2C support 812# I2C support
@@ -795,6 +822,7 @@ CONFIG_MAX_RAW_DEVS=256
795# 822#
796# Dallas's 1-wire bus 823# Dallas's 1-wire bus
797# 824#
825# CONFIG_W1 is not set
798 826
799# 827#
800# Hardware Monitoring support 828# Hardware Monitoring support
@@ -803,11 +831,6 @@ CONFIG_MAX_RAW_DEVS=256
803# CONFIG_HWMON_VID is not set 831# CONFIG_HWMON_VID is not set
804 832
805# 833#
806# Misc devices
807#
808# CONFIG_TIFM_CORE is not set
809
810#
811# Multimedia devices 834# Multimedia devices
812# 835#
813# CONFIG_VIDEO_DEV is not set 836# CONFIG_VIDEO_DEV is not set
@@ -822,6 +845,7 @@ CONFIG_MAX_RAW_DEVS=256
822# 845#
823CONFIG_FIRMWARE_EDID=y 846CONFIG_FIRMWARE_EDID=y
824# CONFIG_FB is not set 847# CONFIG_FB is not set
848# CONFIG_FB_IBM_GXT4500 is not set
825# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 849# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
826 850
827# 851#
@@ -830,6 +854,11 @@ CONFIG_FIRMWARE_EDID=y
830# CONFIG_SOUND is not set 854# CONFIG_SOUND is not set
831 855
832# 856#
857# HID Devices
858#
859# CONFIG_HID is not set
860
861#
833# USB support 862# USB support
834# 863#
835CONFIG_USB_ARCH_HAS_HCD=y 864CONFIG_USB_ARCH_HAS_HCD=y
@@ -892,6 +921,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
892# 921#
893 922
894# 923#
924# Virtualization
925#
926
927#
895# File systems 928# File systems
896# 929#
897CONFIG_EXT2_FS=y 930CONFIG_EXT2_FS=y
@@ -904,6 +937,7 @@ CONFIG_EXT3_FS=y
904CONFIG_EXT3_FS_XATTR=y 937CONFIG_EXT3_FS_XATTR=y
905CONFIG_EXT3_FS_POSIX_ACL=y 938CONFIG_EXT3_FS_POSIX_ACL=y
906CONFIG_EXT3_FS_SECURITY=y 939CONFIG_EXT3_FS_SECURITY=y
940# CONFIG_EXT4DEV_FS is not set
907CONFIG_JBD=y 941CONFIG_JBD=y
908# CONFIG_JBD_DEBUG is not set 942# CONFIG_JBD_DEBUG is not set
909CONFIG_FS_MBCACHE=y 943CONFIG_FS_MBCACHE=y
@@ -937,6 +971,7 @@ CONFIG_DNOTIFY=y
937CONFIG_AUTOFS_FS=m 971CONFIG_AUTOFS_FS=m
938# CONFIG_AUTOFS4_FS is not set 972# CONFIG_AUTOFS4_FS is not set
939# CONFIG_FUSE_FS is not set 973# CONFIG_FUSE_FS is not set
974CONFIG_GENERIC_ACL=y
940 975
941# 976#
942# CD-ROM/DVD Filesystems 977# CD-ROM/DVD Filesystems
@@ -1024,7 +1059,6 @@ CONFIG_CIFS_POSIX=y
1024# CONFIG_CODA_FS is not set 1059# CONFIG_CODA_FS is not set
1025# CONFIG_AFS_FS is not set 1060# CONFIG_AFS_FS is not set
1026# CONFIG_9P_FS is not set 1061# CONFIG_9P_FS is not set
1027CONFIG_GENERIC_ACL=y
1028 1062
1029# 1063#
1030# Partition Types 1064# Partition Types
@@ -1080,6 +1114,8 @@ CONFIG_NLS_ISO8859_1=y
1080# Distributed Lock Manager 1114# Distributed Lock Manager
1081# 1115#
1082CONFIG_DLM=m 1116CONFIG_DLM=m
1117CONFIG_DLM_TCP=y
1118# CONFIG_DLM_SCTP is not set
1083# CONFIG_DLM_DEBUG is not set 1119# CONFIG_DLM_DEBUG is not set
1084 1120
1085# 1121#
@@ -1094,6 +1130,7 @@ CONFIG_VIOPATH=y
1094# 1130#
1095# Library routines 1131# Library routines
1096# 1132#
1133CONFIG_BITREVERSE=y
1097CONFIG_CRC_CCITT=m 1134CONFIG_CRC_CCITT=m
1098# CONFIG_CRC16 is not set 1135# CONFIG_CRC16 is not set
1099CONFIG_CRC32=y 1136CONFIG_CRC32=y
@@ -1105,6 +1142,7 @@ CONFIG_TEXTSEARCH_KMP=m
1105CONFIG_TEXTSEARCH_BM=m 1142CONFIG_TEXTSEARCH_BM=m
1106CONFIG_TEXTSEARCH_FSM=m 1143CONFIG_TEXTSEARCH_FSM=m
1107CONFIG_PLIST=y 1144CONFIG_PLIST=y
1145CONFIG_IOMAP_COPY=y
1108 1146
1109# 1147#
1110# Instrumentation Support 1148# Instrumentation Support
@@ -1119,6 +1157,8 @@ CONFIG_PLIST=y
1119CONFIG_ENABLE_MUST_CHECK=y 1157CONFIG_ENABLE_MUST_CHECK=y
1120CONFIG_MAGIC_SYSRQ=y 1158CONFIG_MAGIC_SYSRQ=y
1121# CONFIG_UNUSED_SYMBOLS is not set 1159# CONFIG_UNUSED_SYMBOLS is not set
1160CONFIG_DEBUG_FS=y
1161# CONFIG_HEADERS_CHECK is not set
1122CONFIG_DEBUG_KERNEL=y 1162CONFIG_DEBUG_KERNEL=y
1123CONFIG_LOG_BUF_SHIFT=17 1163CONFIG_LOG_BUF_SHIFT=17
1124CONFIG_DETECT_SOFTLOCKUP=y 1164CONFIG_DETECT_SOFTLOCKUP=y
@@ -1132,8 +1172,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
1132# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1172# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1133# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1173# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1134# CONFIG_DEBUG_KOBJECT is not set 1174# CONFIG_DEBUG_KOBJECT is not set
1175CONFIG_DEBUG_BUGVERBOSE=y
1135# CONFIG_DEBUG_INFO is not set 1176# CONFIG_DEBUG_INFO is not set
1136CONFIG_DEBUG_FS=y
1137# CONFIG_DEBUG_VM is not set 1177# CONFIG_DEBUG_VM is not set
1138# CONFIG_DEBUG_LIST is not set 1178# CONFIG_DEBUG_LIST is not set
1139# CONFIG_FORCED_INLINING is not set 1179# CONFIG_FORCED_INLINING is not set
@@ -1142,6 +1182,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
1142CONFIG_DEBUG_STACK_USAGE=y 1182CONFIG_DEBUG_STACK_USAGE=y
1143# CONFIG_DEBUGGER is not set 1183# CONFIG_DEBUGGER is not set
1144CONFIG_IRQSTACKS=y 1184CONFIG_IRQSTACKS=y
1185# CONFIG_BOOTX_TEXT is not set
1145# CONFIG_PPC_EARLY_DEBUG is not set 1186# CONFIG_PPC_EARLY_DEBUG is not set
1146 1187
1147# 1188#
@@ -1155,10 +1196,11 @@ CONFIG_IRQSTACKS=y
1155# 1196#
1156CONFIG_CRYPTO=y 1197CONFIG_CRYPTO=y
1157CONFIG_CRYPTO_ALGAPI=y 1198CONFIG_CRYPTO_ALGAPI=y
1158CONFIG_CRYPTO_BLKCIPHER=m 1199CONFIG_CRYPTO_BLKCIPHER=y
1159CONFIG_CRYPTO_HASH=y 1200CONFIG_CRYPTO_HASH=y
1160CONFIG_CRYPTO_MANAGER=m 1201CONFIG_CRYPTO_MANAGER=y
1161CONFIG_CRYPTO_HMAC=y 1202CONFIG_CRYPTO_HMAC=y
1203# CONFIG_CRYPTO_XCBC is not set
1162CONFIG_CRYPTO_NULL=m 1204CONFIG_CRYPTO_NULL=m
1163CONFIG_CRYPTO_MD4=m 1205CONFIG_CRYPTO_MD4=m
1164CONFIG_CRYPTO_MD5=y 1206CONFIG_CRYPTO_MD5=y
@@ -1167,8 +1209,10 @@ CONFIG_CRYPTO_SHA256=m
1167CONFIG_CRYPTO_SHA512=m 1209CONFIG_CRYPTO_SHA512=m
1168CONFIG_CRYPTO_WP512=m 1210CONFIG_CRYPTO_WP512=m
1169CONFIG_CRYPTO_TGR192=m 1211CONFIG_CRYPTO_TGR192=m
1212# CONFIG_CRYPTO_GF128MUL is not set
1170CONFIG_CRYPTO_ECB=m 1213CONFIG_CRYPTO_ECB=m
1171CONFIG_CRYPTO_CBC=m 1214CONFIG_CRYPTO_CBC=y
1215# CONFIG_CRYPTO_LRW is not set
1172CONFIG_CRYPTO_DES=y 1216CONFIG_CRYPTO_DES=y
1173CONFIG_CRYPTO_BLOWFISH=m 1217CONFIG_CRYPTO_BLOWFISH=m
1174CONFIG_CRYPTO_TWOFISH=m 1218CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 23fd210eb56a..405c1c908213 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_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.19-rc4 3# Linux kernel version: 2.6.20-rc5
4# Wed Nov 15 20:36:30 2006 4# Mon Jan 22 22:17:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,13 +23,13 @@ CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
24CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
25# CONFIG_DEFAULT_UIMAGE is not set 27# CONFIG_DEFAULT_UIMAGE is not set
26 28
27# 29#
28# Processor support 30# Processor support
29# 31#
30CONFIG_CLASSIC32=y 32CONFIG_CLASSIC32=y
31# CONFIG_PPC_52xx is not set
32# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
33# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
34# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -69,12 +70,13 @@ CONFIG_POSIX_MQUEUE=y
69# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
70CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
73CONFIG_SYSFS_DEPRECATED=y
72# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
73CONFIG_INITRAMFS_SOURCE="" 75CONFIG_INITRAMFS_SOURCE=""
74# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
75CONFIG_SYSCTL=y 77CONFIG_SYSCTL=y
76# CONFIG_EMBEDDED is not set 78# CONFIG_EMBEDDED is not set
77# CONFIG_SYSCTL_SYSCALL is not set 79CONFIG_SYSCTL_SYSCALL=y
78CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
79# CONFIG_KALLSYMS_ALL is not set 81# CONFIG_KALLSYMS_ALL is not set
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -130,6 +132,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
130# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
131CONFIG_EMBEDDED6xx=y 133CONFIG_EMBEDDED6xx=y
132# CONFIG_APUS is not set 134# CONFIG_APUS is not set
135# CONFIG_PPC_MPC52xx is not set
133# CONFIG_PPC_CELL is not set 136# CONFIG_PPC_CELL is not set
134# CONFIG_PPC_CELL_NATIVE is not set 137# CONFIG_PPC_CELL_NATIVE is not set
135# CONFIG_PPC_RTAS is not set 138# CONFIG_PPC_RTAS is not set
@@ -166,7 +169,6 @@ CONFIG_LINKSTATION=y
166# CONFIG_TQM8260 is not set 169# CONFIG_TQM8260 is not set
167# CONFIG_ADS8272 is not set 170# CONFIG_ADS8272 is not set
168# CONFIG_PQ2FADS is not set 171# CONFIG_PQ2FADS is not set
169# CONFIG_LITE5200 is not set
170# CONFIG_EV64360 is not set 172# CONFIG_EV64360 is not set
171CONFIG_PPC_GEN550=y 173CONFIG_PPC_GEN550=y
172CONFIG_MPC10X_BRIDGE=y 174CONFIG_MPC10X_BRIDGE=y
@@ -181,6 +183,7 @@ CONFIG_MPIC=y
181# CONFIG_HIGHMEM is not set 183# CONFIG_HIGHMEM is not set
182CONFIG_HZ_100=y 184CONFIG_HZ_100=y
183# CONFIG_HZ_250 is not set 185# CONFIG_HZ_250 is not set
186# CONFIG_HZ_300 is not set
184# CONFIG_HZ_1000 is not set 187# CONFIG_HZ_1000 is not set
185CONFIG_HZ=100 188CONFIG_HZ=100
186CONFIG_PREEMPT_NONE=y 189CONFIG_PREEMPT_NONE=y
@@ -217,7 +220,6 @@ CONFIG_FSL_SOC=y
217CONFIG_PCI=y 220CONFIG_PCI=y
218CONFIG_PCI_DOMAINS=y 221CONFIG_PCI_DOMAINS=y
219# CONFIG_PCIEPORTBUS is not set 222# CONFIG_PCIEPORTBUS is not set
220# CONFIG_PCI_MULTITHREAD_PROBE is not set
221# CONFIG_PCI_DEBUG is not set 223# CONFIG_PCI_DEBUG is not set
222 224
223# 225#
@@ -286,6 +288,7 @@ CONFIG_INET_TCP_DIAG=y
286# CONFIG_TCP_CONG_ADVANCED is not set 288# CONFIG_TCP_CONG_ADVANCED is not set
287CONFIG_TCP_CONG_CUBIC=y 289CONFIG_TCP_CONG_CUBIC=y
288CONFIG_DEFAULT_TCP_CONG="cubic" 290CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_TCP_MD5SIG is not set
289 292
290# 293#
291# IP: Virtual Server Configuration 294# IP: Virtual Server Configuration
@@ -302,18 +305,35 @@ CONFIG_NETFILTER=y
302# Core Netfilter Configuration 305# Core Netfilter Configuration
303# 306#
304# CONFIG_NETFILTER_NETLINK is not set 307# CONFIG_NETFILTER_NETLINK is not set
308CONFIG_NF_CONNTRACK_ENABLED=m
309CONFIG_NF_CONNTRACK_SUPPORT=y
310# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
311CONFIG_NF_CONNTRACK=m
312# CONFIG_NF_CT_ACCT is not set
313# CONFIG_NF_CONNTRACK_MARK is not set
314# CONFIG_NF_CONNTRACK_EVENTS is not set
315# CONFIG_NF_CT_PROTO_SCTP is not set
316# CONFIG_NF_CONNTRACK_AMANDA is not set
317CONFIG_NF_CONNTRACK_FTP=m
318# CONFIG_NF_CONNTRACK_H323 is not set
319CONFIG_NF_CONNTRACK_IRC=m
320# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
321# CONFIG_NF_CONNTRACK_PPTP is not set
322# CONFIG_NF_CONNTRACK_SIP is not set
323CONFIG_NF_CONNTRACK_TFTP=m
305CONFIG_NETFILTER_XTABLES=m 324CONFIG_NETFILTER_XTABLES=m
306CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 325CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
307# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 326# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
308CONFIG_NETFILTER_XT_TARGET_MARK=m 327CONFIG_NETFILTER_XT_TARGET_MARK=m
309# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 328# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
329CONFIG_NETFILTER_XT_TARGET_NFLOG=m
310# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 330# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
311# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 331# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
312CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 332CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
313# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 333# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
314# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 334# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
315CONFIG_NETFILTER_XT_MATCH_ESP=m 335CONFIG_NETFILTER_XT_MATCH_ESP=m
316# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 336CONFIG_NETFILTER_XT_MATCH_HELPER=m
317CONFIG_NETFILTER_XT_MATCH_LENGTH=m 337CONFIG_NETFILTER_XT_MATCH_LENGTH=m
318CONFIG_NETFILTER_XT_MATCH_LIMIT=m 338CONFIG_NETFILTER_XT_MATCH_LIMIT=m
319CONFIG_NETFILTER_XT_MATCH_MAC=m 339CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -324,27 +344,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
324# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 344# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
325# CONFIG_NETFILTER_XT_MATCH_REALM is not set 345# CONFIG_NETFILTER_XT_MATCH_REALM is not set
326# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 346# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
327CONFIG_NETFILTER_XT_MATCH_STATE=m 347# CONFIG_NETFILTER_XT_MATCH_STATE is not set
328# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 348# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
329# CONFIG_NETFILTER_XT_MATCH_STRING is not set 349# CONFIG_NETFILTER_XT_MATCH_STRING is not set
330# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 350# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
351# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
331 352
332# 353#
333# IP: Netfilter Configuration 354# IP: Netfilter Configuration
334# 355#
335CONFIG_IP_NF_CONNTRACK=m 356CONFIG_NF_CONNTRACK_IPV4=m
336# CONFIG_IP_NF_CT_ACCT is not set 357CONFIG_NF_CONNTRACK_PROC_COMPAT=y
337# CONFIG_IP_NF_CONNTRACK_MARK is not set
338# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
339# CONFIG_IP_NF_CT_PROTO_SCTP is not set
340CONFIG_IP_NF_FTP=m
341CONFIG_IP_NF_IRC=m
342# CONFIG_IP_NF_NETBIOS_NS is not set
343CONFIG_IP_NF_TFTP=m
344# CONFIG_IP_NF_AMANDA is not set
345# CONFIG_IP_NF_PPTP is not set
346# CONFIG_IP_NF_H323 is not set
347# CONFIG_IP_NF_SIP is not set
348# CONFIG_IP_NF_QUEUE is not set 358# CONFIG_IP_NF_QUEUE is not set
349CONFIG_IP_NF_IPTABLES=m 359CONFIG_IP_NF_IPTABLES=m
350CONFIG_IP_NF_MATCH_IPRANGE=m 360CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -355,22 +365,25 @@ CONFIG_IP_NF_MATCH_IPRANGE=m
355# CONFIG_IP_NF_MATCH_TTL is not set 365# CONFIG_IP_NF_MATCH_TTL is not set
356# CONFIG_IP_NF_MATCH_OWNER is not set 366# CONFIG_IP_NF_MATCH_OWNER is not set
357# CONFIG_IP_NF_MATCH_ADDRTYPE is not set 367# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
358# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
359CONFIG_IP_NF_FILTER=m 368CONFIG_IP_NF_FILTER=m
360CONFIG_IP_NF_TARGET_REJECT=m 369CONFIG_IP_NF_TARGET_REJECT=m
361# CONFIG_IP_NF_TARGET_LOG is not set 370# CONFIG_IP_NF_TARGET_LOG is not set
362# CONFIG_IP_NF_TARGET_ULOG is not set 371# CONFIG_IP_NF_TARGET_ULOG is not set
363# CONFIG_IP_NF_TARGET_TCPMSS is not set 372# CONFIG_IP_NF_TARGET_TCPMSS is not set
364CONFIG_IP_NF_NAT=m 373CONFIG_NF_NAT=m
365CONFIG_IP_NF_NAT_NEEDED=y 374CONFIG_NF_NAT_NEEDED=y
366CONFIG_IP_NF_TARGET_MASQUERADE=m 375CONFIG_IP_NF_TARGET_MASQUERADE=m
367CONFIG_IP_NF_TARGET_REDIRECT=m 376CONFIG_IP_NF_TARGET_REDIRECT=m
368CONFIG_IP_NF_TARGET_NETMAP=m 377CONFIG_IP_NF_TARGET_NETMAP=m
369CONFIG_IP_NF_TARGET_SAME=m 378CONFIG_IP_NF_TARGET_SAME=m
370# CONFIG_IP_NF_NAT_SNMP_BASIC is not set 379# CONFIG_NF_NAT_SNMP_BASIC is not set
371CONFIG_IP_NF_NAT_IRC=m 380CONFIG_NF_NAT_FTP=m
372CONFIG_IP_NF_NAT_FTP=m 381CONFIG_NF_NAT_IRC=m
373CONFIG_IP_NF_NAT_TFTP=m 382CONFIG_NF_NAT_TFTP=m
383# CONFIG_NF_NAT_AMANDA is not set
384# CONFIG_NF_NAT_PPTP is not set
385# CONFIG_NF_NAT_H323 is not set
386# CONFIG_NF_NAT_SIP is not set
374CONFIG_IP_NF_MANGLE=m 387CONFIG_IP_NF_MANGLE=m
375CONFIG_IP_NF_TARGET_TOS=m 388CONFIG_IP_NF_TARGET_TOS=m
376CONFIG_IP_NF_TARGET_ECN=m 389CONFIG_IP_NF_TARGET_ECN=m
@@ -580,6 +593,7 @@ CONFIG_BLK_DEV_INITRD=y
580# 593#
581# CONFIG_RAID_ATTRS is not set 594# CONFIG_RAID_ATTRS is not set
582CONFIG_SCSI=y 595CONFIG_SCSI=y
596# CONFIG_SCSI_TGT is not set
583# CONFIG_SCSI_NETLINK is not set 597# CONFIG_SCSI_NETLINK is not set
584CONFIG_SCSI_PROC_FS=y 598CONFIG_SCSI_PROC_FS=y
585 599
@@ -599,6 +613,7 @@ CONFIG_CHR_DEV_SG=y
599CONFIG_SCSI_MULTI_LUN=y 613CONFIG_SCSI_MULTI_LUN=y
600# CONFIG_SCSI_CONSTANTS is not set 614# CONFIG_SCSI_CONSTANTS is not set
601# CONFIG_SCSI_LOGGING is not set 615# CONFIG_SCSI_LOGGING is not set
616# CONFIG_SCSI_SCAN_ASYNC is not set
602 617
603# 618#
604# SCSI Transports 619# SCSI Transports
@@ -646,6 +661,7 @@ CONFIG_SCSI_MULTI_LUN=y
646# CONFIG_SCSI_DC390T is not set 661# CONFIG_SCSI_DC390T is not set
647# CONFIG_SCSI_NSP32 is not set 662# CONFIG_SCSI_NSP32 is not set
648# CONFIG_SCSI_DEBUG is not set 663# CONFIG_SCSI_DEBUG is not set
664# CONFIG_SCSI_SRP is not set
649 665
650# 666#
651# Serial ATA (prod) and Parallel ATA (experimental) drivers 667# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -683,6 +699,7 @@ CONFIG_ATA=y
683# CONFIG_PATA_IT821X is not set 699# CONFIG_PATA_IT821X is not set
684# CONFIG_PATA_JMICRON is not set 700# CONFIG_PATA_JMICRON is not set
685# CONFIG_PATA_TRIFLEX is not set 701# CONFIG_PATA_TRIFLEX is not set
702# CONFIG_PATA_MARVELL is not set
686# CONFIG_PATA_MPIIX is not set 703# CONFIG_PATA_MPIIX is not set
687# CONFIG_PATA_OLDPIIX is not set 704# CONFIG_PATA_OLDPIIX is not set
688# CONFIG_PATA_NETCELL is not set 705# CONFIG_PATA_NETCELL is not set
@@ -726,6 +743,7 @@ CONFIG_PATA_SIL680=y
726# 743#
727# Macintosh device drivers 744# Macintosh device drivers
728# 745#
746# CONFIG_MAC_EMUMOUSEBTN is not set
729# CONFIG_WINDFARM is not set 747# CONFIG_WINDFARM is not set
730 748
731# 749#
@@ -777,6 +795,7 @@ CONFIG_R8169=y
777# CONFIG_IXGB is not set 795# CONFIG_IXGB is not set
778# CONFIG_S2IO is not set 796# CONFIG_S2IO is not set
779# CONFIG_MYRI10GE is not set 797# CONFIG_MYRI10GE is not set
798# CONFIG_NETXEN_NIC is not set
780 799
781# 800#
782# Token Ring devices 801# Token Ring devices
@@ -899,6 +918,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
899# 918#
900# Non-8250 serial port support 919# Non-8250 serial port support
901# 920#
921# CONFIG_SERIAL_UARTLITE is not set
902CONFIG_SERIAL_CORE=y 922CONFIG_SERIAL_CORE=y
903CONFIG_SERIAL_CORE_CONSOLE=y 923CONFIG_SERIAL_CORE_CONSOLE=y
904# CONFIG_SERIAL_JSM is not set 924# CONFIG_SERIAL_JSM is not set
@@ -921,10 +941,6 @@ CONFIG_HW_RANDOM=y
921# CONFIG_DTLK is not set 941# CONFIG_DTLK is not set
922# CONFIG_R3964 is not set 942# CONFIG_R3964 is not set
923# CONFIG_APPLICOM is not set 943# CONFIG_APPLICOM is not set
924
925#
926# Ftape, the floppy tape device driver
927#
928# CONFIG_AGP is not set 944# CONFIG_AGP is not set
929# CONFIG_DRM is not set 945# CONFIG_DRM is not set
930# CONFIG_RAW_DRIVER is not set 946# CONFIG_RAW_DRIVER is not set
@@ -1032,6 +1048,7 @@ CONFIG_HWMON=y
1032# CONFIG_SENSORS_LM92 is not set 1048# CONFIG_SENSORS_LM92 is not set
1033# CONFIG_SENSORS_MAX1619 is not set 1049# CONFIG_SENSORS_MAX1619 is not set
1034# CONFIG_SENSORS_PC87360 is not set 1050# CONFIG_SENSORS_PC87360 is not set
1051# CONFIG_SENSORS_PC87427 is not set
1035# CONFIG_SENSORS_SIS5595 is not set 1052# CONFIG_SENSORS_SIS5595 is not set
1036# CONFIG_SENSORS_SMSC47M1 is not set 1053# CONFIG_SENSORS_SMSC47M1 is not set
1037# CONFIG_SENSORS_SMSC47M192 is not set 1054# CONFIG_SENSORS_SMSC47M192 is not set
@@ -1042,6 +1059,7 @@ CONFIG_HWMON=y
1042# CONFIG_SENSORS_W83781D is not set 1059# CONFIG_SENSORS_W83781D is not set
1043# CONFIG_SENSORS_W83791D is not set 1060# CONFIG_SENSORS_W83791D is not set
1044# CONFIG_SENSORS_W83792D is not set 1061# CONFIG_SENSORS_W83792D is not set
1062# CONFIG_SENSORS_W83793 is not set
1045# CONFIG_SENSORS_W83L785TS is not set 1063# CONFIG_SENSORS_W83L785TS is not set
1046# CONFIG_SENSORS_W83627HF is not set 1064# CONFIG_SENSORS_W83627HF is not set
1047# CONFIG_SENSORS_W83627EHF is not set 1065# CONFIG_SENSORS_W83627EHF is not set
@@ -1063,6 +1081,7 @@ CONFIG_HWMON=y
1063# 1081#
1064CONFIG_FIRMWARE_EDID=y 1082CONFIG_FIRMWARE_EDID=y
1065# CONFIG_FB is not set 1083# CONFIG_FB is not set
1084# CONFIG_FB_IBM_GXT4500 is not set
1066 1085
1067# 1086#
1068# Console display driver support 1087# Console display driver support
@@ -1077,6 +1096,11 @@ CONFIG_DUMMY_CONSOLE=y
1077# CONFIG_SOUND is not set 1096# CONFIG_SOUND is not set
1078 1097
1079# 1098#
1099# HID Devices
1100#
1101CONFIG_HID=y
1102
1103#
1080# USB support 1104# USB support
1081# 1105#
1082CONFIG_USB_ARCH_HAS_HCD=y 1106CONFIG_USB_ARCH_HAS_HCD=y
@@ -1091,6 +1115,7 @@ CONFIG_USB=y
1091CONFIG_USB_DEVICEFS=y 1115CONFIG_USB_DEVICEFS=y
1092# CONFIG_USB_BANDWIDTH is not set 1116# CONFIG_USB_BANDWIDTH is not set
1093# CONFIG_USB_DYNAMIC_MINORS is not set 1117# CONFIG_USB_DYNAMIC_MINORS is not set
1118# CONFIG_USB_MULTITHREAD_PROBE is not set
1094# CONFIG_USB_OTG is not set 1119# CONFIG_USB_OTG is not set
1095 1120
1096# 1121#
@@ -1170,6 +1195,7 @@ CONFIG_USB_STORAGE=m
1170# CONFIG_USB_KAWETH is not set 1195# CONFIG_USB_KAWETH is not set
1171# CONFIG_USB_PEGASUS is not set 1196# CONFIG_USB_PEGASUS is not set
1172# CONFIG_USB_RTL8150 is not set 1197# CONFIG_USB_RTL8150 is not set
1198# CONFIG_USB_USBNET_MII is not set
1173# CONFIG_USB_USBNET is not set 1199# CONFIG_USB_USBNET is not set
1174CONFIG_USB_MON=y 1200CONFIG_USB_MON=y
1175 1201
@@ -1218,6 +1244,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1218# CONFIG_USB_SERIAL_XIRCOM is not set 1244# CONFIG_USB_SERIAL_XIRCOM is not set
1219# CONFIG_USB_SERIAL_OPTION is not set 1245# CONFIG_USB_SERIAL_OPTION is not set
1220# CONFIG_USB_SERIAL_OMNINET is not set 1246# CONFIG_USB_SERIAL_OMNINET is not set
1247# CONFIG_USB_SERIAL_DEBUG is not set
1221 1248
1222# 1249#
1223# USB Miscellaneous drivers 1250# USB Miscellaneous drivers
@@ -1324,6 +1351,10 @@ CONFIG_RTC_DRV_RS5C372=y
1324# 1351#
1325 1352
1326# 1353#
1354# Virtualization
1355#
1356
1357#
1327# File systems 1358# File systems
1328# 1359#
1329CONFIG_EXT2_FS=y 1360CONFIG_EXT2_FS=y
@@ -1398,7 +1429,6 @@ CONFIG_RAMFS=y
1398# CONFIG_BEFS_FS is not set 1429# CONFIG_BEFS_FS is not set
1399# CONFIG_BFS_FS is not set 1430# CONFIG_BFS_FS is not set
1400# CONFIG_EFS_FS is not set 1431# CONFIG_EFS_FS is not set
1401# CONFIG_JFFS_FS is not set
1402# CONFIG_JFFS2_FS is not set 1432# CONFIG_JFFS2_FS is not set
1403# CONFIG_CRAMFS is not set 1433# CONFIG_CRAMFS is not set
1404# CONFIG_VXFS_FS is not set 1434# CONFIG_VXFS_FS is not set
@@ -1488,8 +1518,14 @@ CONFIG_NLS_ISO8859_1=m
1488CONFIG_NLS_UTF8=m 1518CONFIG_NLS_UTF8=m
1489 1519
1490# 1520#
1521# Distributed Lock Manager
1522#
1523# CONFIG_DLM is not set
1524
1525#
1491# Library routines 1526# Library routines
1492# 1527#
1528CONFIG_BITREVERSE=y
1493# CONFIG_CRC_CCITT is not set 1529# CONFIG_CRC_CCITT is not set
1494# CONFIG_CRC16 is not set 1530# CONFIG_CRC16 is not set
1495CONFIG_CRC32=y 1531CONFIG_CRC32=y
@@ -1497,6 +1533,7 @@ CONFIG_LIBCRC32C=m
1497CONFIG_ZLIB_INFLATE=m 1533CONFIG_ZLIB_INFLATE=m
1498CONFIG_ZLIB_DEFLATE=m 1534CONFIG_ZLIB_DEFLATE=m
1499CONFIG_PLIST=y 1535CONFIG_PLIST=y
1536CONFIG_IOMAP_COPY=y
1500 1537
1501# 1538#
1502# Instrumentation Support 1539# Instrumentation Support
@@ -1511,6 +1548,8 @@ CONFIG_OPROFILE=m
1511CONFIG_ENABLE_MUST_CHECK=y 1548CONFIG_ENABLE_MUST_CHECK=y
1512CONFIG_MAGIC_SYSRQ=y 1549CONFIG_MAGIC_SYSRQ=y
1513# CONFIG_UNUSED_SYMBOLS is not set 1550# CONFIG_UNUSED_SYMBOLS is not set
1551# CONFIG_DEBUG_FS is not set
1552# CONFIG_HEADERS_CHECK is not set
1514CONFIG_DEBUG_KERNEL=y 1553CONFIG_DEBUG_KERNEL=y
1515CONFIG_LOG_BUF_SHIFT=14 1554CONFIG_LOG_BUF_SHIFT=14
1516CONFIG_DETECT_SOFTLOCKUP=y 1555CONFIG_DETECT_SOFTLOCKUP=y
@@ -1524,12 +1563,11 @@ CONFIG_DETECT_SOFTLOCKUP=y
1524# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1563# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1525# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1564# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1526# CONFIG_DEBUG_KOBJECT is not set 1565# CONFIG_DEBUG_KOBJECT is not set
1566CONFIG_DEBUG_BUGVERBOSE=y
1527# CONFIG_DEBUG_INFO is not set 1567# CONFIG_DEBUG_INFO is not set
1528# CONFIG_DEBUG_FS is not set
1529# CONFIG_DEBUG_VM is not set 1568# CONFIG_DEBUG_VM is not set
1530# CONFIG_DEBUG_LIST is not set 1569# CONFIG_DEBUG_LIST is not set
1531CONFIG_FORCED_INLINING=y 1570CONFIG_FORCED_INLINING=y
1532# CONFIG_HEADERS_CHECK is not set
1533# CONFIG_RCU_TORTURE_TEST is not set 1571# CONFIG_RCU_TORTURE_TEST is not set
1534# CONFIG_DEBUGGER is not set 1572# CONFIG_DEBUGGER is not set
1535# CONFIG_BDI_SWITCH is not set 1573# CONFIG_BDI_SWITCH is not set
@@ -1551,6 +1589,7 @@ CONFIG_CRYPTO_ALGAPI=y
1551CONFIG_CRYPTO_BLKCIPHER=y 1589CONFIG_CRYPTO_BLKCIPHER=y
1552CONFIG_CRYPTO_MANAGER=y 1590CONFIG_CRYPTO_MANAGER=y
1553# CONFIG_CRYPTO_HMAC is not set 1591# CONFIG_CRYPTO_HMAC is not set
1592# CONFIG_CRYPTO_XCBC is not set
1554# CONFIG_CRYPTO_NULL is not set 1593# CONFIG_CRYPTO_NULL is not set
1555CONFIG_CRYPTO_MD4=m 1594CONFIG_CRYPTO_MD4=m
1556CONFIG_CRYPTO_MD5=y 1595CONFIG_CRYPTO_MD5=y
@@ -1559,8 +1598,10 @@ CONFIG_CRYPTO_SHA1=m
1559# CONFIG_CRYPTO_SHA512 is not set 1598# CONFIG_CRYPTO_SHA512 is not set
1560# CONFIG_CRYPTO_WP512 is not set 1599# CONFIG_CRYPTO_WP512 is not set
1561# CONFIG_CRYPTO_TGR192 is not set 1600# CONFIG_CRYPTO_TGR192 is not set
1601# CONFIG_CRYPTO_GF128MUL is not set
1562CONFIG_CRYPTO_ECB=m 1602CONFIG_CRYPTO_ECB=m
1563CONFIG_CRYPTO_CBC=y 1603CONFIG_CRYPTO_CBC=y
1604# CONFIG_CRYPTO_LRW is not set
1564CONFIG_CRYPTO_DES=y 1605CONFIG_CRYPTO_DES=y
1565CONFIG_CRYPTO_BLOWFISH=m 1606CONFIG_CRYPTO_BLOWFISH=m
1566CONFIG_CRYPTO_TWOFISH=m 1607CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index ee7655776d45..8cbd87ded6b4 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_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.19-rc6 3# Linux kernel version: 2.6.20-rc5
4# Mon Nov 27 11:08:20 2006 4# Mon Jan 22 22:18:18 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,13 +23,13 @@ CONFIG_PPC_OF=y
22# CONFIG_PPC_UDBG_16550 is not set 23# CONFIG_PPC_UDBG_16550 is not set
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
24CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
25# CONFIG_DEFAULT_UIMAGE is not set 27# CONFIG_DEFAULT_UIMAGE is not set
26 28
27# 29#
28# Processor support 30# Processor support
29# 31#
30CONFIG_CLASSIC32=y 32CONFIG_CLASSIC32=y
31# CONFIG_PPC_52xx is not set
32# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
33# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
34# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -68,6 +69,7 @@ CONFIG_SYSVIPC=y
68# CONFIG_UTS_NS is not set 69# CONFIG_UTS_NS is not set
69# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
70# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
72CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
73# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -151,6 +153,7 @@ CONFIG_PPC_LITE5200=y
151# CONFIG_HIGHMEM is not set 153# CONFIG_HIGHMEM is not set
152# CONFIG_HZ_100 is not set 154# CONFIG_HZ_100 is not set
153CONFIG_HZ_250=y 155CONFIG_HZ_250=y
156# CONFIG_HZ_300 is not set
154# CONFIG_HZ_1000 is not set 157# CONFIG_HZ_1000 is not set
155CONFIG_HZ=250 158CONFIG_HZ=250
156CONFIG_PREEMPT_NONE=y 159CONFIG_PREEMPT_NONE=y
@@ -259,6 +262,7 @@ CONFIG_INET_TCP_DIAG=y
259# CONFIG_TCP_CONG_ADVANCED is not set 262# CONFIG_TCP_CONG_ADVANCED is not set
260CONFIG_TCP_CONG_CUBIC=y 263CONFIG_TCP_CONG_CUBIC=y
261CONFIG_DEFAULT_TCP_CONG="cubic" 264CONFIG_DEFAULT_TCP_CONG="cubic"
265# CONFIG_TCP_MD5SIG is not set
262# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
263# CONFIG_INET6_XFRM_TUNNEL is not set 267# CONFIG_INET6_XFRM_TUNNEL is not set
264# CONFIG_INET6_TUNNEL is not set 268# CONFIG_INET6_TUNNEL is not set
@@ -374,6 +378,7 @@ CONFIG_BLK_DEV_INITRD=y
374# 378#
375# CONFIG_RAID_ATTRS is not set 379# CONFIG_RAID_ATTRS is not set
376CONFIG_SCSI=y 380CONFIG_SCSI=y
381# CONFIG_SCSI_TGT is not set
377# CONFIG_SCSI_NETLINK is not set 382# CONFIG_SCSI_NETLINK is not set
378# CONFIG_SCSI_PROC_FS is not set 383# CONFIG_SCSI_PROC_FS is not set
379 384
@@ -393,6 +398,7 @@ CONFIG_SCSI=y
393# CONFIG_SCSI_MULTI_LUN is not set 398# CONFIG_SCSI_MULTI_LUN is not set
394# CONFIG_SCSI_CONSTANTS is not set 399# CONFIG_SCSI_CONSTANTS is not set
395# CONFIG_SCSI_LOGGING is not set 400# CONFIG_SCSI_LOGGING is not set
401# CONFIG_SCSI_SCAN_ASYNC is not set
396 402
397# 403#
398# SCSI Transports 404# SCSI Transports
@@ -440,6 +446,7 @@ CONFIG_SCSI=y
440# CONFIG_SCSI_DC390T is not set 446# CONFIG_SCSI_DC390T is not set
441# CONFIG_SCSI_NSP32 is not set 447# CONFIG_SCSI_NSP32 is not set
442# CONFIG_SCSI_DEBUG is not set 448# CONFIG_SCSI_DEBUG is not set
449# CONFIG_SCSI_SRP is not set
443 450
444# 451#
445# Serial ATA (prod) and Parallel ATA (experimental) drivers 452# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -477,7 +484,7 @@ CONFIG_ATA=y
477# CONFIG_PATA_IT821X is not set 484# CONFIG_PATA_IT821X is not set
478# CONFIG_PATA_JMICRON is not set 485# CONFIG_PATA_JMICRON is not set
479# CONFIG_PATA_TRIFLEX is not set 486# CONFIG_PATA_TRIFLEX is not set
480CONFIG_PATA_MPC52xx=y 487# CONFIG_PATA_MARVELL is not set
481# CONFIG_PATA_MPIIX is not set 488# CONFIG_PATA_MPIIX is not set
482# CONFIG_PATA_OLDPIIX is not set 489# CONFIG_PATA_OLDPIIX is not set
483# CONFIG_PATA_NETCELL is not set 490# CONFIG_PATA_NETCELL is not set
@@ -494,6 +501,7 @@ CONFIG_PATA_MPC52xx=y
494# CONFIG_PATA_SIS is not set 501# CONFIG_PATA_SIS is not set
495# CONFIG_PATA_VIA is not set 502# CONFIG_PATA_VIA is not set
496# CONFIG_PATA_WINBOND is not set 503# CONFIG_PATA_WINBOND is not set
504# CONFIG_PATA_PLATFORM is not set
497 505
498# 506#
499# Multi-device support (RAID and LVM) 507# Multi-device support (RAID and LVM)
@@ -521,6 +529,7 @@ CONFIG_PATA_MPC52xx=y
521# 529#
522# Macintosh device drivers 530# Macintosh device drivers
523# 531#
532# CONFIG_MAC_EMUMOUSEBTN is not set
524# CONFIG_WINDFARM is not set 533# CONFIG_WINDFARM is not set
525 534
526# 535#
@@ -572,6 +581,7 @@ CONFIG_NETDEVICES=y
572# CONFIG_IXGB is not set 581# CONFIG_IXGB is not set
573# CONFIG_S2IO is not set 582# CONFIG_S2IO is not set
574# CONFIG_MYRI10GE is not set 583# CONFIG_MYRI10GE is not set
584# CONFIG_NETXEN_NIC is not set
575 585
576# 586#
577# Token Ring devices 587# Token Ring devices
@@ -632,6 +642,7 @@ CONFIG_NETDEVICES=y
632# 642#
633# Non-8250 serial port support 643# Non-8250 serial port support
634# 644#
645# CONFIG_SERIAL_UARTLITE is not set
635CONFIG_SERIAL_CORE=y 646CONFIG_SERIAL_CORE=y
636CONFIG_SERIAL_CORE_CONSOLE=y 647CONFIG_SERIAL_CORE_CONSOLE=y
637CONFIG_SERIAL_MPC52xx=y 648CONFIG_SERIAL_MPC52xx=y
@@ -657,10 +668,6 @@ CONFIG_LEGACY_PTY_COUNT=256
657# CONFIG_DTLK is not set 668# CONFIG_DTLK is not set
658# CONFIG_R3964 is not set 669# CONFIG_R3964 is not set
659# CONFIG_APPLICOM is not set 670# CONFIG_APPLICOM is not set
660
661#
662# Ftape, the floppy tape device driver
663#
664# CONFIG_AGP is not set 671# CONFIG_AGP is not set
665# CONFIG_DRM is not set 672# CONFIG_DRM is not set
666# CONFIG_RAW_DRIVER is not set 673# CONFIG_RAW_DRIVER is not set
@@ -707,6 +714,7 @@ CONFIG_LEGACY_PTY_COUNT=256
707# 714#
708# CONFIG_FIRMWARE_EDID is not set 715# CONFIG_FIRMWARE_EDID is not set
709# CONFIG_FB is not set 716# CONFIG_FB is not set
717# CONFIG_FB_IBM_GXT4500 is not set
710# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 718# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
711 719
712# 720#
@@ -777,6 +785,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
777# 785#
778 786
779# 787#
788# Virtualization
789#
790
791#
780# File systems 792# File systems
781# 793#
782CONFIG_EXT2_FS=y 794CONFIG_EXT2_FS=y
@@ -873,6 +885,11 @@ CONFIG_MSDOS_PARTITION=y
873# CONFIG_NLS is not set 885# CONFIG_NLS is not set
874 886
875# 887#
888# Distributed Lock Manager
889#
890# CONFIG_DLM is not set
891
892#
876# Library routines 893# Library routines
877# 894#
878# CONFIG_CRC_CCITT is not set 895# CONFIG_CRC_CCITT is not set
@@ -880,6 +897,7 @@ CONFIG_MSDOS_PARTITION=y
880# CONFIG_CRC32 is not set 897# CONFIG_CRC32 is not set
881# CONFIG_LIBCRC32C is not set 898# CONFIG_LIBCRC32C is not set
882CONFIG_PLIST=y 899CONFIG_PLIST=y
900CONFIG_IOMAP_COPY=y
883 901
884# 902#
885# Instrumentation Support 903# Instrumentation Support
@@ -893,6 +911,8 @@ CONFIG_PRINTK_TIME=y
893CONFIG_ENABLE_MUST_CHECK=y 911CONFIG_ENABLE_MUST_CHECK=y
894# CONFIG_MAGIC_SYSRQ is not set 912# CONFIG_MAGIC_SYSRQ is not set
895# CONFIG_UNUSED_SYMBOLS is not set 913# CONFIG_UNUSED_SYMBOLS is not set
914# CONFIG_DEBUG_FS is not set
915# CONFIG_HEADERS_CHECK is not set
896CONFIG_DEBUG_KERNEL=y 916CONFIG_DEBUG_KERNEL=y
897CONFIG_LOG_BUF_SHIFT=14 917CONFIG_LOG_BUF_SHIFT=14
898CONFIG_DETECT_SOFTLOCKUP=y 918CONFIG_DETECT_SOFTLOCKUP=y
@@ -906,12 +926,11 @@ CONFIG_DETECT_SOFTLOCKUP=y
906# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 926# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
907# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 927# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
908# CONFIG_DEBUG_KOBJECT is not set 928# CONFIG_DEBUG_KOBJECT is not set
929# CONFIG_DEBUG_BUGVERBOSE is not set
909CONFIG_DEBUG_INFO=y 930CONFIG_DEBUG_INFO=y
910# CONFIG_DEBUG_FS is not set
911# CONFIG_DEBUG_VM is not set 931# CONFIG_DEBUG_VM is not set
912# CONFIG_DEBUG_LIST is not set 932# CONFIG_DEBUG_LIST is not set
913CONFIG_FORCED_INLINING=y 933CONFIG_FORCED_INLINING=y
914# CONFIG_HEADERS_CHECK is not set
915# CONFIG_RCU_TORTURE_TEST is not set 934# CONFIG_RCU_TORTURE_TEST is not set
916# CONFIG_DEBUGGER is not set 935# CONFIG_DEBUGGER is not set
917# CONFIG_BDI_SWITCH is not set 936# CONFIG_BDI_SWITCH is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index ae96a5b2f00d..de97f2f0ae96 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_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 3# Linux kernel version: 2.6.20-rc5
4# Mon Oct 9 11:59:34 2006 4# Mon Jan 22 22:19:02 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_ARCH_HAS_ILOG2_U64=y
13CONFIG_GENERIC_HWEIGHT=y 15CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 17CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -23,6 +25,7 @@ CONFIG_PPC_OF=y
23CONFIG_PPC_UDBG_16550=y 25CONFIG_PPC_UDBG_16550=y
24CONFIG_GENERIC_TBSYNC=y 26CONFIG_GENERIC_TBSYNC=y
25CONFIG_AUDIT_ARCH=y 27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y
26# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
27 30
28# 31#
@@ -31,6 +34,9 @@ CONFIG_AUDIT_ARCH=y
31CONFIG_POWER4_ONLY=y 34CONFIG_POWER4_ONLY=y
32CONFIG_POWER4=y 35CONFIG_POWER4=y
33CONFIG_PPC_FPU=y 36CONFIG_PPC_FPU=y
37# CONFIG_PPC_DCR_NATIVE is not set
38# CONFIG_PPC_DCR_MMIO is not set
39# CONFIG_PPC_OF_PLATFORM_PCI is not set
34# CONFIG_ALTIVEC is not set 40# CONFIG_ALTIVEC is not set
35CONFIG_PPC_STD_MMU=y 41CONFIG_PPC_STD_MMU=y
36CONFIG_VIRT_CPU_ACCOUNTING=y 42CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -61,12 +67,13 @@ CONFIG_POSIX_MQUEUE=y
61CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
62CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
63# CONFIG_CPUSETS is not set 69# CONFIG_CPUSETS is not set
70CONFIG_SYSFS_DEPRECATED=y
64# CONFIG_RELAY is not set 71# CONFIG_RELAY is not set
65CONFIG_INITRAMFS_SOURCE="" 72CONFIG_INITRAMFS_SOURCE=""
66CONFIG_CC_OPTIMIZE_FOR_SIZE=y 73CONFIG_CC_OPTIMIZE_FOR_SIZE=y
67CONFIG_SYSCTL=y 74CONFIG_SYSCTL=y
68# CONFIG_EMBEDDED is not set 75# CONFIG_EMBEDDED is not set
69# CONFIG_SYSCTL_SYSCALL is not set 76CONFIG_SYSCTL_SYSCALL=y
70CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
71CONFIG_KALLSYMS_ALL=y 78CONFIG_KALLSYMS_ALL=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -123,18 +130,27 @@ CONFIG_PPC_MULTIPLATFORM=y
123# CONFIG_APUS is not set 130# CONFIG_APUS is not set
124# CONFIG_PPC_PSERIES is not set 131# CONFIG_PPC_PSERIES is not set
125# CONFIG_PPC_ISERIES is not set 132# CONFIG_PPC_ISERIES is not set
133# CONFIG_PPC_MPC52xx is not set
126# CONFIG_PPC_PMAC is not set 134# CONFIG_PPC_PMAC is not set
127CONFIG_PPC_MAPLE=y 135CONFIG_PPC_MAPLE=y
128# CONFIG_PPC_PASEMI is not set 136# CONFIG_PPC_PASEMI is not set
129# CONFIG_PPC_CELL is not set 137# CONFIG_PPC_CELL is not set
130# CONFIG_PPC_CELL_NATIVE is not set 138# CONFIG_PPC_CELL_NATIVE is not set
131# CONFIG_PPC_IBM_CELL_BLADE is not set 139# CONFIG_PPC_IBM_CELL_BLADE is not set
140# CONFIG_PPC_PS3 is not set
141CONFIG_PPC_NATIVE=y
142CONFIG_UDBG_RTAS_CONSOLE=y
132CONFIG_U3_DART=y 143CONFIG_U3_DART=y
133# CONFIG_PPC_RTAS is not set 144CONFIG_PPC_RTAS=y
145# CONFIG_RTAS_ERROR_LOGGING is not set
146CONFIG_RTAS_PROC=y
147# CONFIG_RTAS_FLASH is not set
134# CONFIG_MMIO_NVRAM is not set 148# CONFIG_MMIO_NVRAM is not set
135CONFIG_MPIC_BROKEN_U3=y 149CONFIG_MPIC_BROKEN_U3=y
136# CONFIG_PPC_MPC106 is not set 150# CONFIG_PPC_MPC106 is not set
137CONFIG_PPC_970_NAP=y 151CONFIG_PPC_970_NAP=y
152# CONFIG_PPC_INDIRECT_IO is not set
153# CONFIG_GENERIC_IOMAP is not set
138# CONFIG_CPU_FREQ is not set 154# CONFIG_CPU_FREQ is not set
139# CONFIG_WANT_EARLY_SERIAL is not set 155# CONFIG_WANT_EARLY_SERIAL is not set
140CONFIG_MPIC=y 156CONFIG_MPIC=y
@@ -144,6 +160,7 @@ CONFIG_MPIC=y
144# 160#
145# CONFIG_HZ_100 is not set 161# CONFIG_HZ_100 is not set
146CONFIG_HZ_250=y 162CONFIG_HZ_250=y
163# CONFIG_HZ_300 is not set
147# CONFIG_HZ_1000 is not set 164# CONFIG_HZ_1000 is not set
148CONFIG_HZ=250 165CONFIG_HZ=250
149CONFIG_PREEMPT_NONE=y 166CONFIG_PREEMPT_NONE=y
@@ -190,7 +207,6 @@ CONFIG_GENERIC_ISA_DMA=y
190CONFIG_PCI=y 207CONFIG_PCI=y
191CONFIG_PCI_DOMAINS=y 208CONFIG_PCI_DOMAINS=y
192# CONFIG_PCIEPORTBUS is not set 209# CONFIG_PCIEPORTBUS is not set
193# CONFIG_PCI_MULTITHREAD_PROBE is not set
194# CONFIG_PCI_DEBUG is not set 210# CONFIG_PCI_DEBUG is not set
195 211
196# 212#
@@ -246,6 +262,7 @@ CONFIG_INET_TCP_DIAG=y
246# CONFIG_TCP_CONG_ADVANCED is not set 262# CONFIG_TCP_CONG_ADVANCED is not set
247CONFIG_TCP_CONG_CUBIC=y 263CONFIG_TCP_CONG_CUBIC=y
248CONFIG_DEFAULT_TCP_CONG="cubic" 264CONFIG_DEFAULT_TCP_CONG="cubic"
265# CONFIG_TCP_MD5SIG is not set
249# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
250# CONFIG_INET6_XFRM_TUNNEL is not set 267# CONFIG_INET6_XFRM_TUNNEL is not set
251# CONFIG_INET6_TUNNEL is not set 268# CONFIG_INET6_TUNNEL is not set
@@ -346,6 +363,12 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
346# CONFIG_ATA_OVER_ETH is not set 363# CONFIG_ATA_OVER_ETH is not set
347 364
348# 365#
366# Misc devices
367#
368# CONFIG_SGI_IOC4 is not set
369# CONFIG_TIFM_CORE is not set
370
371#
349# ATA/ATAPI/MFM/RLL support 372# ATA/ATAPI/MFM/RLL support
350# 373#
351CONFIG_IDE=y 374CONFIG_IDE=y
@@ -371,7 +394,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
371# CONFIG_BLK_DEV_OFFBOARD is not set 394# CONFIG_BLK_DEV_OFFBOARD is not set
372CONFIG_BLK_DEV_GENERIC=y 395CONFIG_BLK_DEV_GENERIC=y
373# CONFIG_BLK_DEV_OPTI621 is not set 396# CONFIG_BLK_DEV_OPTI621 is not set
374# CONFIG_BLK_DEV_SL82C105 is not set
375CONFIG_BLK_DEV_IDEDMA_PCI=y 397CONFIG_BLK_DEV_IDEDMA_PCI=y
376# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 398# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
377CONFIG_IDEDMA_PCI_AUTO=y 399CONFIG_IDEDMA_PCI_AUTO=y
@@ -395,6 +417,7 @@ CONFIG_BLK_DEV_AMD74XX=y
395# CONFIG_BLK_DEV_PDC202XX_NEW is not set 417# CONFIG_BLK_DEV_PDC202XX_NEW is not set
396# CONFIG_BLK_DEV_SVWKS is not set 418# CONFIG_BLK_DEV_SVWKS is not set
397# CONFIG_BLK_DEV_SIIMAGE is not set 419# CONFIG_BLK_DEV_SIIMAGE is not set
420# CONFIG_BLK_DEV_SL82C105 is not set
398# CONFIG_BLK_DEV_SLC90E66 is not set 421# CONFIG_BLK_DEV_SLC90E66 is not set
399# CONFIG_BLK_DEV_TRM290 is not set 422# CONFIG_BLK_DEV_TRM290 is not set
400# CONFIG_BLK_DEV_VIA82CXXX is not set 423# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -439,6 +462,7 @@ CONFIG_IDEDMA_AUTO=y
439# 462#
440# Macintosh device drivers 463# Macintosh device drivers
441# 464#
465# CONFIG_MAC_EMUMOUSEBTN is not set
442# CONFIG_WINDFARM is not set 466# CONFIG_WINDFARM is not set
443 467
444# 468#
@@ -523,6 +547,7 @@ CONFIG_TIGON3=y
523# CONFIG_IXGB is not set 547# CONFIG_IXGB is not set
524# CONFIG_S2IO is not set 548# CONFIG_S2IO is not set
525# CONFIG_MYRI10GE is not set 549# CONFIG_MYRI10GE is not set
550# CONFIG_NETXEN_NIC is not set
526 551
527# 552#
528# Token Ring devices 553# Token Ring devices
@@ -618,6 +643,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y
618CONFIG_UNIX98_PTYS=y 643CONFIG_UNIX98_PTYS=y
619CONFIG_LEGACY_PTYS=y 644CONFIG_LEGACY_PTYS=y
620CONFIG_LEGACY_PTY_COUNT=256 645CONFIG_LEGACY_PTY_COUNT=256
646CONFIG_HVC_DRIVER=y
647CONFIG_HVC_RTAS=y
621 648
622# 649#
623# IPMI 650# IPMI
@@ -634,10 +661,6 @@ CONFIG_GEN_RTC=y
634# CONFIG_DTLK is not set 661# CONFIG_DTLK is not set
635# CONFIG_R3964 is not set 662# CONFIG_R3964 is not set
636# CONFIG_APPLICOM is not set 663# CONFIG_APPLICOM is not set
637
638#
639# Ftape, the floppy tape device driver
640#
641# CONFIG_AGP is not set 664# CONFIG_AGP is not set
642# CONFIG_DRM is not set 665# CONFIG_DRM is not set
643# CONFIG_RAW_DRIVER is not set 666# CONFIG_RAW_DRIVER is not set
@@ -647,7 +670,6 @@ CONFIG_GEN_RTC=y
647# TPM devices 670# TPM devices
648# 671#
649# CONFIG_TCG_TPM is not set 672# CONFIG_TCG_TPM is not set
650# CONFIG_TELCLOCK is not set
651 673
652# 674#
653# I2C support 675# I2C support
@@ -711,6 +733,7 @@ CONFIG_I2C_AMD8111=y
711# 733#
712# Dallas's 1-wire bus 734# Dallas's 1-wire bus
713# 735#
736# CONFIG_W1 is not set
714 737
715# 738#
716# Hardware Monitoring support 739# Hardware Monitoring support
@@ -719,15 +742,9 @@ CONFIG_I2C_AMD8111=y
719# CONFIG_HWMON_VID is not set 742# CONFIG_HWMON_VID is not set
720 743
721# 744#
722# Misc devices
723#
724# CONFIG_TIFM_CORE is not set
725
726#
727# Multimedia devices 745# Multimedia devices
728# 746#
729# CONFIG_VIDEO_DEV is not set 747# CONFIG_VIDEO_DEV is not set
730CONFIG_VIDEO_V4L2=y
731 748
732# 749#
733# Digital Video Broadcasting Devices 750# Digital Video Broadcasting Devices
@@ -740,6 +757,7 @@ CONFIG_VIDEO_V4L2=y
740# 757#
741CONFIG_FIRMWARE_EDID=y 758CONFIG_FIRMWARE_EDID=y
742# CONFIG_FB is not set 759# CONFIG_FB is not set
760# CONFIG_FB_IBM_GXT4500 is not set
743 761
744# 762#
745# Console display driver support 763# Console display driver support
@@ -754,6 +772,11 @@ CONFIG_DUMMY_CONSOLE=y
754# CONFIG_SOUND is not set 772# CONFIG_SOUND is not set
755 773
756# 774#
775# HID Devices
776#
777CONFIG_HID=y
778
779#
757# USB support 780# USB support
758# 781#
759CONFIG_USB_ARCH_HAS_HCD=y 782CONFIG_USB_ARCH_HAS_HCD=y
@@ -768,6 +791,7 @@ CONFIG_USB=y
768CONFIG_USB_DEVICEFS=y 791CONFIG_USB_DEVICEFS=y
769# CONFIG_USB_BANDWIDTH is not set 792# CONFIG_USB_BANDWIDTH is not set
770# CONFIG_USB_DYNAMIC_MINORS is not set 793# CONFIG_USB_DYNAMIC_MINORS is not set
794# CONFIG_USB_MULTITHREAD_PROBE is not set
771# CONFIG_USB_OTG is not set 795# CONFIG_USB_OTG is not set
772 796
773# 797#
@@ -803,7 +827,6 @@ CONFIG_USB_UHCI_HCD=y
803# USB Input Devices 827# USB Input Devices
804# 828#
805CONFIG_USB_HID=y 829CONFIG_USB_HID=y
806CONFIG_USB_HIDINPUT=y
807# CONFIG_USB_HIDINPUT_POWERBOOK is not set 830# CONFIG_USB_HIDINPUT_POWERBOOK is not set
808# CONFIG_HID_FF is not set 831# CONFIG_HID_FF is not set
809# CONFIG_USB_HIDDEV is not set 832# CONFIG_USB_HIDDEV is not set
@@ -819,7 +842,6 @@ CONFIG_USB_HIDINPUT=y
819# CONFIG_USB_ATI_REMOTE2 is not set 842# CONFIG_USB_ATI_REMOTE2 is not set
820# CONFIG_USB_KEYSPAN_REMOTE is not set 843# CONFIG_USB_KEYSPAN_REMOTE is not set
821# CONFIG_USB_APPLETOUCH is not set 844# CONFIG_USB_APPLETOUCH is not set
822# CONFIG_USB_TRANCEVIBRATOR is not set
823 845
824# 846#
825# USB Imaging devices 847# USB Imaging devices
@@ -833,6 +855,7 @@ CONFIG_USB_HIDINPUT=y
833# CONFIG_USB_KAWETH is not set 855# CONFIG_USB_KAWETH is not set
834CONFIG_USB_PEGASUS=y 856CONFIG_USB_PEGASUS=y
835# CONFIG_USB_RTL8150 is not set 857# CONFIG_USB_RTL8150 is not set
858# CONFIG_USB_USBNET_MII is not set
836# CONFIG_USB_USBNET is not set 859# CONFIG_USB_USBNET is not set
837CONFIG_USB_MON=y 860CONFIG_USB_MON=y
838 861
@@ -881,6 +904,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
881# CONFIG_USB_SERIAL_KLSI is not set 904# CONFIG_USB_SERIAL_KLSI is not set
882# CONFIG_USB_SERIAL_KOBIL_SCT is not set 905# CONFIG_USB_SERIAL_KOBIL_SCT is not set
883# CONFIG_USB_SERIAL_MCT_U232 is not set 906# CONFIG_USB_SERIAL_MCT_U232 is not set
907# CONFIG_USB_SERIAL_MOS7720 is not set
884# CONFIG_USB_SERIAL_MOS7840 is not set 908# CONFIG_USB_SERIAL_MOS7840 is not set
885# CONFIG_USB_SERIAL_NAVMAN is not set 909# CONFIG_USB_SERIAL_NAVMAN is not set
886# CONFIG_USB_SERIAL_PL2303 is not set 910# CONFIG_USB_SERIAL_PL2303 is not set
@@ -892,6 +916,7 @@ CONFIG_USB_SERIAL_TI=m
892# CONFIG_USB_SERIAL_XIRCOM is not set 916# CONFIG_USB_SERIAL_XIRCOM is not set
893# CONFIG_USB_SERIAL_OPTION is not set 917# CONFIG_USB_SERIAL_OPTION is not set
894# CONFIG_USB_SERIAL_OMNINET is not set 918# CONFIG_USB_SERIAL_OMNINET is not set
919# CONFIG_USB_SERIAL_DEBUG is not set
895CONFIG_USB_EZUSB=y 920CONFIG_USB_EZUSB=y
896 921
897# 922#
@@ -913,6 +938,7 @@ CONFIG_USB_EZUSB=y
913# CONFIG_USB_APPLEDISPLAY is not set 938# CONFIG_USB_APPLEDISPLAY is not set
914# CONFIG_USB_SISUSBVGA is not set 939# CONFIG_USB_SISUSBVGA is not set
915# CONFIG_USB_LD is not set 940# CONFIG_USB_LD is not set
941# CONFIG_USB_TRANCEVIBRATOR is not set
916# CONFIG_USB_TEST is not set 942# CONFIG_USB_TEST is not set
917 943
918# 944#
@@ -970,6 +996,10 @@ CONFIG_USB_EZUSB=y
970# 996#
971 997
972# 998#
999# Virtualization
1000#
1001
1002#
973# File systems 1003# File systems
974# 1004#
975CONFIG_EXT2_FS=y 1005CONFIG_EXT2_FS=y
@@ -978,12 +1008,14 @@ CONFIG_EXT2_FS_XIP=y
978CONFIG_FS_XIP=y 1008CONFIG_FS_XIP=y
979CONFIG_EXT3_FS=y 1009CONFIG_EXT3_FS=y
980# CONFIG_EXT3_FS_XATTR is not set 1010# CONFIG_EXT3_FS_XATTR is not set
1011# CONFIG_EXT4DEV_FS is not set
981CONFIG_JBD=y 1012CONFIG_JBD=y
982# CONFIG_JBD_DEBUG is not set 1013# CONFIG_JBD_DEBUG is not set
983# CONFIG_REISERFS_FS is not set 1014# CONFIG_REISERFS_FS is not set
984# CONFIG_JFS_FS is not set 1015# CONFIG_JFS_FS is not set
985CONFIG_FS_POSIX_ACL=y 1016CONFIG_FS_POSIX_ACL=y
986# CONFIG_XFS_FS is not set 1017# CONFIG_XFS_FS is not set
1018# CONFIG_GFS2_FS is not set
987# CONFIG_OCFS2_FS is not set 1019# CONFIG_OCFS2_FS is not set
988# CONFIG_MINIX_FS is not set 1020# CONFIG_MINIX_FS is not set
989# CONFIG_ROMFS_FS is not set 1021# CONFIG_ROMFS_FS is not set
@@ -1133,14 +1165,21 @@ CONFIG_NLS_DEFAULT="utf-8"
1133CONFIG_NLS_UTF8=y 1165CONFIG_NLS_UTF8=y
1134 1166
1135# 1167#
1168# Distributed Lock Manager
1169#
1170# CONFIG_DLM is not set
1171
1172#
1136# Library routines 1173# Library routines
1137# 1174#
1175CONFIG_BITREVERSE=y
1138CONFIG_CRC_CCITT=y 1176CONFIG_CRC_CCITT=y
1139# CONFIG_CRC16 is not set 1177# CONFIG_CRC16 is not set
1140CONFIG_CRC32=y 1178CONFIG_CRC32=y
1141# CONFIG_LIBCRC32C is not set 1179# CONFIG_LIBCRC32C is not set
1142CONFIG_ZLIB_INFLATE=y 1180CONFIG_ZLIB_INFLATE=y
1143CONFIG_PLIST=y 1181CONFIG_PLIST=y
1182CONFIG_IOMAP_COPY=y
1144 1183
1145# 1184#
1146# Instrumentation Support 1185# Instrumentation Support
@@ -1155,6 +1194,8 @@ CONFIG_PLIST=y
1155CONFIG_ENABLE_MUST_CHECK=y 1194CONFIG_ENABLE_MUST_CHECK=y
1156CONFIG_MAGIC_SYSRQ=y 1195CONFIG_MAGIC_SYSRQ=y
1157# CONFIG_UNUSED_SYMBOLS is not set 1196# CONFIG_UNUSED_SYMBOLS is not set
1197CONFIG_DEBUG_FS=y
1198# CONFIG_HEADERS_CHECK is not set
1158CONFIG_DEBUG_KERNEL=y 1199CONFIG_DEBUG_KERNEL=y
1159CONFIG_LOG_BUF_SHIFT=17 1200CONFIG_LOG_BUF_SHIFT=17
1160CONFIG_DETECT_SOFTLOCKUP=y 1201CONFIG_DETECT_SOFTLOCKUP=y
@@ -1169,8 +1210,8 @@ CONFIG_DEBUG_SLAB=y
1169CONFIG_DEBUG_SPINLOCK_SLEEP=y 1210CONFIG_DEBUG_SPINLOCK_SLEEP=y
1170# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1211# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1171# CONFIG_DEBUG_KOBJECT is not set 1212# CONFIG_DEBUG_KOBJECT is not set
1213CONFIG_DEBUG_BUGVERBOSE=y
1172# CONFIG_DEBUG_INFO is not set 1214# CONFIG_DEBUG_INFO is not set
1173CONFIG_DEBUG_FS=y
1174# CONFIG_DEBUG_VM is not set 1215# CONFIG_DEBUG_VM is not set
1175# CONFIG_DEBUG_LIST is not set 1216# CONFIG_DEBUG_LIST is not set
1176# CONFIG_FORCED_INLINING is not set 1217# CONFIG_FORCED_INLINING is not set
@@ -1180,6 +1221,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1180CONFIG_DEBUGGER=y 1221CONFIG_DEBUGGER=y
1181CONFIG_XMON=y 1222CONFIG_XMON=y
1182CONFIG_XMON_DEFAULT=y 1223CONFIG_XMON_DEFAULT=y
1224CONFIG_XMON_DISASSEMBLY=y
1183# CONFIG_IRQSTACKS is not set 1225# CONFIG_IRQSTACKS is not set
1184CONFIG_BOOTX_TEXT=y 1226CONFIG_BOOTX_TEXT=y
1185# CONFIG_PPC_EARLY_DEBUG is not set 1227# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1195,9 +1237,10 @@ CONFIG_BOOTX_TEXT=y
1195# 1237#
1196CONFIG_CRYPTO=y 1238CONFIG_CRYPTO=y
1197CONFIG_CRYPTO_ALGAPI=y 1239CONFIG_CRYPTO_ALGAPI=y
1198CONFIG_CRYPTO_BLKCIPHER=m 1240CONFIG_CRYPTO_BLKCIPHER=y
1199CONFIG_CRYPTO_MANAGER=m 1241CONFIG_CRYPTO_MANAGER=y
1200# CONFIG_CRYPTO_HMAC is not set 1242# CONFIG_CRYPTO_HMAC is not set
1243# CONFIG_CRYPTO_XCBC is not set
1201# CONFIG_CRYPTO_NULL is not set 1244# CONFIG_CRYPTO_NULL is not set
1202# CONFIG_CRYPTO_MD4 is not set 1245# CONFIG_CRYPTO_MD4 is not set
1203CONFIG_CRYPTO_MD5=y 1246CONFIG_CRYPTO_MD5=y
@@ -1206,8 +1249,10 @@ CONFIG_CRYPTO_MD5=y
1206# CONFIG_CRYPTO_SHA512 is not set 1249# CONFIG_CRYPTO_SHA512 is not set
1207# CONFIG_CRYPTO_WP512 is not set 1250# CONFIG_CRYPTO_WP512 is not set
1208# CONFIG_CRYPTO_TGR192 is not set 1251# CONFIG_CRYPTO_TGR192 is not set
1252# CONFIG_CRYPTO_GF128MUL is not set
1209CONFIG_CRYPTO_ECB=m 1253CONFIG_CRYPTO_ECB=m
1210CONFIG_CRYPTO_CBC=m 1254CONFIG_CRYPTO_CBC=y
1255# CONFIG_CRYPTO_LRW is not set
1211CONFIG_CRYPTO_DES=y 1256CONFIG_CRYPTO_DES=y
1212# CONFIG_CRYPTO_BLOWFISH is not set 1257# CONFIG_CRYPTO_BLOWFISH is not set
1213# CONFIG_CRYPTO_TWOFISH is not set 1258# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index d1811e754518..fdf09eabe6e7 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:26:55 2006 4# Mon Jan 22 22:20:53 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29CONFIG_CLASSIC32=y 32CONFIG_CLASSIC32=y
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -38,6 +40,8 @@ CONFIG_CLASSIC32=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_6xx=y 41CONFIG_6xx=y
40CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41# CONFIG_ALTIVEC is not set 45# CONFIG_ALTIVEC is not set
42CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
@@ -58,16 +62,20 @@ CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 63CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
61# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
64CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y
70CONFIG_EMBEDDED=y 77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
71CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
73CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
@@ -75,12 +83,12 @@ CONFIG_PRINTK=y
75CONFIG_BUG=y 83CONFIG_BUG=y
76CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
77CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
78CONFIG_RT_MUTEXES=y
79CONFIG_FUTEX=y 86CONFIG_FUTEX=y
80CONFIG_EPOLL=y 87CONFIG_EPOLL=y
81CONFIG_SHMEM=y 88CONFIG_SHMEM=y
82CONFIG_SLAB=y 89CONFIG_SLAB=y
83CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
91CONFIG_RT_MUTEXES=y
84# CONFIG_TINY_SHMEM is not set 92# CONFIG_TINY_SHMEM is not set
85CONFIG_BASE_SMALL=0 93CONFIG_BASE_SMALL=0
86# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
@@ -93,6 +101,7 @@ CONFIG_BASE_SMALL=0
93# 101#
94# Block layer 102# Block layer
95# 103#
104CONFIG_BLOCK=y
96CONFIG_LBD=y 105CONFIG_LBD=y
97# CONFIG_BLK_DEV_IO_TRACE is not set 106# CONFIG_BLK_DEV_IO_TRACE is not set
98# CONFIG_LSF is not set 107# CONFIG_LSF is not set
@@ -114,19 +123,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
114# Platform support 123# Platform support
115# 124#
116# CONFIG_PPC_MULTIPLATFORM is not set 125# CONFIG_PPC_MULTIPLATFORM is not set
117# CONFIG_PPC_ISERIES is not set
118CONFIG_EMBEDDED6xx=y 126CONFIG_EMBEDDED6xx=y
119# CONFIG_APUS is not set 127# CONFIG_APUS is not set
128# CONFIG_PPC_MPC52xx is not set
120# CONFIG_PPC_CELL is not set 129# CONFIG_PPC_CELL is not set
121# CONFIG_PPC_CELL_NATIVE is not set 130# CONFIG_PPC_CELL_NATIVE is not set
122# CONFIG_UDBG_RTAS_CONSOLE is not set
123# CONFIG_PPC_RTAS is not set 131# CONFIG_PPC_RTAS is not set
124# CONFIG_MMIO_NVRAM is not set 132# CONFIG_MMIO_NVRAM is not set
125# CONFIG_PPC_MPC106 is not set 133# CONFIG_PPC_MPC106 is not set
126# CONFIG_PPC_970_NAP is not set 134# CONFIG_PPC_970_NAP is not set
135# CONFIG_PPC_INDIRECT_IO is not set
136# CONFIG_GENERIC_IOMAP is not set
127# CONFIG_CPU_FREQ is not set 137# CONFIG_CPU_FREQ is not set
128# CONFIG_TAU is not set 138# CONFIG_TAU is not set
129# CONFIG_PPC_TODC is not set
130# CONFIG_KATANA is not set 139# CONFIG_KATANA is not set
131# CONFIG_WILLOW is not set 140# CONFIG_WILLOW is not set
132# CONFIG_CPCI690 is not set 141# CONFIG_CPCI690 is not set
@@ -141,6 +150,7 @@ CONFIG_EMBEDDED6xx=y
141# CONFIG_PRPMC750 is not set 150# CONFIG_PRPMC750 is not set
142# CONFIG_PRPMC800 is not set 151# CONFIG_PRPMC800 is not set
143# CONFIG_SANDPOINT is not set 152# CONFIG_SANDPOINT is not set
153# CONFIG_LINKSTATION is not set
144CONFIG_MPC7448HPC2=y 154CONFIG_MPC7448HPC2=y
145# CONFIG_RADSTONE_PPC7D is not set 155# CONFIG_RADSTONE_PPC7D is not set
146# CONFIG_PAL4 is not set 156# CONFIG_PAL4 is not set
@@ -152,7 +162,6 @@ CONFIG_MPC7448HPC2=y
152# CONFIG_TQM8260 is not set 162# CONFIG_TQM8260 is not set
153# CONFIG_ADS8272 is not set 163# CONFIG_ADS8272 is not set
154# CONFIG_PQ2FADS is not set 164# CONFIG_PQ2FADS is not set
155# CONFIG_LITE5200 is not set
156# CONFIG_EV64360 is not set 165# CONFIG_EV64360 is not set
157CONFIG_TSI108_BRIDGE=y 166CONFIG_TSI108_BRIDGE=y
158# CONFIG_WANT_EARLY_SERIAL is not set 167# CONFIG_WANT_EARLY_SERIAL is not set
@@ -164,6 +173,7 @@ CONFIG_MPIC=y
164# CONFIG_HIGHMEM is not set 173# CONFIG_HIGHMEM is not set
165# CONFIG_HZ_100 is not set 174# CONFIG_HZ_100 is not set
166CONFIG_HZ_250=y 175CONFIG_HZ_250=y
176# CONFIG_HZ_300 is not set
167# CONFIG_HZ_1000 is not set 177# CONFIG_HZ_1000 is not set
168CONFIG_HZ=250 178CONFIG_HZ=250
169CONFIG_PREEMPT_NONE=y 179CONFIG_PREEMPT_NONE=y
@@ -173,6 +183,7 @@ CONFIG_BINFMT_ELF=y
173CONFIG_BINFMT_MISC=y 183CONFIG_BINFMT_MISC=y
174CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 184CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
175CONFIG_ARCH_FLATMEM_ENABLE=y 185CONFIG_ARCH_FLATMEM_ENABLE=y
186CONFIG_ARCH_POPULATES_NODE_MAP=y
176CONFIG_SELECT_MEMORY_MODEL=y 187CONFIG_SELECT_MEMORY_MODEL=y
177CONFIG_FLATMEM_MANUAL=y 188CONFIG_FLATMEM_MANUAL=y
178# CONFIG_DISCONTIGMEM_MANUAL is not set 189# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -237,6 +248,7 @@ CONFIG_PACKET=y
237CONFIG_UNIX=y 248CONFIG_UNIX=y
238CONFIG_XFRM=y 249CONFIG_XFRM=y
239CONFIG_XFRM_USER=y 250CONFIG_XFRM_USER=y
251# CONFIG_XFRM_SUB_POLICY is not set
240# CONFIG_NET_KEY is not set 252# CONFIG_NET_KEY is not set
241CONFIG_INET=y 253CONFIG_INET=y
242CONFIG_IP_MULTICAST=y 254CONFIG_IP_MULTICAST=y
@@ -258,10 +270,13 @@ CONFIG_SYN_COOKIES=y
258# CONFIG_INET_TUNNEL is not set 270# CONFIG_INET_TUNNEL is not set
259CONFIG_INET_XFRM_MODE_TRANSPORT=y 271CONFIG_INET_XFRM_MODE_TRANSPORT=y
260CONFIG_INET_XFRM_MODE_TUNNEL=y 272CONFIG_INET_XFRM_MODE_TUNNEL=y
273CONFIG_INET_XFRM_MODE_BEET=y
261CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
262CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
263# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
264CONFIG_TCP_CONG_BIC=y 277CONFIG_TCP_CONG_CUBIC=y
278CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_TCP_MD5SIG is not set
265# CONFIG_IPV6 is not set 280# CONFIG_IPV6 is not set
266# CONFIG_INET6_XFRM_TUNNEL is not set 281# CONFIG_INET6_XFRM_TUNNEL is not set
267# CONFIG_INET6_TUNNEL is not set 282# CONFIG_INET6_TUNNEL is not set
@@ -291,7 +306,6 @@ CONFIG_TCP_CONG_BIC=y
291# CONFIG_ATALK is not set 306# CONFIG_ATALK is not set
292# CONFIG_X25 is not set 307# CONFIG_X25 is not set
293# CONFIG_LAPB is not set 308# CONFIG_LAPB is not set
294# CONFIG_NET_DIVERT is not set
295# CONFIG_ECONET is not set 309# CONFIG_ECONET is not set
296# CONFIG_WAN_ROUTER is not set 310# CONFIG_WAN_ROUTER is not set
297 311
@@ -362,6 +376,12 @@ CONFIG_BLK_DEV_INITRD=y
362# CONFIG_ATA_OVER_ETH is not set 376# CONFIG_ATA_OVER_ETH is not set
363 377
364# 378#
379# Misc devices
380#
381# CONFIG_SGI_IOC4 is not set
382# CONFIG_TIFM_CORE is not set
383
384#
365# ATA/ATAPI/MFM/RLL support 385# ATA/ATAPI/MFM/RLL support
366# 386#
367# CONFIG_IDE is not set 387# CONFIG_IDE is not set
@@ -371,6 +391,8 @@ CONFIG_BLK_DEV_INITRD=y
371# 391#
372# CONFIG_RAID_ATTRS is not set 392# CONFIG_RAID_ATTRS is not set
373CONFIG_SCSI=y 393CONFIG_SCSI=y
394# CONFIG_SCSI_TGT is not set
395# CONFIG_SCSI_NETLINK is not set
374CONFIG_SCSI_PROC_FS=y 396CONFIG_SCSI_PROC_FS=y
375 397
376# 398#
@@ -389,14 +411,16 @@ CONFIG_BLK_DEV_SD=y
389# CONFIG_SCSI_MULTI_LUN is not set 411# CONFIG_SCSI_MULTI_LUN is not set
390# CONFIG_SCSI_CONSTANTS is not set 412# CONFIG_SCSI_CONSTANTS is not set
391# CONFIG_SCSI_LOGGING is not set 413# CONFIG_SCSI_LOGGING is not set
414# CONFIG_SCSI_SCAN_ASYNC is not set
392 415
393# 416#
394# SCSI Transport Attributes 417# SCSI Transports
395# 418#
396# CONFIG_SCSI_SPI_ATTRS is not set 419# CONFIG_SCSI_SPI_ATTRS is not set
397# CONFIG_SCSI_FC_ATTRS is not set 420# CONFIG_SCSI_FC_ATTRS is not set
398# CONFIG_SCSI_ISCSI_ATTRS is not set 421# CONFIG_SCSI_ISCSI_ATTRS is not set
399# CONFIG_SCSI_SAS_ATTRS is not set 422# CONFIG_SCSI_SAS_ATTRS is not set
423# CONFIG_SCSI_SAS_LIBSAS is not set
400 424
401# 425#
402# SCSI low-level drivers 426# SCSI low-level drivers
@@ -409,27 +433,13 @@ CONFIG_BLK_DEV_SD=y
409# CONFIG_SCSI_AIC7XXX is not set 433# CONFIG_SCSI_AIC7XXX is not set
410# CONFIG_SCSI_AIC7XXX_OLD is not set 434# CONFIG_SCSI_AIC7XXX_OLD is not set
411# CONFIG_SCSI_AIC79XX is not set 435# CONFIG_SCSI_AIC79XX is not set
436# CONFIG_SCSI_AIC94XX is not set
412# CONFIG_SCSI_DPT_I2O is not set 437# CONFIG_SCSI_DPT_I2O is not set
438# CONFIG_SCSI_ARCMSR is not set
413# CONFIG_MEGARAID_NEWGEN is not set 439# CONFIG_MEGARAID_NEWGEN is not set
414# CONFIG_MEGARAID_LEGACY is not set 440# CONFIG_MEGARAID_LEGACY is not set
415# CONFIG_MEGARAID_SAS is not set 441# CONFIG_MEGARAID_SAS is not set
416CONFIG_ATA=y
417# CONFIG_SATA_AHCI is not set
418# CONFIG_SATA_SVW is not set
419# CONFIG_SCSI_ATA_PIIX is not set
420CONFIG_SATA_MV=y
421# CONFIG_SATA_NV is not set
422# CONFIG_SCSI_PDC_ADMA is not set
423# CONFIG_SCSI_HPTIOP is not set 442# CONFIG_SCSI_HPTIOP is not set
424# CONFIG_SATA_QSTOR is not set
425# CONFIG_SATA_PROMISE is not set
426# CONFIG_SATA_SX4 is not set
427# CONFIG_SATA_SIL is not set
428# CONFIG_SATA_SIL24 is not set
429# CONFIG_SATA_SIS is not set
430# CONFIG_SATA_ULI is not set
431# CONFIG_SATA_VIA is not set
432# CONFIG_SATA_VITESSE is not set
433# CONFIG_SCSI_BUSLOGIC is not set 443# CONFIG_SCSI_BUSLOGIC is not set
434# CONFIG_SCSI_DMX3191D is not set 444# CONFIG_SCSI_DMX3191D is not set
435# CONFIG_SCSI_EATA is not set 445# CONFIG_SCSI_EATA is not set
@@ -438,15 +448,73 @@ CONFIG_SATA_MV=y
438# CONFIG_SCSI_IPS is not set 448# CONFIG_SCSI_IPS is not set
439# CONFIG_SCSI_INITIO is not set 449# CONFIG_SCSI_INITIO is not set
440# CONFIG_SCSI_INIA100 is not set 450# CONFIG_SCSI_INIA100 is not set
451# CONFIG_SCSI_STEX is not set
441# CONFIG_SCSI_SYM53C8XX_2 is not set 452# CONFIG_SCSI_SYM53C8XX_2 is not set
442# CONFIG_SCSI_IPR is not set 453# CONFIG_SCSI_IPR is not set
443# CONFIG_SCSI_QLOGIC_1280 is not set 454# CONFIG_SCSI_QLOGIC_1280 is not set
444# CONFIG_SCSI_QLA_FC is not set 455# CONFIG_SCSI_QLA_FC is not set
456# CONFIG_SCSI_QLA_ISCSI is not set
445# CONFIG_SCSI_LPFC is not set 457# CONFIG_SCSI_LPFC is not set
446# CONFIG_SCSI_DC395x is not set 458# CONFIG_SCSI_DC395x is not set
447# CONFIG_SCSI_DC390T is not set 459# CONFIG_SCSI_DC390T is not set
448# CONFIG_SCSI_NSP32 is not set 460# CONFIG_SCSI_NSP32 is not set
449# CONFIG_SCSI_DEBUG is not set 461# CONFIG_SCSI_DEBUG is not set
462# CONFIG_SCSI_SRP is not set
463
464#
465# Serial ATA (prod) and Parallel ATA (experimental) drivers
466#
467CONFIG_ATA=y
468# CONFIG_SATA_AHCI is not set
469# CONFIG_SATA_SVW is not set
470# CONFIG_ATA_PIIX is not set
471CONFIG_SATA_MV=y
472# CONFIG_SATA_NV is not set
473# CONFIG_PDC_ADMA is not set
474# CONFIG_SATA_QSTOR is not set
475# CONFIG_SATA_PROMISE is not set
476# CONFIG_SATA_SX4 is not set
477# CONFIG_SATA_SIL is not set
478# CONFIG_SATA_SIL24 is not set
479# CONFIG_SATA_SIS is not set
480# CONFIG_SATA_ULI is not set
481# CONFIG_SATA_VIA is not set
482# CONFIG_SATA_VITESSE is not set
483# CONFIG_PATA_ALI is not set
484# CONFIG_PATA_AMD is not set
485# CONFIG_PATA_ARTOP is not set
486# CONFIG_PATA_ATIIXP is not set
487# CONFIG_PATA_CMD64X is not set
488# CONFIG_PATA_CS5520 is not set
489# CONFIG_PATA_CS5530 is not set
490# CONFIG_PATA_CYPRESS is not set
491# CONFIG_PATA_EFAR is not set
492# CONFIG_ATA_GENERIC is not set
493# CONFIG_PATA_HPT366 is not set
494# CONFIG_PATA_HPT37X is not set
495# CONFIG_PATA_HPT3X2N is not set
496# CONFIG_PATA_HPT3X3 is not set
497# CONFIG_PATA_IT821X is not set
498# CONFIG_PATA_JMICRON is not set
499# CONFIG_PATA_TRIFLEX is not set
500# CONFIG_PATA_MARVELL is not set
501# CONFIG_PATA_MPIIX is not set
502# CONFIG_PATA_OLDPIIX is not set
503# CONFIG_PATA_NETCELL is not set
504# CONFIG_PATA_NS87410 is not set
505# CONFIG_PATA_OPTI is not set
506# CONFIG_PATA_OPTIDMA is not set
507# CONFIG_PATA_PDC_OLD is not set
508# CONFIG_PATA_RADISYS is not set
509# CONFIG_PATA_RZ1000 is not set
510# CONFIG_PATA_SC1200 is not set
511# CONFIG_PATA_SERVERWORKS is not set
512# CONFIG_PATA_PDC2027X is not set
513# CONFIG_PATA_SIL680 is not set
514# CONFIG_PATA_SIS is not set
515# CONFIG_PATA_VIA is not set
516# CONFIG_PATA_WINBOND is not set
517# CONFIG_PATA_PLATFORM is not set
450 518
451# 519#
452# Multi-device support (RAID and LVM) 520# Multi-device support (RAID and LVM)
@@ -474,6 +542,7 @@ CONFIG_SATA_MV=y
474# 542#
475# Macintosh device drivers 543# Macintosh device drivers
476# 544#
545# CONFIG_MAC_EMUMOUSEBTN is not set
477# CONFIG_WINDFARM is not set 546# CONFIG_WINDFARM is not set
478 547
479# 548#
@@ -505,6 +574,7 @@ CONFIG_PHYLIB=y
505# CONFIG_CICADA_PHY is not set 574# CONFIG_CICADA_PHY is not set
506# CONFIG_VITESSE_PHY is not set 575# CONFIG_VITESSE_PHY is not set
507# CONFIG_SMSC_PHY is not set 576# CONFIG_SMSC_PHY is not set
577# CONFIG_BROADCOM_PHY is not set
508# CONFIG_FIXED_PHY is not set 578# CONFIG_FIXED_PHY is not set
509 579
510# 580#
@@ -563,6 +633,8 @@ CONFIG_8139TOO=y
563# CONFIG_VIA_VELOCITY is not set 633# CONFIG_VIA_VELOCITY is not set
564# CONFIG_TIGON3 is not set 634# CONFIG_TIGON3 is not set
565# CONFIG_BNX2 is not set 635# CONFIG_BNX2 is not set
636CONFIG_TSI108_ETH=y
637# CONFIG_QLA3XXX is not set
566 638
567# 639#
568# Ethernet (10000 Mbit) 640# Ethernet (10000 Mbit)
@@ -571,6 +643,7 @@ CONFIG_8139TOO=y
571# CONFIG_IXGB is not set 643# CONFIG_IXGB is not set
572# CONFIG_S2IO is not set 644# CONFIG_S2IO is not set
573# CONFIG_MYRI10GE is not set 645# CONFIG_MYRI10GE is not set
646# CONFIG_NETXEN_NIC is not set
574 647
575# 648#
576# Token Ring devices 649# Token Ring devices
@@ -610,6 +683,7 @@ CONFIG_8139TOO=y
610# Input device support 683# Input device support
611# 684#
612CONFIG_INPUT=y 685CONFIG_INPUT=y
686# CONFIG_INPUT_FF_MEMLESS is not set
613 687
614# 688#
615# Userland interfaces 689# Userland interfaces
@@ -654,6 +728,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
654# 728#
655# Non-8250 serial port support 729# Non-8250 serial port support
656# 730#
731# CONFIG_SERIAL_UARTLITE is not set
657CONFIG_SERIAL_CORE=y 732CONFIG_SERIAL_CORE=y
658CONFIG_SERIAL_CORE_CONSOLE=y 733CONFIG_SERIAL_CORE_CONSOLE=y
659# CONFIG_SERIAL_JSM is not set 734# CONFIG_SERIAL_JSM is not set
@@ -677,10 +752,6 @@ CONFIG_GEN_RTC=y
677# CONFIG_DTLK is not set 752# CONFIG_DTLK is not set
678# CONFIG_R3964 is not set 753# CONFIG_R3964 is not set
679# CONFIG_APPLICOM is not set 754# CONFIG_APPLICOM is not set
680
681#
682# Ftape, the floppy tape device driver
683#
684# CONFIG_AGP is not set 755# CONFIG_AGP is not set
685# CONFIG_DRM is not set 756# CONFIG_DRM is not set
686# CONFIG_RAW_DRIVER is not set 757# CONFIG_RAW_DRIVER is not set
@@ -689,7 +760,6 @@ CONFIG_GEN_RTC=y
689# TPM devices 760# TPM devices
690# 761#
691# CONFIG_TCG_TPM is not set 762# CONFIG_TCG_TPM is not set
692# CONFIG_TELCLOCK is not set
693 763
694# 764#
695# I2C support 765# I2C support
@@ -705,6 +775,7 @@ CONFIG_GEN_RTC=y
705# 775#
706# Dallas's 1-wire bus 776# Dallas's 1-wire bus
707# 777#
778# CONFIG_W1 is not set
708 779
709# 780#
710# Hardware Monitoring support 781# Hardware Monitoring support
@@ -713,17 +784,14 @@ CONFIG_HWMON=y
713# CONFIG_HWMON_VID is not set 784# CONFIG_HWMON_VID is not set
714# CONFIG_SENSORS_ABITUGURU is not set 785# CONFIG_SENSORS_ABITUGURU is not set
715# CONFIG_SENSORS_F71805F is not set 786# CONFIG_SENSORS_F71805F is not set
787# CONFIG_SENSORS_PC87427 is not set
788# CONFIG_SENSORS_VT1211 is not set
716# CONFIG_HWMON_DEBUG_CHIP is not set 789# CONFIG_HWMON_DEBUG_CHIP is not set
717 790
718# 791#
719# Misc devices
720#
721
722#
723# Multimedia devices 792# Multimedia devices
724# 793#
725# CONFIG_VIDEO_DEV is not set 794# CONFIG_VIDEO_DEV is not set
726CONFIG_VIDEO_V4L2=y
727 795
728# 796#
729# Digital Video Broadcasting Devices 797# Digital Video Broadcasting Devices
@@ -735,6 +803,7 @@ CONFIG_VIDEO_V4L2=y
735# 803#
736CONFIG_FIRMWARE_EDID=y 804CONFIG_FIRMWARE_EDID=y
737# CONFIG_FB is not set 805# CONFIG_FB is not set
806# CONFIG_FB_IBM_GXT4500 is not set
738# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 807# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
739 808
740# 809#
@@ -743,6 +812,11 @@ CONFIG_FIRMWARE_EDID=y
743# CONFIG_SOUND is not set 812# CONFIG_SOUND is not set
744 813
745# 814#
815# HID Devices
816#
817CONFIG_HID=y
818
819#
746# USB support 820# USB support
747# 821#
748CONFIG_USB_ARCH_HAS_HCD=y 822CONFIG_USB_ARCH_HAS_HCD=y
@@ -805,6 +879,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
805# 879#
806 880
807# 881#
882# Virtualization
883#
884
885#
808# File systems 886# File systems
809# 887#
810CONFIG_EXT2_FS=y 888CONFIG_EXT2_FS=y
@@ -814,6 +892,7 @@ CONFIG_EXT3_FS=y
814CONFIG_EXT3_FS_XATTR=y 892CONFIG_EXT3_FS_XATTR=y
815# CONFIG_EXT3_FS_POSIX_ACL is not set 893# CONFIG_EXT3_FS_POSIX_ACL is not set
816# CONFIG_EXT3_FS_SECURITY is not set 894# CONFIG_EXT3_FS_SECURITY is not set
895# CONFIG_EXT4DEV_FS is not set
817CONFIG_JBD=y 896CONFIG_JBD=y
818# CONFIG_JBD_DEBUG is not set 897# CONFIG_JBD_DEBUG is not set
819CONFIG_FS_MBCACHE=y 898CONFIG_FS_MBCACHE=y
@@ -821,6 +900,7 @@ CONFIG_FS_MBCACHE=y
821# CONFIG_JFS_FS is not set 900# CONFIG_JFS_FS is not set
822# CONFIG_FS_POSIX_ACL is not set 901# CONFIG_FS_POSIX_ACL is not set
823# CONFIG_XFS_FS is not set 902# CONFIG_XFS_FS is not set
903# CONFIG_GFS2_FS is not set
824# CONFIG_OCFS2_FS is not set 904# CONFIG_OCFS2_FS is not set
825# CONFIG_MINIX_FS is not set 905# CONFIG_MINIX_FS is not set
826# CONFIG_ROMFS_FS is not set 906# CONFIG_ROMFS_FS is not set
@@ -850,8 +930,10 @@ CONFIG_DNOTIFY=y
850# 930#
851CONFIG_PROC_FS=y 931CONFIG_PROC_FS=y
852CONFIG_PROC_KCORE=y 932CONFIG_PROC_KCORE=y
933CONFIG_PROC_SYSCTL=y
853CONFIG_SYSFS=y 934CONFIG_SYSFS=y
854CONFIG_TMPFS=y 935CONFIG_TMPFS=y
936# CONFIG_TMPFS_POSIX_ACL is not set
855# CONFIG_HUGETLB_PAGE is not set 937# CONFIG_HUGETLB_PAGE is not set
856CONFIG_RAMFS=y 938CONFIG_RAMFS=y
857# CONFIG_CONFIGFS_FS is not set 939# CONFIG_CONFIGFS_FS is not set
@@ -921,13 +1003,20 @@ CONFIG_MSDOS_PARTITION=y
921# CONFIG_NLS is not set 1003# CONFIG_NLS is not set
922 1004
923# 1005#
1006# Distributed Lock Manager
1007#
1008# CONFIG_DLM is not set
1009
1010#
924# Library routines 1011# Library routines
925# 1012#
1013CONFIG_BITREVERSE=y
926# CONFIG_CRC_CCITT is not set 1014# CONFIG_CRC_CCITT is not set
927# CONFIG_CRC16 is not set 1015# CONFIG_CRC16 is not set
928CONFIG_CRC32=y 1016CONFIG_CRC32=y
929# CONFIG_LIBCRC32C is not set 1017# CONFIG_LIBCRC32C is not set
930CONFIG_PLIST=y 1018CONFIG_PLIST=y
1019CONFIG_IOMAP_COPY=y
931 1020
932# 1021#
933# Instrumentation Support 1022# Instrumentation Support
@@ -938,12 +1027,14 @@ CONFIG_PLIST=y
938# Kernel hacking 1027# Kernel hacking
939# 1028#
940# CONFIG_PRINTK_TIME is not set 1029# CONFIG_PRINTK_TIME is not set
1030CONFIG_ENABLE_MUST_CHECK=y
941# CONFIG_MAGIC_SYSRQ is not set 1031# CONFIG_MAGIC_SYSRQ is not set
942# CONFIG_UNUSED_SYMBOLS is not set 1032# CONFIG_UNUSED_SYMBOLS is not set
1033# CONFIG_DEBUG_FS is not set
1034# CONFIG_HEADERS_CHECK is not set
943# CONFIG_DEBUG_KERNEL is not set 1035# CONFIG_DEBUG_KERNEL is not set
944CONFIG_LOG_BUF_SHIFT=14 1036CONFIG_LOG_BUF_SHIFT=14
945# CONFIG_DEBUG_FS is not set 1037# CONFIG_DEBUG_BUGVERBOSE is not set
946# CONFIG_UNWIND_INFO is not set
947# CONFIG_BOOTX_TEXT is not set 1038# CONFIG_BOOTX_TEXT is not set
948# CONFIG_PPC_EARLY_DEBUG is not set 1039# CONFIG_PPC_EARLY_DEBUG is not set
949 1040
@@ -957,7 +1048,3 @@ CONFIG_LOG_BUF_SHIFT=14
957# Cryptographic options 1048# Cryptographic options
958# 1049#
959# CONFIG_CRYPTO is not set 1050# CONFIG_CRYPTO is not set
960
961#
962# Hardware crypto devices
963#
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 0561b73a918f..45757b613702 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.18 3# Linux kernel version: 2.6.20-rc5
4# Mon Sep 25 19:41:14 2006 4# Mon Jan 22 22:23:43 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,13 +23,13 @@ CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
24CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
25CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
26 28
27# 29#
28# Processor support 30# Processor support
29# 31#
30# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
31# CONFIG_PPC_52xx is not set
32# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
33CONFIG_PPC_83xx=y 34CONFIG_PPC_83xx=y
34# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -40,6 +41,8 @@ CONFIG_PPC_83xx=y
40CONFIG_6xx=y 41CONFIG_6xx=y
41CONFIG_83xx=y 42CONFIG_83xx=y
42CONFIG_PPC_FPU=y 43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set
43CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
44CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
45# CONFIG_SMP is not set 48# CONFIG_SMP is not set
@@ -59,16 +62,20 @@ CONFIG_LOCALVERSION=""
59CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
60CONFIG_SWAP=y 63CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
62# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
63# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
70CONFIG_EMBEDDED=y
71CONFIG_SYSCTL=y 76CONFIG_SYSCTL=y
77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
72# CONFIG_KALLSYMS is not set 79# CONFIG_KALLSYMS is not set
73CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
74CONFIG_PRINTK=y 81CONFIG_PRINTK=y
@@ -98,6 +105,7 @@ CONFIG_MODULE_UNLOAD=y
98# 105#
99# Block layer 106# Block layer
100# 107#
108CONFIG_BLOCK=y
101# CONFIG_LBD is not set 109# CONFIG_LBD is not set
102# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_IO_TRACE is not set
103# CONFIG_LSF is not set 111# CONFIG_LSF is not set
@@ -120,8 +128,10 @@ CONFIG_PPC_GEN550=y
120# 128#
121# Platform support 129# Platform support
122# 130#
131# CONFIG_MPC832x_MDS is not set
123# CONFIG_MPC834x_SYS is not set 132# CONFIG_MPC834x_SYS is not set
124CONFIG_MPC834x_ITX=y 133CONFIG_MPC834x_ITX=y
134# CONFIG_MPC8360E_PB is not set
125CONFIG_MPC834x=y 135CONFIG_MPC834x=y
126# CONFIG_MPIC is not set 136# CONFIG_MPIC is not set
127 137
@@ -131,6 +141,7 @@ CONFIG_MPC834x=y
131# CONFIG_HIGHMEM is not set 141# CONFIG_HIGHMEM is not set
132# CONFIG_HZ_100 is not set 142# CONFIG_HZ_100 is not set
133CONFIG_HZ_250=y 143CONFIG_HZ_250=y
144# CONFIG_HZ_300 is not set
134# CONFIG_HZ_1000 is not set 145# CONFIG_HZ_1000 is not set
135CONFIG_HZ=250 146CONFIG_HZ=250
136CONFIG_PREEMPT_NONE=y 147CONFIG_PREEMPT_NONE=y
@@ -138,8 +149,10 @@ CONFIG_PREEMPT_NONE=y
138# CONFIG_PREEMPT is not set 149# CONFIG_PREEMPT is not set
139CONFIG_BINFMT_ELF=y 150CONFIG_BINFMT_ELF=y
140# CONFIG_BINFMT_MISC is not set 151# CONFIG_BINFMT_MISC is not set
152CONFIG_MATH_EMULATION=y
141CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 153CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
142CONFIG_ARCH_FLATMEM_ENABLE=y 154CONFIG_ARCH_FLATMEM_ENABLE=y
155CONFIG_ARCH_POPULATES_NODE_MAP=y
143CONFIG_SELECT_MEMORY_MODEL=y 156CONFIG_SELECT_MEMORY_MODEL=y
144CONFIG_FLATMEM_MANUAL=y 157CONFIG_FLATMEM_MANUAL=y
145# CONFIG_DISCONTIGMEM_MANUAL is not set 158# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -206,6 +219,7 @@ CONFIG_PACKET=y
206CONFIG_UNIX=y 219CONFIG_UNIX=y
207CONFIG_XFRM=y 220CONFIG_XFRM=y
208# CONFIG_XFRM_USER is not set 221# CONFIG_XFRM_USER is not set
222# CONFIG_XFRM_SUB_POLICY is not set
209# CONFIG_NET_KEY is not set 223# CONFIG_NET_KEY is not set
210CONFIG_INET=y 224CONFIG_INET=y
211CONFIG_IP_MULTICAST=y 225CONFIG_IP_MULTICAST=y
@@ -227,10 +241,13 @@ CONFIG_SYN_COOKIES=y
227# CONFIG_INET_TUNNEL is not set 241# CONFIG_INET_TUNNEL is not set
228CONFIG_INET_XFRM_MODE_TRANSPORT=y 242CONFIG_INET_XFRM_MODE_TRANSPORT=y
229CONFIG_INET_XFRM_MODE_TUNNEL=y 243CONFIG_INET_XFRM_MODE_TUNNEL=y
244CONFIG_INET_XFRM_MODE_BEET=y
230CONFIG_INET_DIAG=y 245CONFIG_INET_DIAG=y
231CONFIG_INET_TCP_DIAG=y 246CONFIG_INET_TCP_DIAG=y
232# CONFIG_TCP_CONG_ADVANCED is not set 247# CONFIG_TCP_CONG_ADVANCED is not set
233CONFIG_TCP_CONG_BIC=y 248CONFIG_TCP_CONG_CUBIC=y
249CONFIG_DEFAULT_TCP_CONG="cubic"
250# CONFIG_TCP_MD5SIG is not set
234# CONFIG_IPV6 is not set 251# CONFIG_IPV6 is not set
235# CONFIG_INET6_XFRM_TUNNEL is not set 252# CONFIG_INET6_XFRM_TUNNEL is not set
236# CONFIG_INET6_TUNNEL is not set 253# CONFIG_INET6_TUNNEL is not set
@@ -411,9 +428,16 @@ CONFIG_BLK_DEV_INITRD=y
411# CONFIG_ATA_OVER_ETH is not set 428# CONFIG_ATA_OVER_ETH is not set
412 429
413# 430#
431# Misc devices
432#
433# CONFIG_SGI_IOC4 is not set
434# CONFIG_TIFM_CORE is not set
435
436#
414# ATA/ATAPI/MFM/RLL support 437# ATA/ATAPI/MFM/RLL support
415# 438#
416CONFIG_IDE=y 439CONFIG_IDE=y
440CONFIG_IDE_MAX_HWIFS=4
417# CONFIG_BLK_DEV_IDE is not set 441# CONFIG_BLK_DEV_IDE is not set
418# CONFIG_BLK_DEV_HD_ONLY is not set 442# CONFIG_BLK_DEV_HD_ONLY is not set
419# CONFIG_BLK_DEV_HD is not set 443# CONFIG_BLK_DEV_HD is not set
@@ -423,6 +447,8 @@ CONFIG_IDE=y
423# 447#
424# CONFIG_RAID_ATTRS is not set 448# CONFIG_RAID_ATTRS is not set
425CONFIG_SCSI=y 449CONFIG_SCSI=y
450# CONFIG_SCSI_TGT is not set
451# CONFIG_SCSI_NETLINK is not set
426CONFIG_SCSI_PROC_FS=y 452CONFIG_SCSI_PROC_FS=y
427 453
428# 454#
@@ -441,14 +467,16 @@ CONFIG_CHR_DEV_SG=y
441# CONFIG_SCSI_MULTI_LUN is not set 467# CONFIG_SCSI_MULTI_LUN is not set
442# CONFIG_SCSI_CONSTANTS is not set 468# CONFIG_SCSI_CONSTANTS is not set
443# CONFIG_SCSI_LOGGING is not set 469# CONFIG_SCSI_LOGGING is not set
470# CONFIG_SCSI_SCAN_ASYNC is not set
444 471
445# 472#
446# SCSI Transport Attributes 473# SCSI Transports
447# 474#
448CONFIG_SCSI_SPI_ATTRS=y 475CONFIG_SCSI_SPI_ATTRS=y
449# CONFIG_SCSI_FC_ATTRS is not set 476# CONFIG_SCSI_FC_ATTRS is not set
450# CONFIG_SCSI_ISCSI_ATTRS is not set 477# CONFIG_SCSI_ISCSI_ATTRS is not set
451# CONFIG_SCSI_SAS_ATTRS is not set 478# CONFIG_SCSI_SAS_ATTRS is not set
479# CONFIG_SCSI_SAS_LIBSAS is not set
452 480
453# 481#
454# SCSI low-level drivers 482# SCSI low-level drivers
@@ -461,27 +489,13 @@ CONFIG_SCSI_SPI_ATTRS=y
461# CONFIG_SCSI_AIC7XXX is not set 489# CONFIG_SCSI_AIC7XXX is not set
462# CONFIG_SCSI_AIC7XXX_OLD is not set 490# CONFIG_SCSI_AIC7XXX_OLD is not set
463# CONFIG_SCSI_AIC79XX is not set 491# CONFIG_SCSI_AIC79XX is not set
492# CONFIG_SCSI_AIC94XX is not set
464# CONFIG_SCSI_DPT_I2O is not set 493# CONFIG_SCSI_DPT_I2O is not set
494# CONFIG_SCSI_ARCMSR is not set
465# CONFIG_MEGARAID_NEWGEN is not set 495# CONFIG_MEGARAID_NEWGEN is not set
466# CONFIG_MEGARAID_LEGACY is not set 496# CONFIG_MEGARAID_LEGACY is not set
467# CONFIG_MEGARAID_SAS is not set 497# CONFIG_MEGARAID_SAS is not set
468CONFIG_ATA=y
469# CONFIG_SATA_AHCI is not set
470# CONFIG_SATA_SVW is not set
471# CONFIG_SCSI_ATA_PIIX is not set
472# CONFIG_SATA_MV is not set
473# CONFIG_SATA_NV is not set
474# CONFIG_SCSI_PDC_ADMA is not set
475# CONFIG_SCSI_HPTIOP is not set 498# CONFIG_SCSI_HPTIOP is not set
476# CONFIG_SATA_QSTOR is not set
477# CONFIG_SATA_PROMISE is not set
478# CONFIG_SATA_SX4 is not set
479CONFIG_SATA_SIL=y
480# CONFIG_SATA_SIL24 is not set
481# CONFIG_SATA_SIS is not set
482# CONFIG_SATA_ULI is not set
483# CONFIG_SATA_VIA is not set
484# CONFIG_SATA_VITESSE is not set
485# CONFIG_SCSI_BUSLOGIC is not set 499# CONFIG_SCSI_BUSLOGIC is not set
486# CONFIG_SCSI_DMX3191D is not set 500# CONFIG_SCSI_DMX3191D is not set
487# CONFIG_SCSI_EATA is not set 501# CONFIG_SCSI_EATA is not set
@@ -490,15 +504,73 @@ CONFIG_SATA_SIL=y
490# CONFIG_SCSI_IPS is not set 504# CONFIG_SCSI_IPS is not set
491# CONFIG_SCSI_INITIO is not set 505# CONFIG_SCSI_INITIO is not set
492# CONFIG_SCSI_INIA100 is not set 506# CONFIG_SCSI_INIA100 is not set
507# CONFIG_SCSI_STEX is not set
493# CONFIG_SCSI_SYM53C8XX_2 is not set 508# CONFIG_SCSI_SYM53C8XX_2 is not set
494# CONFIG_SCSI_IPR is not set 509# CONFIG_SCSI_IPR is not set
495# CONFIG_SCSI_QLOGIC_1280 is not set 510# CONFIG_SCSI_QLOGIC_1280 is not set
496# CONFIG_SCSI_QLA_FC is not set 511# CONFIG_SCSI_QLA_FC is not set
512# CONFIG_SCSI_QLA_ISCSI is not set
497# CONFIG_SCSI_LPFC is not set 513# CONFIG_SCSI_LPFC is not set
498# CONFIG_SCSI_DC395x is not set 514# CONFIG_SCSI_DC395x is not set
499# CONFIG_SCSI_DC390T is not set 515# CONFIG_SCSI_DC390T is not set
500# CONFIG_SCSI_NSP32 is not set 516# CONFIG_SCSI_NSP32 is not set
501# CONFIG_SCSI_DEBUG is not set 517# CONFIG_SCSI_DEBUG is not set
518# CONFIG_SCSI_SRP is not set
519
520#
521# Serial ATA (prod) and Parallel ATA (experimental) drivers
522#
523CONFIG_ATA=y
524# CONFIG_SATA_AHCI is not set
525# CONFIG_SATA_SVW is not set
526# CONFIG_ATA_PIIX is not set
527# CONFIG_SATA_MV is not set
528# CONFIG_SATA_NV is not set
529# CONFIG_PDC_ADMA is not set
530# CONFIG_SATA_QSTOR is not set
531# CONFIG_SATA_PROMISE is not set
532# CONFIG_SATA_SX4 is not set
533CONFIG_SATA_SIL=y
534# CONFIG_SATA_SIL24 is not set
535# CONFIG_SATA_SIS is not set
536# CONFIG_SATA_ULI is not set
537# CONFIG_SATA_VIA is not set
538# CONFIG_SATA_VITESSE is not set
539# CONFIG_PATA_ALI is not set
540# CONFIG_PATA_AMD is not set
541# CONFIG_PATA_ARTOP is not set
542# CONFIG_PATA_ATIIXP is not set
543# CONFIG_PATA_CMD64X is not set
544# CONFIG_PATA_CS5520 is not set
545# CONFIG_PATA_CS5530 is not set
546# CONFIG_PATA_CYPRESS is not set
547# CONFIG_PATA_EFAR is not set
548# CONFIG_ATA_GENERIC is not set
549# CONFIG_PATA_HPT366 is not set
550# CONFIG_PATA_HPT37X is not set
551# CONFIG_PATA_HPT3X2N is not set
552# CONFIG_PATA_HPT3X3 is not set
553# CONFIG_PATA_IT821X is not set
554# CONFIG_PATA_JMICRON is not set
555# CONFIG_PATA_TRIFLEX is not set
556# CONFIG_PATA_MARVELL is not set
557# CONFIG_PATA_MPIIX is not set
558# CONFIG_PATA_OLDPIIX is not set
559# CONFIG_PATA_NETCELL is not set
560# CONFIG_PATA_NS87410 is not set
561# CONFIG_PATA_OPTI is not set
562# CONFIG_PATA_OPTIDMA is not set
563# CONFIG_PATA_PDC_OLD is not set
564# CONFIG_PATA_RADISYS is not set
565# CONFIG_PATA_RZ1000 is not set
566# CONFIG_PATA_SC1200 is not set
567# CONFIG_PATA_SERVERWORKS is not set
568# CONFIG_PATA_PDC2027X is not set
569# CONFIG_PATA_SIL680 is not set
570# CONFIG_PATA_SIS is not set
571# CONFIG_PATA_VIA is not set
572# CONFIG_PATA_WINBOND is not set
573# CONFIG_PATA_PLATFORM is not set
502 574
503# 575#
504# Multi-device support (RAID and LVM) 576# Multi-device support (RAID and LVM)
@@ -535,6 +607,7 @@ CONFIG_MD_RAID1=y
535# 607#
536# Macintosh device drivers 608# Macintosh device drivers
537# 609#
610# CONFIG_MAC_EMUMOUSEBTN is not set
538# CONFIG_WINDFARM is not set 611# CONFIG_WINDFARM is not set
539 612
540# 613#
@@ -566,6 +639,7 @@ CONFIG_PHYLIB=y
566CONFIG_CICADA_PHY=y 639CONFIG_CICADA_PHY=y
567# CONFIG_VITESSE_PHY is not set 640# CONFIG_VITESSE_PHY is not set
568# CONFIG_SMSC_PHY is not set 641# CONFIG_SMSC_PHY is not set
642# CONFIG_BROADCOM_PHY is not set
569# CONFIG_FIXED_PHY is not set 643# CONFIG_FIXED_PHY is not set
570 644
571# 645#
@@ -622,6 +696,7 @@ CONFIG_E100=y
622# CONFIG_BNX2 is not set 696# CONFIG_BNX2 is not set
623CONFIG_GIANFAR=y 697CONFIG_GIANFAR=y
624CONFIG_GFAR_NAPI=y 698CONFIG_GFAR_NAPI=y
699# CONFIG_QLA3XXX is not set
625 700
626# 701#
627# Ethernet (10000 Mbit) 702# Ethernet (10000 Mbit)
@@ -630,6 +705,7 @@ CONFIG_GFAR_NAPI=y
630# CONFIG_IXGB is not set 705# CONFIG_IXGB is not set
631# CONFIG_S2IO is not set 706# CONFIG_S2IO is not set
632# CONFIG_MYRI10GE is not set 707# CONFIG_MYRI10GE is not set
708# CONFIG_NETXEN_NIC is not set
633 709
634# 710#
635# Token Ring devices 711# Token Ring devices
@@ -669,6 +745,7 @@ CONFIG_GFAR_NAPI=y
669# Input device support 745# Input device support
670# 746#
671CONFIG_INPUT=y 747CONFIG_INPUT=y
748# CONFIG_INPUT_FF_MEMLESS is not set
672 749
673# 750#
674# Userland interfaces 751# Userland interfaces
@@ -713,6 +790,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
713# 790#
714# Non-8250 serial port support 791# Non-8250 serial port support
715# 792#
793# CONFIG_SERIAL_UARTLITE is not set
716CONFIG_SERIAL_CORE=y 794CONFIG_SERIAL_CORE=y
717CONFIG_SERIAL_CORE_CONSOLE=y 795CONFIG_SERIAL_CORE_CONSOLE=y
718# CONFIG_SERIAL_JSM is not set 796# CONFIG_SERIAL_JSM is not set
@@ -753,10 +831,6 @@ CONFIG_HW_RANDOM=y
753# CONFIG_DTLK is not set 831# CONFIG_DTLK is not set
754# CONFIG_R3964 is not set 832# CONFIG_R3964 is not set
755# CONFIG_APPLICOM is not set 833# CONFIG_APPLICOM is not set
756
757#
758# Ftape, the floppy tape device driver
759#
760# CONFIG_AGP is not set 834# CONFIG_AGP is not set
761# CONFIG_DRM is not set 835# CONFIG_DRM is not set
762# CONFIG_RAW_DRIVER is not set 836# CONFIG_RAW_DRIVER is not set
@@ -765,7 +839,6 @@ CONFIG_HW_RANDOM=y
765# TPM devices 839# TPM devices
766# 840#
767# CONFIG_TCG_TPM is not set 841# CONFIG_TCG_TPM is not set
768# CONFIG_TELCLOCK is not set
769 842
770# 843#
771# I2C support 844# I2C support
@@ -842,6 +915,7 @@ CONFIG_SPI_MPC83xx=y
842# 915#
843# Dallas's 1-wire bus 916# Dallas's 1-wire bus
844# 917#
918# CONFIG_W1 is not set
845 919
846# 920#
847# Hardware Monitoring support 921# Hardware Monitoring support
@@ -876,29 +950,27 @@ CONFIG_HWMON=y
876# CONFIG_SENSORS_LM92 is not set 950# CONFIG_SENSORS_LM92 is not set
877# CONFIG_SENSORS_MAX1619 is not set 951# CONFIG_SENSORS_MAX1619 is not set
878# CONFIG_SENSORS_PC87360 is not set 952# CONFIG_SENSORS_PC87360 is not set
953# CONFIG_SENSORS_PC87427 is not set
879# CONFIG_SENSORS_SIS5595 is not set 954# CONFIG_SENSORS_SIS5595 is not set
880# CONFIG_SENSORS_SMSC47M1 is not set 955# CONFIG_SENSORS_SMSC47M1 is not set
881# CONFIG_SENSORS_SMSC47M192 is not set 956# CONFIG_SENSORS_SMSC47M192 is not set
882# CONFIG_SENSORS_SMSC47B397 is not set 957# CONFIG_SENSORS_SMSC47B397 is not set
883# CONFIG_SENSORS_VIA686A is not set 958# CONFIG_SENSORS_VIA686A is not set
959# CONFIG_SENSORS_VT1211 is not set
884# CONFIG_SENSORS_VT8231 is not set 960# CONFIG_SENSORS_VT8231 is not set
885# CONFIG_SENSORS_W83781D is not set 961# CONFIG_SENSORS_W83781D is not set
886# CONFIG_SENSORS_W83791D is not set 962# CONFIG_SENSORS_W83791D is not set
887# CONFIG_SENSORS_W83792D is not set 963# CONFIG_SENSORS_W83792D is not set
964# CONFIG_SENSORS_W83793 is not set
888# CONFIG_SENSORS_W83L785TS is not set 965# CONFIG_SENSORS_W83L785TS is not set
889# CONFIG_SENSORS_W83627HF is not set 966# CONFIG_SENSORS_W83627HF is not set
890# CONFIG_SENSORS_W83627EHF is not set 967# CONFIG_SENSORS_W83627EHF is not set
891# CONFIG_HWMON_DEBUG_CHIP is not set 968# CONFIG_HWMON_DEBUG_CHIP is not set
892 969
893# 970#
894# Misc devices
895#
896
897#
898# Multimedia devices 971# Multimedia devices
899# 972#
900# CONFIG_VIDEO_DEV is not set 973# CONFIG_VIDEO_DEV is not set
901CONFIG_VIDEO_V4L2=y
902 974
903# 975#
904# Digital Video Broadcasting Devices 976# Digital Video Broadcasting Devices
@@ -911,6 +983,7 @@ CONFIG_VIDEO_V4L2=y
911# 983#
912CONFIG_FIRMWARE_EDID=y 984CONFIG_FIRMWARE_EDID=y
913# CONFIG_FB is not set 985# CONFIG_FB is not set
986# CONFIG_FB_IBM_GXT4500 is not set
914# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 987# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
915 988
916# 989#
@@ -919,6 +992,11 @@ CONFIG_FIRMWARE_EDID=y
919# CONFIG_SOUND is not set 992# CONFIG_SOUND is not set
920 993
921# 994#
995# HID Devices
996#
997CONFIG_HID=y
998
999#
922# USB support 1000# USB support
923# 1001#
924CONFIG_USB_ARCH_HAS_HCD=y 1002CONFIG_USB_ARCH_HAS_HCD=y
@@ -933,6 +1011,7 @@ CONFIG_USB=y
933CONFIG_USB_DEVICEFS=y 1011CONFIG_USB_DEVICEFS=y
934# CONFIG_USB_BANDWIDTH is not set 1012# CONFIG_USB_BANDWIDTH is not set
935# CONFIG_USB_DYNAMIC_MINORS is not set 1013# CONFIG_USB_DYNAMIC_MINORS is not set
1014# CONFIG_USB_MULTITHREAD_PROBE is not set
936# CONFIG_USB_OTG is not set 1015# CONFIG_USB_OTG is not set
937 1016
938# 1017#
@@ -972,6 +1051,7 @@ CONFIG_USB_STORAGE=y
972# CONFIG_USB_STORAGE_SDDR55 is not set 1051# CONFIG_USB_STORAGE_SDDR55 is not set
973# CONFIG_USB_STORAGE_JUMPSHOT is not set 1052# CONFIG_USB_STORAGE_JUMPSHOT is not set
974# CONFIG_USB_STORAGE_ALAUDA is not set 1053# CONFIG_USB_STORAGE_ALAUDA is not set
1054# CONFIG_USB_STORAGE_KARMA is not set
975# CONFIG_USB_LIBUSUAL is not set 1055# CONFIG_USB_LIBUSUAL is not set
976 1056
977# 1057#
@@ -1010,6 +1090,7 @@ CONFIG_USB_STORAGE=y
1010# CONFIG_USB_KAWETH is not set 1090# CONFIG_USB_KAWETH is not set
1011# CONFIG_USB_PEGASUS is not set 1091# CONFIG_USB_PEGASUS is not set
1012# CONFIG_USB_RTL8150 is not set 1092# CONFIG_USB_RTL8150 is not set
1093# CONFIG_USB_USBNET_MII is not set
1013# CONFIG_USB_USBNET is not set 1094# CONFIG_USB_USBNET is not set
1014CONFIG_USB_MON=y 1095CONFIG_USB_MON=y
1015 1096
@@ -1027,6 +1108,7 @@ CONFIG_USB_MON=y
1027# 1108#
1028# CONFIG_USB_EMI62 is not set 1109# CONFIG_USB_EMI62 is not set
1029# CONFIG_USB_EMI26 is not set 1110# CONFIG_USB_EMI26 is not set
1111# CONFIG_USB_ADUTUX is not set
1030# CONFIG_USB_AUERSWALD is not set 1112# CONFIG_USB_AUERSWALD is not set
1031# CONFIG_USB_RIO500 is not set 1113# CONFIG_USB_RIO500 is not set
1032# CONFIG_USB_LEGOTOWER is not set 1114# CONFIG_USB_LEGOTOWER is not set
@@ -1034,12 +1116,13 @@ CONFIG_USB_MON=y
1034# CONFIG_USB_LED is not set 1116# CONFIG_USB_LED is not set
1035# CONFIG_USB_CYPRESS_CY7C63 is not set 1117# CONFIG_USB_CYPRESS_CY7C63 is not set
1036# CONFIG_USB_CYTHERM is not set 1118# CONFIG_USB_CYTHERM is not set
1037# CONFIG_USB_PHIDGETKIT is not set 1119# CONFIG_USB_PHIDGET is not set
1038# CONFIG_USB_PHIDGETSERVO is not set
1039# CONFIG_USB_IDMOUSE is not set 1120# CONFIG_USB_IDMOUSE is not set
1121# CONFIG_USB_FTDI_ELAN is not set
1040# CONFIG_USB_APPLEDISPLAY is not set 1122# CONFIG_USB_APPLEDISPLAY is not set
1041# CONFIG_USB_SISUSBVGA is not set 1123# CONFIG_USB_SISUSBVGA is not set
1042# CONFIG_USB_LD is not set 1124# CONFIG_USB_LD is not set
1125# CONFIG_USB_TRANCEVIBRATOR is not set
1043# CONFIG_USB_TEST is not set 1126# CONFIG_USB_TEST is not set
1044 1127
1045# 1128#
@@ -1067,6 +1150,7 @@ CONFIG_USB_ETH_RNDIS=y
1067# CONFIG_USB_GADGETFS is not set 1150# CONFIG_USB_GADGETFS is not set
1068# CONFIG_USB_FILE_STORAGE is not set 1151# CONFIG_USB_FILE_STORAGE is not set
1069# CONFIG_USB_G_SERIAL is not set 1152# CONFIG_USB_G_SERIAL is not set
1153# CONFIG_USB_MIDI_GADGET is not set
1070 1154
1071# 1155#
1072# MMC/SD Card support 1156# MMC/SD Card support
@@ -1102,6 +1186,7 @@ CONFIG_RTC_LIB=y
1102CONFIG_RTC_CLASS=y 1186CONFIG_RTC_CLASS=y
1103CONFIG_RTC_HCTOSYS=y 1187CONFIG_RTC_HCTOSYS=y
1104CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 1188CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1189# CONFIG_RTC_DEBUG is not set
1105 1190
1106# 1191#
1107# RTC interfaces 1192# RTC interfaces
@@ -1145,6 +1230,10 @@ CONFIG_NET_DMA=y
1145CONFIG_INTEL_IOATDMA=y 1230CONFIG_INTEL_IOATDMA=y
1146 1231
1147# 1232#
1233# Virtualization
1234#
1235
1236#
1148# File systems 1237# File systems
1149# 1238#
1150CONFIG_EXT2_FS=y 1239CONFIG_EXT2_FS=y
@@ -1154,6 +1243,7 @@ CONFIG_EXT3_FS=y
1154CONFIG_EXT3_FS_XATTR=y 1243CONFIG_EXT3_FS_XATTR=y
1155# CONFIG_EXT3_FS_POSIX_ACL is not set 1244# CONFIG_EXT3_FS_POSIX_ACL is not set
1156# CONFIG_EXT3_FS_SECURITY is not set 1245# CONFIG_EXT3_FS_SECURITY is not set
1246# CONFIG_EXT4DEV_FS is not set
1157CONFIG_JBD=y 1247CONFIG_JBD=y
1158# CONFIG_JBD_DEBUG is not set 1248# CONFIG_JBD_DEBUG is not set
1159CONFIG_FS_MBCACHE=y 1249CONFIG_FS_MBCACHE=y
@@ -1161,6 +1251,7 @@ CONFIG_FS_MBCACHE=y
1161# CONFIG_JFS_FS is not set 1251# CONFIG_JFS_FS is not set
1162# CONFIG_FS_POSIX_ACL is not set 1252# CONFIG_FS_POSIX_ACL is not set
1163# CONFIG_XFS_FS is not set 1253# CONFIG_XFS_FS is not set
1254# CONFIG_GFS2_FS is not set
1164# CONFIG_OCFS2_FS is not set 1255# CONFIG_OCFS2_FS is not set
1165# CONFIG_MINIX_FS is not set 1256# CONFIG_MINIX_FS is not set
1166# CONFIG_ROMFS_FS is not set 1257# CONFIG_ROMFS_FS is not set
@@ -1190,8 +1281,10 @@ CONFIG_DNOTIFY=y
1190# 1281#
1191CONFIG_PROC_FS=y 1282CONFIG_PROC_FS=y
1192CONFIG_PROC_KCORE=y 1283CONFIG_PROC_KCORE=y
1284CONFIG_PROC_SYSCTL=y
1193CONFIG_SYSFS=y 1285CONFIG_SYSFS=y
1194CONFIG_TMPFS=y 1286CONFIG_TMPFS=y
1287# CONFIG_TMPFS_POSIX_ACL is not set
1195# CONFIG_HUGETLB_PAGE is not set 1288# CONFIG_HUGETLB_PAGE is not set
1196CONFIG_RAMFS=y 1289CONFIG_RAMFS=y
1197# CONFIG_CONFIGFS_FS is not set 1290# CONFIG_CONFIGFS_FS is not set
@@ -1206,7 +1299,6 @@ CONFIG_RAMFS=y
1206# CONFIG_BEFS_FS is not set 1299# CONFIG_BEFS_FS is not set
1207# CONFIG_BFS_FS is not set 1300# CONFIG_BFS_FS is not set
1208# CONFIG_EFS_FS is not set 1301# CONFIG_EFS_FS is not set
1209# CONFIG_JFFS_FS is not set
1210# CONFIG_JFFS2_FS is not set 1302# CONFIG_JFFS2_FS is not set
1211# CONFIG_CRAMFS is not set 1303# CONFIG_CRAMFS is not set
1212# CONFIG_VXFS_FS is not set 1304# CONFIG_VXFS_FS is not set
@@ -1249,6 +1341,10 @@ CONFIG_PARTITION_ADVANCED=y
1249# CONFIG_ATARI_PARTITION is not set 1341# CONFIG_ATARI_PARTITION is not set
1250# CONFIG_MAC_PARTITION is not set 1342# CONFIG_MAC_PARTITION is not set
1251CONFIG_MSDOS_PARTITION=y 1343CONFIG_MSDOS_PARTITION=y
1344# CONFIG_BSD_DISKLABEL is not set
1345# CONFIG_MINIX_SUBPARTITION is not set
1346# CONFIG_SOLARIS_X86_PARTITION is not set
1347# CONFIG_UNIXWARE_DISKLABEL is not set
1252# CONFIG_LDM_PARTITION is not set 1348# CONFIG_LDM_PARTITION is not set
1253# CONFIG_SGI_PARTITION is not set 1349# CONFIG_SGI_PARTITION is not set
1254# CONFIG_ULTRIX_PARTITION is not set 1350# CONFIG_ULTRIX_PARTITION is not set
@@ -1262,13 +1358,20 @@ CONFIG_MSDOS_PARTITION=y
1262# CONFIG_NLS is not set 1358# CONFIG_NLS is not set
1263 1359
1264# 1360#
1361# Distributed Lock Manager
1362#
1363# CONFIG_DLM is not set
1364
1365#
1265# Library routines 1366# Library routines
1266# 1367#
1368CONFIG_BITREVERSE=y
1267# CONFIG_CRC_CCITT is not set 1369# CONFIG_CRC_CCITT is not set
1268# CONFIG_CRC16 is not set 1370# CONFIG_CRC16 is not set
1269CONFIG_CRC32=y 1371CONFIG_CRC32=y
1270# CONFIG_LIBCRC32C is not set 1372# CONFIG_LIBCRC32C is not set
1271CONFIG_PLIST=y 1373CONFIG_PLIST=y
1374CONFIG_IOMAP_COPY=y
1272 1375
1273# 1376#
1274# Instrumentation Support 1377# Instrumentation Support
@@ -1279,8 +1382,11 @@ CONFIG_PLIST=y
1279# Kernel hacking 1382# Kernel hacking
1280# 1383#
1281# CONFIG_PRINTK_TIME is not set 1384# CONFIG_PRINTK_TIME is not set
1385CONFIG_ENABLE_MUST_CHECK=y
1282# CONFIG_MAGIC_SYSRQ is not set 1386# CONFIG_MAGIC_SYSRQ is not set
1283# CONFIG_UNUSED_SYMBOLS is not set 1387# CONFIG_UNUSED_SYMBOLS is not set
1388# CONFIG_DEBUG_FS is not set
1389# CONFIG_HEADERS_CHECK is not set
1284CONFIG_DEBUG_KERNEL=y 1390CONFIG_DEBUG_KERNEL=y
1285CONFIG_LOG_BUF_SHIFT=14 1391CONFIG_LOG_BUF_SHIFT=14
1286CONFIG_DETECT_SOFTLOCKUP=y 1392CONFIG_DETECT_SOFTLOCKUP=y
@@ -1294,9 +1400,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
1294# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1400# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1295# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1401# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1296# CONFIG_DEBUG_KOBJECT is not set 1402# CONFIG_DEBUG_KOBJECT is not set
1403# CONFIG_DEBUG_BUGVERBOSE is not set
1297# CONFIG_DEBUG_INFO is not set 1404# CONFIG_DEBUG_INFO is not set
1298# CONFIG_DEBUG_FS is not set
1299# CONFIG_DEBUG_VM is not set 1405# CONFIG_DEBUG_VM is not set
1406# CONFIG_DEBUG_LIST is not set
1300CONFIG_FORCED_INLINING=y 1407CONFIG_FORCED_INLINING=y
1301# CONFIG_RCU_TORTURE_TEST is not set 1408# CONFIG_RCU_TORTURE_TEST is not set
1302# CONFIG_DEBUGGER is not set 1409# CONFIG_DEBUGGER is not set
@@ -1316,8 +1423,10 @@ CONFIG_FORCED_INLINING=y
1316# 1423#
1317CONFIG_CRYPTO=y 1424CONFIG_CRYPTO=y
1318CONFIG_CRYPTO_ALGAPI=y 1425CONFIG_CRYPTO_ALGAPI=y
1319# CONFIG_CRYPTO_MANAGER is not set 1426CONFIG_CRYPTO_BLKCIPHER=y
1427CONFIG_CRYPTO_MANAGER=y
1320# CONFIG_CRYPTO_HMAC is not set 1428# CONFIG_CRYPTO_HMAC is not set
1429# CONFIG_CRYPTO_XCBC is not set
1321# CONFIG_CRYPTO_NULL is not set 1430# CONFIG_CRYPTO_NULL is not set
1322# CONFIG_CRYPTO_MD4 is not set 1431# CONFIG_CRYPTO_MD4 is not set
1323CONFIG_CRYPTO_MD5=y 1432CONFIG_CRYPTO_MD5=y
@@ -1326,8 +1435,10 @@ CONFIG_CRYPTO_MD5=y
1326# CONFIG_CRYPTO_SHA512 is not set 1435# CONFIG_CRYPTO_SHA512 is not set
1327# CONFIG_CRYPTO_WP512 is not set 1436# CONFIG_CRYPTO_WP512 is not set
1328# CONFIG_CRYPTO_TGR192 is not set 1437# CONFIG_CRYPTO_TGR192 is not set
1438# CONFIG_CRYPTO_GF128MUL is not set
1329# CONFIG_CRYPTO_ECB is not set 1439# CONFIG_CRYPTO_ECB is not set
1330# CONFIG_CRYPTO_CBC is not set 1440CONFIG_CRYPTO_CBC=y
1441# CONFIG_CRYPTO_LRW is not set
1331CONFIG_CRYPTO_DES=y 1442CONFIG_CRYPTO_DES=y
1332# CONFIG_CRYPTO_BLOWFISH is not set 1443# CONFIG_CRYPTO_BLOWFISH is not set
1333# CONFIG_CRYPTO_TWOFISH is not set 1444# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 9eefab967898..c24db58be457 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:28:54 2006 4# Mon Jan 22 22:24:10 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32CONFIG_PPC_83xx=y 34CONFIG_PPC_83xx=y
33# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -39,6 +41,8 @@ CONFIG_PPC_83xx=y
39CONFIG_6xx=y 41CONFIG_6xx=y
40CONFIG_83xx=y 42CONFIG_83xx=y
41CONFIG_PPC_FPU=y 43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set
42CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
44# CONFIG_SMP is not set 48# CONFIG_SMP is not set
@@ -58,28 +62,32 @@ CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 63CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
61# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
64CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y
70CONFIG_EMBEDDED=y 77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
71# CONFIG_KALLSYMS is not set 79# CONFIG_KALLSYMS is not set
72CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
73CONFIG_PRINTK=y 81CONFIG_PRINTK=y
74CONFIG_BUG=y 82CONFIG_BUG=y
75CONFIG_ELF_CORE=y 83CONFIG_ELF_CORE=y
76CONFIG_BASE_FULL=y 84CONFIG_BASE_FULL=y
77CONFIG_RT_MUTEXES=y
78CONFIG_FUTEX=y 85CONFIG_FUTEX=y
79# CONFIG_EPOLL is not set 86# CONFIG_EPOLL is not set
80CONFIG_SHMEM=y 87CONFIG_SHMEM=y
81CONFIG_SLAB=y 88CONFIG_SLAB=y
82CONFIG_VM_EVENT_COUNTERS=y 89CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_RT_MUTEXES=y
83# CONFIG_TINY_SHMEM is not set 91# CONFIG_TINY_SHMEM is not set
84CONFIG_BASE_SMALL=0 92CONFIG_BASE_SMALL=0
85# CONFIG_SLOB is not set 93# CONFIG_SLOB is not set
@@ -97,6 +105,7 @@ CONFIG_MODULE_UNLOAD=y
97# 105#
98# Block layer 106# Block layer
99# 107#
108CONFIG_BLOCK=y
100# CONFIG_LBD is not set 109# CONFIG_LBD is not set
101# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_IO_TRACE is not set
102# CONFIG_LSF is not set 111# CONFIG_LSF is not set
@@ -119,8 +128,10 @@ CONFIG_PPC_GEN550=y
119# 128#
120# Platform support 129# Platform support
121# 130#
131# CONFIG_MPC832x_MDS is not set
122CONFIG_MPC834x_SYS=y 132CONFIG_MPC834x_SYS=y
123# CONFIG_MPC834x_ITX is not set 133# CONFIG_MPC834x_ITX is not set
134# CONFIG_MPC8360E_PB is not set
124CONFIG_MPC834x=y 135CONFIG_MPC834x=y
125# CONFIG_MPIC is not set 136# CONFIG_MPIC is not set
126 137
@@ -130,6 +141,7 @@ CONFIG_MPC834x=y
130# CONFIG_HIGHMEM is not set 141# CONFIG_HIGHMEM is not set
131# CONFIG_HZ_100 is not set 142# CONFIG_HZ_100 is not set
132CONFIG_HZ_250=y 143CONFIG_HZ_250=y
144# CONFIG_HZ_300 is not set
133# CONFIG_HZ_1000 is not set 145# CONFIG_HZ_1000 is not set
134CONFIG_HZ=250 146CONFIG_HZ=250
135CONFIG_PREEMPT_NONE=y 147CONFIG_PREEMPT_NONE=y
@@ -137,8 +149,10 @@ CONFIG_PREEMPT_NONE=y
137# CONFIG_PREEMPT is not set 149# CONFIG_PREEMPT is not set
138CONFIG_BINFMT_ELF=y 150CONFIG_BINFMT_ELF=y
139# CONFIG_BINFMT_MISC is not set 151# CONFIG_BINFMT_MISC is not set
152CONFIG_MATH_EMULATION=y
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 153CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
141CONFIG_ARCH_FLATMEM_ENABLE=y 154CONFIG_ARCH_FLATMEM_ENABLE=y
155CONFIG_ARCH_POPULATES_NODE_MAP=y
142CONFIG_SELECT_MEMORY_MODEL=y 156CONFIG_SELECT_MEMORY_MODEL=y
143CONFIG_FLATMEM_MANUAL=y 157CONFIG_FLATMEM_MANUAL=y
144# CONFIG_DISCONTIGMEM_MANUAL is not set 158# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -204,6 +218,7 @@ CONFIG_PACKET=y
204CONFIG_UNIX=y 218CONFIG_UNIX=y
205CONFIG_XFRM=y 219CONFIG_XFRM=y
206CONFIG_XFRM_USER=m 220CONFIG_XFRM_USER=m
221# CONFIG_XFRM_SUB_POLICY is not set
207# CONFIG_NET_KEY is not set 222# CONFIG_NET_KEY is not set
208CONFIG_INET=y 223CONFIG_INET=y
209CONFIG_IP_MULTICAST=y 224CONFIG_IP_MULTICAST=y
@@ -225,10 +240,13 @@ CONFIG_SYN_COOKIES=y
225# CONFIG_INET_TUNNEL is not set 240# CONFIG_INET_TUNNEL is not set
226CONFIG_INET_XFRM_MODE_TRANSPORT=y 241CONFIG_INET_XFRM_MODE_TRANSPORT=y
227CONFIG_INET_XFRM_MODE_TUNNEL=y 242CONFIG_INET_XFRM_MODE_TUNNEL=y
243CONFIG_INET_XFRM_MODE_BEET=y
228CONFIG_INET_DIAG=y 244CONFIG_INET_DIAG=y
229CONFIG_INET_TCP_DIAG=y 245CONFIG_INET_TCP_DIAG=y
230# CONFIG_TCP_CONG_ADVANCED is not set 246# CONFIG_TCP_CONG_ADVANCED is not set
231CONFIG_TCP_CONG_BIC=y 247CONFIG_TCP_CONG_CUBIC=y
248CONFIG_DEFAULT_TCP_CONG="cubic"
249# CONFIG_TCP_MD5SIG is not set
232# CONFIG_IPV6 is not set 250# CONFIG_IPV6 is not set
233# CONFIG_INET6_XFRM_TUNNEL is not set 251# CONFIG_INET6_XFRM_TUNNEL is not set
234# CONFIG_INET6_TUNNEL is not set 252# CONFIG_INET6_TUNNEL is not set
@@ -258,7 +276,6 @@ CONFIG_TCP_CONG_BIC=y
258# CONFIG_ATALK is not set 276# CONFIG_ATALK is not set
259# CONFIG_X25 is not set 277# CONFIG_X25 is not set
260# CONFIG_LAPB is not set 278# CONFIG_LAPB is not set
261# CONFIG_NET_DIVERT is not set
262# CONFIG_ECONET is not set 279# CONFIG_ECONET is not set
263# CONFIG_WAN_ROUTER is not set 280# CONFIG_WAN_ROUTER is not set
264 281
@@ -329,6 +346,12 @@ CONFIG_BLK_DEV_INITRD=y
329# CONFIG_ATA_OVER_ETH is not set 346# CONFIG_ATA_OVER_ETH is not set
330 347
331# 348#
349# Misc devices
350#
351# CONFIG_SGI_IOC4 is not set
352# CONFIG_TIFM_CORE is not set
353
354#
332# ATA/ATAPI/MFM/RLL support 355# ATA/ATAPI/MFM/RLL support
333# 356#
334# CONFIG_IDE is not set 357# CONFIG_IDE is not set
@@ -338,6 +361,12 @@ CONFIG_BLK_DEV_INITRD=y
338# 361#
339# CONFIG_RAID_ATTRS is not set 362# CONFIG_RAID_ATTRS is not set
340# CONFIG_SCSI is not set 363# CONFIG_SCSI is not set
364# CONFIG_SCSI_NETLINK is not set
365
366#
367# Serial ATA (prod) and Parallel ATA (experimental) drivers
368#
369# CONFIG_ATA is not set
341 370
342# 371#
343# Multi-device support (RAID and LVM) 372# Multi-device support (RAID and LVM)
@@ -362,6 +391,7 @@ CONFIG_BLK_DEV_INITRD=y
362# 391#
363# Macintosh device drivers 392# Macintosh device drivers
364# 393#
394# CONFIG_MAC_EMUMOUSEBTN is not set
365# CONFIG_WINDFARM is not set 395# CONFIG_WINDFARM is not set
366 396
367# 397#
@@ -393,6 +423,7 @@ CONFIG_MARVELL_PHY=y
393# CONFIG_CICADA_PHY is not set 423# CONFIG_CICADA_PHY is not set
394# CONFIG_VITESSE_PHY is not set 424# CONFIG_VITESSE_PHY is not set
395# CONFIG_SMSC_PHY is not set 425# CONFIG_SMSC_PHY is not set
426# CONFIG_BROADCOM_PHY is not set
396# CONFIG_FIXED_PHY is not set 427# CONFIG_FIXED_PHY is not set
397 428
398# 429#
@@ -449,6 +480,7 @@ CONFIG_E100=y
449# CONFIG_BNX2 is not set 480# CONFIG_BNX2 is not set
450CONFIG_GIANFAR=y 481CONFIG_GIANFAR=y
451# CONFIG_GFAR_NAPI is not set 482# CONFIG_GFAR_NAPI is not set
483# CONFIG_QLA3XXX is not set
452 484
453# 485#
454# Ethernet (10000 Mbit) 486# Ethernet (10000 Mbit)
@@ -457,6 +489,7 @@ CONFIG_GIANFAR=y
457# CONFIG_IXGB is not set 489# CONFIG_IXGB is not set
458# CONFIG_S2IO is not set 490# CONFIG_S2IO is not set
459# CONFIG_MYRI10GE is not set 491# CONFIG_MYRI10GE is not set
492# CONFIG_NETXEN_NIC is not set
460 493
461# 494#
462# Token Ring devices 495# Token Ring devices
@@ -495,6 +528,7 @@ CONFIG_GIANFAR=y
495# Input device support 528# Input device support
496# 529#
497CONFIG_INPUT=y 530CONFIG_INPUT=y
531# CONFIG_INPUT_FF_MEMLESS is not set
498 532
499# 533#
500# Userland interfaces 534# Userland interfaces
@@ -539,6 +573,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
539# 573#
540# Non-8250 serial port support 574# Non-8250 serial port support
541# 575#
576# CONFIG_SERIAL_UARTLITE is not set
542CONFIG_SERIAL_CORE=y 577CONFIG_SERIAL_CORE=y
543CONFIG_SERIAL_CORE_CONSOLE=y 578CONFIG_SERIAL_CORE_CONSOLE=y
544# CONFIG_SERIAL_JSM is not set 579# CONFIG_SERIAL_JSM is not set
@@ -575,10 +610,6 @@ CONFIG_GEN_RTC=y
575# CONFIG_DTLK is not set 610# CONFIG_DTLK is not set
576# CONFIG_R3964 is not set 611# CONFIG_R3964 is not set
577# CONFIG_APPLICOM is not set 612# CONFIG_APPLICOM is not set
578
579#
580# Ftape, the floppy tape device driver
581#
582# CONFIG_AGP is not set 613# CONFIG_AGP is not set
583# CONFIG_DRM is not set 614# CONFIG_DRM is not set
584# CONFIG_RAW_DRIVER is not set 615# CONFIG_RAW_DRIVER is not set
@@ -587,7 +618,6 @@ CONFIG_GEN_RTC=y
587# TPM devices 618# TPM devices
588# 619#
589# CONFIG_TCG_TPM is not set 620# CONFIG_TCG_TPM is not set
590# CONFIG_TELCLOCK is not set
591 621
592# 622#
593# I2C support 623# I2C support
@@ -653,6 +683,7 @@ CONFIG_I2C_MPC=y
653# 683#
654# Dallas's 1-wire bus 684# Dallas's 1-wire bus
655# 685#
686# CONFIG_W1 is not set
656 687
657# 688#
658# Hardware Monitoring support 689# Hardware Monitoring support
@@ -686,29 +717,27 @@ CONFIG_HWMON=y
686# CONFIG_SENSORS_LM92 is not set 717# CONFIG_SENSORS_LM92 is not set
687# CONFIG_SENSORS_MAX1619 is not set 718# CONFIG_SENSORS_MAX1619 is not set
688# CONFIG_SENSORS_PC87360 is not set 719# CONFIG_SENSORS_PC87360 is not set
720# CONFIG_SENSORS_PC87427 is not set
689# CONFIG_SENSORS_SIS5595 is not set 721# CONFIG_SENSORS_SIS5595 is not set
690# CONFIG_SENSORS_SMSC47M1 is not set 722# CONFIG_SENSORS_SMSC47M1 is not set
691# CONFIG_SENSORS_SMSC47M192 is not set 723# CONFIG_SENSORS_SMSC47M192 is not set
692# CONFIG_SENSORS_SMSC47B397 is not set 724# CONFIG_SENSORS_SMSC47B397 is not set
693# CONFIG_SENSORS_VIA686A is not set 725# CONFIG_SENSORS_VIA686A is not set
726# CONFIG_SENSORS_VT1211 is not set
694# CONFIG_SENSORS_VT8231 is not set 727# CONFIG_SENSORS_VT8231 is not set
695# CONFIG_SENSORS_W83781D is not set 728# CONFIG_SENSORS_W83781D is not set
696# CONFIG_SENSORS_W83791D is not set 729# CONFIG_SENSORS_W83791D is not set
697# CONFIG_SENSORS_W83792D is not set 730# CONFIG_SENSORS_W83792D is not set
731# CONFIG_SENSORS_W83793 is not set
698# CONFIG_SENSORS_W83L785TS is not set 732# CONFIG_SENSORS_W83L785TS is not set
699# CONFIG_SENSORS_W83627HF is not set 733# CONFIG_SENSORS_W83627HF is not set
700# CONFIG_SENSORS_W83627EHF is not set 734# CONFIG_SENSORS_W83627EHF is not set
701# CONFIG_HWMON_DEBUG_CHIP is not set 735# CONFIG_HWMON_DEBUG_CHIP is not set
702 736
703# 737#
704# Misc devices
705#
706
707#
708# Multimedia devices 738# Multimedia devices
709# 739#
710# CONFIG_VIDEO_DEV is not set 740# CONFIG_VIDEO_DEV is not set
711CONFIG_VIDEO_V4L2=y
712 741
713# 742#
714# Digital Video Broadcasting Devices 743# Digital Video Broadcasting Devices
@@ -720,6 +749,7 @@ CONFIG_VIDEO_V4L2=y
720# 749#
721CONFIG_FIRMWARE_EDID=y 750CONFIG_FIRMWARE_EDID=y
722# CONFIG_FB is not set 751# CONFIG_FB is not set
752# CONFIG_FB_IBM_GXT4500 is not set
723# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 753# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
724 754
725# 755#
@@ -728,6 +758,11 @@ CONFIG_FIRMWARE_EDID=y
728# CONFIG_SOUND is not set 758# CONFIG_SOUND is not set
729 759
730# 760#
761# HID Devices
762#
763CONFIG_HID=y
764
765#
731# USB support 766# USB support
732# 767#
733CONFIG_USB_ARCH_HAS_HCD=y 768CONFIG_USB_ARCH_HAS_HCD=y
@@ -790,6 +825,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
790# 825#
791 826
792# 827#
828# Virtualization
829#
830
831#
793# File systems 832# File systems
794# 833#
795CONFIG_EXT2_FS=y 834CONFIG_EXT2_FS=y
@@ -799,6 +838,7 @@ CONFIG_EXT3_FS=y
799CONFIG_EXT3_FS_XATTR=y 838CONFIG_EXT3_FS_XATTR=y
800# CONFIG_EXT3_FS_POSIX_ACL is not set 839# CONFIG_EXT3_FS_POSIX_ACL is not set
801# CONFIG_EXT3_FS_SECURITY is not set 840# CONFIG_EXT3_FS_SECURITY is not set
841# CONFIG_EXT4DEV_FS is not set
802CONFIG_JBD=y 842CONFIG_JBD=y
803# CONFIG_JBD_DEBUG is not set 843# CONFIG_JBD_DEBUG is not set
804CONFIG_FS_MBCACHE=y 844CONFIG_FS_MBCACHE=y
@@ -806,6 +846,7 @@ CONFIG_FS_MBCACHE=y
806# CONFIG_JFS_FS is not set 846# CONFIG_JFS_FS is not set
807# CONFIG_FS_POSIX_ACL is not set 847# CONFIG_FS_POSIX_ACL is not set
808# CONFIG_XFS_FS is not set 848# CONFIG_XFS_FS is not set
849# CONFIG_GFS2_FS is not set
809# CONFIG_OCFS2_FS is not set 850# CONFIG_OCFS2_FS is not set
810# CONFIG_MINIX_FS is not set 851# CONFIG_MINIX_FS is not set
811# CONFIG_ROMFS_FS is not set 852# CONFIG_ROMFS_FS is not set
@@ -835,8 +876,10 @@ CONFIG_DNOTIFY=y
835# 876#
836CONFIG_PROC_FS=y 877CONFIG_PROC_FS=y
837CONFIG_PROC_KCORE=y 878CONFIG_PROC_KCORE=y
879CONFIG_PROC_SYSCTL=y
838CONFIG_SYSFS=y 880CONFIG_SYSFS=y
839CONFIG_TMPFS=y 881CONFIG_TMPFS=y
882# CONFIG_TMPFS_POSIX_ACL is not set
840# CONFIG_HUGETLB_PAGE is not set 883# CONFIG_HUGETLB_PAGE is not set
841CONFIG_RAMFS=y 884CONFIG_RAMFS=y
842# CONFIG_CONFIGFS_FS is not set 885# CONFIG_CONFIGFS_FS is not set
@@ -905,13 +948,20 @@ CONFIG_PARTITION_ADVANCED=y
905# CONFIG_NLS is not set 948# CONFIG_NLS is not set
906 949
907# 950#
951# Distributed Lock Manager
952#
953# CONFIG_DLM is not set
954
955#
908# Library routines 956# Library routines
909# 957#
958CONFIG_BITREVERSE=y
910# CONFIG_CRC_CCITT is not set 959# CONFIG_CRC_CCITT is not set
911# CONFIG_CRC16 is not set 960# CONFIG_CRC16 is not set
912CONFIG_CRC32=y 961CONFIG_CRC32=y
913# CONFIG_LIBCRC32C is not set 962# CONFIG_LIBCRC32C is not set
914CONFIG_PLIST=y 963CONFIG_PLIST=y
964CONFIG_IOMAP_COPY=y
915 965
916# 966#
917# Instrumentation Support 967# Instrumentation Support
@@ -922,11 +972,14 @@ CONFIG_PLIST=y
922# Kernel hacking 972# Kernel hacking
923# 973#
924# CONFIG_PRINTK_TIME is not set 974# CONFIG_PRINTK_TIME is not set
975CONFIG_ENABLE_MUST_CHECK=y
925# CONFIG_MAGIC_SYSRQ is not set 976# CONFIG_MAGIC_SYSRQ is not set
926# CONFIG_UNUSED_SYMBOLS is not set 977# CONFIG_UNUSED_SYMBOLS is not set
978# CONFIG_DEBUG_FS is not set
979# CONFIG_HEADERS_CHECK is not set
927# CONFIG_DEBUG_KERNEL is not set 980# CONFIG_DEBUG_KERNEL is not set
928CONFIG_LOG_BUF_SHIFT=14 981CONFIG_LOG_BUF_SHIFT=14
929# CONFIG_DEBUG_FS is not set 982# CONFIG_DEBUG_BUGVERBOSE is not set
930# CONFIG_BOOTX_TEXT is not set 983# CONFIG_BOOTX_TEXT is not set
931# CONFIG_SERIAL_TEXT_DEBUG is not set 984# CONFIG_SERIAL_TEXT_DEBUG is not set
932# CONFIG_PPC_EARLY_DEBUG is not set 985# CONFIG_PPC_EARLY_DEBUG is not set
@@ -941,7 +994,11 @@ CONFIG_LOG_BUF_SHIFT=14
941# Cryptographic options 994# Cryptographic options
942# 995#
943CONFIG_CRYPTO=y 996CONFIG_CRYPTO=y
997CONFIG_CRYPTO_ALGAPI=y
998CONFIG_CRYPTO_BLKCIPHER=y
999CONFIG_CRYPTO_MANAGER=y
944# CONFIG_CRYPTO_HMAC is not set 1000# CONFIG_CRYPTO_HMAC is not set
1001# CONFIG_CRYPTO_XCBC is not set
945# CONFIG_CRYPTO_NULL is not set 1002# CONFIG_CRYPTO_NULL is not set
946# CONFIG_CRYPTO_MD4 is not set 1003# CONFIG_CRYPTO_MD4 is not set
947CONFIG_CRYPTO_MD5=y 1004CONFIG_CRYPTO_MD5=y
@@ -950,6 +1007,10 @@ CONFIG_CRYPTO_MD5=y
950# CONFIG_CRYPTO_SHA512 is not set 1007# CONFIG_CRYPTO_SHA512 is not set
951# CONFIG_CRYPTO_WP512 is not set 1008# CONFIG_CRYPTO_WP512 is not set
952# CONFIG_CRYPTO_TGR192 is not set 1009# CONFIG_CRYPTO_TGR192 is not set
1010# CONFIG_CRYPTO_GF128MUL is not set
1011CONFIG_CRYPTO_ECB=m
1012CONFIG_CRYPTO_CBC=y
1013# CONFIG_CRYPTO_LRW is not set
953CONFIG_CRYPTO_DES=y 1014CONFIG_CRYPTO_DES=y
954# CONFIG_CRYPTO_BLOWFISH is not set 1015# CONFIG_CRYPTO_BLOWFISH is not set
955# CONFIG_CRYPTO_TWOFISH is not set 1016# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/mpc8360emds_defconfig b/arch/powerpc/configs/mpc8360emds_defconfig
index c0703415d608..58e6795dbfe5 100644
--- a/arch/powerpc/configs/mpc8360emds_defconfig
+++ b/arch/powerpc/configs/mpc8360emds_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 3# Linux kernel version: 2.6.20-rc5
4# Thu Sep 21 18:14:27 2006 4# Mon Jan 22 22:24:40 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,13 +23,13 @@ CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
24CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
25CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
26 28
27# 29#
28# Processor support 30# Processor support
29# 31#
30# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
31# CONFIG_PPC_52xx is not set
32# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
33CONFIG_PPC_83xx=y 34CONFIG_PPC_83xx=y
34# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -40,6 +41,8 @@ CONFIG_PPC_83xx=y
40CONFIG_6xx=y 41CONFIG_6xx=y
41CONFIG_83xx=y 42CONFIG_83xx=y
42CONFIG_PPC_FPU=y 43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set
43CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
44CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
45# CONFIG_SMP is not set 48# CONFIG_SMP is not set
@@ -59,16 +62,20 @@ CONFIG_LOCALVERSION=""
59CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
60CONFIG_SWAP=y 63CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
62# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
63# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
70CONFIG_EMBEDDED=y
71CONFIG_SYSCTL=y 76CONFIG_SYSCTL=y
77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
72# CONFIG_KALLSYMS is not set 79# CONFIG_KALLSYMS is not set
73CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
74CONFIG_PRINTK=y 81CONFIG_PRINTK=y
@@ -98,6 +105,7 @@ CONFIG_MODULE_UNLOAD=y
98# 105#
99# Block layer 106# Block layer
100# 107#
108CONFIG_BLOCK=y
101# CONFIG_LBD is not set 109# CONFIG_LBD is not set
102# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_IO_TRACE is not set
103# CONFIG_LSF is not set 111# CONFIG_LSF is not set
@@ -121,6 +129,7 @@ CONFIG_PPC_GEN550=y
121# 129#
122# Platform support 130# Platform support
123# 131#
132# CONFIG_MPC832x_MDS is not set
124# CONFIG_MPC834x_SYS is not set 133# CONFIG_MPC834x_SYS is not set
125# CONFIG_MPC834x_ITX is not set 134# CONFIG_MPC834x_ITX is not set
126CONFIG_MPC8360E_PB=y 135CONFIG_MPC8360E_PB=y
@@ -133,6 +142,7 @@ CONFIG_PPC_MPC836x=y
133# CONFIG_HIGHMEM is not set 142# CONFIG_HIGHMEM is not set
134# CONFIG_HZ_100 is not set 143# CONFIG_HZ_100 is not set
135CONFIG_HZ_250=y 144CONFIG_HZ_250=y
145# CONFIG_HZ_300 is not set
136# CONFIG_HZ_1000 is not set 146# CONFIG_HZ_1000 is not set
137CONFIG_HZ=250 147CONFIG_HZ=250
138CONFIG_PREEMPT_NONE=y 148CONFIG_PREEMPT_NONE=y
@@ -140,8 +150,10 @@ CONFIG_PREEMPT_NONE=y
140# CONFIG_PREEMPT is not set 150# CONFIG_PREEMPT is not set
141CONFIG_BINFMT_ELF=y 151CONFIG_BINFMT_ELF=y
142# CONFIG_BINFMT_MISC is not set 152# CONFIG_BINFMT_MISC is not set
153CONFIG_MATH_EMULATION=y
143CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 154CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
144CONFIG_ARCH_FLATMEM_ENABLE=y 155CONFIG_ARCH_FLATMEM_ENABLE=y
156CONFIG_ARCH_POPULATES_NODE_MAP=y
145CONFIG_SELECT_MEMORY_MODEL=y 157CONFIG_SELECT_MEMORY_MODEL=y
146CONFIG_FLATMEM_MANUAL=y 158CONFIG_FLATMEM_MANUAL=y
147# CONFIG_DISCONTIGMEM_MANUAL is not set 159# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -207,6 +219,7 @@ CONFIG_PACKET=y
207CONFIG_UNIX=y 219CONFIG_UNIX=y
208CONFIG_XFRM=y 220CONFIG_XFRM=y
209# CONFIG_XFRM_USER is not set 221# CONFIG_XFRM_USER is not set
222# CONFIG_XFRM_SUB_POLICY is not set
210# CONFIG_NET_KEY is not set 223# CONFIG_NET_KEY is not set
211CONFIG_INET=y 224CONFIG_INET=y
212CONFIG_IP_MULTICAST=y 225CONFIG_IP_MULTICAST=y
@@ -228,10 +241,13 @@ CONFIG_SYN_COOKIES=y
228# CONFIG_INET_TUNNEL is not set 241# CONFIG_INET_TUNNEL is not set
229CONFIG_INET_XFRM_MODE_TRANSPORT=y 242CONFIG_INET_XFRM_MODE_TRANSPORT=y
230CONFIG_INET_XFRM_MODE_TUNNEL=y 243CONFIG_INET_XFRM_MODE_TUNNEL=y
244CONFIG_INET_XFRM_MODE_BEET=y
231CONFIG_INET_DIAG=y 245CONFIG_INET_DIAG=y
232CONFIG_INET_TCP_DIAG=y 246CONFIG_INET_TCP_DIAG=y
233# CONFIG_TCP_CONG_ADVANCED is not set 247# CONFIG_TCP_CONG_ADVANCED is not set
234CONFIG_TCP_CONG_BIC=y 248CONFIG_TCP_CONG_CUBIC=y
249CONFIG_DEFAULT_TCP_CONG="cubic"
250# CONFIG_TCP_MD5SIG is not set
235# CONFIG_IPV6 is not set 251# CONFIG_IPV6 is not set
236# CONFIG_INET6_XFRM_TUNNEL is not set 252# CONFIG_INET6_XFRM_TUNNEL is not set
237# CONFIG_INET6_TUNNEL is not set 253# CONFIG_INET6_TUNNEL is not set
@@ -331,6 +347,12 @@ CONFIG_BLK_DEV_INITRD=y
331# CONFIG_ATA_OVER_ETH is not set 347# CONFIG_ATA_OVER_ETH is not set
332 348
333# 349#
350# Misc devices
351#
352# CONFIG_SGI_IOC4 is not set
353# CONFIG_TIFM_CORE is not set
354
355#
334# ATA/ATAPI/MFM/RLL support 356# ATA/ATAPI/MFM/RLL support
335# 357#
336# CONFIG_IDE is not set 358# CONFIG_IDE is not set
@@ -340,6 +362,8 @@ CONFIG_BLK_DEV_INITRD=y
340# 362#
341# CONFIG_RAID_ATTRS is not set 363# CONFIG_RAID_ATTRS is not set
342CONFIG_SCSI=y 364CONFIG_SCSI=y
365# CONFIG_SCSI_TGT is not set
366# CONFIG_SCSI_NETLINK is not set
343CONFIG_SCSI_PROC_FS=y 367CONFIG_SCSI_PROC_FS=y
344 368
345# 369#
@@ -358,14 +382,16 @@ CONFIG_SCSI_PROC_FS=y
358# CONFIG_SCSI_MULTI_LUN is not set 382# CONFIG_SCSI_MULTI_LUN is not set
359# CONFIG_SCSI_CONSTANTS is not set 383# CONFIG_SCSI_CONSTANTS is not set
360# CONFIG_SCSI_LOGGING is not set 384# CONFIG_SCSI_LOGGING is not set
385# CONFIG_SCSI_SCAN_ASYNC is not set
361 386
362# 387#
363# SCSI Transport Attributes 388# SCSI Transports
364# 389#
365# CONFIG_SCSI_SPI_ATTRS is not set 390# CONFIG_SCSI_SPI_ATTRS is not set
366# CONFIG_SCSI_FC_ATTRS is not set 391# CONFIG_SCSI_FC_ATTRS is not set
367# CONFIG_SCSI_ISCSI_ATTRS is not set 392# CONFIG_SCSI_ISCSI_ATTRS is not set
368# CONFIG_SCSI_SAS_ATTRS is not set 393# CONFIG_SCSI_SAS_ATTRS is not set
394# CONFIG_SCSI_SAS_LIBSAS is not set
369 395
370# 396#
371# SCSI low-level drivers 397# SCSI low-level drivers
@@ -378,11 +404,12 @@ CONFIG_SCSI_PROC_FS=y
378# CONFIG_SCSI_AIC7XXX is not set 404# CONFIG_SCSI_AIC7XXX is not set
379# CONFIG_SCSI_AIC7XXX_OLD is not set 405# CONFIG_SCSI_AIC7XXX_OLD is not set
380# CONFIG_SCSI_AIC79XX is not set 406# CONFIG_SCSI_AIC79XX is not set
407# CONFIG_SCSI_AIC94XX is not set
381# CONFIG_SCSI_DPT_I2O is not set 408# CONFIG_SCSI_DPT_I2O is not set
409# CONFIG_SCSI_ARCMSR is not set
382# CONFIG_MEGARAID_NEWGEN is not set 410# CONFIG_MEGARAID_NEWGEN is not set
383# CONFIG_MEGARAID_LEGACY is not set 411# CONFIG_MEGARAID_LEGACY is not set
384# CONFIG_MEGARAID_SAS is not set 412# CONFIG_MEGARAID_SAS is not set
385# CONFIG_SCSI_SATA is not set
386# CONFIG_SCSI_HPTIOP is not set 413# CONFIG_SCSI_HPTIOP is not set
387# CONFIG_SCSI_BUSLOGIC is not set 414# CONFIG_SCSI_BUSLOGIC is not set
388# CONFIG_SCSI_DMX3191D is not set 415# CONFIG_SCSI_DMX3191D is not set
@@ -392,15 +419,22 @@ CONFIG_SCSI_PROC_FS=y
392# CONFIG_SCSI_IPS is not set 419# CONFIG_SCSI_IPS is not set
393# CONFIG_SCSI_INITIO is not set 420# CONFIG_SCSI_INITIO is not set
394# CONFIG_SCSI_INIA100 is not set 421# CONFIG_SCSI_INIA100 is not set
422# CONFIG_SCSI_STEX is not set
395# CONFIG_SCSI_SYM53C8XX_2 is not set 423# CONFIG_SCSI_SYM53C8XX_2 is not set
396# CONFIG_SCSI_IPR is not set
397# CONFIG_SCSI_QLOGIC_1280 is not set 424# CONFIG_SCSI_QLOGIC_1280 is not set
398# CONFIG_SCSI_QLA_FC is not set 425# CONFIG_SCSI_QLA_FC is not set
426# CONFIG_SCSI_QLA_ISCSI is not set
399# CONFIG_SCSI_LPFC is not set 427# CONFIG_SCSI_LPFC is not set
400# CONFIG_SCSI_DC395x is not set 428# CONFIG_SCSI_DC395x is not set
401# CONFIG_SCSI_DC390T is not set 429# CONFIG_SCSI_DC390T is not set
402# CONFIG_SCSI_NSP32 is not set 430# CONFIG_SCSI_NSP32 is not set
403# CONFIG_SCSI_DEBUG is not set 431# CONFIG_SCSI_DEBUG is not set
432# CONFIG_SCSI_SRP is not set
433
434#
435# Serial ATA (prod) and Parallel ATA (experimental) drivers
436#
437# CONFIG_ATA is not set
404 438
405# 439#
406# Multi-device support (RAID and LVM) 440# Multi-device support (RAID and LVM)
@@ -428,6 +462,7 @@ CONFIG_SCSI_PROC_FS=y
428# 462#
429# Macintosh device drivers 463# Macintosh device drivers
430# 464#
465# CONFIG_MAC_EMUMOUSEBTN is not set
431# CONFIG_WINDFARM is not set 466# CONFIG_WINDFARM is not set
432 467
433# 468#
@@ -488,6 +523,7 @@ CONFIG_UCC_GETH=y
488# CONFIG_UGETH_MAGIC_PACKET is not set 523# CONFIG_UGETH_MAGIC_PACKET is not set
489# CONFIG_UGETH_FILTERING is not set 524# CONFIG_UGETH_FILTERING is not set
490# CONFIG_UGETH_TX_ON_DEMOND is not set 525# CONFIG_UGETH_TX_ON_DEMOND is not set
526# CONFIG_QLA3XXX is not set
491 527
492# 528#
493# Ethernet (10000 Mbit) 529# Ethernet (10000 Mbit)
@@ -496,6 +532,7 @@ CONFIG_UCC_GETH=y
496# CONFIG_IXGB is not set 532# CONFIG_IXGB is not set
497# CONFIG_S2IO is not set 533# CONFIG_S2IO is not set
498# CONFIG_MYRI10GE is not set 534# CONFIG_MYRI10GE is not set
535# CONFIG_NETXEN_NIC is not set
499 536
500# 537#
501# Token Ring devices 538# Token Ring devices
@@ -535,6 +572,7 @@ CONFIG_UCC_GETH=y
535# Input device support 572# Input device support
536# 573#
537CONFIG_INPUT=y 574CONFIG_INPUT=y
575# CONFIG_INPUT_FF_MEMLESS is not set
538 576
539# 577#
540# Userland interfaces 578# Userland interfaces
@@ -579,6 +617,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
579# 617#
580# Non-8250 serial port support 618# Non-8250 serial port support
581# 619#
620# CONFIG_SERIAL_UARTLITE is not set
582CONFIG_SERIAL_CORE=y 621CONFIG_SERIAL_CORE=y
583CONFIG_SERIAL_CORE_CONSOLE=y 622CONFIG_SERIAL_CORE_CONSOLE=y
584# CONFIG_SERIAL_JSM is not set 623# CONFIG_SERIAL_JSM is not set
@@ -615,10 +654,6 @@ CONFIG_GEN_RTC=y
615# CONFIG_DTLK is not set 654# CONFIG_DTLK is not set
616# CONFIG_R3964 is not set 655# CONFIG_R3964 is not set
617# CONFIG_APPLICOM is not set 656# CONFIG_APPLICOM is not set
618
619#
620# Ftape, the floppy tape device driver
621#
622# CONFIG_AGP is not set 657# CONFIG_AGP is not set
623# CONFIG_DRM is not set 658# CONFIG_DRM is not set
624# CONFIG_RAW_DRIVER is not set 659# CONFIG_RAW_DRIVER is not set
@@ -627,7 +662,6 @@ CONFIG_GEN_RTC=y
627# TPM devices 662# TPM devices
628# 663#
629# CONFIG_TCG_TPM is not set 664# CONFIG_TCG_TPM is not set
630# CONFIG_TELCLOCK is not set
631 665
632# 666#
633# I2C support 667# I2C support
@@ -693,6 +727,7 @@ CONFIG_I2C_MPC=y
693# 727#
694# Dallas's 1-wire bus 728# Dallas's 1-wire bus
695# 729#
730# CONFIG_W1 is not set
696 731
697# 732#
698# Hardware Monitoring support 733# Hardware Monitoring support
@@ -726,29 +761,27 @@ CONFIG_HWMON=y
726# CONFIG_SENSORS_LM92 is not set 761# CONFIG_SENSORS_LM92 is not set
727# CONFIG_SENSORS_MAX1619 is not set 762# CONFIG_SENSORS_MAX1619 is not set
728# CONFIG_SENSORS_PC87360 is not set 763# CONFIG_SENSORS_PC87360 is not set
764# CONFIG_SENSORS_PC87427 is not set
729# CONFIG_SENSORS_SIS5595 is not set 765# CONFIG_SENSORS_SIS5595 is not set
730# CONFIG_SENSORS_SMSC47M1 is not set 766# CONFIG_SENSORS_SMSC47M1 is not set
731# CONFIG_SENSORS_SMSC47M192 is not set 767# CONFIG_SENSORS_SMSC47M192 is not set
732# CONFIG_SENSORS_SMSC47B397 is not set 768# CONFIG_SENSORS_SMSC47B397 is not set
733# CONFIG_SENSORS_VIA686A is not set 769# CONFIG_SENSORS_VIA686A is not set
770# CONFIG_SENSORS_VT1211 is not set
734# CONFIG_SENSORS_VT8231 is not set 771# CONFIG_SENSORS_VT8231 is not set
735# CONFIG_SENSORS_W83781D is not set 772# CONFIG_SENSORS_W83781D is not set
736# CONFIG_SENSORS_W83791D is not set 773# CONFIG_SENSORS_W83791D is not set
737# CONFIG_SENSORS_W83792D is not set 774# CONFIG_SENSORS_W83792D is not set
775# CONFIG_SENSORS_W83793 is not set
738# CONFIG_SENSORS_W83L785TS is not set 776# CONFIG_SENSORS_W83L785TS is not set
739# CONFIG_SENSORS_W83627HF is not set 777# CONFIG_SENSORS_W83627HF is not set
740# CONFIG_SENSORS_W83627EHF is not set 778# CONFIG_SENSORS_W83627EHF is not set
741# CONFIG_HWMON_DEBUG_CHIP is not set 779# CONFIG_HWMON_DEBUG_CHIP is not set
742 780
743# 781#
744# Misc devices
745#
746
747#
748# Multimedia devices 782# Multimedia devices
749# 783#
750# CONFIG_VIDEO_DEV is not set 784# CONFIG_VIDEO_DEV is not set
751CONFIG_VIDEO_V4L2=y
752 785
753# 786#
754# Digital Video Broadcasting Devices 787# Digital Video Broadcasting Devices
@@ -760,6 +793,7 @@ CONFIG_VIDEO_V4L2=y
760# 793#
761CONFIG_FIRMWARE_EDID=y 794CONFIG_FIRMWARE_EDID=y
762# CONFIG_FB is not set 795# CONFIG_FB is not set
796# CONFIG_FB_IBM_GXT4500 is not set
763# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 797# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
764 798
765# 799#
@@ -768,6 +802,11 @@ CONFIG_FIRMWARE_EDID=y
768# CONFIG_SOUND is not set 802# CONFIG_SOUND is not set
769 803
770# 804#
805# HID Devices
806#
807CONFIG_HID=y
808
809#
771# USB support 810# USB support
772# 811#
773CONFIG_USB_ARCH_HAS_HCD=y 812CONFIG_USB_ARCH_HAS_HCD=y
@@ -830,6 +869,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
830# 869#
831 870
832# 871#
872# Virtualization
873#
874
875#
833# File systems 876# File systems
834# 877#
835CONFIG_EXT2_FS=y 878CONFIG_EXT2_FS=y
@@ -839,6 +882,7 @@ CONFIG_EXT3_FS=y
839CONFIG_EXT3_FS_XATTR=y 882CONFIG_EXT3_FS_XATTR=y
840# CONFIG_EXT3_FS_POSIX_ACL is not set 883# CONFIG_EXT3_FS_POSIX_ACL is not set
841# CONFIG_EXT3_FS_SECURITY is not set 884# CONFIG_EXT3_FS_SECURITY is not set
885# CONFIG_EXT4DEV_FS is not set
842CONFIG_JBD=y 886CONFIG_JBD=y
843# CONFIG_JBD_DEBUG is not set 887# CONFIG_JBD_DEBUG is not set
844CONFIG_FS_MBCACHE=y 888CONFIG_FS_MBCACHE=y
@@ -846,6 +890,7 @@ CONFIG_FS_MBCACHE=y
846# CONFIG_JFS_FS is not set 890# CONFIG_JFS_FS is not set
847# CONFIG_FS_POSIX_ACL is not set 891# CONFIG_FS_POSIX_ACL is not set
848# CONFIG_XFS_FS is not set 892# CONFIG_XFS_FS is not set
893# CONFIG_GFS2_FS is not set
849# CONFIG_OCFS2_FS is not set 894# CONFIG_OCFS2_FS is not set
850# CONFIG_MINIX_FS is not set 895# CONFIG_MINIX_FS is not set
851# CONFIG_ROMFS_FS is not set 896# CONFIG_ROMFS_FS is not set
@@ -875,8 +920,10 @@ CONFIG_DNOTIFY=y
875# 920#
876CONFIG_PROC_FS=y 921CONFIG_PROC_FS=y
877CONFIG_PROC_KCORE=y 922CONFIG_PROC_KCORE=y
923CONFIG_PROC_SYSCTL=y
878CONFIG_SYSFS=y 924CONFIG_SYSFS=y
879CONFIG_TMPFS=y 925CONFIG_TMPFS=y
926# CONFIG_TMPFS_POSIX_ACL is not set
880# CONFIG_HUGETLB_PAGE is not set 927# CONFIG_HUGETLB_PAGE is not set
881CONFIG_RAMFS=y 928CONFIG_RAMFS=y
882# CONFIG_CONFIGFS_FS is not set 929# CONFIG_CONFIGFS_FS is not set
@@ -945,20 +992,27 @@ CONFIG_PARTITION_ADVANCED=y
945# CONFIG_NLS is not set 992# CONFIG_NLS is not set
946 993
947# 994#
995# Distributed Lock Manager
996#
997# CONFIG_DLM is not set
998
999#
948# QE Options 1000# QE Options
949# 1001#
950# CONFIG_UCC_SLOW is not set 1002CONFIG_UCC_SLOW=y
951CONFIG_UCC_FAST=y 1003CONFIG_UCC_FAST=y
952CONFIG_UCC=y 1004CONFIG_UCC=y
953 1005
954# 1006#
955# Library routines 1007# Library routines
956# 1008#
1009CONFIG_BITREVERSE=y
957# CONFIG_CRC_CCITT is not set 1010# CONFIG_CRC_CCITT is not set
958# CONFIG_CRC16 is not set 1011# CONFIG_CRC16 is not set
959CONFIG_CRC32=y 1012CONFIG_CRC32=y
960# CONFIG_LIBCRC32C is not set 1013# CONFIG_LIBCRC32C is not set
961CONFIG_PLIST=y 1014CONFIG_PLIST=y
1015CONFIG_IOMAP_COPY=y
962 1016
963# 1017#
964# Instrumentation Support 1018# Instrumentation Support
@@ -969,11 +1023,14 @@ CONFIG_PLIST=y
969# Kernel hacking 1023# Kernel hacking
970# 1024#
971# CONFIG_PRINTK_TIME is not set 1025# CONFIG_PRINTK_TIME is not set
1026CONFIG_ENABLE_MUST_CHECK=y
972# CONFIG_MAGIC_SYSRQ is not set 1027# CONFIG_MAGIC_SYSRQ is not set
973# CONFIG_UNUSED_SYMBOLS is not set 1028# CONFIG_UNUSED_SYMBOLS is not set
1029# CONFIG_DEBUG_FS is not set
1030# CONFIG_HEADERS_CHECK is not set
974# CONFIG_DEBUG_KERNEL is not set 1031# CONFIG_DEBUG_KERNEL is not set
975CONFIG_LOG_BUF_SHIFT=14 1032CONFIG_LOG_BUF_SHIFT=14
976# CONFIG_DEBUG_FS is not set 1033# CONFIG_DEBUG_BUGVERBOSE is not set
977# CONFIG_BOOTX_TEXT is not set 1034# CONFIG_BOOTX_TEXT is not set
978# CONFIG_SERIAL_TEXT_DEBUG is not set 1035# CONFIG_SERIAL_TEXT_DEBUG is not set
979# CONFIG_PPC_EARLY_DEBUG is not set 1036# CONFIG_PPC_EARLY_DEBUG is not set
@@ -988,7 +1045,11 @@ CONFIG_LOG_BUF_SHIFT=14
988# Cryptographic options 1045# Cryptographic options
989# 1046#
990CONFIG_CRYPTO=y 1047CONFIG_CRYPTO=y
1048CONFIG_CRYPTO_ALGAPI=y
1049CONFIG_CRYPTO_BLKCIPHER=y
1050CONFIG_CRYPTO_MANAGER=y
991# CONFIG_CRYPTO_HMAC is not set 1051# CONFIG_CRYPTO_HMAC is not set
1052# CONFIG_CRYPTO_XCBC is not set
992# CONFIG_CRYPTO_NULL is not set 1053# CONFIG_CRYPTO_NULL is not set
993# CONFIG_CRYPTO_MD4 is not set 1054# CONFIG_CRYPTO_MD4 is not set
994CONFIG_CRYPTO_MD5=y 1055CONFIG_CRYPTO_MD5=y
@@ -997,6 +1058,10 @@ CONFIG_CRYPTO_MD5=y
997# CONFIG_CRYPTO_SHA512 is not set 1058# CONFIG_CRYPTO_SHA512 is not set
998# CONFIG_CRYPTO_WP512 is not set 1059# CONFIG_CRYPTO_WP512 is not set
999# CONFIG_CRYPTO_TGR192 is not set 1060# CONFIG_CRYPTO_TGR192 is not set
1061# CONFIG_CRYPTO_GF128MUL is not set
1062CONFIG_CRYPTO_ECB=m
1063CONFIG_CRYPTO_CBC=y
1064# CONFIG_CRYPTO_LRW is not set
1000CONFIG_CRYPTO_DES=y 1065CONFIG_CRYPTO_DES=y
1001# CONFIG_CRYPTO_BLOWFISH is not set 1066# CONFIG_CRYPTO_BLOWFISH is not set
1002# CONFIG_CRYPTO_TWOFISH is not set 1067# CONFIG_CRYPTO_TWOFISH is not set
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 67e7d0b5793d..17120c472304 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:29:23 2006 4# Mon Jan 22 22:25:24 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33CONFIG_PPC_85xx=y 35CONFIG_PPC_85xx=y
@@ -38,6 +40,8 @@ CONFIG_PPC_85xx=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_85xx=y 41CONFIG_85xx=y
40CONFIG_E500=y 42CONFIG_E500=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41CONFIG_BOOKE=y 45CONFIG_BOOKE=y
42CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
43# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
@@ -58,16 +62,20 @@ CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 63CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
61# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
64CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y
70CONFIG_EMBEDDED=y 77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
71CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_ALL is not set 80# CONFIG_KALLSYMS_ALL is not set
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -76,12 +84,12 @@ CONFIG_PRINTK=y
76CONFIG_BUG=y 84CONFIG_BUG=y
77CONFIG_ELF_CORE=y 85CONFIG_ELF_CORE=y
78CONFIG_BASE_FULL=y 86CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
80CONFIG_FUTEX=y 87CONFIG_FUTEX=y
81CONFIG_EPOLL=y 88CONFIG_EPOLL=y
82CONFIG_SHMEM=y 89CONFIG_SHMEM=y
83CONFIG_SLAB=y 90CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_RT_MUTEXES=y
85# CONFIG_TINY_SHMEM is not set 93# CONFIG_TINY_SHMEM is not set
86CONFIG_BASE_SMALL=0 94CONFIG_BASE_SMALL=0
87# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -94,6 +102,7 @@ CONFIG_BASE_SMALL=0
94# 102#
95# Block layer 103# Block layer
96# 104#
105CONFIG_BLOCK=y
97# CONFIG_LBD is not set 106# CONFIG_LBD is not set
98# CONFIG_BLK_DEV_IO_TRACE is not set 107# CONFIG_BLK_DEV_IO_TRACE is not set
99# CONFIG_LSF is not set 108# CONFIG_LSF is not set
@@ -116,6 +125,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
116# Platform support 125# Platform support
117# 126#
118CONFIG_MPC8540_ADS=y 127CONFIG_MPC8540_ADS=y
128# CONFIG_MPC8560_ADS is not set
119# CONFIG_MPC85xx_CDS is not set 129# CONFIG_MPC85xx_CDS is not set
120CONFIG_MPC8540=y 130CONFIG_MPC8540=y
121CONFIG_PPC_INDIRECT_PCI_BE=y 131CONFIG_PPC_INDIRECT_PCI_BE=y
@@ -127,6 +137,7 @@ CONFIG_MPIC=y
127# CONFIG_HIGHMEM is not set 137# CONFIG_HIGHMEM is not set
128# CONFIG_HZ_100 is not set 138# CONFIG_HZ_100 is not set
129CONFIG_HZ_250=y 139CONFIG_HZ_250=y
140# CONFIG_HZ_300 is not set
130# CONFIG_HZ_1000 is not set 141# CONFIG_HZ_1000 is not set
131CONFIG_HZ=250 142CONFIG_HZ=250
132CONFIG_PREEMPT_NONE=y 143CONFIG_PREEMPT_NONE=y
@@ -137,6 +148,7 @@ CONFIG_BINFMT_MISC=y
137CONFIG_MATH_EMULATION=y 148CONFIG_MATH_EMULATION=y
138CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 149CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
139CONFIG_ARCH_FLATMEM_ENABLE=y 150CONFIG_ARCH_FLATMEM_ENABLE=y
151CONFIG_ARCH_POPULATES_NODE_MAP=y
140CONFIG_SELECT_MEMORY_MODEL=y 152CONFIG_SELECT_MEMORY_MODEL=y
141CONFIG_FLATMEM_MANUAL=y 153CONFIG_FLATMEM_MANUAL=y
142# CONFIG_DISCONTIGMEM_MANUAL is not set 154# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -199,6 +211,7 @@ CONFIG_PACKET=y
199CONFIG_UNIX=y 211CONFIG_UNIX=y
200CONFIG_XFRM=y 212CONFIG_XFRM=y
201CONFIG_XFRM_USER=y 213CONFIG_XFRM_USER=y
214# CONFIG_XFRM_SUB_POLICY is not set
202# CONFIG_NET_KEY is not set 215# CONFIG_NET_KEY is not set
203CONFIG_INET=y 216CONFIG_INET=y
204CONFIG_IP_MULTICAST=y 217CONFIG_IP_MULTICAST=y
@@ -220,10 +233,13 @@ CONFIG_SYN_COOKIES=y
220# CONFIG_INET_TUNNEL is not set 233# CONFIG_INET_TUNNEL is not set
221CONFIG_INET_XFRM_MODE_TRANSPORT=y 234CONFIG_INET_XFRM_MODE_TRANSPORT=y
222CONFIG_INET_XFRM_MODE_TUNNEL=y 235CONFIG_INET_XFRM_MODE_TUNNEL=y
236CONFIG_INET_XFRM_MODE_BEET=y
223CONFIG_INET_DIAG=y 237CONFIG_INET_DIAG=y
224CONFIG_INET_TCP_DIAG=y 238CONFIG_INET_TCP_DIAG=y
225# CONFIG_TCP_CONG_ADVANCED is not set 239# CONFIG_TCP_CONG_ADVANCED is not set
226CONFIG_TCP_CONG_BIC=y 240CONFIG_TCP_CONG_CUBIC=y
241CONFIG_DEFAULT_TCP_CONG="cubic"
242# CONFIG_TCP_MD5SIG is not set
227# CONFIG_IPV6 is not set 243# CONFIG_IPV6 is not set
228# CONFIG_INET6_XFRM_TUNNEL is not set 244# CONFIG_INET6_XFRM_TUNNEL is not set
229# CONFIG_INET6_TUNNEL is not set 245# CONFIG_INET6_TUNNEL is not set
@@ -253,7 +269,6 @@ CONFIG_TCP_CONG_BIC=y
253# CONFIG_ATALK is not set 269# CONFIG_ATALK is not set
254# CONFIG_X25 is not set 270# CONFIG_X25 is not set
255# CONFIG_LAPB is not set 271# CONFIG_LAPB is not set
256# CONFIG_NET_DIVERT is not set
257# CONFIG_ECONET is not set 272# CONFIG_ECONET is not set
258# CONFIG_WAN_ROUTER is not set 273# CONFIG_WAN_ROUTER is not set
259 274
@@ -320,6 +335,11 @@ CONFIG_BLK_DEV_INITRD=y
320# CONFIG_ATA_OVER_ETH is not set 335# CONFIG_ATA_OVER_ETH is not set
321 336
322# 337#
338# Misc devices
339#
340# CONFIG_TIFM_CORE is not set
341
342#
323# ATA/ATAPI/MFM/RLL support 343# ATA/ATAPI/MFM/RLL support
324# 344#
325# CONFIG_IDE is not set 345# CONFIG_IDE is not set
@@ -329,6 +349,12 @@ CONFIG_BLK_DEV_INITRD=y
329# 349#
330# CONFIG_RAID_ATTRS is not set 350# CONFIG_RAID_ATTRS is not set
331# CONFIG_SCSI is not set 351# CONFIG_SCSI is not set
352# CONFIG_SCSI_NETLINK is not set
353
354#
355# Serial ATA (prod) and Parallel ATA (experimental) drivers
356#
357# CONFIG_ATA is not set
332 358
333# 359#
334# Multi-device support (RAID and LVM) 360# Multi-device support (RAID and LVM)
@@ -351,6 +377,7 @@ CONFIG_BLK_DEV_INITRD=y
351# 377#
352# Macintosh device drivers 378# Macintosh device drivers
353# 379#
380# CONFIG_MAC_EMUMOUSEBTN is not set
354# CONFIG_WINDFARM is not set 381# CONFIG_WINDFARM is not set
355 382
356# 383#
@@ -377,6 +404,7 @@ CONFIG_PHYLIB=y
377# CONFIG_CICADA_PHY is not set 404# CONFIG_CICADA_PHY is not set
378# CONFIG_VITESSE_PHY is not set 405# CONFIG_VITESSE_PHY is not set
379# CONFIG_SMSC_PHY is not set 406# CONFIG_SMSC_PHY is not set
407# CONFIG_BROADCOM_PHY is not set
380# CONFIG_FIXED_PHY is not set 408# CONFIG_FIXED_PHY is not set
381 409
382# 410#
@@ -429,6 +457,7 @@ CONFIG_GFAR_NAPI=y
429# Input device support 457# Input device support
430# 458#
431CONFIG_INPUT=y 459CONFIG_INPUT=y
460# CONFIG_INPUT_FF_MEMLESS is not set
432 461
433# 462#
434# Userland interfaces 463# Userland interfaces
@@ -472,6 +501,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
472# 501#
473# Non-8250 serial port support 502# Non-8250 serial port support
474# 503#
504# CONFIG_SERIAL_UARTLITE is not set
475CONFIG_SERIAL_CORE=y 505CONFIG_SERIAL_CORE=y
476CONFIG_SERIAL_CORE_CONSOLE=y 506CONFIG_SERIAL_CORE_CONSOLE=y
477CONFIG_UNIX98_PTYS=y 507CONFIG_UNIX98_PTYS=y
@@ -493,17 +523,12 @@ CONFIG_GEN_RTC=y
493# CONFIG_GEN_RTC_X is not set 523# CONFIG_GEN_RTC_X is not set
494# CONFIG_DTLK is not set 524# CONFIG_DTLK is not set
495# CONFIG_R3964 is not set 525# CONFIG_R3964 is not set
496
497#
498# Ftape, the floppy tape device driver
499#
500# CONFIG_RAW_DRIVER is not set 526# CONFIG_RAW_DRIVER is not set
501 527
502# 528#
503# TPM devices 529# TPM devices
504# 530#
505# CONFIG_TCG_TPM is not set 531# CONFIG_TCG_TPM is not set
506# CONFIG_TELCLOCK is not set
507 532
508# 533#
509# I2C support 534# I2C support
@@ -519,6 +544,7 @@ CONFIG_GEN_RTC=y
519# 544#
520# Dallas's 1-wire bus 545# Dallas's 1-wire bus
521# 546#
547# CONFIG_W1 is not set
522 548
523# 549#
524# Hardware Monitoring support 550# Hardware Monitoring support
@@ -527,17 +553,14 @@ CONFIG_HWMON=y
527# CONFIG_HWMON_VID is not set 553# CONFIG_HWMON_VID is not set
528# CONFIG_SENSORS_ABITUGURU is not set 554# CONFIG_SENSORS_ABITUGURU is not set
529# CONFIG_SENSORS_F71805F is not set 555# CONFIG_SENSORS_F71805F is not set
556# CONFIG_SENSORS_PC87427 is not set
557# CONFIG_SENSORS_VT1211 is not set
530# CONFIG_HWMON_DEBUG_CHIP is not set 558# CONFIG_HWMON_DEBUG_CHIP is not set
531 559
532# 560#
533# Misc devices
534#
535
536#
537# Multimedia devices 561# Multimedia devices
538# 562#
539# CONFIG_VIDEO_DEV is not set 563# CONFIG_VIDEO_DEV is not set
540CONFIG_VIDEO_V4L2=y
541 564
542# 565#
543# Digital Video Broadcasting Devices 566# Digital Video Broadcasting Devices
@@ -549,6 +572,7 @@ CONFIG_VIDEO_V4L2=y
549# 572#
550CONFIG_FIRMWARE_EDID=y 573CONFIG_FIRMWARE_EDID=y
551# CONFIG_FB is not set 574# CONFIG_FB is not set
575# CONFIG_FB_IBM_GXT4500 is not set
552# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 576# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
553 577
554# 578#
@@ -557,6 +581,11 @@ CONFIG_FIRMWARE_EDID=y
557# CONFIG_SOUND is not set 581# CONFIG_SOUND is not set
558 582
559# 583#
584# HID Devices
585#
586CONFIG_HID=y
587
588#
560# USB support 589# USB support
561# 590#
562# CONFIG_USB_ARCH_HAS_HCD is not set 591# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -617,6 +646,10 @@ CONFIG_FIRMWARE_EDID=y
617# 646#
618 647
619# 648#
649# Virtualization
650#
651
652#
620# File systems 653# File systems
621# 654#
622CONFIG_EXT2_FS=y 655CONFIG_EXT2_FS=y
@@ -626,6 +659,7 @@ CONFIG_EXT3_FS=y
626CONFIG_EXT3_FS_XATTR=y 659CONFIG_EXT3_FS_XATTR=y
627# CONFIG_EXT3_FS_POSIX_ACL is not set 660# CONFIG_EXT3_FS_POSIX_ACL is not set
628# CONFIG_EXT3_FS_SECURITY is not set 661# CONFIG_EXT3_FS_SECURITY is not set
662# CONFIG_EXT4DEV_FS is not set
629CONFIG_JBD=y 663CONFIG_JBD=y
630# CONFIG_JBD_DEBUG is not set 664# CONFIG_JBD_DEBUG is not set
631CONFIG_FS_MBCACHE=y 665CONFIG_FS_MBCACHE=y
@@ -633,6 +667,7 @@ CONFIG_FS_MBCACHE=y
633# CONFIG_JFS_FS is not set 667# CONFIG_JFS_FS is not set
634# CONFIG_FS_POSIX_ACL is not set 668# CONFIG_FS_POSIX_ACL is not set
635# CONFIG_XFS_FS is not set 669# CONFIG_XFS_FS is not set
670# CONFIG_GFS2_FS is not set
636# CONFIG_OCFS2_FS is not set 671# CONFIG_OCFS2_FS is not set
637# CONFIG_MINIX_FS is not set 672# CONFIG_MINIX_FS is not set
638# CONFIG_ROMFS_FS is not set 673# CONFIG_ROMFS_FS is not set
@@ -662,8 +697,10 @@ CONFIG_DNOTIFY=y
662# 697#
663CONFIG_PROC_FS=y 698CONFIG_PROC_FS=y
664CONFIG_PROC_KCORE=y 699CONFIG_PROC_KCORE=y
700CONFIG_PROC_SYSCTL=y
665CONFIG_SYSFS=y 701CONFIG_SYSFS=y
666CONFIG_TMPFS=y 702CONFIG_TMPFS=y
703# CONFIG_TMPFS_POSIX_ACL is not set
667# CONFIG_HUGETLB_PAGE is not set 704# CONFIG_HUGETLB_PAGE is not set
668CONFIG_RAMFS=y 705CONFIG_RAMFS=y
669# CONFIG_CONFIGFS_FS is not set 706# CONFIG_CONFIGFS_FS is not set
@@ -729,13 +766,20 @@ CONFIG_PARTITION_ADVANCED=y
729# CONFIG_NLS is not set 766# CONFIG_NLS is not set
730 767
731# 768#
769# Distributed Lock Manager
770#
771# CONFIG_DLM is not set
772
773#
732# Library routines 774# Library routines
733# 775#
776CONFIG_BITREVERSE=y
734# CONFIG_CRC_CCITT is not set 777# CONFIG_CRC_CCITT is not set
735# CONFIG_CRC16 is not set 778# CONFIG_CRC16 is not set
736CONFIG_CRC32=y 779CONFIG_CRC32=y
737# CONFIG_LIBCRC32C is not set 780# CONFIG_LIBCRC32C is not set
738CONFIG_PLIST=y 781CONFIG_PLIST=y
782CONFIG_IOMAP_COPY=y
739 783
740# 784#
741# Instrumentation Support 785# Instrumentation Support
@@ -746,8 +790,11 @@ CONFIG_PLIST=y
746# Kernel hacking 790# Kernel hacking
747# 791#
748# CONFIG_PRINTK_TIME is not set 792# CONFIG_PRINTK_TIME is not set
793CONFIG_ENABLE_MUST_CHECK=y
749# CONFIG_MAGIC_SYSRQ is not set 794# CONFIG_MAGIC_SYSRQ is not set
750# CONFIG_UNUSED_SYMBOLS is not set 795# CONFIG_UNUSED_SYMBOLS is not set
796# CONFIG_DEBUG_FS is not set
797# CONFIG_HEADERS_CHECK is not set
751CONFIG_DEBUG_KERNEL=y 798CONFIG_DEBUG_KERNEL=y
752CONFIG_LOG_BUF_SHIFT=14 799CONFIG_LOG_BUF_SHIFT=14
753CONFIG_DETECT_SOFTLOCKUP=y 800CONFIG_DETECT_SOFTLOCKUP=y
@@ -761,10 +808,10 @@ CONFIG_DEBUG_MUTEXES=y
761# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 808# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
762# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 809# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
763# CONFIG_DEBUG_KOBJECT is not set 810# CONFIG_DEBUG_KOBJECT is not set
811# CONFIG_DEBUG_BUGVERBOSE is not set
764# CONFIG_DEBUG_INFO is not set 812# CONFIG_DEBUG_INFO is not set
765# CONFIG_DEBUG_FS is not set
766# CONFIG_DEBUG_VM is not set 813# CONFIG_DEBUG_VM is not set
767# CONFIG_UNWIND_INFO is not set 814# CONFIG_DEBUG_LIST is not set
768CONFIG_FORCED_INLINING=y 815CONFIG_FORCED_INLINING=y
769# CONFIG_RCU_TORTURE_TEST is not set 816# CONFIG_RCU_TORTURE_TEST is not set
770# CONFIG_DEBUGGER is not set 817# CONFIG_DEBUGGER is not set
@@ -782,7 +829,3 @@ CONFIG_FORCED_INLINING=y
782# Cryptographic options 829# Cryptographic options
783# 830#
784# CONFIG_CRYPTO is not set 831# CONFIG_CRYPTO is not set
785
786#
787# Hardware crypto devices
788#
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index ddc2a7b07ba0..ecaa267a853c 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_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-rc4 3# Linux kernel version: 2.6.20-rc5
4# Fri Aug 11 16:45:05 2006 4# Mon Jan 22 22:25:53 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22# CONFIG_PPC_UDBG_16550 is not set 23# CONFIG_PPC_UDBG_16550 is not set
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33CONFIG_PPC_85xx=y 35CONFIG_PPC_85xx=y
@@ -38,6 +40,8 @@ CONFIG_PPC_85xx=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_85xx=y 41CONFIG_85xx=y
40CONFIG_E500=y 42CONFIG_E500=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41CONFIG_BOOKE=y 45CONFIG_BOOKE=y
42CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
43# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
@@ -58,16 +62,20 @@ CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 63CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
61# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
64CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y
70CONFIG_EMBEDDED=y 77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
71CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_ALL is not set 80# CONFIG_KALLSYMS_ALL is not set
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -76,12 +84,12 @@ CONFIG_PRINTK=y
76CONFIG_BUG=y 84CONFIG_BUG=y
77CONFIG_ELF_CORE=y 85CONFIG_ELF_CORE=y
78CONFIG_BASE_FULL=y 86CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
80CONFIG_FUTEX=y 87CONFIG_FUTEX=y
81CONFIG_EPOLL=y 88CONFIG_EPOLL=y
82CONFIG_SHMEM=y 89CONFIG_SHMEM=y
83CONFIG_SLAB=y 90CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_RT_MUTEXES=y
85# CONFIG_TINY_SHMEM is not set 93# CONFIG_TINY_SHMEM is not set
86CONFIG_BASE_SMALL=0 94CONFIG_BASE_SMALL=0
87# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -94,6 +102,7 @@ CONFIG_BASE_SMALL=0
94# 102#
95# Block layer 103# Block layer
96# 104#
105CONFIG_BLOCK=y
97# CONFIG_LBD is not set 106# CONFIG_LBD is not set
98# CONFIG_BLK_DEV_IO_TRACE is not set 107# CONFIG_BLK_DEV_IO_TRACE is not set
99# CONFIG_LSF is not set 108# CONFIG_LSF is not set
@@ -110,7 +119,6 @@ CONFIG_DEFAULT_AS=y
110# CONFIG_DEFAULT_CFQ is not set 119# CONFIG_DEFAULT_CFQ is not set
111# CONFIG_DEFAULT_NOOP is not set 120# CONFIG_DEFAULT_NOOP is not set
112CONFIG_DEFAULT_IOSCHED="anticipatory" 121CONFIG_DEFAULT_IOSCHED="anticipatory"
113CONFIG_MPIC=y
114CONFIG_CPM2=y 122CONFIG_CPM2=y
115# CONFIG_WANT_EARLY_SERIAL is not set 123# CONFIG_WANT_EARLY_SERIAL is not set
116 124
@@ -122,6 +130,7 @@ CONFIG_MPC8560_ADS=y
122# CONFIG_MPC85xx_CDS is not set 130# CONFIG_MPC85xx_CDS is not set
123CONFIG_MPC8560=y 131CONFIG_MPC8560=y
124CONFIG_PPC_INDIRECT_PCI_BE=y 132CONFIG_PPC_INDIRECT_PCI_BE=y
133CONFIG_MPIC=y
125 134
126# 135#
127# Kernel options 136# Kernel options
@@ -129,6 +138,7 @@ CONFIG_PPC_INDIRECT_PCI_BE=y
129# CONFIG_HIGHMEM is not set 138# CONFIG_HIGHMEM is not set
130# CONFIG_HZ_100 is not set 139# CONFIG_HZ_100 is not set
131CONFIG_HZ_250=y 140CONFIG_HZ_250=y
141# CONFIG_HZ_300 is not set
132# CONFIG_HZ_1000 is not set 142# CONFIG_HZ_1000 is not set
133CONFIG_HZ=250 143CONFIG_HZ=250
134CONFIG_PREEMPT_NONE=y 144CONFIG_PREEMPT_NONE=y
@@ -140,6 +150,7 @@ CONFIG_BINFMT_MISC=y
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 150CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
141# CONFIG_PC_KEYBOARD is not set 151# CONFIG_PC_KEYBOARD is not set
142CONFIG_ARCH_FLATMEM_ENABLE=y 152CONFIG_ARCH_FLATMEM_ENABLE=y
153CONFIG_ARCH_POPULATES_NODE_MAP=y
143CONFIG_SELECT_MEMORY_MODEL=y 154CONFIG_SELECT_MEMORY_MODEL=y
144CONFIG_FLATMEM_MANUAL=y 155CONFIG_FLATMEM_MANUAL=y
145# CONFIG_DISCONTIGMEM_MANUAL is not set 156# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -152,13 +163,13 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
152# CONFIG_PROC_DEVICETREE is not set 163# CONFIG_PROC_DEVICETREE is not set
153# CONFIG_CMDLINE_BOOL is not set 164# CONFIG_CMDLINE_BOOL is not set
154# CONFIG_PM is not set 165# CONFIG_PM is not set
155# CONFIG_SOFTWARE_SUSPEND is not set
156# CONFIG_SECCOMP is not set 166# CONFIG_SECCOMP is not set
157CONFIG_ISA_DMA_API=y 167CONFIG_ISA_DMA_API=y
158 168
159# 169#
160# Bus options 170# Bus options
161# 171#
172# CONFIG_MPIC_WEIRD is not set
162# CONFIG_PPC_I8259 is not set 173# CONFIG_PPC_I8259 is not set
163CONFIG_PPC_INDIRECT_PCI=y 174CONFIG_PPC_INDIRECT_PCI=y
164CONFIG_FSL_SOC=y 175CONFIG_FSL_SOC=y
@@ -205,6 +216,7 @@ CONFIG_PACKET=y
205CONFIG_UNIX=y 216CONFIG_UNIX=y
206CONFIG_XFRM=y 217CONFIG_XFRM=y
207# CONFIG_XFRM_USER is not set 218# CONFIG_XFRM_USER is not set
219# CONFIG_XFRM_SUB_POLICY is not set
208# CONFIG_NET_KEY is not set 220# CONFIG_NET_KEY is not set
209CONFIG_INET=y 221CONFIG_INET=y
210CONFIG_IP_MULTICAST=y 222CONFIG_IP_MULTICAST=y
@@ -226,10 +238,13 @@ CONFIG_SYN_COOKIES=y
226# CONFIG_INET_TUNNEL is not set 238# CONFIG_INET_TUNNEL is not set
227CONFIG_INET_XFRM_MODE_TRANSPORT=y 239CONFIG_INET_XFRM_MODE_TRANSPORT=y
228CONFIG_INET_XFRM_MODE_TUNNEL=y 240CONFIG_INET_XFRM_MODE_TUNNEL=y
241CONFIG_INET_XFRM_MODE_BEET=y
229CONFIG_INET_DIAG=y 242CONFIG_INET_DIAG=y
230CONFIG_INET_TCP_DIAG=y 243CONFIG_INET_TCP_DIAG=y
231# CONFIG_TCP_CONG_ADVANCED is not set 244# CONFIG_TCP_CONG_ADVANCED is not set
232CONFIG_TCP_CONG_BIC=y 245CONFIG_TCP_CONG_CUBIC=y
246CONFIG_DEFAULT_TCP_CONG="cubic"
247# CONFIG_TCP_MD5SIG is not set
233# CONFIG_IPV6 is not set 248# CONFIG_IPV6 is not set
234# CONFIG_INET6_XFRM_TUNNEL is not set 249# CONFIG_INET6_XFRM_TUNNEL is not set
235# CONFIG_INET6_TUNNEL is not set 250# CONFIG_INET6_TUNNEL is not set
@@ -259,7 +274,6 @@ CONFIG_TCP_CONG_BIC=y
259# CONFIG_ATALK is not set 274# CONFIG_ATALK is not set
260# CONFIG_X25 is not set 275# CONFIG_X25 is not set
261# CONFIG_LAPB is not set 276# CONFIG_LAPB is not set
262# CONFIG_NET_DIVERT is not set
263# CONFIG_ECONET is not set 277# CONFIG_ECONET is not set
264# CONFIG_WAN_ROUTER is not set 278# CONFIG_WAN_ROUTER is not set
265 279
@@ -331,6 +345,12 @@ CONFIG_BLK_DEV_INITRD=y
331# CONFIG_ATA_OVER_ETH is not set 345# CONFIG_ATA_OVER_ETH is not set
332 346
333# 347#
348# Misc devices
349#
350# CONFIG_SGI_IOC4 is not set
351# CONFIG_TIFM_CORE is not set
352
353#
334# ATA/ATAPI/MFM/RLL support 354# ATA/ATAPI/MFM/RLL support
335# 355#
336# CONFIG_IDE is not set 356# CONFIG_IDE is not set
@@ -340,6 +360,12 @@ CONFIG_BLK_DEV_INITRD=y
340# 360#
341# CONFIG_RAID_ATTRS is not set 361# CONFIG_RAID_ATTRS is not set
342# CONFIG_SCSI is not set 362# CONFIG_SCSI is not set
363# CONFIG_SCSI_NETLINK is not set
364
365#
366# Serial ATA (prod) and Parallel ATA (experimental) drivers
367#
368# CONFIG_ATA is not set
343 369
344# 370#
345# Multi-device support (RAID and LVM) 371# Multi-device support (RAID and LVM)
@@ -364,6 +390,7 @@ CONFIG_BLK_DEV_INITRD=y
364# 390#
365# Macintosh device drivers 391# Macintosh device drivers
366# 392#
393# CONFIG_MAC_EMUMOUSEBTN is not set
367# CONFIG_WINDFARM is not set 394# CONFIG_WINDFARM is not set
368 395
369# 396#
@@ -395,6 +422,7 @@ CONFIG_DAVICOM_PHY=y
395# CONFIG_CICADA_PHY is not set 422# CONFIG_CICADA_PHY is not set
396# CONFIG_VITESSE_PHY is not set 423# CONFIG_VITESSE_PHY is not set
397# CONFIG_SMSC_PHY is not set 424# CONFIG_SMSC_PHY is not set
425# CONFIG_BROADCOM_PHY is not set
398# CONFIG_FIXED_PHY is not set 426# CONFIG_FIXED_PHY is not set
399 427
400# 428#
@@ -437,6 +465,7 @@ CONFIG_E1000_NAPI=y
437# CONFIG_BNX2 is not set 465# CONFIG_BNX2 is not set
438CONFIG_GIANFAR=y 466CONFIG_GIANFAR=y
439CONFIG_GFAR_NAPI=y 467CONFIG_GFAR_NAPI=y
468# CONFIG_QLA3XXX is not set
440 469
441# 470#
442# Ethernet (10000 Mbit) 471# Ethernet (10000 Mbit)
@@ -445,6 +474,7 @@ CONFIG_GFAR_NAPI=y
445# CONFIG_IXGB is not set 474# CONFIG_IXGB is not set
446# CONFIG_S2IO is not set 475# CONFIG_S2IO is not set
447# CONFIG_MYRI10GE is not set 476# CONFIG_MYRI10GE is not set
477# CONFIG_NETXEN_NIC is not set
448 478
449# 479#
450# Token Ring devices 480# Token Ring devices
@@ -483,6 +513,7 @@ CONFIG_GFAR_NAPI=y
483# Input device support 513# Input device support
484# 514#
485CONFIG_INPUT=y 515CONFIG_INPUT=y
516# CONFIG_INPUT_FF_MEMLESS is not set
486 517
487# 518#
488# Userland interfaces 519# Userland interfaces
@@ -522,6 +553,7 @@ CONFIG_INPUT=y
522# 553#
523# Non-8250 serial port support 554# Non-8250 serial port support
524# 555#
556# CONFIG_SERIAL_UARTLITE is not set
525CONFIG_SERIAL_CORE=y 557CONFIG_SERIAL_CORE=y
526CONFIG_SERIAL_CORE_CONSOLE=y 558CONFIG_SERIAL_CORE_CONSOLE=y
527CONFIG_SERIAL_CPM=y 559CONFIG_SERIAL_CPM=y
@@ -536,7 +568,6 @@ CONFIG_SERIAL_CPM_SCC2=y
536CONFIG_UNIX98_PTYS=y 568CONFIG_UNIX98_PTYS=y
537CONFIG_LEGACY_PTYS=y 569CONFIG_LEGACY_PTYS=y
538CONFIG_LEGACY_PTY_COUNT=256 570CONFIG_LEGACY_PTY_COUNT=256
539# CONFIG_BRIQ_PANEL is not set
540 571
541# 572#
542# IPMI 573# IPMI
@@ -554,10 +585,6 @@ CONFIG_GEN_RTC=y
554# CONFIG_DTLK is not set 585# CONFIG_DTLK is not set
555# CONFIG_R3964 is not set 586# CONFIG_R3964 is not set
556# CONFIG_APPLICOM is not set 587# CONFIG_APPLICOM is not set
557
558#
559# Ftape, the floppy tape device driver
560#
561# CONFIG_AGP is not set 588# CONFIG_AGP is not set
562# CONFIG_DRM is not set 589# CONFIG_DRM is not set
563# CONFIG_RAW_DRIVER is not set 590# CONFIG_RAW_DRIVER is not set
@@ -566,7 +593,6 @@ CONFIG_GEN_RTC=y
566# TPM devices 593# TPM devices
567# 594#
568# CONFIG_TCG_TPM is not set 595# CONFIG_TCG_TPM is not set
569# CONFIG_TELCLOCK is not set
570 596
571# 597#
572# I2C support 598# I2C support
@@ -582,6 +608,7 @@ CONFIG_GEN_RTC=y
582# 608#
583# Dallas's 1-wire bus 609# Dallas's 1-wire bus
584# 610#
611# CONFIG_W1 is not set
585 612
586# 613#
587# Hardware Monitoring support 614# Hardware Monitoring support
@@ -590,17 +617,14 @@ CONFIG_HWMON=y
590# CONFIG_HWMON_VID is not set 617# CONFIG_HWMON_VID is not set
591# CONFIG_SENSORS_ABITUGURU is not set 618# CONFIG_SENSORS_ABITUGURU is not set
592# CONFIG_SENSORS_F71805F is not set 619# CONFIG_SENSORS_F71805F is not set
620# CONFIG_SENSORS_PC87427 is not set
621# CONFIG_SENSORS_VT1211 is not set
593# CONFIG_HWMON_DEBUG_CHIP is not set 622# CONFIG_HWMON_DEBUG_CHIP is not set
594 623
595# 624#
596# Misc devices
597#
598
599#
600# Multimedia devices 625# Multimedia devices
601# 626#
602# CONFIG_VIDEO_DEV is not set 627# CONFIG_VIDEO_DEV is not set
603CONFIG_VIDEO_V4L2=y
604 628
605# 629#
606# Digital Video Broadcasting Devices 630# Digital Video Broadcasting Devices
@@ -612,6 +636,7 @@ CONFIG_VIDEO_V4L2=y
612# 636#
613CONFIG_FIRMWARE_EDID=y 637CONFIG_FIRMWARE_EDID=y
614# CONFIG_FB is not set 638# CONFIG_FB is not set
639# CONFIG_FB_IBM_GXT4500 is not set
615# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 640# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
616 641
617# 642#
@@ -620,6 +645,11 @@ CONFIG_FIRMWARE_EDID=y
620# CONFIG_SOUND is not set 645# CONFIG_SOUND is not set
621 646
622# 647#
648# HID Devices
649#
650CONFIG_HID=y
651
652#
623# USB support 653# USB support
624# 654#
625CONFIG_USB_ARCH_HAS_HCD=y 655CONFIG_USB_ARCH_HAS_HCD=y
@@ -682,6 +712,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
682# 712#
683 713
684# 714#
715# Virtualization
716#
717
718#
685# File systems 719# File systems
686# 720#
687CONFIG_EXT2_FS=y 721CONFIG_EXT2_FS=y
@@ -691,6 +725,7 @@ CONFIG_EXT3_FS=y
691CONFIG_EXT3_FS_XATTR=y 725CONFIG_EXT3_FS_XATTR=y
692# CONFIG_EXT3_FS_POSIX_ACL is not set 726# CONFIG_EXT3_FS_POSIX_ACL is not set
693# CONFIG_EXT3_FS_SECURITY is not set 727# CONFIG_EXT3_FS_SECURITY is not set
728# CONFIG_EXT4DEV_FS is not set
694CONFIG_JBD=y 729CONFIG_JBD=y
695# CONFIG_JBD_DEBUG is not set 730# CONFIG_JBD_DEBUG is not set
696CONFIG_FS_MBCACHE=y 731CONFIG_FS_MBCACHE=y
@@ -698,6 +733,7 @@ CONFIG_FS_MBCACHE=y
698# CONFIG_JFS_FS is not set 733# CONFIG_JFS_FS is not set
699# CONFIG_FS_POSIX_ACL is not set 734# CONFIG_FS_POSIX_ACL is not set
700# CONFIG_XFS_FS is not set 735# CONFIG_XFS_FS is not set
736# CONFIG_GFS2_FS is not set
701# CONFIG_OCFS2_FS is not set 737# CONFIG_OCFS2_FS is not set
702# CONFIG_MINIX_FS is not set 738# CONFIG_MINIX_FS is not set
703# CONFIG_ROMFS_FS is not set 739# CONFIG_ROMFS_FS is not set
@@ -727,8 +763,10 @@ CONFIG_DNOTIFY=y
727# 763#
728CONFIG_PROC_FS=y 764CONFIG_PROC_FS=y
729CONFIG_PROC_KCORE=y 765CONFIG_PROC_KCORE=y
766CONFIG_PROC_SYSCTL=y
730CONFIG_SYSFS=y 767CONFIG_SYSFS=y
731CONFIG_TMPFS=y 768CONFIG_TMPFS=y
769# CONFIG_TMPFS_POSIX_ACL is not set
732# CONFIG_HUGETLB_PAGE is not set 770# CONFIG_HUGETLB_PAGE is not set
733CONFIG_RAMFS=y 771CONFIG_RAMFS=y
734# CONFIG_CONFIGFS_FS is not set 772# CONFIG_CONFIGFS_FS is not set
@@ -794,13 +832,20 @@ CONFIG_PARTITION_ADVANCED=y
794# CONFIG_NLS is not set 832# CONFIG_NLS is not set
795 833
796# 834#
835# Distributed Lock Manager
836#
837# CONFIG_DLM is not set
838
839#
797# Library routines 840# Library routines
798# 841#
842CONFIG_BITREVERSE=y
799# CONFIG_CRC_CCITT is not set 843# CONFIG_CRC_CCITT is not set
800# CONFIG_CRC16 is not set 844# CONFIG_CRC16 is not set
801CONFIG_CRC32=y 845CONFIG_CRC32=y
802# CONFIG_LIBCRC32C is not set 846# CONFIG_LIBCRC32C is not set
803CONFIG_PLIST=y 847CONFIG_PLIST=y
848CONFIG_IOMAP_COPY=y
804 849
805# 850#
806# Instrumentation Support 851# Instrumentation Support
@@ -811,8 +856,11 @@ CONFIG_PLIST=y
811# Kernel hacking 856# Kernel hacking
812# 857#
813# CONFIG_PRINTK_TIME is not set 858# CONFIG_PRINTK_TIME is not set
859CONFIG_ENABLE_MUST_CHECK=y
814# CONFIG_MAGIC_SYSRQ is not set 860# CONFIG_MAGIC_SYSRQ is not set
815# CONFIG_UNUSED_SYMBOLS is not set 861# CONFIG_UNUSED_SYMBOLS is not set
862# CONFIG_DEBUG_FS is not set
863# CONFIG_HEADERS_CHECK is not set
816CONFIG_DEBUG_KERNEL=y 864CONFIG_DEBUG_KERNEL=y
817CONFIG_LOG_BUF_SHIFT=14 865CONFIG_LOG_BUF_SHIFT=14
818CONFIG_DETECT_SOFTLOCKUP=y 866CONFIG_DETECT_SOFTLOCKUP=y
@@ -826,10 +874,10 @@ CONFIG_DEBUG_MUTEXES=y
826# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 874# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
827# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 875# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
828# CONFIG_DEBUG_KOBJECT is not set 876# CONFIG_DEBUG_KOBJECT is not set
877# CONFIG_DEBUG_BUGVERBOSE is not set
829# CONFIG_DEBUG_INFO is not set 878# CONFIG_DEBUG_INFO is not set
830# CONFIG_DEBUG_FS is not set
831# CONFIG_DEBUG_VM is not set 879# CONFIG_DEBUG_VM is not set
832# CONFIG_UNWIND_INFO is not set 880# CONFIG_DEBUG_LIST is not set
833CONFIG_FORCED_INLINING=y 881CONFIG_FORCED_INLINING=y
834# CONFIG_RCU_TORTURE_TEST is not set 882# CONFIG_RCU_TORTURE_TEST is not set
835# CONFIG_DEBUGGER is not set 883# CONFIG_DEBUGGER is not set
@@ -848,7 +896,3 @@ CONFIG_FORCED_INLINING=y
848# Cryptographic options 896# Cryptographic options
849# 897#
850# CONFIG_CRYPTO is not set 898# CONFIG_CRYPTO is not set
851
852#
853# Hardware crypto devices
854#
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index 72edf9f66829..1f61bce33e32 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:29:49 2006 4# Mon Jan 22 22:26:46 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24CONFIG_DEFAULT_UIMAGE=y 27CONFIG_DEFAULT_UIMAGE=y
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33CONFIG_PPC_85xx=y 35CONFIG_PPC_85xx=y
@@ -38,6 +40,8 @@ CONFIG_PPC_85xx=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_85xx=y 41CONFIG_85xx=y
40CONFIG_E500=y 42CONFIG_E500=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41CONFIG_BOOKE=y 45CONFIG_BOOKE=y
42CONFIG_FSL_BOOKE=y 46CONFIG_FSL_BOOKE=y
43# CONFIG_PHYS_64BIT is not set 47# CONFIG_PHYS_64BIT is not set
@@ -58,16 +62,20 @@ CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 62CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 63CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
61# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
64CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
72CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 74CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y
70CONFIG_EMBEDDED=y 77CONFIG_EMBEDDED=y
78CONFIG_SYSCTL_SYSCALL=y
71CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_ALL is not set 80# CONFIG_KALLSYMS_ALL is not set
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -76,12 +84,12 @@ CONFIG_PRINTK=y
76CONFIG_BUG=y 84CONFIG_BUG=y
77CONFIG_ELF_CORE=y 85CONFIG_ELF_CORE=y
78CONFIG_BASE_FULL=y 86CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
80CONFIG_FUTEX=y 87CONFIG_FUTEX=y
81CONFIG_EPOLL=y 88CONFIG_EPOLL=y
82CONFIG_SHMEM=y 89CONFIG_SHMEM=y
83CONFIG_SLAB=y 90CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_RT_MUTEXES=y
85# CONFIG_TINY_SHMEM is not set 93# CONFIG_TINY_SHMEM is not set
86CONFIG_BASE_SMALL=0 94CONFIG_BASE_SMALL=0
87# CONFIG_SLOB is not set 95# CONFIG_SLOB is not set
@@ -94,6 +102,7 @@ CONFIG_BASE_SMALL=0
94# 102#
95# Block layer 103# Block layer
96# 104#
105CONFIG_BLOCK=y
97# CONFIG_LBD is not set 106# CONFIG_LBD is not set
98# CONFIG_BLK_DEV_IO_TRACE is not set 107# CONFIG_BLK_DEV_IO_TRACE is not set
99# CONFIG_LSF is not set 108# CONFIG_LSF is not set
@@ -116,6 +125,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
116# Platform support 125# Platform support
117# 126#
118# CONFIG_MPC8540_ADS is not set 127# CONFIG_MPC8540_ADS is not set
128# CONFIG_MPC8560_ADS is not set
119CONFIG_MPC85xx_CDS=y 129CONFIG_MPC85xx_CDS=y
120CONFIG_MPC8540=y 130CONFIG_MPC8540=y
121CONFIG_PPC_INDIRECT_PCI_BE=y 131CONFIG_PPC_INDIRECT_PCI_BE=y
@@ -127,6 +137,7 @@ CONFIG_MPIC=y
127# CONFIG_HIGHMEM is not set 137# CONFIG_HIGHMEM is not set
128# CONFIG_HZ_100 is not set 138# CONFIG_HZ_100 is not set
129CONFIG_HZ_250=y 139CONFIG_HZ_250=y
140# CONFIG_HZ_300 is not set
130# CONFIG_HZ_1000 is not set 141# CONFIG_HZ_1000 is not set
131CONFIG_HZ=250 142CONFIG_HZ=250
132CONFIG_PREEMPT_NONE=y 143CONFIG_PREEMPT_NONE=y
@@ -137,6 +148,7 @@ CONFIG_BINFMT_MISC=y
137CONFIG_MATH_EMULATION=y 148CONFIG_MATH_EMULATION=y
138CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 149CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
139CONFIG_ARCH_FLATMEM_ENABLE=y 150CONFIG_ARCH_FLATMEM_ENABLE=y
151CONFIG_ARCH_POPULATES_NODE_MAP=y
140CONFIG_SELECT_MEMORY_MODEL=y 152CONFIG_SELECT_MEMORY_MODEL=y
141CONFIG_FLATMEM_MANUAL=y 153CONFIG_FLATMEM_MANUAL=y
142# CONFIG_DISCONTIGMEM_MANUAL is not set 154# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -202,6 +214,7 @@ CONFIG_PACKET=y
202CONFIG_UNIX=y 214CONFIG_UNIX=y
203CONFIG_XFRM=y 215CONFIG_XFRM=y
204CONFIG_XFRM_USER=y 216CONFIG_XFRM_USER=y
217# CONFIG_XFRM_SUB_POLICY is not set
205# CONFIG_NET_KEY is not set 218# CONFIG_NET_KEY is not set
206CONFIG_INET=y 219CONFIG_INET=y
207CONFIG_IP_MULTICAST=y 220CONFIG_IP_MULTICAST=y
@@ -223,10 +236,13 @@ CONFIG_SYN_COOKIES=y
223# CONFIG_INET_TUNNEL is not set 236# CONFIG_INET_TUNNEL is not set
224CONFIG_INET_XFRM_MODE_TRANSPORT=y 237CONFIG_INET_XFRM_MODE_TRANSPORT=y
225CONFIG_INET_XFRM_MODE_TUNNEL=y 238CONFIG_INET_XFRM_MODE_TUNNEL=y
239CONFIG_INET_XFRM_MODE_BEET=y
226CONFIG_INET_DIAG=y 240CONFIG_INET_DIAG=y
227CONFIG_INET_TCP_DIAG=y 241CONFIG_INET_TCP_DIAG=y
228# CONFIG_TCP_CONG_ADVANCED is not set 242# CONFIG_TCP_CONG_ADVANCED is not set
229CONFIG_TCP_CONG_BIC=y 243CONFIG_TCP_CONG_CUBIC=y
244CONFIG_DEFAULT_TCP_CONG="cubic"
245# CONFIG_TCP_MD5SIG is not set
230# CONFIG_IPV6 is not set 246# CONFIG_IPV6 is not set
231# CONFIG_INET6_XFRM_TUNNEL is not set 247# CONFIG_INET6_XFRM_TUNNEL is not set
232# CONFIG_INET6_TUNNEL is not set 248# CONFIG_INET6_TUNNEL is not set
@@ -256,7 +272,6 @@ CONFIG_TCP_CONG_BIC=y
256# CONFIG_ATALK is not set 272# CONFIG_ATALK is not set
257# CONFIG_X25 is not set 273# CONFIG_X25 is not set
258# CONFIG_LAPB is not set 274# CONFIG_LAPB is not set
259# CONFIG_NET_DIVERT is not set
260# CONFIG_ECONET is not set 275# CONFIG_ECONET is not set
261# CONFIG_WAN_ROUTER is not set 276# CONFIG_WAN_ROUTER is not set
262 277
@@ -328,9 +343,16 @@ CONFIG_BLK_DEV_INITRD=y
328# CONFIG_ATA_OVER_ETH is not set 343# CONFIG_ATA_OVER_ETH is not set
329 344
330# 345#
346# Misc devices
347#
348# CONFIG_SGI_IOC4 is not set
349# CONFIG_TIFM_CORE is not set
350
351#
331# ATA/ATAPI/MFM/RLL support 352# ATA/ATAPI/MFM/RLL support
332# 353#
333CONFIG_IDE=y 354CONFIG_IDE=y
355CONFIG_IDE_MAX_HWIFS=4
334CONFIG_BLK_DEV_IDE=y 356CONFIG_BLK_DEV_IDE=y
335 357
336# 358#
@@ -353,7 +375,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
353# CONFIG_BLK_DEV_OFFBOARD is not set 375# CONFIG_BLK_DEV_OFFBOARD is not set
354CONFIG_BLK_DEV_GENERIC=y 376CONFIG_BLK_DEV_GENERIC=y
355# CONFIG_BLK_DEV_OPTI621 is not set 377# CONFIG_BLK_DEV_OPTI621 is not set
356# CONFIG_BLK_DEV_SL82C105 is not set
357CONFIG_BLK_DEV_IDEDMA_PCI=y 378CONFIG_BLK_DEV_IDEDMA_PCI=y
358# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 379# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
359# CONFIG_IDEDMA_PCI_AUTO is not set 380# CONFIG_IDEDMA_PCI_AUTO is not set
@@ -367,6 +388,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
367# CONFIG_BLK_DEV_CS5530 is not set 388# CONFIG_BLK_DEV_CS5530 is not set
368# CONFIG_BLK_DEV_HPT34X is not set 389# CONFIG_BLK_DEV_HPT34X is not set
369# CONFIG_BLK_DEV_HPT366 is not set 390# CONFIG_BLK_DEV_HPT366 is not set
391# CONFIG_BLK_DEV_JMICRON is not set
370# CONFIG_BLK_DEV_SC1200 is not set 392# CONFIG_BLK_DEV_SC1200 is not set
371# CONFIG_BLK_DEV_PIIX is not set 393# CONFIG_BLK_DEV_PIIX is not set
372# CONFIG_BLK_DEV_IT821X is not set 394# CONFIG_BLK_DEV_IT821X is not set
@@ -375,6 +397,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
375# CONFIG_BLK_DEV_PDC202XX_NEW is not set 397# CONFIG_BLK_DEV_PDC202XX_NEW is not set
376# CONFIG_BLK_DEV_SVWKS is not set 398# CONFIG_BLK_DEV_SVWKS is not set
377# CONFIG_BLK_DEV_SIIMAGE is not set 399# CONFIG_BLK_DEV_SIIMAGE is not set
400# CONFIG_BLK_DEV_SL82C105 is not set
378# CONFIG_BLK_DEV_SLC90E66 is not set 401# CONFIG_BLK_DEV_SLC90E66 is not set
379# CONFIG_BLK_DEV_TRM290 is not set 402# CONFIG_BLK_DEV_TRM290 is not set
380CONFIG_BLK_DEV_VIA82CXXX=y 403CONFIG_BLK_DEV_VIA82CXXX=y
@@ -389,6 +412,12 @@ CONFIG_BLK_DEV_IDEDMA=y
389# 412#
390# CONFIG_RAID_ATTRS is not set 413# CONFIG_RAID_ATTRS is not set
391# CONFIG_SCSI is not set 414# CONFIG_SCSI is not set
415# CONFIG_SCSI_NETLINK is not set
416
417#
418# Serial ATA (prod) and Parallel ATA (experimental) drivers
419#
420# CONFIG_ATA is not set
392 421
393# 422#
394# Multi-device support (RAID and LVM) 423# Multi-device support (RAID and LVM)
@@ -413,6 +442,7 @@ CONFIG_BLK_DEV_IDEDMA=y
413# 442#
414# Macintosh device drivers 443# Macintosh device drivers
415# 444#
445# CONFIG_MAC_EMUMOUSEBTN is not set
416# CONFIG_WINDFARM is not set 446# CONFIG_WINDFARM is not set
417 447
418# 448#
@@ -444,6 +474,7 @@ CONFIG_PHYLIB=y
444# CONFIG_CICADA_PHY is not set 474# CONFIG_CICADA_PHY is not set
445# CONFIG_VITESSE_PHY is not set 475# CONFIG_VITESSE_PHY is not set
446# CONFIG_SMSC_PHY is not set 476# CONFIG_SMSC_PHY is not set
477# CONFIG_BROADCOM_PHY is not set
447# CONFIG_FIXED_PHY is not set 478# CONFIG_FIXED_PHY is not set
448 479
449# 480#
@@ -483,6 +514,7 @@ CONFIG_E1000_NAPI=y
483# CONFIG_BNX2 is not set 514# CONFIG_BNX2 is not set
484CONFIG_GIANFAR=y 515CONFIG_GIANFAR=y
485CONFIG_GFAR_NAPI=y 516CONFIG_GFAR_NAPI=y
517# CONFIG_QLA3XXX is not set
486 518
487# 519#
488# Ethernet (10000 Mbit) 520# Ethernet (10000 Mbit)
@@ -491,6 +523,7 @@ CONFIG_GFAR_NAPI=y
491# CONFIG_IXGB is not set 523# CONFIG_IXGB is not set
492# CONFIG_S2IO is not set 524# CONFIG_S2IO is not set
493# CONFIG_MYRI10GE is not set 525# CONFIG_MYRI10GE is not set
526# CONFIG_NETXEN_NIC is not set
494 527
495# 528#
496# Token Ring devices 529# Token Ring devices
@@ -529,6 +562,7 @@ CONFIG_GFAR_NAPI=y
529# Input device support 562# Input device support
530# 563#
531CONFIG_INPUT=y 564CONFIG_INPUT=y
565# CONFIG_INPUT_FF_MEMLESS is not set
532 566
533# 567#
534# Userland interfaces 568# Userland interfaces
@@ -573,6 +607,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
573# 607#
574# Non-8250 serial port support 608# Non-8250 serial port support
575# 609#
610# CONFIG_SERIAL_UARTLITE is not set
576CONFIG_SERIAL_CORE=y 611CONFIG_SERIAL_CORE=y
577CONFIG_SERIAL_CORE_CONSOLE=y 612CONFIG_SERIAL_CORE_CONSOLE=y
578# CONFIG_SERIAL_JSM is not set 613# CONFIG_SERIAL_JSM is not set
@@ -596,10 +631,6 @@ CONFIG_GEN_RTC=y
596# CONFIG_DTLK is not set 631# CONFIG_DTLK is not set
597# CONFIG_R3964 is not set 632# CONFIG_R3964 is not set
598# CONFIG_APPLICOM is not set 633# CONFIG_APPLICOM is not set
599
600#
601# Ftape, the floppy tape device driver
602#
603# CONFIG_AGP is not set 634# CONFIG_AGP is not set
604# CONFIG_DRM is not set 635# CONFIG_DRM is not set
605# CONFIG_RAW_DRIVER is not set 636# CONFIG_RAW_DRIVER is not set
@@ -608,7 +639,6 @@ CONFIG_GEN_RTC=y
608# TPM devices 639# TPM devices
609# 640#
610# CONFIG_TCG_TPM is not set 641# CONFIG_TCG_TPM is not set
611# CONFIG_TELCLOCK is not set
612 642
613# 643#
614# I2C support 644# I2C support
@@ -624,6 +654,7 @@ CONFIG_GEN_RTC=y
624# 654#
625# Dallas's 1-wire bus 655# Dallas's 1-wire bus
626# 656#
657# CONFIG_W1 is not set
627 658
628# 659#
629# Hardware Monitoring support 660# Hardware Monitoring support
@@ -632,17 +663,14 @@ CONFIG_HWMON=y
632# CONFIG_HWMON_VID is not set 663# CONFIG_HWMON_VID is not set
633# CONFIG_SENSORS_ABITUGURU is not set 664# CONFIG_SENSORS_ABITUGURU is not set
634# CONFIG_SENSORS_F71805F is not set 665# CONFIG_SENSORS_F71805F is not set
666# CONFIG_SENSORS_PC87427 is not set
667# CONFIG_SENSORS_VT1211 is not set
635# CONFIG_HWMON_DEBUG_CHIP is not set 668# CONFIG_HWMON_DEBUG_CHIP is not set
636 669
637# 670#
638# Misc devices
639#
640
641#
642# Multimedia devices 671# Multimedia devices
643# 672#
644# CONFIG_VIDEO_DEV is not set 673# CONFIG_VIDEO_DEV is not set
645CONFIG_VIDEO_V4L2=y
646 674
647# 675#
648# Digital Video Broadcasting Devices 676# Digital Video Broadcasting Devices
@@ -654,6 +682,7 @@ CONFIG_VIDEO_V4L2=y
654# 682#
655CONFIG_FIRMWARE_EDID=y 683CONFIG_FIRMWARE_EDID=y
656# CONFIG_FB is not set 684# CONFIG_FB is not set
685# CONFIG_FB_IBM_GXT4500 is not set
657# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 686# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
658 687
659# 688#
@@ -662,6 +691,11 @@ CONFIG_FIRMWARE_EDID=y
662# CONFIG_SOUND is not set 691# CONFIG_SOUND is not set
663 692
664# 693#
694# HID Devices
695#
696CONFIG_HID=y
697
698#
665# USB support 699# USB support
666# 700#
667CONFIG_USB_ARCH_HAS_HCD=y 701CONFIG_USB_ARCH_HAS_HCD=y
@@ -724,6 +758,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
724# 758#
725 759
726# 760#
761# Virtualization
762#
763
764#
727# File systems 765# File systems
728# 766#
729CONFIG_EXT2_FS=y 767CONFIG_EXT2_FS=y
@@ -733,6 +771,7 @@ CONFIG_EXT3_FS=y
733CONFIG_EXT3_FS_XATTR=y 771CONFIG_EXT3_FS_XATTR=y
734# CONFIG_EXT3_FS_POSIX_ACL is not set 772# CONFIG_EXT3_FS_POSIX_ACL is not set
735# CONFIG_EXT3_FS_SECURITY is not set 773# CONFIG_EXT3_FS_SECURITY is not set
774# CONFIG_EXT4DEV_FS is not set
736CONFIG_JBD=y 775CONFIG_JBD=y
737# CONFIG_JBD_DEBUG is not set 776# CONFIG_JBD_DEBUG is not set
738CONFIG_FS_MBCACHE=y 777CONFIG_FS_MBCACHE=y
@@ -740,6 +779,7 @@ CONFIG_FS_MBCACHE=y
740# CONFIG_JFS_FS is not set 779# CONFIG_JFS_FS is not set
741# CONFIG_FS_POSIX_ACL is not set 780# CONFIG_FS_POSIX_ACL is not set
742# CONFIG_XFS_FS is not set 781# CONFIG_XFS_FS is not set
782# CONFIG_GFS2_FS is not set
743# CONFIG_OCFS2_FS is not set 783# CONFIG_OCFS2_FS is not set
744# CONFIG_MINIX_FS is not set 784# CONFIG_MINIX_FS is not set
745# CONFIG_ROMFS_FS is not set 785# CONFIG_ROMFS_FS is not set
@@ -769,8 +809,10 @@ CONFIG_DNOTIFY=y
769# 809#
770CONFIG_PROC_FS=y 810CONFIG_PROC_FS=y
771CONFIG_PROC_KCORE=y 811CONFIG_PROC_KCORE=y
812CONFIG_PROC_SYSCTL=y
772CONFIG_SYSFS=y 813CONFIG_SYSFS=y
773CONFIG_TMPFS=y 814CONFIG_TMPFS=y
815# CONFIG_TMPFS_POSIX_ACL is not set
774# CONFIG_HUGETLB_PAGE is not set 816# CONFIG_HUGETLB_PAGE is not set
775CONFIG_RAMFS=y 817CONFIG_RAMFS=y
776# CONFIG_CONFIGFS_FS is not set 818# CONFIG_CONFIGFS_FS is not set
@@ -836,13 +878,20 @@ CONFIG_PARTITION_ADVANCED=y
836# CONFIG_NLS is not set 878# CONFIG_NLS is not set
837 879
838# 880#
881# Distributed Lock Manager
882#
883# CONFIG_DLM is not set
884
885#
839# Library routines 886# Library routines
840# 887#
888CONFIG_BITREVERSE=y
841# CONFIG_CRC_CCITT is not set 889# CONFIG_CRC_CCITT is not set
842# CONFIG_CRC16 is not set 890# CONFIG_CRC16 is not set
843CONFIG_CRC32=y 891CONFIG_CRC32=y
844# CONFIG_LIBCRC32C is not set 892# CONFIG_LIBCRC32C is not set
845CONFIG_PLIST=y 893CONFIG_PLIST=y
894CONFIG_IOMAP_COPY=y
846 895
847# 896#
848# Instrumentation Support 897# Instrumentation Support
@@ -853,8 +902,11 @@ CONFIG_PLIST=y
853# Kernel hacking 902# Kernel hacking
854# 903#
855# CONFIG_PRINTK_TIME is not set 904# CONFIG_PRINTK_TIME is not set
905CONFIG_ENABLE_MUST_CHECK=y
856# CONFIG_MAGIC_SYSRQ is not set 906# CONFIG_MAGIC_SYSRQ is not set
857# CONFIG_UNUSED_SYMBOLS is not set 907# CONFIG_UNUSED_SYMBOLS is not set
908# CONFIG_DEBUG_FS is not set
909# CONFIG_HEADERS_CHECK is not set
858CONFIG_DEBUG_KERNEL=y 910CONFIG_DEBUG_KERNEL=y
859CONFIG_LOG_BUF_SHIFT=14 911CONFIG_LOG_BUF_SHIFT=14
860CONFIG_DETECT_SOFTLOCKUP=y 912CONFIG_DETECT_SOFTLOCKUP=y
@@ -868,10 +920,10 @@ CONFIG_DEBUG_MUTEXES=y
868# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 920# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
869# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 921# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
870# CONFIG_DEBUG_KOBJECT is not set 922# CONFIG_DEBUG_KOBJECT is not set
923# CONFIG_DEBUG_BUGVERBOSE is not set
871# CONFIG_DEBUG_INFO is not set 924# CONFIG_DEBUG_INFO is not set
872# CONFIG_DEBUG_FS is not set
873# CONFIG_DEBUG_VM is not set 925# CONFIG_DEBUG_VM is not set
874# CONFIG_UNWIND_INFO is not set 926# CONFIG_DEBUG_LIST is not set
875CONFIG_FORCED_INLINING=y 927CONFIG_FORCED_INLINING=y
876# CONFIG_RCU_TORTURE_TEST is not set 928# CONFIG_RCU_TORTURE_TEST is not set
877# CONFIG_DEBUGGER is not set 929# CONFIG_DEBUGGER is not set
@@ -889,7 +941,3 @@ CONFIG_FORCED_INLINING=y
889# Cryptographic options 941# Cryptographic options
890# 942#
891# CONFIG_CRYPTO is not set 943# CONFIG_CRYPTO is not set
892
893#
894# Hardware crypto devices
895#
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index 92a527fccf83..53fcd6932f5b 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:30:15 2006 4# Mon Jan 22 22:27:14 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22CONFIG_PPC_UDBG_16550=y 23CONFIG_PPC_UDBG_16550=y
23CONFIG_GENERIC_TBSYNC=y 24CONFIG_GENERIC_TBSYNC=y
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24# CONFIG_DEFAULT_UIMAGE is not set 27# CONFIG_DEFAULT_UIMAGE is not set
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29# CONFIG_CLASSIC32 is not set 32# CONFIG_CLASSIC32 is not set
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -38,6 +40,8 @@ CONFIG_PPC_86xx=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_6xx=y 41CONFIG_6xx=y
40CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41CONFIG_ALTIVEC=y 45CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
@@ -62,15 +66,18 @@ CONFIG_LOCALVERSION=""
62# CONFIG_POSIX_MQUEUE is not set 66# CONFIG_POSIX_MQUEUE is not set
63# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
65CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
66# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
69# CONFIG_CPUSETS is not set 73# CONFIG_CPUSETS is not set
74CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 75# CONFIG_RELAY is not set
71CONFIG_INITRAMFS_SOURCE="" 76CONFIG_INITRAMFS_SOURCE=""
72# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 77# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
78CONFIG_SYSCTL=y
73CONFIG_EMBEDDED=y 79CONFIG_EMBEDDED=y
80CONFIG_SYSCTL_SYSCALL=y
74CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
75# CONFIG_KALLSYMS_ALL is not set 82# CONFIG_KALLSYMS_ALL is not set
76CONFIG_KALLSYMS_EXTRA_PASS=y 83CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -79,15 +86,15 @@ CONFIG_PRINTK=y
79CONFIG_BUG=y 86CONFIG_BUG=y
80# CONFIG_ELF_CORE is not set 87# CONFIG_ELF_CORE is not set
81CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
82CONFIG_RT_MUTEXES=y
83CONFIG_FUTEX=y 89CONFIG_FUTEX=y
84CONFIG_EPOLL=y 90CONFIG_EPOLL=y
85CONFIG_SHMEM=y 91CONFIG_SHMEM=y
86# CONFIG_SLAB is not set 92CONFIG_SLAB=y
87CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_RT_MUTEXES=y
88# CONFIG_TINY_SHMEM is not set 95# CONFIG_TINY_SHMEM is not set
89CONFIG_BASE_SMALL=0 96CONFIG_BASE_SMALL=0
90CONFIG_SLOB=y 97# CONFIG_SLOB is not set
91 98
92# 99#
93# Loadable module support 100# Loadable module support
@@ -97,6 +104,7 @@ CONFIG_SLOB=y
97# 104#
98# Block layer 105# Block layer
99# 106#
107CONFIG_BLOCK=y
100# CONFIG_LBD is not set 108# CONFIG_LBD is not set
101# CONFIG_BLK_DEV_IO_TRACE is not set 109# CONFIG_BLK_DEV_IO_TRACE is not set
102# CONFIG_LSF is not set 110# CONFIG_LSF is not set
@@ -129,6 +137,7 @@ CONFIG_MPC8641=y
129CONFIG_HIGHMEM=y 137CONFIG_HIGHMEM=y
130# CONFIG_HZ_100 is not set 138# CONFIG_HZ_100 is not set
131# CONFIG_HZ_250 is not set 139# CONFIG_HZ_250 is not set
140# CONFIG_HZ_300 is not set
132CONFIG_HZ_1000=y 141CONFIG_HZ_1000=y
133CONFIG_HZ=1000 142CONFIG_HZ=1000
134CONFIG_PREEMPT_NONE=y 143CONFIG_PREEMPT_NONE=y
@@ -140,6 +149,7 @@ CONFIG_BINFMT_ELF=y
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 149CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
141# CONFIG_IRQ_ALL_CPUS is not set 150# CONFIG_IRQ_ALL_CPUS is not set
142CONFIG_ARCH_FLATMEM_ENABLE=y 151CONFIG_ARCH_FLATMEM_ENABLE=y
152CONFIG_ARCH_POPULATES_NODE_MAP=y
143CONFIG_SELECT_MEMORY_MODEL=y 153CONFIG_SELECT_MEMORY_MODEL=y
144CONFIG_FLATMEM_MANUAL=y 154CONFIG_FLATMEM_MANUAL=y
145# CONFIG_DISCONTIGMEM_MANUAL is not set 155# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -206,6 +216,7 @@ CONFIG_PACKET=y
206CONFIG_UNIX=y 216CONFIG_UNIX=y
207CONFIG_XFRM=y 217CONFIG_XFRM=y
208CONFIG_XFRM_USER=y 218CONFIG_XFRM_USER=y
219# CONFIG_XFRM_SUB_POLICY is not set
209# CONFIG_NET_KEY is not set 220# CONFIG_NET_KEY is not set
210CONFIG_INET=y 221CONFIG_INET=y
211# CONFIG_IP_MULTICAST is not set 222# CONFIG_IP_MULTICAST is not set
@@ -226,21 +237,29 @@ CONFIG_IP_PNP_RARP=y
226# CONFIG_INET_TUNNEL is not set 237# CONFIG_INET_TUNNEL is not set
227CONFIG_INET_XFRM_MODE_TRANSPORT=y 238CONFIG_INET_XFRM_MODE_TRANSPORT=y
228CONFIG_INET_XFRM_MODE_TUNNEL=y 239CONFIG_INET_XFRM_MODE_TUNNEL=y
240CONFIG_INET_XFRM_MODE_BEET=y
229CONFIG_INET_DIAG=y 241CONFIG_INET_DIAG=y
230CONFIG_INET_TCP_DIAG=y 242CONFIG_INET_TCP_DIAG=y
231# CONFIG_TCP_CONG_ADVANCED is not set 243# CONFIG_TCP_CONG_ADVANCED is not set
232CONFIG_TCP_CONG_BIC=y 244CONFIG_TCP_CONG_CUBIC=y
245CONFIG_DEFAULT_TCP_CONG="cubic"
246# CONFIG_TCP_MD5SIG is not set
233CONFIG_IPV6=y 247CONFIG_IPV6=y
234# CONFIG_IPV6_PRIVACY is not set 248# CONFIG_IPV6_PRIVACY is not set
235# CONFIG_IPV6_ROUTER_PREF is not set 249# CONFIG_IPV6_ROUTER_PREF is not set
236# CONFIG_INET6_AH is not set 250# CONFIG_INET6_AH is not set
237# CONFIG_INET6_ESP is not set 251# CONFIG_INET6_ESP is not set
238# CONFIG_INET6_IPCOMP is not set 252# CONFIG_INET6_IPCOMP is not set
253# CONFIG_IPV6_MIP6 is not set
239# CONFIG_INET6_XFRM_TUNNEL is not set 254# CONFIG_INET6_XFRM_TUNNEL is not set
240# CONFIG_INET6_TUNNEL is not set 255# CONFIG_INET6_TUNNEL is not set
241CONFIG_INET6_XFRM_MODE_TRANSPORT=y 256CONFIG_INET6_XFRM_MODE_TRANSPORT=y
242CONFIG_INET6_XFRM_MODE_TUNNEL=y 257CONFIG_INET6_XFRM_MODE_TUNNEL=y
258CONFIG_INET6_XFRM_MODE_BEET=y
259# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
260CONFIG_IPV6_SIT=y
243# CONFIG_IPV6_TUNNEL is not set 261# CONFIG_IPV6_TUNNEL is not set
262# CONFIG_IPV6_MULTIPLE_TABLES is not set
244# CONFIG_NETWORK_SECMARK is not set 263# CONFIG_NETWORK_SECMARK is not set
245# CONFIG_NETFILTER is not set 264# CONFIG_NETFILTER is not set
246 265
@@ -267,7 +286,6 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
267# CONFIG_ATALK is not set 286# CONFIG_ATALK is not set
268# CONFIG_X25 is not set 287# CONFIG_X25 is not set
269# CONFIG_LAPB is not set 288# CONFIG_LAPB is not set
270# CONFIG_NET_DIVERT is not set
271# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
272# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
273 291
@@ -339,6 +357,12 @@ CONFIG_BLK_DEV_INITRD=y
339# CONFIG_ATA_OVER_ETH is not set 357# CONFIG_ATA_OVER_ETH is not set
340 358
341# 359#
360# Misc devices
361#
362# CONFIG_SGI_IOC4 is not set
363# CONFIG_TIFM_CORE is not set
364
365#
342# ATA/ATAPI/MFM/RLL support 366# ATA/ATAPI/MFM/RLL support
343# 367#
344# CONFIG_IDE is not set 368# CONFIG_IDE is not set
@@ -348,6 +372,12 @@ CONFIG_BLK_DEV_INITRD=y
348# 372#
349# CONFIG_RAID_ATTRS is not set 373# CONFIG_RAID_ATTRS is not set
350# CONFIG_SCSI is not set 374# CONFIG_SCSI is not set
375# CONFIG_SCSI_NETLINK is not set
376
377#
378# Serial ATA (prod) and Parallel ATA (experimental) drivers
379#
380# CONFIG_ATA is not set
351 381
352# 382#
353# Multi-device support (RAID and LVM) 383# Multi-device support (RAID and LVM)
@@ -372,6 +402,7 @@ CONFIG_BLK_DEV_INITRD=y
372# 402#
373# Macintosh device drivers 403# Macintosh device drivers
374# 404#
405# CONFIG_MAC_EMUMOUSEBTN is not set
375# CONFIG_WINDFARM is not set 406# CONFIG_WINDFARM is not set
376 407
377# 408#
@@ -403,6 +434,7 @@ CONFIG_PHYLIB=y
403# CONFIG_CICADA_PHY is not set 434# CONFIG_CICADA_PHY is not set
404CONFIG_VITESSE_PHY=y 435CONFIG_VITESSE_PHY=y
405# CONFIG_SMSC_PHY is not set 436# CONFIG_SMSC_PHY is not set
437# CONFIG_BROADCOM_PHY is not set
406# CONFIG_FIXED_PHY is not set 438# CONFIG_FIXED_PHY is not set
407 439
408# 440#
@@ -440,6 +472,7 @@ CONFIG_MII=y
440# CONFIG_BNX2 is not set 472# CONFIG_BNX2 is not set
441CONFIG_GIANFAR=y 473CONFIG_GIANFAR=y
442# CONFIG_GFAR_NAPI is not set 474# CONFIG_GFAR_NAPI is not set
475# CONFIG_QLA3XXX is not set
443 476
444# 477#
445# Ethernet (10000 Mbit) 478# Ethernet (10000 Mbit)
@@ -448,6 +481,7 @@ CONFIG_GIANFAR=y
448# CONFIG_IXGB is not set 481# CONFIG_IXGB is not set
449# CONFIG_S2IO is not set 482# CONFIG_S2IO is not set
450# CONFIG_MYRI10GE is not set 483# CONFIG_MYRI10GE is not set
484# CONFIG_NETXEN_NIC is not set
451 485
452# 486#
453# Token Ring devices 487# Token Ring devices
@@ -486,6 +520,7 @@ CONFIG_GIANFAR=y
486# Input device support 520# Input device support
487# 521#
488CONFIG_INPUT=y 522CONFIG_INPUT=y
523# CONFIG_INPUT_FF_MEMLESS is not set
489 524
490# 525#
491# Userland interfaces 526# Userland interfaces
@@ -542,6 +577,7 @@ CONFIG_SERIAL_8250_RSA=y
542# 577#
543# Non-8250 serial port support 578# Non-8250 serial port support
544# 579#
580# CONFIG_SERIAL_UARTLITE is not set
545CONFIG_SERIAL_CORE=y 581CONFIG_SERIAL_CORE=y
546CONFIG_SERIAL_CORE_CONSOLE=y 582CONFIG_SERIAL_CORE_CONSOLE=y
547# CONFIG_SERIAL_JSM is not set 583# CONFIG_SERIAL_JSM is not set
@@ -563,10 +599,6 @@ CONFIG_UNIX98_PTYS=y
563# CONFIG_DTLK is not set 599# CONFIG_DTLK is not set
564# CONFIG_R3964 is not set 600# CONFIG_R3964 is not set
565# CONFIG_APPLICOM is not set 601# CONFIG_APPLICOM is not set
566
567#
568# Ftape, the floppy tape device driver
569#
570# CONFIG_AGP is not set 602# CONFIG_AGP is not set
571# CONFIG_DRM is not set 603# CONFIG_DRM is not set
572# CONFIG_RAW_DRIVER is not set 604# CONFIG_RAW_DRIVER is not set
@@ -575,7 +607,6 @@ CONFIG_UNIX98_PTYS=y
575# TPM devices 607# TPM devices
576# 608#
577# CONFIG_TCG_TPM is not set 609# CONFIG_TCG_TPM is not set
578# CONFIG_TELCLOCK is not set
579 610
580# 611#
581# I2C support 612# I2C support
@@ -640,6 +671,7 @@ CONFIG_SENSORS_EEPROM=y
640# 671#
641# Dallas's 1-wire bus 672# Dallas's 1-wire bus
642# 673#
674# CONFIG_W1 is not set
643 675
644# 676#
645# Hardware Monitoring support 677# Hardware Monitoring support
@@ -648,14 +680,9 @@ CONFIG_SENSORS_EEPROM=y
648# CONFIG_HWMON_VID is not set 680# CONFIG_HWMON_VID is not set
649 681
650# 682#
651# Misc devices
652#
653
654#
655# Multimedia devices 683# Multimedia devices
656# 684#
657# CONFIG_VIDEO_DEV is not set 685# CONFIG_VIDEO_DEV is not set
658CONFIG_VIDEO_V4L2=y
659 686
660# 687#
661# Digital Video Broadcasting Devices 688# Digital Video Broadcasting Devices
@@ -667,6 +694,7 @@ CONFIG_VIDEO_V4L2=y
667# 694#
668CONFIG_FIRMWARE_EDID=y 695CONFIG_FIRMWARE_EDID=y
669# CONFIG_FB is not set 696# CONFIG_FB is not set
697# CONFIG_FB_IBM_GXT4500 is not set
670 698
671# 699#
672# Console display driver support 700# Console display driver support
@@ -682,6 +710,11 @@ CONFIG_DUMMY_CONSOLE=y
682# CONFIG_SOUND is not set 710# CONFIG_SOUND is not set
683 711
684# 712#
713# HID Devices
714#
715CONFIG_HID=y
716
717#
685# USB support 718# USB support
686# 719#
687CONFIG_USB_ARCH_HAS_HCD=y 720CONFIG_USB_ARCH_HAS_HCD=y
@@ -744,6 +777,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
744# 777#
745 778
746# 779#
780# Virtualization
781#
782
783#
747# File systems 784# File systems
748# 785#
749CONFIG_EXT2_FS=y 786CONFIG_EXT2_FS=y
@@ -753,6 +790,7 @@ CONFIG_EXT3_FS=y
753CONFIG_EXT3_FS_XATTR=y 790CONFIG_EXT3_FS_XATTR=y
754# CONFIG_EXT3_FS_POSIX_ACL is not set 791# CONFIG_EXT3_FS_POSIX_ACL is not set
755# CONFIG_EXT3_FS_SECURITY is not set 792# CONFIG_EXT3_FS_SECURITY is not set
793# CONFIG_EXT4DEV_FS is not set
756CONFIG_JBD=y 794CONFIG_JBD=y
757# CONFIG_JBD_DEBUG is not set 795# CONFIG_JBD_DEBUG is not set
758CONFIG_FS_MBCACHE=y 796CONFIG_FS_MBCACHE=y
@@ -760,6 +798,7 @@ CONFIG_FS_MBCACHE=y
760# CONFIG_JFS_FS is not set 798# CONFIG_JFS_FS is not set
761# CONFIG_FS_POSIX_ACL is not set 799# CONFIG_FS_POSIX_ACL is not set
762# CONFIG_XFS_FS is not set 800# CONFIG_XFS_FS is not set
801# CONFIG_GFS2_FS is not set
763# CONFIG_OCFS2_FS is not set 802# CONFIG_OCFS2_FS is not set
764# CONFIG_MINIX_FS is not set 803# CONFIG_MINIX_FS is not set
765# CONFIG_ROMFS_FS is not set 804# CONFIG_ROMFS_FS is not set
@@ -788,8 +827,10 @@ CONFIG_FS_MBCACHE=y
788# 827#
789CONFIG_PROC_FS=y 828CONFIG_PROC_FS=y
790CONFIG_PROC_KCORE=y 829CONFIG_PROC_KCORE=y
830CONFIG_PROC_SYSCTL=y
791CONFIG_SYSFS=y 831CONFIG_SYSFS=y
792CONFIG_TMPFS=y 832CONFIG_TMPFS=y
833# CONFIG_TMPFS_POSIX_ACL is not set
793# CONFIG_HUGETLB_PAGE is not set 834# CONFIG_HUGETLB_PAGE is not set
794CONFIG_RAMFS=y 835CONFIG_RAMFS=y
795# CONFIG_CONFIGFS_FS is not set 836# CONFIG_CONFIGFS_FS is not set
@@ -904,13 +945,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"
904# CONFIG_NLS_UTF8 is not set 945# CONFIG_NLS_UTF8 is not set
905 946
906# 947#
948# Distributed Lock Manager
949#
950# CONFIG_DLM is not set
951
952#
907# Library routines 953# Library routines
908# 954#
955CONFIG_BITREVERSE=y
909# CONFIG_CRC_CCITT is not set 956# CONFIG_CRC_CCITT is not set
910# CONFIG_CRC16 is not set 957# CONFIG_CRC16 is not set
911CONFIG_CRC32=y 958CONFIG_CRC32=y
912# CONFIG_LIBCRC32C is not set 959# CONFIG_LIBCRC32C is not set
913CONFIG_PLIST=y 960CONFIG_PLIST=y
961CONFIG_IOMAP_COPY=y
914 962
915# 963#
916# Instrumentation Support 964# Instrumentation Support
@@ -921,12 +969,16 @@ CONFIG_PLIST=y
921# Kernel hacking 969# Kernel hacking
922# 970#
923# CONFIG_PRINTK_TIME is not set 971# CONFIG_PRINTK_TIME is not set
972CONFIG_ENABLE_MUST_CHECK=y
924# CONFIG_MAGIC_SYSRQ is not set 973# CONFIG_MAGIC_SYSRQ is not set
925# CONFIG_UNUSED_SYMBOLS is not set 974# CONFIG_UNUSED_SYMBOLS is not set
975# CONFIG_DEBUG_FS is not set
976# CONFIG_HEADERS_CHECK is not set
926CONFIG_DEBUG_KERNEL=y 977CONFIG_DEBUG_KERNEL=y
927CONFIG_LOG_BUF_SHIFT=14 978CONFIG_LOG_BUF_SHIFT=14
928CONFIG_DETECT_SOFTLOCKUP=y 979CONFIG_DETECT_SOFTLOCKUP=y
929# CONFIG_SCHEDSTATS is not set 980# CONFIG_SCHEDSTATS is not set
981# CONFIG_DEBUG_SLAB is not set
930# CONFIG_DEBUG_RT_MUTEXES is not set 982# CONFIG_DEBUG_RT_MUTEXES is not set
931# CONFIG_RT_MUTEX_TESTER is not set 983# CONFIG_RT_MUTEX_TESTER is not set
932# CONFIG_DEBUG_SPINLOCK is not set 984# CONFIG_DEBUG_SPINLOCK is not set
@@ -936,10 +988,10 @@ CONFIG_DETECT_SOFTLOCKUP=y
936# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 988# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
937# CONFIG_DEBUG_KOBJECT is not set 989# CONFIG_DEBUG_KOBJECT is not set
938# CONFIG_DEBUG_HIGHMEM is not set 990# CONFIG_DEBUG_HIGHMEM is not set
991# CONFIG_DEBUG_BUGVERBOSE is not set
939# CONFIG_DEBUG_INFO is not set 992# CONFIG_DEBUG_INFO is not set
940# CONFIG_DEBUG_FS is not set
941# CONFIG_DEBUG_VM is not set 993# CONFIG_DEBUG_VM is not set
942# CONFIG_UNWIND_INFO is not set 994# CONFIG_DEBUG_LIST is not set
943CONFIG_FORCED_INLINING=y 995CONFIG_FORCED_INLINING=y
944# CONFIG_RCU_TORTURE_TEST is not set 996# CONFIG_RCU_TORTURE_TEST is not set
945# CONFIG_DEBUGGER is not set 997# CONFIG_DEBUGGER is not set
@@ -957,7 +1009,3 @@ CONFIG_FORCED_INLINING=y
957# Cryptographic options 1009# Cryptographic options
958# 1010#
959# CONFIG_CRYPTO is not set 1011# CONFIG_CRYPTO is not set
960
961#
962# Hardware crypto devices
963#
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 765c8bb90ddd..f611df480fd9 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.18-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:30:23 2006 4# Mon Jan 22 22:28:56 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -10,6 +10,7 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 15CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 16CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -21,13 +22,14 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
21CONFIG_PPC_OF=y 22CONFIG_PPC_OF=y
22# CONFIG_PPC_UDBG_16550 is not set 23# CONFIG_PPC_UDBG_16550 is not set
23# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y
24# CONFIG_DEFAULT_UIMAGE is not set 27# CONFIG_DEFAULT_UIMAGE is not set
25 28
26# 29#
27# Processor support 30# Processor support
28# 31#
29CONFIG_CLASSIC32=y 32CONFIG_CLASSIC32=y
30# CONFIG_PPC_52xx is not set
31# CONFIG_PPC_82xx is not set 33# CONFIG_PPC_82xx is not set
32# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
33# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
@@ -38,6 +40,8 @@ CONFIG_CLASSIC32=y
38# CONFIG_E200 is not set 40# CONFIG_E200 is not set
39CONFIG_6xx=y 41CONFIG_6xx=y
40CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set
41CONFIG_ALTIVEC=y 45CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
@@ -58,17 +62,21 @@ CONFIG_LOCALVERSION=""
58# CONFIG_LOCALVERSION_AUTO is not set 62# CONFIG_LOCALVERSION_AUTO is not set
59CONFIG_SWAP=y 63CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
61CONFIG_POSIX_MQUEUE=y 66CONFIG_POSIX_MQUEUE=y
62# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
64CONFIG_SYSCTL=y 69# CONFIG_UTS_NS is not set
65# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
66CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
67CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
73CONFIG_SYSFS_DEPRECATED=y
68# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
69CONFIG_INITRAMFS_SOURCE="" 75CONFIG_INITRAMFS_SOURCE=""
70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
77CONFIG_SYSCTL=y
71# CONFIG_EMBEDDED is not set 78# CONFIG_EMBEDDED is not set
79CONFIG_SYSCTL_SYSCALL=y
72CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
73# CONFIG_KALLSYMS_ALL is not set 81# CONFIG_KALLSYMS_ALL is not set
74# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -77,12 +85,12 @@ CONFIG_PRINTK=y
77CONFIG_BUG=y 85CONFIG_BUG=y
78CONFIG_ELF_CORE=y 86CONFIG_ELF_CORE=y
79CONFIG_BASE_FULL=y 87CONFIG_BASE_FULL=y
80CONFIG_RT_MUTEXES=y
81CONFIG_FUTEX=y 88CONFIG_FUTEX=y
82CONFIG_EPOLL=y 89CONFIG_EPOLL=y
83CONFIG_SHMEM=y 90CONFIG_SHMEM=y
84CONFIG_SLAB=y 91CONFIG_SLAB=y
85CONFIG_VM_EVENT_COUNTERS=y 92CONFIG_VM_EVENT_COUNTERS=y
93CONFIG_RT_MUTEXES=y
86# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
87CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
88# CONFIG_SLOB is not set 96# CONFIG_SLOB is not set
@@ -100,6 +108,7 @@ CONFIG_KMOD=y
100# 108#
101# Block layer 109# Block layer
102# 110#
111CONFIG_BLOCK=y
103CONFIG_LBD=y 112CONFIG_LBD=y
104# CONFIG_BLK_DEV_IO_TRACE is not set 113# CONFIG_BLK_DEV_IO_TRACE is not set
105CONFIG_LSF=y 114CONFIG_LSF=y
@@ -121,18 +130,22 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
121# Platform support 130# Platform support
122# 131#
123CONFIG_PPC_MULTIPLATFORM=y 132CONFIG_PPC_MULTIPLATFORM=y
124# CONFIG_PPC_ISERIES is not set
125# CONFIG_EMBEDDED6xx is not set 133# CONFIG_EMBEDDED6xx is not set
126# CONFIG_APUS is not set 134# CONFIG_APUS is not set
127# CONFIG_PPC_CHRP is not set 135# CONFIG_PPC_CHRP is not set
136# CONFIG_PPC_MPC52xx is not set
137# CONFIG_PPC_EFIKA is not set
138# CONFIG_PPC_LITE5200 is not set
128CONFIG_PPC_PMAC=y 139CONFIG_PPC_PMAC=y
129# CONFIG_PPC_CELL is not set 140# CONFIG_PPC_CELL is not set
130# CONFIG_PPC_CELL_NATIVE is not set 141# CONFIG_PPC_CELL_NATIVE is not set
131# CONFIG_UDBG_RTAS_CONSOLE is not set 142CONFIG_PPC_NATIVE=y
132# CONFIG_PPC_RTAS is not set 143# CONFIG_PPC_RTAS is not set
133# CONFIG_MMIO_NVRAM is not set 144# CONFIG_MMIO_NVRAM is not set
134CONFIG_PPC_MPC106=y 145CONFIG_PPC_MPC106=y
135# CONFIG_PPC_970_NAP is not set 146# CONFIG_PPC_970_NAP is not set
147# CONFIG_PPC_INDIRECT_IO is not set
148# CONFIG_GENERIC_IOMAP is not set
136CONFIG_CPU_FREQ=y 149CONFIG_CPU_FREQ=y
137CONFIG_CPU_FREQ_TABLE=y 150CONFIG_CPU_FREQ_TABLE=y
138# CONFIG_CPU_FREQ_DEBUG is not set 151# CONFIG_CPU_FREQ_DEBUG is not set
@@ -157,6 +170,7 @@ CONFIG_MPIC=y
157# CONFIG_HIGHMEM is not set 170# CONFIG_HIGHMEM is not set
158# CONFIG_HZ_100 is not set 171# CONFIG_HZ_100 is not set
159CONFIG_HZ_250=y 172CONFIG_HZ_250=y
173# CONFIG_HZ_300 is not set
160# CONFIG_HZ_1000 is not set 174# CONFIG_HZ_1000 is not set
161CONFIG_HZ=250 175CONFIG_HZ=250
162CONFIG_PREEMPT_NONE=y 176CONFIG_PREEMPT_NONE=y
@@ -167,6 +181,7 @@ CONFIG_BINFMT_MISC=m
167CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
168# CONFIG_KEXEC is not set 182# CONFIG_KEXEC is not set
169CONFIG_ARCH_FLATMEM_ENABLE=y 183CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_ARCH_POPULATES_NODE_MAP=y
170CONFIG_SELECT_MEMORY_MODEL=y 185CONFIG_SELECT_MEMORY_MODEL=y
171CONFIG_FLATMEM_MANUAL=y 186CONFIG_FLATMEM_MANUAL=y
172# CONFIG_DISCONTIGMEM_MANUAL is not set 187# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -181,6 +196,8 @@ CONFIG_PROC_DEVICETREE=y
181CONFIG_PM=y 196CONFIG_PM=y
182# CONFIG_PM_LEGACY is not set 197# CONFIG_PM_LEGACY is not set
183CONFIG_PM_DEBUG=y 198CONFIG_PM_DEBUG=y
199# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
200CONFIG_PM_SYSFS_DEPRECATED=y
184CONFIG_SOFTWARE_SUSPEND=y 201CONFIG_SOFTWARE_SUSPEND=y
185CONFIG_PM_STD_PARTITION="" 202CONFIG_PM_STD_PARTITION=""
186CONFIG_SECCOMP=y 203CONFIG_SECCOMP=y
@@ -254,6 +271,7 @@ CONFIG_PACKET=y
254CONFIG_UNIX=y 271CONFIG_UNIX=y
255CONFIG_XFRM=y 272CONFIG_XFRM=y
256CONFIG_XFRM_USER=y 273CONFIG_XFRM_USER=y
274# CONFIG_XFRM_SUB_POLICY is not set
257CONFIG_NET_KEY=y 275CONFIG_NET_KEY=y
258CONFIG_INET=y 276CONFIG_INET=y
259CONFIG_IP_MULTICAST=y 277CONFIG_IP_MULTICAST=y
@@ -272,10 +290,13 @@ CONFIG_INET_ESP=y
272# CONFIG_INET_TUNNEL is not set 290# CONFIG_INET_TUNNEL is not set
273# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 291# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
274# CONFIG_INET_XFRM_MODE_TUNNEL is not set 292# CONFIG_INET_XFRM_MODE_TUNNEL is not set
293CONFIG_INET_XFRM_MODE_BEET=y
275CONFIG_INET_DIAG=y 294CONFIG_INET_DIAG=y
276CONFIG_INET_TCP_DIAG=y 295CONFIG_INET_TCP_DIAG=y
277# CONFIG_TCP_CONG_ADVANCED is not set 296# CONFIG_TCP_CONG_ADVANCED is not set
278CONFIG_TCP_CONG_BIC=y 297CONFIG_TCP_CONG_CUBIC=y
298CONFIG_DEFAULT_TCP_CONG="cubic"
299# CONFIG_TCP_MD5SIG is not set
279 300
280# 301#
281# IP: Virtual Server Configuration 302# IP: Virtual Server Configuration
@@ -292,14 +313,33 @@ CONFIG_NETFILTER=y
292# Core Netfilter Configuration 313# Core Netfilter Configuration
293# 314#
294# CONFIG_NETFILTER_NETLINK is not set 315# CONFIG_NETFILTER_NETLINK is not set
316CONFIG_NF_CONNTRACK_ENABLED=m
317CONFIG_NF_CONNTRACK_SUPPORT=y
318# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
319CONFIG_NF_CONNTRACK=m
320# CONFIG_NF_CT_ACCT is not set
321# CONFIG_NF_CONNTRACK_MARK is not set
322# CONFIG_NF_CONNTRACK_EVENTS is not set
323# CONFIG_NF_CT_PROTO_SCTP is not set
324# CONFIG_NF_CONNTRACK_AMANDA is not set
325CONFIG_NF_CONNTRACK_FTP=m
326# CONFIG_NF_CONNTRACK_H323 is not set
327CONFIG_NF_CONNTRACK_IRC=m
328# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
329# CONFIG_NF_CONNTRACK_PPTP is not set
330# CONFIG_NF_CONNTRACK_SIP is not set
331CONFIG_NF_CONNTRACK_TFTP=m
295CONFIG_NETFILTER_XTABLES=m 332CONFIG_NETFILTER_XTABLES=m
296CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 333CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
334# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
297CONFIG_NETFILTER_XT_TARGET_MARK=m 335CONFIG_NETFILTER_XT_TARGET_MARK=m
298CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 336CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
337CONFIG_NETFILTER_XT_TARGET_NFLOG=m
299CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 338CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
300CONFIG_NETFILTER_XT_MATCH_COMMENT=m 339CONFIG_NETFILTER_XT_MATCH_COMMENT=m
301CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 340CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
302CONFIG_NETFILTER_XT_MATCH_DCCP=m 341CONFIG_NETFILTER_XT_MATCH_DCCP=m
342CONFIG_NETFILTER_XT_MATCH_DSCP=m
303CONFIG_NETFILTER_XT_MATCH_ESP=m 343CONFIG_NETFILTER_XT_MATCH_ESP=m
304CONFIG_NETFILTER_XT_MATCH_HELPER=m 344CONFIG_NETFILTER_XT_MATCH_HELPER=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m 345CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -312,61 +352,49 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
312# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 352# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
313CONFIG_NETFILTER_XT_MATCH_REALM=m 353CONFIG_NETFILTER_XT_MATCH_REALM=m
314CONFIG_NETFILTER_XT_MATCH_SCTP=m 354CONFIG_NETFILTER_XT_MATCH_SCTP=m
315CONFIG_NETFILTER_XT_MATCH_STATE=m 355# CONFIG_NETFILTER_XT_MATCH_STATE is not set
316# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 356# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
317CONFIG_NETFILTER_XT_MATCH_STRING=m 357CONFIG_NETFILTER_XT_MATCH_STRING=m
318CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 358CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
359# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
319 360
320# 361#
321# IP: Netfilter Configuration 362# IP: Netfilter Configuration
322# 363#
323CONFIG_IP_NF_CONNTRACK=m 364CONFIG_NF_CONNTRACK_IPV4=m
324# CONFIG_IP_NF_CT_ACCT is not set 365CONFIG_NF_CONNTRACK_PROC_COMPAT=y
325# CONFIG_IP_NF_CONNTRACK_MARK is not set
326# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
327# CONFIG_IP_NF_CT_PROTO_SCTP is not set
328CONFIG_IP_NF_FTP=m
329CONFIG_IP_NF_IRC=m
330CONFIG_IP_NF_NETBIOS_NS=m
331CONFIG_IP_NF_TFTP=m
332CONFIG_IP_NF_AMANDA=m
333CONFIG_IP_NF_PPTP=m
334CONFIG_IP_NF_H323=m
335# CONFIG_IP_NF_SIP is not set
336# CONFIG_IP_NF_QUEUE is not set 366# CONFIG_IP_NF_QUEUE is not set
337CONFIG_IP_NF_IPTABLES=m 367CONFIG_IP_NF_IPTABLES=m
338CONFIG_IP_NF_MATCH_IPRANGE=m 368CONFIG_IP_NF_MATCH_IPRANGE=m
339CONFIG_IP_NF_MATCH_TOS=m 369CONFIG_IP_NF_MATCH_TOS=m
340CONFIG_IP_NF_MATCH_RECENT=m 370CONFIG_IP_NF_MATCH_RECENT=m
341CONFIG_IP_NF_MATCH_ECN=m 371CONFIG_IP_NF_MATCH_ECN=m
342CONFIG_IP_NF_MATCH_DSCP=m
343CONFIG_IP_NF_MATCH_AH=m 372CONFIG_IP_NF_MATCH_AH=m
344CONFIG_IP_NF_MATCH_TTL=m 373CONFIG_IP_NF_MATCH_TTL=m
345CONFIG_IP_NF_MATCH_OWNER=m 374CONFIG_IP_NF_MATCH_OWNER=m
346CONFIG_IP_NF_MATCH_ADDRTYPE=m 375CONFIG_IP_NF_MATCH_ADDRTYPE=m
347CONFIG_IP_NF_MATCH_HASHLIMIT=m
348CONFIG_IP_NF_FILTER=m 376CONFIG_IP_NF_FILTER=m
349CONFIG_IP_NF_TARGET_REJECT=m 377CONFIG_IP_NF_TARGET_REJECT=m
350CONFIG_IP_NF_TARGET_LOG=m 378CONFIG_IP_NF_TARGET_LOG=m
351CONFIG_IP_NF_TARGET_ULOG=m 379CONFIG_IP_NF_TARGET_ULOG=m
352CONFIG_IP_NF_TARGET_TCPMSS=m 380CONFIG_IP_NF_TARGET_TCPMSS=m
353CONFIG_IP_NF_NAT=m 381CONFIG_NF_NAT=m
354CONFIG_IP_NF_NAT_NEEDED=y 382CONFIG_NF_NAT_NEEDED=y
355CONFIG_IP_NF_TARGET_MASQUERADE=m 383CONFIG_IP_NF_TARGET_MASQUERADE=m
356CONFIG_IP_NF_TARGET_REDIRECT=m 384CONFIG_IP_NF_TARGET_REDIRECT=m
357CONFIG_IP_NF_TARGET_NETMAP=m 385CONFIG_IP_NF_TARGET_NETMAP=m
358CONFIG_IP_NF_TARGET_SAME=m 386CONFIG_IP_NF_TARGET_SAME=m
359CONFIG_IP_NF_NAT_SNMP_BASIC=m 387# CONFIG_NF_NAT_SNMP_BASIC is not set
360CONFIG_IP_NF_NAT_IRC=m 388CONFIG_NF_NAT_FTP=m
361CONFIG_IP_NF_NAT_FTP=m 389CONFIG_NF_NAT_IRC=m
362CONFIG_IP_NF_NAT_TFTP=m 390CONFIG_NF_NAT_TFTP=m
363CONFIG_IP_NF_NAT_AMANDA=m 391# CONFIG_NF_NAT_AMANDA is not set
364CONFIG_IP_NF_NAT_PPTP=m 392# CONFIG_NF_NAT_PPTP is not set
365CONFIG_IP_NF_NAT_H323=m 393# CONFIG_NF_NAT_H323 is not set
394# CONFIG_NF_NAT_SIP is not set
366CONFIG_IP_NF_MANGLE=m 395CONFIG_IP_NF_MANGLE=m
367CONFIG_IP_NF_TARGET_TOS=m 396CONFIG_IP_NF_TARGET_TOS=m
368CONFIG_IP_NF_TARGET_ECN=m 397CONFIG_IP_NF_TARGET_ECN=m
369CONFIG_IP_NF_TARGET_DSCP=m
370CONFIG_IP_NF_TARGET_TTL=m 398CONFIG_IP_NF_TARGET_TTL=m
371CONFIG_IP_NF_RAW=m 399CONFIG_IP_NF_RAW=m
372CONFIG_IP_NF_ARPTABLES=m 400CONFIG_IP_NF_ARPTABLES=m
@@ -384,8 +412,11 @@ CONFIG_IP_DCCP_ACKVEC=y
384# DCCP CCIDs Configuration (EXPERIMENTAL) 412# DCCP CCIDs Configuration (EXPERIMENTAL)
385# 413#
386CONFIG_IP_DCCP_CCID2=m 414CONFIG_IP_DCCP_CCID2=m
415# CONFIG_IP_DCCP_CCID2_DEBUG is not set
387CONFIG_IP_DCCP_CCID3=m 416CONFIG_IP_DCCP_CCID3=m
388CONFIG_IP_DCCP_TFRC_LIB=m 417CONFIG_IP_DCCP_TFRC_LIB=m
418# CONFIG_IP_DCCP_CCID3_DEBUG is not set
419CONFIG_IP_DCCP_CCID3_RTO=100
389 420
390# 421#
391# DCCP Kernel Hacking 422# DCCP Kernel Hacking
@@ -410,7 +441,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m
410# CONFIG_ATALK is not set 441# CONFIG_ATALK is not set
411# CONFIG_X25 is not set 442# CONFIG_X25 is not set
412# CONFIG_LAPB is not set 443# CONFIG_LAPB is not set
413# CONFIG_NET_DIVERT is not set
414# CONFIG_ECONET is not set 444# CONFIG_ECONET is not set
415# CONFIG_WAN_ROUTER is not set 445# CONFIG_WAN_ROUTER is not set
416 446
@@ -567,6 +597,12 @@ CONFIG_BLK_DEV_INITRD=y
567# CONFIG_ATA_OVER_ETH is not set 597# CONFIG_ATA_OVER_ETH is not set
568 598
569# 599#
600# Misc devices
601#
602# CONFIG_SGI_IOC4 is not set
603# CONFIG_TIFM_CORE is not set
604
605#
570# ATA/ATAPI/MFM/RLL support 606# ATA/ATAPI/MFM/RLL support
571# 607#
572CONFIG_IDE=y 608CONFIG_IDE=y
@@ -594,7 +630,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
594# CONFIG_BLK_DEV_OFFBOARD is not set 630# CONFIG_BLK_DEV_OFFBOARD is not set
595CONFIG_BLK_DEV_GENERIC=y 631CONFIG_BLK_DEV_GENERIC=y
596# CONFIG_BLK_DEV_OPTI621 is not set 632# CONFIG_BLK_DEV_OPTI621 is not set
597CONFIG_BLK_DEV_SL82C105=y
598CONFIG_BLK_DEV_IDEDMA_PCI=y 633CONFIG_BLK_DEV_IDEDMA_PCI=y
599# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 634# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
600CONFIG_IDEDMA_PCI_AUTO=y 635CONFIG_IDEDMA_PCI_AUTO=y
@@ -609,6 +644,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
609# CONFIG_BLK_DEV_CS5530 is not set 644# CONFIG_BLK_DEV_CS5530 is not set
610# CONFIG_BLK_DEV_HPT34X is not set 645# CONFIG_BLK_DEV_HPT34X is not set
611# CONFIG_BLK_DEV_HPT366 is not set 646# CONFIG_BLK_DEV_HPT366 is not set
647# CONFIG_BLK_DEV_JMICRON is not set
612# CONFIG_BLK_DEV_SC1200 is not set 648# CONFIG_BLK_DEV_SC1200 is not set
613# CONFIG_BLK_DEV_PIIX is not set 649# CONFIG_BLK_DEV_PIIX is not set
614# CONFIG_BLK_DEV_IT821X is not set 650# CONFIG_BLK_DEV_IT821X is not set
@@ -617,6 +653,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
617CONFIG_BLK_DEV_PDC202XX_NEW=y 653CONFIG_BLK_DEV_PDC202XX_NEW=y
618# CONFIG_BLK_DEV_SVWKS is not set 654# CONFIG_BLK_DEV_SVWKS is not set
619# CONFIG_BLK_DEV_SIIMAGE is not set 655# CONFIG_BLK_DEV_SIIMAGE is not set
656CONFIG_BLK_DEV_SL82C105=y
620# CONFIG_BLK_DEV_SLC90E66 is not set 657# CONFIG_BLK_DEV_SLC90E66 is not set
621# CONFIG_BLK_DEV_TRM290 is not set 658# CONFIG_BLK_DEV_TRM290 is not set
622# CONFIG_BLK_DEV_VIA82CXXX is not set 659# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -634,6 +671,8 @@ CONFIG_IDEDMA_AUTO=y
634# 671#
635# CONFIG_RAID_ATTRS is not set 672# CONFIG_RAID_ATTRS is not set
636CONFIG_SCSI=y 673CONFIG_SCSI=y
674# CONFIG_SCSI_TGT is not set
675CONFIG_SCSI_NETLINK=y
637CONFIG_SCSI_PROC_FS=y 676CONFIG_SCSI_PROC_FS=y
638 677
639# 678#
@@ -653,14 +692,16 @@ CONFIG_CHR_DEV_SG=y
653# CONFIG_SCSI_MULTI_LUN is not set 692# CONFIG_SCSI_MULTI_LUN is not set
654CONFIG_SCSI_CONSTANTS=y 693CONFIG_SCSI_CONSTANTS=y
655# CONFIG_SCSI_LOGGING is not set 694# CONFIG_SCSI_LOGGING is not set
695# CONFIG_SCSI_SCAN_ASYNC is not set
656 696
657# 697#
658# SCSI Transport Attributes 698# SCSI Transports
659# 699#
660CONFIG_SCSI_SPI_ATTRS=y 700CONFIG_SCSI_SPI_ATTRS=y
661CONFIG_SCSI_FC_ATTRS=y 701CONFIG_SCSI_FC_ATTRS=y
662# CONFIG_SCSI_ISCSI_ATTRS is not set 702# CONFIG_SCSI_ISCSI_ATTRS is not set
663# CONFIG_SCSI_SAS_ATTRS is not set 703# CONFIG_SCSI_SAS_ATTRS is not set
704# CONFIG_SCSI_SAS_LIBSAS is not set
664 705
665# 706#
666# SCSI low-level drivers 707# SCSI low-level drivers
@@ -678,11 +719,12 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
678CONFIG_AIC7XXX_REG_PRETTY_PRINT=y 719CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
679CONFIG_SCSI_AIC7XXX_OLD=m 720CONFIG_SCSI_AIC7XXX_OLD=m
680# CONFIG_SCSI_AIC79XX is not set 721# CONFIG_SCSI_AIC79XX is not set
722# CONFIG_SCSI_AIC94XX is not set
681# CONFIG_SCSI_DPT_I2O is not set 723# CONFIG_SCSI_DPT_I2O is not set
724# CONFIG_SCSI_ARCMSR is not set
682# CONFIG_MEGARAID_NEWGEN is not set 725# CONFIG_MEGARAID_NEWGEN is not set
683# CONFIG_MEGARAID_LEGACY is not set 726# CONFIG_MEGARAID_LEGACY is not set
684# CONFIG_MEGARAID_SAS is not set 727# CONFIG_MEGARAID_SAS is not set
685# CONFIG_ATA is not set
686# CONFIG_SCSI_HPTIOP is not set 728# CONFIG_SCSI_HPTIOP is not set
687# CONFIG_SCSI_BUSLOGIC is not set 729# CONFIG_SCSI_BUSLOGIC is not set
688# CONFIG_SCSI_DMX3191D is not set 730# CONFIG_SCSI_DMX3191D is not set
@@ -692,14 +734,15 @@ CONFIG_SCSI_AIC7XXX_OLD=m
692# CONFIG_SCSI_IPS is not set 734# CONFIG_SCSI_IPS is not set
693# CONFIG_SCSI_INITIO is not set 735# CONFIG_SCSI_INITIO is not set
694# CONFIG_SCSI_INIA100 is not set 736# CONFIG_SCSI_INIA100 is not set
737# CONFIG_SCSI_STEX is not set
695CONFIG_SCSI_SYM53C8XX_2=y 738CONFIG_SCSI_SYM53C8XX_2=y
696CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 739CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
697CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 740CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
698CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 741CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
699CONFIG_SCSI_SYM53C8XX_MMIO=y 742CONFIG_SCSI_SYM53C8XX_MMIO=y
700# CONFIG_SCSI_IPR is not set
701# CONFIG_SCSI_QLOGIC_1280 is not set 743# CONFIG_SCSI_QLOGIC_1280 is not set
702# CONFIG_SCSI_QLA_FC is not set 744# CONFIG_SCSI_QLA_FC is not set
745# CONFIG_SCSI_QLA_ISCSI is not set
703# CONFIG_SCSI_LPFC is not set 746# CONFIG_SCSI_LPFC is not set
704# CONFIG_SCSI_DC395x is not set 747# CONFIG_SCSI_DC395x is not set
705# CONFIG_SCSI_DC390T is not set 748# CONFIG_SCSI_DC390T is not set
@@ -709,6 +752,7 @@ CONFIG_SCSI_MESH=y
709CONFIG_SCSI_MESH_SYNC_RATE=5 752CONFIG_SCSI_MESH_SYNC_RATE=5
710CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 753CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
711CONFIG_SCSI_MAC53C94=y 754CONFIG_SCSI_MAC53C94=y
755# CONFIG_SCSI_SRP is not set
712 756
713# 757#
714# PCMCIA SCSI adapter support 758# PCMCIA SCSI adapter support
@@ -720,6 +764,11 @@ CONFIG_SCSI_MAC53C94=y
720# CONFIG_PCMCIA_SYM53C500 is not set 764# CONFIG_PCMCIA_SYM53C500 is not set
721 765
722# 766#
767# Serial ATA (prod) and Parallel ATA (experimental) drivers
768#
769# CONFIG_ATA is not set
770
771#
723# Multi-device support (RAID and LVM) 772# Multi-device support (RAID and LVM)
724# 773#
725CONFIG_MD=y 774CONFIG_MD=y
@@ -732,6 +781,7 @@ CONFIG_MD_RAID10=m
732CONFIG_MD_MULTIPATH=m 781CONFIG_MD_MULTIPATH=m
733CONFIG_MD_FAULTY=m 782CONFIG_MD_FAULTY=m
734CONFIG_BLK_DEV_DM=m 783CONFIG_BLK_DEV_DM=m
784# CONFIG_DM_DEBUG is not set
735CONFIG_DM_CRYPT=m 785CONFIG_DM_CRYPT=m
736CONFIG_DM_SNAPSHOT=m 786CONFIG_DM_SNAPSHOT=m
737CONFIG_DM_MIRROR=m 787CONFIG_DM_MIRROR=m
@@ -798,6 +848,7 @@ CONFIG_THERM_WINDTUNNEL=m
798CONFIG_THERM_ADT746X=m 848CONFIG_THERM_ADT746X=m
799# CONFIG_WINDFARM is not set 849# CONFIG_WINDFARM is not set
800# CONFIG_ANSLCD is not set 850# CONFIG_ANSLCD is not set
851CONFIG_PMAC_RACKMETER=m
801 852
802# 853#
803# Network device support 854# Network device support
@@ -838,6 +889,7 @@ CONFIG_SUNGEM=y
838# CONFIG_HP100 is not set 889# CONFIG_HP100 is not set
839CONFIG_NET_PCI=y 890CONFIG_NET_PCI=y
840CONFIG_PCNET32=y 891CONFIG_PCNET32=y
892# CONFIG_PCNET32_NAPI is not set
841# CONFIG_AMD8111_ETH is not set 893# CONFIG_AMD8111_ETH is not set
842# CONFIG_ADAPTEC_STARFIRE is not set 894# CONFIG_ADAPTEC_STARFIRE is not set
843# CONFIG_B44 is not set 895# CONFIG_B44 is not set
@@ -874,6 +926,7 @@ CONFIG_PCNET32=y
874# CONFIG_TIGON3 is not set 926# CONFIG_TIGON3 is not set
875# CONFIG_BNX2 is not set 927# CONFIG_BNX2 is not set
876# CONFIG_MV643XX_ETH is not set 928# CONFIG_MV643XX_ETH is not set
929# CONFIG_QLA3XXX is not set
877 930
878# 931#
879# Ethernet (10000 Mbit) 932# Ethernet (10000 Mbit)
@@ -882,6 +935,7 @@ CONFIG_PCNET32=y
882# CONFIG_IXGB is not set 935# CONFIG_IXGB is not set
883# CONFIG_S2IO is not set 936# CONFIG_S2IO is not set
884# CONFIG_MYRI10GE is not set 937# CONFIG_MYRI10GE is not set
938# CONFIG_NETXEN_NIC is not set
885 939
886# 940#
887# Token Ring devices 941# Token Ring devices
@@ -957,6 +1011,7 @@ CONFIG_PPP_BSDCOMP=m
957# CONFIG_PPP_MPPE is not set 1011# CONFIG_PPP_MPPE is not set
958# CONFIG_PPPOE is not set 1012# CONFIG_PPPOE is not set
959# CONFIG_SLIP is not set 1013# CONFIG_SLIP is not set
1014CONFIG_SLHC=y
960# CONFIG_NET_FC is not set 1015# CONFIG_NET_FC is not set
961# CONFIG_SHAPER is not set 1016# CONFIG_SHAPER is not set
962# CONFIG_NETCONSOLE is not set 1017# CONFIG_NETCONSOLE is not set
@@ -977,6 +1032,7 @@ CONFIG_PPP_BSDCOMP=m
977# Input device support 1032# Input device support
978# 1033#
979CONFIG_INPUT=y 1034CONFIG_INPUT=y
1035# CONFIG_INPUT_FF_MEMLESS is not set
980 1036
981# 1037#
982# Userland interfaces 1038# Userland interfaces
@@ -999,6 +1055,7 @@ CONFIG_INPUT_KEYBOARD=y
999# CONFIG_KEYBOARD_LKKBD is not set 1055# CONFIG_KEYBOARD_LKKBD is not set
1000# CONFIG_KEYBOARD_XTKBD is not set 1056# CONFIG_KEYBOARD_XTKBD is not set
1001# CONFIG_KEYBOARD_NEWTON is not set 1057# CONFIG_KEYBOARD_NEWTON is not set
1058# CONFIG_KEYBOARD_STOWAWAY is not set
1002CONFIG_INPUT_MOUSE=y 1059CONFIG_INPUT_MOUSE=y
1003# CONFIG_MOUSE_PS2 is not set 1060# CONFIG_MOUSE_PS2 is not set
1004# CONFIG_MOUSE_SERIAL is not set 1061# CONFIG_MOUSE_SERIAL is not set
@@ -1039,6 +1096,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
1039# 1096#
1040# Non-8250 serial port support 1097# Non-8250 serial port support
1041# 1098#
1099# CONFIG_SERIAL_UARTLITE is not set
1042CONFIG_SERIAL_CORE=m 1100CONFIG_SERIAL_CORE=m
1043CONFIG_SERIAL_PMACZILOG=m 1101CONFIG_SERIAL_PMACZILOG=m
1044# CONFIG_SERIAL_JSM is not set 1102# CONFIG_SERIAL_JSM is not set
@@ -1062,13 +1120,7 @@ CONFIG_GEN_RTC=y
1062# CONFIG_DTLK is not set 1120# CONFIG_DTLK is not set
1063# CONFIG_R3964 is not set 1121# CONFIG_R3964 is not set
1064# CONFIG_APPLICOM is not set 1122# CONFIG_APPLICOM is not set
1065
1066#
1067# Ftape, the floppy tape device driver
1068#
1069CONFIG_AGP=m 1123CONFIG_AGP=m
1070# CONFIG_AGP_SIS is not set
1071# CONFIG_AGP_VIA is not set
1072CONFIG_AGP_UNINORTH=m 1124CONFIG_AGP_UNINORTH=m
1073CONFIG_DRM=m 1125CONFIG_DRM=m
1074# CONFIG_DRM_TDFX is not set 1126# CONFIG_DRM_TDFX is not set
@@ -1091,7 +1143,6 @@ CONFIG_DRM_RADEON=m
1091# TPM devices 1143# TPM devices
1092# 1144#
1093# CONFIG_TCG_TPM is not set 1145# CONFIG_TCG_TPM is not set
1094# CONFIG_TELCLOCK is not set
1095 1146
1096# 1147#
1097# I2C support 1148# I2C support
@@ -1167,14 +1218,9 @@ CONFIG_I2C_POWERMAC=y
1167# CONFIG_HWMON_VID is not set 1218# CONFIG_HWMON_VID is not set
1168 1219
1169# 1220#
1170# Misc devices
1171#
1172
1173#
1174# Multimedia devices 1221# Multimedia devices
1175# 1222#
1176# CONFIG_VIDEO_DEV is not set 1223# CONFIG_VIDEO_DEV is not set
1177CONFIG_VIDEO_V4L2=y
1178 1224
1179# 1225#
1180# Digital Video Broadcasting Devices 1226# Digital Video Broadcasting Devices
@@ -1187,6 +1233,7 @@ CONFIG_VIDEO_V4L2=y
1187# 1233#
1188# CONFIG_FIRMWARE_EDID is not set 1234# CONFIG_FIRMWARE_EDID is not set
1189CONFIG_FB=y 1235CONFIG_FB=y
1236CONFIG_FB_DDC=y
1190CONFIG_FB_CFB_FILLRECT=y 1237CONFIG_FB_CFB_FILLRECT=y
1191CONFIG_FB_CFB_COPYAREA=y 1238CONFIG_FB_CFB_COPYAREA=y
1192CONFIG_FB_CFB_IMAGEBLIT=y 1239CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1235,6 +1282,7 @@ CONFIG_FB_3DFX=y
1235# CONFIG_FB_3DFX_ACCEL is not set 1282# CONFIG_FB_3DFX_ACCEL is not set
1236# CONFIG_FB_VOODOO1 is not set 1283# CONFIG_FB_VOODOO1 is not set
1237# CONFIG_FB_TRIDENT is not set 1284# CONFIG_FB_TRIDENT is not set
1285# CONFIG_FB_IBM_GXT4500 is not set
1238# CONFIG_FB_VIRTUAL is not set 1286# CONFIG_FB_VIRTUAL is not set
1239 1287
1240# 1288#
@@ -1393,6 +1441,11 @@ CONFIG_SND_USB_AUDIO=m
1393# CONFIG_SOUND_PRIME is not set 1441# CONFIG_SOUND_PRIME is not set
1394 1442
1395# 1443#
1444# HID Devices
1445#
1446CONFIG_HID=y
1447
1448#
1396# USB support 1449# USB support
1397# 1450#
1398CONFIG_USB_ARCH_HAS_HCD=y 1451CONFIG_USB_ARCH_HAS_HCD=y
@@ -1408,6 +1461,7 @@ CONFIG_USB_DEVICEFS=y
1408# CONFIG_USB_BANDWIDTH is not set 1461# CONFIG_USB_BANDWIDTH is not set
1409CONFIG_USB_DYNAMIC_MINORS=y 1462CONFIG_USB_DYNAMIC_MINORS=y
1410# CONFIG_USB_SUSPEND is not set 1463# CONFIG_USB_SUSPEND is not set
1464# CONFIG_USB_MULTITHREAD_PROBE is not set
1411# CONFIG_USB_OTG is not set 1465# CONFIG_USB_OTG is not set
1412 1466
1413# 1467#
@@ -1448,13 +1502,13 @@ CONFIG_USB_STORAGE=m
1448# CONFIG_USB_STORAGE_SDDR55 is not set 1502# CONFIG_USB_STORAGE_SDDR55 is not set
1449# CONFIG_USB_STORAGE_JUMPSHOT is not set 1503# CONFIG_USB_STORAGE_JUMPSHOT is not set
1450# CONFIG_USB_STORAGE_ALAUDA is not set 1504# CONFIG_USB_STORAGE_ALAUDA is not set
1505# CONFIG_USB_STORAGE_KARMA is not set
1451# CONFIG_USB_LIBUSUAL is not set 1506# CONFIG_USB_LIBUSUAL is not set
1452 1507
1453# 1508#
1454# USB Input Devices 1509# USB Input Devices
1455# 1510#
1456CONFIG_USB_HID=y 1511CONFIG_USB_HID=y
1457CONFIG_USB_HIDINPUT=y
1458CONFIG_USB_HIDINPUT_POWERBOOK=y 1512CONFIG_USB_HIDINPUT_POWERBOOK=y
1459# CONFIG_HID_FF is not set 1513# CONFIG_HID_FF is not set
1460# CONFIG_USB_HIDDEV is not set 1514# CONFIG_USB_HIDDEV is not set
@@ -1484,12 +1538,14 @@ CONFIG_USB_APPLETOUCH=y
1484# CONFIG_USB_KAWETH is not set 1538# CONFIG_USB_KAWETH is not set
1485# CONFIG_USB_PEGASUS is not set 1539# CONFIG_USB_PEGASUS is not set
1486# CONFIG_USB_RTL8150 is not set 1540# CONFIG_USB_RTL8150 is not set
1541CONFIG_USB_USBNET_MII=m
1487CONFIG_USB_USBNET=m 1542CONFIG_USB_USBNET=m
1488CONFIG_USB_NET_AX8817X=m 1543CONFIG_USB_NET_AX8817X=m
1489CONFIG_USB_NET_CDCETHER=m 1544CONFIG_USB_NET_CDCETHER=m
1490# CONFIG_USB_NET_GL620A is not set 1545# CONFIG_USB_NET_GL620A is not set
1491CONFIG_USB_NET_NET1080=m 1546CONFIG_USB_NET_NET1080=m
1492# CONFIG_USB_NET_PLUSB is not set 1547# CONFIG_USB_NET_PLUSB is not set
1548# CONFIG_USB_NET_MCS7830 is not set
1493# CONFIG_USB_NET_RNDIS_HOST is not set 1549# CONFIG_USB_NET_RNDIS_HOST is not set
1494# CONFIG_USB_NET_CDC_SUBSET is not set 1550# CONFIG_USB_NET_CDC_SUBSET is not set
1495CONFIG_USB_NET_ZAURUS=m 1551CONFIG_USB_NET_ZAURUS=m
@@ -1504,6 +1560,7 @@ CONFIG_USB_MON=y
1504# 1560#
1505CONFIG_USB_SERIAL=m 1561CONFIG_USB_SERIAL=m
1506# CONFIG_USB_SERIAL_GENERIC is not set 1562# CONFIG_USB_SERIAL_GENERIC is not set
1563# CONFIG_USB_SERIAL_AIRCABLE is not set
1507# CONFIG_USB_SERIAL_AIRPRIME is not set 1564# CONFIG_USB_SERIAL_AIRPRIME is not set
1508# CONFIG_USB_SERIAL_ARK3116 is not set 1565# CONFIG_USB_SERIAL_ARK3116 is not set
1509# CONFIG_USB_SERIAL_BELKIN is not set 1566# CONFIG_USB_SERIAL_BELKIN is not set
@@ -1538,6 +1595,8 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1538# CONFIG_USB_SERIAL_KLSI is not set 1595# CONFIG_USB_SERIAL_KLSI is not set
1539# CONFIG_USB_SERIAL_KOBIL_SCT is not set 1596# CONFIG_USB_SERIAL_KOBIL_SCT is not set
1540# CONFIG_USB_SERIAL_MCT_U232 is not set 1597# CONFIG_USB_SERIAL_MCT_U232 is not set
1598# CONFIG_USB_SERIAL_MOS7720 is not set
1599# CONFIG_USB_SERIAL_MOS7840 is not set
1541# CONFIG_USB_SERIAL_NAVMAN is not set 1600# CONFIG_USB_SERIAL_NAVMAN is not set
1542# CONFIG_USB_SERIAL_PL2303 is not set 1601# CONFIG_USB_SERIAL_PL2303 is not set
1543# CONFIG_USB_SERIAL_HP4X is not set 1602# CONFIG_USB_SERIAL_HP4X is not set
@@ -1548,6 +1607,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1548# CONFIG_USB_SERIAL_XIRCOM is not set 1607# CONFIG_USB_SERIAL_XIRCOM is not set
1549# CONFIG_USB_SERIAL_OPTION is not set 1608# CONFIG_USB_SERIAL_OPTION is not set
1550# CONFIG_USB_SERIAL_OMNINET is not set 1609# CONFIG_USB_SERIAL_OMNINET is not set
1610# CONFIG_USB_SERIAL_DEBUG is not set
1551CONFIG_USB_EZUSB=y 1611CONFIG_USB_EZUSB=y
1552 1612
1553# 1613#
@@ -1555,6 +1615,7 @@ CONFIG_USB_EZUSB=y
1555# 1615#
1556# CONFIG_USB_EMI62 is not set 1616# CONFIG_USB_EMI62 is not set
1557# CONFIG_USB_EMI26 is not set 1617# CONFIG_USB_EMI26 is not set
1618# CONFIG_USB_ADUTUX is not set
1558# CONFIG_USB_AUERSWALD is not set 1619# CONFIG_USB_AUERSWALD is not set
1559# CONFIG_USB_RIO500 is not set 1620# CONFIG_USB_RIO500 is not set
1560# CONFIG_USB_LEGOTOWER is not set 1621# CONFIG_USB_LEGOTOWER is not set
@@ -1562,12 +1623,13 @@ CONFIG_USB_EZUSB=y
1562# CONFIG_USB_LED is not set 1623# CONFIG_USB_LED is not set
1563# CONFIG_USB_CYPRESS_CY7C63 is not set 1624# CONFIG_USB_CYPRESS_CY7C63 is not set
1564# CONFIG_USB_CYTHERM is not set 1625# CONFIG_USB_CYTHERM is not set
1565# CONFIG_USB_PHIDGETKIT is not set 1626# CONFIG_USB_PHIDGET is not set
1566# CONFIG_USB_PHIDGETSERVO is not set
1567# CONFIG_USB_IDMOUSE is not set 1627# CONFIG_USB_IDMOUSE is not set
1628# CONFIG_USB_FTDI_ELAN is not set
1568CONFIG_USB_APPLEDISPLAY=m 1629CONFIG_USB_APPLEDISPLAY=m
1569# CONFIG_USB_SISUSBVGA is not set 1630# CONFIG_USB_SISUSBVGA is not set
1570# CONFIG_USB_LD is not set 1631# CONFIG_USB_LD is not set
1632# CONFIG_USB_TRANCEVIBRATOR is not set
1571# CONFIG_USB_TEST is not set 1633# CONFIG_USB_TEST is not set
1572 1634
1573# 1635#
@@ -1630,6 +1692,10 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
1630# 1692#
1631 1693
1632# 1694#
1695# Virtualization
1696#
1697
1698#
1633# File systems 1699# File systems
1634# 1700#
1635CONFIG_EXT2_FS=y 1701CONFIG_EXT2_FS=y
@@ -1639,6 +1705,7 @@ CONFIG_EXT3_FS=y
1639CONFIG_EXT3_FS_XATTR=y 1705CONFIG_EXT3_FS_XATTR=y
1640CONFIG_EXT3_FS_POSIX_ACL=y 1706CONFIG_EXT3_FS_POSIX_ACL=y
1641# CONFIG_EXT3_FS_SECURITY is not set 1707# CONFIG_EXT3_FS_SECURITY is not set
1708# CONFIG_EXT4DEV_FS is not set
1642CONFIG_JBD=y 1709CONFIG_JBD=y
1643# CONFIG_JBD_DEBUG is not set 1710# CONFIG_JBD_DEBUG is not set
1644CONFIG_FS_MBCACHE=y 1711CONFIG_FS_MBCACHE=y
@@ -1646,6 +1713,7 @@ CONFIG_FS_MBCACHE=y
1646# CONFIG_JFS_FS is not set 1713# CONFIG_JFS_FS is not set
1647CONFIG_FS_POSIX_ACL=y 1714CONFIG_FS_POSIX_ACL=y
1648# CONFIG_XFS_FS is not set 1715# CONFIG_XFS_FS is not set
1716# CONFIG_GFS2_FS is not set
1649# CONFIG_OCFS2_FS is not set 1717# CONFIG_OCFS2_FS is not set
1650# CONFIG_MINIX_FS is not set 1718# CONFIG_MINIX_FS is not set
1651# CONFIG_ROMFS_FS is not set 1719# CONFIG_ROMFS_FS is not set
@@ -1682,8 +1750,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1682# 1750#
1683CONFIG_PROC_FS=y 1751CONFIG_PROC_FS=y
1684CONFIG_PROC_KCORE=y 1752CONFIG_PROC_KCORE=y
1753CONFIG_PROC_SYSCTL=y
1685CONFIG_SYSFS=y 1754CONFIG_SYSFS=y
1686CONFIG_TMPFS=y 1755CONFIG_TMPFS=y
1756# CONFIG_TMPFS_POSIX_ACL is not set
1687# CONFIG_HUGETLB_PAGE is not set 1757# CONFIG_HUGETLB_PAGE is not set
1688CONFIG_RAMFS=y 1758CONFIG_RAMFS=y
1689# CONFIG_CONFIGFS_FS is not set 1759# CONFIG_CONFIGFS_FS is not set
@@ -1802,8 +1872,14 @@ CONFIG_NLS_ISO8859_1=m
1802CONFIG_NLS_UTF8=m 1872CONFIG_NLS_UTF8=m
1803 1873
1804# 1874#
1875# Distributed Lock Manager
1876#
1877# CONFIG_DLM is not set
1878
1879#
1805# Library routines 1880# Library routines
1806# 1881#
1882CONFIG_BITREVERSE=y
1807CONFIG_CRC_CCITT=y 1883CONFIG_CRC_CCITT=y
1808CONFIG_CRC16=y 1884CONFIG_CRC16=y
1809CONFIG_CRC32=y 1885CONFIG_CRC32=y
@@ -1815,6 +1891,7 @@ CONFIG_TEXTSEARCH_KMP=m
1815CONFIG_TEXTSEARCH_BM=m 1891CONFIG_TEXTSEARCH_BM=m
1816CONFIG_TEXTSEARCH_FSM=m 1892CONFIG_TEXTSEARCH_FSM=m
1817CONFIG_PLIST=y 1893CONFIG_PLIST=y
1894CONFIG_IOMAP_COPY=y
1818 1895
1819# 1896#
1820# Instrumentation Support 1897# Instrumentation Support
@@ -1826,8 +1903,11 @@ CONFIG_OPROFILE=y
1826# Kernel hacking 1903# Kernel hacking
1827# 1904#
1828# CONFIG_PRINTK_TIME is not set 1905# CONFIG_PRINTK_TIME is not set
1906CONFIG_ENABLE_MUST_CHECK=y
1829CONFIG_MAGIC_SYSRQ=y 1907CONFIG_MAGIC_SYSRQ=y
1830# CONFIG_UNUSED_SYMBOLS is not set 1908# CONFIG_UNUSED_SYMBOLS is not set
1909# CONFIG_DEBUG_FS is not set
1910# CONFIG_HEADERS_CHECK is not set
1831CONFIG_DEBUG_KERNEL=y 1911CONFIG_DEBUG_KERNEL=y
1832CONFIG_LOG_BUF_SHIFT=14 1912CONFIG_LOG_BUF_SHIFT=14
1833CONFIG_DETECT_SOFTLOCKUP=y 1913CONFIG_DETECT_SOFTLOCKUP=y
@@ -1841,14 +1921,16 @@ CONFIG_DETECT_SOFTLOCKUP=y
1841# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1921# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1842# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1922# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1843# CONFIG_DEBUG_KOBJECT is not set 1923# CONFIG_DEBUG_KOBJECT is not set
1924CONFIG_DEBUG_BUGVERBOSE=y
1844# CONFIG_DEBUG_INFO is not set 1925# CONFIG_DEBUG_INFO is not set
1845# CONFIG_DEBUG_FS is not set
1846# CONFIG_DEBUG_VM is not set 1926# CONFIG_DEBUG_VM is not set
1927# CONFIG_DEBUG_LIST is not set
1847# CONFIG_FORCED_INLINING is not set 1928# CONFIG_FORCED_INLINING is not set
1848# CONFIG_RCU_TORTURE_TEST is not set 1929# CONFIG_RCU_TORTURE_TEST is not set
1849CONFIG_DEBUGGER=y 1930CONFIG_DEBUGGER=y
1850CONFIG_XMON=y 1931CONFIG_XMON=y
1851CONFIG_XMON_DEFAULT=y 1932CONFIG_XMON_DEFAULT=y
1933CONFIG_XMON_DISASSEMBLY=y
1852# CONFIG_BDI_SWITCH is not set 1934# CONFIG_BDI_SWITCH is not set
1853CONFIG_BOOTX_TEXT=y 1935CONFIG_BOOTX_TEXT=y
1854# CONFIG_PPC_EARLY_DEBUG is not set 1936# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1863,7 +1945,12 @@ CONFIG_BOOTX_TEXT=y
1863# Cryptographic options 1945# Cryptographic options
1864# 1946#
1865CONFIG_CRYPTO=y 1947CONFIG_CRYPTO=y
1948CONFIG_CRYPTO_ALGAPI=y
1949CONFIG_CRYPTO_BLKCIPHER=y
1950CONFIG_CRYPTO_HASH=y
1951CONFIG_CRYPTO_MANAGER=y
1866CONFIG_CRYPTO_HMAC=y 1952CONFIG_CRYPTO_HMAC=y
1953# CONFIG_CRYPTO_XCBC is not set
1867CONFIG_CRYPTO_NULL=m 1954CONFIG_CRYPTO_NULL=m
1868CONFIG_CRYPTO_MD4=m 1955CONFIG_CRYPTO_MD4=m
1869CONFIG_CRYPTO_MD5=y 1956CONFIG_CRYPTO_MD5=y
@@ -1872,9 +1959,14 @@ CONFIG_CRYPTO_SHA256=m
1872CONFIG_CRYPTO_SHA512=m 1959CONFIG_CRYPTO_SHA512=m
1873CONFIG_CRYPTO_WP512=m 1960CONFIG_CRYPTO_WP512=m
1874CONFIG_CRYPTO_TGR192=m 1961CONFIG_CRYPTO_TGR192=m
1962# CONFIG_CRYPTO_GF128MUL is not set
1963CONFIG_CRYPTO_ECB=m
1964CONFIG_CRYPTO_CBC=y
1965# CONFIG_CRYPTO_LRW is not set
1875CONFIG_CRYPTO_DES=y 1966CONFIG_CRYPTO_DES=y
1876CONFIG_CRYPTO_BLOWFISH=m 1967CONFIG_CRYPTO_BLOWFISH=m
1877CONFIG_CRYPTO_TWOFISH=m 1968CONFIG_CRYPTO_TWOFISH=m
1969CONFIG_CRYPTO_TWOFISH_COMMON=m
1878CONFIG_CRYPTO_SERPENT=m 1970CONFIG_CRYPTO_SERPENT=m
1879CONFIG_CRYPTO_AES=m 1971CONFIG_CRYPTO_AES=m
1880CONFIG_CRYPTO_CAST5=m 1972CONFIG_CRYPTO_CAST5=m
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 340376a47001..debac66e8258 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_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.20-rc3 3# Linux kernel version: 2.6.20-rc5
4# Tue Jan 2 15:32:44 2007 4# Mon Jan 22 22:28:58 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -246,7 +246,6 @@ CONFIG_PPC_I8259=y
246CONFIG_PCI=y 246CONFIG_PCI=y
247CONFIG_PCI_DOMAINS=y 247CONFIG_PCI_DOMAINS=y
248# CONFIG_PCIEPORTBUS is not set 248# CONFIG_PCIEPORTBUS is not set
249# CONFIG_PCI_MULTITHREAD_PROBE is not set
250# CONFIG_PCI_DEBUG is not set 249# CONFIG_PCI_DEBUG is not set
251 250
252# 251#
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 70ed61337f5c..32560876c3dc 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_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.19-rc6 3# Linux kernel version: 2.6.20-rc5
4# Tue Nov 21 19:38:53 2006 4# Mon Jan 22 22:29:11 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_ARCH_HAS_ILOG2_U64=y
13CONFIG_GENERIC_HWEIGHT=y 15CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 17CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -23,6 +25,7 @@ CONFIG_PPC_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 25# CONFIG_PPC_UDBG_16550 is not set
24# CONFIG_GENERIC_TBSYNC is not set 26# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y
26# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
27 30
28# 31#
@@ -64,6 +67,7 @@ CONFIG_SYSVIPC=y
64# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
65# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
66# CONFIG_CPUSETS is not set 69# CONFIG_CPUSETS is not set
70CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 71# CONFIG_RELAY is not set
68CONFIG_INITRAMFS_SOURCE="" 72CONFIG_INITRAMFS_SOURCE=""
69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 73# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -126,6 +130,7 @@ CONFIG_PPC_MULTIPLATFORM=y
126# CONFIG_APUS is not set 130# CONFIG_APUS is not set
127# CONFIG_PPC_PSERIES is not set 131# CONFIG_PPC_PSERIES is not set
128# CONFIG_PPC_ISERIES is not set 132# CONFIG_PPC_ISERIES is not set
133# CONFIG_PPC_MPC52xx is not set
129# CONFIG_PPC_PMAC is not set 134# CONFIG_PPC_PMAC is not set
130# CONFIG_PPC_MAPLE is not set 135# CONFIG_PPC_MAPLE is not set
131# CONFIG_PPC_PASEMI is not set 136# CONFIG_PPC_PASEMI is not set
@@ -164,6 +169,7 @@ CONFIG_PS3_VUART=y
164# 169#
165# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
166CONFIG_HZ_250=y 171CONFIG_HZ_250=y
172# CONFIG_HZ_300 is not set
167# CONFIG_HZ_1000 is not set 173# CONFIG_HZ_1000 is not set
168CONFIG_HZ=250 174CONFIG_HZ=250
169CONFIG_PREEMPT_NONE=y 175CONFIG_PREEMPT_NONE=y
@@ -261,6 +267,7 @@ CONFIG_IP_PNP_DHCP=y
261# CONFIG_TCP_CONG_ADVANCED is not set 267# CONFIG_TCP_CONG_ADVANCED is not set
262CONFIG_TCP_CONG_CUBIC=y 268CONFIG_TCP_CONG_CUBIC=y
263CONFIG_DEFAULT_TCP_CONG="cubic" 269CONFIG_DEFAULT_TCP_CONG="cubic"
270# CONFIG_TCP_MD5SIG is not set
264# CONFIG_IPV6 is not set 271# CONFIG_IPV6 is not set
265# CONFIG_INET6_XFRM_TUNNEL is not set 272# CONFIG_INET6_XFRM_TUNNEL is not set
266# CONFIG_INET6_TUNNEL is not set 273# CONFIG_INET6_TUNNEL is not set
@@ -366,6 +373,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
366# 373#
367# CONFIG_RAID_ATTRS is not set 374# CONFIG_RAID_ATTRS is not set
368CONFIG_SCSI=y 375CONFIG_SCSI=y
376# CONFIG_SCSI_TGT is not set
369# CONFIG_SCSI_NETLINK is not set 377# CONFIG_SCSI_NETLINK is not set
370CONFIG_SCSI_PROC_FS=y 378CONFIG_SCSI_PROC_FS=y
371 379
@@ -385,6 +393,7 @@ CONFIG_SCSI_PROC_FS=y
385# CONFIG_SCSI_MULTI_LUN is not set 393# CONFIG_SCSI_MULTI_LUN is not set
386# CONFIG_SCSI_CONSTANTS is not set 394# CONFIG_SCSI_CONSTANTS is not set
387# CONFIG_SCSI_LOGGING is not set 395# CONFIG_SCSI_LOGGING is not set
396# CONFIG_SCSI_SCAN_ASYNC is not set
388 397
389# 398#
390# SCSI Transports 399# SCSI Transports
@@ -427,6 +436,7 @@ CONFIG_SCSI_PROC_FS=y
427# 436#
428# Macintosh device drivers 437# Macintosh device drivers
429# 438#
439# CONFIG_MAC_EMUMOUSEBTN is not set
430# CONFIG_WINDFARM is not set 440# CONFIG_WINDFARM is not set
431 441
432# 442#
@@ -549,10 +559,6 @@ CONFIG_GEN_RTC=y
549# CONFIG_GEN_RTC_X is not set 559# CONFIG_GEN_RTC_X is not set
550# CONFIG_DTLK is not set 560# CONFIG_DTLK is not set
551# CONFIG_R3964 is not set 561# CONFIG_R3964 is not set
552
553#
554# Ftape, the floppy tape device driver
555#
556# CONFIG_RAW_DRIVER is not set 562# CONFIG_RAW_DRIVER is not set
557# CONFIG_HANGCHECK_TIMER is not set 563# CONFIG_HANGCHECK_TIMER is not set
558 564
@@ -598,6 +604,7 @@ CONFIG_GEN_RTC=y
598# 604#
599# CONFIG_FIRMWARE_EDID is not set 605# CONFIG_FIRMWARE_EDID is not set
600# CONFIG_FB is not set 606# CONFIG_FB is not set
607# CONFIG_FB_IBM_GXT4500 is not set
601 608
602# 609#
603# Console display driver support 610# Console display driver support
@@ -612,6 +619,11 @@ CONFIG_DUMMY_CONSOLE=y
612# CONFIG_SOUND is not set 619# CONFIG_SOUND is not set
613 620
614# 621#
622# HID Devices
623#
624CONFIG_HID=y
625
626#
615# USB support 627# USB support
616# 628#
617# CONFIG_USB_ARCH_HAS_HCD is not set 629# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -672,6 +684,10 @@ CONFIG_DUMMY_CONSOLE=y
672# 684#
673 685
674# 686#
687# Virtualization
688#
689
690#
675# File systems 691# File systems
676# 692#
677# CONFIG_EXT2_FS is not set 693# CONFIG_EXT2_FS is not set
@@ -772,6 +788,11 @@ CONFIG_MSDOS_PARTITION=y
772# CONFIG_NLS is not set 788# CONFIG_NLS is not set
773 789
774# 790#
791# Distributed Lock Manager
792#
793# CONFIG_DLM is not set
794
795#
775# Library routines 796# Library routines
776# 797#
777# CONFIG_CRC_CCITT is not set 798# CONFIG_CRC_CCITT is not set
@@ -779,6 +800,7 @@ CONFIG_MSDOS_PARTITION=y
779# CONFIG_CRC32 is not set 800# CONFIG_CRC32 is not set
780# CONFIG_LIBCRC32C is not set 801# CONFIG_LIBCRC32C is not set
781CONFIG_PLIST=y 802CONFIG_PLIST=y
803CONFIG_IOMAP_COPY=y
782 804
783# 805#
784# Instrumentation Support 806# Instrumentation Support
@@ -793,6 +815,8 @@ CONFIG_PLIST=y
793CONFIG_ENABLE_MUST_CHECK=y 815CONFIG_ENABLE_MUST_CHECK=y
794# CONFIG_MAGIC_SYSRQ is not set 816# CONFIG_MAGIC_SYSRQ is not set
795# CONFIG_UNUSED_SYMBOLS is not set 817# CONFIG_UNUSED_SYMBOLS is not set
818# CONFIG_DEBUG_FS is not set
819# CONFIG_HEADERS_CHECK is not set
796CONFIG_DEBUG_KERNEL=y 820CONFIG_DEBUG_KERNEL=y
797CONFIG_LOG_BUF_SHIFT=17 821CONFIG_LOG_BUF_SHIFT=17
798CONFIG_DETECT_SOFTLOCKUP=y 822CONFIG_DETECT_SOFTLOCKUP=y
@@ -806,12 +830,11 @@ CONFIG_DEBUG_SPINLOCK=y
806CONFIG_DEBUG_SPINLOCK_SLEEP=y 830CONFIG_DEBUG_SPINLOCK_SLEEP=y
807# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 831# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
808# CONFIG_DEBUG_KOBJECT is not set 832# CONFIG_DEBUG_KOBJECT is not set
833# CONFIG_DEBUG_BUGVERBOSE is not set
809CONFIG_DEBUG_INFO=y 834CONFIG_DEBUG_INFO=y
810# CONFIG_DEBUG_FS is not set
811# CONFIG_DEBUG_VM is not set 835# CONFIG_DEBUG_VM is not set
812CONFIG_DEBUG_LIST=y 836CONFIG_DEBUG_LIST=y
813CONFIG_FORCED_INLINING=y 837CONFIG_FORCED_INLINING=y
814# CONFIG_HEADERS_CHECK is not set
815# CONFIG_RCU_TORTURE_TEST is not set 838# CONFIG_RCU_TORTURE_TEST is not set
816# CONFIG_DEBUG_STACKOVERFLOW is not set 839# CONFIG_DEBUG_STACKOVERFLOW is not set
817# CONFIG_DEBUG_STACK_USAGE is not set 840# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index d2833c1a1f3d..1c794fe718fd 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-rc6 3# Linux kernel version: 2.6.20-rc5
4# Sun Sep 10 10:45:12 2006 4# Mon Jan 22 22:31:27 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y 11CONFIG_IRQ_PER_CPU=y
12CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_ARCH_HAS_ILOG2_U64=y
13CONFIG_GENERIC_HWEIGHT=y 15CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y 17CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -22,6 +24,8 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 24CONFIG_PPC_OF=y
23CONFIG_PPC_UDBG_16550=y 25CONFIG_PPC_UDBG_16550=y
24# CONFIG_GENERIC_TBSYNC is not set 26# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y
25# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
26 30
27# 31#
@@ -31,6 +35,9 @@ CONFIG_PPC_UDBG_16550=y
31CONFIG_POWER3=y 35CONFIG_POWER3=y
32CONFIG_POWER4=y 36CONFIG_POWER4=y
33CONFIG_PPC_FPU=y 37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set
39# CONFIG_PPC_DCR_MMIO is not set
40# CONFIG_PPC_OF_PLATFORM_PCI is not set
34CONFIG_ALTIVEC=y 41CONFIG_ALTIVEC=y
35CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
36CONFIG_VIRT_CPU_ACCOUNTING=y 43CONFIG_VIRT_CPU_ACCOUNTING=y
@@ -52,19 +59,22 @@ CONFIG_LOCALVERSION=""
52CONFIG_LOCALVERSION_AUTO=y 59CONFIG_LOCALVERSION_AUTO=y
53CONFIG_SWAP=y 60CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
62# CONFIG_IPC_NS is not set
55CONFIG_POSIX_MQUEUE=y 63CONFIG_POSIX_MQUEUE=y
56# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
57# CONFIG_TASKSTATS is not set 65# CONFIG_UTS_NS is not set
58CONFIG_SYSCTL=y
59CONFIG_AUDIT=y 66CONFIG_AUDIT=y
60CONFIG_AUDITSYSCALL=y 67CONFIG_AUDITSYSCALL=y
61CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
62CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
63CONFIG_CPUSETS=y 70CONFIG_CPUSETS=y
71CONFIG_SYSFS_DEPRECATED=y
64# CONFIG_RELAY is not set 72# CONFIG_RELAY is not set
65CONFIG_INITRAMFS_SOURCE="" 73CONFIG_INITRAMFS_SOURCE=""
66CONFIG_CC_OPTIMIZE_FOR_SIZE=y 74CONFIG_CC_OPTIMIZE_FOR_SIZE=y
75CONFIG_SYSCTL=y
67# CONFIG_EMBEDDED is not set 76# CONFIG_EMBEDDED is not set
77CONFIG_SYSCTL_SYSCALL=y
68CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
69CONFIG_KALLSYMS_ALL=y 79CONFIG_KALLSYMS_ALL=y
70# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -73,12 +83,12 @@ CONFIG_PRINTK=y
73CONFIG_BUG=y 83CONFIG_BUG=y
74CONFIG_ELF_CORE=y 84CONFIG_ELF_CORE=y
75CONFIG_BASE_FULL=y 85CONFIG_BASE_FULL=y
76CONFIG_RT_MUTEXES=y
77CONFIG_FUTEX=y 86CONFIG_FUTEX=y
78CONFIG_EPOLL=y 87CONFIG_EPOLL=y
79CONFIG_SHMEM=y 88CONFIG_SHMEM=y
80CONFIG_SLAB=y 89CONFIG_SLAB=y
81CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
91CONFIG_RT_MUTEXES=y
82# CONFIG_TINY_SHMEM is not set 92# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 93CONFIG_BASE_SMALL=0
84# CONFIG_SLOB is not set 94# CONFIG_SLOB is not set
@@ -97,6 +107,7 @@ CONFIG_STOP_MACHINE=y
97# 107#
98# Block layer 108# Block layer
99# 109#
110CONFIG_BLOCK=y
100# CONFIG_BLK_DEV_IO_TRACE is not set 111# CONFIG_BLK_DEV_IO_TRACE is not set
101 112
102# 113#
@@ -116,15 +127,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
116# Platform support 127# Platform support
117# 128#
118CONFIG_PPC_MULTIPLATFORM=y 129CONFIG_PPC_MULTIPLATFORM=y
119# CONFIG_PPC_ISERIES is not set
120# CONFIG_EMBEDDED6xx is not set 130# CONFIG_EMBEDDED6xx is not set
121# CONFIG_APUS is not set 131# CONFIG_APUS is not set
122CONFIG_PPC_PSERIES=y 132CONFIG_PPC_PSERIES=y
133# CONFIG_PPC_ISERIES is not set
134# CONFIG_PPC_MPC52xx is not set
123# CONFIG_PPC_PMAC is not set 135# CONFIG_PPC_PMAC is not set
124# CONFIG_PPC_MAPLE is not set 136# CONFIG_PPC_MAPLE is not set
137# CONFIG_PPC_PASEMI is not set
125# CONFIG_PPC_CELL is not set 138# CONFIG_PPC_CELL is not set
126# CONFIG_PPC_CELL_NATIVE is not set 139# CONFIG_PPC_CELL_NATIVE is not set
127# CONFIG_PPC_IBM_CELL_BLADE is not set 140# CONFIG_PPC_IBM_CELL_BLADE is not set
141# CONFIG_PPC_PS3 is not set
142CONFIG_PPC_NATIVE=y
128# CONFIG_UDBG_RTAS_CONSOLE is not set 143# CONFIG_UDBG_RTAS_CONSOLE is not set
129CONFIG_XICS=y 144CONFIG_XICS=y
130# CONFIG_U3_DART is not set 145# CONFIG_U3_DART is not set
@@ -137,6 +152,8 @@ CONFIG_IBMVIO=y
137CONFIG_IBMEBUS=y 152CONFIG_IBMEBUS=y
138# CONFIG_PPC_MPC106 is not set 153# CONFIG_PPC_MPC106 is not set
139# CONFIG_PPC_970_NAP is not set 154# CONFIG_PPC_970_NAP is not set
155# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set
140# CONFIG_CPU_FREQ is not set 157# CONFIG_CPU_FREQ is not set
141# CONFIG_WANT_EARLY_SERIAL is not set 158# CONFIG_WANT_EARLY_SERIAL is not set
142CONFIG_MPIC=y 159CONFIG_MPIC=y
@@ -146,6 +163,7 @@ CONFIG_MPIC=y
146# 163#
147# CONFIG_HZ_100 is not set 164# CONFIG_HZ_100 is not set
148CONFIG_HZ_250=y 165CONFIG_HZ_250=y
166# CONFIG_HZ_300 is not set
149# CONFIG_HZ_1000 is not set 167# CONFIG_HZ_1000 is not set
150CONFIG_HZ=250 168CONFIG_HZ=250
151CONFIG_PREEMPT_NONE=y 169CONFIG_PREEMPT_NONE=y
@@ -170,6 +188,7 @@ CONFIG_NODES_SHIFT=4
170CONFIG_ARCH_SELECT_MEMORY_MODEL=y 188CONFIG_ARCH_SELECT_MEMORY_MODEL=y
171CONFIG_ARCH_SPARSEMEM_ENABLE=y 189CONFIG_ARCH_SPARSEMEM_ENABLE=y
172CONFIG_ARCH_SPARSEMEM_DEFAULT=y 190CONFIG_ARCH_SPARSEMEM_DEFAULT=y
191CONFIG_ARCH_POPULATES_NODE_MAP=y
173CONFIG_SELECT_MEMORY_MODEL=y 192CONFIG_SELECT_MEMORY_MODEL=y
174# CONFIG_FLATMEM_MANUAL is not set 193# CONFIG_FLATMEM_MANUAL is not set
175# CONFIG_DISCONTIGMEM_MANUAL is not set 194# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -183,7 +202,6 @@ CONFIG_SPARSEMEM_EXTREME=y
183CONFIG_SPLIT_PTLOCK_CPUS=4 202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_MIGRATION=y 203CONFIG_MIGRATION=y
185CONFIG_RESOURCES_64BIT=y 204CONFIG_RESOURCES_64BIT=y
186CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
187CONFIG_NODES_SPAN_OTHER_NODES=y 205CONFIG_NODES_SPAN_OTHER_NODES=y
188# CONFIG_PPC_64K_PAGES is not set 206# CONFIG_PPC_64K_PAGES is not set
189CONFIG_SCHED_SMT=y 207CONFIG_SCHED_SMT=y
@@ -235,6 +253,7 @@ CONFIG_PACKET=y
235CONFIG_UNIX=y 253CONFIG_UNIX=y
236CONFIG_XFRM=y 254CONFIG_XFRM=y
237CONFIG_XFRM_USER=m 255CONFIG_XFRM_USER=m
256# CONFIG_XFRM_SUB_POLICY is not set
238CONFIG_NET_KEY=m 257CONFIG_NET_KEY=m
239CONFIG_INET=y 258CONFIG_INET=y
240CONFIG_IP_MULTICAST=y 259CONFIG_IP_MULTICAST=y
@@ -253,10 +272,13 @@ CONFIG_INET_XFRM_TUNNEL=m
253CONFIG_INET_TUNNEL=y 272CONFIG_INET_TUNNEL=y
254CONFIG_INET_XFRM_MODE_TRANSPORT=y 273CONFIG_INET_XFRM_MODE_TRANSPORT=y
255CONFIG_INET_XFRM_MODE_TUNNEL=y 274CONFIG_INET_XFRM_MODE_TUNNEL=y
275CONFIG_INET_XFRM_MODE_BEET=y
256CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
257CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
258# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
259CONFIG_TCP_CONG_BIC=y 279CONFIG_TCP_CONG_CUBIC=y
280CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_TCP_MD5SIG is not set
260 282
261# 283#
262# IP: Virtual Server Configuration 284# IP: Virtual Server Configuration
@@ -275,25 +297,30 @@ CONFIG_NETFILTER=y
275CONFIG_NETFILTER_NETLINK=y 297CONFIG_NETFILTER_NETLINK=y
276CONFIG_NETFILTER_NETLINK_QUEUE=m 298CONFIG_NETFILTER_NETLINK_QUEUE=m
277CONFIG_NETFILTER_NETLINK_LOG=m 299CONFIG_NETFILTER_NETLINK_LOG=m
300CONFIG_NF_CONNTRACK_ENABLED=m
301CONFIG_NF_CONNTRACK_SUPPORT=y
302# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
303CONFIG_NF_CONNTRACK=m
304# CONFIG_NF_CT_ACCT is not set
305CONFIG_NF_CONNTRACK_MARK=y
306CONFIG_NF_CONNTRACK_EVENTS=y
307# CONFIG_NF_CT_PROTO_SCTP is not set
308# CONFIG_NF_CONNTRACK_AMANDA is not set
309CONFIG_NF_CONNTRACK_FTP=m
310# CONFIG_NF_CONNTRACK_H323 is not set
311CONFIG_NF_CONNTRACK_IRC=m
312# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
313# CONFIG_NF_CONNTRACK_PPTP is not set
314# CONFIG_NF_CONNTRACK_SIP is not set
315CONFIG_NF_CONNTRACK_TFTP=m
316CONFIG_NF_CT_NETLINK=m
278# CONFIG_NETFILTER_XTABLES is not set 317# CONFIG_NETFILTER_XTABLES is not set
279 318
280# 319#
281# IP: Netfilter Configuration 320# IP: Netfilter Configuration
282# 321#
283CONFIG_IP_NF_CONNTRACK=m 322CONFIG_NF_CONNTRACK_IPV4=m
284CONFIG_IP_NF_CT_ACCT=y 323CONFIG_NF_CONNTRACK_PROC_COMPAT=y
285CONFIG_IP_NF_CONNTRACK_MARK=y
286CONFIG_IP_NF_CONNTRACK_EVENTS=y
287CONFIG_IP_NF_CONNTRACK_NETLINK=m
288CONFIG_IP_NF_CT_PROTO_SCTP=m
289CONFIG_IP_NF_FTP=m
290CONFIG_IP_NF_IRC=m
291# CONFIG_IP_NF_NETBIOS_NS is not set
292CONFIG_IP_NF_TFTP=m
293CONFIG_IP_NF_AMANDA=m
294# CONFIG_IP_NF_PPTP is not set
295# CONFIG_IP_NF_H323 is not set
296# CONFIG_IP_NF_SIP is not set
297CONFIG_IP_NF_QUEUE=m 324CONFIG_IP_NF_QUEUE=m
298 325
299# 326#
@@ -320,7 +347,6 @@ CONFIG_LLC=y
320# CONFIG_ATALK is not set 347# CONFIG_ATALK is not set
321# CONFIG_X25 is not set 348# CONFIG_X25 is not set
322# CONFIG_LAPB is not set 349# CONFIG_LAPB is not set
323# CONFIG_NET_DIVERT is not set
324# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
326 352
@@ -402,6 +428,12 @@ CONFIG_BLK_DEV_INITRD=y
402# CONFIG_ATA_OVER_ETH is not set 428# CONFIG_ATA_OVER_ETH is not set
403 429
404# 430#
431# Misc devices
432#
433# CONFIG_SGI_IOC4 is not set
434# CONFIG_TIFM_CORE is not set
435
436#
405# ATA/ATAPI/MFM/RLL support 437# ATA/ATAPI/MFM/RLL support
406# 438#
407CONFIG_IDE=y 439CONFIG_IDE=y
@@ -428,7 +460,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
428# CONFIG_BLK_DEV_OFFBOARD is not set 460# CONFIG_BLK_DEV_OFFBOARD is not set
429CONFIG_BLK_DEV_GENERIC=y 461CONFIG_BLK_DEV_GENERIC=y
430# CONFIG_BLK_DEV_OPTI621 is not set 462# CONFIG_BLK_DEV_OPTI621 is not set
431CONFIG_BLK_DEV_SL82C105=y
432CONFIG_BLK_DEV_IDEDMA_PCI=y 463CONFIG_BLK_DEV_IDEDMA_PCI=y
433# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 464# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
434CONFIG_IDEDMA_PCI_AUTO=y 465CONFIG_IDEDMA_PCI_AUTO=y
@@ -443,6 +474,7 @@ CONFIG_BLK_DEV_AMD74XX=y
443# CONFIG_BLK_DEV_CS5530 is not set 474# CONFIG_BLK_DEV_CS5530 is not set
444# CONFIG_BLK_DEV_HPT34X is not set 475# CONFIG_BLK_DEV_HPT34X is not set
445# CONFIG_BLK_DEV_HPT366 is not set 476# CONFIG_BLK_DEV_HPT366 is not set
477# CONFIG_BLK_DEV_JMICRON is not set
446# CONFIG_BLK_DEV_SC1200 is not set 478# CONFIG_BLK_DEV_SC1200 is not set
447# CONFIG_BLK_DEV_PIIX is not set 479# CONFIG_BLK_DEV_PIIX is not set
448# CONFIG_BLK_DEV_IT821X is not set 480# CONFIG_BLK_DEV_IT821X is not set
@@ -451,6 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y
451# CONFIG_BLK_DEV_PDC202XX_NEW is not set 483# CONFIG_BLK_DEV_PDC202XX_NEW is not set
452# CONFIG_BLK_DEV_SVWKS is not set 484# CONFIG_BLK_DEV_SVWKS is not set
453# CONFIG_BLK_DEV_SIIMAGE is not set 485# CONFIG_BLK_DEV_SIIMAGE is not set
486CONFIG_BLK_DEV_SL82C105=y
454# CONFIG_BLK_DEV_SLC90E66 is not set 487# CONFIG_BLK_DEV_SLC90E66 is not set
455# CONFIG_BLK_DEV_TRM290 is not set 488# CONFIG_BLK_DEV_TRM290 is not set
456# CONFIG_BLK_DEV_VIA82CXXX is not set 489# CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -465,6 +498,8 @@ CONFIG_IDEDMA_AUTO=y
465# 498#
466# CONFIG_RAID_ATTRS is not set 499# CONFIG_RAID_ATTRS is not set
467CONFIG_SCSI=y 500CONFIG_SCSI=y
501# CONFIG_SCSI_TGT is not set
502CONFIG_SCSI_NETLINK=y
468CONFIG_SCSI_PROC_FS=y 503CONFIG_SCSI_PROC_FS=y
469 504
470# 505#
@@ -484,14 +519,16 @@ CONFIG_CHR_DEV_SG=y
484CONFIG_SCSI_MULTI_LUN=y 519CONFIG_SCSI_MULTI_LUN=y
485CONFIG_SCSI_CONSTANTS=y 520CONFIG_SCSI_CONSTANTS=y
486# CONFIG_SCSI_LOGGING is not set 521# CONFIG_SCSI_LOGGING is not set
522# CONFIG_SCSI_SCAN_ASYNC is not set
487 523
488# 524#
489# SCSI Transport Attributes 525# SCSI Transports
490# 526#
491CONFIG_SCSI_SPI_ATTRS=y 527CONFIG_SCSI_SPI_ATTRS=y
492CONFIG_SCSI_FC_ATTRS=y 528CONFIG_SCSI_FC_ATTRS=y
493CONFIG_SCSI_ISCSI_ATTRS=m 529CONFIG_SCSI_ISCSI_ATTRS=m
494CONFIG_SCSI_SAS_ATTRS=m 530CONFIG_SCSI_SAS_ATTRS=m
531# CONFIG_SCSI_SAS_LIBSAS is not set
495 532
496# 533#
497# SCSI low-level drivers 534# SCSI low-level drivers
@@ -504,10 +541,11 @@ CONFIG_SCSI_SAS_ATTRS=m
504# CONFIG_SCSI_AIC7XXX is not set 541# CONFIG_SCSI_AIC7XXX is not set
505# CONFIG_SCSI_AIC7XXX_OLD is not set 542# CONFIG_SCSI_AIC7XXX_OLD is not set
506# CONFIG_SCSI_AIC79XX is not set 543# CONFIG_SCSI_AIC79XX is not set
544# CONFIG_SCSI_AIC94XX is not set
545# CONFIG_SCSI_ARCMSR is not set
507# CONFIG_MEGARAID_NEWGEN is not set 546# CONFIG_MEGARAID_NEWGEN is not set
508# CONFIG_MEGARAID_LEGACY is not set 547# CONFIG_MEGARAID_LEGACY is not set
509# CONFIG_MEGARAID_SAS is not set 548# CONFIG_MEGARAID_SAS is not set
510CONFIG_ATA=y
511# CONFIG_SCSI_HPTIOP is not set 549# CONFIG_SCSI_HPTIOP is not set
512# CONFIG_SCSI_BUSLOGIC is not set 550# CONFIG_SCSI_BUSLOGIC is not set
513# CONFIG_SCSI_DMX3191D is not set 551# CONFIG_SCSI_DMX3191D is not set
@@ -520,6 +558,7 @@ CONFIG_SCSI_IBMVSCSI=y
520# CONFIG_SCSI_INIA100 is not set 558# CONFIG_SCSI_INIA100 is not set
521# CONFIG_SCSI_PPA is not set 559# CONFIG_SCSI_PPA is not set
522# CONFIG_SCSI_IMM is not set 560# CONFIG_SCSI_IMM is not set
561# CONFIG_SCSI_STEX is not set
523CONFIG_SCSI_SYM53C8XX_2=y 562CONFIG_SCSI_SYM53C8XX_2=y
524CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 563CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
525CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 564CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
@@ -530,10 +569,66 @@ CONFIG_SCSI_IPR_TRACE=y
530CONFIG_SCSI_IPR_DUMP=y 569CONFIG_SCSI_IPR_DUMP=y
531# CONFIG_SCSI_QLOGIC_1280 is not set 570# CONFIG_SCSI_QLOGIC_1280 is not set
532CONFIG_SCSI_QLA_FC=m 571CONFIG_SCSI_QLA_FC=m
572# CONFIG_SCSI_QLA_ISCSI is not set
533CONFIG_SCSI_LPFC=m 573CONFIG_SCSI_LPFC=m
534# CONFIG_SCSI_DC395x is not set 574# CONFIG_SCSI_DC395x is not set
535# CONFIG_SCSI_DC390T is not set 575# CONFIG_SCSI_DC390T is not set
536# CONFIG_SCSI_DEBUG is not set 576# CONFIG_SCSI_DEBUG is not set
577# CONFIG_SCSI_SRP is not set
578
579#
580# Serial ATA (prod) and Parallel ATA (experimental) drivers
581#
582CONFIG_ATA=y
583# CONFIG_SATA_AHCI is not set
584# CONFIG_SATA_SVW is not set
585# CONFIG_ATA_PIIX is not set
586# CONFIG_SATA_MV is not set
587# CONFIG_SATA_NV is not set
588# CONFIG_PDC_ADMA is not set
589# CONFIG_SATA_QSTOR is not set
590# CONFIG_SATA_PROMISE is not set
591# CONFIG_SATA_SX4 is not set
592# CONFIG_SATA_SIL is not set
593# CONFIG_SATA_SIL24 is not set
594# CONFIG_SATA_SIS is not set
595# CONFIG_SATA_ULI is not set
596# CONFIG_SATA_VIA is not set
597# CONFIG_SATA_VITESSE is not set
598# CONFIG_PATA_ALI is not set
599# CONFIG_PATA_AMD is not set
600# CONFIG_PATA_ARTOP is not set
601# CONFIG_PATA_ATIIXP is not set
602# CONFIG_PATA_CMD64X is not set
603# CONFIG_PATA_CS5520 is not set
604# CONFIG_PATA_CS5530 is not set
605# CONFIG_PATA_CYPRESS is not set
606# CONFIG_PATA_EFAR is not set
607# CONFIG_ATA_GENERIC is not set
608# CONFIG_PATA_HPT366 is not set
609# CONFIG_PATA_HPT37X is not set
610# CONFIG_PATA_HPT3X2N is not set
611# CONFIG_PATA_HPT3X3 is not set
612# CONFIG_PATA_IT821X is not set
613# CONFIG_PATA_JMICRON is not set
614# CONFIG_PATA_TRIFLEX is not set
615# CONFIG_PATA_MARVELL is not set
616# CONFIG_PATA_MPIIX is not set
617# CONFIG_PATA_OLDPIIX is not set
618# CONFIG_PATA_NETCELL is not set
619# CONFIG_PATA_NS87410 is not set
620# CONFIG_PATA_OPTI is not set
621# CONFIG_PATA_OPTIDMA is not set
622# CONFIG_PATA_PDC_OLD is not set
623# CONFIG_PATA_RADISYS is not set
624# CONFIG_PATA_RZ1000 is not set
625# CONFIG_PATA_SC1200 is not set
626# CONFIG_PATA_SERVERWORKS is not set
627# CONFIG_PATA_PDC2027X is not set
628# CONFIG_PATA_SIL680 is not set
629# CONFIG_PATA_SIS is not set
630# CONFIG_PATA_VIA is not set
631# CONFIG_PATA_WINBOND is not set
537 632
538# 633#
539# Multi-device support (RAID and LVM) 634# Multi-device support (RAID and LVM)
@@ -548,6 +643,7 @@ CONFIG_MD_RAID10=m
548CONFIG_MD_MULTIPATH=m 643CONFIG_MD_MULTIPATH=m
549CONFIG_MD_FAULTY=m 644CONFIG_MD_FAULTY=m
550CONFIG_BLK_DEV_DM=y 645CONFIG_BLK_DEV_DM=y
646# CONFIG_DM_DEBUG is not set
551CONFIG_DM_CRYPT=m 647CONFIG_DM_CRYPT=m
552CONFIG_DM_SNAPSHOT=m 648CONFIG_DM_SNAPSHOT=m
553CONFIG_DM_MIRROR=m 649CONFIG_DM_MIRROR=m
@@ -576,6 +672,7 @@ CONFIG_DM_MULTIPATH_EMC=m
576# 672#
577# Macintosh device drivers 673# Macintosh device drivers
578# 674#
675# CONFIG_MAC_EMUMOUSEBTN is not set
579# CONFIG_WINDFARM is not set 676# CONFIG_WINDFARM is not set
580 677
581# 678#
@@ -617,6 +714,7 @@ CONFIG_VORTEX=y
617CONFIG_IBMVETH=y 714CONFIG_IBMVETH=y
618CONFIG_NET_PCI=y 715CONFIG_NET_PCI=y
619CONFIG_PCNET32=y 716CONFIG_PCNET32=y
717# CONFIG_PCNET32_NAPI is not set
620# CONFIG_AMD8111_ETH is not set 718# CONFIG_AMD8111_ETH is not set
621# CONFIG_ADAPTEC_STARFIRE is not set 719# CONFIG_ADAPTEC_STARFIRE is not set
622# CONFIG_B44 is not set 720# CONFIG_B44 is not set
@@ -655,17 +753,19 @@ CONFIG_E1000=y
655# CONFIG_VIA_VELOCITY is not set 753# CONFIG_VIA_VELOCITY is not set
656CONFIG_TIGON3=y 754CONFIG_TIGON3=y
657# CONFIG_BNX2 is not set 755# CONFIG_BNX2 is not set
658# CONFIG_MV643XX_ETH is not set 756# CONFIG_QLA3XXX is not set
659 757
660# 758#
661# Ethernet (10000 Mbit) 759# Ethernet (10000 Mbit)
662# 760#
663# CONFIG_CHELSIO_T1 is not set 761# CONFIG_CHELSIO_T1 is not set
762CONFIG_EHEA=m
664CONFIG_IXGB=m 763CONFIG_IXGB=m
665# CONFIG_IXGB_NAPI is not set 764# CONFIG_IXGB_NAPI is not set
666CONFIG_S2IO=m 765CONFIG_S2IO=m
667# CONFIG_S2IO_NAPI is not set 766# CONFIG_S2IO_NAPI is not set
668# CONFIG_MYRI10GE is not set 767# CONFIG_MYRI10GE is not set
768# CONFIG_NETXEN_NIC is not set
669 769
670# 770#
671# Token Ring devices 771# Token Ring devices
@@ -697,6 +797,7 @@ CONFIG_PPP_BSDCOMP=m
697# CONFIG_PPP_MPPE is not set 797# CONFIG_PPP_MPPE is not set
698CONFIG_PPPOE=m 798CONFIG_PPPOE=m
699# CONFIG_SLIP is not set 799# CONFIG_SLIP is not set
800CONFIG_SLHC=m
700# CONFIG_NET_FC is not set 801# CONFIG_NET_FC is not set
701# CONFIG_SHAPER is not set 802# CONFIG_SHAPER is not set
702CONFIG_NETCONSOLE=y 803CONFIG_NETCONSOLE=y
@@ -719,6 +820,7 @@ CONFIG_NET_POLL_CONTROLLER=y
719# Input device support 820# Input device support
720# 821#
721CONFIG_INPUT=y 822CONFIG_INPUT=y
823# CONFIG_INPUT_FF_MEMLESS is not set
722 824
723# 825#
724# Userland interfaces 826# Userland interfaces
@@ -741,6 +843,7 @@ CONFIG_KEYBOARD_ATKBD=y
741# CONFIG_KEYBOARD_LKKBD is not set 843# CONFIG_KEYBOARD_LKKBD is not set
742# CONFIG_KEYBOARD_XTKBD is not set 844# CONFIG_KEYBOARD_XTKBD is not set
743# CONFIG_KEYBOARD_NEWTON is not set 845# CONFIG_KEYBOARD_NEWTON is not set
846# CONFIG_KEYBOARD_STOWAWAY is not set
744CONFIG_INPUT_MOUSE=y 847CONFIG_INPUT_MOUSE=y
745CONFIG_MOUSE_PS2=y 848CONFIG_MOUSE_PS2=y
746# CONFIG_MOUSE_SERIAL is not set 849# CONFIG_MOUSE_SERIAL is not set
@@ -815,10 +918,6 @@ CONFIG_GEN_RTC=y
815# CONFIG_DTLK is not set 918# CONFIG_DTLK is not set
816# CONFIG_R3964 is not set 919# CONFIG_R3964 is not set
817# CONFIG_APPLICOM is not set 920# CONFIG_APPLICOM is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822# CONFIG_AGP is not set 921# CONFIG_AGP is not set
823# CONFIG_DRM is not set 922# CONFIG_DRM is not set
824CONFIG_RAW_DRIVER=y 923CONFIG_RAW_DRIVER=y
@@ -829,7 +928,6 @@ CONFIG_MAX_RAW_DEVS=1024
829# TPM devices 928# TPM devices
830# 929#
831# CONFIG_TCG_TPM is not set 930# CONFIG_TCG_TPM is not set
832# CONFIG_TELCLOCK is not set
833 931
834# 932#
835# I2C support 933# I2C support
@@ -894,6 +992,7 @@ CONFIG_I2C_ALGOBIT=y
894# 992#
895# Dallas's 1-wire bus 993# Dallas's 1-wire bus
896# 994#
995# CONFIG_W1 is not set
897 996
898# 997#
899# Hardware Monitoring support 998# Hardware Monitoring support
@@ -902,14 +1001,9 @@ CONFIG_I2C_ALGOBIT=y
902# CONFIG_HWMON_VID is not set 1001# CONFIG_HWMON_VID is not set
903 1002
904# 1003#
905# Misc devices
906#
907
908#
909# Multimedia devices 1004# Multimedia devices
910# 1005#
911# CONFIG_VIDEO_DEV is not set 1006# CONFIG_VIDEO_DEV is not set
912CONFIG_VIDEO_V4L2=y
913 1007
914# 1008#
915# Digital Video Broadcasting Devices 1009# Digital Video Broadcasting Devices
@@ -922,6 +1016,7 @@ CONFIG_VIDEO_V4L2=y
922# 1016#
923CONFIG_FIRMWARE_EDID=y 1017CONFIG_FIRMWARE_EDID=y
924CONFIG_FB=y 1018CONFIG_FB=y
1019CONFIG_FB_DDC=y
925CONFIG_FB_CFB_FILLRECT=y 1020CONFIG_FB_CFB_FILLRECT=y
926CONFIG_FB_CFB_COPYAREA=y 1021CONFIG_FB_CFB_COPYAREA=y
927CONFIG_FB_CFB_IMAGEBLIT=y 1022CONFIG_FB_CFB_IMAGEBLIT=y
@@ -957,6 +1052,7 @@ CONFIG_FB_RADEON_I2C=y
957# CONFIG_FB_3DFX is not set 1052# CONFIG_FB_3DFX is not set
958# CONFIG_FB_VOODOO1 is not set 1053# CONFIG_FB_VOODOO1 is not set
959# CONFIG_FB_TRIDENT is not set 1054# CONFIG_FB_TRIDENT is not set
1055CONFIG_FB_IBM_GXT4500=y
960# CONFIG_FB_VIRTUAL is not set 1056# CONFIG_FB_VIRTUAL is not set
961 1057
962# 1058#
@@ -989,6 +1085,11 @@ CONFIG_LCD_DEVICE=y
989# CONFIG_SOUND is not set 1085# CONFIG_SOUND is not set
990 1086
991# 1087#
1088# HID Devices
1089#
1090CONFIG_HID=y
1091
1092#
992# USB support 1093# USB support
993# 1094#
994CONFIG_USB_ARCH_HAS_HCD=y 1095CONFIG_USB_ARCH_HAS_HCD=y
@@ -1003,6 +1104,7 @@ CONFIG_USB=y
1003CONFIG_USB_DEVICEFS=y 1104CONFIG_USB_DEVICEFS=y
1004# CONFIG_USB_BANDWIDTH is not set 1105# CONFIG_USB_BANDWIDTH is not set
1005# CONFIG_USB_DYNAMIC_MINORS is not set 1106# CONFIG_USB_DYNAMIC_MINORS is not set
1107# CONFIG_USB_MULTITHREAD_PROBE is not set
1006# CONFIG_USB_OTG is not set 1108# CONFIG_USB_OTG is not set
1007 1109
1008# 1110#
@@ -1043,13 +1145,13 @@ CONFIG_USB_STORAGE=y
1043# CONFIG_USB_STORAGE_SDDR55 is not set 1145# CONFIG_USB_STORAGE_SDDR55 is not set
1044# CONFIG_USB_STORAGE_JUMPSHOT is not set 1146# CONFIG_USB_STORAGE_JUMPSHOT is not set
1045# CONFIG_USB_STORAGE_ALAUDA is not set 1147# CONFIG_USB_STORAGE_ALAUDA is not set
1148# CONFIG_USB_STORAGE_KARMA is not set
1046# CONFIG_USB_LIBUSUAL is not set 1149# CONFIG_USB_LIBUSUAL is not set
1047 1150
1048# 1151#
1049# USB Input Devices 1152# USB Input Devices
1050# 1153#
1051CONFIG_USB_HID=y 1154CONFIG_USB_HID=y
1052CONFIG_USB_HIDINPUT=y
1053# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1155# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1054# CONFIG_HID_FF is not set 1156# CONFIG_HID_FF is not set
1055CONFIG_USB_HIDDEV=y 1157CONFIG_USB_HIDDEV=y
@@ -1079,6 +1181,7 @@ CONFIG_USB_HIDDEV=y
1079# CONFIG_USB_KAWETH is not set 1181# CONFIG_USB_KAWETH is not set
1080# CONFIG_USB_PEGASUS is not set 1182# CONFIG_USB_PEGASUS is not set
1081# CONFIG_USB_RTL8150 is not set 1183# CONFIG_USB_RTL8150 is not set
1184# CONFIG_USB_USBNET_MII is not set
1082# CONFIG_USB_USBNET is not set 1185# CONFIG_USB_USBNET is not set
1083CONFIG_USB_MON=y 1186CONFIG_USB_MON=y
1084 1187
@@ -1097,6 +1200,7 @@ CONFIG_USB_MON=y
1097# 1200#
1098# CONFIG_USB_EMI62 is not set 1201# CONFIG_USB_EMI62 is not set
1099# CONFIG_USB_EMI26 is not set 1202# CONFIG_USB_EMI26 is not set
1203# CONFIG_USB_ADUTUX is not set
1100# CONFIG_USB_AUERSWALD is not set 1204# CONFIG_USB_AUERSWALD is not set
1101# CONFIG_USB_RIO500 is not set 1205# CONFIG_USB_RIO500 is not set
1102# CONFIG_USB_LEGOTOWER is not set 1206# CONFIG_USB_LEGOTOWER is not set
@@ -1104,12 +1208,13 @@ CONFIG_USB_MON=y
1104# CONFIG_USB_LED is not set 1208# CONFIG_USB_LED is not set
1105# CONFIG_USB_CYPRESS_CY7C63 is not set 1209# CONFIG_USB_CYPRESS_CY7C63 is not set
1106# CONFIG_USB_CYTHERM is not set 1210# CONFIG_USB_CYTHERM is not set
1107# CONFIG_USB_PHIDGETKIT is not set 1211# CONFIG_USB_PHIDGET is not set
1108# CONFIG_USB_PHIDGETSERVO is not set
1109# CONFIG_USB_IDMOUSE is not set 1212# CONFIG_USB_IDMOUSE is not set
1213# CONFIG_USB_FTDI_ELAN is not set
1110# CONFIG_USB_APPLEDISPLAY is not set 1214# CONFIG_USB_APPLEDISPLAY is not set
1111# CONFIG_USB_SISUSBVGA is not set 1215# CONFIG_USB_SISUSBVGA is not set
1112# CONFIG_USB_LD is not set 1216# CONFIG_USB_LD is not set
1217# CONFIG_USB_TRANCEVIBRATOR is not set
1113# CONFIG_USB_TEST is not set 1218# CONFIG_USB_TEST is not set
1114 1219
1115# 1220#
@@ -1148,6 +1253,9 @@ CONFIG_INFINIBAND_USER_ACCESS=m
1148CONFIG_INFINIBAND_ADDR_TRANS=y 1253CONFIG_INFINIBAND_ADDR_TRANS=y
1149CONFIG_INFINIBAND_MTHCA=m 1254CONFIG_INFINIBAND_MTHCA=m
1150CONFIG_INFINIBAND_MTHCA_DEBUG=y 1255CONFIG_INFINIBAND_MTHCA_DEBUG=y
1256CONFIG_INFINIBAND_EHCA=m
1257CONFIG_INFINIBAND_EHCA_SCALING=y
1258# CONFIG_INFINIBAND_AMSO1100 is not set
1151CONFIG_INFINIBAND_IPOIB=m 1259CONFIG_INFINIBAND_IPOIB=m
1152CONFIG_INFINIBAND_IPOIB_DEBUG=y 1260CONFIG_INFINIBAND_IPOIB_DEBUG=y
1153# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set 1261# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
@@ -1177,6 +1285,10 @@ CONFIG_INFINIBAND_SRP=m
1177# 1285#
1178 1286
1179# 1287#
1288# Virtualization
1289#
1290
1291#
1180# File systems 1292# File systems
1181# 1293#
1182CONFIG_EXT2_FS=y 1294CONFIG_EXT2_FS=y
@@ -1189,6 +1301,7 @@ CONFIG_EXT3_FS=y
1189CONFIG_EXT3_FS_XATTR=y 1301CONFIG_EXT3_FS_XATTR=y
1190CONFIG_EXT3_FS_POSIX_ACL=y 1302CONFIG_EXT3_FS_POSIX_ACL=y
1191CONFIG_EXT3_FS_SECURITY=y 1303CONFIG_EXT3_FS_SECURITY=y
1304# CONFIG_EXT4DEV_FS is not set
1192CONFIG_JBD=y 1305CONFIG_JBD=y
1193# CONFIG_JBD_DEBUG is not set 1306# CONFIG_JBD_DEBUG is not set
1194CONFIG_FS_MBCACHE=y 1307CONFIG_FS_MBCACHE=y
@@ -1209,6 +1322,7 @@ CONFIG_XFS_FS=m
1209CONFIG_XFS_SECURITY=y 1322CONFIG_XFS_SECURITY=y
1210CONFIG_XFS_POSIX_ACL=y 1323CONFIG_XFS_POSIX_ACL=y
1211# CONFIG_XFS_RT is not set 1324# CONFIG_XFS_RT is not set
1325# CONFIG_GFS2_FS is not set
1212CONFIG_OCFS2_FS=m 1326CONFIG_OCFS2_FS=m
1213CONFIG_OCFS2_DEBUG_MASKLOG=y 1327CONFIG_OCFS2_DEBUG_MASKLOG=y
1214# CONFIG_MINIX_FS is not set 1328# CONFIG_MINIX_FS is not set
@@ -1246,8 +1360,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1246# 1360#
1247CONFIG_PROC_FS=y 1361CONFIG_PROC_FS=y
1248CONFIG_PROC_KCORE=y 1362CONFIG_PROC_KCORE=y
1363CONFIG_PROC_SYSCTL=y
1249CONFIG_SYSFS=y 1364CONFIG_SYSFS=y
1250CONFIG_TMPFS=y 1365CONFIG_TMPFS=y
1366# CONFIG_TMPFS_POSIX_ACL is not set
1251CONFIG_HUGETLBFS=y 1367CONFIG_HUGETLBFS=y
1252CONFIG_HUGETLB_PAGE=y 1368CONFIG_HUGETLB_PAGE=y
1253CONFIG_RAMFS=y 1369CONFIG_RAMFS=y
@@ -1357,17 +1473,22 @@ CONFIG_NLS_ISO8859_1=y
1357# CONFIG_NLS_UTF8 is not set 1473# CONFIG_NLS_UTF8 is not set
1358 1474
1359# 1475#
1476# Distributed Lock Manager
1477#
1478# CONFIG_DLM is not set
1479
1480#
1360# Library routines 1481# Library routines
1361# 1482#
1483CONFIG_BITREVERSE=y
1362CONFIG_CRC_CCITT=m 1484CONFIG_CRC_CCITT=m
1363# CONFIG_CRC16 is not set 1485# CONFIG_CRC16 is not set
1364CONFIG_CRC32=y 1486CONFIG_CRC32=y
1365CONFIG_LIBCRC32C=m 1487CONFIG_LIBCRC32C=m
1366CONFIG_ZLIB_INFLATE=y 1488CONFIG_ZLIB_INFLATE=y
1367CONFIG_ZLIB_DEFLATE=m 1489CONFIG_ZLIB_DEFLATE=m
1368CONFIG_TEXTSEARCH=y
1369CONFIG_TEXTSEARCH_KMP=m
1370CONFIG_PLIST=y 1490CONFIG_PLIST=y
1491CONFIG_IOMAP_COPY=y
1371 1492
1372# 1493#
1373# Instrumentation Support 1494# Instrumentation Support
@@ -1380,8 +1501,11 @@ CONFIG_KPROBES=y
1380# Kernel hacking 1501# Kernel hacking
1381# 1502#
1382# CONFIG_PRINTK_TIME is not set 1503# CONFIG_PRINTK_TIME is not set
1504CONFIG_ENABLE_MUST_CHECK=y
1383CONFIG_MAGIC_SYSRQ=y 1505CONFIG_MAGIC_SYSRQ=y
1384# CONFIG_UNUSED_SYMBOLS is not set 1506# CONFIG_UNUSED_SYMBOLS is not set
1507CONFIG_DEBUG_FS=y
1508# CONFIG_HEADERS_CHECK is not set
1385CONFIG_DEBUG_KERNEL=y 1509CONFIG_DEBUG_KERNEL=y
1386CONFIG_LOG_BUF_SHIFT=17 1510CONFIG_LOG_BUF_SHIFT=17
1387CONFIG_DETECT_SOFTLOCKUP=y 1511CONFIG_DETECT_SOFTLOCKUP=y
@@ -1395,16 +1519,20 @@ CONFIG_DETECT_SOFTLOCKUP=y
1395# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1519# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1396# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1520# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1397# CONFIG_DEBUG_KOBJECT is not set 1521# CONFIG_DEBUG_KOBJECT is not set
1522CONFIG_DEBUG_BUGVERBOSE=y
1398# CONFIG_DEBUG_INFO is not set 1523# CONFIG_DEBUG_INFO is not set
1399CONFIG_DEBUG_FS=y
1400# CONFIG_DEBUG_VM is not set 1524# CONFIG_DEBUG_VM is not set
1525# CONFIG_DEBUG_LIST is not set
1401CONFIG_FORCED_INLINING=y 1526CONFIG_FORCED_INLINING=y
1402# CONFIG_RCU_TORTURE_TEST is not set 1527# CONFIG_RCU_TORTURE_TEST is not set
1528# CONFIG_LKDTM is not set
1403CONFIG_DEBUG_STACKOVERFLOW=y 1529CONFIG_DEBUG_STACKOVERFLOW=y
1404# CONFIG_DEBUG_STACK_USAGE is not set 1530# CONFIG_DEBUG_STACK_USAGE is not set
1531CONFIG_HCALL_STATS=y
1405CONFIG_DEBUGGER=y 1532CONFIG_DEBUGGER=y
1406CONFIG_XMON=y 1533CONFIG_XMON=y
1407CONFIG_XMON_DEFAULT=y 1534CONFIG_XMON_DEFAULT=y
1535CONFIG_XMON_DISASSEMBLY=y
1408CONFIG_IRQSTACKS=y 1536CONFIG_IRQSTACKS=y
1409# CONFIG_BOOTX_TEXT is not set 1537# CONFIG_BOOTX_TEXT is not set
1410# CONFIG_PPC_EARLY_DEBUG is not set 1538# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1419,7 +1547,12 @@ CONFIG_IRQSTACKS=y
1419# Cryptographic options 1547# Cryptographic options
1420# 1548#
1421CONFIG_CRYPTO=y 1549CONFIG_CRYPTO=y
1550CONFIG_CRYPTO_ALGAPI=y
1551CONFIG_CRYPTO_BLKCIPHER=y
1552CONFIG_CRYPTO_HASH=y
1553CONFIG_CRYPTO_MANAGER=y
1422CONFIG_CRYPTO_HMAC=y 1554CONFIG_CRYPTO_HMAC=y
1555# CONFIG_CRYPTO_XCBC is not set
1423CONFIG_CRYPTO_NULL=m 1556CONFIG_CRYPTO_NULL=m
1424CONFIG_CRYPTO_MD4=m 1557CONFIG_CRYPTO_MD4=m
1425CONFIG_CRYPTO_MD5=y 1558CONFIG_CRYPTO_MD5=y
@@ -1428,9 +1561,14 @@ CONFIG_CRYPTO_SHA256=m
1428CONFIG_CRYPTO_SHA512=m 1561CONFIG_CRYPTO_SHA512=m
1429CONFIG_CRYPTO_WP512=m 1562CONFIG_CRYPTO_WP512=m
1430CONFIG_CRYPTO_TGR192=m 1563CONFIG_CRYPTO_TGR192=m
1564# CONFIG_CRYPTO_GF128MUL is not set
1565CONFIG_CRYPTO_ECB=m
1566CONFIG_CRYPTO_CBC=y
1567# CONFIG_CRYPTO_LRW is not set
1431CONFIG_CRYPTO_DES=y 1568CONFIG_CRYPTO_DES=y
1432CONFIG_CRYPTO_BLOWFISH=m 1569CONFIG_CRYPTO_BLOWFISH=m
1433CONFIG_CRYPTO_TWOFISH=m 1570CONFIG_CRYPTO_TWOFISH=m
1571CONFIG_CRYPTO_TWOFISH_COMMON=m
1434CONFIG_CRYPTO_SERPENT=m 1572CONFIG_CRYPTO_SERPENT=m
1435CONFIG_CRYPTO_AES=m 1573CONFIG_CRYPTO_AES=m
1436CONFIG_CRYPTO_CAST5=m 1574CONFIG_CRYPTO_CAST5=m
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 2847cd51a2d7..c54f3639c5ad 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -775,11 +775,6 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus)
775 np = scan_OF_for_pci_dev(parent, bus->self->devfn); 775 np = scan_OF_for_pci_dev(parent, bus->self->devfn);
776 of_node_put(parent); 776 of_node_put(parent);
777 777
778 /* sanity check */
779 if (strcmp(np->type, "pci") != 0)
780 printk(KERN_WARNING "pci: wrong type \"%s\" for bridge %s\n",
781 np->type, np->full_name);
782
783 return np; 778 return np;
784} 779}
785 780
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index f58c9780b66f..4d471190be8d 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -103,7 +103,7 @@ static void __init mpc832x_sys_setup_arch(void)
103#ifdef CONFIG_QUICC_ENGINE 103#ifdef CONFIG_QUICC_ENGINE
104 qe_reset(); 104 qe_reset();
105 105
106 if ((np = of_find_node_by_name(np, "par_io")) != NULL) { 106 if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) {
107 par_io_init(np); 107 par_io_init(np);
108 of_node_put(np); 108 of_node_put(np);
109 109
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc8360e_pb.c
index 7bfd47ad7233..53b92a904e8e 100644
--- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/arch/powerpc/platforms/83xx/mpc8360e_pb.c
@@ -108,7 +108,7 @@ static void __init mpc8360_sys_setup_arch(void)
108#ifdef CONFIG_QUICC_ENGINE 108#ifdef CONFIG_QUICC_ENGINE
109 qe_reset(); 109 qe_reset();
110 110
111 if ((np = of_find_node_by_name(np, "par_io")) != NULL) { 111 if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) {
112 par_io_init(np); 112 par_io_init(np);
113 of_node_put(np); 113 of_node_put(np);
114 114
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 3c95392f4f41..e6653a868b91 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -459,7 +459,8 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev)
459 tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL, 459 tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
460 phb->node); 460 phb->node);
461 iommu_table_setparms(phb, dn, tbl); 461 iommu_table_setparms(phb, dn, tbl);
462 dev->dev.archdata.dma_data = iommu_init_table(tbl, phb->node); 462 PCI_DN(dn)->iommu_table = iommu_init_table(tbl, phb->node);
463 dev->dev.archdata.dma_data = PCI_DN(dn)->iommu_table;
463 return; 464 return;
464 } 465 }
465 466
diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c
index ff23f5a4d4b9..e073e246293d 100644
--- a/arch/powerpc/sysdev/mmio_nvram.c
+++ b/arch/powerpc/sysdev/mmio_nvram.c
@@ -80,33 +80,39 @@ static ssize_t mmio_nvram_get_size(void)
80int __init mmio_nvram_init(void) 80int __init mmio_nvram_init(void)
81{ 81{
82 struct device_node *nvram_node; 82 struct device_node *nvram_node;
83 const unsigned long *buffer;
84 int proplen;
85 unsigned long nvram_addr; 83 unsigned long nvram_addr;
84 struct resource r;
86 int ret; 85 int ret;
87 86
88 ret = -ENODEV;
89 nvram_node = of_find_node_by_type(NULL, "nvram"); 87 nvram_node = of_find_node_by_type(NULL, "nvram");
90 if (!nvram_node) 88 if (!nvram_node) {
89 printk(KERN_WARNING "nvram: no node found in device-tree\n");
90 return -ENODEV;
91 }
92
93 ret = of_address_to_resource(nvram_node, 0, &r);
94 if (ret) {
95 printk(KERN_WARNING "nvram: failed to get address (err %d)\n",
96 ret);
91 goto out; 97 goto out;
92 98 }
93 ret = -EIO; 99 nvram_addr = r.start;
94 buffer = get_property(nvram_node, "reg", &proplen); 100 mmio_nvram_len = r.end - r.start + 1;
95 if (proplen != 2*sizeof(unsigned long)) 101 if ( (!mmio_nvram_len) || (!nvram_addr) ) {
96 goto out; 102 printk(KERN_WARNING "nvram: address or lenght is 0\n");
97 103 ret = -EIO;
98 ret = -ENODEV;
99 nvram_addr = buffer[0];
100 mmio_nvram_len = buffer[1];
101 if ( (!mmio_nvram_len) || (!nvram_addr) )
102 goto out; 104 goto out;
105 }
103 106
104 mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len); 107 mmio_nvram_start = ioremap(nvram_addr, mmio_nvram_len);
105 if (!mmio_nvram_start) 108 if (!mmio_nvram_start) {
109 printk(KERN_WARNING "nvram: failed to ioremap\n");
110 ret = -ENOMEM;
106 goto out; 111 goto out;
112 }
107 113
108 printk(KERN_INFO "mmio NVRAM, %luk mapped to %p\n", 114 printk(KERN_INFO "mmio NVRAM, %luk at 0x%lx mapped to %p\n",
109 mmio_nvram_len >> 10, mmio_nvram_start); 115 mmio_nvram_len >> 10, nvram_addr, mmio_nvram_start);
110 116
111 ppc_md.nvram_read = mmio_nvram_read; 117 ppc_md.nvram_read = mmio_nvram_read;
112 ppc_md.nvram_write = mmio_nvram_write; 118 ppc_md.nvram_write = mmio_nvram_write;
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 14:57:17 -0500