aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 20:50:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-06 20:50:07 -0500
commit5fa2e1591300267b1e082c693d0b4da8e4943551 (patch)
treef37a664a6cf23eda2441dea39a7e58de7b8965fe /arch/powerpc
parentf194d132e4971111f85c18c96067acffb13cee6d (diff)
parent7cc955c8fdd58c5f2c98077011a20ce10897288c (diff)
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams [POWERPC] Update defconfigs [POWERPC] PS3: Update ps3_defconfig [POWERPC] Update iseries_defconfig [POWERPC] Fix hardware IRQ time accounting problem.
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/bamboo_defconfig22
-rw-r--r--arch/powerpc/configs/cell_defconfig176
-rw-r--r--arch/powerpc/configs/celleb_defconfig170
-rw-r--r--arch/powerpc/configs/chrp32_defconfig163
-rw-r--r--arch/powerpc/configs/ebony_defconfig25
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig92
-rw-r--r--arch/powerpc/configs/g5_defconfig150
-rw-r--r--arch/powerpc/configs/holly_defconfig136
-rw-r--r--arch/powerpc/configs/iseries_defconfig123
-rw-r--r--arch/powerpc/configs/kilauea_defconfig79
-rw-r--r--arch/powerpc/configs/linkstation_defconfig152
-rw-r--r--arch/powerpc/configs/lite5200_defconfig119
-rw-r--r--arch/powerpc/configs/maple_defconfig126
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig137
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig106
-rw-r--r--arch/powerpc/configs/mpc8313_rdb_defconfig173
-rw-r--r--arch/powerpc/configs/mpc832x_mds_defconfig155
-rw-r--r--arch/powerpc/configs/mpc832x_rdb_defconfig167
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig156
-rw-r--r--arch/powerpc/configs/mpc834x_itxgp_defconfig161
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig149
-rw-r--r--arch/powerpc/configs/mpc836x_mds_defconfig155
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig101
-rw-r--r--arch/powerpc/configs/mpc8544_ds_defconfig130
-rw-r--r--arch/powerpc/configs/mpc8560_ads_defconfig104
-rw-r--r--arch/powerpc/configs/mpc8568mds_defconfig161
-rw-r--r--arch/powerpc/configs/mpc8572_ds_defconfig130
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig126
-rw-r--r--arch/powerpc/configs/mpc8610_hpcd_defconfig114
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig131
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig107
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig98
-rw-r--r--arch/powerpc/configs/pasemi_defconfig8
-rw-r--r--arch/powerpc/configs/pmac32_defconfig217
-rw-r--r--arch/powerpc/configs/ppc64_defconfig9
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig148
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig150
-rw-r--r--arch/powerpc/configs/ps3_defconfig177
-rw-r--r--arch/powerpc/configs/pseries_defconfig156
-rw-r--r--arch/powerpc/configs/sequoia_defconfig111
-rw-r--r--arch/powerpc/configs/walnut_defconfig22
-rw-r--r--arch/powerpc/kernel/process.c2
42 files changed, 2648 insertions, 2446 deletions
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig
index 844808ebf245..76d883e008b6 100644
--- a/arch/powerpc/configs/bamboo_defconfig
+++ b/arch/powerpc/configs/bamboo_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.23 3# Linux kernel version: 2.6.24-rc4
4# Fri Oct 19 09:01:11 2007 4# Thu Dec 6 16:48:04 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -69,11 +69,14 @@ CONFIG_POSIX_MQUEUE=y
69# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
71# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
72# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set
75CONFIG_FAIR_GROUP_SCHED=y 77CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y 78CONFIG_FAIR_USER_SCHED=y
79# CONFIG_FAIR_CGROUP_SCHED is not set
77CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
78# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
79CONFIG_BLK_DEV_INITRD=y 82CONFIG_BLK_DEV_INITRD=y
@@ -209,6 +212,7 @@ CONFIG_PCI_SYSCALL=y
209# CONFIG_PCIEPORTBUS is not set 212# CONFIG_PCIEPORTBUS is not set
210CONFIG_ARCH_SUPPORTS_MSI=y 213CONFIG_ARCH_SUPPORTS_MSI=y
211# CONFIG_PCI_MSI is not set 214# CONFIG_PCI_MSI is not set
215CONFIG_PCI_LEGACY=y
212# CONFIG_PCI_DEBUG is not set 216# CONFIG_PCI_DEBUG is not set
213# CONFIG_PCCARD is not set 217# CONFIG_PCCARD is not set
214# CONFIG_HOTPLUG_PCI is not set 218# CONFIG_HOTPLUG_PCI is not set
@@ -287,10 +291,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
287# CONFIG_LAPB is not set 291# CONFIG_LAPB is not set
288# CONFIG_ECONET is not set 292# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 293# CONFIG_WAN_ROUTER is not set
290
291#
292# QoS and/or fair queueing
293#
294# CONFIG_NET_SCHED is not set 294# CONFIG_NET_SCHED is not set
295 295
296# 296#
@@ -690,16 +690,16 @@ CONFIG_PLIST=y
690CONFIG_HAS_IOMEM=y 690CONFIG_HAS_IOMEM=y
691CONFIG_HAS_IOPORT=y 691CONFIG_HAS_IOPORT=y
692CONFIG_HAS_DMA=y 692CONFIG_HAS_DMA=y
693 693CONFIG_INSTRUMENTATION=y
694#
695# Instrumentation Support
696#
697# CONFIG_PROFILING is not set 694# CONFIG_PROFILING is not set
695# CONFIG_KPROBES is not set
696# CONFIG_MARKERS is not set
698 697
699# 698#
700# Kernel hacking 699# Kernel hacking
701# 700#
702# CONFIG_PRINTK_TIME is not set 701# CONFIG_PRINTK_TIME is not set
702CONFIG_ENABLE_WARN_DEPRECATED=y
703CONFIG_ENABLE_MUST_CHECK=y 703CONFIG_ENABLE_MUST_CHECK=y
704CONFIG_MAGIC_SYSRQ=y 704CONFIG_MAGIC_SYSRQ=y
705# CONFIG_UNUSED_SYMBOLS is not set 705# CONFIG_UNUSED_SYMBOLS is not set
@@ -723,10 +723,12 @@ CONFIG_SCHED_DEBUG=y
723# CONFIG_DEBUG_INFO is not set 723# CONFIG_DEBUG_INFO is not set
724# CONFIG_DEBUG_VM is not set 724# CONFIG_DEBUG_VM is not set
725# CONFIG_DEBUG_LIST is not set 725# CONFIG_DEBUG_LIST is not set
726# CONFIG_DEBUG_SG is not set
726CONFIG_FORCED_INLINING=y 727CONFIG_FORCED_INLINING=y
727# CONFIG_BOOT_PRINTK_DELAY is not set 728# CONFIG_BOOT_PRINTK_DELAY is not set
728# CONFIG_RCU_TORTURE_TEST is not set 729# CONFIG_RCU_TORTURE_TEST is not set
729# CONFIG_FAULT_INJECTION is not set 730# CONFIG_FAULT_INJECTION is not set
731# CONFIG_SAMPLES is not set
730# CONFIG_DEBUG_STACKOVERFLOW is not set 732# CONFIG_DEBUG_STACKOVERFLOW is not set
731# CONFIG_DEBUG_STACK_USAGE is not set 733# CONFIG_DEBUG_STACK_USAGE is not set
732# CONFIG_DEBUG_PAGEALLOC is not set 734# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index dcd7c02727c2..f3bde8c6c8c6 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.23-rc3 3# Linux kernel version: 2.6.24-rc4
4# Wed Aug 22 15:19:19 2007 4# Thu Dec 6 16:48:05 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -11,6 +11,7 @@ CONFIG_PPC64=y
11# CONFIG_POWER4_ONLY is not set 11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y 12CONFIG_POWER3=y
13CONFIG_POWER4=y 13CONFIG_POWER4=y
14CONFIG_TUNE_CELL=y
14CONFIG_PPC_FPU=y 15CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y 16CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y 17CONFIG_PPC_STD_MMU=y
@@ -19,8 +20,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y 20CONFIG_SMP=y
20CONFIG_NR_CPUS=4 21CONFIG_NR_CPUS=4
21CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64
22CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
23CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
24CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
25CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
26CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -64,13 +70,21 @@ CONFIG_SYSVIPC_SYSCTL=y
64# CONFIG_BSD_PROCESS_ACCT is not set 70# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set 72# CONFIG_USER_NS is not set
73# CONFIG_PID_NS is not set
67# CONFIG_AUDIT is not set 74# CONFIG_AUDIT is not set
68CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=15 77CONFIG_LOG_BUF_SHIFT=15
71CONFIG_CGROUPS=y 78CONFIG_CGROUPS=y
79# CONFIG_CGROUP_DEBUG is not set
80# CONFIG_CGROUP_NS is not set
72CONFIG_CPUSETS=y 81CONFIG_CPUSETS=y
82CONFIG_FAIR_GROUP_SCHED=y
83CONFIG_FAIR_USER_SCHED=y
84# CONFIG_FAIR_CGROUP_SCHED is not set
85# CONFIG_CGROUP_CPUACCT is not set
73CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
87CONFIG_PROC_PID_CPUSET=y
74# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 89CONFIG_BLK_DEV_INITRD=y
76CONFIG_INITRAMFS_SOURCE="" 90CONFIG_INITRAMFS_SOURCE=""
@@ -90,7 +104,6 @@ CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y 104CONFIG_ANON_INODES=y
91CONFIG_EPOLL=y 105CONFIG_EPOLL=y
92CONFIG_SIGNALFD=y 106CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 107CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 108CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
@@ -111,6 +124,7 @@ CONFIG_STOP_MACHINE=y
111CONFIG_BLOCK=y 124CONFIG_BLOCK=y
112# CONFIG_BLK_DEV_IO_TRACE is not set 125# CONFIG_BLK_DEV_IO_TRACE is not set
113# CONFIG_BLK_DEV_BSG is not set 126# CONFIG_BLK_DEV_BSG is not set
127CONFIG_BLOCK_COMPAT=y
114 128
115# 129#
116# IO Schedulers 130# IO Schedulers
@@ -129,7 +143,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
129# Platform support 143# Platform support
130# 144#
131CONFIG_PPC_MULTIPLATFORM=y 145CONFIG_PPC_MULTIPLATFORM=y
132# CONFIG_EMBEDDED6xx is not set
133# CONFIG_PPC_82xx is not set 146# CONFIG_PPC_82xx is not set
134# CONFIG_PPC_83xx is not set 147# CONFIG_PPC_83xx is not set
135# CONFIG_PPC_86xx is not set 148# CONFIG_PPC_86xx is not set
@@ -195,6 +208,8 @@ CONFIG_CPU_FREQ_STAT=y
195# CONFIG_CPU_FREQ_STAT_DETAILS is not set 208# CONFIG_CPU_FREQ_STAT_DETAILS is not set
196CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y 209CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
197# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set 210# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
211# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
212# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
198CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 213CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
199CONFIG_CPU_FREQ_GOV_POWERSAVE=y 214CONFIG_CPU_FREQ_GOV_POWERSAVE=y
200CONFIG_CPU_FREQ_GOV_USERSPACE=y 215CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -211,6 +226,10 @@ CONFIG_AXON_RAM=m
211# 226#
212# Kernel options 227# Kernel options
213# 228#
229CONFIG_TICK_ONESHOT=y
230CONFIG_NO_HZ=y
231CONFIG_HIGH_RES_TIMERS=y
232CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
214# CONFIG_HZ_100 is not set 233# CONFIG_HZ_100 is not set
215CONFIG_HZ_250=y 234CONFIG_HZ_250=y
216# CONFIG_HZ_300 is not set 235# CONFIG_HZ_300 is not set
@@ -223,6 +242,7 @@ CONFIG_PREEMPT_BKL=y
223CONFIG_BINFMT_ELF=y 242CONFIG_BINFMT_ELF=y
224CONFIG_BINFMT_MISC=m 243CONFIG_BINFMT_MISC=m
225CONFIG_FORCE_MAX_ZONEORDER=9 244CONFIG_FORCE_MAX_ZONEORDER=9
245CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
226# CONFIG_IOMMU_VMERGE is not set 246# CONFIG_IOMMU_VMERGE is not set
227CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
228# CONFIG_KEXEC is not set 248# CONFIG_KEXEC is not set
@@ -243,6 +263,8 @@ CONFIG_NEED_MULTIPLE_NODES=y
243CONFIG_HAVE_MEMORY_PRESENT=y 263CONFIG_HAVE_MEMORY_PRESENT=y
244# CONFIG_SPARSEMEM_STATIC is not set 264# CONFIG_SPARSEMEM_STATIC is not set
245CONFIG_SPARSEMEM_EXTREME=y 265CONFIG_SPARSEMEM_EXTREME=y
266CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
267CONFIG_SPARSEMEM_VMEMMAP=y
246CONFIG_MEMORY_HOTPLUG=y 268CONFIG_MEMORY_HOTPLUG=y
247CONFIG_MEMORY_HOTPLUG_SPARSE=y 269CONFIG_MEMORY_HOTPLUG_SPARSE=y
248CONFIG_SPLIT_PTLOCK_CPUS=4 270CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -275,11 +297,8 @@ CONFIG_PCIEPORTBUS=y
275CONFIG_PCIEAER=y 297CONFIG_PCIEAER=y
276CONFIG_ARCH_SUPPORTS_MSI=y 298CONFIG_ARCH_SUPPORTS_MSI=y
277# CONFIG_PCI_MSI is not set 299# CONFIG_PCI_MSI is not set
300CONFIG_PCI_LEGACY=y
278# CONFIG_PCI_DEBUG is not set 301# CONFIG_PCI_DEBUG is not set
279
280#
281# PCCARD (PCMCIA/CardBus) support
282#
283# CONFIG_PCCARD is not set 302# CONFIG_PCCARD is not set
284# CONFIG_HOTPLUG_PCI is not set 303# CONFIG_HOTPLUG_PCI is not set
285CONFIG_KERNEL_START=0xc000000000000000 304CONFIG_KERNEL_START=0xc000000000000000
@@ -321,6 +340,7 @@ CONFIG_INET_TUNNEL=y
321CONFIG_INET_XFRM_MODE_TRANSPORT=y 340CONFIG_INET_XFRM_MODE_TRANSPORT=y
322CONFIG_INET_XFRM_MODE_TUNNEL=y 341CONFIG_INET_XFRM_MODE_TUNNEL=y
323# CONFIG_INET_XFRM_MODE_BEET is not set 342# CONFIG_INET_XFRM_MODE_BEET is not set
343CONFIG_INET_LRO=y
324CONFIG_INET_DIAG=y 344CONFIG_INET_DIAG=y
325CONFIG_INET_TCP_DIAG=y 345CONFIG_INET_TCP_DIAG=y
326# CONFIG_TCP_CONG_ADVANCED is not set 346# CONFIG_TCP_CONG_ADVANCED is not set
@@ -382,6 +402,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
382CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 402CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
383CONFIG_NETFILTER_XT_MATCH_STRING=m 403CONFIG_NETFILTER_XT_MATCH_STRING=m
384CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 404CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
405CONFIG_NETFILTER_XT_MATCH_TIME=m
385CONFIG_NETFILTER_XT_MATCH_U32=m 406CONFIG_NETFILTER_XT_MATCH_U32=m
386CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 407CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
387 408
@@ -430,10 +451,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
430# CONFIG_LAPB is not set 451# CONFIG_LAPB is not set
431# CONFIG_ECONET is not set 452# CONFIG_ECONET is not set
432# CONFIG_WAN_ROUTER is not set 453# CONFIG_WAN_ROUTER is not set
433
434#
435# QoS and/or fair queueing
436#
437# CONFIG_NET_SCHED is not set 454# CONFIG_NET_SCHED is not set
438CONFIG_NET_CLS_ROUTE=y 455CONFIG_NET_CLS_ROUTE=y
439 456
@@ -463,6 +480,7 @@ CONFIG_NET_CLS_ROUTE=y
463# 480#
464# Generic Driver Options 481# Generic Driver Options
465# 482#
483CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
466CONFIG_STANDALONE=y 484CONFIG_STANDALONE=y
467CONFIG_PREVENT_FIRMWARE_BUILD=y 485CONFIG_PREVENT_FIRMWARE_BUILD=y
468CONFIG_FW_LOADER=y 486CONFIG_FW_LOADER=y
@@ -515,6 +533,11 @@ CONFIG_IDE_PROC_FS=y
515# IDE chipset support/bugfixes 533# IDE chipset support/bugfixes
516# 534#
517CONFIG_IDE_GENERIC=y 535CONFIG_IDE_GENERIC=y
536# CONFIG_BLK_DEV_PLATFORM is not set
537
538#
539# PCI IDE chipsets support
540#
518CONFIG_BLK_DEV_IDEPCI=y 541CONFIG_BLK_DEV_IDEPCI=y
519CONFIG_IDEPCI_SHARE_IRQ=y 542CONFIG_IDEPCI_SHARE_IRQ=y
520CONFIG_IDEPCI_PCIBUS_ORDER=y 543CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -522,8 +545,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
522CONFIG_BLK_DEV_GENERIC=y 545CONFIG_BLK_DEV_GENERIC=y
523# CONFIG_BLK_DEV_OPTI621 is not set 546# CONFIG_BLK_DEV_OPTI621 is not set
524CONFIG_BLK_DEV_IDEDMA_PCI=y 547CONFIG_BLK_DEV_IDEDMA_PCI=y
525# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
526# CONFIG_IDEDMA_ONLYDISK is not set
527CONFIG_BLK_DEV_AEC62XX=y 548CONFIG_BLK_DEV_AEC62XX=y
528# CONFIG_BLK_DEV_ALI15X3 is not set 549# CONFIG_BLK_DEV_ALI15X3 is not set
529# CONFIG_BLK_DEV_AMD74XX is not set 550# CONFIG_BLK_DEV_AMD74XX is not set
@@ -552,7 +573,7 @@ CONFIG_BLK_DEV_SIIMAGE=y
552CONFIG_BLK_DEV_CELLEB=y 573CONFIG_BLK_DEV_CELLEB=y
553# CONFIG_IDE_ARM is not set 574# CONFIG_IDE_ARM is not set
554CONFIG_BLK_DEV_IDEDMA=y 575CONFIG_BLK_DEV_IDEDMA=y
555# CONFIG_IDEDMA_IVB is not set 576CONFIG_IDE_ARCH_OBSOLETE_INIT=y
556# CONFIG_BLK_DEV_HD is not set 577# CONFIG_BLK_DEV_HD is not set
557 578
558# 579#
@@ -593,6 +614,7 @@ CONFIG_SCSI_WAIT_SCAN=m
593# CONFIG_SCSI_ISCSI_ATTRS is not set 614# CONFIG_SCSI_ISCSI_ATTRS is not set
594CONFIG_SCSI_SAS_ATTRS=y 615CONFIG_SCSI_SAS_ATTRS=y
595# CONFIG_SCSI_SAS_LIBSAS is not set 616# CONFIG_SCSI_SAS_LIBSAS is not set
617# CONFIG_SCSI_SRP_ATTRS is not set
596CONFIG_SCSI_LOWLEVEL=y 618CONFIG_SCSI_LOWLEVEL=y
597# CONFIG_ISCSI_TCP is not set 619# CONFIG_ISCSI_TCP is not set
598# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 620# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -668,6 +690,7 @@ CONFIG_SATA_PROMISE=y
668# CONFIG_PATA_OLDPIIX is not set 690# CONFIG_PATA_OLDPIIX is not set
669# CONFIG_PATA_NETCELL is not set 691# CONFIG_PATA_NETCELL is not set
670# CONFIG_PATA_NS87410 is not set 692# CONFIG_PATA_NS87410 is not set
693# CONFIG_PATA_NS87415 is not set
671# CONFIG_PATA_OPTI is not set 694# CONFIG_PATA_OPTI is not set
672# CONFIG_PATA_OPTIDMA is not set 695# CONFIG_PATA_OPTIDMA is not set
673# CONFIG_PATA_PDC_OLD is not set 696# CONFIG_PATA_PDC_OLD is not set
@@ -699,11 +722,9 @@ CONFIG_DM_ZERO=m
699CONFIG_DM_MULTIPATH=m 722CONFIG_DM_MULTIPATH=m
700# CONFIG_DM_MULTIPATH_EMC is not set 723# CONFIG_DM_MULTIPATH_EMC is not set
701# CONFIG_DM_MULTIPATH_RDAC is not set 724# CONFIG_DM_MULTIPATH_RDAC is not set
725# CONFIG_DM_MULTIPATH_HP is not set
702# CONFIG_DM_DELAY is not set 726# CONFIG_DM_DELAY is not set
703 727# CONFIG_DM_UEVENT is not set
704#
705# Fusion MPT device support
706#
707CONFIG_FUSION=y 728CONFIG_FUSION=y
708# CONFIG_FUSION_SPI is not set 729# CONFIG_FUSION_SPI is not set
709# CONFIG_FUSION_FC is not set 730# CONFIG_FUSION_FC is not set
@@ -726,6 +747,8 @@ CONFIG_BONDING=m
726CONFIG_MACVLAN=m 747CONFIG_MACVLAN=m
727# CONFIG_EQUALIZER is not set 748# CONFIG_EQUALIZER is not set
728CONFIG_TUN=y 749CONFIG_TUN=y
750# CONFIG_VETH is not set
751# CONFIG_IP1000 is not set
729# CONFIG_ARCNET is not set 752# CONFIG_ARCNET is not set
730# CONFIG_PHYLIB is not set 753# CONFIG_PHYLIB is not set
731CONFIG_NET_ETHERNET=y 754CONFIG_NET_ETHERNET=y
@@ -736,21 +759,30 @@ CONFIG_MII=y
736# CONFIG_NET_VENDOR_3COM is not set 759# CONFIG_NET_VENDOR_3COM is not set
737# CONFIG_NET_TULIP is not set 760# CONFIG_NET_TULIP is not set
738# CONFIG_HP100 is not set 761# CONFIG_HP100 is not set
762# CONFIG_IBM_NEW_EMAC is not set
763CONFIG_IBM_NEW_EMAC_ZMII=y
764CONFIG_IBM_NEW_EMAC_RGMII=y
765CONFIG_IBM_NEW_EMAC_TAH=y
766CONFIG_IBM_NEW_EMAC_EMAC4=y
739# CONFIG_NET_PCI is not set 767# CONFIG_NET_PCI is not set
768# CONFIG_B44 is not set
740CONFIG_NETDEV_1000=y 769CONFIG_NETDEV_1000=y
741# CONFIG_ACENIC is not set 770# CONFIG_ACENIC is not set
742# CONFIG_DL2K is not set 771# CONFIG_DL2K is not set
743CONFIG_E1000=m 772CONFIG_E1000=m
744CONFIG_E1000_NAPI=y 773CONFIG_E1000_NAPI=y
745# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 774# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
775# CONFIG_E1000E is not set
746# CONFIG_NS83820 is not set 776# CONFIG_NS83820 is not set
747# CONFIG_HAMACHI is not set 777# CONFIG_HAMACHI is not set
748# CONFIG_YELLOWFIN is not set 778# CONFIG_YELLOWFIN is not set
749# CONFIG_R8169 is not set 779# CONFIG_R8169 is not set
750# CONFIG_SIS190 is not set 780# CONFIG_SIS190 is not set
751CONFIG_SKGE=m 781CONFIG_SKGE=m
782# CONFIG_SKGE_DEBUG is not set
752CONFIG_SKY2=m 783CONFIG_SKY2=m
753# CONFIG_SKY2_DEBUG is not set 784# CONFIG_SKY2_DEBUG is not set
785# CONFIG_SK98LIN is not set
754# CONFIG_VIA_VELOCITY is not set 786# CONFIG_VIA_VELOCITY is not set
755CONFIG_TIGON3=y 787CONFIG_TIGON3=y
756# CONFIG_BNX2 is not set 788# CONFIG_BNX2 is not set
@@ -761,12 +793,15 @@ CONFIG_GELIC_NET=m
761CONFIG_NETDEV_10000=y 793CONFIG_NETDEV_10000=y
762# CONFIG_CHELSIO_T1 is not set 794# CONFIG_CHELSIO_T1 is not set
763# CONFIG_CHELSIO_T3 is not set 795# CONFIG_CHELSIO_T3 is not set
796# CONFIG_IXGBE is not set
764# CONFIG_IXGB is not set 797# CONFIG_IXGB is not set
765# CONFIG_S2IO is not set 798# CONFIG_S2IO is not set
766# CONFIG_MYRI10GE is not set 799# CONFIG_MYRI10GE is not set
767# CONFIG_NETXEN_NIC is not set 800# CONFIG_NETXEN_NIC is not set
801# CONFIG_NIU is not set
768# CONFIG_PASEMI_MAC is not set 802# CONFIG_PASEMI_MAC is not set
769# CONFIG_MLX4_CORE is not set 803# CONFIG_MLX4_CORE is not set
804# CONFIG_TEHUTI is not set
770# CONFIG_TR is not set 805# CONFIG_TR is not set
771 806
772# 807#
@@ -782,7 +817,6 @@ CONFIG_NETDEV_10000=y
782# CONFIG_USB_KAWETH is not set 817# CONFIG_USB_KAWETH is not set
783# CONFIG_USB_PEGASUS is not set 818# CONFIG_USB_PEGASUS is not set
784# CONFIG_USB_RTL8150 is not set 819# CONFIG_USB_RTL8150 is not set
785# CONFIG_USB_USBNET_MII is not set
786# CONFIG_USB_USBNET is not set 820# CONFIG_USB_USBNET is not set
787# CONFIG_WAN is not set 821# CONFIG_WAN is not set
788# CONFIG_FDDI is not set 822# CONFIG_FDDI is not set
@@ -812,7 +846,6 @@ CONFIG_INPUT_MOUSEDEV=y
812CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 846CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
813CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 847CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
814# CONFIG_INPUT_JOYDEV is not set 848# CONFIG_INPUT_JOYDEV is not set
815# CONFIG_INPUT_TSDEV is not set
816# CONFIG_INPUT_EVDEV is not set 849# CONFIG_INPUT_EVDEV is not set
817# CONFIG_INPUT_EVBUG is not set 850# CONFIG_INPUT_EVBUG is not set
818 851
@@ -893,32 +926,11 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
893CONFIG_IPMI_SI=m 926CONFIG_IPMI_SI=m
894CONFIG_IPMI_WATCHDOG=m 927CONFIG_IPMI_WATCHDOG=m
895CONFIG_IPMI_POWEROFF=m 928CONFIG_IPMI_POWEROFF=m
896CONFIG_WATCHDOG=y
897# CONFIG_WATCHDOG_NOWAYOUT is not set
898
899#
900# Watchdog Device Drivers
901#
902# CONFIG_SOFT_WATCHDOG is not set
903# CONFIG_WATCHDOG_RTAS is not set
904
905#
906# PCI-based Watchdog Cards
907#
908# CONFIG_PCIPCWATCHDOG is not set
909# CONFIG_WDTPCI is not set
910
911#
912# USB-based Watchdog Cards
913#
914# CONFIG_USBPCWATCHDOG is not set
915# CONFIG_HW_RANDOM is not set 929# CONFIG_HW_RANDOM is not set
916CONFIG_GEN_RTC=y 930CONFIG_GEN_RTC=y
917# CONFIG_GEN_RTC_X is not set 931# CONFIG_GEN_RTC_X is not set
918# CONFIG_R3964 is not set 932# CONFIG_R3964 is not set
919# CONFIG_APPLICOM is not set 933# CONFIG_APPLICOM is not set
920# CONFIG_AGP is not set
921# CONFIG_DRM is not set
922# CONFIG_RAW_DRIVER is not set 934# CONFIG_RAW_DRIVER is not set
923# CONFIG_HANGCHECK_TIMER is not set 935# CONFIG_HANGCHECK_TIMER is not set
924# CONFIG_TCG_TPM is not set 936# CONFIG_TCG_TPM is not set
@@ -986,6 +998,31 @@ CONFIG_I2C_ALGOBIT=y
986# CONFIG_W1 is not set 998# CONFIG_W1 is not set
987# CONFIG_POWER_SUPPLY is not set 999# CONFIG_POWER_SUPPLY is not set
988# CONFIG_HWMON is not set 1000# CONFIG_HWMON is not set
1001CONFIG_WATCHDOG=y
1002# CONFIG_WATCHDOG_NOWAYOUT is not set
1003
1004#
1005# Watchdog Device Drivers
1006#
1007# CONFIG_SOFT_WATCHDOG is not set
1008# CONFIG_WATCHDOG_RTAS is not set
1009
1010#
1011# PCI-based Watchdog Cards
1012#
1013# CONFIG_PCIPCWATCHDOG is not set
1014# CONFIG_WDTPCI is not set
1015
1016#
1017# USB-based Watchdog Cards
1018#
1019# CONFIG_USBPCWATCHDOG is not set
1020
1021#
1022# Sonics Silicon Backplane
1023#
1024CONFIG_SSB_POSSIBLE=y
1025# CONFIG_SSB is not set
989 1026
990# 1027#
991# Multifunction device drivers 1028# Multifunction device drivers
@@ -1002,16 +1039,17 @@ CONFIG_I2C_ALGOBIT=y
1002# 1039#
1003# Graphics support 1040# Graphics support
1004# 1041#
1042# CONFIG_AGP is not set
1043# CONFIG_DRM is not set
1044# CONFIG_VGASTATE is not set
1045CONFIG_VIDEO_OUTPUT_CONTROL=m
1046# CONFIG_FB is not set
1005# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1047# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1006 1048
1007# 1049#
1008# Display device support 1050# Display device support
1009# 1051#
1010# CONFIG_DISPLAY_SUPPORT is not set 1052# CONFIG_DISPLAY_SUPPORT is not set
1011# CONFIG_VGASTATE is not set
1012CONFIG_VIDEO_OUTPUT_CONTROL=m
1013# CONFIG_FB is not set
1014# CONFIG_FB_IBM_GXT4500 is not set
1015 1053
1016# 1054#
1017# Console display driver support 1055# Console display driver support
@@ -1026,6 +1064,7 @@ CONFIG_DUMMY_CONSOLE=y
1026CONFIG_HID_SUPPORT=y 1064CONFIG_HID_SUPPORT=y
1027CONFIG_HID=m 1065CONFIG_HID=m
1028# CONFIG_HID_DEBUG is not set 1066# CONFIG_HID_DEBUG is not set
1067# CONFIG_HIDRAW is not set
1029 1068
1030# 1069#
1031# USB Input Devices 1070# USB Input Devices
@@ -1175,19 +1214,6 @@ CONFIG_EDAC_MM_EDAC=y
1175# CONFIG_RTC_CLASS is not set 1214# CONFIG_RTC_CLASS is not set
1176 1215
1177# 1216#
1178# DMA Engine support
1179#
1180# CONFIG_DMA_ENGINE is not set
1181
1182#
1183# DMA Clients
1184#
1185
1186#
1187# DMA Devices
1188#
1189
1190#
1191# Userspace I/O 1217# Userspace I/O
1192# 1218#
1193CONFIG_UIO=m 1219CONFIG_UIO=m
@@ -1253,7 +1279,6 @@ CONFIG_TMPFS=y
1253# CONFIG_TMPFS_POSIX_ACL is not set 1279# CONFIG_TMPFS_POSIX_ACL is not set
1254CONFIG_HUGETLBFS=y 1280CONFIG_HUGETLBFS=y
1255CONFIG_HUGETLB_PAGE=y 1281CONFIG_HUGETLB_PAGE=y
1256CONFIG_RAMFS=y
1257# CONFIG_CONFIGFS_FS is not set 1282# CONFIG_CONFIGFS_FS is not set
1258 1283
1259# 1284#
@@ -1272,10 +1297,7 @@ CONFIG_RAMFS=y
1272# CONFIG_QNX4FS_FS is not set 1297# CONFIG_QNX4FS_FS is not set
1273# CONFIG_SYSV_FS is not set 1298# CONFIG_SYSV_FS is not set
1274# CONFIG_UFS_FS is not set 1299# CONFIG_UFS_FS is not set
1275 1300CONFIG_NETWORK_FILESYSTEMS=y
1276#
1277# Network File Systems
1278#
1279CONFIG_NFS_FS=y 1301CONFIG_NFS_FS=y
1280CONFIG_NFS_V3=y 1302CONFIG_NFS_V3=y
1281CONFIG_NFS_V3_ACL=y 1303CONFIG_NFS_V3_ACL=y
@@ -1288,6 +1310,7 @@ CONFIG_LOCKD_V4=y
1288CONFIG_NFS_ACL_SUPPORT=y 1310CONFIG_NFS_ACL_SUPPORT=y
1289CONFIG_NFS_COMMON=y 1311CONFIG_NFS_COMMON=y
1290CONFIG_SUNRPC=y 1312CONFIG_SUNRPC=y
1313CONFIG_SUNRPC_XPRT_RDMA=m
1291# CONFIG_SUNRPC_BIND34 is not set 1314# CONFIG_SUNRPC_BIND34 is not set
1292# CONFIG_RPCSEC_GSS_KRB5 is not set 1315# CONFIG_RPCSEC_GSS_KRB5 is not set
1293# CONFIG_RPCSEC_GSS_SPKM3 is not set 1316# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -1318,10 +1341,6 @@ CONFIG_MSDOS_PARTITION=y
1318# CONFIG_KARMA_PARTITION is not set 1341# CONFIG_KARMA_PARTITION is not set
1319CONFIG_EFI_PARTITION=y 1342CONFIG_EFI_PARTITION=y
1320# CONFIG_SYSV68_PARTITION is not set 1343# CONFIG_SYSV68_PARTITION is not set
1321
1322#
1323# Native Language Support
1324#
1325CONFIG_NLS=m 1344CONFIG_NLS=m
1326CONFIG_NLS_DEFAULT="iso8859-1" 1345CONFIG_NLS_DEFAULT="iso8859-1"
1327# CONFIG_NLS_CODEPAGE_437 is not set 1346# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1362,10 +1381,6 @@ CONFIG_NLS_ISO8859_15=m
1362# CONFIG_NLS_KOI8_R is not set 1381# CONFIG_NLS_KOI8_R is not set
1363# CONFIG_NLS_KOI8_U is not set 1382# CONFIG_NLS_KOI8_U is not set
1364# CONFIG_NLS_UTF8 is not set 1383# CONFIG_NLS_UTF8 is not set
1365
1366#
1367# Distributed Lock Manager
1368#
1369# CONFIG_DLM is not set 1384# CONFIG_DLM is not set
1370# CONFIG_UCC_SLOW is not set 1385# CONFIG_UCC_SLOW is not set
1371 1386
@@ -1389,19 +1404,17 @@ CONFIG_PLIST=y
1389CONFIG_HAS_IOMEM=y 1404CONFIG_HAS_IOMEM=y
1390CONFIG_HAS_IOPORT=y 1405CONFIG_HAS_IOPORT=y
1391CONFIG_HAS_DMA=y 1406CONFIG_HAS_DMA=y
1392 1407CONFIG_INSTRUMENTATION=y
1393#
1394# Instrumentation Support
1395#
1396CONFIG_PROFILING=y 1408CONFIG_PROFILING=y
1397CONFIG_OPROFILE=m 1409CONFIG_OPROFILE=m
1398CONFIG_OPROFILE_CELL=y
1399# CONFIG_KPROBES is not set 1410# CONFIG_KPROBES is not set
1411# CONFIG_MARKERS is not set
1400 1412
1401# 1413#
1402# Kernel hacking 1414# Kernel hacking
1403# 1415#
1404# CONFIG_PRINTK_TIME is not set 1416# CONFIG_PRINTK_TIME is not set
1417CONFIG_ENABLE_WARN_DEPRECATED=y
1405# CONFIG_ENABLE_MUST_CHECK is not set 1418# CONFIG_ENABLE_MUST_CHECK is not set
1406CONFIG_MAGIC_SYSRQ=y 1419CONFIG_MAGIC_SYSRQ=y
1407# CONFIG_UNUSED_SYMBOLS is not set 1420# CONFIG_UNUSED_SYMBOLS is not set
@@ -1425,9 +1438,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1425# CONFIG_DEBUG_INFO is not set 1438# CONFIG_DEBUG_INFO is not set
1426# CONFIG_DEBUG_VM is not set 1439# CONFIG_DEBUG_VM is not set
1427# CONFIG_DEBUG_LIST is not set 1440# CONFIG_DEBUG_LIST is not set
1441# CONFIG_DEBUG_SG is not set
1428# CONFIG_FORCED_INLINING is not set 1442# CONFIG_FORCED_INLINING is not set
1443# CONFIG_BOOT_PRINTK_DELAY is not set
1429# CONFIG_RCU_TORTURE_TEST is not set 1444# CONFIG_RCU_TORTURE_TEST is not set
1430# CONFIG_FAULT_INJECTION is not set 1445# CONFIG_FAULT_INJECTION is not set
1446# CONFIG_SAMPLES is not set
1431# CONFIG_DEBUG_STACKOVERFLOW is not set 1447# CONFIG_DEBUG_STACKOVERFLOW is not set
1432# CONFIG_DEBUG_STACK_USAGE is not set 1448# CONFIG_DEBUG_STACK_USAGE is not set
1433# CONFIG_DEBUG_PAGEALLOC is not set 1449# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1436,6 +1452,7 @@ CONFIG_XMON=y
1436CONFIG_XMON_DEFAULT=y 1452CONFIG_XMON_DEFAULT=y
1437CONFIG_XMON_DISASSEMBLY=y 1453CONFIG_XMON_DISASSEMBLY=y
1438CONFIG_IRQSTACKS=y 1454CONFIG_IRQSTACKS=y
1455# CONFIG_VIRQ_DEBUG is not set
1439# CONFIG_BOOTX_TEXT is not set 1456# CONFIG_BOOTX_TEXT is not set
1440# CONFIG_PPC_EARLY_DEBUG is not set 1457# CONFIG_PPC_EARLY_DEBUG is not set
1441 1458
@@ -1444,6 +1461,7 @@ CONFIG_IRQSTACKS=y
1444# 1461#
1445# CONFIG_KEYS is not set 1462# CONFIG_KEYS is not set
1446# CONFIG_SECURITY is not set 1463# CONFIG_SECURITY is not set
1464# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1447CONFIG_CRYPTO=y 1465CONFIG_CRYPTO=y
1448CONFIG_CRYPTO_ALGAPI=y 1466CONFIG_CRYPTO_ALGAPI=y
1449CONFIG_CRYPTO_BLKCIPHER=m 1467CONFIG_CRYPTO_BLKCIPHER=m
@@ -1464,6 +1482,7 @@ CONFIG_CRYPTO_ECB=m
1464CONFIG_CRYPTO_CBC=m 1482CONFIG_CRYPTO_CBC=m
1465CONFIG_CRYPTO_PCBC=m 1483CONFIG_CRYPTO_PCBC=m
1466# CONFIG_CRYPTO_LRW is not set 1484# CONFIG_CRYPTO_LRW is not set
1485# CONFIG_CRYPTO_XTS is not set
1467# CONFIG_CRYPTO_CRYPTD is not set 1486# CONFIG_CRYPTO_CRYPTD is not set
1468CONFIG_CRYPTO_DES=m 1487CONFIG_CRYPTO_DES=m
1469# CONFIG_CRYPTO_FCRYPT is not set 1488# CONFIG_CRYPTO_FCRYPT is not set
@@ -1477,9 +1496,12 @@ CONFIG_CRYPTO_DES=m
1477# CONFIG_CRYPTO_ARC4 is not set 1496# CONFIG_CRYPTO_ARC4 is not set
1478# CONFIG_CRYPTO_KHAZAD is not set 1497# CONFIG_CRYPTO_KHAZAD is not set
1479# CONFIG_CRYPTO_ANUBIS is not set 1498# CONFIG_CRYPTO_ANUBIS is not set
1499# CONFIG_CRYPTO_SEED is not set
1480CONFIG_CRYPTO_DEFLATE=m 1500CONFIG_CRYPTO_DEFLATE=m
1481# CONFIG_CRYPTO_MICHAEL_MIC is not set 1501# CONFIG_CRYPTO_MICHAEL_MIC is not set
1482# CONFIG_CRYPTO_CRC32C is not set 1502# CONFIG_CRYPTO_CRC32C is not set
1483# CONFIG_CRYPTO_CAMELLIA is not set 1503# CONFIG_CRYPTO_CAMELLIA is not set
1484# CONFIG_CRYPTO_TEST is not set 1504# CONFIG_CRYPTO_TEST is not set
1505# CONFIG_CRYPTO_AUTHENC is not set
1485CONFIG_CRYPTO_HW=y 1506CONFIG_CRYPTO_HW=y
1507# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 2c5969801bd6..421e08ee857a 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:32:07 2007 4# Thu Dec 6 16:48:07 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -11,6 +11,7 @@ CONFIG_PPC64=y
11# CONFIG_POWER4_ONLY is not set 11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y 12CONFIG_POWER3=y
13CONFIG_POWER4=y 13CONFIG_POWER4=y
14CONFIG_TUNE_CELL=y
14CONFIG_PPC_FPU=y 15CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y 16CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y 17CONFIG_PPC_STD_MMU=y
@@ -19,8 +20,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y 20CONFIG_SMP=y
20CONFIG_NR_CPUS=4 21CONFIG_NR_CPUS=4
21CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64
22CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
23CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
24CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
25CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
26CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,11 +69,13 @@ CONFIG_SYSVIPC_SYSCTL=y
63# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
69CONFIG_LOG_BUF_SHIFT=15 76CONFIG_LOG_BUF_SHIFT=15
70# CONFIG_CPUSETS is not set 77# CONFIG_CGROUPS is not set
78# CONFIG_FAIR_GROUP_SCHED is not set
71CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
72# CONFIG_RELAY is not set 80# CONFIG_RELAY is not set
73CONFIG_BLK_DEV_INITRD=y 81CONFIG_BLK_DEV_INITRD=y
@@ -88,7 +96,6 @@ CONFIG_FUTEX=y
88CONFIG_ANON_INODES=y 96CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 97CONFIG_EPOLL=y
90CONFIG_SIGNALFD=y 98CONFIG_SIGNALFD=y
91CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 99CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 100CONFIG_SHMEM=y
94CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
@@ -109,6 +116,7 @@ CONFIG_STOP_MACHINE=y
109CONFIG_BLOCK=y 116CONFIG_BLOCK=y
110# CONFIG_BLK_DEV_IO_TRACE is not set 117# CONFIG_BLK_DEV_IO_TRACE is not set
111CONFIG_BLK_DEV_BSG=y 118CONFIG_BLK_DEV_BSG=y
119CONFIG_BLOCK_COMPAT=y
112 120
113# 121#
114# IO Schedulers 122# IO Schedulers
@@ -127,7 +135,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
127# Platform support 135# Platform support
128# 136#
129CONFIG_PPC_MULTIPLATFORM=y 137CONFIG_PPC_MULTIPLATFORM=y
130# CONFIG_EMBEDDED6xx is not set
131# CONFIG_PPC_82xx is not set 138# CONFIG_PPC_82xx is not set
132# CONFIG_PPC_83xx is not set 139# CONFIG_PPC_83xx is not set
133# CONFIG_PPC_86xx is not set 140# CONFIG_PPC_86xx is not set
@@ -160,8 +167,8 @@ CONFIG_PPC_UDBG_BEAT=y
160# CONFIG_MMIO_NVRAM is not set 167# CONFIG_MMIO_NVRAM is not set
161# CONFIG_PPC_MPC106 is not set 168# CONFIG_PPC_MPC106 is not set
162# CONFIG_PPC_970_NAP is not set 169# CONFIG_PPC_970_NAP is not set
163# CONFIG_PPC_INDIRECT_IO is not set 170CONFIG_PPC_INDIRECT_IO=y
164# CONFIG_GENERIC_IOMAP is not set 171CONFIG_GENERIC_IOMAP=y
165# CONFIG_CPU_FREQ is not set 172# CONFIG_CPU_FREQ is not set
166# CONFIG_CPM2 is not set 173# CONFIG_CPM2 is not set
167# CONFIG_FSL_ULI1575 is not set 174# CONFIG_FSL_ULI1575 is not set
@@ -169,6 +176,10 @@ CONFIG_PPC_UDBG_BEAT=y
169# 176#
170# Kernel options 177# Kernel options
171# 178#
179CONFIG_TICK_ONESHOT=y
180CONFIG_NO_HZ=y
181CONFIG_HIGH_RES_TIMERS=y
182CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
172# CONFIG_HZ_100 is not set 183# CONFIG_HZ_100 is not set
173CONFIG_HZ_250=y 184CONFIG_HZ_250=y
174# CONFIG_HZ_300 is not set 185# CONFIG_HZ_300 is not set
@@ -181,6 +192,7 @@ CONFIG_PREEMPT_BKL=y
181CONFIG_BINFMT_ELF=y 192CONFIG_BINFMT_ELF=y
182CONFIG_BINFMT_MISC=m 193CONFIG_BINFMT_MISC=m
183CONFIG_FORCE_MAX_ZONEORDER=13 194CONFIG_FORCE_MAX_ZONEORDER=13
195CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
184# CONFIG_IOMMU_VMERGE is not set 196# CONFIG_IOMMU_VMERGE is not set
185CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 197CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
186CONFIG_KEXEC=y 198CONFIG_KEXEC=y
@@ -200,6 +212,8 @@ CONFIG_NEED_MULTIPLE_NODES=y
200CONFIG_HAVE_MEMORY_PRESENT=y 212CONFIG_HAVE_MEMORY_PRESENT=y
201# CONFIG_SPARSEMEM_STATIC is not set 213# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPARSEMEM_EXTREME=y 214CONFIG_SPARSEMEM_EXTREME=y
215CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
216CONFIG_SPARSEMEM_VMEMMAP=y
203CONFIG_MEMORY_HOTPLUG=y 217CONFIG_MEMORY_HOTPLUG=y
204CONFIG_MEMORY_HOTPLUG_SPARSE=y 218CONFIG_MEMORY_HOTPLUG_SPARSE=y
205CONFIG_SPLIT_PTLOCK_CPUS=4 219CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -231,11 +245,8 @@ CONFIG_PCI_SYSCALL=y
231# CONFIG_PCIEPORTBUS is not set 245# CONFIG_PCIEPORTBUS is not set
232CONFIG_ARCH_SUPPORTS_MSI=y 246CONFIG_ARCH_SUPPORTS_MSI=y
233# CONFIG_PCI_MSI is not set 247# CONFIG_PCI_MSI is not set
248CONFIG_PCI_LEGACY=y
234# CONFIG_PCI_DEBUG is not set 249# CONFIG_PCI_DEBUG is not set
235
236#
237# PCCARD (PCMCIA/CardBus) support
238#
239# CONFIG_PCCARD is not set 250# CONFIG_PCCARD is not set
240# CONFIG_HOTPLUG_PCI is not set 251# CONFIG_HOTPLUG_PCI is not set
241CONFIG_KERNEL_START=0xc000000000000000 252CONFIG_KERNEL_START=0xc000000000000000
@@ -274,6 +285,7 @@ CONFIG_INET_TUNNEL=y
274CONFIG_INET_XFRM_MODE_TRANSPORT=y 285CONFIG_INET_XFRM_MODE_TRANSPORT=y
275CONFIG_INET_XFRM_MODE_TUNNEL=y 286CONFIG_INET_XFRM_MODE_TUNNEL=y
276CONFIG_INET_XFRM_MODE_BEET=y 287CONFIG_INET_XFRM_MODE_BEET=y
288CONFIG_INET_LRO=y
277CONFIG_INET_DIAG=y 289CONFIG_INET_DIAG=y
278CONFIG_INET_TCP_DIAG=y 290CONFIG_INET_TCP_DIAG=y
279# CONFIG_TCP_CONG_ADVANCED is not set 291# CONFIG_TCP_CONG_ADVANCED is not set
@@ -336,10 +348,6 @@ CONFIG_IP_NF_QUEUE=m
336# CONFIG_LAPB is not set 348# CONFIG_LAPB is not set
337# CONFIG_ECONET is not set 349# CONFIG_ECONET is not set
338# CONFIG_WAN_ROUTER is not set 350# CONFIG_WAN_ROUTER is not set
339
340#
341# QoS and/or fair queueing
342#
343# CONFIG_NET_SCHED is not set 351# CONFIG_NET_SCHED is not set
344 352
345# 353#
@@ -368,6 +376,7 @@ CONFIG_IP_NF_QUEUE=m
368# 376#
369# Generic Driver Options 377# Generic Driver Options
370# 378#
379CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
371CONFIG_STANDALONE=y 380CONFIG_STANDALONE=y
372CONFIG_PREVENT_FIRMWARE_BUILD=y 381CONFIG_PREVENT_FIRMWARE_BUILD=y
373CONFIG_FW_LOADER=y 382CONFIG_FW_LOADER=y
@@ -420,6 +429,11 @@ CONFIG_IDE_PROC_FS=y
420# IDE chipset support/bugfixes 429# IDE chipset support/bugfixes
421# 430#
422CONFIG_IDE_GENERIC=y 431CONFIG_IDE_GENERIC=y
432# CONFIG_BLK_DEV_PLATFORM is not set
433
434#
435# PCI IDE chipsets support
436#
423CONFIG_BLK_DEV_IDEPCI=y 437CONFIG_BLK_DEV_IDEPCI=y
424CONFIG_IDEPCI_SHARE_IRQ=y 438CONFIG_IDEPCI_SHARE_IRQ=y
425CONFIG_IDEPCI_PCIBUS_ORDER=y 439CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -427,8 +441,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
427CONFIG_BLK_DEV_GENERIC=y 441CONFIG_BLK_DEV_GENERIC=y
428# CONFIG_BLK_DEV_OPTI621 is not set 442# CONFIG_BLK_DEV_OPTI621 is not set
429CONFIG_BLK_DEV_IDEDMA_PCI=y 443CONFIG_BLK_DEV_IDEDMA_PCI=y
430# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
431# CONFIG_IDEDMA_ONLYDISK is not set
432# CONFIG_BLK_DEV_AEC62XX is not set 444# CONFIG_BLK_DEV_AEC62XX is not set
433# CONFIG_BLK_DEV_ALI15X3 is not set 445# CONFIG_BLK_DEV_ALI15X3 is not set
434# CONFIG_BLK_DEV_AMD74XX is not set 446# CONFIG_BLK_DEV_AMD74XX is not set
@@ -457,7 +469,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
457CONFIG_BLK_DEV_CELLEB=y 469CONFIG_BLK_DEV_CELLEB=y
458# CONFIG_IDE_ARM is not set 470# CONFIG_IDE_ARM is not set
459CONFIG_BLK_DEV_IDEDMA=y 471CONFIG_BLK_DEV_IDEDMA=y
460# CONFIG_IDEDMA_IVB is not set 472CONFIG_IDE_ARCH_OBSOLETE_INIT=y
461# CONFIG_BLK_DEV_HD is not set 473# CONFIG_BLK_DEV_HD is not set
462 474
463# 475#
@@ -498,6 +510,7 @@ CONFIG_SCSI_WAIT_SCAN=m
498# CONFIG_SCSI_ISCSI_ATTRS is not set 510# CONFIG_SCSI_ISCSI_ATTRS is not set
499# CONFIG_SCSI_SAS_ATTRS is not set 511# CONFIG_SCSI_SAS_ATTRS is not set
500# CONFIG_SCSI_SAS_LIBSAS is not set 512# CONFIG_SCSI_SAS_LIBSAS is not set
513# CONFIG_SCSI_SRP_ATTRS is not set
501CONFIG_SCSI_LOWLEVEL=y 514CONFIG_SCSI_LOWLEVEL=y
502# CONFIG_ISCSI_TCP is not set 515# CONFIG_ISCSI_TCP is not set
503# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 516# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -549,15 +562,10 @@ CONFIG_DM_ZERO=m
549CONFIG_DM_MULTIPATH=m 562CONFIG_DM_MULTIPATH=m
550# CONFIG_DM_MULTIPATH_EMC is not set 563# CONFIG_DM_MULTIPATH_EMC is not set
551# CONFIG_DM_MULTIPATH_RDAC is not set 564# CONFIG_DM_MULTIPATH_RDAC is not set
565# CONFIG_DM_MULTIPATH_HP is not set
552# CONFIG_DM_DELAY is not set 566# CONFIG_DM_DELAY is not set
553 567# CONFIG_DM_UEVENT is not set
554#
555# Fusion MPT device support
556#
557# CONFIG_FUSION is not set 568# CONFIG_FUSION is not set
558# CONFIG_FUSION_SPI is not set
559# CONFIG_FUSION_FC is not set
560# CONFIG_FUSION_SAS is not set
561 569
562# 570#
563# IEEE 1394 (FireWire) support 571# IEEE 1394 (FireWire) support
@@ -573,6 +581,8 @@ CONFIG_NETDEVICES=y
573# CONFIG_MACVLAN is not set 581# CONFIG_MACVLAN is not set
574# CONFIG_EQUALIZER is not set 582# CONFIG_EQUALIZER is not set
575# CONFIG_TUN is not set 583# CONFIG_TUN is not set
584# CONFIG_VETH is not set
585# CONFIG_IP1000 is not set
576# CONFIG_ARCNET is not set 586# CONFIG_ARCNET is not set
577# CONFIG_PHYLIB is not set 587# CONFIG_PHYLIB is not set
578CONFIG_NET_ETHERNET=y 588CONFIG_NET_ETHERNET=y
@@ -583,11 +593,17 @@ CONFIG_MII=y
583# CONFIG_NET_VENDOR_3COM is not set 593# CONFIG_NET_VENDOR_3COM is not set
584# CONFIG_NET_TULIP is not set 594# CONFIG_NET_TULIP is not set
585# CONFIG_HP100 is not set 595# CONFIG_HP100 is not set
596# CONFIG_IBM_NEW_EMAC_ZMII is not set
597# CONFIG_IBM_NEW_EMAC_RGMII is not set
598# CONFIG_IBM_NEW_EMAC_TAH is not set
599# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
586# CONFIG_NET_PCI is not set 600# CONFIG_NET_PCI is not set
601# CONFIG_B44 is not set
587CONFIG_NETDEV_1000=y 602CONFIG_NETDEV_1000=y
588# CONFIG_ACENIC is not set 603# CONFIG_ACENIC is not set
589# CONFIG_DL2K is not set 604# CONFIG_DL2K is not set
590# CONFIG_E1000 is not set 605# CONFIG_E1000 is not set
606# CONFIG_E1000E is not set
591# CONFIG_NS83820 is not set 607# CONFIG_NS83820 is not set
592# CONFIG_HAMACHI is not set 608# CONFIG_HAMACHI is not set
593# CONFIG_YELLOWFIN is not set 609# CONFIG_YELLOWFIN is not set
@@ -595,6 +611,7 @@ CONFIG_NETDEV_1000=y
595# CONFIG_SIS190 is not set 611# CONFIG_SIS190 is not set
596# CONFIG_SKGE is not set 612# CONFIG_SKGE is not set
597# CONFIG_SKY2 is not set 613# CONFIG_SKY2 is not set
614# CONFIG_SK98LIN is not set
598# CONFIG_VIA_VELOCITY is not set 615# CONFIG_VIA_VELOCITY is not set
599# CONFIG_TIGON3 is not set 616# CONFIG_TIGON3 is not set
600# CONFIG_BNX2 is not set 617# CONFIG_BNX2 is not set
@@ -604,12 +621,15 @@ CONFIG_SPIDER_NET=y
604CONFIG_NETDEV_10000=y 621CONFIG_NETDEV_10000=y
605# CONFIG_CHELSIO_T1 is not set 622# CONFIG_CHELSIO_T1 is not set
606# CONFIG_CHELSIO_T3 is not set 623# CONFIG_CHELSIO_T3 is not set
624# CONFIG_IXGBE is not set
607# CONFIG_IXGB is not set 625# CONFIG_IXGB is not set
608# CONFIG_S2IO is not set 626# CONFIG_S2IO is not set
609# CONFIG_MYRI10GE is not set 627# CONFIG_MYRI10GE is not set
610# CONFIG_NETXEN_NIC is not set 628# CONFIG_NETXEN_NIC is not set
629# CONFIG_NIU is not set
611# CONFIG_PASEMI_MAC is not set 630# CONFIG_PASEMI_MAC is not set
612# CONFIG_MLX4_CORE is not set 631# CONFIG_MLX4_CORE is not set
632# CONFIG_TEHUTI is not set
613# CONFIG_TR is not set 633# CONFIG_TR is not set
614 634
615# 635#
@@ -625,7 +645,6 @@ CONFIG_NETDEV_10000=y
625# CONFIG_USB_KAWETH is not set 645# CONFIG_USB_KAWETH is not set
626# CONFIG_USB_PEGASUS is not set 646# CONFIG_USB_PEGASUS is not set
627# CONFIG_USB_RTL8150 is not set 647# CONFIG_USB_RTL8150 is not set
628# CONFIG_USB_USBNET_MII is not set
629# CONFIG_USB_USBNET is not set 648# CONFIG_USB_USBNET is not set
630# CONFIG_WAN is not set 649# CONFIG_WAN is not set
631# CONFIG_FDDI is not set 650# CONFIG_FDDI is not set
@@ -655,7 +674,6 @@ CONFIG_INPUT_MOUSEDEV=y
655CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 674CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
656CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 675CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
657# CONFIG_INPUT_JOYDEV is not set 676# CONFIG_INPUT_JOYDEV is not set
658# CONFIG_INPUT_TSDEV is not set
659# CONFIG_INPUT_EVDEV is not set 677# CONFIG_INPUT_EVDEV is not set
660# CONFIG_INPUT_EVBUG is not set 678# CONFIG_INPUT_EVBUG is not set
661 679
@@ -725,31 +743,11 @@ CONFIG_UNIX98_PTYS=y
725CONFIG_HVC_DRIVER=y 743CONFIG_HVC_DRIVER=y
726CONFIG_HVC_BEAT=y 744CONFIG_HVC_BEAT=y
727# CONFIG_IPMI_HANDLER is not set 745# CONFIG_IPMI_HANDLER is not set
728CONFIG_WATCHDOG=y
729# CONFIG_WATCHDOG_NOWAYOUT is not set
730
731#
732# Watchdog Device Drivers
733#
734# CONFIG_SOFT_WATCHDOG is not set
735
736#
737# PCI-based Watchdog Cards
738#
739# CONFIG_PCIPCWATCHDOG is not set
740# CONFIG_WDTPCI is not set
741
742#
743# USB-based Watchdog Cards
744#
745# CONFIG_USBPCWATCHDOG is not set
746# CONFIG_HW_RANDOM is not set 746# CONFIG_HW_RANDOM is not set
747CONFIG_GEN_RTC=y 747CONFIG_GEN_RTC=y
748# CONFIG_GEN_RTC_X is not set 748# CONFIG_GEN_RTC_X is not set
749# CONFIG_R3964 is not set 749# CONFIG_R3964 is not set
750# CONFIG_APPLICOM is not set 750# CONFIG_APPLICOM is not set
751# CONFIG_AGP is not set
752# CONFIG_DRM is not set
753# CONFIG_RAW_DRIVER is not set 751# CONFIG_RAW_DRIVER is not set
754# CONFIG_HANGCHECK_TIMER is not set 752# CONFIG_HANGCHECK_TIMER is not set
755# CONFIG_TCG_TPM is not set 753# CONFIG_TCG_TPM is not set
@@ -817,6 +815,30 @@ CONFIG_I2C_ALGOBIT=y
817# CONFIG_W1 is not set 815# CONFIG_W1 is not set
818# CONFIG_POWER_SUPPLY is not set 816# CONFIG_POWER_SUPPLY is not set
819# CONFIG_HWMON is not set 817# CONFIG_HWMON is not set
818CONFIG_WATCHDOG=y
819# CONFIG_WATCHDOG_NOWAYOUT is not set
820
821#
822# Watchdog Device Drivers
823#
824# CONFIG_SOFT_WATCHDOG is not set
825
826#
827# PCI-based Watchdog Cards
828#
829# CONFIG_PCIPCWATCHDOG is not set
830# CONFIG_WDTPCI is not set
831
832#
833# USB-based Watchdog Cards
834#
835# CONFIG_USBPCWATCHDOG is not set
836
837#
838# Sonics Silicon Backplane
839#
840CONFIG_SSB_POSSIBLE=y
841# CONFIG_SSB is not set
820 842
821# 843#
822# Multifunction device drivers 844# Multifunction device drivers
@@ -833,16 +855,17 @@ CONFIG_I2C_ALGOBIT=y
833# 855#
834# Graphics support 856# Graphics support
835# 857#
858# CONFIG_AGP is not set
859# CONFIG_DRM is not set
860# CONFIG_VGASTATE is not set
861# CONFIG_VIDEO_OUTPUT_CONTROL is not set
862# CONFIG_FB is not set
836# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 863# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
837 864
838# 865#
839# Display device support 866# Display device support
840# 867#
841# CONFIG_DISPLAY_SUPPORT is not set 868# CONFIG_DISPLAY_SUPPORT is not set
842# CONFIG_VGASTATE is not set
843# CONFIG_VIDEO_OUTPUT_CONTROL is not set
844# CONFIG_FB is not set
845# CONFIG_FB_IBM_GXT4500 is not set
846 869
847# 870#
848# Console display driver support 871# Console display driver support
@@ -857,6 +880,7 @@ CONFIG_DUMMY_CONSOLE=y
857CONFIG_HID_SUPPORT=y 880CONFIG_HID_SUPPORT=y
858CONFIG_HID=y 881CONFIG_HID=y
859# CONFIG_HID_DEBUG is not set 882# CONFIG_HID_DEBUG is not set
883# CONFIG_HIDRAW is not set
860 884
861# 885#
862# USB Input Devices 886# USB Input Devices
@@ -980,19 +1004,6 @@ CONFIG_USB_MON=y
980# CONFIG_RTC_CLASS is not set 1004# CONFIG_RTC_CLASS is not set
981 1005
982# 1006#
983# DMA Engine support
984#
985# CONFIG_DMA_ENGINE is not set
986
987#
988# DMA Clients
989#
990
991#
992# DMA Devices
993#
994
995#
996# Userspace I/O 1007# Userspace I/O
997# 1008#
998# CONFIG_UIO is not set 1009# CONFIG_UIO is not set
@@ -1060,7 +1071,6 @@ CONFIG_TMPFS=y
1060# CONFIG_TMPFS_POSIX_ACL is not set 1071# CONFIG_TMPFS_POSIX_ACL is not set
1061CONFIG_HUGETLBFS=y 1072CONFIG_HUGETLBFS=y
1062CONFIG_HUGETLB_PAGE=y 1073CONFIG_HUGETLB_PAGE=y
1063CONFIG_RAMFS=y
1064# CONFIG_CONFIGFS_FS is not set 1074# CONFIG_CONFIGFS_FS is not set
1065 1075
1066# 1076#
@@ -1079,10 +1089,7 @@ CONFIG_RAMFS=y
1079# CONFIG_QNX4FS_FS is not set 1089# CONFIG_QNX4FS_FS is not set
1080# CONFIG_SYSV_FS is not set 1090# CONFIG_SYSV_FS is not set
1081# CONFIG_UFS_FS is not set 1091# CONFIG_UFS_FS is not set
1082 1092CONFIG_NETWORK_FILESYSTEMS=y
1083#
1084# Network File Systems
1085#
1086CONFIG_NFS_FS=m 1093CONFIG_NFS_FS=m
1087CONFIG_NFS_V3=y 1094CONFIG_NFS_V3=y
1088CONFIG_NFS_V3_ACL=y 1095CONFIG_NFS_V3_ACL=y
@@ -1130,10 +1137,6 @@ CONFIG_MSDOS_PARTITION=y
1130# CONFIG_KARMA_PARTITION is not set 1137# CONFIG_KARMA_PARTITION is not set
1131CONFIG_EFI_PARTITION=y 1138CONFIG_EFI_PARTITION=y
1132# CONFIG_SYSV68_PARTITION is not set 1139# CONFIG_SYSV68_PARTITION is not set
1133
1134#
1135# Native Language Support
1136#
1137CONFIG_NLS=m 1140CONFIG_NLS=m
1138CONFIG_NLS_DEFAULT="iso8859-1" 1141CONFIG_NLS_DEFAULT="iso8859-1"
1139# CONFIG_NLS_CODEPAGE_437 is not set 1142# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1174,10 +1177,6 @@ CONFIG_NLS_ISO8859_15=m
1174# CONFIG_NLS_KOI8_R is not set 1177# CONFIG_NLS_KOI8_R is not set
1175# CONFIG_NLS_KOI8_U is not set 1178# CONFIG_NLS_KOI8_U is not set
1176# CONFIG_NLS_UTF8 is not set 1179# CONFIG_NLS_UTF8 is not set
1177
1178#
1179# Distributed Lock Manager
1180#
1181# CONFIG_DLM is not set 1180# CONFIG_DLM is not set
1182# CONFIG_UCC_SLOW is not set 1181# CONFIG_UCC_SLOW is not set
1183 1182
@@ -1197,17 +1196,16 @@ CONFIG_PLIST=y
1197CONFIG_HAS_IOMEM=y 1196CONFIG_HAS_IOMEM=y
1198CONFIG_HAS_IOPORT=y 1197CONFIG_HAS_IOPORT=y
1199CONFIG_HAS_DMA=y 1198CONFIG_HAS_DMA=y
1200 1199CONFIG_INSTRUMENTATION=y
1201#
1202# Instrumentation Support
1203#
1204# CONFIG_PROFILING is not set 1200# CONFIG_PROFILING is not set
1205# CONFIG_KPROBES is not set 1201# CONFIG_KPROBES is not set
1202# CONFIG_MARKERS is not set
1206 1203
1207# 1204#
1208# Kernel hacking 1205# Kernel hacking
1209# 1206#
1210# CONFIG_PRINTK_TIME is not set 1207# CONFIG_PRINTK_TIME is not set
1208CONFIG_ENABLE_WARN_DEPRECATED=y
1211CONFIG_ENABLE_MUST_CHECK=y 1209CONFIG_ENABLE_MUST_CHECK=y
1212CONFIG_MAGIC_SYSRQ=y 1210CONFIG_MAGIC_SYSRQ=y
1213# CONFIG_UNUSED_SYMBOLS is not set 1211# CONFIG_UNUSED_SYMBOLS is not set
@@ -1231,9 +1229,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1231# CONFIG_DEBUG_INFO is not set 1229# CONFIG_DEBUG_INFO is not set
1232# CONFIG_DEBUG_VM is not set 1230# CONFIG_DEBUG_VM is not set
1233# CONFIG_DEBUG_LIST is not set 1231# CONFIG_DEBUG_LIST is not set
1232# CONFIG_DEBUG_SG is not set
1234# CONFIG_FORCED_INLINING is not set 1233# CONFIG_FORCED_INLINING is not set
1234# CONFIG_BOOT_PRINTK_DELAY is not set
1235# CONFIG_RCU_TORTURE_TEST is not set 1235# CONFIG_RCU_TORTURE_TEST is not set
1236# CONFIG_FAULT_INJECTION is not set 1236# CONFIG_FAULT_INJECTION is not set
1237# CONFIG_SAMPLES is not set
1237# CONFIG_DEBUG_STACKOVERFLOW is not set 1238# CONFIG_DEBUG_STACKOVERFLOW is not set
1238# CONFIG_DEBUG_STACK_USAGE is not set 1239# CONFIG_DEBUG_STACK_USAGE is not set
1239# CONFIG_DEBUG_PAGEALLOC is not set 1240# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1242,6 +1243,7 @@ CONFIG_XMON=y
1242CONFIG_XMON_DEFAULT=y 1243CONFIG_XMON_DEFAULT=y
1243CONFIG_XMON_DISASSEMBLY=y 1244CONFIG_XMON_DISASSEMBLY=y
1244CONFIG_IRQSTACKS=y 1245CONFIG_IRQSTACKS=y
1246# CONFIG_VIRQ_DEBUG is not set
1245# CONFIG_BOOTX_TEXT is not set 1247# CONFIG_BOOTX_TEXT is not set
1246CONFIG_PPC_EARLY_DEBUG=y 1248CONFIG_PPC_EARLY_DEBUG=y
1247# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1249# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
@@ -1253,12 +1255,14 @@ CONFIG_PPC_EARLY_DEBUG=y
1253# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 1255# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
1254CONFIG_PPC_EARLY_DEBUG_BEAT=y 1256CONFIG_PPC_EARLY_DEBUG_BEAT=y
1255# CONFIG_PPC_EARLY_DEBUG_44x is not set 1257# CONFIG_PPC_EARLY_DEBUG_44x is not set
1258# CONFIG_PPC_EARLY_DEBUG_CPM is not set
1256 1259
1257# 1260#
1258# Security options 1261# Security options
1259# 1262#
1260# CONFIG_KEYS is not set 1263# CONFIG_KEYS is not set
1261# CONFIG_SECURITY is not set 1264# CONFIG_SECURITY is not set
1265# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1262CONFIG_CRYPTO=y 1266CONFIG_CRYPTO=y
1263CONFIG_CRYPTO_ALGAPI=y 1267CONFIG_CRYPTO_ALGAPI=y
1264CONFIG_CRYPTO_BLKCIPHER=m 1268CONFIG_CRYPTO_BLKCIPHER=m
@@ -1279,6 +1283,7 @@ CONFIG_CRYPTO_ECB=m
1279CONFIG_CRYPTO_CBC=m 1283CONFIG_CRYPTO_CBC=m
1280CONFIG_CRYPTO_PCBC=m 1284CONFIG_CRYPTO_PCBC=m
1281# CONFIG_CRYPTO_LRW is not set 1285# CONFIG_CRYPTO_LRW is not set
1286# CONFIG_CRYPTO_XTS is not set
1282# CONFIG_CRYPTO_CRYPTD is not set 1287# CONFIG_CRYPTO_CRYPTD is not set
1283CONFIG_CRYPTO_DES=m 1288CONFIG_CRYPTO_DES=m
1284# CONFIG_CRYPTO_FCRYPT is not set 1289# CONFIG_CRYPTO_FCRYPT is not set
@@ -1293,9 +1298,12 @@ CONFIG_CRYPTO_TEA=m
1293CONFIG_CRYPTO_ARC4=m 1298CONFIG_CRYPTO_ARC4=m
1294CONFIG_CRYPTO_KHAZAD=m 1299CONFIG_CRYPTO_KHAZAD=m
1295CONFIG_CRYPTO_ANUBIS=m 1300CONFIG_CRYPTO_ANUBIS=m
1301# CONFIG_CRYPTO_SEED is not set
1296CONFIG_CRYPTO_DEFLATE=m 1302CONFIG_CRYPTO_DEFLATE=m
1297CONFIG_CRYPTO_MICHAEL_MIC=m 1303CONFIG_CRYPTO_MICHAEL_MIC=m
1298CONFIG_CRYPTO_CRC32C=m 1304CONFIG_CRYPTO_CRC32C=m
1299# CONFIG_CRYPTO_CAMELLIA is not set 1305# CONFIG_CRYPTO_CAMELLIA is not set
1300CONFIG_CRYPTO_TEST=m 1306CONFIG_CRYPTO_TEST=m
1307# CONFIG_CRYPTO_AUTHENC is not set
1301# CONFIG_CRYPTO_HW is not set 1308# CONFIG_CRYPTO_HW is not set
1309# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 6f27e57331d5..5989b5d2277e 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:33:50 2007 4# Thu Dec 6 16:48:09 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_PPC_STD_MMU_32=y
22CONFIG_SMP=y 22CONFIG_SMP=y
23CONFIG_NR_CPUS=4 23CONFIG_NR_CPUS=4
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,11 +68,13 @@ CONFIG_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
65# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
69CONFIG_LOG_BUF_SHIFT=15 75CONFIG_LOG_BUF_SHIFT=15
70# CONFIG_CPUSETS is not set 76# CONFIG_CGROUPS is not set
77# CONFIG_FAIR_GROUP_SCHED is not set
71CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
72# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
73CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
@@ -88,7 +95,6 @@ CONFIG_FUTEX=y
88CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 96CONFIG_EPOLL=y
90CONFIG_SIGNALFD=y 97CONFIG_SIGNALFD=y
91CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 99CONFIG_SHMEM=y
94CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
@@ -129,7 +135,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
129# Platform support 135# Platform support
130# 136#
131CONFIG_PPC_MULTIPLATFORM=y 137CONFIG_PPC_MULTIPLATFORM=y
132# CONFIG_EMBEDDED6xx is not set
133# CONFIG_PPC_82xx is not set 138# CONFIG_PPC_82xx is not set
134# CONFIG_PPC_83xx is not set 139# CONFIG_PPC_83xx is not set
135# CONFIG_PPC_86xx is not set 140# CONFIG_PPC_86xx is not set
@@ -165,6 +170,10 @@ CONFIG_PPC_MPC106=y
165# Kernel options 170# Kernel options
166# 171#
167CONFIG_HIGHMEM=y 172CONFIG_HIGHMEM=y
173CONFIG_TICK_ONESHOT=y
174CONFIG_NO_HZ=y
175CONFIG_HIGH_RES_TIMERS=y
176CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
168# CONFIG_HZ_100 is not set 177# CONFIG_HZ_100 is not set
169CONFIG_HZ_250=y 178CONFIG_HZ_250=y
170# CONFIG_HZ_300 is not set 179# CONFIG_HZ_300 is not set
@@ -188,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
188CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
189CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
190# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
191CONFIG_SPLIT_PTLOCK_CPUS=4 201CONFIG_SPLIT_PTLOCK_CPUS=4
192# CONFIG_RESOURCES_64BIT is not set 202# CONFIG_RESOURCES_64BIT is not set
193CONFIG_ZONE_DMA_FLAG=1 203CONFIG_ZONE_DMA_FLAG=1
@@ -213,11 +223,8 @@ CONFIG_PCI_SYSCALL=y
213# CONFIG_PCIEPORTBUS is not set 223# CONFIG_PCIEPORTBUS is not set
214CONFIG_ARCH_SUPPORTS_MSI=y 224CONFIG_ARCH_SUPPORTS_MSI=y
215# CONFIG_PCI_MSI is not set 225# CONFIG_PCI_MSI is not set
226CONFIG_PCI_LEGACY=y
216# CONFIG_PCI_DEBUG is not set 227# CONFIG_PCI_DEBUG is not set
217
218#
219# PCCARD (PCMCIA/CardBus) support
220#
221# CONFIG_PCCARD is not set 228# CONFIG_PCCARD is not set
222# CONFIG_HOTPLUG_PCI is not set 229# CONFIG_HOTPLUG_PCI is not set
223 230
@@ -232,7 +239,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
232CONFIG_HIGHMEM_START=0xfe000000 239CONFIG_HIGHMEM_START=0xfe000000
233CONFIG_LOWMEM_SIZE=0x30000000 240CONFIG_LOWMEM_SIZE=0x30000000
234CONFIG_KERNEL_START=0xc0000000 241CONFIG_KERNEL_START=0xc0000000
235CONFIG_TASK_SIZE=0x80000000 242CONFIG_TASK_SIZE=0xc0000000
236CONFIG_BOOT_LOAD=0x00800000 243CONFIG_BOOT_LOAD=0x00800000
237 244
238# 245#
@@ -265,6 +272,7 @@ CONFIG_SYN_COOKIES=y
265# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 272# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
266# CONFIG_INET_XFRM_MODE_TUNNEL is not set 273# CONFIG_INET_XFRM_MODE_TUNNEL is not set
267# CONFIG_INET_XFRM_MODE_BEET is not set 274# CONFIG_INET_XFRM_MODE_BEET is not set
275# CONFIG_INET_LRO is not set
268CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
269CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
270# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
@@ -327,6 +335,7 @@ CONFIG_NETFILTER_XTABLES=m
327# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 335# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
328# CONFIG_NETFILTER_XT_MATCH_STRING is not set 336# CONFIG_NETFILTER_XT_MATCH_STRING is not set
329# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 337# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
338# CONFIG_NETFILTER_XT_MATCH_TIME is not set
330# CONFIG_NETFILTER_XT_MATCH_U32 is not set 339# CONFIG_NETFILTER_XT_MATCH_U32 is not set
331# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 340# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
332 341
@@ -380,10 +389,6 @@ CONFIG_NF_NAT_SIP=m
380# CONFIG_LAPB is not set 389# CONFIG_LAPB is not set
381# CONFIG_ECONET is not set 390# CONFIG_ECONET is not set
382# CONFIG_WAN_ROUTER is not set 391# CONFIG_WAN_ROUTER is not set
383
384#
385# QoS and/or fair queueing
386#
387# CONFIG_NET_SCHED is not set 392# CONFIG_NET_SCHED is not set
388 393
389# 394#
@@ -412,6 +417,7 @@ CONFIG_NF_NAT_SIP=m
412# 417#
413# Generic Driver Options 418# Generic Driver Options
414# 419#
420CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
415# CONFIG_STANDALONE is not set 421# CONFIG_STANDALONE is not set
416CONFIG_PREVENT_FIRMWARE_BUILD=y 422CONFIG_PREVENT_FIRMWARE_BUILD=y
417# CONFIG_FW_LOADER is not set 423# CONFIG_FW_LOADER is not set
@@ -467,6 +473,11 @@ CONFIG_IDE_PROC_FS=y
467# IDE chipset support/bugfixes 473# IDE chipset support/bugfixes
468# 474#
469CONFIG_IDE_GENERIC=y 475CONFIG_IDE_GENERIC=y
476# CONFIG_BLK_DEV_PLATFORM is not set
477
478#
479# PCI IDE chipsets support
480#
470CONFIG_BLK_DEV_IDEPCI=y 481CONFIG_BLK_DEV_IDEPCI=y
471CONFIG_IDEPCI_SHARE_IRQ=y 482CONFIG_IDEPCI_SHARE_IRQ=y
472CONFIG_IDEPCI_PCIBUS_ORDER=y 483CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -474,8 +485,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
474CONFIG_BLK_DEV_GENERIC=y 485CONFIG_BLK_DEV_GENERIC=y
475# CONFIG_BLK_DEV_OPTI621 is not set 486# CONFIG_BLK_DEV_OPTI621 is not set
476CONFIG_BLK_DEV_IDEDMA_PCI=y 487CONFIG_BLK_DEV_IDEDMA_PCI=y
477# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
478# CONFIG_IDEDMA_ONLYDISK is not set
479# CONFIG_BLK_DEV_AEC62XX is not set 488# CONFIG_BLK_DEV_AEC62XX is not set
480# CONFIG_BLK_DEV_ALI15X3 is not set 489# CONFIG_BLK_DEV_ALI15X3 is not set
481# CONFIG_BLK_DEV_AMD74XX is not set 490# CONFIG_BLK_DEV_AMD74XX is not set
@@ -502,9 +511,22 @@ CONFIG_BLK_DEV_SL82C105=y
502CONFIG_BLK_DEV_VIA82CXXX=y 511CONFIG_BLK_DEV_VIA82CXXX=y
503# CONFIG_BLK_DEV_TC86C001 is not set 512# CONFIG_BLK_DEV_TC86C001 is not set
504# CONFIG_IDE_ARM is not set 513# CONFIG_IDE_ARM is not set
505# CONFIG_IDE_CHIPSETS is not set 514
515#
516# Other IDE chipsets support
517#
518
519#
520# Note: most of these also require special kernel boot parameters
521#
522# CONFIG_BLK_DEV_4DRIVES is not set
523# CONFIG_BLK_DEV_ALI14XX is not set
524# CONFIG_BLK_DEV_DTC2278 is not set
525# CONFIG_BLK_DEV_HT6560B is not set
526# CONFIG_BLK_DEV_QD65XX is not set
527# CONFIG_BLK_DEV_UMC8672 is not set
506CONFIG_BLK_DEV_IDEDMA=y 528CONFIG_BLK_DEV_IDEDMA=y
507# CONFIG_IDEDMA_IVB is not set 529CONFIG_IDE_ARCH_OBSOLETE_INIT=y
508# CONFIG_BLK_DEV_HD is not set 530# CONFIG_BLK_DEV_HD is not set
509 531
510# 532#
@@ -544,6 +566,7 @@ CONFIG_SCSI_SPI_ATTRS=y
544# CONFIG_SCSI_FC_ATTRS is not set 566# CONFIG_SCSI_FC_ATTRS is not set
545# CONFIG_SCSI_ISCSI_ATTRS is not set 567# CONFIG_SCSI_ISCSI_ATTRS is not set
546# CONFIG_SCSI_SAS_LIBSAS is not set 568# CONFIG_SCSI_SAS_LIBSAS is not set
569# CONFIG_SCSI_SRP_ATTRS is not set
547CONFIG_SCSI_LOWLEVEL=y 570CONFIG_SCSI_LOWLEVEL=y
548# CONFIG_ISCSI_TCP is not set 571# CONFIG_ISCSI_TCP is not set
549# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 572# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -558,6 +581,7 @@ CONFIG_SCSI_LOWLEVEL=y
558# CONFIG_SCSI_AIC79XX is not set 581# CONFIG_SCSI_AIC79XX is not set
559# CONFIG_SCSI_AIC94XX is not set 582# CONFIG_SCSI_AIC94XX is not set
560# CONFIG_SCSI_DPT_I2O is not set 583# CONFIG_SCSI_DPT_I2O is not set
584# CONFIG_SCSI_ADVANSYS is not set
561# CONFIG_SCSI_IN2000 is not set 585# CONFIG_SCSI_IN2000 is not set
562# CONFIG_SCSI_ARCMSR is not set 586# CONFIG_SCSI_ARCMSR is not set
563# CONFIG_MEGARAID_NEWGEN is not set 587# CONFIG_MEGARAID_NEWGEN is not set
@@ -599,14 +623,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
599# CONFIG_SCSI_SRP is not set 623# CONFIG_SCSI_SRP is not set
600# CONFIG_ATA is not set 624# CONFIG_ATA is not set
601# CONFIG_MD is not set 625# CONFIG_MD is not set
602
603#
604# Fusion MPT device support
605#
606# CONFIG_FUSION is not set 626# CONFIG_FUSION is not set
607# CONFIG_FUSION_SPI is not set
608# CONFIG_FUSION_FC is not set
609# CONFIG_FUSION_SAS is not set
610 627
611# 628#
612# IEEE 1394 (FireWire) support 629# IEEE 1394 (FireWire) support
@@ -622,6 +639,8 @@ CONFIG_NETDEVICES=y
622# CONFIG_MACVLAN is not set 639# CONFIG_MACVLAN is not set
623# CONFIG_EQUALIZER is not set 640# CONFIG_EQUALIZER is not set
624# CONFIG_TUN is not set 641# CONFIG_TUN is not set
642# CONFIG_VETH is not set
643# CONFIG_IP1000 is not set
625# CONFIG_ARCNET is not set 644# CONFIG_ARCNET is not set
626# CONFIG_PHYLIB is not set 645# CONFIG_PHYLIB is not set
627CONFIG_NET_ETHERNET=y 646CONFIG_NET_ETHERNET=y
@@ -644,6 +663,10 @@ CONFIG_DE4X5=y
644# CONFIG_DEPCA is not set 663# CONFIG_DEPCA is not set
645# CONFIG_HP100 is not set 664# CONFIG_HP100 is not set
646# CONFIG_NET_ISA is not set 665# CONFIG_NET_ISA is not set
666# CONFIG_IBM_NEW_EMAC_ZMII is not set
667# CONFIG_IBM_NEW_EMAC_RGMII is not set
668# CONFIG_IBM_NEW_EMAC_TAH is not set
669# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
647CONFIG_NET_PCI=y 670CONFIG_NET_PCI=y
648CONFIG_PCNET32=y 671CONFIG_PCNET32=y
649# CONFIG_PCNET32_NAPI is not set 672# CONFIG_PCNET32_NAPI is not set
@@ -654,7 +677,6 @@ CONFIG_PCNET32=y
654# CONFIG_B44 is not set 677# CONFIG_B44 is not set
655# CONFIG_FORCEDETH is not set 678# CONFIG_FORCEDETH is not set
656# CONFIG_CS89x0 is not set 679# CONFIG_CS89x0 is not set
657# CONFIG_DGRS is not set
658# CONFIG_EEPRO100 is not set 680# CONFIG_EEPRO100 is not set
659# CONFIG_E100 is not set 681# CONFIG_E100 is not set
660# CONFIG_FEALNX is not set 682# CONFIG_FEALNX is not set
@@ -678,6 +700,7 @@ CONFIG_NETDEV_1000=y
678# CONFIG_ACENIC is not set 700# CONFIG_ACENIC is not set
679# CONFIG_DL2K is not set 701# CONFIG_DL2K is not set
680# CONFIG_E1000 is not set 702# CONFIG_E1000 is not set
703# CONFIG_E1000E is not set
681# CONFIG_NS83820 is not set 704# CONFIG_NS83820 is not set
682# CONFIG_HAMACHI is not set 705# CONFIG_HAMACHI is not set
683# CONFIG_YELLOWFIN is not set 706# CONFIG_YELLOWFIN is not set
@@ -685,6 +708,7 @@ CONFIG_NETDEV_1000=y
685# CONFIG_SIS190 is not set 708# CONFIG_SIS190 is not set
686# CONFIG_SKGE is not set 709# CONFIG_SKGE is not set
687# CONFIG_SKY2 is not set 710# CONFIG_SKY2 is not set
711# CONFIG_SK98LIN is not set
688# CONFIG_VIA_VELOCITY is not set 712# CONFIG_VIA_VELOCITY is not set
689# CONFIG_TIGON3 is not set 713# CONFIG_TIGON3 is not set
690# CONFIG_BNX2 is not set 714# CONFIG_BNX2 is not set
@@ -694,11 +718,14 @@ CONFIG_MV643XX_ETH=y
694CONFIG_NETDEV_10000=y 718CONFIG_NETDEV_10000=y
695# CONFIG_CHELSIO_T1 is not set 719# CONFIG_CHELSIO_T1 is not set
696# CONFIG_CHELSIO_T3 is not set 720# CONFIG_CHELSIO_T3 is not set
721# CONFIG_IXGBE is not set
697# CONFIG_IXGB is not set 722# CONFIG_IXGB is not set
698# CONFIG_S2IO is not set 723# CONFIG_S2IO is not set
699# CONFIG_MYRI10GE is not set 724# CONFIG_MYRI10GE is not set
700# CONFIG_NETXEN_NIC is not set 725# CONFIG_NETXEN_NIC is not set
726# CONFIG_NIU is not set
701# CONFIG_MLX4_CORE is not set 727# CONFIG_MLX4_CORE is not set
728# CONFIG_TEHUTI is not set
702# CONFIG_TR is not set 729# CONFIG_TR is not set
703 730
704# 731#
@@ -714,7 +741,6 @@ CONFIG_NETDEV_10000=y
714# CONFIG_USB_KAWETH is not set 741# CONFIG_USB_KAWETH is not set
715# CONFIG_USB_PEGASUS is not set 742# CONFIG_USB_PEGASUS is not set
716# CONFIG_USB_RTL8150 is not set 743# CONFIG_USB_RTL8150 is not set
717# CONFIG_USB_USBNET_MII is not set
718# CONFIG_USB_USBNET is not set 744# CONFIG_USB_USBNET is not set
719# CONFIG_WAN is not set 745# CONFIG_WAN is not set
720# CONFIG_FDDI is not set 746# CONFIG_FDDI is not set
@@ -754,7 +780,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
754CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 780CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
755CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 781CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
756# CONFIG_INPUT_JOYDEV is not set 782# CONFIG_INPUT_JOYDEV is not set
757# CONFIG_INPUT_TSDEV is not set
758CONFIG_INPUT_EVDEV=y 783CONFIG_INPUT_EVDEV=y
759# CONFIG_INPUT_EVBUG is not set 784# CONFIG_INPUT_EVBUG is not set
760 785
@@ -838,7 +863,6 @@ CONFIG_LEGACY_PTY_COUNT=256
838CONFIG_BRIQ_PANEL=m 863CONFIG_BRIQ_PANEL=m
839# CONFIG_HVC_RTAS is not set 864# CONFIG_HVC_RTAS is not set
840# CONFIG_IPMI_HANDLER is not set 865# CONFIG_IPMI_HANDLER is not set
841# CONFIG_WATCHDOG is not set
842# CONFIG_HW_RANDOM is not set 866# CONFIG_HW_RANDOM is not set
843CONFIG_NVRAM=y 867CONFIG_NVRAM=y
844CONFIG_GEN_RTC=y 868CONFIG_GEN_RTC=y
@@ -846,8 +870,6 @@ CONFIG_GEN_RTC=y
846# CONFIG_DTLK is not set 870# CONFIG_DTLK is not set
847# CONFIG_R3964 is not set 871# CONFIG_R3964 is not set
848# CONFIG_APPLICOM is not set 872# CONFIG_APPLICOM is not set
849# CONFIG_AGP is not set
850# CONFIG_DRM is not set
851# CONFIG_RAW_DRIVER is not set 873# CONFIG_RAW_DRIVER is not set
852# CONFIG_TCG_TPM is not set 874# CONFIG_TCG_TPM is not set
853CONFIG_DEVPORT=y 875CONFIG_DEVPORT=y
@@ -918,6 +940,13 @@ CONFIG_I2C_ALGOBIT=y
918# CONFIG_W1 is not set 940# CONFIG_W1 is not set
919# CONFIG_POWER_SUPPLY is not set 941# CONFIG_POWER_SUPPLY is not set
920# CONFIG_HWMON is not set 942# CONFIG_HWMON is not set
943# CONFIG_WATCHDOG is not set
944
945#
946# Sonics Silicon Backplane
947#
948CONFIG_SSB_POSSIBLE=y
949# CONFIG_SSB is not set
921 950
922# 951#
923# Multifunction device drivers 952# Multifunction device drivers
@@ -934,18 +963,8 @@ CONFIG_I2C_ALGOBIT=y
934# 963#
935# Graphics support 964# Graphics support
936# 965#
937CONFIG_BACKLIGHT_LCD_SUPPORT=y 966# CONFIG_AGP is not set
938CONFIG_LCD_CLASS_DEVICE=m 967# CONFIG_DRM is not set
939CONFIG_BACKLIGHT_CLASS_DEVICE=y
940
941#
942# Display device support
943#
944CONFIG_DISPLAY_SUPPORT=m
945
946#
947# Display hardware drivers
948#
949# CONFIG_VGASTATE is not set 968# CONFIG_VGASTATE is not set
950# CONFIG_VIDEO_OUTPUT_CONTROL is not set 969# CONFIG_VIDEO_OUTPUT_CONTROL is not set
951CONFIG_FB=y 970CONFIG_FB=y
@@ -954,6 +973,7 @@ CONFIG_FB_DDC=y
954CONFIG_FB_CFB_FILLRECT=y 973CONFIG_FB_CFB_FILLRECT=y
955CONFIG_FB_CFB_COPYAREA=y 974CONFIG_FB_CFB_COPYAREA=y
956CONFIG_FB_CFB_IMAGEBLIT=y 975CONFIG_FB_CFB_IMAGEBLIT=y
976# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
957# CONFIG_FB_SYS_FILLRECT is not set 977# CONFIG_FB_SYS_FILLRECT is not set
958# CONFIG_FB_SYS_COPYAREA is not set 978# CONFIG_FB_SYS_COPYAREA is not set
959# CONFIG_FB_SYS_IMAGEBLIT is not set 979# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -1009,6 +1029,19 @@ CONFIG_FB_3DFX=y
1009# CONFIG_FB_PM3 is not set 1029# CONFIG_FB_PM3 is not set
1010# CONFIG_FB_IBM_GXT4500 is not set 1030# CONFIG_FB_IBM_GXT4500 is not set
1011# CONFIG_FB_VIRTUAL is not set 1031# CONFIG_FB_VIRTUAL is not set
1032CONFIG_BACKLIGHT_LCD_SUPPORT=y
1033CONFIG_LCD_CLASS_DEVICE=m
1034CONFIG_BACKLIGHT_CLASS_DEVICE=y
1035# CONFIG_BACKLIGHT_CORGI is not set
1036
1037#
1038# Display device support
1039#
1040CONFIG_DISPLAY_SUPPORT=m
1041
1042#
1043# Display hardware drivers
1044#
1012 1045
1013# 1046#
1014# Console display driver support 1047# Console display driver support
@@ -1035,6 +1068,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
1035CONFIG_HID_SUPPORT=y 1068CONFIG_HID_SUPPORT=y
1036CONFIG_HID=y 1069CONFIG_HID=y
1037# CONFIG_HID_DEBUG is not set 1070# CONFIG_HID_DEBUG is not set
1071# CONFIG_HIDRAW is not set
1038 1072
1039# 1073#
1040# USB Input Devices 1074# USB Input Devices
@@ -1158,19 +1192,6 @@ CONFIG_USB_MON=y
1158# CONFIG_RTC_CLASS is not set 1192# CONFIG_RTC_CLASS is not set
1159 1193
1160# 1194#
1161# DMA Engine support
1162#
1163# CONFIG_DMA_ENGINE is not set
1164
1165#
1166# DMA Clients
1167#
1168
1169#
1170# DMA Devices
1171#
1172
1173#
1174# Userspace I/O 1195# Userspace I/O
1175# 1196#
1176# CONFIG_UIO is not set 1197# CONFIG_UIO is not set
@@ -1187,7 +1208,6 @@ CONFIG_EXT3_FS_XATTR=y
1187# CONFIG_EXT3_FS_SECURITY is not set 1208# CONFIG_EXT3_FS_SECURITY is not set
1188# CONFIG_EXT4DEV_FS is not set 1209# CONFIG_EXT4DEV_FS is not set
1189CONFIG_JBD=y 1210CONFIG_JBD=y
1190# CONFIG_JBD_DEBUG is not set
1191CONFIG_FS_MBCACHE=y 1211CONFIG_FS_MBCACHE=y
1192# CONFIG_REISERFS_FS is not set 1212# CONFIG_REISERFS_FS is not set
1193# CONFIG_JFS_FS is not set 1213# CONFIG_JFS_FS is not set
@@ -1233,7 +1253,6 @@ CONFIG_SYSFS=y
1233CONFIG_TMPFS=y 1253CONFIG_TMPFS=y
1234# CONFIG_TMPFS_POSIX_ACL is not set 1254# CONFIG_TMPFS_POSIX_ACL is not set
1235# CONFIG_HUGETLB_PAGE is not set 1255# CONFIG_HUGETLB_PAGE is not set
1236CONFIG_RAMFS=y
1237# CONFIG_CONFIGFS_FS is not set 1256# CONFIG_CONFIGFS_FS is not set
1238 1257
1239# 1258#
@@ -1252,10 +1271,7 @@ CONFIG_RAMFS=y
1252# CONFIG_QNX4FS_FS is not set 1271# CONFIG_QNX4FS_FS is not set
1253# CONFIG_SYSV_FS is not set 1272# CONFIG_SYSV_FS is not set
1254# CONFIG_UFS_FS is not set 1273# CONFIG_UFS_FS is not set
1255 1274CONFIG_NETWORK_FILESYSTEMS=y
1256#
1257# Network File Systems
1258#
1259# CONFIG_NFS_FS is not set 1275# CONFIG_NFS_FS is not set
1260# CONFIG_NFSD is not set 1276# CONFIG_NFSD is not set
1261# CONFIG_SMB_FS is not set 1277# CONFIG_SMB_FS is not set
@@ -1285,10 +1301,6 @@ CONFIG_MSDOS_PARTITION=y
1285# CONFIG_KARMA_PARTITION is not set 1301# CONFIG_KARMA_PARTITION is not set
1286# CONFIG_EFI_PARTITION is not set 1302# CONFIG_EFI_PARTITION is not set
1287# CONFIG_SYSV68_PARTITION is not set 1303# CONFIG_SYSV68_PARTITION is not set
1288
1289#
1290# Native Language Support
1291#
1292CONFIG_NLS=y 1304CONFIG_NLS=y
1293CONFIG_NLS_DEFAULT="iso8859-1" 1305CONFIG_NLS_DEFAULT="iso8859-1"
1294# CONFIG_NLS_CODEPAGE_437 is not set 1306# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1329,10 +1341,6 @@ CONFIG_NLS_ISO8859_1=m
1329# CONFIG_NLS_KOI8_R is not set 1341# CONFIG_NLS_KOI8_R is not set
1330# CONFIG_NLS_KOI8_U is not set 1342# CONFIG_NLS_KOI8_U is not set
1331# CONFIG_NLS_UTF8 is not set 1343# CONFIG_NLS_UTF8 is not set
1332
1333#
1334# Distributed Lock Manager
1335#
1336# CONFIG_DLM is not set 1344# CONFIG_DLM is not set
1337# CONFIG_UCC_SLOW is not set 1345# CONFIG_UCC_SLOW is not set
1338 1346
@@ -1352,17 +1360,16 @@ CONFIG_PLIST=y
1352CONFIG_HAS_IOMEM=y 1360CONFIG_HAS_IOMEM=y
1353CONFIG_HAS_IOPORT=y 1361CONFIG_HAS_IOPORT=y
1354CONFIG_HAS_DMA=y 1362CONFIG_HAS_DMA=y
1355 1363CONFIG_INSTRUMENTATION=y
1356#
1357# Instrumentation Support
1358#
1359# CONFIG_PROFILING is not set 1364# CONFIG_PROFILING is not set
1360# CONFIG_KPROBES is not set 1365# CONFIG_KPROBES is not set
1366# CONFIG_MARKERS is not set
1361 1367
1362# 1368#
1363# Kernel hacking 1369# Kernel hacking
1364# 1370#
1365# CONFIG_PRINTK_TIME is not set 1371# CONFIG_PRINTK_TIME is not set
1372CONFIG_ENABLE_WARN_DEPRECATED=y
1366CONFIG_ENABLE_MUST_CHECK=y 1373CONFIG_ENABLE_MUST_CHECK=y
1367CONFIG_MAGIC_SYSRQ=y 1374CONFIG_MAGIC_SYSRQ=y
1368# CONFIG_UNUSED_SYMBOLS is not set 1375# CONFIG_UNUSED_SYMBOLS is not set
@@ -1387,9 +1394,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1387# CONFIG_DEBUG_INFO is not set 1394# CONFIG_DEBUG_INFO is not set
1388# CONFIG_DEBUG_VM is not set 1395# CONFIG_DEBUG_VM is not set
1389# CONFIG_DEBUG_LIST is not set 1396# CONFIG_DEBUG_LIST is not set
1397# CONFIG_DEBUG_SG is not set
1390CONFIG_FORCED_INLINING=y 1398CONFIG_FORCED_INLINING=y
1399# CONFIG_BOOT_PRINTK_DELAY is not set
1391# CONFIG_RCU_TORTURE_TEST is not set 1400# CONFIG_RCU_TORTURE_TEST is not set
1392# CONFIG_FAULT_INJECTION is not set 1401# CONFIG_FAULT_INJECTION is not set
1402# CONFIG_SAMPLES is not set
1393# CONFIG_DEBUG_STACKOVERFLOW is not set 1403# CONFIG_DEBUG_STACKOVERFLOW is not set
1394# CONFIG_DEBUG_STACK_USAGE is not set 1404# CONFIG_DEBUG_STACK_USAGE is not set
1395# CONFIG_DEBUG_PAGEALLOC is not set 1405# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1406,6 +1416,7 @@ CONFIG_XMON_DISASSEMBLY=y
1406# 1416#
1407# CONFIG_KEYS is not set 1417# CONFIG_KEYS is not set
1408# CONFIG_SECURITY is not set 1418# CONFIG_SECURITY is not set
1419# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1409CONFIG_CRYPTO=y 1420CONFIG_CRYPTO=y
1410CONFIG_CRYPTO_ALGAPI=m 1421CONFIG_CRYPTO_ALGAPI=m
1411CONFIG_CRYPTO_BLKCIPHER=m 1422CONFIG_CRYPTO_BLKCIPHER=m
@@ -1425,6 +1436,7 @@ CONFIG_CRYPTO_ECB=m
1425CONFIG_CRYPTO_CBC=m 1436CONFIG_CRYPTO_CBC=m
1426CONFIG_CRYPTO_PCBC=m 1437CONFIG_CRYPTO_PCBC=m
1427# CONFIG_CRYPTO_LRW is not set 1438# CONFIG_CRYPTO_LRW is not set
1439# CONFIG_CRYPTO_XTS is not set
1428# CONFIG_CRYPTO_CRYPTD is not set 1440# CONFIG_CRYPTO_CRYPTD is not set
1429# CONFIG_CRYPTO_DES is not set 1441# CONFIG_CRYPTO_DES is not set
1430# CONFIG_CRYPTO_FCRYPT is not set 1442# CONFIG_CRYPTO_FCRYPT is not set
@@ -1438,9 +1450,12 @@ CONFIG_CRYPTO_PCBC=m
1438CONFIG_CRYPTO_ARC4=m 1450CONFIG_CRYPTO_ARC4=m
1439# CONFIG_CRYPTO_KHAZAD is not set 1451# CONFIG_CRYPTO_KHAZAD is not set
1440# CONFIG_CRYPTO_ANUBIS is not set 1452# CONFIG_CRYPTO_ANUBIS is not set
1453# CONFIG_CRYPTO_SEED is not set
1441# CONFIG_CRYPTO_DEFLATE is not set 1454# CONFIG_CRYPTO_DEFLATE is not set
1442# CONFIG_CRYPTO_MICHAEL_MIC is not set 1455# CONFIG_CRYPTO_MICHAEL_MIC is not set
1443# CONFIG_CRYPTO_CRC32C is not set 1456# CONFIG_CRYPTO_CRC32C is not set
1444# CONFIG_CRYPTO_CAMELLIA is not set 1457# CONFIG_CRYPTO_CAMELLIA is not set
1445# CONFIG_CRYPTO_TEST is not set 1458# CONFIG_CRYPTO_TEST is not set
1459# CONFIG_CRYPTO_AUTHENC is not set
1446# CONFIG_CRYPTO_HW is not set 1460# CONFIG_CRYPTO_HW is not set
1461# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index d3ef642811ef..b84298ce42be 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_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.23 3# Linux kernel version: 2.6.24-rc4
4# Thu Oct 18 08:01:57 2007 4# Thu Dec 6 16:48:11 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -43,7 +43,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
43CONFIG_ARCH_MAY_HAVE_PC_FDC=y 43CONFIG_ARCH_MAY_HAVE_PC_FDC=y
44CONFIG_PPC_OF=y 44CONFIG_PPC_OF=y
45CONFIG_OF=y 45CONFIG_OF=y
46# CONFIG_PPC_UDBG_16550 is not set 46CONFIG_PPC_UDBG_16550=y
47# CONFIG_GENERIC_TBSYNC is not set 47# CONFIG_GENERIC_TBSYNC is not set
48CONFIG_AUDIT_ARCH=y 48CONFIG_AUDIT_ARCH=y
49CONFIG_GENERIC_BUG=y 49CONFIG_GENERIC_BUG=y
@@ -68,11 +68,14 @@ CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
74CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
75CONFIG_FAIR_USER_SCHED=y 77CONFIG_FAIR_USER_SCHED=y
78# CONFIG_FAIR_CGROUP_SCHED is not set
76CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
77# CONFIG_RELAY is not set 80# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y 81CONFIG_BLK_DEV_INITRD=y
@@ -206,6 +209,7 @@ CONFIG_PCI_SYSCALL=y
206# CONFIG_PCIEPORTBUS is not set 209# CONFIG_PCIEPORTBUS is not set
207CONFIG_ARCH_SUPPORTS_MSI=y 210CONFIG_ARCH_SUPPORTS_MSI=y
208# CONFIG_PCI_MSI is not set 211# CONFIG_PCI_MSI is not set
212CONFIG_PCI_LEGACY=y
209# CONFIG_PCI_DEBUG is not set 213# CONFIG_PCI_DEBUG is not set
210# CONFIG_PCCARD is not set 214# CONFIG_PCCARD is not set
211# CONFIG_HOTPLUG_PCI is not set 215# CONFIG_HOTPLUG_PCI is not set
@@ -284,10 +288,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
284# CONFIG_LAPB is not set 288# CONFIG_LAPB is not set
285# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
291# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
292 292
293# 293#
@@ -568,7 +568,6 @@ CONFIG_UNIX98_PTYS=y
568CONFIG_LEGACY_PTYS=y 568CONFIG_LEGACY_PTYS=y
569CONFIG_LEGACY_PTY_COUNT=256 569CONFIG_LEGACY_PTY_COUNT=256
570# CONFIG_IPMI_HANDLER is not set 570# CONFIG_IPMI_HANDLER is not set
571# CONFIG_WATCHDOG is not set
572# CONFIG_HW_RANDOM is not set 571# CONFIG_HW_RANDOM is not set
573# CONFIG_NVRAM is not set 572# CONFIG_NVRAM is not set
574# CONFIG_GEN_RTC is not set 573# CONFIG_GEN_RTC is not set
@@ -587,6 +586,7 @@ CONFIG_DEVPORT=y
587# CONFIG_W1 is not set 586# CONFIG_W1 is not set
588# CONFIG_POWER_SUPPLY is not set 587# CONFIG_POWER_SUPPLY is not set
589# CONFIG_HWMON is not set 588# CONFIG_HWMON is not set
589# CONFIG_WATCHDOG is not set
590 590
591# 591#
592# Sonics Silicon Backplane 592# Sonics Silicon Backplane
@@ -772,16 +772,13 @@ CONFIG_PLIST=y
772CONFIG_HAS_IOMEM=y 772CONFIG_HAS_IOMEM=y
773CONFIG_HAS_IOPORT=y 773CONFIG_HAS_IOPORT=y
774CONFIG_HAS_DMA=y 774CONFIG_HAS_DMA=y
775 775# CONFIG_INSTRUMENTATION is not set
776#
777# Instrumentation Support
778#
779# CONFIG_PROFILING is not set
780 776
781# 777#
782# Kernel hacking 778# Kernel hacking
783# 779#
784# CONFIG_PRINTK_TIME is not set 780# CONFIG_PRINTK_TIME is not set
781CONFIG_ENABLE_WARN_DEPRECATED=y
785CONFIG_ENABLE_MUST_CHECK=y 782CONFIG_ENABLE_MUST_CHECK=y
786CONFIG_MAGIC_SYSRQ=y 783CONFIG_MAGIC_SYSRQ=y
787# CONFIG_UNUSED_SYMBOLS is not set 784# CONFIG_UNUSED_SYMBOLS is not set
@@ -805,10 +802,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
805# CONFIG_DEBUG_INFO is not set 802# CONFIG_DEBUG_INFO is not set
806# CONFIG_DEBUG_VM is not set 803# CONFIG_DEBUG_VM is not set
807# CONFIG_DEBUG_LIST is not set 804# CONFIG_DEBUG_LIST is not set
805# CONFIG_DEBUG_SG is not set
808CONFIG_FORCED_INLINING=y 806CONFIG_FORCED_INLINING=y
809# CONFIG_BOOT_PRINTK_DELAY is not set 807# CONFIG_BOOT_PRINTK_DELAY is not set
810# CONFIG_RCU_TORTURE_TEST is not set 808# CONFIG_RCU_TORTURE_TEST is not set
811# CONFIG_FAULT_INJECTION is not set 809# CONFIG_FAULT_INJECTION is not set
810# CONFIG_SAMPLES is not set
812# CONFIG_DEBUG_STACKOVERFLOW is not set 811# CONFIG_DEBUG_STACKOVERFLOW is not set
813# CONFIG_DEBUG_STACK_USAGE is not set 812# CONFIG_DEBUG_STACK_USAGE is not set
814# CONFIG_DEBUG_PAGEALLOC is not set 813# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index d8ee3c0dcadf..a1f98200d9e3 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_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.23-rc6 3# Linux kernel version: 2.6.24-rc4
4# Fri Sep 14 14:59:56 2007 4# Thu Dec 6 16:48:13 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,8 +18,13 @@ CONFIG_8xx=y
18# CONFIG_PPC_MM_SLICES is not set 18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32
21CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
22CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y
23CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
24CONFIG_IRQ_PER_CPU=y 29CONFIG_IRQ_PER_CPU=y
25CONFIG_RWSEM_XCHGADD_ALGORITHM=y 30CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -59,9 +64,12 @@ CONFIG_SYSVIPC_SYSCTL=y
59# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
60# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
61# CONFIG_USER_NS is not set 66# CONFIG_USER_NS is not set
67# CONFIG_PID_NS is not set
62# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
63# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
64CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set
72# CONFIG_FAIR_GROUP_SCHED is not set
65CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
66# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
67# CONFIG_BLK_DEV_INITRD is not set 75# CONFIG_BLK_DEV_INITRD is not set
@@ -81,7 +89,6 @@ CONFIG_BUG=y
81CONFIG_ANON_INODES=y 89CONFIG_ANON_INODES=y
82CONFIG_EPOLL=y 90CONFIG_EPOLL=y
83CONFIG_SIGNALFD=y 91CONFIG_SIGNALFD=y
84CONFIG_TIMERFD=y
85CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
86CONFIG_SHMEM=y 93CONFIG_SHMEM=y
87# CONFIG_VM_EVENT_COUNTERS is not set 94# CONFIG_VM_EVENT_COUNTERS is not set
@@ -158,6 +165,10 @@ CONFIG_CPM=y
158# Kernel options 165# Kernel options
159# 166#
160# CONFIG_HIGHMEM is not set 167# CONFIG_HIGHMEM is not set
168CONFIG_TICK_ONESHOT=y
169CONFIG_NO_HZ=y
170CONFIG_HIGH_RES_TIMERS=y
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
161CONFIG_HZ_100=y 172CONFIG_HZ_100=y
162# CONFIG_HZ_250 is not set 173# CONFIG_HZ_250 is not set
163# CONFIG_HZ_300 is not set 174# CONFIG_HZ_300 is not set
@@ -169,6 +180,7 @@ CONFIG_PREEMPT_NONE=y
169CONFIG_BINFMT_ELF=y 180CONFIG_BINFMT_ELF=y
170# CONFIG_BINFMT_MISC is not set 181# CONFIG_BINFMT_MISC is not set
171# CONFIG_MATH_EMULATION is not set 182# CONFIG_MATH_EMULATION is not set
183CONFIG_8XX_MINIMAL_FPEMU=y
172CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 184CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
173CONFIG_ARCH_FLATMEM_ENABLE=y 185CONFIG_ARCH_FLATMEM_ENABLE=y
174CONFIG_ARCH_POPULATES_NODE_MAP=y 186CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -179,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
182CONFIG_SPLIT_PTLOCK_CPUS=4 195CONFIG_SPLIT_PTLOCK_CPUS=4
183# CONFIG_RESOURCES_64BIT is not set 196# CONFIG_RESOURCES_64BIT is not set
184CONFIG_ZONE_DMA_FLAG=1 197CONFIG_ZONE_DMA_FLAG=1
@@ -204,10 +217,6 @@ CONFIG_FSL_SOC=y
204# CONFIG_PCI_SYSCALL is not set 217# CONFIG_PCI_SYSCALL is not set
205# CONFIG_PCI_QSPAN is not set 218# CONFIG_PCI_QSPAN is not set
206# CONFIG_ARCH_SUPPORTS_MSI is not set 219# CONFIG_ARCH_SUPPORTS_MSI is not set
207
208#
209# PCCARD (PCMCIA/CardBus) support
210#
211# CONFIG_PCCARD is not set 220# CONFIG_PCCARD is not set
212 221
213# 222#
@@ -259,6 +268,7 @@ CONFIG_SYN_COOKIES=y
259# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 268# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
260# CONFIG_INET_XFRM_MODE_TUNNEL is not set 269# CONFIG_INET_XFRM_MODE_TUNNEL is not set
261# CONFIG_INET_XFRM_MODE_BEET is not set 270# CONFIG_INET_XFRM_MODE_BEET is not set
271# CONFIG_INET_LRO is not set
262CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
263CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
264# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
@@ -284,10 +294,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
284# CONFIG_LAPB is not set 294# CONFIG_LAPB is not set
285# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
291# CONFIG_NET_SCHED is not set 297# CONFIG_NET_SCHED is not set
292 298
293# 299#
@@ -316,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# 322#
317# Generic Driver Options 323# Generic Driver Options
318# 324#
325CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
319CONFIG_STANDALONE=y 326CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y 327CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set 328# CONFIG_FW_LOADER is not set
@@ -339,6 +346,7 @@ CONFIG_MTD_BLOCK=y
339# CONFIG_INFTL is not set 346# CONFIG_INFTL is not set
340# CONFIG_RFD_FTL is not set 347# CONFIG_RFD_FTL is not set
341# CONFIG_SSFDC is not set 348# CONFIG_SSFDC is not set
349# CONFIG_MTD_OOPS is not set
342 350
343# 351#
344# RAM/ROM/Flash chip drivers 352# RAM/ROM/Flash chip drivers
@@ -418,6 +426,7 @@ CONFIG_NETDEVICES=y
418# CONFIG_MACVLAN is not set 426# CONFIG_MACVLAN is not set
419# CONFIG_EQUALIZER is not set 427# CONFIG_EQUALIZER is not set
420# CONFIG_TUN is not set 428# CONFIG_TUN is not set
429# CONFIG_VETH is not set
421CONFIG_PHYLIB=y 430CONFIG_PHYLIB=y
422 431
423# 432#
@@ -436,9 +445,15 @@ CONFIG_LXT_PHY=y
436# CONFIG_MDIO_BITBANG is not set 445# CONFIG_MDIO_BITBANG is not set
437CONFIG_NET_ETHERNET=y 446CONFIG_NET_ETHERNET=y
438CONFIG_MII=y 447CONFIG_MII=y
448# CONFIG_IBM_NEW_EMAC_ZMII is not set
449# CONFIG_IBM_NEW_EMAC_RGMII is not set
450# CONFIG_IBM_NEW_EMAC_TAH is not set
451# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
452# CONFIG_B44 is not set
439CONFIG_FS_ENET=y 453CONFIG_FS_ENET=y
440# CONFIG_FS_ENET_HAS_SCC is not set 454# CONFIG_FS_ENET_HAS_SCC is not set
441CONFIG_FS_ENET_HAS_FEC=y 455CONFIG_FS_ENET_HAS_FEC=y
456CONFIG_FS_ENET_MDIO_FEC=y
442# CONFIG_NETDEV_1000 is not set 457# CONFIG_NETDEV_1000 is not set
443# CONFIG_NETDEV_10000 is not set 458# CONFIG_NETDEV_10000 is not set
444 459
@@ -496,7 +511,6 @@ CONFIG_SERIAL_CPM_SMC2=y
496CONFIG_UNIX98_PTYS=y 511CONFIG_UNIX98_PTYS=y
497# CONFIG_LEGACY_PTYS is not set 512# CONFIG_LEGACY_PTYS is not set
498# CONFIG_IPMI_HANDLER is not set 513# CONFIG_IPMI_HANDLER is not set
499# CONFIG_WATCHDOG is not set
500CONFIG_HW_RANDOM=y 514CONFIG_HW_RANDOM=y
501# CONFIG_NVRAM is not set 515# CONFIG_NVRAM is not set
502CONFIG_GEN_RTC=y 516CONFIG_GEN_RTC=y
@@ -514,6 +528,13 @@ CONFIG_GEN_RTC=y
514# CONFIG_W1 is not set 528# CONFIG_W1 is not set
515# CONFIG_POWER_SUPPLY is not set 529# CONFIG_POWER_SUPPLY is not set
516# CONFIG_HWMON is not set 530# CONFIG_HWMON is not set
531# CONFIG_WATCHDOG is not set
532
533#
534# Sonics Silicon Backplane
535#
536CONFIG_SSB_POSSIBLE=y
537# CONFIG_SSB is not set
517 538
518# 539#
519# Multifunction device drivers 540# Multifunction device drivers
@@ -530,16 +551,15 @@ CONFIG_DAB=y
530# 551#
531# Graphics support 552# Graphics support
532# 553#
554# CONFIG_VGASTATE is not set
555# CONFIG_VIDEO_OUTPUT_CONTROL is not set
556# CONFIG_FB is not set
533# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 557# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
534 558
535# 559#
536# Display device support 560# Display device support
537# 561#
538# CONFIG_DISPLAY_SUPPORT is not set 562# CONFIG_DISPLAY_SUPPORT is not set
539# CONFIG_VGASTATE is not set
540# CONFIG_VIDEO_OUTPUT_CONTROL is not set
541# CONFIG_FB is not set
542# CONFIG_FB_IBM_GXT4500 is not set
543 563
544# 564#
545# Sound 565# Sound
@@ -552,19 +572,6 @@ CONFIG_DAB=y
552# CONFIG_RTC_CLASS is not set 572# CONFIG_RTC_CLASS is not set
553 573
554# 574#
555# DMA Engine support
556#
557# CONFIG_DMA_ENGINE is not set
558
559#
560# DMA Clients
561#
562
563#
564# DMA Devices
565#
566
567#
568# Userspace I/O 575# Userspace I/O
569# 576#
570# CONFIG_UIO is not set 577# CONFIG_UIO is not set
@@ -613,7 +620,6 @@ CONFIG_SYSFS=y
613CONFIG_TMPFS=y 620CONFIG_TMPFS=y
614# CONFIG_TMPFS_POSIX_ACL is not set 621# CONFIG_TMPFS_POSIX_ACL is not set
615# CONFIG_HUGETLB_PAGE is not set 622# CONFIG_HUGETLB_PAGE is not set
616CONFIG_RAMFS=y
617# CONFIG_CONFIGFS_FS is not set 623# CONFIG_CONFIGFS_FS is not set
618 624
619# 625#
@@ -633,10 +639,7 @@ CONFIG_CRAMFS=y
633# CONFIG_QNX4FS_FS is not set 639# CONFIG_QNX4FS_FS is not set
634# CONFIG_SYSV_FS is not set 640# CONFIG_SYSV_FS is not set
635# CONFIG_UFS_FS is not set 641# CONFIG_UFS_FS is not set
636 642CONFIG_NETWORK_FILESYSTEMS=y
637#
638# Network File Systems
639#
640CONFIG_NFS_FS=y 643CONFIG_NFS_FS=y
641CONFIG_NFS_V3=y 644CONFIG_NFS_V3=y
642# CONFIG_NFS_V3_ACL is not set 645# CONFIG_NFS_V3_ACL is not set
@@ -678,15 +681,7 @@ CONFIG_MSDOS_PARTITION=y
678# CONFIG_KARMA_PARTITION is not set 681# CONFIG_KARMA_PARTITION is not set
679# CONFIG_EFI_PARTITION is not set 682# CONFIG_EFI_PARTITION is not set
680# CONFIG_SYSV68_PARTITION is not set 683# CONFIG_SYSV68_PARTITION is not set
681
682#
683# Native Language Support
684#
685# CONFIG_NLS is not set 684# CONFIG_NLS is not set
686
687#
688# Distributed Lock Manager
689#
690# CONFIG_DLM is not set 685# CONFIG_DLM is not set
691# CONFIG_UCC_SLOW is not set 686# CONFIG_UCC_SLOW is not set
692 687
@@ -703,16 +698,13 @@ CONFIG_ZLIB_INFLATE=y
703CONFIG_HAS_IOMEM=y 698CONFIG_HAS_IOMEM=y
704CONFIG_HAS_IOPORT=y 699CONFIG_HAS_IOPORT=y
705CONFIG_HAS_DMA=y 700CONFIG_HAS_DMA=y
706 701# CONFIG_INSTRUMENTATION is not set
707#
708# Instrumentation Support
709#
710# CONFIG_PROFILING is not set
711 702
712# 703#
713# Kernel hacking 704# Kernel hacking
714# 705#
715# CONFIG_PRINTK_TIME is not set 706# CONFIG_PRINTK_TIME is not set
707CONFIG_ENABLE_WARN_DEPRECATED=y
716CONFIG_ENABLE_MUST_CHECK=y 708CONFIG_ENABLE_MUST_CHECK=y
717CONFIG_MAGIC_SYSRQ=y 709CONFIG_MAGIC_SYSRQ=y
718# CONFIG_UNUSED_SYMBOLS is not set 710# CONFIG_UNUSED_SYMBOLS is not set
@@ -734,8 +726,11 @@ CONFIG_DEBUG_BUGVERBOSE=y
734CONFIG_DEBUG_INFO=y 726CONFIG_DEBUG_INFO=y
735# CONFIG_DEBUG_VM is not set 727# CONFIG_DEBUG_VM is not set
736# CONFIG_DEBUG_LIST is not set 728# CONFIG_DEBUG_LIST is not set
729# CONFIG_DEBUG_SG is not set
737CONFIG_FORCED_INLINING=y 730CONFIG_FORCED_INLINING=y
731# CONFIG_BOOT_PRINTK_DELAY is not set
738# CONFIG_FAULT_INJECTION is not set 732# CONFIG_FAULT_INJECTION is not set
733# CONFIG_SAMPLES is not set
739# CONFIG_DEBUG_STACKOVERFLOW is not set 734# CONFIG_DEBUG_STACKOVERFLOW is not set
740# CONFIG_DEBUG_STACK_USAGE is not set 735# CONFIG_DEBUG_STACK_USAGE is not set
741# CONFIG_DEBUG_PAGEALLOC is not set 736# CONFIG_DEBUG_PAGEALLOC is not set
@@ -748,4 +743,7 @@ CONFIG_FORCED_INLINING=y
748# 743#
749# CONFIG_KEYS is not set 744# CONFIG_KEYS is not set
750# CONFIG_SECURITY is not set 745# CONFIG_SECURITY is not set
746# CONFIG_SECURITY_FILE_CAPABILITIES is not set
751# CONFIG_CRYPTO is not set 747# CONFIG_CRYPTO is not set
748# CONFIG_PPC_CLOCK is not set
749CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 0a6fa1fc9766..3673dd23120c 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:34:59 2007 4# Thu Dec 6 16:48:15 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -10,6 +10,7 @@ CONFIG_PPC64=y
10# 10#
11CONFIG_POWER4_ONLY=y 11CONFIG_POWER4_ONLY=y
12CONFIG_POWER4=y 12CONFIG_POWER4=y
13# CONFIG_TUNE_CELL is not set
13CONFIG_PPC_FPU=y 14CONFIG_PPC_FPU=y
14CONFIG_ALTIVEC=y 15CONFIG_ALTIVEC=y
15CONFIG_PPC_STD_MMU=y 16CONFIG_PPC_STD_MMU=y
@@ -18,8 +19,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
18CONFIG_SMP=y 19CONFIG_SMP=y
19CONFIG_NR_CPUS=4 20CONFIG_NR_CPUS=4
20CONFIG_64BIT=y 21CONFIG_64BIT=y
22CONFIG_WORD_SIZE=64
21CONFIG_PPC_MERGE=y 23CONFIG_PPC_MERGE=y
22CONFIG_MMU=y 24CONFIG_MMU=y
25CONFIG_GENERIC_CMOS_UPDATE=y
26CONFIG_GENERIC_TIME=y
27CONFIG_GENERIC_TIME_VSYSCALL=y
28CONFIG_GENERIC_CLOCKEVENTS=y
23CONFIG_GENERIC_HARDIRQS=y 29CONFIG_GENERIC_HARDIRQS=y
24CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
25CONFIG_RWSEM_XCHGADD_ALGORITHM=y 31CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,11 +69,15 @@ CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
69CONFIG_LOG_BUF_SHIFT=17 76CONFIG_LOG_BUF_SHIFT=17
70# CONFIG_CPUSETS is not set 77# CONFIG_CGROUPS is not set
78CONFIG_FAIR_GROUP_SCHED=y
79CONFIG_FAIR_USER_SCHED=y
80# CONFIG_FAIR_CGROUP_SCHED is not set
71CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
72# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
73CONFIG_BLK_DEV_INITRD=y 83CONFIG_BLK_DEV_INITRD=y
@@ -88,7 +98,6 @@ CONFIG_FUTEX=y
88CONFIG_ANON_INODES=y 98CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 99CONFIG_EPOLL=y
90CONFIG_SIGNALFD=y 100CONFIG_SIGNALFD=y
91CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 101CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 102CONFIG_SHMEM=y
94CONFIG_VM_EVENT_COUNTERS=y 103CONFIG_VM_EVENT_COUNTERS=y
@@ -109,6 +118,7 @@ CONFIG_STOP_MACHINE=y
109CONFIG_BLOCK=y 118CONFIG_BLOCK=y
110# CONFIG_BLK_DEV_IO_TRACE is not set 119# CONFIG_BLK_DEV_IO_TRACE is not set
111CONFIG_BLK_DEV_BSG=y 120CONFIG_BLK_DEV_BSG=y
121CONFIG_BLOCK_COMPAT=y
112 122
113# 123#
114# IO Schedulers 124# IO Schedulers
@@ -127,7 +137,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
127# Platform support 137# Platform support
128# 138#
129CONFIG_PPC_MULTIPLATFORM=y 139CONFIG_PPC_MULTIPLATFORM=y
130# CONFIG_EMBEDDED6xx is not set
131# CONFIG_PPC_82xx is not set 140# CONFIG_PPC_82xx is not set
132# CONFIG_PPC_83xx is not set 141# CONFIG_PPC_83xx is not set
133# CONFIG_PPC_86xx is not set 142# CONFIG_PPC_86xx is not set
@@ -164,6 +173,8 @@ CONFIG_CPU_FREQ_STAT=y
164# CONFIG_CPU_FREQ_STAT_DETAILS is not set 173# CONFIG_CPU_FREQ_STAT_DETAILS is not set
165CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y 174CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
166# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set 175# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
176# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
177# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
167CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 178CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
168CONFIG_CPU_FREQ_GOV_POWERSAVE=y 179CONFIG_CPU_FREQ_GOV_POWERSAVE=y
169CONFIG_CPU_FREQ_GOV_USERSPACE=y 180CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -180,6 +191,10 @@ CONFIG_CPU_FREQ_PMAC64=y
180# 191#
181# Kernel options 192# Kernel options
182# 193#
194CONFIG_TICK_ONESHOT=y
195CONFIG_NO_HZ=y
196CONFIG_HIGH_RES_TIMERS=y
197CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
183# CONFIG_HZ_100 is not set 198# CONFIG_HZ_100 is not set
184CONFIG_HZ_250=y 199CONFIG_HZ_250=y
185# CONFIG_HZ_300 is not set 200# CONFIG_HZ_300 is not set
@@ -192,6 +207,7 @@ CONFIG_PREEMPT_NONE=y
192CONFIG_BINFMT_ELF=y 207CONFIG_BINFMT_ELF=y
193# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
194CONFIG_FORCE_MAX_ZONEORDER=13 209CONFIG_FORCE_MAX_ZONEORDER=13
210CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
195CONFIG_IOMMU_VMERGE=y 211CONFIG_IOMMU_VMERGE=y
196# CONFIG_HOTPLUG_CPU is not set 212# CONFIG_HOTPLUG_CPU is not set
197CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 213CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -210,6 +226,7 @@ CONFIG_FLATMEM_MANUAL=y
210CONFIG_FLATMEM=y 226CONFIG_FLATMEM=y
211CONFIG_FLAT_NODE_MEM_MAP=y 227CONFIG_FLAT_NODE_MEM_MAP=y
212# CONFIG_SPARSEMEM_STATIC is not set 228# CONFIG_SPARSEMEM_STATIC is not set
229CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
213CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
214CONFIG_RESOURCES_64BIT=y 231CONFIG_RESOURCES_64BIT=y
215CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
@@ -221,6 +238,7 @@ CONFIG_PROC_DEVICETREE=y
221# CONFIG_CMDLINE_BOOL is not set 238# CONFIG_CMDLINE_BOOL is not set
222# CONFIG_PM is not set 239# CONFIG_PM is not set
223CONFIG_SUSPEND_SMP_POSSIBLE=y 240CONFIG_SUSPEND_SMP_POSSIBLE=y
241CONFIG_HIBERNATION_SMP_POSSIBLE=y
224CONFIG_SECCOMP=y 242CONFIG_SECCOMP=y
225# CONFIG_WANT_DEVICE_TREE is not set 243# CONFIG_WANT_DEVICE_TREE is not set
226CONFIG_ISA_DMA_API=y 244CONFIG_ISA_DMA_API=y
@@ -237,11 +255,8 @@ CONFIG_PCI_SYSCALL=y
237# CONFIG_PCIEPORTBUS is not set 255# CONFIG_PCIEPORTBUS is not set
238CONFIG_ARCH_SUPPORTS_MSI=y 256CONFIG_ARCH_SUPPORTS_MSI=y
239CONFIG_PCI_MSI=y 257CONFIG_PCI_MSI=y
258CONFIG_PCI_LEGACY=y
240# CONFIG_PCI_DEBUG is not set 259# CONFIG_PCI_DEBUG is not set
241
242#
243# PCCARD (PCMCIA/CardBus) support
244#
245# CONFIG_PCCARD is not set 260# CONFIG_PCCARD is not set
246# CONFIG_HOTPLUG_PCI is not set 261# CONFIG_HOTPLUG_PCI is not set
247CONFIG_KERNEL_START=0xc000000000000000 262CONFIG_KERNEL_START=0xc000000000000000
@@ -281,6 +296,7 @@ CONFIG_INET_TUNNEL=y
281CONFIG_INET_XFRM_MODE_TRANSPORT=y 296CONFIG_INET_XFRM_MODE_TRANSPORT=y
282CONFIG_INET_XFRM_MODE_TUNNEL=y 297CONFIG_INET_XFRM_MODE_TUNNEL=y
283CONFIG_INET_XFRM_MODE_BEET=y 298CONFIG_INET_XFRM_MODE_BEET=y
299CONFIG_INET_LRO=y
284CONFIG_INET_DIAG=y 300CONFIG_INET_DIAG=y
285CONFIG_INET_TCP_DIAG=y 301CONFIG_INET_TCP_DIAG=y
286# CONFIG_TCP_CONG_ADVANCED is not set 302# CONFIG_TCP_CONG_ADVANCED is not set
@@ -340,10 +356,6 @@ CONFIG_LLC=y
340# CONFIG_LAPB is not set 356# CONFIG_LAPB is not set
341# CONFIG_ECONET is not set 357# CONFIG_ECONET is not set
342# CONFIG_WAN_ROUTER is not set 358# CONFIG_WAN_ROUTER is not set
343
344#
345# QoS and/or fair queueing
346#
347# CONFIG_NET_SCHED is not set 359# CONFIG_NET_SCHED is not set
348 360
349# 361#
@@ -372,6 +384,7 @@ CONFIG_LLC=y
372# 384#
373# Generic Driver Options 385# Generic Driver Options
374# 386#
387CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
375CONFIG_STANDALONE=y 388CONFIG_STANDALONE=y
376CONFIG_PREVENT_FIRMWARE_BUILD=y 389CONFIG_PREVENT_FIRMWARE_BUILD=y
377CONFIG_FW_LOADER=y 390CONFIG_FW_LOADER=y
@@ -426,15 +439,17 @@ CONFIG_IDE_PROC_FS=y
426# IDE chipset support/bugfixes 439# IDE chipset support/bugfixes
427# 440#
428CONFIG_IDE_GENERIC=y 441CONFIG_IDE_GENERIC=y
442# CONFIG_BLK_DEV_PLATFORM is not set
443
444#
445# PCI IDE chipsets support
446#
429CONFIG_BLK_DEV_IDEPCI=y 447CONFIG_BLK_DEV_IDEPCI=y
430# CONFIG_IDEPCI_SHARE_IRQ is not set 448# CONFIG_IDEPCI_SHARE_IRQ is not set
431CONFIG_IDEPCI_PCIBUS_ORDER=y 449CONFIG_IDEPCI_PCIBUS_ORDER=y
432# CONFIG_BLK_DEV_OFFBOARD is not set
433# CONFIG_BLK_DEV_GENERIC is not set 450# CONFIG_BLK_DEV_GENERIC is not set
434# CONFIG_BLK_DEV_OPTI621 is not set 451# CONFIG_BLK_DEV_OPTI621 is not set
435CONFIG_BLK_DEV_IDEDMA_PCI=y 452CONFIG_BLK_DEV_IDEDMA_PCI=y
436# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
437# CONFIG_IDEDMA_ONLYDISK is not set
438# CONFIG_BLK_DEV_AEC62XX is not set 453# CONFIG_BLK_DEV_AEC62XX is not set
439# CONFIG_BLK_DEV_ALI15X3 is not set 454# CONFIG_BLK_DEV_ALI15X3 is not set
440# CONFIG_BLK_DEV_AMD74XX is not set 455# CONFIG_BLK_DEV_AMD74XX is not set
@@ -465,7 +480,7 @@ CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
465CONFIG_BLK_DEV_IDEDMA_PMAC=y 480CONFIG_BLK_DEV_IDEDMA_PMAC=y
466# CONFIG_IDE_ARM is not set 481# CONFIG_IDE_ARM is not set
467CONFIG_BLK_DEV_IDEDMA=y 482CONFIG_BLK_DEV_IDEDMA=y
468# CONFIG_IDEDMA_IVB is not set 483CONFIG_IDE_ARCH_OBSOLETE_INIT=y
469# CONFIG_BLK_DEV_HD is not set 484# CONFIG_BLK_DEV_HD is not set
470 485
471# 486#
@@ -506,6 +521,7 @@ CONFIG_SCSI_SPI_ATTRS=y
506# CONFIG_SCSI_ISCSI_ATTRS is not set 521# CONFIG_SCSI_ISCSI_ATTRS is not set
507# CONFIG_SCSI_SAS_ATTRS is not set 522# CONFIG_SCSI_SAS_ATTRS is not set
508# CONFIG_SCSI_SAS_LIBSAS is not set 523# CONFIG_SCSI_SAS_LIBSAS is not set
524# CONFIG_SCSI_SRP_ATTRS is not set
509CONFIG_SCSI_LOWLEVEL=y 525CONFIG_SCSI_LOWLEVEL=y
510# CONFIG_ISCSI_TCP is not set 526# CONFIG_ISCSI_TCP is not set
511# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 527# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -581,6 +597,7 @@ CONFIG_SATA_SVW=y
581# CONFIG_PATA_OLDPIIX is not set 597# CONFIG_PATA_OLDPIIX is not set
582# CONFIG_PATA_NETCELL is not set 598# CONFIG_PATA_NETCELL is not set
583# CONFIG_PATA_NS87410 is not set 599# CONFIG_PATA_NS87410 is not set
600# CONFIG_PATA_NS87415 is not set
584# CONFIG_PATA_OPTI is not set 601# CONFIG_PATA_OPTI is not set
585# CONFIG_PATA_OPTIDMA is not set 602# CONFIG_PATA_OPTIDMA is not set
586# CONFIG_PATA_PDC_OLD is not set 603# CONFIG_PATA_PDC_OLD is not set
@@ -610,14 +627,8 @@ CONFIG_DM_MIRROR=m
610CONFIG_DM_ZERO=m 627CONFIG_DM_ZERO=m
611# CONFIG_DM_MULTIPATH is not set 628# CONFIG_DM_MULTIPATH is not set
612# CONFIG_DM_DELAY is not set 629# CONFIG_DM_DELAY is not set
613 630# CONFIG_DM_UEVENT is not set
614#
615# Fusion MPT device support
616#
617# CONFIG_FUSION is not set 631# CONFIG_FUSION is not set
618# CONFIG_FUSION_SPI is not set
619# CONFIG_FUSION_FC is not set
620# CONFIG_FUSION_SAS is not set
621 632
622# 633#
623# IEEE 1394 (FireWire) support 634# IEEE 1394 (FireWire) support
@@ -664,6 +675,8 @@ CONFIG_BONDING=m
664# CONFIG_MACVLAN is not set 675# CONFIG_MACVLAN is not set
665# CONFIG_EQUALIZER is not set 676# CONFIG_EQUALIZER is not set
666CONFIG_TUN=m 677CONFIG_TUN=m
678# CONFIG_VETH is not set
679# CONFIG_IP1000 is not set
667# CONFIG_ARCNET is not set 680# CONFIG_ARCNET is not set
668# CONFIG_PHYLIB is not set 681# CONFIG_PHYLIB is not set
669CONFIG_NET_ETHERNET=y 682CONFIG_NET_ETHERNET=y
@@ -674,7 +687,12 @@ CONFIG_SUNGEM=y
674# CONFIG_NET_VENDOR_3COM is not set 687# CONFIG_NET_VENDOR_3COM is not set
675# CONFIG_NET_TULIP is not set 688# CONFIG_NET_TULIP is not set
676# CONFIG_HP100 is not set 689# CONFIG_HP100 is not set
690# CONFIG_IBM_NEW_EMAC_ZMII is not set
691# CONFIG_IBM_NEW_EMAC_RGMII is not set
692# CONFIG_IBM_NEW_EMAC_TAH is not set
693# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
677# CONFIG_NET_PCI is not set 694# CONFIG_NET_PCI is not set
695# CONFIG_B44 is not set
678CONFIG_NETDEV_1000=y 696CONFIG_NETDEV_1000=y
679CONFIG_ACENIC=y 697CONFIG_ACENIC=y
680CONFIG_ACENIC_OMIT_TIGON_I=y 698CONFIG_ACENIC_OMIT_TIGON_I=y
@@ -682,6 +700,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
682CONFIG_E1000=y 700CONFIG_E1000=y
683# CONFIG_E1000_NAPI is not set 701# CONFIG_E1000_NAPI is not set
684# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 702# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
703# CONFIG_E1000E is not set
685# CONFIG_NS83820 is not set 704# CONFIG_NS83820 is not set
686# CONFIG_HAMACHI is not set 705# CONFIG_HAMACHI is not set
687# CONFIG_YELLOWFIN is not set 706# CONFIG_YELLOWFIN is not set
@@ -689,6 +708,7 @@ CONFIG_E1000=y
689# CONFIG_SIS190 is not set 708# CONFIG_SIS190 is not set
690# CONFIG_SKGE is not set 709# CONFIG_SKGE is not set
691# CONFIG_SKY2 is not set 710# CONFIG_SKY2 is not set
711# CONFIG_SK98LIN is not set
692# CONFIG_VIA_VELOCITY is not set 712# CONFIG_VIA_VELOCITY is not set
693CONFIG_TIGON3=y 713CONFIG_TIGON3=y
694# CONFIG_BNX2 is not set 714# CONFIG_BNX2 is not set
@@ -697,12 +717,15 @@ CONFIG_TIGON3=y
697CONFIG_NETDEV_10000=y 717CONFIG_NETDEV_10000=y
698# CONFIG_CHELSIO_T1 is not set 718# CONFIG_CHELSIO_T1 is not set
699# CONFIG_CHELSIO_T3 is not set 719# CONFIG_CHELSIO_T3 is not set
720# CONFIG_IXGBE is not set
700# CONFIG_IXGB is not set 721# CONFIG_IXGB is not set
701# CONFIG_S2IO is not set 722# CONFIG_S2IO is not set
702# CONFIG_MYRI10GE is not set 723# CONFIG_MYRI10GE is not set
703# CONFIG_NETXEN_NIC is not set 724# CONFIG_NETXEN_NIC is not set
725# CONFIG_NIU is not set
704# CONFIG_PASEMI_MAC is not set 726# CONFIG_PASEMI_MAC is not set
705# CONFIG_MLX4_CORE is not set 727# CONFIG_MLX4_CORE is not set
728# CONFIG_TEHUTI is not set
706CONFIG_TR=y 729CONFIG_TR=y
707CONFIG_IBMOL=y 730CONFIG_IBMOL=y
708# CONFIG_3C359 is not set 731# CONFIG_3C359 is not set
@@ -721,7 +744,6 @@ CONFIG_USB_CATC=m
721CONFIG_USB_KAWETH=m 744CONFIG_USB_KAWETH=m
722CONFIG_USB_PEGASUS=m 745CONFIG_USB_PEGASUS=m
723CONFIG_USB_RTL8150=m 746CONFIG_USB_RTL8150=m
724# CONFIG_USB_USBNET_MII is not set
725CONFIG_USB_USBNET=m 747CONFIG_USB_USBNET=m
726# CONFIG_USB_NET_AX8817X is not set 748# CONFIG_USB_NET_AX8817X is not set
727CONFIG_USB_NET_CDCETHER=m 749CONFIG_USB_NET_CDCETHER=m
@@ -771,7 +793,6 @@ CONFIG_INPUT_MOUSEDEV=y
771CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 793CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
772CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 794CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
773CONFIG_INPUT_JOYDEV=m 795CONFIG_INPUT_JOYDEV=m
774# CONFIG_INPUT_TSDEV is not set
775CONFIG_INPUT_EVDEV=y 796CONFIG_INPUT_EVDEV=y
776# CONFIG_INPUT_EVBUG is not set 797# CONFIG_INPUT_EVBUG is not set
777 798
@@ -828,15 +849,11 @@ CONFIG_UNIX98_PTYS=y
828CONFIG_LEGACY_PTYS=y 849CONFIG_LEGACY_PTYS=y
829CONFIG_LEGACY_PTY_COUNT=256 850CONFIG_LEGACY_PTY_COUNT=256
830# CONFIG_IPMI_HANDLER is not set 851# CONFIG_IPMI_HANDLER is not set
831# CONFIG_WATCHDOG is not set
832# CONFIG_HW_RANDOM is not set 852# CONFIG_HW_RANDOM is not set
833CONFIG_GEN_RTC=y 853CONFIG_GEN_RTC=y
834# CONFIG_GEN_RTC_X is not set 854# CONFIG_GEN_RTC_X is not set
835# CONFIG_R3964 is not set 855# CONFIG_R3964 is not set
836# CONFIG_APPLICOM is not set 856# CONFIG_APPLICOM is not set
837CONFIG_AGP=m
838CONFIG_AGP_UNINORTH=m
839# CONFIG_DRM is not set
840CONFIG_RAW_DRIVER=y 857CONFIG_RAW_DRIVER=y
841CONFIG_MAX_RAW_DEVS=256 858CONFIG_MAX_RAW_DEVS=256
842# CONFIG_HANGCHECK_TIMER is not set 859# CONFIG_HANGCHECK_TIMER is not set
@@ -906,6 +923,13 @@ CONFIG_I2C_POWERMAC=y
906# CONFIG_W1 is not set 923# CONFIG_W1 is not set
907# CONFIG_POWER_SUPPLY is not set 924# CONFIG_POWER_SUPPLY is not set
908# CONFIG_HWMON is not set 925# CONFIG_HWMON is not set
926# CONFIG_WATCHDOG is not set
927
928#
929# Sonics Silicon Backplane
930#
931CONFIG_SSB_POSSIBLE=y
932# CONFIG_SSB is not set
909 933
910# 934#
911# Multifunction device drivers 935# Multifunction device drivers
@@ -923,14 +947,9 @@ CONFIG_DAB=y
923# 947#
924# Graphics support 948# Graphics support
925# 949#
926CONFIG_BACKLIGHT_LCD_SUPPORT=y 950CONFIG_AGP=m
927CONFIG_LCD_CLASS_DEVICE=m 951CONFIG_AGP_UNINORTH=m
928CONFIG_BACKLIGHT_CLASS_DEVICE=y 952# CONFIG_DRM is not set
929
930#
931# Display device support
932#
933# CONFIG_DISPLAY_SUPPORT is not set
934CONFIG_VGASTATE=y 953CONFIG_VGASTATE=y
935CONFIG_VIDEO_OUTPUT_CONTROL=m 954CONFIG_VIDEO_OUTPUT_CONTROL=m
936CONFIG_FB=y 955CONFIG_FB=y
@@ -939,6 +958,7 @@ CONFIG_FB_DDC=y
939CONFIG_FB_CFB_FILLRECT=y 958CONFIG_FB_CFB_FILLRECT=y
940CONFIG_FB_CFB_COPYAREA=y 959CONFIG_FB_CFB_COPYAREA=y
941CONFIG_FB_CFB_IMAGEBLIT=y 960CONFIG_FB_CFB_IMAGEBLIT=y
961# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
942# CONFIG_FB_SYS_FILLRECT is not set 962# CONFIG_FB_SYS_FILLRECT is not set
943# CONFIG_FB_SYS_COPYAREA is not set 963# CONFIG_FB_SYS_COPYAREA is not set
944# CONFIG_FB_SYS_IMAGEBLIT is not set 964# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -986,6 +1006,15 @@ CONFIG_FB_RADEON_BACKLIGHT=y
986# CONFIG_FB_PM3 is not set 1006# CONFIG_FB_PM3 is not set
987# CONFIG_FB_IBM_GXT4500 is not set 1007# CONFIG_FB_IBM_GXT4500 is not set
988# CONFIG_FB_VIRTUAL is not set 1008# CONFIG_FB_VIRTUAL is not set
1009CONFIG_BACKLIGHT_LCD_SUPPORT=y
1010CONFIG_LCD_CLASS_DEVICE=m
1011CONFIG_BACKLIGHT_CLASS_DEVICE=y
1012# CONFIG_BACKLIGHT_CORGI is not set
1013
1014#
1015# Display device support
1016#
1017# CONFIG_DISPLAY_SUPPORT is not set
989 1018
990# 1019#
991# Console display driver support 1020# Console display driver support
@@ -1143,6 +1172,7 @@ CONFIG_SND_USB_AUDIO=m
1143CONFIG_HID_SUPPORT=y 1172CONFIG_HID_SUPPORT=y
1144CONFIG_HID=y 1173CONFIG_HID=y
1145# CONFIG_HID_DEBUG is not set 1174# CONFIG_HID_DEBUG is not set
1175# CONFIG_HIDRAW is not set
1146 1176
1147# 1177#
1148# USB Input Devices 1178# USB Input Devices
@@ -1239,6 +1269,7 @@ CONFIG_USB_SERIAL_GENERIC=y
1239# CONFIG_USB_SERIAL_AIRPRIME is not set 1269# CONFIG_USB_SERIAL_AIRPRIME is not set
1240# CONFIG_USB_SERIAL_ARK3116 is not set 1270# CONFIG_USB_SERIAL_ARK3116 is not set
1241CONFIG_USB_SERIAL_BELKIN=m 1271CONFIG_USB_SERIAL_BELKIN=m
1272# CONFIG_USB_SERIAL_CH341 is not set
1242# CONFIG_USB_SERIAL_WHITEHEAT is not set 1273# CONFIG_USB_SERIAL_WHITEHEAT is not set
1243CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 1274CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1244# CONFIG_USB_SERIAL_CP2101 is not set 1275# CONFIG_USB_SERIAL_CP2101 is not set
@@ -1326,19 +1357,6 @@ CONFIG_USB_APPLEDISPLAY=m
1326# CONFIG_RTC_CLASS is not set 1357# CONFIG_RTC_CLASS is not set
1327 1358
1328# 1359#
1329# DMA Engine support
1330#
1331# CONFIG_DMA_ENGINE is not set
1332
1333#
1334# DMA Clients
1335#
1336
1337#
1338# DMA Devices
1339#
1340
1341#
1342# Userspace I/O 1360# Userspace I/O
1343# 1361#
1344# CONFIG_UIO is not set 1362# CONFIG_UIO is not set
@@ -1415,7 +1433,6 @@ CONFIG_TMPFS=y
1415# CONFIG_TMPFS_POSIX_ACL is not set 1433# CONFIG_TMPFS_POSIX_ACL is not set
1416CONFIG_HUGETLBFS=y 1434CONFIG_HUGETLBFS=y
1417CONFIG_HUGETLB_PAGE=y 1435CONFIG_HUGETLB_PAGE=y
1418CONFIG_RAMFS=y
1419# CONFIG_CONFIGFS_FS is not set 1436# CONFIG_CONFIGFS_FS is not set
1420 1437
1421# 1438#
@@ -1434,10 +1451,7 @@ CONFIG_CRAMFS=y
1434# CONFIG_QNX4FS_FS is not set 1451# CONFIG_QNX4FS_FS is not set
1435# CONFIG_SYSV_FS is not set 1452# CONFIG_SYSV_FS is not set
1436# CONFIG_UFS_FS is not set 1453# CONFIG_UFS_FS is not set
1437 1454CONFIG_NETWORK_FILESYSTEMS=y
1438#
1439# Network File Systems
1440#
1441CONFIG_NFS_FS=y 1455CONFIG_NFS_FS=y
1442CONFIG_NFS_V3=y 1456CONFIG_NFS_V3=y
1443CONFIG_NFS_V3_ACL=y 1457CONFIG_NFS_V3_ACL=y
@@ -1491,10 +1505,6 @@ CONFIG_MSDOS_PARTITION=y
1491# CONFIG_KARMA_PARTITION is not set 1505# CONFIG_KARMA_PARTITION is not set
1492# CONFIG_EFI_PARTITION is not set 1506# CONFIG_EFI_PARTITION is not set
1493# CONFIG_SYSV68_PARTITION is not set 1507# CONFIG_SYSV68_PARTITION is not set
1494
1495#
1496# Native Language Support
1497#
1498CONFIG_NLS=y 1508CONFIG_NLS=y
1499CONFIG_NLS_DEFAULT="iso8859-1" 1509CONFIG_NLS_DEFAULT="iso8859-1"
1500CONFIG_NLS_CODEPAGE_437=y 1510CONFIG_NLS_CODEPAGE_437=y
@@ -1535,10 +1545,6 @@ CONFIG_NLS_ISO8859_15=y
1535# CONFIG_NLS_KOI8_R is not set 1545# CONFIG_NLS_KOI8_R is not set
1536# CONFIG_NLS_KOI8_U is not set 1546# CONFIG_NLS_KOI8_U is not set
1537CONFIG_NLS_UTF8=y 1547CONFIG_NLS_UTF8=y
1538
1539#
1540# Distributed Lock Manager
1541#
1542# CONFIG_DLM is not set 1548# CONFIG_DLM is not set
1543# CONFIG_UCC_SLOW is not set 1549# CONFIG_UCC_SLOW is not set
1544 1550
@@ -1558,18 +1564,17 @@ CONFIG_PLIST=y
1558CONFIG_HAS_IOMEM=y 1564CONFIG_HAS_IOMEM=y
1559CONFIG_HAS_IOPORT=y 1565CONFIG_HAS_IOPORT=y
1560CONFIG_HAS_DMA=y 1566CONFIG_HAS_DMA=y
1561 1567CONFIG_INSTRUMENTATION=y
1562#
1563# Instrumentation Support
1564#
1565CONFIG_PROFILING=y 1568CONFIG_PROFILING=y
1566CONFIG_OPROFILE=y 1569CONFIG_OPROFILE=y
1567# CONFIG_KPROBES is not set 1570# CONFIG_KPROBES is not set
1571# CONFIG_MARKERS is not set
1568 1572
1569# 1573#
1570# Kernel hacking 1574# Kernel hacking
1571# 1575#
1572# CONFIG_PRINTK_TIME is not set 1576# CONFIG_PRINTK_TIME is not set
1577CONFIG_ENABLE_WARN_DEPRECATED=y
1573CONFIG_ENABLE_MUST_CHECK=y 1578CONFIG_ENABLE_MUST_CHECK=y
1574CONFIG_MAGIC_SYSRQ=y 1579CONFIG_MAGIC_SYSRQ=y
1575# CONFIG_UNUSED_SYMBOLS is not set 1580# CONFIG_UNUSED_SYMBOLS is not set
@@ -1593,14 +1598,18 @@ CONFIG_DEBUG_BUGVERBOSE=y
1593# CONFIG_DEBUG_INFO is not set 1598# CONFIG_DEBUG_INFO is not set
1594# CONFIG_DEBUG_VM is not set 1599# CONFIG_DEBUG_VM is not set
1595# CONFIG_DEBUG_LIST is not set 1600# CONFIG_DEBUG_LIST is not set
1601# CONFIG_DEBUG_SG is not set
1596CONFIG_FORCED_INLINING=y 1602CONFIG_FORCED_INLINING=y
1603# CONFIG_BOOT_PRINTK_DELAY is not set
1597# CONFIG_RCU_TORTURE_TEST is not set 1604# CONFIG_RCU_TORTURE_TEST is not set
1598# CONFIG_FAULT_INJECTION is not set 1605# CONFIG_FAULT_INJECTION is not set
1606# CONFIG_SAMPLES is not set
1599# CONFIG_DEBUG_STACKOVERFLOW is not set 1607# CONFIG_DEBUG_STACKOVERFLOW is not set
1600# CONFIG_DEBUG_STACK_USAGE is not set 1608# CONFIG_DEBUG_STACK_USAGE is not set
1601# CONFIG_DEBUG_PAGEALLOC is not set 1609# CONFIG_DEBUG_PAGEALLOC is not set
1602# CONFIG_DEBUGGER is not set 1610# CONFIG_DEBUGGER is not set
1603CONFIG_IRQSTACKS=y 1611CONFIG_IRQSTACKS=y
1612# CONFIG_VIRQ_DEBUG is not set
1604CONFIG_BOOTX_TEXT=y 1613CONFIG_BOOTX_TEXT=y
1605# CONFIG_PPC_EARLY_DEBUG is not set 1614# CONFIG_PPC_EARLY_DEBUG is not set
1606 1615
@@ -1609,6 +1618,7 @@ CONFIG_BOOTX_TEXT=y
1609# 1618#
1610# CONFIG_KEYS is not set 1619# CONFIG_KEYS is not set
1611# CONFIG_SECURITY is not set 1620# CONFIG_SECURITY is not set
1621# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1612CONFIG_CRYPTO=y 1622CONFIG_CRYPTO=y
1613CONFIG_CRYPTO_ALGAPI=y 1623CONFIG_CRYPTO_ALGAPI=y
1614CONFIG_CRYPTO_BLKCIPHER=y 1624CONFIG_CRYPTO_BLKCIPHER=y
@@ -1629,6 +1639,7 @@ CONFIG_CRYPTO_ECB=m
1629CONFIG_CRYPTO_CBC=y 1639CONFIG_CRYPTO_CBC=y
1630CONFIG_CRYPTO_PCBC=m 1640CONFIG_CRYPTO_PCBC=m
1631# CONFIG_CRYPTO_LRW is not set 1641# CONFIG_CRYPTO_LRW is not set
1642# CONFIG_CRYPTO_XTS is not set
1632# CONFIG_CRYPTO_CRYPTD is not set 1643# CONFIG_CRYPTO_CRYPTD is not set
1633CONFIG_CRYPTO_DES=y 1644CONFIG_CRYPTO_DES=y
1634# CONFIG_CRYPTO_FCRYPT is not set 1645# CONFIG_CRYPTO_FCRYPT is not set
@@ -1643,9 +1654,12 @@ CONFIG_CRYPTO_TEA=m
1643CONFIG_CRYPTO_ARC4=m 1654CONFIG_CRYPTO_ARC4=m
1644CONFIG_CRYPTO_KHAZAD=m 1655CONFIG_CRYPTO_KHAZAD=m
1645CONFIG_CRYPTO_ANUBIS=m 1656CONFIG_CRYPTO_ANUBIS=m
1657# CONFIG_CRYPTO_SEED is not set
1646CONFIG_CRYPTO_DEFLATE=m 1658CONFIG_CRYPTO_DEFLATE=m
1647CONFIG_CRYPTO_MICHAEL_MIC=m 1659CONFIG_CRYPTO_MICHAEL_MIC=m
1648CONFIG_CRYPTO_CRC32C=m 1660CONFIG_CRYPTO_CRC32C=m
1649# CONFIG_CRYPTO_CAMELLIA is not set 1661# CONFIG_CRYPTO_CAMELLIA is not set
1650CONFIG_CRYPTO_TEST=m 1662CONFIG_CRYPTO_TEST=m
1663# CONFIG_CRYPTO_AUTHENC is not set
1651# CONFIG_CRYPTO_HW is not set 1664# CONFIG_CRYPTO_HW is not set
1665# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index 11009185d230..a211a79959ca 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:35:41 2007 4# Thu Dec 6 16:48:17 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,13 +15,19 @@ CONFIG_6xx=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set
18CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set 22# CONFIG_SMP is not set
22CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
23CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
24CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
25CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
26CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
27CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -61,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=y
61# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
62# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
63# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
64# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
65# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
66CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
67CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
68# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
69CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -84,7 +93,6 @@ CONFIG_FUTEX=y
84CONFIG_ANON_INODES=y 93CONFIG_ANON_INODES=y
85CONFIG_EPOLL=y 94CONFIG_EPOLL=y
86CONFIG_SIGNALFD=y 95CONFIG_SIGNALFD=y
87CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 96CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 97CONFIG_SHMEM=y
90CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
@@ -122,16 +130,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
122# 130#
123# Platform support 131# Platform support
124# 132#
125# CONFIG_PPC_MULTIPLATFORM is not set 133CONFIG_PPC_MULTIPLATFORM=y
126CONFIG_EMBEDDED6xx=y
127# CONFIG_PPC_82xx is not set 134# CONFIG_PPC_82xx is not set
128# CONFIG_PPC_83xx is not set 135# CONFIG_PPC_83xx is not set
129# CONFIG_PPC_86xx is not set 136# CONFIG_PPC_86xx is not set
137CONFIG_CLASSIC32=y
138# CONFIG_PPC_CHRP is not set
130# CONFIG_PPC_MPC52xx is not set 139# CONFIG_PPC_MPC52xx is not set
131# CONFIG_PPC_MPC5200 is not set 140# CONFIG_PPC_MPC5200 is not set
141# CONFIG_PPC_EFIKA is not set
142# CONFIG_PPC_LITE5200 is not set
143# CONFIG_PPC_PMAC is not set
132# CONFIG_PPC_CELL is not set 144# CONFIG_PPC_CELL is not set
133# CONFIG_PPC_CELL_NATIVE is not set 145# CONFIG_PPC_CELL_NATIVE is not set
134# CONFIG_PQ2ADS is not set 146# CONFIG_PQ2ADS is not set
147CONFIG_EMBEDDED6xx=y
135# CONFIG_LINKSTATION is not set 148# CONFIG_LINKSTATION is not set
136# CONFIG_MPC7448HPC2 is not set 149# CONFIG_MPC7448HPC2 is not set
137CONFIG_PPC_HOLLY=y 150CONFIG_PPC_HOLLY=y
@@ -147,6 +160,7 @@ CONFIG_MPIC_WEIRD=y
147# CONFIG_PPC_INDIRECT_IO is not set 160# CONFIG_PPC_INDIRECT_IO is not set
148# CONFIG_GENERIC_IOMAP is not set 161# CONFIG_GENERIC_IOMAP is not set
149# CONFIG_CPU_FREQ is not set 162# CONFIG_CPU_FREQ is not set
163# CONFIG_TAU is not set
150# CONFIG_CPM2 is not set 164# CONFIG_CPM2 is not set
151# CONFIG_FSL_ULI1575 is not set 165# CONFIG_FSL_ULI1575 is not set
152 166
@@ -154,6 +168,10 @@ CONFIG_MPIC_WEIRD=y
154# Kernel options 168# Kernel options
155# 169#
156# CONFIG_HIGHMEM is not set 170# CONFIG_HIGHMEM is not set
171CONFIG_TICK_ONESHOT=y
172CONFIG_NO_HZ=y
173CONFIG_HIGH_RES_TIMERS=y
174CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
157# CONFIG_HZ_100 is not set 175# CONFIG_HZ_100 is not set
158CONFIG_HZ_250=y 176CONFIG_HZ_250=y
159# CONFIG_HZ_300 is not set 177# CONFIG_HZ_300 is not set
@@ -165,6 +183,7 @@ CONFIG_PREEMPT_NONE=y
165CONFIG_BINFMT_ELF=y 183CONFIG_BINFMT_ELF=y
166CONFIG_BINFMT_MISC=y 184CONFIG_BINFMT_MISC=y
167CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 185CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
186# CONFIG_KEXEC is not set
168CONFIG_ARCH_FLATMEM_ENABLE=y 187CONFIG_ARCH_FLATMEM_ENABLE=y
169CONFIG_ARCH_POPULATES_NODE_MAP=y 188CONFIG_ARCH_POPULATES_NODE_MAP=y
170CONFIG_SELECT_MEMORY_MODEL=y 189CONFIG_SELECT_MEMORY_MODEL=y
@@ -174,6 +193,7 @@ CONFIG_FLATMEM_MANUAL=y
174CONFIG_FLATMEM=y 193CONFIG_FLATMEM=y
175CONFIG_FLAT_NODE_MEM_MAP=y 194CONFIG_FLAT_NODE_MEM_MAP=y
176# CONFIG_SPARSEMEM_STATIC is not set 195# CONFIG_SPARSEMEM_STATIC is not set
196# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
177CONFIG_SPLIT_PTLOCK_CPUS=4 197CONFIG_SPLIT_PTLOCK_CPUS=4
178# CONFIG_RESOURCES_64BIT is not set 198# CONFIG_RESOURCES_64BIT is not set
179CONFIG_ZONE_DMA_FLAG=1 199CONFIG_ZONE_DMA_FLAG=1
@@ -183,6 +203,8 @@ CONFIG_PROC_DEVICETREE=y
183CONFIG_CMDLINE_BOOL=y 203CONFIG_CMDLINE_BOOL=y
184CONFIG_CMDLINE="console=ttyS0,115200" 204CONFIG_CMDLINE="console=ttyS0,115200"
185# CONFIG_PM is not set 205# CONFIG_PM is not set
206CONFIG_SUSPEND_UP_POSSIBLE=y
207CONFIG_HIBERNATION_UP_POSSIBLE=y
186# CONFIG_SECCOMP is not set 208# CONFIG_SECCOMP is not set
187CONFIG_WANT_DEVICE_TREE=y 209CONFIG_WANT_DEVICE_TREE=y
188CONFIG_DEVICE_TREE="holly.dts" 210CONFIG_DEVICE_TREE="holly.dts"
@@ -200,11 +222,8 @@ CONFIG_PCI_SYSCALL=y
200# CONFIG_PCIEPORTBUS is not set 222# CONFIG_PCIEPORTBUS is not set
201CONFIG_ARCH_SUPPORTS_MSI=y 223CONFIG_ARCH_SUPPORTS_MSI=y
202# CONFIG_PCI_MSI is not set 224# CONFIG_PCI_MSI is not set
225CONFIG_PCI_LEGACY=y
203# CONFIG_PCI_DEBUG is not set 226# CONFIG_PCI_DEBUG is not set
204
205#
206# PCCARD (PCMCIA/CardBus) support
207#
208# CONFIG_PCCARD is not set 227# CONFIG_PCCARD is not set
209# CONFIG_HOTPLUG_PCI is not set 228# CONFIG_HOTPLUG_PCI is not set
210 229
@@ -219,7 +238,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
219CONFIG_HIGHMEM_START=0xfe000000 238CONFIG_HIGHMEM_START=0xfe000000
220CONFIG_LOWMEM_SIZE=0x30000000 239CONFIG_LOWMEM_SIZE=0x30000000
221CONFIG_KERNEL_START=0xc0000000 240CONFIG_KERNEL_START=0xc0000000
222CONFIG_TASK_SIZE=0x80000000 241CONFIG_TASK_SIZE=0xc0000000
223CONFIG_BOOT_LOAD=0x00800000 242CONFIG_BOOT_LOAD=0x00800000
224 243
225# 244#
@@ -259,6 +278,7 @@ CONFIG_SYN_COOKIES=y
259CONFIG_INET_XFRM_MODE_TRANSPORT=y 278CONFIG_INET_XFRM_MODE_TRANSPORT=y
260CONFIG_INET_XFRM_MODE_TUNNEL=y 279CONFIG_INET_XFRM_MODE_TUNNEL=y
261CONFIG_INET_XFRM_MODE_BEET=y 280CONFIG_INET_XFRM_MODE_BEET=y
281# CONFIG_INET_LRO is not set
262CONFIG_INET_DIAG=y 282CONFIG_INET_DIAG=y
263CONFIG_INET_TCP_DIAG=y 283CONFIG_INET_TCP_DIAG=y
264# CONFIG_TCP_CONG_ADVANCED is not set 284# CONFIG_TCP_CONG_ADVANCED is not set
@@ -284,10 +304,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
284# CONFIG_LAPB is not set 304# CONFIG_LAPB is not set
285# CONFIG_ECONET is not set 305# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 306# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
291# CONFIG_NET_SCHED is not set 307# CONFIG_NET_SCHED is not set
292 308
293# 309#
@@ -316,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# 332#
317# Generic Driver Options 333# Generic Driver Options
318# 334#
335CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
319CONFIG_STANDALONE=y 336CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y 337CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set 338# CONFIG_FW_LOADER is not set
@@ -386,6 +403,7 @@ CONFIG_SCSI_WAIT_SCAN=m
386# CONFIG_SCSI_FC_ATTRS is not set 403# CONFIG_SCSI_FC_ATTRS is not set
387# CONFIG_SCSI_ISCSI_ATTRS is not set 404# CONFIG_SCSI_ISCSI_ATTRS is not set
388# CONFIG_SCSI_SAS_LIBSAS is not set 405# CONFIG_SCSI_SAS_LIBSAS is not set
406# CONFIG_SCSI_SRP_ATTRS is not set
389CONFIG_SCSI_LOWLEVEL=y 407CONFIG_SCSI_LOWLEVEL=y
390# CONFIG_ISCSI_TCP is not set 408# CONFIG_ISCSI_TCP is not set
391# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 409# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -397,6 +415,7 @@ CONFIG_SCSI_LOWLEVEL=y
397# CONFIG_SCSI_AIC79XX is not set 415# CONFIG_SCSI_AIC79XX is not set
398# CONFIG_SCSI_AIC94XX is not set 416# CONFIG_SCSI_AIC94XX is not set
399# CONFIG_SCSI_DPT_I2O is not set 417# CONFIG_SCSI_DPT_I2O is not set
418# CONFIG_SCSI_ADVANSYS is not set
400# CONFIG_SCSI_ARCMSR is not set 419# CONFIG_SCSI_ARCMSR is not set
401# CONFIG_MEGARAID_NEWGEN is not set 420# CONFIG_MEGARAID_NEWGEN is not set
402# CONFIG_MEGARAID_LEGACY is not set 421# CONFIG_MEGARAID_LEGACY is not set
@@ -464,6 +483,7 @@ CONFIG_ATA=y
464# CONFIG_PATA_OLDPIIX is not set 483# CONFIG_PATA_OLDPIIX is not set
465# CONFIG_PATA_NETCELL is not set 484# CONFIG_PATA_NETCELL is not set
466# CONFIG_PATA_NS87410 is not set 485# CONFIG_PATA_NS87410 is not set
486# CONFIG_PATA_NS87415 is not set
467# CONFIG_PATA_OPTI is not set 487# CONFIG_PATA_OPTI is not set
468# CONFIG_PATA_OPTIDMA is not set 488# CONFIG_PATA_OPTIDMA is not set
469# CONFIG_PATA_PDC_OLD is not set 489# CONFIG_PATA_PDC_OLD is not set
@@ -478,14 +498,7 @@ CONFIG_ATA=y
478# CONFIG_PATA_WINBOND is not set 498# CONFIG_PATA_WINBOND is not set
479# CONFIG_PATA_PLATFORM is not set 499# CONFIG_PATA_PLATFORM is not set
480# CONFIG_MD is not set 500# CONFIG_MD is not set
481
482#
483# Fusion MPT device support
484#
485# CONFIG_FUSION is not set 501# CONFIG_FUSION is not set
486# CONFIG_FUSION_SPI is not set
487# CONFIG_FUSION_FC is not set
488# CONFIG_FUSION_SAS is not set
489 502
490# 503#
491# IEEE 1394 (FireWire) support 504# IEEE 1394 (FireWire) support
@@ -501,6 +514,8 @@ CONFIG_NETDEVICES=y
501# CONFIG_MACVLAN is not set 514# CONFIG_MACVLAN is not set
502# CONFIG_EQUALIZER is not set 515# CONFIG_EQUALIZER is not set
503# CONFIG_TUN is not set 516# CONFIG_TUN is not set
517# CONFIG_VETH is not set
518# CONFIG_IP1000 is not set
504# CONFIG_ARCNET is not set 519# CONFIG_ARCNET is not set
505CONFIG_PHYLIB=y 520CONFIG_PHYLIB=y
506 521
@@ -517,6 +532,7 @@ CONFIG_PHYLIB=y
517# CONFIG_BROADCOM_PHY is not set 532# CONFIG_BROADCOM_PHY is not set
518# CONFIG_ICPLUS_PHY is not set 533# CONFIG_ICPLUS_PHY is not set
519# CONFIG_FIXED_PHY is not set 534# CONFIG_FIXED_PHY is not set
535# CONFIG_MDIO_BITBANG is not set
520CONFIG_NET_ETHERNET=y 536CONFIG_NET_ETHERNET=y
521CONFIG_MII=y 537CONFIG_MII=y
522# CONFIG_HAPPYMEAL is not set 538# CONFIG_HAPPYMEAL is not set
@@ -527,11 +543,17 @@ CONFIG_VORTEX=y
527# CONFIG_TYPHOON is not set 543# CONFIG_TYPHOON is not set
528# CONFIG_NET_TULIP is not set 544# CONFIG_NET_TULIP is not set
529# CONFIG_HP100 is not set 545# CONFIG_HP100 is not set
546# CONFIG_IBM_NEW_EMAC_ZMII is not set
547# CONFIG_IBM_NEW_EMAC_RGMII is not set
548# CONFIG_IBM_NEW_EMAC_TAH is not set
549# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
530# CONFIG_NET_PCI is not set 550# CONFIG_NET_PCI is not set
551# CONFIG_B44 is not set
531CONFIG_NETDEV_1000=y 552CONFIG_NETDEV_1000=y
532# CONFIG_ACENIC is not set 553# CONFIG_ACENIC is not set
533# CONFIG_DL2K is not set 554# CONFIG_DL2K is not set
534# CONFIG_E1000 is not set 555# CONFIG_E1000 is not set
556# CONFIG_E1000E is not set
535# CONFIG_NS83820 is not set 557# CONFIG_NS83820 is not set
536# CONFIG_HAMACHI is not set 558# CONFIG_HAMACHI is not set
537# CONFIG_YELLOWFIN is not set 559# CONFIG_YELLOWFIN is not set
@@ -539,20 +561,25 @@ CONFIG_NETDEV_1000=y
539# CONFIG_SIS190 is not set 561# CONFIG_SIS190 is not set
540# CONFIG_SKGE is not set 562# CONFIG_SKGE is not set
541# CONFIG_SKY2 is not set 563# CONFIG_SKY2 is not set
564# CONFIG_SK98LIN is not set
542# CONFIG_VIA_VELOCITY is not set 565# CONFIG_VIA_VELOCITY is not set
543# CONFIG_TIGON3 is not set 566# CONFIG_TIGON3 is not set
544# CONFIG_BNX2 is not set 567# CONFIG_BNX2 is not set
545CONFIG_TSI108_ETH=y 568CONFIG_TSI108_ETH=y
569# CONFIG_MV643XX_ETH is not set
546# CONFIG_QLA3XXX is not set 570# CONFIG_QLA3XXX is not set
547# CONFIG_ATL1 is not set 571# CONFIG_ATL1 is not set
548CONFIG_NETDEV_10000=y 572CONFIG_NETDEV_10000=y
549# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
550# CONFIG_CHELSIO_T3 is not set 574# CONFIG_CHELSIO_T3 is not set
575# CONFIG_IXGBE is not set
551# CONFIG_IXGB is not set 576# CONFIG_IXGB is not set
552# CONFIG_S2IO is not set 577# CONFIG_S2IO is not set
553# CONFIG_MYRI10GE is not set 578# CONFIG_MYRI10GE is not set
554# CONFIG_NETXEN_NIC is not set 579# CONFIG_NETXEN_NIC is not set
580# CONFIG_NIU is not set
555# CONFIG_MLX4_CORE is not set 581# CONFIG_MLX4_CORE is not set
582# CONFIG_TEHUTI is not set
556# CONFIG_TR is not set 583# CONFIG_TR is not set
557 584
558# 585#
@@ -585,7 +612,6 @@ CONFIG_INPUT=y
585# 612#
586# CONFIG_INPUT_MOUSEDEV is not set 613# CONFIG_INPUT_MOUSEDEV is not set
587# CONFIG_INPUT_JOYDEV is not set 614# CONFIG_INPUT_JOYDEV is not set
588# CONFIG_INPUT_TSDEV is not set
589# CONFIG_INPUT_EVDEV is not set 615# CONFIG_INPUT_EVDEV is not set
590# CONFIG_INPUT_EVBUG is not set 616# CONFIG_INPUT_EVBUG is not set
591 617
@@ -637,15 +663,12 @@ CONFIG_UNIX98_PTYS=y
637CONFIG_LEGACY_PTYS=y 663CONFIG_LEGACY_PTYS=y
638CONFIG_LEGACY_PTY_COUNT=256 664CONFIG_LEGACY_PTY_COUNT=256
639# CONFIG_IPMI_HANDLER is not set 665# CONFIG_IPMI_HANDLER is not set
640# CONFIG_WATCHDOG is not set
641# CONFIG_HW_RANDOM is not set 666# CONFIG_HW_RANDOM is not set
642# CONFIG_NVRAM is not set 667# CONFIG_NVRAM is not set
643CONFIG_GEN_RTC=y 668CONFIG_GEN_RTC=y
644# CONFIG_GEN_RTC_X is not set 669# CONFIG_GEN_RTC_X is not set
645# CONFIG_R3964 is not set 670# CONFIG_R3964 is not set
646# CONFIG_APPLICOM is not set 671# CONFIG_APPLICOM is not set
647# CONFIG_AGP is not set
648# CONFIG_DRM is not set
649# CONFIG_RAW_DRIVER is not set 672# CONFIG_RAW_DRIVER is not set
650# CONFIG_TCG_TPM is not set 673# CONFIG_TCG_TPM is not set
651CONFIG_DEVPORT=y 674CONFIG_DEVPORT=y
@@ -660,9 +683,9 @@ CONFIG_DEVPORT=y
660# CONFIG_POWER_SUPPLY is not set 683# CONFIG_POWER_SUPPLY is not set
661CONFIG_HWMON=y 684CONFIG_HWMON=y
662# CONFIG_HWMON_VID is not set 685# CONFIG_HWMON_VID is not set
663# CONFIG_SENSORS_ABITUGURU is not set 686# CONFIG_SENSORS_I5K_AMB is not set
664# CONFIG_SENSORS_ABITUGURU3 is not set
665# CONFIG_SENSORS_F71805F is not set 687# CONFIG_SENSORS_F71805F is not set
688# CONFIG_SENSORS_F71882FG is not set
666# CONFIG_SENSORS_IT87 is not set 689# CONFIG_SENSORS_IT87 is not set
667# CONFIG_SENSORS_PC87360 is not set 690# CONFIG_SENSORS_PC87360 is not set
668# CONFIG_SENSORS_PC87427 is not set 691# CONFIG_SENSORS_PC87427 is not set
@@ -675,6 +698,13 @@ CONFIG_HWMON=y
675# CONFIG_SENSORS_W83627HF is not set 698# CONFIG_SENSORS_W83627HF is not set
676# CONFIG_SENSORS_W83627EHF is not set 699# CONFIG_SENSORS_W83627EHF is not set
677# CONFIG_HWMON_DEBUG_CHIP is not set 700# CONFIG_HWMON_DEBUG_CHIP is not set
701# CONFIG_WATCHDOG is not set
702
703#
704# Sonics Silicon Backplane
705#
706CONFIG_SSB_POSSIBLE=y
707# CONFIG_SSB is not set
678 708
679# 709#
680# Multifunction device drivers 710# Multifunction device drivers
@@ -691,16 +721,17 @@ CONFIG_HWMON=y
691# 721#
692# Graphics support 722# Graphics support
693# 723#
724# CONFIG_AGP is not set
725# CONFIG_DRM is not set
726# CONFIG_VGASTATE is not set
727# CONFIG_VIDEO_OUTPUT_CONTROL is not set
728# CONFIG_FB is not set
694# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 729# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
695 730
696# 731#
697# Display device support 732# Display device support
698# 733#
699# CONFIG_DISPLAY_SUPPORT is not set 734# CONFIG_DISPLAY_SUPPORT is not set
700# CONFIG_VGASTATE is not set
701# CONFIG_VIDEO_OUTPUT_CONTROL is not set
702# CONFIG_FB is not set
703# CONFIG_FB_IBM_GXT4500 is not set
704 735
705# 736#
706# Sound 737# Sound
@@ -709,6 +740,7 @@ CONFIG_HWMON=y
709CONFIG_HID_SUPPORT=y 740CONFIG_HID_SUPPORT=y
710CONFIG_HID=y 741CONFIG_HID=y
711# CONFIG_HID_DEBUG is not set 742# CONFIG_HID_DEBUG is not set
743# CONFIG_HIDRAW is not set
712CONFIG_USB_SUPPORT=y 744CONFIG_USB_SUPPORT=y
713CONFIG_USB_ARCH_HAS_HCD=y 745CONFIG_USB_ARCH_HAS_HCD=y
714CONFIG_USB_ARCH_HAS_OHCI=y 746CONFIG_USB_ARCH_HAS_OHCI=y
@@ -730,19 +762,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
730# CONFIG_RTC_CLASS is not set 762# CONFIG_RTC_CLASS is not set
731 763
732# 764#
733# DMA Engine support
734#
735# CONFIG_DMA_ENGINE is not set
736
737#
738# DMA Clients
739#
740
741#
742# DMA Devices
743#
744
745#
746# Userspace I/O 765# Userspace I/O
747# 766#
748# CONFIG_UIO is not set 767# CONFIG_UIO is not set
@@ -759,7 +778,6 @@ CONFIG_EXT3_FS_XATTR=y
759# CONFIG_EXT3_FS_SECURITY is not set 778# CONFIG_EXT3_FS_SECURITY is not set
760# CONFIG_EXT4DEV_FS is not set 779# CONFIG_EXT4DEV_FS is not set
761CONFIG_JBD=y 780CONFIG_JBD=y
762# CONFIG_JBD_DEBUG is not set
763CONFIG_FS_MBCACHE=y 781CONFIG_FS_MBCACHE=y
764# CONFIG_REISERFS_FS is not set 782# CONFIG_REISERFS_FS is not set
765# CONFIG_JFS_FS is not set 783# CONFIG_JFS_FS is not set
@@ -800,7 +818,6 @@ CONFIG_SYSFS=y
800CONFIG_TMPFS=y 818CONFIG_TMPFS=y
801# CONFIG_TMPFS_POSIX_ACL is not set 819# CONFIG_TMPFS_POSIX_ACL is not set
802# CONFIG_HUGETLB_PAGE is not set 820# CONFIG_HUGETLB_PAGE is not set
803CONFIG_RAMFS=y
804# CONFIG_CONFIGFS_FS is not set 821# CONFIG_CONFIGFS_FS is not set
805 822
806# 823#
@@ -819,10 +836,7 @@ CONFIG_RAMFS=y
819# CONFIG_QNX4FS_FS is not set 836# CONFIG_QNX4FS_FS is not set
820# CONFIG_SYSV_FS is not set 837# CONFIG_SYSV_FS is not set
821# CONFIG_UFS_FS is not set 838# CONFIG_UFS_FS is not set
822 839CONFIG_NETWORK_FILESYSTEMS=y
823#
824# Network File Systems
825#
826CONFIG_NFS_FS=y 840CONFIG_NFS_FS=y
827# CONFIG_NFS_V3 is not set 841# CONFIG_NFS_V3 is not set
828# CONFIG_NFS_V4 is not set 842# CONFIG_NFS_V4 is not set
@@ -862,15 +876,7 @@ CONFIG_MSDOS_PARTITION=y
862# CONFIG_KARMA_PARTITION is not set 876# CONFIG_KARMA_PARTITION is not set
863# CONFIG_EFI_PARTITION is not set 877# CONFIG_EFI_PARTITION is not set
864# CONFIG_SYSV68_PARTITION is not set 878# CONFIG_SYSV68_PARTITION is not set
865
866#
867# Native Language Support
868#
869# CONFIG_NLS is not set 879# CONFIG_NLS is not set
870
871#
872# Distributed Lock Manager
873#
874# CONFIG_DLM is not set 880# CONFIG_DLM is not set
875# CONFIG_UCC_SLOW is not set 881# CONFIG_UCC_SLOW is not set
876 882
@@ -888,17 +894,13 @@ CONFIG_PLIST=y
888CONFIG_HAS_IOMEM=y 894CONFIG_HAS_IOMEM=y
889CONFIG_HAS_IOPORT=y 895CONFIG_HAS_IOPORT=y
890CONFIG_HAS_DMA=y 896CONFIG_HAS_DMA=y
891 897# CONFIG_INSTRUMENTATION is not set
892#
893# Instrumentation Support
894#
895# CONFIG_PROFILING is not set
896# CONFIG_KPROBES is not set
897 898
898# 899#
899# Kernel hacking 900# Kernel hacking
900# 901#
901# CONFIG_PRINTK_TIME is not set 902# CONFIG_PRINTK_TIME is not set
903CONFIG_ENABLE_WARN_DEPRECATED=y
902CONFIG_ENABLE_MUST_CHECK=y 904CONFIG_ENABLE_MUST_CHECK=y
903CONFIG_MAGIC_SYSRQ=y 905CONFIG_MAGIC_SYSRQ=y
904# CONFIG_UNUSED_SYMBOLS is not set 906# CONFIG_UNUSED_SYMBOLS is not set
@@ -922,9 +924,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
922# CONFIG_DEBUG_INFO is not set 924# CONFIG_DEBUG_INFO is not set
923# CONFIG_DEBUG_VM is not set 925# CONFIG_DEBUG_VM is not set
924# CONFIG_DEBUG_LIST is not set 926# CONFIG_DEBUG_LIST is not set
927# CONFIG_DEBUG_SG is not set
925CONFIG_FORCED_INLINING=y 928CONFIG_FORCED_INLINING=y
929# CONFIG_BOOT_PRINTK_DELAY is not set
926# CONFIG_RCU_TORTURE_TEST is not set 930# CONFIG_RCU_TORTURE_TEST is not set
927# CONFIG_FAULT_INJECTION is not set 931# CONFIG_FAULT_INJECTION is not set
932# CONFIG_SAMPLES is not set
928# CONFIG_DEBUG_STACKOVERFLOW is not set 933# CONFIG_DEBUG_STACKOVERFLOW is not set
929# CONFIG_DEBUG_STACK_USAGE is not set 934# CONFIG_DEBUG_STACK_USAGE is not set
930# CONFIG_DEBUG_PAGEALLOC is not set 935# CONFIG_DEBUG_PAGEALLOC is not set
@@ -933,6 +938,7 @@ CONFIG_XMON=y
933CONFIG_XMON_DEFAULT=y 938CONFIG_XMON_DEFAULT=y
934CONFIG_XMON_DISASSEMBLY=y 939CONFIG_XMON_DISASSEMBLY=y
935# CONFIG_BDI_SWITCH is not set 940# CONFIG_BDI_SWITCH is not set
941# CONFIG_BOOTX_TEXT is not set
936# CONFIG_PPC_EARLY_DEBUG is not set 942# CONFIG_PPC_EARLY_DEBUG is not set
937 943
938# 944#
@@ -940,4 +946,6 @@ CONFIG_XMON_DISASSEMBLY=y
940# 946#
941# CONFIG_KEYS is not set 947# CONFIG_KEYS is not set
942# CONFIG_SECURITY is not set 948# CONFIG_SECURITY is not set
949# CONFIG_SECURITY_FILE_CAPABILITIES is not set
943# CONFIG_CRYPTO is not set 950# CONFIG_CRYPTO is not set
951# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index d78e3a6fc68c..4a87745c7803 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.23-rc4 3# Linux kernel version: 2.6.24-rc3
4# Thu Aug 30 16:37:16 2007 4# Wed Nov 21 11:19:59 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -11,6 +11,7 @@ CONFIG_PPC64=y
11# CONFIG_POWER4_ONLY is not set 11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y 12CONFIG_POWER3=y
13CONFIG_POWER4=y 13CONFIG_POWER4=y
14# CONFIG_TUNE_CELL is not set
14CONFIG_PPC_FPU=y 15CONFIG_PPC_FPU=y
15# CONFIG_ALTIVEC is not set 16# CONFIG_ALTIVEC is not set
16CONFIG_PPC_STD_MMU=y 17CONFIG_PPC_STD_MMU=y
@@ -19,8 +20,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y 20CONFIG_SMP=y
20CONFIG_NR_CPUS=32 21CONFIG_NR_CPUS=32
21CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64
22CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
23CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
24CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
25CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
26CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,12 +69,17 @@ CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
66CONFIG_AUDIT=y 73CONFIG_AUDIT=y
67CONFIG_AUDITSYSCALL=y 74CONFIG_AUDITSYSCALL=y
75CONFIG_AUDIT_TREE=y
68CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
70CONFIG_LOG_BUF_SHIFT=17 78CONFIG_LOG_BUF_SHIFT=17
71# CONFIG_CPUSETS is not set 79# CONFIG_CGROUPS is not set
80CONFIG_FAIR_GROUP_SCHED=y
81CONFIG_FAIR_USER_SCHED=y
82# CONFIG_FAIR_CGROUP_SCHED is not set
72CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
74CONFIG_BLK_DEV_INITRD=y 85CONFIG_BLK_DEV_INITRD=y
@@ -89,7 +100,6 @@ CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y 100CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 101CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 102CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 103CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 104CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y 105CONFIG_VM_EVENT_COUNTERS=y
@@ -110,6 +120,7 @@ CONFIG_STOP_MACHINE=y
110CONFIG_BLOCK=y 120CONFIG_BLOCK=y
111# CONFIG_BLK_DEV_IO_TRACE is not set 121# CONFIG_BLK_DEV_IO_TRACE is not set
112CONFIG_BLK_DEV_BSG=y 122CONFIG_BLK_DEV_BSG=y
123CONFIG_BLOCK_COMPAT=y
113 124
114# 125#
115# IO Schedulers 126# IO Schedulers
@@ -128,7 +139,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
128# Platform support 139# Platform support
129# 140#
130CONFIG_PPC_MULTIPLATFORM=y 141CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_EMBEDDED6xx is not set
132# CONFIG_PPC_82xx is not set 142# CONFIG_PPC_82xx is not set
133# CONFIG_PPC_83xx is not set 143# CONFIG_PPC_83xx is not set
134# CONFIG_PPC_86xx is not set 144# CONFIG_PPC_86xx is not set
@@ -172,6 +182,10 @@ CONFIG_GENERIC_IOMAP=y
172# 182#
173# Kernel options 183# Kernel options
174# 184#
185CONFIG_TICK_ONESHOT=y
186CONFIG_NO_HZ=y
187CONFIG_HIGH_RES_TIMERS=y
188CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
175# CONFIG_HZ_100 is not set 189# CONFIG_HZ_100 is not set
176CONFIG_HZ_250=y 190CONFIG_HZ_250=y
177# CONFIG_HZ_300 is not set 191# CONFIG_HZ_300 is not set
@@ -201,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
201CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
202CONFIG_FLAT_NODE_MEM_MAP=y 216CONFIG_FLAT_NODE_MEM_MAP=y
203# CONFIG_SPARSEMEM_STATIC is not set 217# CONFIG_SPARSEMEM_STATIC is not set
218CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
204CONFIG_SPLIT_PTLOCK_CPUS=4 219CONFIG_SPLIT_PTLOCK_CPUS=4
205CONFIG_RESOURCES_64BIT=y 220CONFIG_RESOURCES_64BIT=y
206CONFIG_ZONE_DMA_FLAG=1 221CONFIG_ZONE_DMA_FLAG=1
@@ -227,11 +242,8 @@ CONFIG_PCI_SYSCALL=y
227# CONFIG_PCIEPORTBUS is not set 242# CONFIG_PCIEPORTBUS is not set
228CONFIG_ARCH_SUPPORTS_MSI=y 243CONFIG_ARCH_SUPPORTS_MSI=y
229# CONFIG_PCI_MSI is not set 244# CONFIG_PCI_MSI is not set
245CONFIG_PCI_LEGACY=y
230# CONFIG_PCI_DEBUG is not set 246# CONFIG_PCI_DEBUG is not set
231
232#
233# PCCARD (PCMCIA/CardBus) support
234#
235# CONFIG_PCCARD is not set 247# CONFIG_PCCARD is not set
236# CONFIG_HOTPLUG_PCI is not set 248# CONFIG_HOTPLUG_PCI is not set
237CONFIG_KERNEL_START=0xc000000000000000 249CONFIG_KERNEL_START=0xc000000000000000
@@ -271,6 +283,7 @@ CONFIG_INET_TUNNEL=y
271CONFIG_INET_XFRM_MODE_TRANSPORT=y 283CONFIG_INET_XFRM_MODE_TRANSPORT=y
272CONFIG_INET_XFRM_MODE_TUNNEL=y 284CONFIG_INET_XFRM_MODE_TUNNEL=y
273CONFIG_INET_XFRM_MODE_BEET=m 285CONFIG_INET_XFRM_MODE_BEET=m
286# CONFIG_INET_LRO is not set
274CONFIG_INET_DIAG=y 287CONFIG_INET_DIAG=y
275CONFIG_INET_TCP_DIAG=y 288CONFIG_INET_TCP_DIAG=y
276# CONFIG_TCP_CONG_ADVANCED is not set 289# CONFIG_TCP_CONG_ADVANCED is not set
@@ -338,6 +351,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
338# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 351# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
339CONFIG_NETFILTER_XT_MATCH_STRING=m 352CONFIG_NETFILTER_XT_MATCH_STRING=m
340CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 353CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
354CONFIG_NETFILTER_XT_MATCH_TIME=m
341# CONFIG_NETFILTER_XT_MATCH_U32 is not set 355# CONFIG_NETFILTER_XT_MATCH_U32 is not set
342# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 356# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
343 357
@@ -403,10 +417,6 @@ CONFIG_LLC=y
403# CONFIG_LAPB is not set 417# CONFIG_LAPB is not set
404# CONFIG_ECONET is not set 418# CONFIG_ECONET is not set
405# CONFIG_WAN_ROUTER is not set 419# CONFIG_WAN_ROUTER is not set
406
407#
408# QoS and/or fair queueing
409#
410# CONFIG_NET_SCHED is not set 420# CONFIG_NET_SCHED is not set
411CONFIG_NET_CLS_ROUTE=y 421CONFIG_NET_CLS_ROUTE=y
412 422
@@ -436,6 +446,7 @@ CONFIG_NET_CLS_ROUTE=y
436# 446#
437# Generic Driver Options 447# Generic Driver Options
438# 448#
449CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
439CONFIG_STANDALONE=y 450CONFIG_STANDALONE=y
440CONFIG_PREVENT_FIRMWARE_BUILD=y 451CONFIG_PREVENT_FIRMWARE_BUILD=y
441CONFIG_FW_LOADER=m 452CONFIG_FW_LOADER=m
@@ -508,6 +519,7 @@ CONFIG_SCSI_FC_ATTRS=y
508CONFIG_SCSI_SAS_ATTRS=m 519CONFIG_SCSI_SAS_ATTRS=m
509CONFIG_SCSI_SAS_LIBSAS=m 520CONFIG_SCSI_SAS_LIBSAS=m
510CONFIG_SCSI_SAS_LIBSAS_DEBUG=y 521CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
522CONFIG_SCSI_SRP_ATTRS=m
511CONFIG_SCSI_LOWLEVEL=y 523CONFIG_SCSI_LOWLEVEL=y
512# CONFIG_ISCSI_TCP is not set 524# CONFIG_ISCSI_TCP is not set
513# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 525# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -559,14 +571,8 @@ CONFIG_DM_MIRROR=m
559CONFIG_DM_ZERO=m 571CONFIG_DM_ZERO=m
560# CONFIG_DM_MULTIPATH is not set 572# CONFIG_DM_MULTIPATH is not set
561# CONFIG_DM_DELAY is not set 573# CONFIG_DM_DELAY is not set
562 574# CONFIG_DM_UEVENT is not set
563#
564# Fusion MPT device support
565#
566# CONFIG_FUSION is not set 575# CONFIG_FUSION is not set
567# CONFIG_FUSION_SPI is not set
568# CONFIG_FUSION_FC is not set
569# CONFIG_FUSION_SAS is not set
570 576
571# 577#
572# IEEE 1394 (FireWire) support 578# IEEE 1394 (FireWire) support
@@ -582,6 +588,8 @@ CONFIG_BONDING=m
582# CONFIG_MACVLAN is not set 588# CONFIG_MACVLAN is not set
583# CONFIG_EQUALIZER is not set 589# CONFIG_EQUALIZER is not set
584CONFIG_TUN=m 590CONFIG_TUN=m
591# CONFIG_VETH is not set
592# CONFIG_IP1000 is not set
585# CONFIG_ARCNET is not set 593# CONFIG_ARCNET is not set
586# CONFIG_PHYLIB is not set 594# CONFIG_PHYLIB is not set
587CONFIG_NET_ETHERNET=y 595CONFIG_NET_ETHERNET=y
@@ -592,6 +600,10 @@ CONFIG_MII=y
592# CONFIG_NET_VENDOR_3COM is not set 600# CONFIG_NET_VENDOR_3COM is not set
593# CONFIG_NET_TULIP is not set 601# CONFIG_NET_TULIP is not set
594# CONFIG_HP100 is not set 602# CONFIG_HP100 is not set
603# CONFIG_IBM_NEW_EMAC_ZMII is not set
604# CONFIG_IBM_NEW_EMAC_RGMII is not set
605# CONFIG_IBM_NEW_EMAC_TAH is not set
606# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
595CONFIG_NET_PCI=y 607CONFIG_NET_PCI=y
596CONFIG_PCNET32=y 608CONFIG_PCNET32=y
597CONFIG_PCNET32_NAPI=y 609CONFIG_PCNET32_NAPI=y
@@ -599,7 +611,6 @@ CONFIG_PCNET32_NAPI=y
599# CONFIG_ADAPTEC_STARFIRE is not set 611# CONFIG_ADAPTEC_STARFIRE is not set
600# CONFIG_B44 is not set 612# CONFIG_B44 is not set
601# CONFIG_FORCEDETH is not set 613# CONFIG_FORCEDETH is not set
602# CONFIG_DGRS is not set
603# CONFIG_EEPRO100 is not set 614# CONFIG_EEPRO100 is not set
604CONFIG_E100=y 615CONFIG_E100=y
605# CONFIG_FEALNX is not set 616# CONFIG_FEALNX is not set
@@ -619,6 +630,7 @@ CONFIG_ACENIC=m
619CONFIG_E1000=m 630CONFIG_E1000=m
620# CONFIG_E1000_NAPI is not set 631# CONFIG_E1000_NAPI is not set
621# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 632# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
633# CONFIG_E1000E is not set
622# CONFIG_NS83820 is not set 634# CONFIG_NS83820 is not set
623# CONFIG_HAMACHI is not set 635# CONFIG_HAMACHI is not set
624# CONFIG_YELLOWFIN is not set 636# CONFIG_YELLOWFIN is not set
@@ -626,6 +638,7 @@ CONFIG_E1000=m
626# CONFIG_SIS190 is not set 638# CONFIG_SIS190 is not set
627# CONFIG_SKGE is not set 639# CONFIG_SKGE is not set
628# CONFIG_SKY2 is not set 640# CONFIG_SKY2 is not set
641# CONFIG_SK98LIN is not set
629# CONFIG_VIA_VELOCITY is not set 642# CONFIG_VIA_VELOCITY is not set
630# CONFIG_TIGON3 is not set 643# CONFIG_TIGON3 is not set
631# CONFIG_BNX2 is not set 644# CONFIG_BNX2 is not set
@@ -634,12 +647,15 @@ CONFIG_E1000=m
634CONFIG_NETDEV_10000=y 647CONFIG_NETDEV_10000=y
635# CONFIG_CHELSIO_T1 is not set 648# CONFIG_CHELSIO_T1 is not set
636# CONFIG_CHELSIO_T3 is not set 649# CONFIG_CHELSIO_T3 is not set
650# CONFIG_IXGBE is not set
637# CONFIG_IXGB is not set 651# CONFIG_IXGB is not set
638# CONFIG_S2IO is not set 652# CONFIG_S2IO is not set
639# CONFIG_MYRI10GE is not set 653# CONFIG_MYRI10GE is not set
640# CONFIG_NETXEN_NIC is not set 654# CONFIG_NETXEN_NIC is not set
655# CONFIG_NIU is not set
641# CONFIG_PASEMI_MAC is not set 656# CONFIG_PASEMI_MAC is not set
642# CONFIG_MLX4_CORE is not set 657# CONFIG_MLX4_CORE is not set
658# CONFIG_TEHUTI is not set
643CONFIG_TR=y 659CONFIG_TR=y
644CONFIG_IBMOL=y 660CONFIG_IBMOL=y
645# CONFIG_3C359 is not set 661# CONFIG_3C359 is not set
@@ -669,6 +685,7 @@ CONFIG_SLHC=m
669# CONFIG_NET_FC is not set 685# CONFIG_NET_FC is not set
670# CONFIG_SHAPER is not set 686# CONFIG_SHAPER is not set
671CONFIG_NETCONSOLE=y 687CONFIG_NETCONSOLE=y
688# CONFIG_NETCONSOLE_DYNAMIC is not set
672CONFIG_NETPOLL=y 689CONFIG_NETPOLL=y
673CONFIG_NETPOLL_TRAP=y 690CONFIG_NETPOLL_TRAP=y
674CONFIG_NET_POLL_CONTROLLER=y 691CONFIG_NET_POLL_CONTROLLER=y
@@ -690,7 +707,6 @@ CONFIG_INPUT_MOUSEDEV=y
690CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 707CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
691CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 708CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
692# CONFIG_INPUT_JOYDEV is not set 709# CONFIG_INPUT_JOYDEV is not set
693# CONFIG_INPUT_TSDEV is not set
694# CONFIG_INPUT_EVDEV is not set 710# CONFIG_INPUT_EVDEV is not set
695# CONFIG_INPUT_EVBUG is not set 711# CONFIG_INPUT_EVBUG is not set
696 712
@@ -736,14 +752,11 @@ CONFIG_LEGACY_PTY_COUNT=256
736CONFIG_HVC_DRIVER=y 752CONFIG_HVC_DRIVER=y
737CONFIG_HVC_ISERIES=y 753CONFIG_HVC_ISERIES=y
738# CONFIG_IPMI_HANDLER is not set 754# CONFIG_IPMI_HANDLER is not set
739# CONFIG_WATCHDOG is not set
740# CONFIG_HW_RANDOM is not set 755# CONFIG_HW_RANDOM is not set
741CONFIG_GEN_RTC=y 756CONFIG_GEN_RTC=y
742# CONFIG_GEN_RTC_X is not set 757# CONFIG_GEN_RTC_X is not set
743# CONFIG_R3964 is not set 758# CONFIG_R3964 is not set
744# CONFIG_APPLICOM is not set 759# CONFIG_APPLICOM is not set
745# CONFIG_AGP is not set
746# CONFIG_DRM is not set
747CONFIG_RAW_DRIVER=y 760CONFIG_RAW_DRIVER=y
748CONFIG_MAX_RAW_DEVS=256 761CONFIG_MAX_RAW_DEVS=256
749# CONFIG_HANGCHECK_TIMER is not set 762# CONFIG_HANGCHECK_TIMER is not set
@@ -759,6 +772,13 @@ CONFIG_DEVPORT=y
759# CONFIG_W1 is not set 772# CONFIG_W1 is not set
760# CONFIG_POWER_SUPPLY is not set 773# CONFIG_POWER_SUPPLY is not set
761# CONFIG_HWMON is not set 774# CONFIG_HWMON is not set
775# CONFIG_WATCHDOG is not set
776
777#
778# Sonics Silicon Backplane
779#
780CONFIG_SSB_POSSIBLE=y
781# CONFIG_SSB is not set
762 782
763# 783#
764# Multifunction device drivers 784# Multifunction device drivers
@@ -775,16 +795,17 @@ CONFIG_DEVPORT=y
775# 795#
776# Graphics support 796# Graphics support
777# 797#
798# CONFIG_AGP is not set
799# CONFIG_DRM is not set
800# CONFIG_VGASTATE is not set
801# CONFIG_VIDEO_OUTPUT_CONTROL is not set
802# CONFIG_FB is not set
778# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 803# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
779 804
780# 805#
781# Display device support 806# Display device support
782# 807#
783# CONFIG_DISPLAY_SUPPORT is not set 808# CONFIG_DISPLAY_SUPPORT is not set
784# CONFIG_VGASTATE is not set
785# CONFIG_VIDEO_OUTPUT_CONTROL is not set
786# CONFIG_FB is not set
787# CONFIG_FB_IBM_GXT4500 is not set
788 809
789# 810#
790# Console display driver support 811# Console display driver support
@@ -806,19 +827,6 @@ CONFIG_DUMMY_CONSOLE=y
806# CONFIG_RTC_CLASS is not set 827# CONFIG_RTC_CLASS is not set
807 828
808# 829#
809# DMA Engine support
810#
811# CONFIG_DMA_ENGINE is not set
812
813#
814# DMA Clients
815#
816
817#
818# DMA Devices
819#
820
821#
822# Userspace I/O 830# Userspace I/O
823# 831#
824# CONFIG_UIO is not set 832# CONFIG_UIO is not set
@@ -902,7 +910,6 @@ CONFIG_TMPFS=y
902CONFIG_TMPFS_POSIX_ACL=y 910CONFIG_TMPFS_POSIX_ACL=y
903# CONFIG_HUGETLBFS is not set 911# CONFIG_HUGETLBFS is not set
904# CONFIG_HUGETLB_PAGE is not set 912# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y
906CONFIG_CONFIGFS_FS=m 913CONFIG_CONFIGFS_FS=m
907 914
908# 915#
@@ -921,10 +928,7 @@ CONFIG_CRAMFS=y
921# CONFIG_QNX4FS_FS is not set 928# CONFIG_QNX4FS_FS is not set
922# CONFIG_SYSV_FS is not set 929# CONFIG_SYSV_FS is not set
923# CONFIG_UFS_FS is not set 930# CONFIG_UFS_FS is not set
924 931CONFIG_NETWORK_FILESYSTEMS=y
925#
926# Network File Systems
927#
928CONFIG_NFS_FS=y 932CONFIG_NFS_FS=y
929CONFIG_NFS_V3=y 933CONFIG_NFS_V3=y
930CONFIG_NFS_V3_ACL=y 934CONFIG_NFS_V3_ACL=y
@@ -963,10 +967,6 @@ CONFIG_CIFS_POSIX=y
963# 967#
964# CONFIG_PARTITION_ADVANCED is not set 968# CONFIG_PARTITION_ADVANCED is not set
965CONFIG_MSDOS_PARTITION=y 969CONFIG_MSDOS_PARTITION=y
966
967#
968# Native Language Support
969#
970CONFIG_NLS=y 970CONFIG_NLS=y
971CONFIG_NLS_DEFAULT="iso8859-1" 971CONFIG_NLS_DEFAULT="iso8859-1"
972CONFIG_NLS_CODEPAGE_437=y 972CONFIG_NLS_CODEPAGE_437=y
@@ -1007,10 +1007,6 @@ CONFIG_NLS_ISO8859_1=y
1007# CONFIG_NLS_KOI8_R is not set 1007# CONFIG_NLS_KOI8_R is not set
1008# CONFIG_NLS_KOI8_U is not set 1008# CONFIG_NLS_KOI8_U is not set
1009# CONFIG_NLS_UTF8 is not set 1009# CONFIG_NLS_UTF8 is not set
1010
1011#
1012# Distributed Lock Manager
1013#
1014CONFIG_DLM=m 1010CONFIG_DLM=m
1015# CONFIG_DLM_DEBUG is not set 1011# CONFIG_DLM_DEBUG is not set
1016# CONFIG_UCC_SLOW is not set 1012# CONFIG_UCC_SLOW is not set
@@ -1035,17 +1031,16 @@ CONFIG_PLIST=y
1035CONFIG_HAS_IOMEM=y 1031CONFIG_HAS_IOMEM=y
1036CONFIG_HAS_IOPORT=y 1032CONFIG_HAS_IOPORT=y
1037CONFIG_HAS_DMA=y 1033CONFIG_HAS_DMA=y
1038 1034CONFIG_INSTRUMENTATION=y
1039#
1040# Instrumentation Support
1041#
1042# CONFIG_PROFILING is not set 1035# CONFIG_PROFILING is not set
1043# CONFIG_KPROBES is not set 1036# CONFIG_KPROBES is not set
1037# CONFIG_MARKERS is not set
1044 1038
1045# 1039#
1046# Kernel hacking 1040# Kernel hacking
1047# 1041#
1048# CONFIG_PRINTK_TIME is not set 1042# CONFIG_PRINTK_TIME is not set
1043CONFIG_ENABLE_WARN_DEPRECATED=y
1049CONFIG_ENABLE_MUST_CHECK=y 1044CONFIG_ENABLE_MUST_CHECK=y
1050CONFIG_MAGIC_SYSRQ=y 1045CONFIG_MAGIC_SYSRQ=y
1051# CONFIG_UNUSED_SYMBOLS is not set 1046# CONFIG_UNUSED_SYMBOLS is not set
@@ -1069,14 +1064,18 @@ CONFIG_DEBUG_BUGVERBOSE=y
1069# CONFIG_DEBUG_INFO is not set 1064# CONFIG_DEBUG_INFO is not set
1070# CONFIG_DEBUG_VM is not set 1065# CONFIG_DEBUG_VM is not set
1071# CONFIG_DEBUG_LIST is not set 1066# CONFIG_DEBUG_LIST is not set
1067# CONFIG_DEBUG_SG is not set
1072# CONFIG_FORCED_INLINING is not set 1068# CONFIG_FORCED_INLINING is not set
1069# CONFIG_BOOT_PRINTK_DELAY is not set
1073# CONFIG_RCU_TORTURE_TEST is not set 1070# CONFIG_RCU_TORTURE_TEST is not set
1074# CONFIG_FAULT_INJECTION is not set 1071# CONFIG_FAULT_INJECTION is not set
1072# CONFIG_SAMPLES is not set
1075CONFIG_DEBUG_STACKOVERFLOW=y 1073CONFIG_DEBUG_STACKOVERFLOW=y
1076CONFIG_DEBUG_STACK_USAGE=y 1074CONFIG_DEBUG_STACK_USAGE=y
1077# CONFIG_DEBUG_PAGEALLOC is not set 1075# CONFIG_DEBUG_PAGEALLOC is not set
1078# CONFIG_DEBUGGER is not set 1076# CONFIG_DEBUGGER is not set
1079CONFIG_IRQSTACKS=y 1077CONFIG_IRQSTACKS=y
1078# CONFIG_VIRQ_DEBUG is not set
1080# CONFIG_BOOTX_TEXT is not set 1079# CONFIG_BOOTX_TEXT is not set
1081# CONFIG_PPC_EARLY_DEBUG is not set 1080# CONFIG_PPC_EARLY_DEBUG is not set
1082 1081
@@ -1085,8 +1084,10 @@ CONFIG_IRQSTACKS=y
1085# 1084#
1086# CONFIG_KEYS is not set 1085# CONFIG_KEYS is not set
1087# CONFIG_SECURITY is not set 1086# CONFIG_SECURITY is not set
1087# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1088CONFIG_CRYPTO=y 1088CONFIG_CRYPTO=y
1089CONFIG_CRYPTO_ALGAPI=y 1089CONFIG_CRYPTO_ALGAPI=y
1090CONFIG_CRYPTO_AEAD=m
1090CONFIG_CRYPTO_BLKCIPHER=y 1091CONFIG_CRYPTO_BLKCIPHER=y
1091CONFIG_CRYPTO_HASH=y 1092CONFIG_CRYPTO_HASH=y
1092CONFIG_CRYPTO_MANAGER=y 1093CONFIG_CRYPTO_MANAGER=y
@@ -1105,6 +1106,7 @@ CONFIG_CRYPTO_ECB=m
1105CONFIG_CRYPTO_CBC=y 1106CONFIG_CRYPTO_CBC=y
1106CONFIG_CRYPTO_PCBC=m 1107CONFIG_CRYPTO_PCBC=m
1107# CONFIG_CRYPTO_LRW is not set 1108# CONFIG_CRYPTO_LRW is not set
1109# CONFIG_CRYPTO_XTS is not set
1108# CONFIG_CRYPTO_CRYPTD is not set 1110# CONFIG_CRYPTO_CRYPTD is not set
1109CONFIG_CRYPTO_DES=y 1111CONFIG_CRYPTO_DES=y
1110# CONFIG_CRYPTO_FCRYPT is not set 1112# CONFIG_CRYPTO_FCRYPT is not set
@@ -1119,9 +1121,12 @@ CONFIG_CRYPTO_TEA=m
1119CONFIG_CRYPTO_ARC4=m 1121CONFIG_CRYPTO_ARC4=m
1120CONFIG_CRYPTO_KHAZAD=m 1122CONFIG_CRYPTO_KHAZAD=m
1121CONFIG_CRYPTO_ANUBIS=m 1123CONFIG_CRYPTO_ANUBIS=m
1124CONFIG_CRYPTO_SEED=m
1122CONFIG_CRYPTO_DEFLATE=m 1125CONFIG_CRYPTO_DEFLATE=m
1123CONFIG_CRYPTO_MICHAEL_MIC=m 1126CONFIG_CRYPTO_MICHAEL_MIC=m
1124CONFIG_CRYPTO_CRC32C=m 1127CONFIG_CRYPTO_CRC32C=m
1125# CONFIG_CRYPTO_CAMELLIA is not set 1128# CONFIG_CRYPTO_CAMELLIA is not set
1126CONFIG_CRYPTO_TEST=m 1129CONFIG_CRYPTO_TEST=m
1130CONFIG_CRYPTO_AUTHENC=m
1127# CONFIG_CRYPTO_HW is not set 1131# CONFIG_CRYPTO_HW is not set
1132# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig
index fd1c530aa3ec..28dee12031f5 100644
--- a/arch/powerpc/configs/kilauea_defconfig
+++ b/arch/powerpc/configs/kilauea_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.23-rc9 3# Linux kernel version: 2.6.24-rc4
4# Thu Oct 11 19:05:15 2007 4# Thu Dec 6 16:48:20 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -65,9 +65,12 @@ CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
67# CONFIG_USER_NS is not set 67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
68# CONFIG_AUDIT is not set 69# CONFIG_AUDIT is not set
69# CONFIG_IKCONFIG is not set 70# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set
73# CONFIG_FAIR_GROUP_SCHED is not set
71CONFIG_SYSFS_DEPRECATED=y 74CONFIG_SYSFS_DEPRECATED=y
72# CONFIG_RELAY is not set 75# CONFIG_RELAY is not set
73CONFIG_BLK_DEV_INITRD=y 76CONFIG_BLK_DEV_INITRD=y
@@ -154,6 +157,7 @@ CONFIG_KILAUEA=y
154# CONFIG_TICK_ONESHOT is not set 157# CONFIG_TICK_ONESHOT is not set
155# CONFIG_NO_HZ is not set 158# CONFIG_NO_HZ is not set
156# CONFIG_HIGH_RES_TIMERS is not set 159# CONFIG_HIGH_RES_TIMERS is not set
160CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
157# CONFIG_HZ_100 is not set 161# CONFIG_HZ_100 is not set
158CONFIG_HZ_250=y 162CONFIG_HZ_250=y
159# CONFIG_HZ_300 is not set 163# CONFIG_HZ_300 is not set
@@ -175,6 +179,7 @@ CONFIG_FLATMEM_MANUAL=y
175CONFIG_FLATMEM=y 179CONFIG_FLATMEM=y
176CONFIG_FLAT_NODE_MEM_MAP=y 180CONFIG_FLAT_NODE_MEM_MAP=y
177# CONFIG_SPARSEMEM_STATIC is not set 181# CONFIG_SPARSEMEM_STATIC is not set
182# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
178CONFIG_SPLIT_PTLOCK_CPUS=4 183CONFIG_SPLIT_PTLOCK_CPUS=4
179# CONFIG_RESOURCES_64BIT is not set 184# CONFIG_RESOURCES_64BIT is not set
180CONFIG_ZONE_DMA_FLAG=1 185CONFIG_ZONE_DMA_FLAG=1
@@ -198,10 +203,6 @@ CONFIG_ZONE_DMA=y
198# CONFIG_PCI_DOMAINS is not set 203# CONFIG_PCI_DOMAINS is not set
199# CONFIG_PCI_SYSCALL is not set 204# CONFIG_PCI_SYSCALL is not set
200# CONFIG_ARCH_SUPPORTS_MSI is not set 205# CONFIG_ARCH_SUPPORTS_MSI is not set
201
202#
203# PCCARD (PCMCIA/CardBus) support
204#
205# CONFIG_PCCARD is not set 206# CONFIG_PCCARD is not set
206 207
207# 208#
@@ -215,7 +216,7 @@ CONFIG_ZONE_DMA=y
215CONFIG_HIGHMEM_START=0xfe000000 216CONFIG_HIGHMEM_START=0xfe000000
216CONFIG_LOWMEM_SIZE=0x30000000 217CONFIG_LOWMEM_SIZE=0x30000000
217CONFIG_KERNEL_START=0xc0000000 218CONFIG_KERNEL_START=0xc0000000
218CONFIG_TASK_SIZE=0x80000000 219CONFIG_TASK_SIZE=0xc0000000
219CONFIG_CONSISTENT_START=0xff100000 220CONFIG_CONSISTENT_START=0xff100000
220CONFIG_CONSISTENT_SIZE=0x00200000 221CONFIG_CONSISTENT_SIZE=0x00200000
221CONFIG_BOOT_LOAD=0x00400000 222CONFIG_BOOT_LOAD=0x00400000
@@ -252,6 +253,7 @@ CONFIG_IP_PNP_BOOTP=y
252# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 253# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
253# CONFIG_INET_XFRM_MODE_TUNNEL is not set 254# CONFIG_INET_XFRM_MODE_TUNNEL is not set
254# CONFIG_INET_XFRM_MODE_BEET is not set 255# CONFIG_INET_XFRM_MODE_BEET is not set
256# CONFIG_INET_LRO is not set
255CONFIG_INET_DIAG=y 257CONFIG_INET_DIAG=y
256CONFIG_INET_TCP_DIAG=y 258CONFIG_INET_TCP_DIAG=y
257# CONFIG_TCP_CONG_ADVANCED is not set 259# CONFIG_TCP_CONG_ADVANCED is not set
@@ -277,10 +279,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
277# CONFIG_LAPB is not set 279# CONFIG_LAPB is not set
278# CONFIG_ECONET is not set 280# CONFIG_ECONET is not set
279# CONFIG_WAN_ROUTER is not set 281# CONFIG_WAN_ROUTER is not set
280
281#
282# QoS and/or fair queueing
283#
284# CONFIG_NET_SCHED is not set 282# CONFIG_NET_SCHED is not set
285 283
286# 284#
@@ -309,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# 307#
310# Generic Driver Options 308# Generic Driver Options
311# 309#
310CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
312CONFIG_STANDALONE=y 311CONFIG_STANDALONE=y
313CONFIG_PREVENT_FIRMWARE_BUILD=y 312CONFIG_PREVENT_FIRMWARE_BUILD=y
314CONFIG_FW_LOADER=y 313CONFIG_FW_LOADER=y
@@ -336,6 +335,7 @@ CONFIG_MTD_BLOCK=m
336# CONFIG_INFTL is not set 335# CONFIG_INFTL is not set
337# CONFIG_RFD_FTL is not set 336# CONFIG_RFD_FTL is not set
338# CONFIG_SSFDC is not set 337# CONFIG_SSFDC is not set
338# CONFIG_MTD_OOPS is not set
339 339
340# 340#
341# RAM/ROM/Flash chip drivers 341# RAM/ROM/Flash chip drivers
@@ -425,6 +425,7 @@ CONFIG_NETDEVICES=y
425# CONFIG_MACVLAN is not set 425# CONFIG_MACVLAN is not set
426# CONFIG_EQUALIZER is not set 426# CONFIG_EQUALIZER is not set
427# CONFIG_TUN is not set 427# CONFIG_TUN is not set
428# CONFIG_VETH is not set
428# CONFIG_NET_ETHERNET is not set 429# CONFIG_NET_ETHERNET is not set
429# CONFIG_NETDEV_1000 is not set 430# CONFIG_NETDEV_1000 is not set
430# CONFIG_NETDEV_10000 is not set 431# CONFIG_NETDEV_10000 is not set
@@ -485,7 +486,6 @@ CONFIG_UNIX98_PTYS=y
485CONFIG_LEGACY_PTYS=y 486CONFIG_LEGACY_PTYS=y
486CONFIG_LEGACY_PTY_COUNT=256 487CONFIG_LEGACY_PTY_COUNT=256
487# CONFIG_IPMI_HANDLER is not set 488# CONFIG_IPMI_HANDLER is not set
488# CONFIG_WATCHDOG is not set
489# CONFIG_HW_RANDOM is not set 489# CONFIG_HW_RANDOM is not set
490# CONFIG_NVRAM is not set 490# CONFIG_NVRAM is not set
491# CONFIG_GEN_RTC is not set 491# CONFIG_GEN_RTC is not set
@@ -502,6 +502,13 @@ CONFIG_LEGACY_PTY_COUNT=256
502# CONFIG_W1 is not set 502# CONFIG_W1 is not set
503# CONFIG_POWER_SUPPLY is not set 503# CONFIG_POWER_SUPPLY is not set
504# CONFIG_HWMON is not set 504# CONFIG_HWMON is not set
505# CONFIG_WATCHDOG is not set
506
507#
508# Sonics Silicon Backplane
509#
510CONFIG_SSB_POSSIBLE=y
511# CONFIG_SSB is not set
505 512
506# 513#
507# Multifunction device drivers 514# Multifunction device drivers
@@ -518,16 +525,15 @@ CONFIG_LEGACY_PTY_COUNT=256
518# 525#
519# Graphics support 526# Graphics support
520# 527#
528# CONFIG_VGASTATE is not set
529# CONFIG_VIDEO_OUTPUT_CONTROL is not set
530# CONFIG_FB is not set
521# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 531# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
522 532
523# 533#
524# Display device support 534# Display device support
525# 535#
526# CONFIG_DISPLAY_SUPPORT is not set 536# CONFIG_DISPLAY_SUPPORT is not set
527# CONFIG_VGASTATE is not set
528# CONFIG_VIDEO_OUTPUT_CONTROL is not set
529# CONFIG_FB is not set
530# CONFIG_FB_IBM_GXT4500 is not set
531 537
532# 538#
533# Sound 539# Sound
@@ -540,19 +546,6 @@ CONFIG_LEGACY_PTY_COUNT=256
540# CONFIG_RTC_CLASS is not set 546# CONFIG_RTC_CLASS is not set
541 547
542# 548#
543# DMA Engine support
544#
545# CONFIG_DMA_ENGINE is not set
546
547#
548# DMA Clients
549#
550
551#
552# DMA Devices
553#
554
555#
556# Userspace I/O 549# Userspace I/O
557# 550#
558# CONFIG_UIO is not set 551# CONFIG_UIO is not set
@@ -604,7 +597,6 @@ CONFIG_SYSFS=y
604CONFIG_TMPFS=y 597CONFIG_TMPFS=y
605# CONFIG_TMPFS_POSIX_ACL is not set 598# CONFIG_TMPFS_POSIX_ACL is not set
606# CONFIG_HUGETLB_PAGE is not set 599# CONFIG_HUGETLB_PAGE is not set
607CONFIG_RAMFS=y
608# CONFIG_CONFIGFS_FS is not set 600# CONFIG_CONFIGFS_FS is not set
609 601
610# 602#
@@ -624,10 +616,7 @@ CONFIG_CRAMFS=y
624# CONFIG_QNX4FS_FS is not set 616# CONFIG_QNX4FS_FS is not set
625# CONFIG_SYSV_FS is not set 617# CONFIG_SYSV_FS is not set
626# CONFIG_UFS_FS is not set 618# CONFIG_UFS_FS is not set
627 619CONFIG_NETWORK_FILESYSTEMS=y
628#
629# Network File Systems
630#
631CONFIG_NFS_FS=y 620CONFIG_NFS_FS=y
632CONFIG_NFS_V3=y 621CONFIG_NFS_V3=y
633# CONFIG_NFS_V3_ACL is not set 622# CONFIG_NFS_V3_ACL is not set
@@ -653,15 +642,7 @@ CONFIG_SUNRPC=y
653# 642#
654# CONFIG_PARTITION_ADVANCED is not set 643# CONFIG_PARTITION_ADVANCED is not set
655CONFIG_MSDOS_PARTITION=y 644CONFIG_MSDOS_PARTITION=y
656
657#
658# Native Language Support
659#
660# CONFIG_NLS is not set 645# CONFIG_NLS is not set
661
662#
663# Distributed Lock Manager
664#
665# CONFIG_DLM is not set 646# CONFIG_DLM is not set
666# CONFIG_UCC_SLOW is not set 647# CONFIG_UCC_SLOW is not set
667 648
@@ -680,16 +661,13 @@ CONFIG_PLIST=y
680CONFIG_HAS_IOMEM=y 661CONFIG_HAS_IOMEM=y
681CONFIG_HAS_IOPORT=y 662CONFIG_HAS_IOPORT=y
682CONFIG_HAS_DMA=y 663CONFIG_HAS_DMA=y
683 664# CONFIG_INSTRUMENTATION is not set
684#
685# Instrumentation Support
686#
687# CONFIG_PROFILING is not set
688 665
689# 666#
690# Kernel hacking 667# Kernel hacking
691# 668#
692# CONFIG_PRINTK_TIME is not set 669# CONFIG_PRINTK_TIME is not set
670CONFIG_ENABLE_WARN_DEPRECATED=y
693CONFIG_ENABLE_MUST_CHECK=y 671CONFIG_ENABLE_MUST_CHECK=y
694CONFIG_MAGIC_SYSRQ=y 672CONFIG_MAGIC_SYSRQ=y
695# CONFIG_UNUSED_SYMBOLS is not set 673# CONFIG_UNUSED_SYMBOLS is not set
@@ -713,9 +691,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
713# CONFIG_DEBUG_INFO is not set 691# CONFIG_DEBUG_INFO is not set
714# CONFIG_DEBUG_VM is not set 692# CONFIG_DEBUG_VM is not set
715# CONFIG_DEBUG_LIST is not set 693# CONFIG_DEBUG_LIST is not set
694# CONFIG_DEBUG_SG is not set
716CONFIG_FORCED_INLINING=y 695CONFIG_FORCED_INLINING=y
696# CONFIG_BOOT_PRINTK_DELAY is not set
717# CONFIG_RCU_TORTURE_TEST is not set 697# CONFIG_RCU_TORTURE_TEST is not set
718# CONFIG_FAULT_INJECTION is not set 698# CONFIG_FAULT_INJECTION is not set
699# CONFIG_SAMPLES is not set
719# CONFIG_DEBUG_STACKOVERFLOW is not set 700# CONFIG_DEBUG_STACKOVERFLOW is not set
720# CONFIG_DEBUG_STACK_USAGE is not set 701# CONFIG_DEBUG_STACK_USAGE is not set
721# CONFIG_DEBUG_PAGEALLOC is not set 702# CONFIG_DEBUG_PAGEALLOC is not set
@@ -728,6 +709,7 @@ CONFIG_FORCED_INLINING=y
728# 709#
729# CONFIG_KEYS is not set 710# CONFIG_KEYS is not set
730# CONFIG_SECURITY is not set 711# CONFIG_SECURITY is not set
712# CONFIG_SECURITY_FILE_CAPABILITIES is not set
731CONFIG_CRYPTO=y 713CONFIG_CRYPTO=y
732CONFIG_CRYPTO_ALGAPI=y 714CONFIG_CRYPTO_ALGAPI=y
733CONFIG_CRYPTO_BLKCIPHER=y 715CONFIG_CRYPTO_BLKCIPHER=y
@@ -747,6 +729,7 @@ CONFIG_CRYPTO_ECB=y
747CONFIG_CRYPTO_CBC=y 729CONFIG_CRYPTO_CBC=y
748CONFIG_CRYPTO_PCBC=y 730CONFIG_CRYPTO_PCBC=y
749# CONFIG_CRYPTO_LRW is not set 731# CONFIG_CRYPTO_LRW is not set
732# CONFIG_CRYPTO_XTS is not set
750# CONFIG_CRYPTO_CRYPTD is not set 733# CONFIG_CRYPTO_CRYPTD is not set
751CONFIG_CRYPTO_DES=y 734CONFIG_CRYPTO_DES=y
752# CONFIG_CRYPTO_FCRYPT is not set 735# CONFIG_CRYPTO_FCRYPT is not set
@@ -760,10 +743,12 @@ CONFIG_CRYPTO_DES=y
760# CONFIG_CRYPTO_ARC4 is not set 743# CONFIG_CRYPTO_ARC4 is not set
761# CONFIG_CRYPTO_KHAZAD is not set 744# CONFIG_CRYPTO_KHAZAD is not set
762# CONFIG_CRYPTO_ANUBIS is not set 745# CONFIG_CRYPTO_ANUBIS is not set
746# CONFIG_CRYPTO_SEED is not set
763# CONFIG_CRYPTO_DEFLATE is not set 747# CONFIG_CRYPTO_DEFLATE is not set
764# CONFIG_CRYPTO_MICHAEL_MIC is not set 748# CONFIG_CRYPTO_MICHAEL_MIC is not set
765# CONFIG_CRYPTO_CRC32C is not set 749# CONFIG_CRYPTO_CRC32C is not set
766# CONFIG_CRYPTO_CAMELLIA is not set 750# CONFIG_CRYPTO_CAMELLIA is not set
767# CONFIG_CRYPTO_TEST is not set 751# CONFIG_CRYPTO_TEST is not set
752# CONFIG_CRYPTO_AUTHENC is not set
768CONFIG_CRYPTO_HW=y 753CONFIG_CRYPTO_HW=y
769# CONFIG_PPC_CLOCK is not set 754# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 401033aefd40..7b4280811fb9 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:38 2007 4# Thu Dec 6 16:48:22 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,13 +15,19 @@ CONFIG_6xx=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set
18CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set 22# CONFIG_SMP is not set
22CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
23CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
24CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
25CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
26CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
27CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -61,10 +67,13 @@ CONFIG_POSIX_MQUEUE=y
61# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
62# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
63# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
64# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
65CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
66CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
67CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 79CONFIG_BLK_DEV_INITRD=y
@@ -85,7 +94,6 @@ CONFIG_FUTEX=y
85CONFIG_ANON_INODES=y 94CONFIG_ANON_INODES=y
86CONFIG_EPOLL=y 95CONFIG_EPOLL=y
87CONFIG_SIGNALFD=y 96CONFIG_SIGNALFD=y
88CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 98CONFIG_SHMEM=y
91CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
@@ -124,16 +132,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
124# 132#
125# Platform support 133# Platform support
126# 134#
127# CONFIG_PPC_MULTIPLATFORM is not set 135CONFIG_PPC_MULTIPLATFORM=y
128CONFIG_EMBEDDED6xx=y
129# CONFIG_PPC_82xx is not set 136# CONFIG_PPC_82xx is not set
130# CONFIG_PPC_83xx is not set 137# CONFIG_PPC_83xx is not set
131# CONFIG_PPC_86xx is not set 138# CONFIG_PPC_86xx is not set
139CONFIG_CLASSIC32=y
140# CONFIG_PPC_CHRP is not set
132# CONFIG_PPC_MPC52xx is not set 141# CONFIG_PPC_MPC52xx is not set
133# CONFIG_PPC_MPC5200 is not set 142# CONFIG_PPC_MPC5200 is not set
143# CONFIG_PPC_EFIKA is not set
144# CONFIG_PPC_LITE5200 is not set
145# CONFIG_PPC_PMAC is not set
134# CONFIG_PPC_CELL is not set 146# CONFIG_PPC_CELL is not set
135# CONFIG_PPC_CELL_NATIVE is not set 147# CONFIG_PPC_CELL_NATIVE is not set
136# CONFIG_PQ2ADS is not set 148# CONFIG_PQ2ADS is not set
149CONFIG_EMBEDDED6xx=y
137CONFIG_LINKSTATION=y 150CONFIG_LINKSTATION=y
138# CONFIG_MPC7448HPC2 is not set 151# CONFIG_MPC7448HPC2 is not set
139# CONFIG_PPC_HOLLY is not set 152# CONFIG_PPC_HOLLY is not set
@@ -151,6 +164,7 @@ CONFIG_MPIC=y
151# CONFIG_PPC_INDIRECT_IO is not set 164# CONFIG_PPC_INDIRECT_IO is not set
152# CONFIG_GENERIC_IOMAP is not set 165# CONFIG_GENERIC_IOMAP is not set
153# CONFIG_CPU_FREQ is not set 166# CONFIG_CPU_FREQ is not set
167# CONFIG_TAU is not set
154# CONFIG_CPM2 is not set 168# CONFIG_CPM2 is not set
155# CONFIG_FSL_ULI1575 is not set 169# CONFIG_FSL_ULI1575 is not set
156 170
@@ -158,6 +172,10 @@ CONFIG_MPIC=y
158# Kernel options 172# Kernel options
159# 173#
160# CONFIG_HIGHMEM is not set 174# CONFIG_HIGHMEM is not set
175CONFIG_TICK_ONESHOT=y
176CONFIG_NO_HZ=y
177CONFIG_HIGH_RES_TIMERS=y
178CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
161CONFIG_HZ_100=y 179CONFIG_HZ_100=y
162# CONFIG_HZ_250 is not set 180# CONFIG_HZ_250 is not set
163# CONFIG_HZ_300 is not set 181# CONFIG_HZ_300 is not set
@@ -169,6 +187,7 @@ CONFIG_PREEMPT_NONE=y
169CONFIG_BINFMT_ELF=y 187CONFIG_BINFMT_ELF=y
170# CONFIG_BINFMT_MISC is not set 188# CONFIG_BINFMT_MISC is not set
171CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 189CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
190# CONFIG_KEXEC is not set
172CONFIG_ARCH_FLATMEM_ENABLE=y 191CONFIG_ARCH_FLATMEM_ENABLE=y
173CONFIG_ARCH_POPULATES_NODE_MAP=y 192CONFIG_ARCH_POPULATES_NODE_MAP=y
174CONFIG_SELECT_MEMORY_MODEL=y 193CONFIG_SELECT_MEMORY_MODEL=y
@@ -178,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
181CONFIG_SPLIT_PTLOCK_CPUS=4 201CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_RESOURCES_64BIT is not set 202# CONFIG_RESOURCES_64BIT is not set
183CONFIG_ZONE_DMA_FLAG=1 203CONFIG_ZONE_DMA_FLAG=1
@@ -186,6 +206,8 @@ CONFIG_VIRT_TO_BUS=y
186CONFIG_PROC_DEVICETREE=y 206CONFIG_PROC_DEVICETREE=y
187# CONFIG_CMDLINE_BOOL is not set 207# CONFIG_CMDLINE_BOOL is not set
188# CONFIG_PM is not set 208# CONFIG_PM is not set
209CONFIG_SUSPEND_UP_POSSIBLE=y
210CONFIG_HIBERNATION_UP_POSSIBLE=y
189CONFIG_SECCOMP=y 211CONFIG_SECCOMP=y
190# CONFIG_WANT_DEVICE_TREE is not set 212# CONFIG_WANT_DEVICE_TREE is not set
191CONFIG_ISA_DMA_API=y 213CONFIG_ISA_DMA_API=y
@@ -203,11 +225,8 @@ CONFIG_PCI_SYSCALL=y
203# CONFIG_PCIEPORTBUS is not set 225# CONFIG_PCIEPORTBUS is not set
204CONFIG_ARCH_SUPPORTS_MSI=y 226CONFIG_ARCH_SUPPORTS_MSI=y
205# CONFIG_PCI_MSI is not set 227# CONFIG_PCI_MSI is not set
228CONFIG_PCI_LEGACY=y
206# CONFIG_PCI_DEBUG is not set 229# CONFIG_PCI_DEBUG is not set
207
208#
209# PCCARD (PCMCIA/CardBus) support
210#
211# CONFIG_PCCARD is not set 230# CONFIG_PCCARD is not set
212# CONFIG_HOTPLUG_PCI is not set 231# CONFIG_HOTPLUG_PCI is not set
213 232
@@ -222,7 +241,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
222CONFIG_HIGHMEM_START=0xfe000000 241CONFIG_HIGHMEM_START=0xfe000000
223CONFIG_LOWMEM_SIZE=0x30000000 242CONFIG_LOWMEM_SIZE=0x30000000
224CONFIG_KERNEL_START=0xc0000000 243CONFIG_KERNEL_START=0xc0000000
225CONFIG_TASK_SIZE=0x80000000 244CONFIG_TASK_SIZE=0xc0000000
226CONFIG_BOOT_LOAD=0x00800000 245CONFIG_BOOT_LOAD=0x00800000
227 246
228# 247#
@@ -262,6 +281,7 @@ CONFIG_IP_PNP_BOOTP=y
262CONFIG_INET_XFRM_MODE_TRANSPORT=y 281CONFIG_INET_XFRM_MODE_TRANSPORT=y
263CONFIG_INET_XFRM_MODE_TUNNEL=y 282CONFIG_INET_XFRM_MODE_TUNNEL=y
264CONFIG_INET_XFRM_MODE_BEET=y 283CONFIG_INET_XFRM_MODE_BEET=y
284# CONFIG_INET_LRO is not set
265CONFIG_INET_DIAG=y 285CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y 286CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set 287# CONFIG_TCP_CONG_ADVANCED is not set
@@ -330,6 +350,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
330# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 350# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
331# CONFIG_NETFILTER_XT_MATCH_STRING is not set 351# CONFIG_NETFILTER_XT_MATCH_STRING is not set
332# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 352# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
353# CONFIG_NETFILTER_XT_MATCH_TIME is not set
333# CONFIG_NETFILTER_XT_MATCH_U32 is not set 354# CONFIG_NETFILTER_XT_MATCH_U32 is not set
334# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 355# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
335 356
@@ -390,10 +411,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
390# CONFIG_LAPB is not set 411# CONFIG_LAPB is not set
391# CONFIG_ECONET is not set 412# CONFIG_ECONET is not set
392# CONFIG_WAN_ROUTER is not set 413# CONFIG_WAN_ROUTER is not set
393
394#
395# QoS and/or fair queueing
396#
397# CONFIG_NET_SCHED is not set 414# CONFIG_NET_SCHED is not set
398 415
399# 416#
@@ -428,6 +445,7 @@ CONFIG_IEEE80211_SOFTMAC_DEBUG=y
428# 445#
429# Generic Driver Options 446# Generic Driver Options
430# 447#
448CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
431CONFIG_STANDALONE=y 449CONFIG_STANDALONE=y
432CONFIG_PREVENT_FIRMWARE_BUILD=y 450CONFIG_PREVENT_FIRMWARE_BUILD=y
433CONFIG_FW_LOADER=m 451CONFIG_FW_LOADER=m
@@ -453,6 +471,7 @@ CONFIG_MTD_BLOCK=y
453# CONFIG_INFTL is not set 471# CONFIG_INFTL is not set
454# CONFIG_RFD_FTL is not set 472# CONFIG_RFD_FTL is not set
455# CONFIG_SSFDC is not set 473# CONFIG_SSFDC is not set
474# CONFIG_MTD_OOPS is not set
456 475
457# 476#
458# RAM/ROM/Flash chip drivers 477# RAM/ROM/Flash chip drivers
@@ -493,6 +512,7 @@ CONFIG_MTD_PHYSMAP_START=0xffc00000
493CONFIG_MTD_PHYSMAP_LEN=0x400000 512CONFIG_MTD_PHYSMAP_LEN=0x400000
494CONFIG_MTD_PHYSMAP_BANKWIDTH=1 513CONFIG_MTD_PHYSMAP_BANKWIDTH=1
495# CONFIG_MTD_PHYSMAP_OF is not set 514# CONFIG_MTD_PHYSMAP_OF is not set
515# CONFIG_MTD_INTEL_VR_NOR is not set
496# CONFIG_MTD_PLATRAM is not set 516# CONFIG_MTD_PLATRAM is not set
497 517
498# 518#
@@ -580,6 +600,7 @@ CONFIG_SCSI_WAIT_SCAN=m
580# CONFIG_SCSI_FC_ATTRS is not set 600# CONFIG_SCSI_FC_ATTRS is not set
581# CONFIG_SCSI_ISCSI_ATTRS is not set 601# CONFIG_SCSI_ISCSI_ATTRS is not set
582# CONFIG_SCSI_SAS_LIBSAS is not set 602# CONFIG_SCSI_SAS_LIBSAS is not set
603# CONFIG_SCSI_SRP_ATTRS is not set
583CONFIG_SCSI_LOWLEVEL=y 604CONFIG_SCSI_LOWLEVEL=y
584# CONFIG_ISCSI_TCP is not set 605# CONFIG_ISCSI_TCP is not set
585# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 606# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -591,6 +612,7 @@ CONFIG_SCSI_LOWLEVEL=y
591# CONFIG_SCSI_AIC79XX is not set 612# CONFIG_SCSI_AIC79XX is not set
592# CONFIG_SCSI_AIC94XX is not set 613# CONFIG_SCSI_AIC94XX is not set
593# CONFIG_SCSI_DPT_I2O is not set 614# CONFIG_SCSI_DPT_I2O is not set
615# CONFIG_SCSI_ADVANSYS is not set
594# CONFIG_SCSI_ARCMSR is not set 616# CONFIG_SCSI_ARCMSR is not set
595# CONFIG_MEGARAID_NEWGEN is not set 617# CONFIG_MEGARAID_NEWGEN is not set
596# CONFIG_MEGARAID_LEGACY is not set 618# CONFIG_MEGARAID_LEGACY is not set
@@ -658,6 +680,7 @@ CONFIG_PATA_IT821X=y
658# CONFIG_PATA_OLDPIIX is not set 680# CONFIG_PATA_OLDPIIX is not set
659# CONFIG_PATA_NETCELL is not set 681# CONFIG_PATA_NETCELL is not set
660# CONFIG_PATA_NS87410 is not set 682# CONFIG_PATA_NS87410 is not set
683# CONFIG_PATA_NS87415 is not set
661# CONFIG_PATA_OPTI is not set 684# CONFIG_PATA_OPTI is not set
662# CONFIG_PATA_OPTIDMA is not set 685# CONFIG_PATA_OPTIDMA is not set
663# CONFIG_PATA_PDC_OLD is not set 686# CONFIG_PATA_PDC_OLD is not set
@@ -671,14 +694,7 @@ CONFIG_PATA_SIL680=y
671# CONFIG_PATA_VIA is not set 694# CONFIG_PATA_VIA is not set
672# CONFIG_PATA_WINBOND is not set 695# CONFIG_PATA_WINBOND is not set
673# CONFIG_MD is not set 696# CONFIG_MD is not set
674
675#
676# Fusion MPT device support
677#
678# CONFIG_FUSION is not set 697# CONFIG_FUSION is not set
679# CONFIG_FUSION_SPI is not set
680# CONFIG_FUSION_FC is not set
681# CONFIG_FUSION_SAS is not set
682 698
683# 699#
684# IEEE 1394 (FireWire) support 700# IEEE 1394 (FireWire) support
@@ -694,6 +710,8 @@ CONFIG_NETDEVICES=y
694# CONFIG_MACVLAN is not set 710# CONFIG_MACVLAN is not set
695# CONFIG_EQUALIZER is not set 711# CONFIG_EQUALIZER is not set
696CONFIG_TUN=m 712CONFIG_TUN=m
713# CONFIG_VETH is not set
714# CONFIG_IP1000 is not set
697# CONFIG_ARCNET is not set 715# CONFIG_ARCNET is not set
698# CONFIG_PHYLIB is not set 716# CONFIG_PHYLIB is not set
699CONFIG_NET_ETHERNET=y 717CONFIG_NET_ETHERNET=y
@@ -713,11 +731,17 @@ CONFIG_TULIP_MMIO=y
713# CONFIG_DM9102 is not set 731# CONFIG_DM9102 is not set
714# CONFIG_ULI526X is not set 732# CONFIG_ULI526X is not set
715# CONFIG_HP100 is not set 733# CONFIG_HP100 is not set
734# CONFIG_IBM_NEW_EMAC_ZMII is not set
735# CONFIG_IBM_NEW_EMAC_RGMII is not set
736# CONFIG_IBM_NEW_EMAC_TAH is not set
737# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
716# CONFIG_NET_PCI is not set 738# CONFIG_NET_PCI is not set
739# CONFIG_B44 is not set
717CONFIG_NETDEV_1000=y 740CONFIG_NETDEV_1000=y
718# CONFIG_ACENIC is not set 741# CONFIG_ACENIC is not set
719# CONFIG_DL2K is not set 742# CONFIG_DL2K is not set
720# CONFIG_E1000 is not set 743# CONFIG_E1000 is not set
744# CONFIG_E1000E is not set
721# CONFIG_NS83820 is not set 745# CONFIG_NS83820 is not set
722# CONFIG_HAMACHI is not set 746# CONFIG_HAMACHI is not set
723# CONFIG_YELLOWFIN is not set 747# CONFIG_YELLOWFIN is not set
@@ -726,19 +750,24 @@ CONFIG_R8169=y
726# CONFIG_SIS190 is not set 750# CONFIG_SIS190 is not set
727# CONFIG_SKGE is not set 751# CONFIG_SKGE is not set
728# CONFIG_SKY2 is not set 752# CONFIG_SKY2 is not set
753# CONFIG_SK98LIN is not set
729# CONFIG_VIA_VELOCITY is not set 754# CONFIG_VIA_VELOCITY is not set
730# CONFIG_TIGON3 is not set 755# CONFIG_TIGON3 is not set
731# CONFIG_BNX2 is not set 756# CONFIG_BNX2 is not set
757# CONFIG_MV643XX_ETH is not set
732# CONFIG_QLA3XXX is not set 758# CONFIG_QLA3XXX is not set
733# CONFIG_ATL1 is not set 759# CONFIG_ATL1 is not set
734CONFIG_NETDEV_10000=y 760CONFIG_NETDEV_10000=y
735# CONFIG_CHELSIO_T1 is not set 761# CONFIG_CHELSIO_T1 is not set
736# CONFIG_CHELSIO_T3 is not set 762# CONFIG_CHELSIO_T3 is not set
763# CONFIG_IXGBE is not set
737# CONFIG_IXGB is not set 764# CONFIG_IXGB is not set
738# CONFIG_S2IO is not set 765# CONFIG_S2IO is not set
739# CONFIG_MYRI10GE is not set 766# CONFIG_MYRI10GE is not set
740# CONFIG_NETXEN_NIC is not set 767# CONFIG_NETXEN_NIC is not set
768# CONFIG_NIU is not set
741# CONFIG_MLX4_CORE is not set 769# CONFIG_MLX4_CORE is not set
770# CONFIG_TEHUTI is not set
742# CONFIG_TR is not set 771# CONFIG_TR is not set
743 772
744# 773#
@@ -754,7 +783,6 @@ CONFIG_NETDEV_10000=y
754# CONFIG_USB_KAWETH is not set 783# CONFIG_USB_KAWETH is not set
755# CONFIG_USB_PEGASUS is not set 784# CONFIG_USB_PEGASUS is not set
756# CONFIG_USB_RTL8150 is not set 785# CONFIG_USB_RTL8150 is not set
757# CONFIG_USB_USBNET_MII is not set
758# CONFIG_USB_USBNET is not set 786# CONFIG_USB_USBNET is not set
759# CONFIG_WAN is not set 787# CONFIG_WAN is not set
760# CONFIG_FDDI is not set 788# CONFIG_FDDI is not set
@@ -764,6 +792,7 @@ CONFIG_NETDEV_10000=y
764# CONFIG_NET_FC is not set 792# CONFIG_NET_FC is not set
765# CONFIG_SHAPER is not set 793# CONFIG_SHAPER is not set
766CONFIG_NETCONSOLE=y 794CONFIG_NETCONSOLE=y
795# CONFIG_NETCONSOLE_DYNAMIC is not set
767CONFIG_NETPOLL=y 796CONFIG_NETPOLL=y
768# CONFIG_NETPOLL_TRAP is not set 797# CONFIG_NETPOLL_TRAP is not set
769CONFIG_NET_POLL_CONTROLLER=y 798CONFIG_NET_POLL_CONTROLLER=y
@@ -785,7 +814,6 @@ CONFIG_INPUT_MOUSEDEV=y
785CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 814CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
786CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 815CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
787# CONFIG_INPUT_JOYDEV is not set 816# CONFIG_INPUT_JOYDEV is not set
788# CONFIG_INPUT_TSDEV is not set
789CONFIG_INPUT_EVDEV=m 817CONFIG_INPUT_EVDEV=m
790# CONFIG_INPUT_EVBUG is not set 818# CONFIG_INPUT_EVBUG is not set
791 819
@@ -846,14 +874,11 @@ CONFIG_UNIX98_PTYS=y
846CONFIG_LEGACY_PTYS=y 874CONFIG_LEGACY_PTYS=y
847CONFIG_LEGACY_PTY_COUNT=256 875CONFIG_LEGACY_PTY_COUNT=256
848# CONFIG_IPMI_HANDLER is not set 876# CONFIG_IPMI_HANDLER is not set
849# CONFIG_WATCHDOG is not set
850CONFIG_HW_RANDOM=y 877CONFIG_HW_RANDOM=y
851# CONFIG_NVRAM is not set 878# CONFIG_NVRAM is not set
852# CONFIG_GEN_RTC is not set 879# CONFIG_GEN_RTC is not set
853# CONFIG_R3964 is not set 880# CONFIG_R3964 is not set
854# CONFIG_APPLICOM is not set 881# CONFIG_APPLICOM is not set
855# CONFIG_AGP is not set
856# CONFIG_DRM is not set
857# CONFIG_RAW_DRIVER is not set 882# CONFIG_RAW_DRIVER is not set
858# CONFIG_TCG_TPM is not set 883# CONFIG_TCG_TPM is not set
859CONFIG_DEVPORT=y 884CONFIG_DEVPORT=y
@@ -923,8 +948,6 @@ CONFIG_SENSORS_EEPROM=m
923# CONFIG_POWER_SUPPLY is not set 948# CONFIG_POWER_SUPPLY is not set
924CONFIG_HWMON=y 949CONFIG_HWMON=y
925# CONFIG_HWMON_VID is not set 950# CONFIG_HWMON_VID is not set
926# CONFIG_SENSORS_ABITUGURU is not set
927# CONFIG_SENSORS_ABITUGURU3 is not set
928# CONFIG_SENSORS_AD7418 is not set 951# CONFIG_SENSORS_AD7418 is not set
929# CONFIG_SENSORS_ADM1021 is not set 952# CONFIG_SENSORS_ADM1021 is not set
930# CONFIG_SENSORS_ADM1025 is not set 953# CONFIG_SENSORS_ADM1025 is not set
@@ -932,12 +955,13 @@ CONFIG_HWMON=y
932# CONFIG_SENSORS_ADM1029 is not set 955# CONFIG_SENSORS_ADM1029 is not set
933# CONFIG_SENSORS_ADM1031 is not set 956# CONFIG_SENSORS_ADM1031 is not set
934# CONFIG_SENSORS_ADM9240 is not set 957# CONFIG_SENSORS_ADM9240 is not set
935# CONFIG_SENSORS_ASB100 is not set 958# CONFIG_SENSORS_ADT7470 is not set
936# CONFIG_SENSORS_ATXP1 is not set 959# CONFIG_SENSORS_ATXP1 is not set
937# CONFIG_SENSORS_DS1621 is not set 960# CONFIG_SENSORS_DS1621 is not set
961# CONFIG_SENSORS_I5K_AMB is not set
938# CONFIG_SENSORS_F71805F is not set 962# CONFIG_SENSORS_F71805F is not set
939# CONFIG_SENSORS_FSCHER is not set 963# CONFIG_SENSORS_F71882FG is not set
940# CONFIG_SENSORS_FSCPOS is not set 964# CONFIG_SENSORS_F75375S is not set
941# CONFIG_SENSORS_GL518SM is not set 965# CONFIG_SENSORS_GL518SM is not set
942# CONFIG_SENSORS_GL520SM is not set 966# CONFIG_SENSORS_GL520SM is not set
943# CONFIG_SENSORS_IT87 is not set 967# CONFIG_SENSORS_IT87 is not set
@@ -973,6 +997,13 @@ CONFIG_HWMON=y
973# CONFIG_SENSORS_W83627HF is not set 997# CONFIG_SENSORS_W83627HF is not set
974# CONFIG_SENSORS_W83627EHF is not set 998# CONFIG_SENSORS_W83627EHF is not set
975# CONFIG_HWMON_DEBUG_CHIP is not set 999# CONFIG_HWMON_DEBUG_CHIP is not set
1000# CONFIG_WATCHDOG is not set
1001
1002#
1003# Sonics Silicon Backplane
1004#
1005CONFIG_SSB_POSSIBLE=y
1006# CONFIG_SSB is not set
976 1007
977# 1008#
978# Multifunction device drivers 1009# Multifunction device drivers
@@ -989,16 +1020,17 @@ CONFIG_HWMON=y
989# 1020#
990# Graphics support 1021# Graphics support
991# 1022#
1023# CONFIG_AGP is not set
1024# CONFIG_DRM is not set
1025# CONFIG_VGASTATE is not set
1026CONFIG_VIDEO_OUTPUT_CONTROL=m
1027# CONFIG_FB is not set
992# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1028# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
993 1029
994# 1030#
995# Display device support 1031# Display device support
996# 1032#
997# CONFIG_DISPLAY_SUPPORT is not set 1033# CONFIG_DISPLAY_SUPPORT is not set
998# CONFIG_VGASTATE is not set
999CONFIG_VIDEO_OUTPUT_CONTROL=m
1000# CONFIG_FB is not set
1001# CONFIG_FB_IBM_GXT4500 is not set
1002 1034
1003# 1035#
1004# Console display driver support 1036# Console display driver support
@@ -1013,6 +1045,7 @@ CONFIG_DUMMY_CONSOLE=y
1013CONFIG_HID_SUPPORT=y 1045CONFIG_HID_SUPPORT=y
1014CONFIG_HID=m 1046CONFIG_HID=m
1015# CONFIG_HID_DEBUG is not set 1047# CONFIG_HID_DEBUG is not set
1048# CONFIG_HIDRAW is not set
1016 1049
1017# 1050#
1018# USB Input Devices 1051# USB Input Devices
@@ -1076,6 +1109,7 @@ CONFIG_USB_STORAGE=m
1076# CONFIG_USB_STORAGE_DEBUG is not set 1109# CONFIG_USB_STORAGE_DEBUG is not set
1077# CONFIG_USB_STORAGE_DATAFAB is not set 1110# CONFIG_USB_STORAGE_DATAFAB is not set
1078# CONFIG_USB_STORAGE_FREECOM is not set 1111# CONFIG_USB_STORAGE_FREECOM is not set
1112# CONFIG_USB_STORAGE_ISD200 is not set
1079# CONFIG_USB_STORAGE_DPCM is not set 1113# CONFIG_USB_STORAGE_DPCM is not set
1080# CONFIG_USB_STORAGE_USBAT is not set 1114# CONFIG_USB_STORAGE_USBAT is not set
1081# CONFIG_USB_STORAGE_SDDR09 is not set 1115# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -1107,6 +1141,7 @@ CONFIG_USB_SERIAL_CONSOLE=y
1107# CONFIG_USB_SERIAL_AIRPRIME is not set 1141# CONFIG_USB_SERIAL_AIRPRIME is not set
1108# CONFIG_USB_SERIAL_ARK3116 is not set 1142# CONFIG_USB_SERIAL_ARK3116 is not set
1109# CONFIG_USB_SERIAL_BELKIN is not set 1143# CONFIG_USB_SERIAL_BELKIN is not set
1144# CONFIG_USB_SERIAL_CH341 is not set
1110# CONFIG_USB_SERIAL_WHITEHEAT is not set 1145# CONFIG_USB_SERIAL_WHITEHEAT is not set
1111# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1146# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1112# CONFIG_USB_SERIAL_CP2101 is not set 1147# CONFIG_USB_SERIAL_CP2101 is not set
@@ -1196,6 +1231,7 @@ CONFIG_RTC_INTF_DEV=y
1196# I2C RTC drivers 1231# I2C RTC drivers
1197# 1232#
1198# CONFIG_RTC_DRV_DS1307 is not set 1233# CONFIG_RTC_DRV_DS1307 is not set
1234# CONFIG_RTC_DRV_DS1374 is not set
1199# CONFIG_RTC_DRV_DS1672 is not set 1235# CONFIG_RTC_DRV_DS1672 is not set
1200# CONFIG_RTC_DRV_MAX6900 is not set 1236# CONFIG_RTC_DRV_MAX6900 is not set
1201CONFIG_RTC_DRV_RS5C372=y 1237CONFIG_RTC_DRV_RS5C372=y
@@ -1225,19 +1261,6 @@ CONFIG_RTC_DRV_RS5C372=y
1225# 1261#
1226 1262
1227# 1263#
1228# DMA Engine support
1229#
1230# CONFIG_DMA_ENGINE is not set
1231
1232#
1233# DMA Clients
1234#
1235
1236#
1237# DMA Devices
1238#
1239
1240#
1241# Userspace I/O 1264# Userspace I/O
1242# 1265#
1243# CONFIG_UIO is not set 1266# CONFIG_UIO is not set
@@ -1254,7 +1277,6 @@ CONFIG_EXT3_FS_XATTR=y
1254# CONFIG_EXT3_FS_SECURITY is not set 1277# CONFIG_EXT3_FS_SECURITY is not set
1255# CONFIG_EXT4DEV_FS is not set 1278# CONFIG_EXT4DEV_FS is not set
1256CONFIG_JBD=y 1279CONFIG_JBD=y
1257# CONFIG_JBD_DEBUG is not set
1258CONFIG_FS_MBCACHE=y 1280CONFIG_FS_MBCACHE=y
1259# CONFIG_REISERFS_FS is not set 1281# CONFIG_REISERFS_FS is not set
1260# CONFIG_JFS_FS is not set 1282# CONFIG_JFS_FS is not set
@@ -1307,7 +1329,6 @@ CONFIG_SYSFS=y
1307CONFIG_TMPFS=y 1329CONFIG_TMPFS=y
1308# CONFIG_TMPFS_POSIX_ACL is not set 1330# CONFIG_TMPFS_POSIX_ACL is not set
1309# CONFIG_HUGETLB_PAGE is not set 1331# CONFIG_HUGETLB_PAGE is not set
1310CONFIG_RAMFS=y
1311# CONFIG_CONFIGFS_FS is not set 1332# CONFIG_CONFIGFS_FS is not set
1312 1333
1313# 1334#
@@ -1327,10 +1348,7 @@ CONFIG_RAMFS=y
1327# CONFIG_QNX4FS_FS is not set 1348# CONFIG_QNX4FS_FS is not set
1328# CONFIG_SYSV_FS is not set 1349# CONFIG_SYSV_FS is not set
1329# CONFIG_UFS_FS is not set 1350# CONFIG_UFS_FS is not set
1330 1351CONFIG_NETWORK_FILESYSTEMS=y
1331#
1332# Network File Systems
1333#
1334CONFIG_NFS_FS=y 1352CONFIG_NFS_FS=y
1335CONFIG_NFS_V3=y 1353CONFIG_NFS_V3=y
1336CONFIG_NFS_V3_ACL=y 1354CONFIG_NFS_V3_ACL=y
@@ -1368,10 +1386,6 @@ CONFIG_CIFS=m
1368# 1386#
1369# CONFIG_PARTITION_ADVANCED is not set 1387# CONFIG_PARTITION_ADVANCED is not set
1370CONFIG_MSDOS_PARTITION=y 1388CONFIG_MSDOS_PARTITION=y
1371
1372#
1373# Native Language Support
1374#
1375CONFIG_NLS=m 1389CONFIG_NLS=m
1376CONFIG_NLS_DEFAULT="iso8859-1" 1390CONFIG_NLS_DEFAULT="iso8859-1"
1377CONFIG_NLS_CODEPAGE_437=m 1391CONFIG_NLS_CODEPAGE_437=m
@@ -1412,10 +1426,6 @@ CONFIG_NLS_ISO8859_1=m
1412# CONFIG_NLS_KOI8_R is not set 1426# CONFIG_NLS_KOI8_R is not set
1413# CONFIG_NLS_KOI8_U is not set 1427# CONFIG_NLS_KOI8_U is not set
1414CONFIG_NLS_UTF8=m 1428CONFIG_NLS_UTF8=m
1415
1416#
1417# Distributed Lock Manager
1418#
1419# CONFIG_DLM is not set 1429# CONFIG_DLM is not set
1420# CONFIG_UCC_SLOW is not set 1430# CONFIG_UCC_SLOW is not set
1421 1431
@@ -1437,18 +1447,13 @@ CONFIG_PLIST=y
1437CONFIG_HAS_IOMEM=y 1447CONFIG_HAS_IOMEM=y
1438CONFIG_HAS_IOPORT=y 1448CONFIG_HAS_IOPORT=y
1439CONFIG_HAS_DMA=y 1449CONFIG_HAS_DMA=y
1440 1450# CONFIG_INSTRUMENTATION is not set
1441#
1442# Instrumentation Support
1443#
1444CONFIG_PROFILING=y
1445CONFIG_OPROFILE=m
1446# CONFIG_KPROBES is not set
1447 1451
1448# 1452#
1449# Kernel hacking 1453# Kernel hacking
1450# 1454#
1451# CONFIG_PRINTK_TIME is not set 1455# CONFIG_PRINTK_TIME is not set
1456CONFIG_ENABLE_WARN_DEPRECATED=y
1452CONFIG_ENABLE_MUST_CHECK=y 1457CONFIG_ENABLE_MUST_CHECK=y
1453CONFIG_MAGIC_SYSRQ=y 1458CONFIG_MAGIC_SYSRQ=y
1454# CONFIG_UNUSED_SYMBOLS is not set 1459# CONFIG_UNUSED_SYMBOLS is not set
@@ -1472,14 +1477,18 @@ CONFIG_DEBUG_BUGVERBOSE=y
1472# CONFIG_DEBUG_INFO is not set 1477# CONFIG_DEBUG_INFO is not set
1473# CONFIG_DEBUG_VM is not set 1478# CONFIG_DEBUG_VM is not set
1474# CONFIG_DEBUG_LIST is not set 1479# CONFIG_DEBUG_LIST is not set
1480# CONFIG_DEBUG_SG is not set
1475CONFIG_FORCED_INLINING=y 1481CONFIG_FORCED_INLINING=y
1482# CONFIG_BOOT_PRINTK_DELAY is not set
1476# CONFIG_RCU_TORTURE_TEST is not set 1483# CONFIG_RCU_TORTURE_TEST is not set
1477# CONFIG_FAULT_INJECTION is not set 1484# CONFIG_FAULT_INJECTION is not set
1485# CONFIG_SAMPLES is not set
1478# CONFIG_DEBUG_STACKOVERFLOW is not set 1486# CONFIG_DEBUG_STACKOVERFLOW is not set
1479# CONFIG_DEBUG_STACK_USAGE is not set 1487# CONFIG_DEBUG_STACK_USAGE is not set
1480# CONFIG_DEBUG_PAGEALLOC is not set 1488# CONFIG_DEBUG_PAGEALLOC is not set
1481# CONFIG_DEBUGGER is not set 1489# CONFIG_DEBUGGER is not set
1482# CONFIG_BDI_SWITCH is not set 1490# CONFIG_BDI_SWITCH is not set
1491# CONFIG_BOOTX_TEXT is not set
1483# CONFIG_PPC_EARLY_DEBUG is not set 1492# CONFIG_PPC_EARLY_DEBUG is not set
1484 1493
1485# 1494#
@@ -1487,6 +1496,7 @@ CONFIG_FORCED_INLINING=y
1487# 1496#
1488# CONFIG_KEYS is not set 1497# CONFIG_KEYS is not set
1489# CONFIG_SECURITY is not set 1498# CONFIG_SECURITY is not set
1499# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1490CONFIG_CRYPTO=y 1500CONFIG_CRYPTO=y
1491CONFIG_CRYPTO_ALGAPI=y 1501CONFIG_CRYPTO_ALGAPI=y
1492CONFIG_CRYPTO_BLKCIPHER=y 1502CONFIG_CRYPTO_BLKCIPHER=y
@@ -1506,6 +1516,7 @@ CONFIG_CRYPTO_ECB=m
1506CONFIG_CRYPTO_CBC=y 1516CONFIG_CRYPTO_CBC=y
1507CONFIG_CRYPTO_PCBC=m 1517CONFIG_CRYPTO_PCBC=m
1508# CONFIG_CRYPTO_LRW is not set 1518# CONFIG_CRYPTO_LRW is not set
1519# CONFIG_CRYPTO_XTS is not set
1509# CONFIG_CRYPTO_CRYPTD is not set 1520# CONFIG_CRYPTO_CRYPTD is not set
1510CONFIG_CRYPTO_DES=y 1521CONFIG_CRYPTO_DES=y
1511# CONFIG_CRYPTO_FCRYPT is not set 1522# CONFIG_CRYPTO_FCRYPT is not set
@@ -1520,9 +1531,12 @@ CONFIG_CRYPTO_AES=m
1520CONFIG_CRYPTO_ARC4=m 1531CONFIG_CRYPTO_ARC4=m
1521# CONFIG_CRYPTO_KHAZAD is not set 1532# CONFIG_CRYPTO_KHAZAD is not set
1522# CONFIG_CRYPTO_ANUBIS is not set 1533# CONFIG_CRYPTO_ANUBIS is not set
1534# CONFIG_CRYPTO_SEED is not set
1523CONFIG_CRYPTO_DEFLATE=m 1535CONFIG_CRYPTO_DEFLATE=m
1524CONFIG_CRYPTO_MICHAEL_MIC=m 1536CONFIG_CRYPTO_MICHAEL_MIC=m
1525CONFIG_CRYPTO_CRC32C=m 1537CONFIG_CRYPTO_CRC32C=m
1526# CONFIG_CRYPTO_CAMELLIA is not set 1538# CONFIG_CRYPTO_CAMELLIA is not set
1527# CONFIG_CRYPTO_TEST is not set 1539# CONFIG_CRYPTO_TEST is not set
1540# CONFIG_CRYPTO_AUTHENC is not set
1528CONFIG_CRYPTO_HW=y 1541CONFIG_CRYPTO_HW=y
1542# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index dd78ed955eb0..02bb7e5d8ed5 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:38 2007 4# Thu Dec 6 16:48:24 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125CONFIG_PPC_MULTIPLATFORM=y 132CONFIG_PPC_MULTIPLATFORM=y
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128# CONFIG_PPC_83xx is not set 134# CONFIG_PPC_83xx is not set
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -138,6 +144,7 @@ CONFIG_PPC_LITE5200=y
138# CONFIG_PPC_CELL is not set 144# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 145# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PQ2ADS is not set 146# CONFIG_PQ2ADS is not set
147# CONFIG_EMBEDDED6xx is not set
141# CONFIG_MPIC is not set 148# CONFIG_MPIC is not set
142# CONFIG_MPIC_WEIRD is not set 149# CONFIG_MPIC_WEIRD is not set
143# CONFIG_PPC_I8259 is not set 150# CONFIG_PPC_I8259 is not set
@@ -151,11 +158,19 @@ CONFIG_PPC_LITE5200=y
151# CONFIG_TAU is not set 158# CONFIG_TAU is not set
152# CONFIG_CPM2 is not set 159# CONFIG_CPM2 is not set
153# CONFIG_FSL_ULI1575 is not set 160# CONFIG_FSL_ULI1575 is not set
161CONFIG_PPC_BESTCOMM=y
162CONFIG_PPC_BESTCOMM_ATA=y
163CONFIG_PPC_BESTCOMM_FEC=y
164CONFIG_PPC_BESTCOMM_GEN_BD=y
154 165
155# 166#
156# Kernel options 167# Kernel options
157# 168#
158# CONFIG_HIGHMEM is not set 169# CONFIG_HIGHMEM is not set
170CONFIG_TICK_ONESHOT=y
171CONFIG_NO_HZ=y
172CONFIG_HIGH_RES_TIMERS=y
173CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 174# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 175CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 176# CONFIG_HZ_300 is not set
@@ -177,6 +192,7 @@ CONFIG_FLATMEM_MANUAL=y
177CONFIG_FLATMEM=y 192CONFIG_FLATMEM=y
178CONFIG_FLAT_NODE_MEM_MAP=y 193CONFIG_FLAT_NODE_MEM_MAP=y
179# CONFIG_SPARSEMEM_STATIC is not set 194# CONFIG_SPARSEMEM_STATIC is not set
195# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
180CONFIG_SPLIT_PTLOCK_CPUS=4 196CONFIG_SPLIT_PTLOCK_CPUS=4
181# CONFIG_RESOURCES_64BIT is not set 197# CONFIG_RESOURCES_64BIT is not set
182CONFIG_ZONE_DMA_FLAG=1 198CONFIG_ZONE_DMA_FLAG=1
@@ -188,10 +204,13 @@ CONFIG_PM=y
188# CONFIG_PM_LEGACY is not set 204# CONFIG_PM_LEGACY is not set
189# CONFIG_PM_DEBUG is not set 205# CONFIG_PM_DEBUG is not set
190CONFIG_PM_SLEEP=y 206CONFIG_PM_SLEEP=y
207CONFIG_SUSPEND_UP_POSSIBLE=y
191CONFIG_SUSPEND=y 208CONFIG_SUSPEND=y
209CONFIG_HIBERNATION_UP_POSSIBLE=y
192# CONFIG_HIBERNATION is not set 210# CONFIG_HIBERNATION is not set
193CONFIG_SECCOMP=y 211CONFIG_SECCOMP=y
194# CONFIG_WANT_DEVICE_TREE is not set 212CONFIG_WANT_DEVICE_TREE=y
213CONFIG_DEVICE_TREE=""
195CONFIG_ISA_DMA_API=y 214CONFIG_ISA_DMA_API=y
196 215
197# 216#
@@ -207,11 +226,8 @@ CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 226# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 227CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 228# CONFIG_PCI_MSI is not set
229CONFIG_PCI_LEGACY=y
210# CONFIG_PCI_DEBUG is not set 230# CONFIG_PCI_DEBUG is not set
211
212#
213# PCCARD (PCMCIA/CardBus) support
214#
215# CONFIG_PCCARD is not set 231# CONFIG_PCCARD is not set
216# CONFIG_HOTPLUG_PCI is not set 232# CONFIG_HOTPLUG_PCI is not set
217 233
@@ -226,7 +242,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
226CONFIG_HIGHMEM_START=0xfe000000 242CONFIG_HIGHMEM_START=0xfe000000
227CONFIG_LOWMEM_SIZE=0x30000000 243CONFIG_LOWMEM_SIZE=0x30000000
228CONFIG_KERNEL_START=0xc0000000 244CONFIG_KERNEL_START=0xc0000000
229CONFIG_TASK_SIZE=0x80000000 245CONFIG_TASK_SIZE=0xc0000000
230CONFIG_BOOT_LOAD=0x00800000 246CONFIG_BOOT_LOAD=0x00800000
231 247
232# 248#
@@ -266,6 +282,7 @@ CONFIG_SYN_COOKIES=y
266CONFIG_INET_XFRM_MODE_TRANSPORT=y 282CONFIG_INET_XFRM_MODE_TRANSPORT=y
267CONFIG_INET_XFRM_MODE_TUNNEL=y 283CONFIG_INET_XFRM_MODE_TUNNEL=y
268CONFIG_INET_XFRM_MODE_BEET=y 284CONFIG_INET_XFRM_MODE_BEET=y
285# CONFIG_INET_LRO is not set
269CONFIG_INET_DIAG=y 286CONFIG_INET_DIAG=y
270CONFIG_INET_TCP_DIAG=y 287CONFIG_INET_TCP_DIAG=y
271# CONFIG_TCP_CONG_ADVANCED is not set 288# CONFIG_TCP_CONG_ADVANCED is not set
@@ -291,10 +308,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_LAPB is not set 308# CONFIG_LAPB is not set
292# CONFIG_ECONET is not set 309# CONFIG_ECONET is not set
293# CONFIG_WAN_ROUTER is not set 310# CONFIG_WAN_ROUTER is not set
294
295#
296# QoS and/or fair queueing
297#
298# CONFIG_NET_SCHED is not set 311# CONFIG_NET_SCHED is not set
299 312
300# 313#
@@ -323,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# 336#
324# Generic Driver Options 337# Generic Driver Options
325# 338#
339CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
326CONFIG_STANDALONE=y 340CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 341CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set 342# CONFIG_FW_LOADER is not set
@@ -393,6 +407,7 @@ CONFIG_SCSI_WAIT_SCAN=m
393# CONFIG_SCSI_FC_ATTRS is not set 407# CONFIG_SCSI_FC_ATTRS is not set
394# CONFIG_SCSI_ISCSI_ATTRS is not set 408# CONFIG_SCSI_ISCSI_ATTRS is not set
395# CONFIG_SCSI_SAS_LIBSAS is not set 409# CONFIG_SCSI_SAS_LIBSAS is not set
410# CONFIG_SCSI_SRP_ATTRS is not set
396CONFIG_SCSI_LOWLEVEL=y 411CONFIG_SCSI_LOWLEVEL=y
397# CONFIG_ISCSI_TCP is not set 412# CONFIG_ISCSI_TCP is not set
398# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 413# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -404,6 +419,7 @@ CONFIG_SCSI_LOWLEVEL=y
404# CONFIG_SCSI_AIC79XX is not set 419# CONFIG_SCSI_AIC79XX is not set
405# CONFIG_SCSI_AIC94XX is not set 420# CONFIG_SCSI_AIC94XX is not set
406# CONFIG_SCSI_DPT_I2O is not set 421# CONFIG_SCSI_DPT_I2O is not set
422# CONFIG_SCSI_ADVANSYS is not set
407# CONFIG_SCSI_ARCMSR is not set 423# CONFIG_SCSI_ARCMSR is not set
408# CONFIG_MEGARAID_NEWGEN is not set 424# CONFIG_MEGARAID_NEWGEN is not set
409# CONFIG_MEGARAID_LEGACY is not set 425# CONFIG_MEGARAID_LEGACY is not set
@@ -472,6 +488,7 @@ CONFIG_PATA_MPC52xx=y
472# CONFIG_PATA_OLDPIIX is not set 488# CONFIG_PATA_OLDPIIX is not set
473# CONFIG_PATA_NETCELL is not set 489# CONFIG_PATA_NETCELL is not set
474# CONFIG_PATA_NS87410 is not set 490# CONFIG_PATA_NS87410 is not set
491# CONFIG_PATA_NS87415 is not set
475# CONFIG_PATA_OPTI is not set 492# CONFIG_PATA_OPTI is not set
476# CONFIG_PATA_OPTIDMA is not set 493# CONFIG_PATA_OPTIDMA is not set
477# CONFIG_PATA_PDC_OLD is not set 494# CONFIG_PATA_PDC_OLD is not set
@@ -486,14 +503,7 @@ CONFIG_PATA_MPC52xx=y
486# CONFIG_PATA_WINBOND is not set 503# CONFIG_PATA_WINBOND is not set
487# CONFIG_PATA_PLATFORM is not set 504# CONFIG_PATA_PLATFORM is not set
488# CONFIG_MD is not set 505# CONFIG_MD is not set
489
490#
491# Fusion MPT device support
492#
493# CONFIG_FUSION is not set 506# CONFIG_FUSION is not set
494# CONFIG_FUSION_SPI is not set
495# CONFIG_FUSION_FC is not set
496# CONFIG_FUSION_SAS is not set
497 507
498# 508#
499# IEEE 1394 (FireWire) support 509# IEEE 1394 (FireWire) support
@@ -509,12 +519,15 @@ CONFIG_NETDEVICES=y
509# CONFIG_MACVLAN is not set 519# CONFIG_MACVLAN is not set
510# CONFIG_EQUALIZER is not set 520# CONFIG_EQUALIZER is not set
511# CONFIG_TUN is not set 521# CONFIG_TUN is not set
522# CONFIG_VETH is not set
523# CONFIG_IP1000 is not set
512# CONFIG_ARCNET is not set 524# CONFIG_ARCNET is not set
513# CONFIG_NET_ETHERNET is not set 525# CONFIG_NET_ETHERNET is not set
514CONFIG_NETDEV_1000=y 526CONFIG_NETDEV_1000=y
515# CONFIG_ACENIC is not set 527# CONFIG_ACENIC is not set
516# CONFIG_DL2K is not set 528# CONFIG_DL2K is not set
517# CONFIG_E1000 is not set 529# CONFIG_E1000 is not set
530# CONFIG_E1000E is not set
518# CONFIG_NS83820 is not set 531# CONFIG_NS83820 is not set
519# CONFIG_HAMACHI is not set 532# CONFIG_HAMACHI is not set
520# CONFIG_YELLOWFIN is not set 533# CONFIG_YELLOWFIN is not set
@@ -522,6 +535,7 @@ CONFIG_NETDEV_1000=y
522# CONFIG_SIS190 is not set 535# CONFIG_SIS190 is not set
523# CONFIG_SKGE is not set 536# CONFIG_SKGE is not set
524# CONFIG_SKY2 is not set 537# CONFIG_SKY2 is not set
538# CONFIG_SK98LIN is not set
525# CONFIG_VIA_VELOCITY is not set 539# CONFIG_VIA_VELOCITY is not set
526# CONFIG_TIGON3 is not set 540# CONFIG_TIGON3 is not set
527# CONFIG_BNX2 is not set 541# CONFIG_BNX2 is not set
@@ -531,11 +545,14 @@ CONFIG_NETDEV_1000=y
531CONFIG_NETDEV_10000=y 545CONFIG_NETDEV_10000=y
532# CONFIG_CHELSIO_T1 is not set 546# CONFIG_CHELSIO_T1 is not set
533# CONFIG_CHELSIO_T3 is not set 547# CONFIG_CHELSIO_T3 is not set
548# CONFIG_IXGBE is not set
534# CONFIG_IXGB is not set 549# CONFIG_IXGB is not set
535# CONFIG_S2IO is not set 550# CONFIG_S2IO is not set
536# CONFIG_MYRI10GE is not set 551# CONFIG_MYRI10GE is not set
537# CONFIG_NETXEN_NIC is not set 552# CONFIG_NETXEN_NIC is not set
553# CONFIG_NIU is not set
538# CONFIG_MLX4_CORE is not set 554# CONFIG_MLX4_CORE is not set
555# CONFIG_TEHUTI is not set
539# CONFIG_TR is not set 556# CONFIG_TR is not set
540 557
541# 558#
@@ -592,14 +609,11 @@ CONFIG_UNIX98_PTYS=y
592CONFIG_LEGACY_PTYS=y 609CONFIG_LEGACY_PTYS=y
593CONFIG_LEGACY_PTY_COUNT=256 610CONFIG_LEGACY_PTY_COUNT=256
594# CONFIG_IPMI_HANDLER is not set 611# CONFIG_IPMI_HANDLER is not set
595# CONFIG_WATCHDOG is not set
596# CONFIG_HW_RANDOM is not set 612# CONFIG_HW_RANDOM is not set
597# CONFIG_NVRAM is not set 613# CONFIG_NVRAM is not set
598# CONFIG_GEN_RTC is not set 614# CONFIG_GEN_RTC is not set
599# CONFIG_R3964 is not set 615# CONFIG_R3964 is not set
600# CONFIG_APPLICOM is not set 616# CONFIG_APPLICOM is not set
601# CONFIG_AGP is not set
602# CONFIG_DRM is not set
603# CONFIG_RAW_DRIVER is not set 617# CONFIG_RAW_DRIVER is not set
604# CONFIG_TCG_TPM is not set 618# CONFIG_TCG_TPM is not set
605CONFIG_DEVPORT=y 619CONFIG_DEVPORT=y
@@ -613,6 +627,13 @@ CONFIG_DEVPORT=y
613# CONFIG_W1 is not set 627# CONFIG_W1 is not set
614# CONFIG_POWER_SUPPLY is not set 628# CONFIG_POWER_SUPPLY is not set
615# CONFIG_HWMON is not set 629# CONFIG_HWMON is not set
630# CONFIG_WATCHDOG is not set
631
632#
633# Sonics Silicon Backplane
634#
635CONFIG_SSB_POSSIBLE=y
636# CONFIG_SSB is not set
616 637
617# 638#
618# Multifunction device drivers 639# Multifunction device drivers
@@ -629,16 +650,17 @@ CONFIG_DEVPORT=y
629# 650#
630# Graphics support 651# Graphics support
631# 652#
653# CONFIG_AGP is not set
654# CONFIG_DRM is not set
655# CONFIG_VGASTATE is not set
656CONFIG_VIDEO_OUTPUT_CONTROL=m
657# CONFIG_FB is not set
632# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 658# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
633 659
634# 660#
635# Display device support 661# Display device support
636# 662#
637# CONFIG_DISPLAY_SUPPORT is not set 663# CONFIG_DISPLAY_SUPPORT is not set
638# CONFIG_VGASTATE is not set
639CONFIG_VIDEO_OUTPUT_CONTROL=m
640# CONFIG_FB is not set
641# CONFIG_FB_IBM_GXT4500 is not set
642 664
643# 665#
644# Sound 666# Sound
@@ -665,19 +687,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
665# CONFIG_RTC_CLASS is not set 687# CONFIG_RTC_CLASS is not set
666 688
667# 689#
668# DMA Engine support
669#
670# CONFIG_DMA_ENGINE is not set
671
672#
673# DMA Clients
674#
675
676#
677# DMA Devices
678#
679
680#
681# Userspace I/O 690# Userspace I/O
682# 691#
683# CONFIG_UIO is not set 692# CONFIG_UIO is not set
@@ -694,7 +703,6 @@ CONFIG_EXT3_FS_XATTR=y
694# CONFIG_EXT3_FS_SECURITY is not set 703# CONFIG_EXT3_FS_SECURITY is not set
695# CONFIG_EXT4DEV_FS is not set 704# CONFIG_EXT4DEV_FS is not set
696CONFIG_JBD=y 705CONFIG_JBD=y
697# CONFIG_JBD_DEBUG is not set
698CONFIG_FS_MBCACHE=y 706CONFIG_FS_MBCACHE=y
699# CONFIG_REISERFS_FS is not set 707# CONFIG_REISERFS_FS is not set
700# CONFIG_JFS_FS is not set 708# CONFIG_JFS_FS is not set
@@ -735,7 +743,6 @@ CONFIG_SYSFS=y
735CONFIG_TMPFS=y 743CONFIG_TMPFS=y
736# CONFIG_TMPFS_POSIX_ACL is not set 744# CONFIG_TMPFS_POSIX_ACL is not set
737# CONFIG_HUGETLB_PAGE is not set 745# CONFIG_HUGETLB_PAGE is not set
738CONFIG_RAMFS=y
739# CONFIG_CONFIGFS_FS is not set 746# CONFIG_CONFIGFS_FS is not set
740 747
741# 748#
@@ -754,10 +761,7 @@ CONFIG_RAMFS=y
754# CONFIG_QNX4FS_FS is not set 761# CONFIG_QNX4FS_FS is not set
755# CONFIG_SYSV_FS is not set 762# CONFIG_SYSV_FS is not set
756# CONFIG_UFS_FS is not set 763# CONFIG_UFS_FS is not set
757 764CONFIG_NETWORK_FILESYSTEMS=y
758#
759# Network File Systems
760#
761# CONFIG_NFS_FS is not set 765# CONFIG_NFS_FS is not set
762# CONFIG_NFSD is not set 766# CONFIG_NFSD is not set
763# CONFIG_SMB_FS is not set 767# CONFIG_SMB_FS is not set
@@ -771,15 +775,7 @@ CONFIG_RAMFS=y
771# 775#
772# CONFIG_PARTITION_ADVANCED is not set 776# CONFIG_PARTITION_ADVANCED is not set
773CONFIG_MSDOS_PARTITION=y 777CONFIG_MSDOS_PARTITION=y
774
775#
776# Native Language Support
777#
778# CONFIG_NLS is not set 778# CONFIG_NLS is not set
779
780#
781# Distributed Lock Manager
782#
783# CONFIG_DLM is not set 779# CONFIG_DLM is not set
784# CONFIG_UCC_SLOW is not set 780# CONFIG_UCC_SLOW is not set
785 781
@@ -796,16 +792,13 @@ CONFIG_PLIST=y
796CONFIG_HAS_IOMEM=y 792CONFIG_HAS_IOMEM=y
797CONFIG_HAS_IOPORT=y 793CONFIG_HAS_IOPORT=y
798CONFIG_HAS_DMA=y 794CONFIG_HAS_DMA=y
799 795# CONFIG_INSTRUMENTATION is not set
800#
801# Instrumentation Support
802#
803# CONFIG_PROFILING is not set
804 796
805# 797#
806# Kernel hacking 798# Kernel hacking
807# 799#
808CONFIG_PRINTK_TIME=y 800CONFIG_PRINTK_TIME=y
801CONFIG_ENABLE_WARN_DEPRECATED=y
809CONFIG_ENABLE_MUST_CHECK=y 802CONFIG_ENABLE_MUST_CHECK=y
810# CONFIG_MAGIC_SYSRQ is not set 803# CONFIG_MAGIC_SYSRQ is not set
811# CONFIG_UNUSED_SYMBOLS is not set 804# CONFIG_UNUSED_SYMBOLS is not set
@@ -829,9 +822,12 @@ CONFIG_SCHED_DEBUG=y
829CONFIG_DEBUG_INFO=y 822CONFIG_DEBUG_INFO=y
830# CONFIG_DEBUG_VM is not set 823# CONFIG_DEBUG_VM is not set
831# CONFIG_DEBUG_LIST is not set 824# CONFIG_DEBUG_LIST is not set
825# CONFIG_DEBUG_SG is not set
832CONFIG_FORCED_INLINING=y 826CONFIG_FORCED_INLINING=y
827# CONFIG_BOOT_PRINTK_DELAY is not set
833# CONFIG_RCU_TORTURE_TEST is not set 828# CONFIG_RCU_TORTURE_TEST is not set
834# CONFIG_FAULT_INJECTION is not set 829# CONFIG_FAULT_INJECTION is not set
830# CONFIG_SAMPLES is not set
835# CONFIG_DEBUG_STACKOVERFLOW is not set 831# CONFIG_DEBUG_STACKOVERFLOW is not set
836# CONFIG_DEBUG_STACK_USAGE is not set 832# CONFIG_DEBUG_STACK_USAGE is not set
837# CONFIG_DEBUG_PAGEALLOC is not set 833# CONFIG_DEBUG_PAGEALLOC is not set
@@ -845,4 +841,7 @@ CONFIG_FORCED_INLINING=y
845# 841#
846# CONFIG_KEYS is not set 842# CONFIG_KEYS is not set
847# CONFIG_SECURITY is not set 843# CONFIG_SECURITY is not set
844# CONFIG_SECURITY_FILE_CAPABILITIES is not set
848# CONFIG_CRYPTO is not set 845# CONFIG_CRYPTO is not set
846CONFIG_PPC_CLOCK=y
847CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 84b9ab4a5a92..8b810d056440 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:38:16 2007 4# Thu Dec 6 16:48:26 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -10,6 +10,7 @@ CONFIG_PPC64=y
10# 10#
11CONFIG_POWER4_ONLY=y 11CONFIG_POWER4_ONLY=y
12CONFIG_POWER4=y 12CONFIG_POWER4=y
13# CONFIG_TUNE_CELL is not set
13CONFIG_PPC_FPU=y 14CONFIG_PPC_FPU=y
14# CONFIG_ALTIVEC is not set 15# CONFIG_ALTIVEC is not set
15CONFIG_PPC_STD_MMU=y 16CONFIG_PPC_STD_MMU=y
@@ -18,8 +19,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
18CONFIG_SMP=y 19CONFIG_SMP=y
19CONFIG_NR_CPUS=4 20CONFIG_NR_CPUS=4
20CONFIG_64BIT=y 21CONFIG_64BIT=y
22CONFIG_WORD_SIZE=64
21CONFIG_PPC_MERGE=y 23CONFIG_PPC_MERGE=y
22CONFIG_MMU=y 24CONFIG_MMU=y
25CONFIG_GENERIC_CMOS_UPDATE=y
26CONFIG_GENERIC_TIME=y
27CONFIG_GENERIC_TIME_VSYSCALL=y
28CONFIG_GENERIC_CLOCKEVENTS=y
23CONFIG_GENERIC_HARDIRQS=y 29CONFIG_GENERIC_HARDIRQS=y
24CONFIG_IRQ_PER_CPU=y 30CONFIG_IRQ_PER_CPU=y
25CONFIG_RWSEM_XCHGADD_ALGORITHM=y 31CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,11 +68,13 @@ CONFIG_POSIX_MQUEUE=y
62# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
64# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
66CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
67CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
68CONFIG_LOG_BUF_SHIFT=17 75CONFIG_LOG_BUF_SHIFT=17
69# CONFIG_CPUSETS is not set 76# CONFIG_CGROUPS is not set
77# CONFIG_FAIR_GROUP_SCHED is not set
70CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
72# CONFIG_BLK_DEV_INITRD is not set 80# CONFIG_BLK_DEV_INITRD is not set
@@ -86,7 +94,6 @@ CONFIG_FUTEX=y
86CONFIG_ANON_INODES=y 94CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 95CONFIG_EPOLL=y
88CONFIG_SIGNALFD=y 96CONFIG_SIGNALFD=y
89CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 98CONFIG_SHMEM=y
92CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
@@ -107,6 +114,7 @@ CONFIG_STOP_MACHINE=y
107CONFIG_BLOCK=y 114CONFIG_BLOCK=y
108# CONFIG_BLK_DEV_IO_TRACE is not set 115# CONFIG_BLK_DEV_IO_TRACE is not set
109# CONFIG_BLK_DEV_BSG is not set 116# CONFIG_BLK_DEV_BSG is not set
117CONFIG_BLOCK_COMPAT=y
110 118
111# 119#
112# IO Schedulers 120# IO Schedulers
@@ -125,7 +133,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
125# Platform support 133# Platform support
126# 134#
127CONFIG_PPC_MULTIPLATFORM=y 135CONFIG_PPC_MULTIPLATFORM=y
128# CONFIG_EMBEDDED6xx is not set
129# CONFIG_PPC_82xx is not set 136# CONFIG_PPC_82xx is not set
130# CONFIG_PPC_83xx is not set 137# CONFIG_PPC_83xx is not set
131# CONFIG_PPC_86xx is not set 138# CONFIG_PPC_86xx is not set
@@ -165,6 +172,10 @@ CONFIG_PPC_970_NAP=y
165# 172#
166# Kernel options 173# Kernel options
167# 174#
175CONFIG_TICK_ONESHOT=y
176CONFIG_NO_HZ=y
177CONFIG_HIGH_RES_TIMERS=y
178CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
168# CONFIG_HZ_100 is not set 179# CONFIG_HZ_100 is not set
169CONFIG_HZ_250=y 180CONFIG_HZ_250=y
170# CONFIG_HZ_300 is not set 181# CONFIG_HZ_300 is not set
@@ -177,6 +188,7 @@ CONFIG_PREEMPT_NONE=y
177CONFIG_BINFMT_ELF=y 188CONFIG_BINFMT_ELF=y
178# CONFIG_BINFMT_MISC is not set 189# CONFIG_BINFMT_MISC is not set
179CONFIG_FORCE_MAX_ZONEORDER=13 190CONFIG_FORCE_MAX_ZONEORDER=13
191CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
180CONFIG_IOMMU_VMERGE=y 192CONFIG_IOMMU_VMERGE=y
181CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 193CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
182CONFIG_KEXEC=y 194CONFIG_KEXEC=y
@@ -194,6 +206,7 @@ CONFIG_FLATMEM_MANUAL=y
194CONFIG_FLATMEM=y 206CONFIG_FLATMEM=y
195CONFIG_FLAT_NODE_MEM_MAP=y 207CONFIG_FLAT_NODE_MEM_MAP=y
196# CONFIG_SPARSEMEM_STATIC is not set 208# CONFIG_SPARSEMEM_STATIC is not set
209CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
197CONFIG_SPLIT_PTLOCK_CPUS=4 210CONFIG_SPLIT_PTLOCK_CPUS=4
198CONFIG_RESOURCES_64BIT=y 211CONFIG_RESOURCES_64BIT=y
199CONFIG_ZONE_DMA_FLAG=1 212CONFIG_ZONE_DMA_FLAG=1
@@ -220,11 +233,8 @@ CONFIG_PCI_SYSCALL=y
220# CONFIG_PCIEPORTBUS is not set 233# CONFIG_PCIEPORTBUS is not set
221CONFIG_ARCH_SUPPORTS_MSI=y 234CONFIG_ARCH_SUPPORTS_MSI=y
222CONFIG_PCI_MSI=y 235CONFIG_PCI_MSI=y
236CONFIG_PCI_LEGACY=y
223# CONFIG_PCI_DEBUG is not set 237# CONFIG_PCI_DEBUG is not set
224
225#
226# PCCARD (PCMCIA/CardBus) support
227#
228# CONFIG_PCCARD is not set 238# CONFIG_PCCARD is not set
229# CONFIG_HOTPLUG_PCI is not set 239# CONFIG_HOTPLUG_PCI is not set
230CONFIG_KERNEL_START=0xc000000000000000 240CONFIG_KERNEL_START=0xc000000000000000
@@ -266,6 +276,7 @@ CONFIG_IP_PNP_DHCP=y
266CONFIG_INET_XFRM_MODE_TRANSPORT=y 276CONFIG_INET_XFRM_MODE_TRANSPORT=y
267CONFIG_INET_XFRM_MODE_TUNNEL=y 277CONFIG_INET_XFRM_MODE_TUNNEL=y
268CONFIG_INET_XFRM_MODE_BEET=y 278CONFIG_INET_XFRM_MODE_BEET=y
279# CONFIG_INET_LRO is not set
269CONFIG_INET_DIAG=y 280CONFIG_INET_DIAG=y
270CONFIG_INET_TCP_DIAG=y 281CONFIG_INET_TCP_DIAG=y
271# CONFIG_TCP_CONG_ADVANCED is not set 282# CONFIG_TCP_CONG_ADVANCED is not set
@@ -291,10 +302,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_LAPB is not set 302# CONFIG_LAPB is not set
292# CONFIG_ECONET is not set 303# CONFIG_ECONET is not set
293# CONFIG_WAN_ROUTER is not set 304# CONFIG_WAN_ROUTER is not set
294
295#
296# QoS and/or fair queueing
297#
298# CONFIG_NET_SCHED is not set 305# CONFIG_NET_SCHED is not set
299 306
300# 307#
@@ -323,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# 330#
324# Generic Driver Options 331# Generic Driver Options
325# 332#
333CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
326CONFIG_STANDALONE=y 334CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 335CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set 336# CONFIG_FW_LOADER is not set
@@ -373,6 +381,11 @@ CONFIG_IDE_PROC_FS=y
373# IDE chipset support/bugfixes 381# IDE chipset support/bugfixes
374# 382#
375CONFIG_IDE_GENERIC=y 383CONFIG_IDE_GENERIC=y
384# CONFIG_BLK_DEV_PLATFORM is not set
385
386#
387# PCI IDE chipsets support
388#
376CONFIG_BLK_DEV_IDEPCI=y 389CONFIG_BLK_DEV_IDEPCI=y
377CONFIG_IDEPCI_SHARE_IRQ=y 390CONFIG_IDEPCI_SHARE_IRQ=y
378CONFIG_IDEPCI_PCIBUS_ORDER=y 391CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -380,8 +393,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
380CONFIG_BLK_DEV_GENERIC=y 393CONFIG_BLK_DEV_GENERIC=y
381# CONFIG_BLK_DEV_OPTI621 is not set 394# CONFIG_BLK_DEV_OPTI621 is not set
382CONFIG_BLK_DEV_IDEDMA_PCI=y 395CONFIG_BLK_DEV_IDEDMA_PCI=y
383# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
384# CONFIG_IDEDMA_ONLYDISK is not set
385# CONFIG_BLK_DEV_AEC62XX is not set 396# CONFIG_BLK_DEV_AEC62XX is not set
386# CONFIG_BLK_DEV_ALI15X3 is not set 397# CONFIG_BLK_DEV_ALI15X3 is not set
387CONFIG_BLK_DEV_AMD74XX=y 398CONFIG_BLK_DEV_AMD74XX=y
@@ -409,7 +420,7 @@ CONFIG_BLK_DEV_AMD74XX=y
409# CONFIG_BLK_DEV_TC86C001 is not set 420# CONFIG_BLK_DEV_TC86C001 is not set
410# CONFIG_IDE_ARM is not set 421# CONFIG_IDE_ARM is not set
411CONFIG_BLK_DEV_IDEDMA=y 422CONFIG_BLK_DEV_IDEDMA=y
412# CONFIG_IDEDMA_IVB is not set 423CONFIG_IDE_ARCH_OBSOLETE_INIT=y
413# CONFIG_BLK_DEV_HD is not set 424# CONFIG_BLK_DEV_HD is not set
414 425
415# 426#
@@ -421,10 +432,6 @@ CONFIG_BLK_DEV_IDEDMA=y
421# CONFIG_SCSI_NETLINK is not set 432# CONFIG_SCSI_NETLINK is not set
422# CONFIG_ATA is not set 433# CONFIG_ATA is not set
423# CONFIG_MD is not set 434# CONFIG_MD is not set
424
425#
426# Fusion MPT device support
427#
428# CONFIG_FUSION is not set 435# CONFIG_FUSION is not set
429 436
430# 437#
@@ -441,6 +448,8 @@ CONFIG_NETDEVICES=y
441# CONFIG_MACVLAN is not set 448# CONFIG_MACVLAN is not set
442# CONFIG_EQUALIZER is not set 449# CONFIG_EQUALIZER is not set
443# CONFIG_TUN is not set 450# CONFIG_TUN is not set
451# CONFIG_VETH is not set
452# CONFIG_IP1000 is not set
444# CONFIG_ARCNET is not set 453# CONFIG_ARCNET is not set
445# CONFIG_PHYLIB is not set 454# CONFIG_PHYLIB is not set
446CONFIG_NET_ETHERNET=y 455CONFIG_NET_ETHERNET=y
@@ -451,6 +460,10 @@ CONFIG_MII=y
451# CONFIG_NET_VENDOR_3COM is not set 460# CONFIG_NET_VENDOR_3COM is not set
452# CONFIG_NET_TULIP is not set 461# CONFIG_NET_TULIP is not set
453# CONFIG_HP100 is not set 462# CONFIG_HP100 is not set
463# CONFIG_IBM_NEW_EMAC_ZMII is not set
464# CONFIG_IBM_NEW_EMAC_RGMII is not set
465# CONFIG_IBM_NEW_EMAC_TAH is not set
466# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
454CONFIG_NET_PCI=y 467CONFIG_NET_PCI=y
455# CONFIG_PCNET32 is not set 468# CONFIG_PCNET32 is not set
456CONFIG_AMD8111_ETH=y 469CONFIG_AMD8111_ETH=y
@@ -458,7 +471,6 @@ CONFIG_AMD8111_ETH=y
458# CONFIG_ADAPTEC_STARFIRE is not set 471# CONFIG_ADAPTEC_STARFIRE is not set
459# CONFIG_B44 is not set 472# CONFIG_B44 is not set
460# CONFIG_FORCEDETH is not set 473# CONFIG_FORCEDETH is not set
461# CONFIG_DGRS is not set
462# CONFIG_EEPRO100 is not set 474# CONFIG_EEPRO100 is not set
463# CONFIG_E100 is not set 475# CONFIG_E100 is not set
464# CONFIG_FEALNX is not set 476# CONFIG_FEALNX is not set
@@ -477,6 +489,7 @@ CONFIG_NETDEV_1000=y
477CONFIG_E1000=y 489CONFIG_E1000=y
478# CONFIG_E1000_NAPI is not set 490# CONFIG_E1000_NAPI is not set
479# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 491# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
492# CONFIG_E1000E is not set
480# CONFIG_NS83820 is not set 493# CONFIG_NS83820 is not set
481# CONFIG_HAMACHI is not set 494# CONFIG_HAMACHI is not set
482# CONFIG_YELLOWFIN is not set 495# CONFIG_YELLOWFIN is not set
@@ -484,6 +497,7 @@ CONFIG_E1000=y
484# CONFIG_SIS190 is not set 497# CONFIG_SIS190 is not set
485# CONFIG_SKGE is not set 498# CONFIG_SKGE is not set
486# CONFIG_SKY2 is not set 499# CONFIG_SKY2 is not set
500# CONFIG_SK98LIN is not set
487# CONFIG_VIA_VELOCITY is not set 501# CONFIG_VIA_VELOCITY is not set
488CONFIG_TIGON3=y 502CONFIG_TIGON3=y
489# CONFIG_BNX2 is not set 503# CONFIG_BNX2 is not set
@@ -492,12 +506,15 @@ CONFIG_TIGON3=y
492CONFIG_NETDEV_10000=y 506CONFIG_NETDEV_10000=y
493# CONFIG_CHELSIO_T1 is not set 507# CONFIG_CHELSIO_T1 is not set
494# CONFIG_CHELSIO_T3 is not set 508# CONFIG_CHELSIO_T3 is not set
509# CONFIG_IXGBE is not set
495# CONFIG_IXGB is not set 510# CONFIG_IXGB is not set
496# CONFIG_S2IO is not set 511# CONFIG_S2IO is not set
497# CONFIG_MYRI10GE is not set 512# CONFIG_MYRI10GE is not set
498# CONFIG_NETXEN_NIC is not set 513# CONFIG_NETXEN_NIC is not set
514# CONFIG_NIU is not set
499# CONFIG_PASEMI_MAC is not set 515# CONFIG_PASEMI_MAC is not set
500# CONFIG_MLX4_CORE is not set 516# CONFIG_MLX4_CORE is not set
517# CONFIG_TEHUTI is not set
501# CONFIG_TR is not set 518# CONFIG_TR is not set
502 519
503# 520#
@@ -513,7 +530,6 @@ CONFIG_NETDEV_10000=y
513# CONFIG_USB_KAWETH is not set 530# CONFIG_USB_KAWETH is not set
514CONFIG_USB_PEGASUS=y 531CONFIG_USB_PEGASUS=y
515# CONFIG_USB_RTL8150 is not set 532# CONFIG_USB_RTL8150 is not set
516# CONFIG_USB_USBNET_MII is not set
517# CONFIG_USB_USBNET is not set 533# CONFIG_USB_USBNET is not set
518# CONFIG_WAN is not set 534# CONFIG_WAN is not set
519# CONFIG_FDDI is not set 535# CONFIG_FDDI is not set
@@ -542,7 +558,6 @@ CONFIG_INPUT_MOUSEDEV=y
542CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600 558CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600
543CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200 559CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
544# CONFIG_INPUT_JOYDEV is not set 560# CONFIG_INPUT_JOYDEV is not set
545# CONFIG_INPUT_TSDEV is not set
546# CONFIG_INPUT_EVDEV is not set 561# CONFIG_INPUT_EVDEV is not set
547# CONFIG_INPUT_EVBUG is not set 562# CONFIG_INPUT_EVBUG is not set
548 563
@@ -594,14 +609,11 @@ CONFIG_LEGACY_PTY_COUNT=256
594CONFIG_HVC_DRIVER=y 609CONFIG_HVC_DRIVER=y
595CONFIG_HVC_RTAS=y 610CONFIG_HVC_RTAS=y
596# CONFIG_IPMI_HANDLER is not set 611# CONFIG_IPMI_HANDLER is not set
597# CONFIG_WATCHDOG is not set
598# CONFIG_HW_RANDOM is not set 612# CONFIG_HW_RANDOM is not set
599CONFIG_GEN_RTC=y 613CONFIG_GEN_RTC=y
600# CONFIG_GEN_RTC_X is not set 614# CONFIG_GEN_RTC_X is not set
601# CONFIG_R3964 is not set 615# CONFIG_R3964 is not set
602# CONFIG_APPLICOM is not set 616# CONFIG_APPLICOM is not set
603# CONFIG_AGP is not set
604# CONFIG_DRM is not set
605# CONFIG_RAW_DRIVER is not set 617# CONFIG_RAW_DRIVER is not set
606# CONFIG_HANGCHECK_TIMER is not set 618# CONFIG_HANGCHECK_TIMER is not set
607# CONFIG_TCG_TPM is not set 619# CONFIG_TCG_TPM is not set
@@ -669,6 +681,13 @@ CONFIG_I2C_AMD8111=y
669# CONFIG_W1 is not set 681# CONFIG_W1 is not set
670# CONFIG_POWER_SUPPLY is not set 682# CONFIG_POWER_SUPPLY is not set
671# CONFIG_HWMON is not set 683# CONFIG_HWMON is not set
684# CONFIG_WATCHDOG is not set
685
686#
687# Sonics Silicon Backplane
688#
689CONFIG_SSB_POSSIBLE=y
690# CONFIG_SSB is not set
672 691
673# 692#
674# Multifunction device drivers 693# Multifunction device drivers
@@ -685,16 +704,17 @@ CONFIG_I2C_AMD8111=y
685# 704#
686# Graphics support 705# Graphics support
687# 706#
707# CONFIG_AGP is not set
708# CONFIG_DRM is not set
709# CONFIG_VGASTATE is not set
710# CONFIG_VIDEO_OUTPUT_CONTROL is not set
711# CONFIG_FB is not set
688# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 712# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
689 713
690# 714#
691# Display device support 715# Display device support
692# 716#
693# CONFIG_DISPLAY_SUPPORT is not set 717# CONFIG_DISPLAY_SUPPORT is not set
694# CONFIG_VGASTATE is not set
695# CONFIG_VIDEO_OUTPUT_CONTROL is not set
696# CONFIG_FB is not set
697# CONFIG_FB_IBM_GXT4500 is not set
698 718
699# 719#
700# Console display driver support 720# Console display driver support
@@ -709,6 +729,7 @@ CONFIG_DUMMY_CONSOLE=y
709CONFIG_HID_SUPPORT=y 729CONFIG_HID_SUPPORT=y
710CONFIG_HID=y 730CONFIG_HID=y
711# CONFIG_HID_DEBUG is not set 731# CONFIG_HID_DEBUG is not set
732# CONFIG_HIDRAW is not set
712 733
713# 734#
714# USB Input Devices 735# USB Input Devices
@@ -784,6 +805,7 @@ CONFIG_USB_SERIAL_GENERIC=y
784# CONFIG_USB_SERIAL_AIRPRIME is not set 805# CONFIG_USB_SERIAL_AIRPRIME is not set
785# CONFIG_USB_SERIAL_ARK3116 is not set 806# CONFIG_USB_SERIAL_ARK3116 is not set
786# CONFIG_USB_SERIAL_BELKIN is not set 807# CONFIG_USB_SERIAL_BELKIN is not set
808# CONFIG_USB_SERIAL_CH341 is not set
787# CONFIG_USB_SERIAL_WHITEHEAT is not set 809# CONFIG_USB_SERIAL_WHITEHEAT is not set
788# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 810# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
789# CONFIG_USB_SERIAL_CP2101 is not set 811# CONFIG_USB_SERIAL_CP2101 is not set
@@ -870,19 +892,6 @@ CONFIG_USB_EZUSB=y
870# CONFIG_RTC_CLASS is not set 892# CONFIG_RTC_CLASS is not set
871 893
872# 894#
873# DMA Engine support
874#
875# CONFIG_DMA_ENGINE is not set
876
877#
878# DMA Clients
879#
880
881#
882# DMA Devices
883#
884
885#
886# Userspace I/O 895# Userspace I/O
887# 896#
888# CONFIG_UIO is not set 897# CONFIG_UIO is not set
@@ -942,7 +951,6 @@ CONFIG_TMPFS=y
942# CONFIG_TMPFS_POSIX_ACL is not set 951# CONFIG_TMPFS_POSIX_ACL is not set
943CONFIG_HUGETLBFS=y 952CONFIG_HUGETLBFS=y
944CONFIG_HUGETLB_PAGE=y 953CONFIG_HUGETLB_PAGE=y
945CONFIG_RAMFS=y
946# CONFIG_CONFIGFS_FS is not set 954# CONFIG_CONFIGFS_FS is not set
947 955
948# 956#
@@ -961,10 +969,7 @@ CONFIG_CRAMFS=y
961# CONFIG_QNX4FS_FS is not set 969# CONFIG_QNX4FS_FS is not set
962# CONFIG_SYSV_FS is not set 970# CONFIG_SYSV_FS is not set
963# CONFIG_UFS_FS is not set 971# CONFIG_UFS_FS is not set
964 972CONFIG_NETWORK_FILESYSTEMS=y
965#
966# Network File Systems
967#
968CONFIG_NFS_FS=y 973CONFIG_NFS_FS=y
969CONFIG_NFS_V3=y 974CONFIG_NFS_V3=y
970CONFIG_NFS_V3_ACL=y 975CONFIG_NFS_V3_ACL=y
@@ -1008,10 +1013,6 @@ CONFIG_MSDOS_PARTITION=y
1008# CONFIG_KARMA_PARTITION is not set 1013# CONFIG_KARMA_PARTITION is not set
1009# CONFIG_EFI_PARTITION is not set 1014# CONFIG_EFI_PARTITION is not set
1010# CONFIG_SYSV68_PARTITION is not set 1015# CONFIG_SYSV68_PARTITION is not set
1011
1012#
1013# Native Language Support
1014#
1015CONFIG_NLS=y 1016CONFIG_NLS=y
1016CONFIG_NLS_DEFAULT="utf-8" 1017CONFIG_NLS_DEFAULT="utf-8"
1017# CONFIG_NLS_CODEPAGE_437 is not set 1018# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1052,10 +1053,6 @@ CONFIG_NLS_DEFAULT="utf-8"
1052# CONFIG_NLS_KOI8_R is not set 1053# CONFIG_NLS_KOI8_R is not set
1053# CONFIG_NLS_KOI8_U is not set 1054# CONFIG_NLS_KOI8_U is not set
1054CONFIG_NLS_UTF8=y 1055CONFIG_NLS_UTF8=y
1055
1056#
1057# Distributed Lock Manager
1058#
1059# CONFIG_DLM is not set 1056# CONFIG_DLM is not set
1060# CONFIG_UCC_SLOW is not set 1057# CONFIG_UCC_SLOW is not set
1061 1058
@@ -1074,17 +1071,13 @@ CONFIG_PLIST=y
1074CONFIG_HAS_IOMEM=y 1071CONFIG_HAS_IOMEM=y
1075CONFIG_HAS_IOPORT=y 1072CONFIG_HAS_IOPORT=y
1076CONFIG_HAS_DMA=y 1073CONFIG_HAS_DMA=y
1077 1074# CONFIG_INSTRUMENTATION is not set
1078#
1079# Instrumentation Support
1080#
1081# CONFIG_PROFILING is not set
1082# CONFIG_KPROBES is not set
1083 1075
1084# 1076#
1085# Kernel hacking 1077# Kernel hacking
1086# 1078#
1087# CONFIG_PRINTK_TIME is not set 1079# CONFIG_PRINTK_TIME is not set
1080CONFIG_ENABLE_WARN_DEPRECATED=y
1088CONFIG_ENABLE_MUST_CHECK=y 1081CONFIG_ENABLE_MUST_CHECK=y
1089CONFIG_MAGIC_SYSRQ=y 1082CONFIG_MAGIC_SYSRQ=y
1090# CONFIG_UNUSED_SYMBOLS is not set 1083# CONFIG_UNUSED_SYMBOLS is not set
@@ -1108,9 +1101,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1108# CONFIG_DEBUG_INFO is not set 1101# CONFIG_DEBUG_INFO is not set
1109# CONFIG_DEBUG_VM is not set 1102# CONFIG_DEBUG_VM is not set
1110# CONFIG_DEBUG_LIST is not set 1103# CONFIG_DEBUG_LIST is not set
1104# CONFIG_DEBUG_SG is not set
1111# CONFIG_FORCED_INLINING is not set 1105# CONFIG_FORCED_INLINING is not set
1106# CONFIG_BOOT_PRINTK_DELAY is not set
1112# CONFIG_RCU_TORTURE_TEST is not set 1107# CONFIG_RCU_TORTURE_TEST is not set
1113# CONFIG_FAULT_INJECTION is not set 1108# CONFIG_FAULT_INJECTION is not set
1109# CONFIG_SAMPLES is not set
1114CONFIG_DEBUG_STACKOVERFLOW=y 1110CONFIG_DEBUG_STACKOVERFLOW=y
1115CONFIG_DEBUG_STACK_USAGE=y 1111CONFIG_DEBUG_STACK_USAGE=y
1116# CONFIG_DEBUG_PAGEALLOC is not set 1112# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1119,6 +1115,7 @@ CONFIG_XMON=y
1119CONFIG_XMON_DEFAULT=y 1115CONFIG_XMON_DEFAULT=y
1120CONFIG_XMON_DISASSEMBLY=y 1116CONFIG_XMON_DISASSEMBLY=y
1121# CONFIG_IRQSTACKS is not set 1117# CONFIG_IRQSTACKS is not set
1118# CONFIG_VIRQ_DEBUG is not set
1122CONFIG_BOOTX_TEXT=y 1119CONFIG_BOOTX_TEXT=y
1123# CONFIG_PPC_EARLY_DEBUG is not set 1120# CONFIG_PPC_EARLY_DEBUG is not set
1124 1121
@@ -1127,6 +1124,7 @@ CONFIG_BOOTX_TEXT=y
1127# 1124#
1128# CONFIG_KEYS is not set 1125# CONFIG_KEYS is not set
1129# CONFIG_SECURITY is not set 1126# CONFIG_SECURITY is not set
1127# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1130CONFIG_CRYPTO=y 1128CONFIG_CRYPTO=y
1131CONFIG_CRYPTO_ALGAPI=y 1129CONFIG_CRYPTO_ALGAPI=y
1132CONFIG_CRYPTO_BLKCIPHER=y 1130CONFIG_CRYPTO_BLKCIPHER=y
@@ -1146,6 +1144,7 @@ CONFIG_CRYPTO_ECB=m
1146CONFIG_CRYPTO_CBC=y 1144CONFIG_CRYPTO_CBC=y
1147CONFIG_CRYPTO_PCBC=m 1145CONFIG_CRYPTO_PCBC=m
1148# CONFIG_CRYPTO_LRW is not set 1146# CONFIG_CRYPTO_LRW is not set
1147# CONFIG_CRYPTO_XTS is not set
1149# CONFIG_CRYPTO_CRYPTD is not set 1148# CONFIG_CRYPTO_CRYPTD is not set
1150CONFIG_CRYPTO_DES=y 1149CONFIG_CRYPTO_DES=y
1151# CONFIG_CRYPTO_FCRYPT is not set 1150# CONFIG_CRYPTO_FCRYPT is not set
@@ -1159,9 +1158,12 @@ CONFIG_CRYPTO_DES=y
1159# CONFIG_CRYPTO_ARC4 is not set 1158# CONFIG_CRYPTO_ARC4 is not set
1160# CONFIG_CRYPTO_KHAZAD is not set 1159# CONFIG_CRYPTO_KHAZAD is not set
1161# CONFIG_CRYPTO_ANUBIS is not set 1160# CONFIG_CRYPTO_ANUBIS is not set
1161# CONFIG_CRYPTO_SEED is not set
1162# CONFIG_CRYPTO_DEFLATE is not set 1162# CONFIG_CRYPTO_DEFLATE is not set
1163# CONFIG_CRYPTO_MICHAEL_MIC is not set 1163# CONFIG_CRYPTO_MICHAEL_MIC is not set
1164# CONFIG_CRYPTO_CRC32C is not set 1164# CONFIG_CRYPTO_CRC32C is not set
1165# CONFIG_CRYPTO_CAMELLIA is not set 1165# CONFIG_CRYPTO_CAMELLIA is not set
1166# CONFIG_CRYPTO_TEST is not set 1166# CONFIG_CRYPTO_TEST is not set
1167# CONFIG_CRYPTO_AUTHENC is not set
1167# CONFIG_CRYPTO_HW is not set 1168# CONFIG_CRYPTO_HW is not set
1169# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 87ae894551b7..b0266de48491 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:39 2007 4# Thu Dec 6 16:48:28 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,13 +15,19 @@ CONFIG_6xx=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18CONFIG_ALTIVEC=y
18CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set 22# CONFIG_SMP is not set
22CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
23CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
24CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
25CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
26CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
27CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -61,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=y
61# CONFIG_BSD_PROCESS_ACCT is not set 67# CONFIG_BSD_PROCESS_ACCT is not set
62# CONFIG_TASKSTATS is not set 68# CONFIG_TASKSTATS is not set
63# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
64# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
65# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
66CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
67CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
68# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
69CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +92,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
84CONFIG_EPOLL=y 93CONFIG_EPOLL=y
85CONFIG_SIGNALFD=y 94CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 95CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 96CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
@@ -117,16 +125,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
117# 125#
118# Platform support 126# Platform support
119# 127#
120# CONFIG_PPC_MULTIPLATFORM is not set 128CONFIG_PPC_MULTIPLATFORM=y
121CONFIG_EMBEDDED6xx=y
122# CONFIG_PPC_82xx is not set 129# CONFIG_PPC_82xx is not set
123# CONFIG_PPC_83xx is not set 130# CONFIG_PPC_83xx is not set
124# CONFIG_PPC_86xx is not set 131# CONFIG_PPC_86xx is not set
132CONFIG_CLASSIC32=y
133# CONFIG_PPC_CHRP is not set
125# CONFIG_PPC_MPC52xx is not set 134# CONFIG_PPC_MPC52xx is not set
126# CONFIG_PPC_MPC5200 is not set 135# CONFIG_PPC_MPC5200 is not set
136# CONFIG_PPC_EFIKA is not set
137# CONFIG_PPC_LITE5200 is not set
138# CONFIG_PPC_PMAC is not set
127# CONFIG_PPC_CELL is not set 139# CONFIG_PPC_CELL is not set
128# CONFIG_PPC_CELL_NATIVE is not set 140# CONFIG_PPC_CELL_NATIVE is not set
129# CONFIG_PQ2ADS is not set 141# CONFIG_PQ2ADS is not set
142CONFIG_EMBEDDED6xx=y
130# CONFIG_LINKSTATION is not set 143# CONFIG_LINKSTATION is not set
131CONFIG_MPC7448HPC2=y 144CONFIG_MPC7448HPC2=y
132# CONFIG_PPC_HOLLY is not set 145# CONFIG_PPC_HOLLY is not set
@@ -142,6 +155,7 @@ CONFIG_MPIC_WEIRD=y
142# CONFIG_PPC_INDIRECT_IO is not set 155# CONFIG_PPC_INDIRECT_IO is not set
143# CONFIG_GENERIC_IOMAP is not set 156# CONFIG_GENERIC_IOMAP is not set
144# CONFIG_CPU_FREQ is not set 157# CONFIG_CPU_FREQ is not set
158# CONFIG_TAU is not set
145# CONFIG_CPM2 is not set 159# CONFIG_CPM2 is not set
146# CONFIG_FSL_ULI1575 is not set 160# CONFIG_FSL_ULI1575 is not set
147 161
@@ -149,6 +163,10 @@ CONFIG_MPIC_WEIRD=y
149# Kernel options 163# Kernel options
150# 164#
151# CONFIG_HIGHMEM is not set 165# CONFIG_HIGHMEM is not set
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
152# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
153CONFIG_HZ_250=y 171CONFIG_HZ_250=y
154# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -160,6 +178,7 @@ CONFIG_PREEMPT_NONE=y
160CONFIG_BINFMT_ELF=y 178CONFIG_BINFMT_ELF=y
161CONFIG_BINFMT_MISC=y 179CONFIG_BINFMT_MISC=y
162CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 180CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
181# CONFIG_KEXEC is not set
163CONFIG_ARCH_FLATMEM_ENABLE=y 182CONFIG_ARCH_FLATMEM_ENABLE=y
164CONFIG_ARCH_POPULATES_NODE_MAP=y 183CONFIG_ARCH_POPULATES_NODE_MAP=y
165CONFIG_SELECT_MEMORY_MODEL=y 184CONFIG_SELECT_MEMORY_MODEL=y
@@ -169,6 +188,7 @@ CONFIG_FLATMEM_MANUAL=y
169CONFIG_FLATMEM=y 188CONFIG_FLATMEM=y
170CONFIG_FLAT_NODE_MEM_MAP=y 189CONFIG_FLAT_NODE_MEM_MAP=y
171# CONFIG_SPARSEMEM_STATIC is not set 190# CONFIG_SPARSEMEM_STATIC is not set
191# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
172CONFIG_SPLIT_PTLOCK_CPUS=4 192CONFIG_SPLIT_PTLOCK_CPUS=4
173# CONFIG_RESOURCES_64BIT is not set 193# CONFIG_RESOURCES_64BIT is not set
174CONFIG_ZONE_DMA_FLAG=1 194CONFIG_ZONE_DMA_FLAG=1
@@ -177,8 +197,11 @@ CONFIG_VIRT_TO_BUS=y
177CONFIG_PROC_DEVICETREE=y 197CONFIG_PROC_DEVICETREE=y
178# CONFIG_CMDLINE_BOOL is not set 198# CONFIG_CMDLINE_BOOL is not set
179# CONFIG_PM is not set 199# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
180# CONFIG_SECCOMP is not set 202# CONFIG_SECCOMP is not set
181# CONFIG_WANT_DEVICE_TREE is not set 203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
182CONFIG_ISA_DMA_API=y 205CONFIG_ISA_DMA_API=y
183 206
184# 207#
@@ -193,10 +216,7 @@ CONFIG_PCI_SYSCALL=y
193# CONFIG_PCIEPORTBUS is not set 216# CONFIG_PCIEPORTBUS is not set
194CONFIG_ARCH_SUPPORTS_MSI=y 217CONFIG_ARCH_SUPPORTS_MSI=y
195# CONFIG_PCI_MSI is not set 218# CONFIG_PCI_MSI is not set
196 219CONFIG_PCI_LEGACY=y
197#
198# PCCARD (PCMCIA/CardBus) support
199#
200# CONFIG_PCCARD is not set 220# CONFIG_PCCARD is not set
201# CONFIG_HOTPLUG_PCI is not set 221# CONFIG_HOTPLUG_PCI is not set
202 222
@@ -211,7 +231,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
211CONFIG_HIGHMEM_START=0xfe000000 231CONFIG_HIGHMEM_START=0xfe000000
212CONFIG_LOWMEM_SIZE=0x30000000 232CONFIG_LOWMEM_SIZE=0x30000000
213CONFIG_KERNEL_START=0xc0000000 233CONFIG_KERNEL_START=0xc0000000
214CONFIG_TASK_SIZE=0x80000000 234CONFIG_TASK_SIZE=0xc0000000
215CONFIG_BOOT_LOAD=0x00800000 235CONFIG_BOOT_LOAD=0x00800000
216 236
217# 237#
@@ -251,6 +271,7 @@ CONFIG_SYN_COOKIES=y
251CONFIG_INET_XFRM_MODE_TRANSPORT=y 271CONFIG_INET_XFRM_MODE_TRANSPORT=y
252CONFIG_INET_XFRM_MODE_TUNNEL=y 272CONFIG_INET_XFRM_MODE_TUNNEL=y
253CONFIG_INET_XFRM_MODE_BEET=y 273CONFIG_INET_XFRM_MODE_BEET=y
274# CONFIG_INET_LRO is not set
254CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
255CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
256# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
@@ -276,10 +297,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
276# CONFIG_LAPB is not set 297# CONFIG_LAPB is not set
277# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
278# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
279
280#
281# QoS and/or fair queueing
282#
283# CONFIG_NET_SCHED is not set 300# CONFIG_NET_SCHED is not set
284 301
285# 302#
@@ -308,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
308# 325#
309# Generic Driver Options 326# Generic Driver Options
310# 327#
328CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
311CONFIG_STANDALONE=y 329CONFIG_STANDALONE=y
312CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
313# CONFIG_FW_LOADER is not set 331# CONFIG_FW_LOADER is not set
@@ -375,6 +393,7 @@ CONFIG_BLK_DEV_SD=y
375# CONFIG_SCSI_FC_ATTRS is not set 393# CONFIG_SCSI_FC_ATTRS is not set
376# CONFIG_SCSI_ISCSI_ATTRS is not set 394# CONFIG_SCSI_ISCSI_ATTRS is not set
377# CONFIG_SCSI_SAS_LIBSAS is not set 395# CONFIG_SCSI_SAS_LIBSAS is not set
396# CONFIG_SCSI_SRP_ATTRS is not set
378CONFIG_SCSI_LOWLEVEL=y 397CONFIG_SCSI_LOWLEVEL=y
379# CONFIG_ISCSI_TCP is not set 398# CONFIG_ISCSI_TCP is not set
380# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 399# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -386,6 +405,7 @@ CONFIG_SCSI_LOWLEVEL=y
386# CONFIG_SCSI_AIC79XX is not set 405# CONFIG_SCSI_AIC79XX is not set
387# CONFIG_SCSI_AIC94XX is not set 406# CONFIG_SCSI_AIC94XX is not set
388# CONFIG_SCSI_DPT_I2O is not set 407# CONFIG_SCSI_DPT_I2O is not set
408# CONFIG_SCSI_ADVANSYS is not set
389# CONFIG_SCSI_ARCMSR is not set 409# CONFIG_SCSI_ARCMSR is not set
390# CONFIG_MEGARAID_NEWGEN is not set 410# CONFIG_MEGARAID_NEWGEN is not set
391# CONFIG_MEGARAID_LEGACY is not set 411# CONFIG_MEGARAID_LEGACY is not set
@@ -453,6 +473,7 @@ CONFIG_SATA_MV=y
453# CONFIG_PATA_OLDPIIX is not set 473# CONFIG_PATA_OLDPIIX is not set
454# CONFIG_PATA_NETCELL is not set 474# CONFIG_PATA_NETCELL is not set
455# CONFIG_PATA_NS87410 is not set 475# CONFIG_PATA_NS87410 is not set
476# CONFIG_PATA_NS87415 is not set
456# CONFIG_PATA_OPTI is not set 477# CONFIG_PATA_OPTI is not set
457# CONFIG_PATA_OPTIDMA is not set 478# CONFIG_PATA_OPTIDMA is not set
458# CONFIG_PATA_PDC_OLD is not set 479# CONFIG_PATA_PDC_OLD is not set
@@ -467,14 +488,7 @@ CONFIG_SATA_MV=y
467# CONFIG_PATA_WINBOND is not set 488# CONFIG_PATA_WINBOND is not set
468# CONFIG_PATA_PLATFORM is not set 489# CONFIG_PATA_PLATFORM is not set
469# CONFIG_MD is not set 490# CONFIG_MD is not set
470
471#
472# Fusion MPT device support
473#
474# CONFIG_FUSION is not set 491# CONFIG_FUSION is not set
475# CONFIG_FUSION_SPI is not set
476# CONFIG_FUSION_FC is not set
477# CONFIG_FUSION_SAS is not set
478 492
479# 493#
480# IEEE 1394 (FireWire) support 494# IEEE 1394 (FireWire) support
@@ -490,6 +504,8 @@ CONFIG_NETDEVICES=y
490# CONFIG_MACVLAN is not set 504# CONFIG_MACVLAN is not set
491# CONFIG_EQUALIZER is not set 505# CONFIG_EQUALIZER is not set
492# CONFIG_TUN is not set 506# CONFIG_TUN is not set
507# CONFIG_VETH is not set
508# CONFIG_IP1000 is not set
493# CONFIG_ARCNET is not set 509# CONFIG_ARCNET is not set
494CONFIG_PHYLIB=y 510CONFIG_PHYLIB=y
495 511
@@ -506,6 +522,7 @@ CONFIG_PHYLIB=y
506# CONFIG_BROADCOM_PHY is not set 522# CONFIG_BROADCOM_PHY is not set
507# CONFIG_ICPLUS_PHY is not set 523# CONFIG_ICPLUS_PHY is not set
508# CONFIG_FIXED_PHY is not set 524# CONFIG_FIXED_PHY is not set
525# CONFIG_MDIO_BITBANG is not set
509CONFIG_NET_ETHERNET=y 526CONFIG_NET_ETHERNET=y
510CONFIG_MII=y 527CONFIG_MII=y
511# CONFIG_HAPPYMEAL is not set 528# CONFIG_HAPPYMEAL is not set
@@ -514,13 +531,16 @@ CONFIG_MII=y
514# CONFIG_NET_VENDOR_3COM is not set 531# CONFIG_NET_VENDOR_3COM is not set
515# CONFIG_NET_TULIP is not set 532# CONFIG_NET_TULIP is not set
516# CONFIG_HP100 is not set 533# CONFIG_HP100 is not set
534# CONFIG_IBM_NEW_EMAC_ZMII is not set
535# CONFIG_IBM_NEW_EMAC_RGMII is not set
536# CONFIG_IBM_NEW_EMAC_TAH is not set
537# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
517CONFIG_NET_PCI=y 538CONFIG_NET_PCI=y
518# CONFIG_PCNET32 is not set 539# CONFIG_PCNET32 is not set
519# CONFIG_AMD8111_ETH is not set 540# CONFIG_AMD8111_ETH is not set
520# CONFIG_ADAPTEC_STARFIRE is not set 541# CONFIG_ADAPTEC_STARFIRE is not set
521# CONFIG_B44 is not set 542# CONFIG_B44 is not set
522# CONFIG_FORCEDETH is not set 543# CONFIG_FORCEDETH is not set
523# CONFIG_DGRS is not set
524# CONFIG_EEPRO100 is not set 544# CONFIG_EEPRO100 is not set
525CONFIG_E100=y 545CONFIG_E100=y
526# CONFIG_FEALNX is not set 546# CONFIG_FEALNX is not set
@@ -542,6 +562,7 @@ CONFIG_NETDEV_1000=y
542# CONFIG_ACENIC is not set 562# CONFIG_ACENIC is not set
543# CONFIG_DL2K is not set 563# CONFIG_DL2K is not set
544# CONFIG_E1000 is not set 564# CONFIG_E1000 is not set
565# CONFIG_E1000E is not set
545# CONFIG_NS83820 is not set 566# CONFIG_NS83820 is not set
546# CONFIG_HAMACHI is not set 567# CONFIG_HAMACHI is not set
547# CONFIG_YELLOWFIN is not set 568# CONFIG_YELLOWFIN is not set
@@ -549,20 +570,25 @@ CONFIG_NETDEV_1000=y
549# CONFIG_SIS190 is not set 570# CONFIG_SIS190 is not set
550# CONFIG_SKGE is not set 571# CONFIG_SKGE is not set
551# CONFIG_SKY2 is not set 572# CONFIG_SKY2 is not set
573# CONFIG_SK98LIN is not set
552# CONFIG_VIA_VELOCITY is not set 574# CONFIG_VIA_VELOCITY is not set
553# CONFIG_TIGON3 is not set 575# CONFIG_TIGON3 is not set
554# CONFIG_BNX2 is not set 576# CONFIG_BNX2 is not set
555CONFIG_TSI108_ETH=y 577CONFIG_TSI108_ETH=y
578# CONFIG_MV643XX_ETH is not set
556# CONFIG_QLA3XXX is not set 579# CONFIG_QLA3XXX is not set
557# CONFIG_ATL1 is not set 580# CONFIG_ATL1 is not set
558CONFIG_NETDEV_10000=y 581CONFIG_NETDEV_10000=y
559# CONFIG_CHELSIO_T1 is not set 582# CONFIG_CHELSIO_T1 is not set
560# CONFIG_CHELSIO_T3 is not set 583# CONFIG_CHELSIO_T3 is not set
584# CONFIG_IXGBE is not set
561# CONFIG_IXGB is not set 585# CONFIG_IXGB is not set
562# CONFIG_S2IO is not set 586# CONFIG_S2IO is not set
563# CONFIG_MYRI10GE is not set 587# CONFIG_MYRI10GE is not set
564# CONFIG_NETXEN_NIC is not set 588# CONFIG_NETXEN_NIC is not set
589# CONFIG_NIU is not set
565# CONFIG_MLX4_CORE is not set 590# CONFIG_MLX4_CORE is not set
591# CONFIG_TEHUTI is not set
566# CONFIG_TR is not set 592# CONFIG_TR is not set
567 593
568# 594#
@@ -595,7 +621,6 @@ CONFIG_INPUT=y
595# 621#
596# CONFIG_INPUT_MOUSEDEV is not set 622# CONFIG_INPUT_MOUSEDEV is not set
597# CONFIG_INPUT_JOYDEV is not set 623# CONFIG_INPUT_JOYDEV is not set
598# CONFIG_INPUT_TSDEV is not set
599# CONFIG_INPUT_EVDEV is not set 624# CONFIG_INPUT_EVDEV is not set
600# CONFIG_INPUT_EVBUG is not set 625# CONFIG_INPUT_EVBUG is not set
601 626
@@ -643,15 +668,12 @@ CONFIG_UNIX98_PTYS=y
643CONFIG_LEGACY_PTYS=y 668CONFIG_LEGACY_PTYS=y
644CONFIG_LEGACY_PTY_COUNT=256 669CONFIG_LEGACY_PTY_COUNT=256
645# CONFIG_IPMI_HANDLER is not set 670# CONFIG_IPMI_HANDLER is not set
646# CONFIG_WATCHDOG is not set
647# CONFIG_HW_RANDOM is not set 671# CONFIG_HW_RANDOM is not set
648# CONFIG_NVRAM is not set 672# CONFIG_NVRAM is not set
649CONFIG_GEN_RTC=y 673CONFIG_GEN_RTC=y
650# CONFIG_GEN_RTC_X is not set 674# CONFIG_GEN_RTC_X is not set
651# CONFIG_R3964 is not set 675# CONFIG_R3964 is not set
652# CONFIG_APPLICOM is not set 676# CONFIG_APPLICOM is not set
653# CONFIG_AGP is not set
654# CONFIG_DRM is not set
655# CONFIG_RAW_DRIVER is not set 677# CONFIG_RAW_DRIVER is not set
656# CONFIG_TCG_TPM is not set 678# CONFIG_TCG_TPM is not set
657CONFIG_DEVPORT=y 679CONFIG_DEVPORT=y
@@ -666,9 +688,9 @@ CONFIG_DEVPORT=y
666# CONFIG_POWER_SUPPLY is not set 688# CONFIG_POWER_SUPPLY is not set
667CONFIG_HWMON=y 689CONFIG_HWMON=y
668# CONFIG_HWMON_VID is not set 690# CONFIG_HWMON_VID is not set
669# CONFIG_SENSORS_ABITUGURU is not set 691# CONFIG_SENSORS_I5K_AMB is not set
670# CONFIG_SENSORS_ABITUGURU3 is not set
671# CONFIG_SENSORS_F71805F is not set 692# CONFIG_SENSORS_F71805F is not set
693# CONFIG_SENSORS_F71882FG is not set
672# CONFIG_SENSORS_IT87 is not set 694# CONFIG_SENSORS_IT87 is not set
673# CONFIG_SENSORS_PC87360 is not set 695# CONFIG_SENSORS_PC87360 is not set
674# CONFIG_SENSORS_PC87427 is not set 696# CONFIG_SENSORS_PC87427 is not set
@@ -681,6 +703,13 @@ CONFIG_HWMON=y
681# CONFIG_SENSORS_W83627HF is not set 703# CONFIG_SENSORS_W83627HF is not set
682# CONFIG_SENSORS_W83627EHF is not set 704# CONFIG_SENSORS_W83627EHF is not set
683# CONFIG_HWMON_DEBUG_CHIP is not set 705# CONFIG_HWMON_DEBUG_CHIP is not set
706# CONFIG_WATCHDOG is not set
707
708#
709# Sonics Silicon Backplane
710#
711CONFIG_SSB_POSSIBLE=y
712# CONFIG_SSB is not set
684 713
685# 714#
686# Multifunction device drivers 715# Multifunction device drivers
@@ -697,16 +726,17 @@ CONFIG_DAB=y
697# 726#
698# Graphics support 727# Graphics support
699# 728#
729# CONFIG_AGP is not set
730# CONFIG_DRM is not set
731# CONFIG_VGASTATE is not set
732CONFIG_VIDEO_OUTPUT_CONTROL=y
733# CONFIG_FB is not set
700# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 734# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
701 735
702# 736#
703# Display device support 737# Display device support
704# 738#
705# CONFIG_DISPLAY_SUPPORT is not set 739# CONFIG_DISPLAY_SUPPORT is not set
706# CONFIG_VGASTATE is not set
707CONFIG_VIDEO_OUTPUT_CONTROL=y
708# CONFIG_FB is not set
709# CONFIG_FB_IBM_GXT4500 is not set
710 740
711# 741#
712# Sound 742# Sound
@@ -715,6 +745,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
715CONFIG_HID_SUPPORT=y 745CONFIG_HID_SUPPORT=y
716CONFIG_HID=y 746CONFIG_HID=y
717# CONFIG_HID_DEBUG is not set 747# CONFIG_HID_DEBUG is not set
748# CONFIG_HIDRAW is not set
718CONFIG_USB_SUPPORT=y 749CONFIG_USB_SUPPORT=y
719CONFIG_USB_ARCH_HAS_HCD=y 750CONFIG_USB_ARCH_HAS_HCD=y
720CONFIG_USB_ARCH_HAS_OHCI=y 751CONFIG_USB_ARCH_HAS_OHCI=y
@@ -736,19 +767,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
736# CONFIG_RTC_CLASS is not set 767# CONFIG_RTC_CLASS is not set
737 768
738# 769#
739# DMA Engine support
740#
741# CONFIG_DMA_ENGINE is not set
742
743#
744# DMA Clients
745#
746
747#
748# DMA Devices
749#
750
751#
752# Userspace I/O 770# Userspace I/O
753# 771#
754# CONFIG_UIO is not set 772# CONFIG_UIO is not set
@@ -765,7 +783,6 @@ CONFIG_EXT3_FS_XATTR=y
765# CONFIG_EXT3_FS_SECURITY is not set 783# CONFIG_EXT3_FS_SECURITY is not set
766# CONFIG_EXT4DEV_FS is not set 784# CONFIG_EXT4DEV_FS is not set
767CONFIG_JBD=y 785CONFIG_JBD=y
768# CONFIG_JBD_DEBUG is not set
769CONFIG_FS_MBCACHE=y 786CONFIG_FS_MBCACHE=y
770# CONFIG_REISERFS_FS is not set 787# CONFIG_REISERFS_FS is not set
771# CONFIG_JFS_FS is not set 788# CONFIG_JFS_FS is not set
@@ -806,7 +823,6 @@ CONFIG_SYSFS=y
806CONFIG_TMPFS=y 823CONFIG_TMPFS=y
807# CONFIG_TMPFS_POSIX_ACL is not set 824# CONFIG_TMPFS_POSIX_ACL is not set
808# CONFIG_HUGETLB_PAGE is not set 825# CONFIG_HUGETLB_PAGE is not set
809CONFIG_RAMFS=y
810# CONFIG_CONFIGFS_FS is not set 826# CONFIG_CONFIGFS_FS is not set
811 827
812# 828#
@@ -825,10 +841,7 @@ CONFIG_RAMFS=y
825# CONFIG_QNX4FS_FS is not set 841# CONFIG_QNX4FS_FS is not set
826# CONFIG_SYSV_FS is not set 842# CONFIG_SYSV_FS is not set
827# CONFIG_UFS_FS is not set 843# CONFIG_UFS_FS is not set
828 844CONFIG_NETWORK_FILESYSTEMS=y
829#
830# Network File Systems
831#
832CONFIG_NFS_FS=y 845CONFIG_NFS_FS=y
833# CONFIG_NFS_V3 is not set 846# CONFIG_NFS_V3 is not set
834# CONFIG_NFS_V4 is not set 847# CONFIG_NFS_V4 is not set
@@ -868,15 +881,7 @@ CONFIG_MSDOS_PARTITION=y
868# CONFIG_KARMA_PARTITION is not set 881# CONFIG_KARMA_PARTITION is not set
869# CONFIG_EFI_PARTITION is not set 882# CONFIG_EFI_PARTITION is not set
870# CONFIG_SYSV68_PARTITION is not set 883# CONFIG_SYSV68_PARTITION is not set
871
872#
873# Native Language Support
874#
875# CONFIG_NLS is not set 884# CONFIG_NLS is not set
876
877#
878# Distributed Lock Manager
879#
880# CONFIG_DLM is not set 885# CONFIG_DLM is not set
881# CONFIG_UCC_SLOW is not set 886# CONFIG_UCC_SLOW is not set
882 887
@@ -894,23 +899,23 @@ CONFIG_PLIST=y
894CONFIG_HAS_IOMEM=y 899CONFIG_HAS_IOMEM=y
895CONFIG_HAS_IOPORT=y 900CONFIG_HAS_IOPORT=y
896CONFIG_HAS_DMA=y 901CONFIG_HAS_DMA=y
897 902# CONFIG_INSTRUMENTATION is not set
898#
899# Instrumentation Support
900#
901# CONFIG_PROFILING is not set
902 903
903# 904#
904# Kernel hacking 905# Kernel hacking
905# 906#
906# CONFIG_PRINTK_TIME is not set 907# CONFIG_PRINTK_TIME is not set
908CONFIG_ENABLE_WARN_DEPRECATED=y
907CONFIG_ENABLE_MUST_CHECK=y 909CONFIG_ENABLE_MUST_CHECK=y
908# CONFIG_MAGIC_SYSRQ is not set 910# CONFIG_MAGIC_SYSRQ is not set
909# CONFIG_UNUSED_SYMBOLS is not set 911# CONFIG_UNUSED_SYMBOLS is not set
910# CONFIG_DEBUG_FS is not set 912# CONFIG_DEBUG_FS is not set
911# CONFIG_HEADERS_CHECK is not set 913# CONFIG_HEADERS_CHECK is not set
912# CONFIG_DEBUG_KERNEL is not set 914# CONFIG_DEBUG_KERNEL is not set
915# CONFIG_SLUB_DEBUG_ON is not set
913# CONFIG_DEBUG_BUGVERBOSE is not set 916# CONFIG_DEBUG_BUGVERBOSE is not set
917# CONFIG_SAMPLES is not set
918# CONFIG_BOOTX_TEXT is not set
914# CONFIG_PPC_EARLY_DEBUG is not set 919# CONFIG_PPC_EARLY_DEBUG is not set
915 920
916# 921#
@@ -918,4 +923,6 @@ CONFIG_ENABLE_MUST_CHECK=y
918# 923#
919# CONFIG_KEYS is not set 924# CONFIG_KEYS is not set
920# CONFIG_SECURITY is not set 925# CONFIG_SECURITY is not set
926# CONFIG_SECURITY_FILE_CAPABILITIES is not set
921# CONFIG_CRYPTO is not set 927# CONFIG_CRYPTO is not set
928# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 865a942ecc69..a31b7a030a6b 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Wed Sep 5 12:43:23 2007 4# Thu Dec 6 16:48:30 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -20,8 +20,13 @@ CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set 21# CONFIG_SMP is not set
22CONFIG_PPC32=y 22CONFIG_PPC32=y
23CONFIG_WORD_SIZE=32
23CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
24CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
25CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
26CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
27CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,6 +68,8 @@ CONFIG_SYSVIPC_SYSCTL=y
63CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
64CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
65CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set
72# CONFIG_FAIR_GROUP_SCHED is not set
66CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
68# CONFIG_BLK_DEV_INITRD is not set 75# CONFIG_BLK_DEV_INITRD is not set
@@ -81,7 +88,6 @@ CONFIG_FUTEX=y
81CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
82CONFIG_EPOLL=y 89CONFIG_EPOLL=y
83CONFIG_SIGNALFD=y 90CONFIG_SIGNALFD=y
84CONFIG_TIMERFD=y
85CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
86CONFIG_SHMEM=y 92CONFIG_SHMEM=y
87CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
@@ -115,7 +121,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
115# Platform support 121# Platform support
116# 122#
117# CONFIG_PPC_MULTIPLATFORM is not set 123# CONFIG_PPC_MULTIPLATFORM is not set
118# CONFIG_EMBEDDED6xx is not set
119CONFIG_PPC_82xx=y 124CONFIG_PPC_82xx=y
120# CONFIG_PPC_83xx is not set 125# CONFIG_PPC_83xx is not set
121# CONFIG_PPC_86xx is not set 126# CONFIG_PPC_86xx is not set
@@ -124,6 +129,7 @@ CONFIG_PPC_82xx=y
124# CONFIG_PPC_CELL is not set 129# CONFIG_PPC_CELL is not set
125# CONFIG_PPC_CELL_NATIVE is not set 130# CONFIG_PPC_CELL_NATIVE is not set
126CONFIG_MPC8272_ADS=y 131CONFIG_MPC8272_ADS=y
132# CONFIG_PQ2FADS is not set
127CONFIG_PQ2ADS=y 133CONFIG_PQ2ADS=y
128CONFIG_8260=y 134CONFIG_8260=y
129CONFIG_8272=y 135CONFIG_8272=y
@@ -147,6 +153,10 @@ CONFIG_CPM=y
147# Kernel options 153# Kernel options
148# 154#
149# CONFIG_HIGHMEM is not set 155# CONFIG_HIGHMEM is not set
156CONFIG_TICK_ONESHOT=y
157CONFIG_NO_HZ=y
158CONFIG_HIGH_RES_TIMERS=y
159CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
150# CONFIG_HZ_100 is not set 160# CONFIG_HZ_100 is not set
151CONFIG_HZ_250=y 161CONFIG_HZ_250=y
152# CONFIG_HZ_300 is not set 162# CONFIG_HZ_300 is not set
@@ -163,6 +173,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
163CONFIG_FLATMEM=y 173CONFIG_FLATMEM=y
164CONFIG_FLAT_NODE_MEM_MAP=y 174CONFIG_FLAT_NODE_MEM_MAP=y
165# CONFIG_SPARSEMEM_STATIC is not set 175# CONFIG_SPARSEMEM_STATIC is not set
176# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
166CONFIG_SPLIT_PTLOCK_CPUS=4 177CONFIG_SPLIT_PTLOCK_CPUS=4
167# CONFIG_RESOURCES_64BIT is not set 178# CONFIG_RESOURCES_64BIT is not set
168CONFIG_ZONE_DMA_FLAG=1 179CONFIG_ZONE_DMA_FLAG=1
@@ -171,9 +182,10 @@ CONFIG_VIRT_TO_BUS=y
171CONFIG_PROC_DEVICETREE=y 182CONFIG_PROC_DEVICETREE=y
172# CONFIG_CMDLINE_BOOL is not set 183# CONFIG_CMDLINE_BOOL is not set
173# CONFIG_PM is not set 184# CONFIG_PM is not set
185CONFIG_SUSPEND_UP_POSSIBLE=y
186CONFIG_HIBERNATION_UP_POSSIBLE=y
174CONFIG_SECCOMP=y 187CONFIG_SECCOMP=y
175CONFIG_WANT_DEVICE_TREE=y 188CONFIG_WANT_DEVICE_TREE=y
176# CONFIG_BUILD_RAW_IMAGE is not set
177CONFIG_DEVICE_TREE="mpc8272ads.dts" 189CONFIG_DEVICE_TREE="mpc8272ads.dts"
178CONFIG_ISA_DMA_API=y 190CONFIG_ISA_DMA_API=y
179 191
@@ -190,11 +202,8 @@ CONFIG_PCI_8260=y
190# CONFIG_PCIEPORTBUS is not set 202# CONFIG_PCIEPORTBUS is not set
191CONFIG_ARCH_SUPPORTS_MSI=y 203CONFIG_ARCH_SUPPORTS_MSI=y
192# CONFIG_PCI_MSI is not set 204# CONFIG_PCI_MSI is not set
205CONFIG_PCI_LEGACY=y
193# CONFIG_PCI_DEBUG is not set 206# CONFIG_PCI_DEBUG is not set
194
195#
196# PCCARD (PCMCIA/CardBus) support
197#
198# CONFIG_PCCARD is not set 207# CONFIG_PCCARD is not set
199 208
200# 209#
@@ -208,7 +217,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
208CONFIG_HIGHMEM_START=0xfe000000 217CONFIG_HIGHMEM_START=0xfe000000
209CONFIG_LOWMEM_SIZE=0x30000000 218CONFIG_LOWMEM_SIZE=0x30000000
210CONFIG_KERNEL_START=0xc0000000 219CONFIG_KERNEL_START=0xc0000000
211CONFIG_TASK_SIZE=0x80000000 220CONFIG_TASK_SIZE=0xc0000000
212CONFIG_BOOT_LOAD=0x00400000 221CONFIG_BOOT_LOAD=0x00400000
213 222
214# 223#
@@ -245,6 +254,7 @@ CONFIG_INET_TUNNEL=y
245CONFIG_INET_XFRM_MODE_TRANSPORT=y 254CONFIG_INET_XFRM_MODE_TRANSPORT=y
246CONFIG_INET_XFRM_MODE_TUNNEL=y 255CONFIG_INET_XFRM_MODE_TUNNEL=y
247CONFIG_INET_XFRM_MODE_BEET=y 256CONFIG_INET_XFRM_MODE_BEET=y
257# CONFIG_INET_LRO is not set
248CONFIG_INET_DIAG=y 258CONFIG_INET_DIAG=y
249CONFIG_INET_TCP_DIAG=y 259CONFIG_INET_TCP_DIAG=y
250# CONFIG_TCP_CONG_ADVANCED is not set 260# CONFIG_TCP_CONG_ADVANCED is not set
@@ -288,10 +298,6 @@ CONFIG_NETFILTER=y
288# CONFIG_LLC2 is not set 298# CONFIG_LLC2 is not set
289# CONFIG_IPX is not set 299# CONFIG_IPX is not set
290# CONFIG_ATALK is not set 300# CONFIG_ATALK is not set
291
292#
293# QoS and/or fair queueing
294#
295# CONFIG_NET_SCHED is not set 301# CONFIG_NET_SCHED is not set
296 302
297# 303#
@@ -317,6 +323,7 @@ CONFIG_NETFILTER=y
317# 323#
318# Generic Driver Options 324# Generic Driver Options
319# 325#
326CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
320CONFIG_STANDALONE=y 327CONFIG_STANDALONE=y
321CONFIG_PREVENT_FIRMWARE_BUILD=y 328CONFIG_PREVENT_FIRMWARE_BUILD=y
322# CONFIG_FW_LOADER is not set 329# CONFIG_FW_LOADER is not set
@@ -340,6 +347,7 @@ CONFIG_MTD_BLOCK=y
340# CONFIG_INFTL is not set 347# CONFIG_INFTL is not set
341# CONFIG_RFD_FTL is not set 348# CONFIG_RFD_FTL is not set
342# CONFIG_SSFDC is not set 349# CONFIG_SSFDC is not set
350# CONFIG_MTD_OOPS is not set
343 351
344# 352#
345# RAM/ROM/Flash chip drivers 353# RAM/ROM/Flash chip drivers
@@ -378,6 +386,7 @@ CONFIG_MTD_CFI_UTIL=y
378# CONFIG_MTD_PHYSMAP is not set 386# CONFIG_MTD_PHYSMAP is not set
379CONFIG_MTD_PHYSMAP_OF=y 387CONFIG_MTD_PHYSMAP_OF=y
380# CONFIG_MTD_SBC8240 is not set 388# CONFIG_MTD_SBC8240 is not set
389# CONFIG_MTD_INTEL_VR_NOR is not set
381# CONFIG_MTD_PLATRAM is not set 390# CONFIG_MTD_PLATRAM is not set
382 391
383# 392#
@@ -429,10 +438,6 @@ CONFIG_BLK_DEV_LOOP=y
429# CONFIG_SCSI_NETLINK is not set 438# CONFIG_SCSI_NETLINK is not set
430# CONFIG_ATA is not set 439# CONFIG_ATA is not set
431# CONFIG_MD is not set 440# CONFIG_MD is not set
432
433#
434# Fusion MPT device support
435#
436# CONFIG_FUSION is not set 441# CONFIG_FUSION is not set
437 442
438# 443#
@@ -451,6 +456,7 @@ CONFIG_NETDEVICES=y
451# CONFIG_BONDING is not set 456# CONFIG_BONDING is not set
452# CONFIG_EQUALIZER is not set 457# CONFIG_EQUALIZER is not set
453CONFIG_TUN=y 458CONFIG_TUN=y
459# CONFIG_VETH is not set
454# CONFIG_ARCNET is not set 460# CONFIG_ARCNET is not set
455CONFIG_PHYLIB=y 461CONFIG_PHYLIB=y
456 462
@@ -476,20 +482,28 @@ CONFIG_MII=y
476# CONFIG_NET_VENDOR_3COM is not set 482# CONFIG_NET_VENDOR_3COM is not set
477# CONFIG_NET_TULIP is not set 483# CONFIG_NET_TULIP is not set
478# CONFIG_HP100 is not set 484# CONFIG_HP100 is not set
485# CONFIG_IBM_NEW_EMAC_ZMII is not set
486# CONFIG_IBM_NEW_EMAC_RGMII is not set
487# CONFIG_IBM_NEW_EMAC_TAH is not set
488# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
479# CONFIG_NET_PCI is not set 489# CONFIG_NET_PCI is not set
490# CONFIG_B44 is not set
480CONFIG_FS_ENET=y 491CONFIG_FS_ENET=y
481# CONFIG_FS_ENET_HAS_SCC is not set 492# CONFIG_FS_ENET_HAS_SCC is not set
482CONFIG_FS_ENET_HAS_FCC=y 493CONFIG_FS_ENET_HAS_FCC=y
494# CONFIG_FS_ENET_MDIO_FCC is not set
483CONFIG_NETDEV_1000=y 495CONFIG_NETDEV_1000=y
484# CONFIG_ACENIC is not set 496# CONFIG_ACENIC is not set
485# CONFIG_DL2K is not set 497# CONFIG_DL2K is not set
486# CONFIG_E1000 is not set 498# CONFIG_E1000 is not set
499# CONFIG_E1000E is not set
487# CONFIG_NS83820 is not set 500# CONFIG_NS83820 is not set
488# CONFIG_HAMACHI is not set 501# CONFIG_HAMACHI is not set
489# CONFIG_R8169 is not set 502# CONFIG_R8169 is not set
490# CONFIG_SIS190 is not set 503# CONFIG_SIS190 is not set
491# CONFIG_SKGE is not set 504# CONFIG_SKGE is not set
492# CONFIG_SKY2 is not set 505# CONFIG_SKY2 is not set
506# CONFIG_SK98LIN is not set
493# CONFIG_VIA_VELOCITY is not set 507# CONFIG_VIA_VELOCITY is not set
494# CONFIG_TIGON3 is not set 508# CONFIG_TIGON3 is not set
495# CONFIG_BNX2 is not set 509# CONFIG_BNX2 is not set
@@ -497,11 +511,14 @@ CONFIG_NETDEV_1000=y
497CONFIG_NETDEV_10000=y 511CONFIG_NETDEV_10000=y
498# CONFIG_CHELSIO_T1 is not set 512# CONFIG_CHELSIO_T1 is not set
499# CONFIG_CHELSIO_T3 is not set 513# CONFIG_CHELSIO_T3 is not set
514# CONFIG_IXGBE is not set
500# CONFIG_IXGB is not set 515# CONFIG_IXGB is not set
501# CONFIG_S2IO is not set 516# CONFIG_S2IO is not set
502# CONFIG_MYRI10GE is not set 517# CONFIG_MYRI10GE is not set
503# CONFIG_NETXEN_NIC is not set 518# CONFIG_NETXEN_NIC is not set
519# CONFIG_NIU is not set
504# CONFIG_MLX4_CORE is not set 520# CONFIG_MLX4_CORE is not set
521# CONFIG_TEHUTI is not set
505# CONFIG_TR is not set 522# CONFIG_TR is not set
506 523
507# 524#
@@ -539,7 +556,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
539CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 556CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
540CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 557CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
541# CONFIG_INPUT_JOYDEV is not set 558# CONFIG_INPUT_JOYDEV is not set
542# CONFIG_INPUT_TSDEV is not set
543CONFIG_INPUT_EVDEV=y 559CONFIG_INPUT_EVDEV=y
544# CONFIG_INPUT_EVBUG is not set 560# CONFIG_INPUT_EVBUG is not set
545 561
@@ -609,14 +625,11 @@ CONFIG_UNIX98_PTYS=y
609CONFIG_LEGACY_PTYS=y 625CONFIG_LEGACY_PTYS=y
610CONFIG_LEGACY_PTY_COUNT=256 626CONFIG_LEGACY_PTY_COUNT=256
611# CONFIG_IPMI_HANDLER is not set 627# CONFIG_IPMI_HANDLER is not set
612# CONFIG_WATCHDOG is not set
613CONFIG_HW_RANDOM=y 628CONFIG_HW_RANDOM=y
614# CONFIG_NVRAM is not set 629# CONFIG_NVRAM is not set
615# CONFIG_GEN_RTC is not set 630# CONFIG_GEN_RTC is not set
616# CONFIG_R3964 is not set 631# CONFIG_R3964 is not set
617# CONFIG_APPLICOM is not set 632# CONFIG_APPLICOM is not set
618# CONFIG_AGP is not set
619# CONFIG_DRM is not set
620# CONFIG_RAW_DRIVER is not set 633# CONFIG_RAW_DRIVER is not set
621CONFIG_DEVPORT=y 634CONFIG_DEVPORT=y
622# CONFIG_I2C is not set 635# CONFIG_I2C is not set
@@ -629,6 +642,13 @@ CONFIG_DEVPORT=y
629# CONFIG_W1 is not set 642# CONFIG_W1 is not set
630# CONFIG_POWER_SUPPLY is not set 643# CONFIG_POWER_SUPPLY is not set
631# CONFIG_HWMON is not set 644# CONFIG_HWMON is not set
645# CONFIG_WATCHDOG is not set
646
647#
648# Sonics Silicon Backplane
649#
650CONFIG_SSB_POSSIBLE=y
651# CONFIG_SSB is not set
632 652
633# 653#
634# Multifunction device drivers 654# Multifunction device drivers
@@ -645,16 +665,17 @@ CONFIG_DAB=y
645# 665#
646# Graphics support 666# Graphics support
647# 667#
668# CONFIG_AGP is not set
669# CONFIG_DRM is not set
670# CONFIG_VGASTATE is not set
671# CONFIG_VIDEO_OUTPUT_CONTROL is not set
672# CONFIG_FB is not set
648# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 673# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
649 674
650# 675#
651# Display device support 676# Display device support
652# 677#
653# CONFIG_DISPLAY_SUPPORT is not set 678# CONFIG_DISPLAY_SUPPORT is not set
654# CONFIG_VGASTATE is not set
655# CONFIG_VIDEO_OUTPUT_CONTROL is not set
656# CONFIG_FB is not set
657# CONFIG_FB_IBM_GXT4500 is not set
658 679
659# 680#
660# Sound 681# Sound
@@ -668,19 +689,6 @@ CONFIG_DAB=y
668# CONFIG_RTC_CLASS is not set 689# CONFIG_RTC_CLASS is not set
669 690
670# 691#
671# DMA Engine support
672#
673# CONFIG_DMA_ENGINE is not set
674
675#
676# DMA Clients
677#
678
679#
680# DMA Devices
681#
682
683#
684# Userspace I/O 692# Userspace I/O
685# 693#
686# CONFIG_UIO is not set 694# CONFIG_UIO is not set
@@ -696,7 +704,6 @@ CONFIG_EXT3_FS_XATTR=y
696# CONFIG_EXT3_FS_POSIX_ACL is not set 704# CONFIG_EXT3_FS_POSIX_ACL is not set
697# CONFIG_EXT3_FS_SECURITY is not set 705# CONFIG_EXT3_FS_SECURITY is not set
698CONFIG_JBD=y 706CONFIG_JBD=y
699# CONFIG_JBD_DEBUG is not set
700CONFIG_FS_MBCACHE=y 707CONFIG_FS_MBCACHE=y
701# CONFIG_REISERFS_FS is not set 708# CONFIG_REISERFS_FS is not set
702# CONFIG_JFS_FS is not set 709# CONFIG_JFS_FS is not set
@@ -736,7 +743,6 @@ CONFIG_SYSFS=y
736CONFIG_TMPFS=y 743CONFIG_TMPFS=y
737# CONFIG_TMPFS_POSIX_ACL is not set 744# CONFIG_TMPFS_POSIX_ACL is not set
738# CONFIG_HUGETLB_PAGE is not set 745# CONFIG_HUGETLB_PAGE is not set
739CONFIG_RAMFS=y
740 746
741# 747#
742# Miscellaneous filesystems 748# Miscellaneous filesystems
@@ -749,10 +755,7 @@ CONFIG_CRAMFS=y
749# CONFIG_QNX4FS_FS is not set 755# CONFIG_QNX4FS_FS is not set
750# CONFIG_SYSV_FS is not set 756# CONFIG_SYSV_FS is not set
751# CONFIG_UFS_FS is not set 757# CONFIG_UFS_FS is not set
752 758CONFIG_NETWORK_FILESYSTEMS=y
753#
754# Network File Systems
755#
756CONFIG_NFS_FS=y 759CONFIG_NFS_FS=y
757CONFIG_NFS_V3=y 760CONFIG_NFS_V3=y
758CONFIG_NFS_V3_ACL=y 761CONFIG_NFS_V3_ACL=y
@@ -790,10 +793,6 @@ CONFIG_MSDOS_PARTITION=y
790# CONFIG_KARMA_PARTITION is not set 793# CONFIG_KARMA_PARTITION is not set
791# CONFIG_EFI_PARTITION is not set 794# CONFIG_EFI_PARTITION is not set
792# CONFIG_SYSV68_PARTITION is not set 795# CONFIG_SYSV68_PARTITION is not set
793
794#
795# Native Language Support
796#
797CONFIG_NLS=y 796CONFIG_NLS=y
798CONFIG_NLS_DEFAULT="iso8859-1" 797CONFIG_NLS_DEFAULT="iso8859-1"
799CONFIG_NLS_CODEPAGE_437=y 798CONFIG_NLS_CODEPAGE_437=y
@@ -852,11 +851,13 @@ CONFIG_PLIST=y
852CONFIG_HAS_IOMEM=y 851CONFIG_HAS_IOMEM=y
853CONFIG_HAS_IOPORT=y 852CONFIG_HAS_IOPORT=y
854CONFIG_HAS_DMA=y 853CONFIG_HAS_DMA=y
854# CONFIG_INSTRUMENTATION is not set
855 855
856# 856#
857# Kernel hacking 857# Kernel hacking
858# 858#
859# CONFIG_PRINTK_TIME is not set 859# CONFIG_PRINTK_TIME is not set
860CONFIG_ENABLE_WARN_DEPRECATED=y
860CONFIG_ENABLE_MUST_CHECK=y 861CONFIG_ENABLE_MUST_CHECK=y
861CONFIG_MAGIC_SYSRQ=y 862CONFIG_MAGIC_SYSRQ=y
862# CONFIG_UNUSED_SYMBOLS is not set 863# CONFIG_UNUSED_SYMBOLS is not set
@@ -880,8 +881,11 @@ CONFIG_DEBUG_BUGVERBOSE=y
880CONFIG_DEBUG_INFO=y 881CONFIG_DEBUG_INFO=y
881# CONFIG_DEBUG_VM is not set 882# CONFIG_DEBUG_VM is not set
882# CONFIG_DEBUG_LIST is not set 883# CONFIG_DEBUG_LIST is not set
884# CONFIG_DEBUG_SG is not set
883CONFIG_FORCED_INLINING=y 885CONFIG_FORCED_INLINING=y
886# CONFIG_BOOT_PRINTK_DELAY is not set
884# CONFIG_FAULT_INJECTION is not set 887# CONFIG_FAULT_INJECTION is not set
888# CONFIG_SAMPLES is not set
885# CONFIG_DEBUG_STACKOVERFLOW is not set 889# CONFIG_DEBUG_STACKOVERFLOW is not set
886# CONFIG_DEBUG_STACK_USAGE is not set 890# CONFIG_DEBUG_STACK_USAGE is not set
887# CONFIG_DEBUG_PAGEALLOC is not set 891# CONFIG_DEBUG_PAGEALLOC is not set
@@ -924,8 +928,12 @@ CONFIG_CRYPTO_DES=y
924# CONFIG_CRYPTO_ARC4 is not set 928# CONFIG_CRYPTO_ARC4 is not set
925# CONFIG_CRYPTO_KHAZAD is not set 929# CONFIG_CRYPTO_KHAZAD is not set
926# CONFIG_CRYPTO_ANUBIS is not set 930# CONFIG_CRYPTO_ANUBIS is not set
931# CONFIG_CRYPTO_SEED is not set
927# CONFIG_CRYPTO_DEFLATE is not set 932# CONFIG_CRYPTO_DEFLATE is not set
928# CONFIG_CRYPTO_MICHAEL_MIC is not set 933# CONFIG_CRYPTO_MICHAEL_MIC is not set
929# CONFIG_CRYPTO_CRC32C is not set 934# CONFIG_CRYPTO_CRC32C is not set
930# CONFIG_CRYPTO_CAMELLIA is not set 935# CONFIG_CRYPTO_CAMELLIA is not set
936# CONFIG_CRYPTO_AUTHENC is not set
931# CONFIG_CRYPTO_HW is not set 937# CONFIG_CRYPTO_HW is not set
938# CONFIG_PPC_CLOCK is not set
939CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index 259d40d1eb5a..c9af905bbb1d 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:39 2007 4# Thu Dec 6 16:48:31 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -156,6 +162,10 @@ CONFIG_PPC_MPC831x=y
156# Kernel options 162# Kernel options
157# 163#
158# CONFIG_HIGHMEM is not set 164# CONFIG_HIGHMEM is not set
165CONFIG_TICK_ONESHOT=y
166CONFIG_NO_HZ=y
167CONFIG_HIGH_RES_TIMERS=y
168CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 169# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 170CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 171# CONFIG_HZ_300 is not set
@@ -176,6 +186,7 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
179CONFIG_SPLIT_PTLOCK_CPUS=4 190CONFIG_SPLIT_PTLOCK_CPUS=4
180# CONFIG_RESOURCES_64BIT is not set 191# CONFIG_RESOURCES_64BIT is not set
181CONFIG_ZONE_DMA_FLAG=1 192CONFIG_ZONE_DMA_FLAG=1
@@ -184,6 +195,8 @@ CONFIG_VIRT_TO_BUS=y
184CONFIG_PROC_DEVICETREE=y 195CONFIG_PROC_DEVICETREE=y
185# CONFIG_CMDLINE_BOOL is not set 196# CONFIG_CMDLINE_BOOL is not set
186# CONFIG_PM is not set 197# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
187CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
188CONFIG_WANT_DEVICE_TREE=y 201CONFIG_WANT_DEVICE_TREE=y
189CONFIG_DEVICE_TREE="" 202CONFIG_DEVICE_TREE=""
@@ -202,11 +215,8 @@ CONFIG_PCI_SYSCALL=y
202# CONFIG_PCIEPORTBUS is not set 215# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y 216CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set 217# CONFIG_PCI_MSI is not set
218CONFIG_PCI_LEGACY=y
205# CONFIG_PCI_DEBUG is not set 219# CONFIG_PCI_DEBUG is not set
206
207#
208# PCCARD (PCMCIA/CardBus) support
209#
210# CONFIG_PCCARD is not set 220# CONFIG_PCCARD is not set
211# CONFIG_HOTPLUG_PCI is not set 221# CONFIG_HOTPLUG_PCI is not set
212 222
@@ -221,7 +231,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
221CONFIG_HIGHMEM_START=0xfe000000 231CONFIG_HIGHMEM_START=0xfe000000
222CONFIG_LOWMEM_SIZE=0x30000000 232CONFIG_LOWMEM_SIZE=0x30000000
223CONFIG_KERNEL_START=0xc0000000 233CONFIG_KERNEL_START=0xc0000000
224CONFIG_TASK_SIZE=0x80000000 234CONFIG_TASK_SIZE=0xc0000000
225CONFIG_BOOT_LOAD=0x00800000 235CONFIG_BOOT_LOAD=0x00800000
226 236
227# 237#
@@ -261,6 +271,7 @@ CONFIG_SYN_COOKIES=y
261CONFIG_INET_XFRM_MODE_TRANSPORT=y 271CONFIG_INET_XFRM_MODE_TRANSPORT=y
262CONFIG_INET_XFRM_MODE_TUNNEL=y 272CONFIG_INET_XFRM_MODE_TUNNEL=y
263CONFIG_INET_XFRM_MODE_BEET=y 273CONFIG_INET_XFRM_MODE_BEET=y
274# CONFIG_INET_LRO is not set
264CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
265CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
266# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,10 +297,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
286# CONFIG_LAPB is not set 297# CONFIG_LAPB is not set
287# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
288# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
289
290#
291# QoS and/or fair queueing
292#
293# CONFIG_NET_SCHED is not set 300# CONFIG_NET_SCHED is not set
294 301
295# 302#
@@ -318,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# 325#
319# Generic Driver Options 326# Generic Driver Options
320# 327#
328CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
321CONFIG_STANDALONE=y 329CONFIG_STANDALONE=y
322CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
323# CONFIG_FW_LOADER is not set 331# CONFIG_FW_LOADER is not set
@@ -342,6 +350,7 @@ CONFIG_MTD_CHAR=y
342# CONFIG_INFTL is not set 350# CONFIG_INFTL is not set
343# CONFIG_RFD_FTL is not set 351# CONFIG_RFD_FTL is not set
344# CONFIG_SSFDC is not set 352# CONFIG_SSFDC is not set
353# CONFIG_MTD_OOPS is not set
345 354
346# 355#
347# RAM/ROM/Flash chip drivers 356# RAM/ROM/Flash chip drivers
@@ -377,6 +386,7 @@ CONFIG_MTD_PHYSMAP_START=0xfe000000
377CONFIG_MTD_PHYSMAP_LEN=0x1000000 386CONFIG_MTD_PHYSMAP_LEN=0x1000000
378CONFIG_MTD_PHYSMAP_BANKWIDTH=2 387CONFIG_MTD_PHYSMAP_BANKWIDTH=2
379# CONFIG_MTD_PHYSMAP_OF is not set 388# CONFIG_MTD_PHYSMAP_OF is not set
389# CONFIG_MTD_INTEL_VR_NOR is not set
380# CONFIG_MTD_PLATRAM is not set 390# CONFIG_MTD_PLATRAM is not set
381 391
382# 392#
@@ -466,6 +476,7 @@ CONFIG_SCSI_SPI_ATTRS=y
466# CONFIG_SCSI_FC_ATTRS is not set 476# CONFIG_SCSI_FC_ATTRS is not set
467# CONFIG_SCSI_ISCSI_ATTRS is not set 477# CONFIG_SCSI_ISCSI_ATTRS is not set
468# CONFIG_SCSI_SAS_LIBSAS is not set 478# CONFIG_SCSI_SAS_LIBSAS is not set
479# CONFIG_SCSI_SRP_ATTRS is not set
469CONFIG_SCSI_LOWLEVEL=y 480CONFIG_SCSI_LOWLEVEL=y
470# CONFIG_ISCSI_TCP is not set 481# CONFIG_ISCSI_TCP is not set
471# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 482# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -477,6 +488,7 @@ CONFIG_SCSI_LOWLEVEL=y
477# CONFIG_SCSI_AIC79XX is not set 488# CONFIG_SCSI_AIC79XX is not set
478# CONFIG_SCSI_AIC94XX is not set 489# CONFIG_SCSI_AIC94XX is not set
479# CONFIG_SCSI_DPT_I2O is not set 490# CONFIG_SCSI_DPT_I2O is not set
491# CONFIG_SCSI_ADVANSYS is not set
480# CONFIG_SCSI_ARCMSR is not set 492# CONFIG_SCSI_ARCMSR is not set
481# CONFIG_MEGARAID_NEWGEN is not set 493# CONFIG_MEGARAID_NEWGEN is not set
482# CONFIG_MEGARAID_LEGACY is not set 494# CONFIG_MEGARAID_LEGACY is not set
@@ -512,14 +524,7 @@ CONFIG_MD_RAID1=y
512# CONFIG_MD_MULTIPATH is not set 524# CONFIG_MD_MULTIPATH is not set
513# CONFIG_MD_FAULTY is not set 525# CONFIG_MD_FAULTY is not set
514# CONFIG_BLK_DEV_DM is not set 526# CONFIG_BLK_DEV_DM is not set
515
516#
517# Fusion MPT device support
518#
519# CONFIG_FUSION is not set 527# CONFIG_FUSION is not set
520# CONFIG_FUSION_SPI is not set
521# CONFIG_FUSION_FC is not set
522# CONFIG_FUSION_SAS is not set
523 528
524# 529#
525# IEEE 1394 (FireWire) support 530# IEEE 1394 (FireWire) support
@@ -535,6 +540,8 @@ CONFIG_NETDEVICES=y
535# CONFIG_MACVLAN is not set 540# CONFIG_MACVLAN is not set
536# CONFIG_EQUALIZER is not set 541# CONFIG_EQUALIZER is not set
537# CONFIG_TUN is not set 542# CONFIG_TUN is not set
543# CONFIG_VETH is not set
544# CONFIG_IP1000 is not set
538# CONFIG_ARCNET is not set 545# CONFIG_ARCNET is not set
539CONFIG_PHYLIB=y 546CONFIG_PHYLIB=y
540 547
@@ -551,6 +558,7 @@ CONFIG_CICADA_PHY=y
551# CONFIG_BROADCOM_PHY is not set 558# CONFIG_BROADCOM_PHY is not set
552# CONFIG_ICPLUS_PHY is not set 559# CONFIG_ICPLUS_PHY is not set
553# CONFIG_FIXED_PHY is not set 560# CONFIG_FIXED_PHY is not set
561# CONFIG_MDIO_BITBANG is not set
554CONFIG_NET_ETHERNET=y 562CONFIG_NET_ETHERNET=y
555CONFIG_MII=y 563CONFIG_MII=y
556# CONFIG_HAPPYMEAL is not set 564# CONFIG_HAPPYMEAL is not set
@@ -559,13 +567,16 @@ CONFIG_MII=y
559# CONFIG_NET_VENDOR_3COM is not set 567# CONFIG_NET_VENDOR_3COM is not set
560# CONFIG_NET_TULIP is not set 568# CONFIG_NET_TULIP is not set
561# CONFIG_HP100 is not set 569# CONFIG_HP100 is not set
570# CONFIG_IBM_NEW_EMAC_ZMII is not set
571# CONFIG_IBM_NEW_EMAC_RGMII is not set
572# CONFIG_IBM_NEW_EMAC_TAH is not set
573# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
562CONFIG_NET_PCI=y 574CONFIG_NET_PCI=y
563# CONFIG_PCNET32 is not set 575# CONFIG_PCNET32 is not set
564# CONFIG_AMD8111_ETH is not set 576# CONFIG_AMD8111_ETH is not set
565# CONFIG_ADAPTEC_STARFIRE is not set 577# CONFIG_ADAPTEC_STARFIRE is not set
566# CONFIG_B44 is not set 578# CONFIG_B44 is not set
567# CONFIG_FORCEDETH is not set 579# CONFIG_FORCEDETH is not set
568# CONFIG_DGRS is not set
569# CONFIG_EEPRO100 is not set 580# CONFIG_EEPRO100 is not set
570CONFIG_E100=y 581CONFIG_E100=y
571# CONFIG_FEALNX is not set 582# CONFIG_FEALNX is not set
@@ -583,6 +594,7 @@ CONFIG_NETDEV_1000=y
583# CONFIG_ACENIC is not set 594# CONFIG_ACENIC is not set
584# CONFIG_DL2K is not set 595# CONFIG_DL2K is not set
585# CONFIG_E1000 is not set 596# CONFIG_E1000 is not set
597# CONFIG_E1000E is not set
586# CONFIG_NS83820 is not set 598# CONFIG_NS83820 is not set
587# CONFIG_HAMACHI is not set 599# CONFIG_HAMACHI is not set
588# CONFIG_YELLOWFIN is not set 600# CONFIG_YELLOWFIN is not set
@@ -590,6 +602,7 @@ CONFIG_NETDEV_1000=y
590# CONFIG_SIS190 is not set 602# CONFIG_SIS190 is not set
591# CONFIG_SKGE is not set 603# CONFIG_SKGE is not set
592# CONFIG_SKY2 is not set 604# CONFIG_SKY2 is not set
605# CONFIG_SK98LIN is not set
593# CONFIG_VIA_VELOCITY is not set 606# CONFIG_VIA_VELOCITY is not set
594# CONFIG_TIGON3 is not set 607# CONFIG_TIGON3 is not set
595# CONFIG_BNX2 is not set 608# CONFIG_BNX2 is not set
@@ -600,11 +613,14 @@ CONFIG_GFAR_NAPI=y
600CONFIG_NETDEV_10000=y 613CONFIG_NETDEV_10000=y
601# CONFIG_CHELSIO_T1 is not set 614# CONFIG_CHELSIO_T1 is not set
602# CONFIG_CHELSIO_T3 is not set 615# CONFIG_CHELSIO_T3 is not set
616# CONFIG_IXGBE is not set
603# CONFIG_IXGB is not set 617# CONFIG_IXGB is not set
604# CONFIG_S2IO is not set 618# CONFIG_S2IO is not set
605# CONFIG_MYRI10GE is not set 619# CONFIG_MYRI10GE is not set
606# CONFIG_NETXEN_NIC is not set 620# CONFIG_NETXEN_NIC is not set
621# CONFIG_NIU is not set
607# CONFIG_MLX4_CORE is not set 622# CONFIG_MLX4_CORE is not set
623# CONFIG_TEHUTI is not set
608# CONFIG_TR is not set 624# CONFIG_TR is not set
609 625
610# 626#
@@ -620,7 +636,6 @@ CONFIG_NETDEV_10000=y
620# CONFIG_USB_KAWETH is not set 636# CONFIG_USB_KAWETH is not set
621# CONFIG_USB_PEGASUS is not set 637# CONFIG_USB_PEGASUS is not set
622# CONFIG_USB_RTL8150 is not set 638# CONFIG_USB_RTL8150 is not set
623# CONFIG_USB_USBNET_MII is not set
624# CONFIG_USB_USBNET is not set 639# CONFIG_USB_USBNET is not set
625# CONFIG_WAN is not set 640# CONFIG_WAN is not set
626# CONFIG_FDDI is not set 641# CONFIG_FDDI is not set
@@ -647,7 +662,6 @@ CONFIG_INPUT=y
647# 662#
648# CONFIG_INPUT_MOUSEDEV is not set 663# CONFIG_INPUT_MOUSEDEV is not set
649# CONFIG_INPUT_JOYDEV is not set 664# CONFIG_INPUT_JOYDEV is not set
650# CONFIG_INPUT_TSDEV is not set
651# CONFIG_INPUT_EVDEV is not set 665# CONFIG_INPUT_EVDEV is not set
652# CONFIG_INPUT_EVBUG is not set 666# CONFIG_INPUT_EVBUG is not set
653 667
@@ -695,32 +709,11 @@ CONFIG_UNIX98_PTYS=y
695CONFIG_LEGACY_PTYS=y 709CONFIG_LEGACY_PTYS=y
696CONFIG_LEGACY_PTY_COUNT=256 710CONFIG_LEGACY_PTY_COUNT=256
697# CONFIG_IPMI_HANDLER is not set 711# CONFIG_IPMI_HANDLER is not set
698CONFIG_WATCHDOG=y
699# CONFIG_WATCHDOG_NOWAYOUT is not set
700
701#
702# Watchdog Device Drivers
703#
704# CONFIG_SOFT_WATCHDOG is not set
705CONFIG_83xx_WDT=y
706
707#
708# PCI-based Watchdog Cards
709#
710# CONFIG_PCIPCWATCHDOG is not set
711# CONFIG_WDTPCI is not set
712
713#
714# USB-based Watchdog Cards
715#
716# CONFIG_USBPCWATCHDOG is not set
717CONFIG_HW_RANDOM=y 712CONFIG_HW_RANDOM=y
718# CONFIG_NVRAM is not set 713# CONFIG_NVRAM is not set
719# CONFIG_GEN_RTC is not set 714# CONFIG_GEN_RTC is not set
720# CONFIG_R3964 is not set 715# CONFIG_R3964 is not set
721# CONFIG_APPLICOM is not set 716# CONFIG_APPLICOM is not set
722# CONFIG_AGP is not set
723# CONFIG_DRM is not set
724# CONFIG_RAW_DRIVER is not set 717# CONFIG_RAW_DRIVER is not set
725# CONFIG_TCG_TPM is not set 718# CONFIG_TCG_TPM is not set
726CONFIG_DEVPORT=y 719CONFIG_DEVPORT=y
@@ -804,8 +797,6 @@ CONFIG_SPI_MPC83xx=y
804# CONFIG_POWER_SUPPLY is not set 797# CONFIG_POWER_SUPPLY is not set
805CONFIG_HWMON=y 798CONFIG_HWMON=y
806# CONFIG_HWMON_VID is not set 799# CONFIG_HWMON_VID is not set
807# CONFIG_SENSORS_ABITUGURU is not set
808# CONFIG_SENSORS_ABITUGURU3 is not set
809# CONFIG_SENSORS_AD7418 is not set 800# CONFIG_SENSORS_AD7418 is not set
810# CONFIG_SENSORS_ADM1021 is not set 801# CONFIG_SENSORS_ADM1021 is not set
811# CONFIG_SENSORS_ADM1025 is not set 802# CONFIG_SENSORS_ADM1025 is not set
@@ -813,12 +804,13 @@ CONFIG_HWMON=y
813# CONFIG_SENSORS_ADM1029 is not set 804# CONFIG_SENSORS_ADM1029 is not set
814# CONFIG_SENSORS_ADM1031 is not set 805# CONFIG_SENSORS_ADM1031 is not set
815# CONFIG_SENSORS_ADM9240 is not set 806# CONFIG_SENSORS_ADM9240 is not set
816# CONFIG_SENSORS_ASB100 is not set 807# CONFIG_SENSORS_ADT7470 is not set
817# CONFIG_SENSORS_ATXP1 is not set 808# CONFIG_SENSORS_ATXP1 is not set
818# CONFIG_SENSORS_DS1621 is not set 809# CONFIG_SENSORS_DS1621 is not set
810# CONFIG_SENSORS_I5K_AMB is not set
819# CONFIG_SENSORS_F71805F is not set 811# CONFIG_SENSORS_F71805F is not set
820# CONFIG_SENSORS_FSCHER is not set 812# CONFIG_SENSORS_F71882FG is not set
821# CONFIG_SENSORS_FSCPOS is not set 813# CONFIG_SENSORS_F75375S is not set
822# CONFIG_SENSORS_GL518SM is not set 814# CONFIG_SENSORS_GL518SM is not set
823# CONFIG_SENSORS_GL520SM is not set 815# CONFIG_SENSORS_GL520SM is not set
824# CONFIG_SENSORS_IT87 is not set 816# CONFIG_SENSORS_IT87 is not set
@@ -855,6 +847,31 @@ CONFIG_HWMON=y
855# CONFIG_SENSORS_W83627HF is not set 847# CONFIG_SENSORS_W83627HF is not set
856# CONFIG_SENSORS_W83627EHF is not set 848# CONFIG_SENSORS_W83627EHF is not set
857# CONFIG_HWMON_DEBUG_CHIP is not set 849# CONFIG_HWMON_DEBUG_CHIP is not set
850CONFIG_WATCHDOG=y
851# CONFIG_WATCHDOG_NOWAYOUT is not set
852
853#
854# Watchdog Device Drivers
855#
856# CONFIG_SOFT_WATCHDOG is not set
857CONFIG_83xx_WDT=y
858
859#
860# PCI-based Watchdog Cards
861#
862# CONFIG_PCIPCWATCHDOG is not set
863# CONFIG_WDTPCI is not set
864
865#
866# USB-based Watchdog Cards
867#
868# CONFIG_USBPCWATCHDOG is not set
869
870#
871# Sonics Silicon Backplane
872#
873CONFIG_SSB_POSSIBLE=y
874# CONFIG_SSB is not set
858 875
859# 876#
860# Multifunction device drivers 877# Multifunction device drivers
@@ -872,16 +889,17 @@ CONFIG_DAB=y
872# 889#
873# Graphics support 890# Graphics support
874# 891#
892# CONFIG_AGP is not set
893# CONFIG_DRM is not set
894# CONFIG_VGASTATE is not set
895CONFIG_VIDEO_OUTPUT_CONTROL=m
896# CONFIG_FB is not set
875# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 897# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
876 898
877# 899#
878# Display device support 900# Display device support
879# 901#
880# CONFIG_DISPLAY_SUPPORT is not set 902# CONFIG_DISPLAY_SUPPORT is not set
881# CONFIG_VGASTATE is not set
882CONFIG_VIDEO_OUTPUT_CONTROL=m
883# CONFIG_FB is not set
884# CONFIG_FB_IBM_GXT4500 is not set
885 903
886# 904#
887# Sound 905# Sound
@@ -890,6 +908,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
890CONFIG_HID_SUPPORT=y 908CONFIG_HID_SUPPORT=y
891CONFIG_HID=y 909CONFIG_HID=y
892# CONFIG_HID_DEBUG is not set 910# CONFIG_HID_DEBUG is not set
911# CONFIG_HIDRAW is not set
893 912
894# 913#
895# USB Input Devices 914# USB Input Devices
@@ -954,6 +973,7 @@ CONFIG_USB_STORAGE=y
954# CONFIG_USB_STORAGE_DEBUG is not set 973# CONFIG_USB_STORAGE_DEBUG is not set
955# CONFIG_USB_STORAGE_DATAFAB is not set 974# CONFIG_USB_STORAGE_DATAFAB is not set
956# CONFIG_USB_STORAGE_FREECOM is not set 975# CONFIG_USB_STORAGE_FREECOM is not set
976# CONFIG_USB_STORAGE_ISD200 is not set
957# CONFIG_USB_STORAGE_DPCM is not set 977# CONFIG_USB_STORAGE_DPCM is not set
958# CONFIG_USB_STORAGE_USBAT is not set 978# CONFIG_USB_STORAGE_USBAT is not set
959# CONFIG_USB_STORAGE_SDDR09 is not set 979# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -1015,6 +1035,7 @@ CONFIG_USB_GADGET=y
1015# CONFIG_USB_GADGET_DEBUG_FILES is not set 1035# CONFIG_USB_GADGET_DEBUG_FILES is not set
1016CONFIG_USB_GADGET_SELECTED=y 1036CONFIG_USB_GADGET_SELECTED=y
1017# CONFIG_USB_GADGET_AMD5536UDC is not set 1037# CONFIG_USB_GADGET_AMD5536UDC is not set
1038# CONFIG_USB_GADGET_ATMEL_USBA is not set
1018# CONFIG_USB_GADGET_FSL_USB2 is not set 1039# CONFIG_USB_GADGET_FSL_USB2 is not set
1019CONFIG_USB_GADGET_NET2280=y 1040CONFIG_USB_GADGET_NET2280=y
1020CONFIG_USB_NET2280=y 1041CONFIG_USB_NET2280=y
@@ -1057,6 +1078,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1057# I2C RTC drivers 1078# I2C RTC drivers
1058# 1079#
1059CONFIG_RTC_DRV_DS1307=y 1080CONFIG_RTC_DRV_DS1307=y
1081# CONFIG_RTC_DRV_DS1374 is not set
1060# CONFIG_RTC_DRV_DS1672 is not set 1082# CONFIG_RTC_DRV_DS1672 is not set
1061# CONFIG_RTC_DRV_MAX6900 is not set 1083# CONFIG_RTC_DRV_MAX6900 is not set
1062# CONFIG_RTC_DRV_RS5C372 is not set 1084# CONFIG_RTC_DRV_RS5C372 is not set
@@ -1088,21 +1110,6 @@ CONFIG_RTC_DRV_DS1307=y
1088# 1110#
1089 1111
1090# 1112#
1091# DMA Engine support
1092#
1093CONFIG_DMA_ENGINE=y
1094
1095#
1096# DMA Clients
1097#
1098CONFIG_NET_DMA=y
1099
1100#
1101# DMA Devices
1102#
1103CONFIG_INTEL_IOATDMA=y
1104
1105#
1106# Userspace I/O 1113# Userspace I/O
1107# 1114#
1108# CONFIG_UIO is not set 1115# CONFIG_UIO is not set
@@ -1119,7 +1126,6 @@ CONFIG_EXT3_FS_XATTR=y
1119# CONFIG_EXT3_FS_SECURITY is not set 1126# CONFIG_EXT3_FS_SECURITY is not set
1120# CONFIG_EXT4DEV_FS is not set 1127# CONFIG_EXT4DEV_FS is not set
1121CONFIG_JBD=y 1128CONFIG_JBD=y
1122# CONFIG_JBD_DEBUG is not set
1123CONFIG_FS_MBCACHE=y 1129CONFIG_FS_MBCACHE=y
1124# CONFIG_REISERFS_FS is not set 1130# CONFIG_REISERFS_FS is not set
1125# CONFIG_JFS_FS is not set 1131# CONFIG_JFS_FS is not set
@@ -1160,7 +1166,6 @@ CONFIG_SYSFS=y
1160CONFIG_TMPFS=y 1166CONFIG_TMPFS=y
1161# CONFIG_TMPFS_POSIX_ACL is not set 1167# CONFIG_TMPFS_POSIX_ACL is not set
1162# CONFIG_HUGETLB_PAGE is not set 1168# CONFIG_HUGETLB_PAGE is not set
1163CONFIG_RAMFS=y
1164# CONFIG_CONFIGFS_FS is not set 1169# CONFIG_CONFIGFS_FS is not set
1165 1170
1166# 1171#
@@ -1180,10 +1185,7 @@ CONFIG_RAMFS=y
1180# CONFIG_QNX4FS_FS is not set 1185# CONFIG_QNX4FS_FS is not set
1181# CONFIG_SYSV_FS is not set 1186# CONFIG_SYSV_FS is not set
1182# CONFIG_UFS_FS is not set 1187# CONFIG_UFS_FS is not set
1183 1188CONFIG_NETWORK_FILESYSTEMS=y
1184#
1185# Network File Systems
1186#
1187CONFIG_NFS_FS=y 1189CONFIG_NFS_FS=y
1188CONFIG_NFS_V3=y 1190CONFIG_NFS_V3=y
1189# CONFIG_NFS_V3_ACL is not set 1191# CONFIG_NFS_V3_ACL is not set
@@ -1226,15 +1228,7 @@ CONFIG_MSDOS_PARTITION=y
1226# CONFIG_KARMA_PARTITION is not set 1228# CONFIG_KARMA_PARTITION is not set
1227# CONFIG_EFI_PARTITION is not set 1229# CONFIG_EFI_PARTITION is not set
1228# CONFIG_SYSV68_PARTITION is not set 1230# CONFIG_SYSV68_PARTITION is not set
1229
1230#
1231# Native Language Support
1232#
1233# CONFIG_NLS is not set 1231# CONFIG_NLS is not set
1234
1235#
1236# Distributed Lock Manager
1237#
1238# CONFIG_DLM is not set 1232# CONFIG_DLM is not set
1239# CONFIG_UCC_SLOW is not set 1233# CONFIG_UCC_SLOW is not set
1240 1234
@@ -1252,16 +1246,13 @@ CONFIG_PLIST=y
1252CONFIG_HAS_IOMEM=y 1246CONFIG_HAS_IOMEM=y
1253CONFIG_HAS_IOPORT=y 1247CONFIG_HAS_IOPORT=y
1254CONFIG_HAS_DMA=y 1248CONFIG_HAS_DMA=y
1255 1249# CONFIG_INSTRUMENTATION is not set
1256#
1257# Instrumentation Support
1258#
1259# CONFIG_PROFILING is not set
1260 1250
1261# 1251#
1262# Kernel hacking 1252# Kernel hacking
1263# 1253#
1264# CONFIG_PRINTK_TIME is not set 1254# CONFIG_PRINTK_TIME is not set
1255CONFIG_ENABLE_WARN_DEPRECATED=y
1265CONFIG_ENABLE_MUST_CHECK=y 1256CONFIG_ENABLE_MUST_CHECK=y
1266# CONFIG_MAGIC_SYSRQ is not set 1257# CONFIG_MAGIC_SYSRQ is not set
1267# CONFIG_UNUSED_SYMBOLS is not set 1258# CONFIG_UNUSED_SYMBOLS is not set
@@ -1285,9 +1276,12 @@ CONFIG_SCHED_DEBUG=y
1285# CONFIG_DEBUG_INFO is not set 1276# CONFIG_DEBUG_INFO is not set
1286# CONFIG_DEBUG_VM is not set 1277# CONFIG_DEBUG_VM is not set
1287# CONFIG_DEBUG_LIST is not set 1278# CONFIG_DEBUG_LIST is not set
1279# CONFIG_DEBUG_SG is not set
1288CONFIG_FORCED_INLINING=y 1280CONFIG_FORCED_INLINING=y
1281# CONFIG_BOOT_PRINTK_DELAY is not set
1289# CONFIG_RCU_TORTURE_TEST is not set 1282# CONFIG_RCU_TORTURE_TEST is not set
1290# CONFIG_FAULT_INJECTION is not set 1283# CONFIG_FAULT_INJECTION is not set
1284# CONFIG_SAMPLES is not set
1291# CONFIG_DEBUG_STACKOVERFLOW is not set 1285# CONFIG_DEBUG_STACKOVERFLOW is not set
1292# CONFIG_DEBUG_STACK_USAGE is not set 1286# CONFIG_DEBUG_STACK_USAGE is not set
1293# CONFIG_DEBUG_PAGEALLOC is not set 1287# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1300,6 +1294,7 @@ CONFIG_FORCED_INLINING=y
1300# 1294#
1301# CONFIG_KEYS is not set 1295# CONFIG_KEYS is not set
1302# CONFIG_SECURITY is not set 1296# CONFIG_SECURITY is not set
1297# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1303CONFIG_CRYPTO=y 1298CONFIG_CRYPTO=y
1304CONFIG_CRYPTO_ALGAPI=y 1299CONFIG_CRYPTO_ALGAPI=y
1305CONFIG_CRYPTO_BLKCIPHER=y 1300CONFIG_CRYPTO_BLKCIPHER=y
@@ -1319,6 +1314,7 @@ CONFIG_CRYPTO_MD5=y
1319CONFIG_CRYPTO_CBC=y 1314CONFIG_CRYPTO_CBC=y
1320CONFIG_CRYPTO_PCBC=m 1315CONFIG_CRYPTO_PCBC=m
1321# CONFIG_CRYPTO_LRW is not set 1316# CONFIG_CRYPTO_LRW is not set
1317# CONFIG_CRYPTO_XTS is not set
1322# CONFIG_CRYPTO_CRYPTD is not set 1318# CONFIG_CRYPTO_CRYPTD is not set
1323CONFIG_CRYPTO_DES=y 1319CONFIG_CRYPTO_DES=y
1324# CONFIG_CRYPTO_FCRYPT is not set 1320# CONFIG_CRYPTO_FCRYPT is not set
@@ -1332,9 +1328,12 @@ CONFIG_CRYPTO_DES=y
1332# CONFIG_CRYPTO_ARC4 is not set 1328# CONFIG_CRYPTO_ARC4 is not set
1333# CONFIG_CRYPTO_KHAZAD is not set 1329# CONFIG_CRYPTO_KHAZAD is not set
1334# CONFIG_CRYPTO_ANUBIS is not set 1330# CONFIG_CRYPTO_ANUBIS is not set
1331# CONFIG_CRYPTO_SEED is not set
1335# CONFIG_CRYPTO_DEFLATE is not set 1332# CONFIG_CRYPTO_DEFLATE is not set
1336# CONFIG_CRYPTO_MICHAEL_MIC is not set 1333# CONFIG_CRYPTO_MICHAEL_MIC is not set
1337# CONFIG_CRYPTO_CRC32C is not set 1334# CONFIG_CRYPTO_CRC32C is not set
1338# CONFIG_CRYPTO_CAMELLIA is not set 1335# CONFIG_CRYPTO_CAMELLIA is not set
1339# CONFIG_CRYPTO_TEST is not set 1336# CONFIG_CRYPTO_TEST is not set
1337# CONFIG_CRYPTO_AUTHENC is not set
1340CONFIG_CRYPTO_HW=y 1338CONFIG_CRYPTO_HW=y
1339# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index e069018276ca..2d8951b1096e 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:40 2007 4# Thu Dec 6 16:48:33 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -157,6 +163,10 @@ CONFIG_QUICC_ENGINE=y
157# Kernel options 163# Kernel options
158# 164#
159# CONFIG_HIGHMEM is not set 165# CONFIG_HIGHMEM is not set
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
160# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
161CONFIG_HZ_250=y 171CONFIG_HZ_250=y
162# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -178,6 +188,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 188CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 189CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 190# CONFIG_SPARSEMEM_STATIC is not set
191# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
181CONFIG_SPLIT_PTLOCK_CPUS=4 192CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_RESOURCES_64BIT is not set 193# CONFIG_RESOURCES_64BIT is not set
183CONFIG_ZONE_DMA_FLAG=1 194CONFIG_ZONE_DMA_FLAG=1
@@ -186,6 +197,8 @@ CONFIG_VIRT_TO_BUS=y
186CONFIG_PROC_DEVICETREE=y 197CONFIG_PROC_DEVICETREE=y
187# CONFIG_CMDLINE_BOOL is not set 198# CONFIG_CMDLINE_BOOL is not set
188# CONFIG_PM is not set 199# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
189CONFIG_SECCOMP=y 202CONFIG_SECCOMP=y
190CONFIG_WANT_DEVICE_TREE=y 203CONFIG_WANT_DEVICE_TREE=y
191CONFIG_DEVICE_TREE="" 204CONFIG_DEVICE_TREE=""
@@ -204,10 +217,7 @@ CONFIG_PCI_SYSCALL=y
204# CONFIG_PCIEPORTBUS is not set 217# CONFIG_PCIEPORTBUS is not set
205CONFIG_ARCH_SUPPORTS_MSI=y 218CONFIG_ARCH_SUPPORTS_MSI=y
206# CONFIG_PCI_MSI is not set 219# CONFIG_PCI_MSI is not set
207 220CONFIG_PCI_LEGACY=y
208#
209# PCCARD (PCMCIA/CardBus) support
210#
211# CONFIG_PCCARD is not set 221# CONFIG_PCCARD is not set
212# CONFIG_HOTPLUG_PCI is not set 222# CONFIG_HOTPLUG_PCI is not set
213 223
@@ -222,7 +232,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
222CONFIG_HIGHMEM_START=0xfe000000 232CONFIG_HIGHMEM_START=0xfe000000
223CONFIG_LOWMEM_SIZE=0x30000000 233CONFIG_LOWMEM_SIZE=0x30000000
224CONFIG_KERNEL_START=0xc0000000 234CONFIG_KERNEL_START=0xc0000000
225CONFIG_TASK_SIZE=0x80000000 235CONFIG_TASK_SIZE=0xc0000000
226CONFIG_BOOT_LOAD=0x00800000 236CONFIG_BOOT_LOAD=0x00800000
227 237
228# 238#
@@ -262,6 +272,7 @@ CONFIG_SYN_COOKIES=y
262CONFIG_INET_XFRM_MODE_TRANSPORT=y 272CONFIG_INET_XFRM_MODE_TRANSPORT=y
263CONFIG_INET_XFRM_MODE_TUNNEL=y 273CONFIG_INET_XFRM_MODE_TUNNEL=y
264CONFIG_INET_XFRM_MODE_BEET=y 274CONFIG_INET_XFRM_MODE_BEET=y
275# CONFIG_INET_LRO is not set
265CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
@@ -287,10 +298,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
287# CONFIG_LAPB is not set 298# CONFIG_LAPB is not set
288# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
290
291#
292# QoS and/or fair queueing
293#
294# CONFIG_NET_SCHED is not set 301# CONFIG_NET_SCHED is not set
295 302
296# 303#
@@ -319,6 +326,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# 326#
320# Generic Driver Options 327# Generic Driver Options
321# 328#
329CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
322CONFIG_STANDALONE=y 330CONFIG_STANDALONE=y
323CONFIG_PREVENT_FIRMWARE_BUILD=y 331CONFIG_PREVENT_FIRMWARE_BUILD=y
324# CONFIG_FW_LOADER is not set 332# CONFIG_FW_LOADER is not set
@@ -387,6 +395,7 @@ CONFIG_SCSI_WAIT_SCAN=m
387# CONFIG_SCSI_FC_ATTRS is not set 395# CONFIG_SCSI_FC_ATTRS is not set
388# CONFIG_SCSI_ISCSI_ATTRS is not set 396# CONFIG_SCSI_ISCSI_ATTRS is not set
389# CONFIG_SCSI_SAS_LIBSAS is not set 397# CONFIG_SCSI_SAS_LIBSAS is not set
398# CONFIG_SCSI_SRP_ATTRS is not set
390CONFIG_SCSI_LOWLEVEL=y 399CONFIG_SCSI_LOWLEVEL=y
391# CONFIG_ISCSI_TCP is not set 400# CONFIG_ISCSI_TCP is not set
392# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 401# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -398,6 +407,7 @@ CONFIG_SCSI_LOWLEVEL=y
398# CONFIG_SCSI_AIC79XX is not set 407# CONFIG_SCSI_AIC79XX is not set
399# CONFIG_SCSI_AIC94XX is not set 408# CONFIG_SCSI_AIC94XX is not set
400# CONFIG_SCSI_DPT_I2O is not set 409# CONFIG_SCSI_DPT_I2O is not set
410# CONFIG_SCSI_ADVANSYS is not set
401# CONFIG_SCSI_ARCMSR is not set 411# CONFIG_SCSI_ARCMSR is not set
402# CONFIG_MEGARAID_NEWGEN is not set 412# CONFIG_MEGARAID_NEWGEN is not set
403# CONFIG_MEGARAID_LEGACY is not set 413# CONFIG_MEGARAID_LEGACY is not set
@@ -424,14 +434,7 @@ CONFIG_SCSI_LOWLEVEL=y
424# CONFIG_SCSI_SRP is not set 434# CONFIG_SCSI_SRP is not set
425# CONFIG_ATA is not set 435# CONFIG_ATA is not set
426# CONFIG_MD is not set 436# CONFIG_MD is not set
427
428#
429# Fusion MPT device support
430#
431# CONFIG_FUSION is not set 437# CONFIG_FUSION is not set
432# CONFIG_FUSION_SPI is not set
433# CONFIG_FUSION_FC is not set
434# CONFIG_FUSION_SAS is not set
435 438
436# 439#
437# IEEE 1394 (FireWire) support 440# IEEE 1394 (FireWire) support
@@ -447,6 +450,8 @@ CONFIG_NETDEVICES=y
447# CONFIG_MACVLAN is not set 450# CONFIG_MACVLAN is not set
448# CONFIG_EQUALIZER is not set 451# CONFIG_EQUALIZER is not set
449# CONFIG_TUN is not set 452# CONFIG_TUN is not set
453# CONFIG_VETH is not set
454# CONFIG_IP1000 is not set
450# CONFIG_ARCNET is not set 455# CONFIG_ARCNET is not set
451CONFIG_PHYLIB=y 456CONFIG_PHYLIB=y
452 457
@@ -463,6 +468,7 @@ CONFIG_DAVICOM_PHY=y
463# CONFIG_BROADCOM_PHY is not set 468# CONFIG_BROADCOM_PHY is not set
464# CONFIG_ICPLUS_PHY is not set 469# CONFIG_ICPLUS_PHY is not set
465# CONFIG_FIXED_PHY is not set 470# CONFIG_FIXED_PHY is not set
471# CONFIG_MDIO_BITBANG is not set
466CONFIG_NET_ETHERNET=y 472CONFIG_NET_ETHERNET=y
467CONFIG_MII=y 473CONFIG_MII=y
468# CONFIG_HAPPYMEAL is not set 474# CONFIG_HAPPYMEAL is not set
@@ -471,11 +477,17 @@ CONFIG_MII=y
471# CONFIG_NET_VENDOR_3COM is not set 477# CONFIG_NET_VENDOR_3COM is not set
472# CONFIG_NET_TULIP is not set 478# CONFIG_NET_TULIP is not set
473# CONFIG_HP100 is not set 479# CONFIG_HP100 is not set
480# CONFIG_IBM_NEW_EMAC_ZMII is not set
481# CONFIG_IBM_NEW_EMAC_RGMII is not set
482# CONFIG_IBM_NEW_EMAC_TAH is not set
483# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
474# CONFIG_NET_PCI is not set 484# CONFIG_NET_PCI is not set
485# CONFIG_B44 is not set
475CONFIG_NETDEV_1000=y 486CONFIG_NETDEV_1000=y
476# CONFIG_ACENIC is not set 487# CONFIG_ACENIC is not set
477# CONFIG_DL2K is not set 488# CONFIG_DL2K is not set
478# CONFIG_E1000 is not set 489# CONFIG_E1000 is not set
490# CONFIG_E1000E is not set
479# CONFIG_NS83820 is not set 491# CONFIG_NS83820 is not set
480# CONFIG_HAMACHI is not set 492# CONFIG_HAMACHI is not set
481# CONFIG_YELLOWFIN is not set 493# CONFIG_YELLOWFIN is not set
@@ -483,6 +495,7 @@ CONFIG_NETDEV_1000=y
483# CONFIG_SIS190 is not set 495# CONFIG_SIS190 is not set
484# CONFIG_SKGE is not set 496# CONFIG_SKGE is not set
485# CONFIG_SKY2 is not set 497# CONFIG_SKY2 is not set
498# CONFIG_SK98LIN is not set
486# CONFIG_VIA_VELOCITY is not set 499# CONFIG_VIA_VELOCITY is not set
487# CONFIG_TIGON3 is not set 500# CONFIG_TIGON3 is not set
488# CONFIG_BNX2 is not set 501# CONFIG_BNX2 is not set
@@ -497,11 +510,14 @@ CONFIG_UCC_GETH=y
497CONFIG_NETDEV_10000=y 510CONFIG_NETDEV_10000=y
498# CONFIG_CHELSIO_T1 is not set 511# CONFIG_CHELSIO_T1 is not set
499# CONFIG_CHELSIO_T3 is not set 512# CONFIG_CHELSIO_T3 is not set
513# CONFIG_IXGBE is not set
500# CONFIG_IXGB is not set 514# CONFIG_IXGB is not set
501# CONFIG_S2IO is not set 515# CONFIG_S2IO is not set
502# CONFIG_MYRI10GE is not set 516# CONFIG_MYRI10GE is not set
503# CONFIG_NETXEN_NIC is not set 517# CONFIG_NETXEN_NIC is not set
518# CONFIG_NIU is not set
504# CONFIG_MLX4_CORE is not set 519# CONFIG_MLX4_CORE is not set
520# CONFIG_TEHUTI is not set
505# CONFIG_TR is not set 521# CONFIG_TR is not set
506 522
507# 523#
@@ -534,7 +550,6 @@ CONFIG_INPUT=y
534# 550#
535# CONFIG_INPUT_MOUSEDEV is not set 551# CONFIG_INPUT_MOUSEDEV is not set
536# CONFIG_INPUT_JOYDEV is not set 552# CONFIG_INPUT_JOYDEV is not set
537# CONFIG_INPUT_TSDEV is not set
538# CONFIG_INPUT_EVDEV is not set 553# CONFIG_INPUT_EVDEV is not set
539# CONFIG_INPUT_EVBUG is not set 554# CONFIG_INPUT_EVBUG is not set
540 555
@@ -582,28 +597,12 @@ CONFIG_UNIX98_PTYS=y
582CONFIG_LEGACY_PTYS=y 597CONFIG_LEGACY_PTYS=y
583CONFIG_LEGACY_PTY_COUNT=256 598CONFIG_LEGACY_PTY_COUNT=256
584# CONFIG_IPMI_HANDLER is not set 599# CONFIG_IPMI_HANDLER is not set
585CONFIG_WATCHDOG=y
586# CONFIG_WATCHDOG_NOWAYOUT is not set
587
588#
589# Watchdog Device Drivers
590#
591# CONFIG_SOFT_WATCHDOG is not set
592CONFIG_83xx_WDT=y
593
594#
595# PCI-based Watchdog Cards
596#
597# CONFIG_PCIPCWATCHDOG is not set
598# CONFIG_WDTPCI is not set
599CONFIG_HW_RANDOM=y 600CONFIG_HW_RANDOM=y
600# CONFIG_NVRAM is not set 601# CONFIG_NVRAM is not set
601CONFIG_GEN_RTC=y 602CONFIG_GEN_RTC=y
602# CONFIG_GEN_RTC_X is not set 603# CONFIG_GEN_RTC_X is not set
603# CONFIG_R3964 is not set 604# CONFIG_R3964 is not set
604# CONFIG_APPLICOM is not set 605# CONFIG_APPLICOM is not set
605# CONFIG_AGP is not set
606# CONFIG_DRM is not set
607# CONFIG_RAW_DRIVER is not set 606# CONFIG_RAW_DRIVER is not set
608# CONFIG_TCG_TPM is not set 607# CONFIG_TCG_TPM is not set
609CONFIG_DEVPORT=y 608CONFIG_DEVPORT=y
@@ -672,8 +671,6 @@ CONFIG_I2C_MPC=y
672# CONFIG_POWER_SUPPLY is not set 671# CONFIG_POWER_SUPPLY is not set
673CONFIG_HWMON=y 672CONFIG_HWMON=y
674# CONFIG_HWMON_VID is not set 673# CONFIG_HWMON_VID is not set
675# CONFIG_SENSORS_ABITUGURU is not set
676# CONFIG_SENSORS_ABITUGURU3 is not set
677# CONFIG_SENSORS_AD7418 is not set 674# CONFIG_SENSORS_AD7418 is not set
678# CONFIG_SENSORS_ADM1021 is not set 675# CONFIG_SENSORS_ADM1021 is not set
679# CONFIG_SENSORS_ADM1025 is not set 676# CONFIG_SENSORS_ADM1025 is not set
@@ -681,12 +678,13 @@ CONFIG_HWMON=y
681# CONFIG_SENSORS_ADM1029 is not set 678# CONFIG_SENSORS_ADM1029 is not set
682# CONFIG_SENSORS_ADM1031 is not set 679# CONFIG_SENSORS_ADM1031 is not set
683# CONFIG_SENSORS_ADM9240 is not set 680# CONFIG_SENSORS_ADM9240 is not set
684# CONFIG_SENSORS_ASB100 is not set 681# CONFIG_SENSORS_ADT7470 is not set
685# CONFIG_SENSORS_ATXP1 is not set 682# CONFIG_SENSORS_ATXP1 is not set
686# CONFIG_SENSORS_DS1621 is not set 683# CONFIG_SENSORS_DS1621 is not set
684# CONFIG_SENSORS_I5K_AMB is not set
687# CONFIG_SENSORS_F71805F is not set 685# CONFIG_SENSORS_F71805F is not set
688# CONFIG_SENSORS_FSCHER is not set 686# CONFIG_SENSORS_F71882FG is not set
689# CONFIG_SENSORS_FSCPOS is not set 687# CONFIG_SENSORS_F75375S is not set
690# CONFIG_SENSORS_GL518SM is not set 688# CONFIG_SENSORS_GL518SM is not set
691# CONFIG_SENSORS_GL520SM is not set 689# CONFIG_SENSORS_GL520SM is not set
692# CONFIG_SENSORS_IT87 is not set 690# CONFIG_SENSORS_IT87 is not set
@@ -722,6 +720,26 @@ CONFIG_HWMON=y
722# CONFIG_SENSORS_W83627HF is not set 720# CONFIG_SENSORS_W83627HF is not set
723# CONFIG_SENSORS_W83627EHF is not set 721# CONFIG_SENSORS_W83627EHF is not set
724# CONFIG_HWMON_DEBUG_CHIP is not set 722# CONFIG_HWMON_DEBUG_CHIP is not set
723CONFIG_WATCHDOG=y
724# CONFIG_WATCHDOG_NOWAYOUT is not set
725
726#
727# Watchdog Device Drivers
728#
729# CONFIG_SOFT_WATCHDOG is not set
730CONFIG_83xx_WDT=y
731
732#
733# PCI-based Watchdog Cards
734#
735# CONFIG_PCIPCWATCHDOG is not set
736# CONFIG_WDTPCI is not set
737
738#
739# Sonics Silicon Backplane
740#
741CONFIG_SSB_POSSIBLE=y
742# CONFIG_SSB is not set
725 743
726# 744#
727# Multifunction device drivers 745# Multifunction device drivers
@@ -738,16 +756,17 @@ CONFIG_DAB=y
738# 756#
739# Graphics support 757# Graphics support
740# 758#
759# CONFIG_AGP is not set
760# CONFIG_DRM is not set
761# CONFIG_VGASTATE is not set
762CONFIG_VIDEO_OUTPUT_CONTROL=m
763# CONFIG_FB is not set
741# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 764# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
742 765
743# 766#
744# Display device support 767# Display device support
745# 768#
746# CONFIG_DISPLAY_SUPPORT is not set 769# CONFIG_DISPLAY_SUPPORT is not set
747# CONFIG_VGASTATE is not set
748CONFIG_VIDEO_OUTPUT_CONTROL=m
749# CONFIG_FB is not set
750# CONFIG_FB_IBM_GXT4500 is not set
751 770
752# 771#
753# Sound 772# Sound
@@ -756,6 +775,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
756CONFIG_HID_SUPPORT=y 775CONFIG_HID_SUPPORT=y
757CONFIG_HID=y 776CONFIG_HID=y
758# CONFIG_HID_DEBUG is not set 777# CONFIG_HID_DEBUG is not set
778# CONFIG_HIDRAW is not set
759CONFIG_USB_SUPPORT=y 779CONFIG_USB_SUPPORT=y
760CONFIG_USB_ARCH_HAS_HCD=y 780CONFIG_USB_ARCH_HAS_HCD=y
761CONFIG_USB_ARCH_HAS_OHCI=y 781CONFIG_USB_ARCH_HAS_OHCI=y
@@ -823,19 +843,6 @@ CONFIG_RTC_DRV_DS1374=y
823# 843#
824 844
825# 845#
826# DMA Engine support
827#
828# CONFIG_DMA_ENGINE is not set
829
830#
831# DMA Clients
832#
833
834#
835# DMA Devices
836#
837
838#
839# Userspace I/O 846# Userspace I/O
840# 847#
841# CONFIG_UIO is not set 848# CONFIG_UIO is not set
@@ -852,7 +859,6 @@ CONFIG_EXT3_FS_XATTR=y
852# CONFIG_EXT3_FS_SECURITY is not set 859# CONFIG_EXT3_FS_SECURITY is not set
853# CONFIG_EXT4DEV_FS is not set 860# CONFIG_EXT4DEV_FS is not set
854CONFIG_JBD=y 861CONFIG_JBD=y
855# CONFIG_JBD_DEBUG is not set
856CONFIG_FS_MBCACHE=y 862CONFIG_FS_MBCACHE=y
857# CONFIG_REISERFS_FS is not set 863# CONFIG_REISERFS_FS is not set
858# CONFIG_JFS_FS is not set 864# CONFIG_JFS_FS is not set
@@ -893,7 +899,6 @@ CONFIG_SYSFS=y
893CONFIG_TMPFS=y 899CONFIG_TMPFS=y
894# CONFIG_TMPFS_POSIX_ACL is not set 900# CONFIG_TMPFS_POSIX_ACL is not set
895# CONFIG_HUGETLB_PAGE is not set 901# CONFIG_HUGETLB_PAGE is not set
896CONFIG_RAMFS=y
897# CONFIG_CONFIGFS_FS is not set 902# CONFIG_CONFIGFS_FS is not set
898 903
899# 904#
@@ -912,10 +917,7 @@ CONFIG_RAMFS=y
912# CONFIG_QNX4FS_FS is not set 917# CONFIG_QNX4FS_FS is not set
913# CONFIG_SYSV_FS is not set 918# CONFIG_SYSV_FS is not set
914# CONFIG_UFS_FS is not set 919# CONFIG_UFS_FS is not set
915 920CONFIG_NETWORK_FILESYSTEMS=y
916#
917# Network File Systems
918#
919CONFIG_NFS_FS=y 921CONFIG_NFS_FS=y
920CONFIG_NFS_V3=y 922CONFIG_NFS_V3=y
921# CONFIG_NFS_V3_ACL is not set 923# CONFIG_NFS_V3_ACL is not set
@@ -954,15 +956,7 @@ CONFIG_PARTITION_ADVANCED=y
954# CONFIG_KARMA_PARTITION is not set 956# CONFIG_KARMA_PARTITION is not set
955# CONFIG_EFI_PARTITION is not set 957# CONFIG_EFI_PARTITION is not set
956# CONFIG_SYSV68_PARTITION is not set 958# CONFIG_SYSV68_PARTITION is not set
957
958#
959# Native Language Support
960#
961# CONFIG_NLS is not set 959# CONFIG_NLS is not set
962
963#
964# Distributed Lock Manager
965#
966# CONFIG_DLM is not set 960# CONFIG_DLM is not set
967# CONFIG_UCC_SLOW is not set 961# CONFIG_UCC_SLOW is not set
968CONFIG_UCC_FAST=y 962CONFIG_UCC_FAST=y
@@ -982,23 +976,22 @@ CONFIG_PLIST=y
982CONFIG_HAS_IOMEM=y 976CONFIG_HAS_IOMEM=y
983CONFIG_HAS_IOPORT=y 977CONFIG_HAS_IOPORT=y
984CONFIG_HAS_DMA=y 978CONFIG_HAS_DMA=y
985 979# CONFIG_INSTRUMENTATION is not set
986#
987# Instrumentation Support
988#
989# CONFIG_PROFILING is not set
990 980
991# 981#
992# Kernel hacking 982# Kernel hacking
993# 983#
994# CONFIG_PRINTK_TIME is not set 984# CONFIG_PRINTK_TIME is not set
985CONFIG_ENABLE_WARN_DEPRECATED=y
995CONFIG_ENABLE_MUST_CHECK=y 986CONFIG_ENABLE_MUST_CHECK=y
996# CONFIG_MAGIC_SYSRQ is not set 987# CONFIG_MAGIC_SYSRQ is not set
997# CONFIG_UNUSED_SYMBOLS is not set 988# CONFIG_UNUSED_SYMBOLS is not set
998# CONFIG_DEBUG_FS is not set 989# CONFIG_DEBUG_FS is not set
999# CONFIG_HEADERS_CHECK is not set 990# CONFIG_HEADERS_CHECK is not set
1000# CONFIG_DEBUG_KERNEL is not set 991# CONFIG_DEBUG_KERNEL is not set
992# CONFIG_SLUB_DEBUG_ON is not set
1001# CONFIG_DEBUG_BUGVERBOSE is not set 993# CONFIG_DEBUG_BUGVERBOSE is not set
994# CONFIG_SAMPLES is not set
1002# CONFIG_PPC_EARLY_DEBUG is not set 995# CONFIG_PPC_EARLY_DEBUG is not set
1003 996
1004# 997#
@@ -1006,6 +999,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1006# 999#
1007# CONFIG_KEYS is not set 1000# CONFIG_KEYS is not set
1008# CONFIG_SECURITY is not set 1001# CONFIG_SECURITY is not set
1002# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1009CONFIG_CRYPTO=y 1003CONFIG_CRYPTO=y
1010CONFIG_CRYPTO_ALGAPI=y 1004CONFIG_CRYPTO_ALGAPI=y
1011CONFIG_CRYPTO_BLKCIPHER=y 1005CONFIG_CRYPTO_BLKCIPHER=y
@@ -1025,6 +1019,7 @@ CONFIG_CRYPTO_ECB=m
1025CONFIG_CRYPTO_CBC=y 1019CONFIG_CRYPTO_CBC=y
1026CONFIG_CRYPTO_PCBC=m 1020CONFIG_CRYPTO_PCBC=m
1027# CONFIG_CRYPTO_LRW is not set 1021# CONFIG_CRYPTO_LRW is not set
1022# CONFIG_CRYPTO_XTS is not set
1028# CONFIG_CRYPTO_CRYPTD is not set 1023# CONFIG_CRYPTO_CRYPTD is not set
1029CONFIG_CRYPTO_DES=y 1024CONFIG_CRYPTO_DES=y
1030# CONFIG_CRYPTO_FCRYPT is not set 1025# CONFIG_CRYPTO_FCRYPT is not set
@@ -1038,9 +1033,13 @@ CONFIG_CRYPTO_DES=y
1038# CONFIG_CRYPTO_ARC4 is not set 1033# CONFIG_CRYPTO_ARC4 is not set
1039# CONFIG_CRYPTO_KHAZAD is not set 1034# CONFIG_CRYPTO_KHAZAD is not set
1040# CONFIG_CRYPTO_ANUBIS is not set 1035# CONFIG_CRYPTO_ANUBIS is not set
1036# CONFIG_CRYPTO_SEED is not set
1041# CONFIG_CRYPTO_DEFLATE is not set 1037# CONFIG_CRYPTO_DEFLATE is not set
1042# CONFIG_CRYPTO_MICHAEL_MIC is not set 1038# CONFIG_CRYPTO_MICHAEL_MIC is not set
1043# CONFIG_CRYPTO_CRC32C is not set 1039# CONFIG_CRYPTO_CRC32C is not set
1044# CONFIG_CRYPTO_CAMELLIA is not set 1040# CONFIG_CRYPTO_CAMELLIA is not set
1045# CONFIG_CRYPTO_TEST is not set 1041# CONFIG_CRYPTO_TEST is not set
1042# CONFIG_CRYPTO_AUTHENC is not set
1046CONFIG_CRYPTO_HW=y 1043CONFIG_CRYPTO_HW=y
1044# CONFIG_PPC_CLOCK is not set
1045CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 7a5b13f4140f..761718a63b7c 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:27:19 2007 4# Thu Dec 6 16:48:35 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -157,6 +163,10 @@ CONFIG_QUICC_ENGINE=y
157# Kernel options 163# Kernel options
158# 164#
159# CONFIG_HIGHMEM is not set 165# CONFIG_HIGHMEM is not set
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
160# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
161CONFIG_HZ_250=y 171CONFIG_HZ_250=y
162# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -178,6 +188,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 188CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 189CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 190# CONFIG_SPARSEMEM_STATIC is not set
191# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
181CONFIG_SPLIT_PTLOCK_CPUS=4 192CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_RESOURCES_64BIT is not set 193# CONFIG_RESOURCES_64BIT is not set
183CONFIG_ZONE_DMA_FLAG=1 194CONFIG_ZONE_DMA_FLAG=1
@@ -186,6 +197,8 @@ CONFIG_VIRT_TO_BUS=y
186CONFIG_PROC_DEVICETREE=y 197CONFIG_PROC_DEVICETREE=y
187# CONFIG_CMDLINE_BOOL is not set 198# CONFIG_CMDLINE_BOOL is not set
188# CONFIG_PM is not set 199# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
189CONFIG_SECCOMP=y 202CONFIG_SECCOMP=y
190CONFIG_WANT_DEVICE_TREE=y 203CONFIG_WANT_DEVICE_TREE=y
191CONFIG_DEVICE_TREE="" 204CONFIG_DEVICE_TREE=""
@@ -204,10 +217,7 @@ CONFIG_PCI_SYSCALL=y
204# CONFIG_PCIEPORTBUS is not set 217# CONFIG_PCIEPORTBUS is not set
205CONFIG_ARCH_SUPPORTS_MSI=y 218CONFIG_ARCH_SUPPORTS_MSI=y
206# CONFIG_PCI_MSI is not set 219# CONFIG_PCI_MSI is not set
207 220CONFIG_PCI_LEGACY=y
208#
209# PCCARD (PCMCIA/CardBus) support
210#
211# CONFIG_PCCARD is not set 221# CONFIG_PCCARD is not set
212# CONFIG_HOTPLUG_PCI is not set 222# CONFIG_HOTPLUG_PCI is not set
213 223
@@ -222,7 +232,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
222CONFIG_HIGHMEM_START=0xfe000000 232CONFIG_HIGHMEM_START=0xfe000000
223CONFIG_LOWMEM_SIZE=0x30000000 233CONFIG_LOWMEM_SIZE=0x30000000
224CONFIG_KERNEL_START=0xc0000000 234CONFIG_KERNEL_START=0xc0000000
225CONFIG_TASK_SIZE=0x80000000 235CONFIG_TASK_SIZE=0xc0000000
226CONFIG_BOOT_LOAD=0x00800000 236CONFIG_BOOT_LOAD=0x00800000
227 237
228# 238#
@@ -262,6 +272,7 @@ CONFIG_SYN_COOKIES=y
262CONFIG_INET_XFRM_MODE_TRANSPORT=y 272CONFIG_INET_XFRM_MODE_TRANSPORT=y
263CONFIG_INET_XFRM_MODE_TUNNEL=y 273CONFIG_INET_XFRM_MODE_TUNNEL=y
264CONFIG_INET_XFRM_MODE_BEET=y 274CONFIG_INET_XFRM_MODE_BEET=y
275# CONFIG_INET_LRO is not set
265CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
@@ -287,10 +298,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
287# CONFIG_LAPB is not set 298# CONFIG_LAPB is not set
288# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
290
291#
292# QoS and/or fair queueing
293#
294# CONFIG_NET_SCHED is not set 301# CONFIG_NET_SCHED is not set
295 302
296# 303#
@@ -319,6 +326,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# 326#
320# Generic Driver Options 327# Generic Driver Options
321# 328#
329CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
322CONFIG_STANDALONE=y 330CONFIG_STANDALONE=y
323CONFIG_PREVENT_FIRMWARE_BUILD=y 331CONFIG_PREVENT_FIRMWARE_BUILD=y
324# CONFIG_FW_LOADER is not set 332# CONFIG_FW_LOADER is not set
@@ -388,6 +396,7 @@ CONFIG_SCSI_WAIT_SCAN=m
388# CONFIG_SCSI_FC_ATTRS is not set 396# CONFIG_SCSI_FC_ATTRS is not set
389# CONFIG_SCSI_ISCSI_ATTRS is not set 397# CONFIG_SCSI_ISCSI_ATTRS is not set
390# CONFIG_SCSI_SAS_LIBSAS is not set 398# CONFIG_SCSI_SAS_LIBSAS is not set
399# CONFIG_SCSI_SRP_ATTRS is not set
391CONFIG_SCSI_LOWLEVEL=y 400CONFIG_SCSI_LOWLEVEL=y
392# CONFIG_ISCSI_TCP is not set 401# CONFIG_ISCSI_TCP is not set
393# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 402# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -399,6 +408,7 @@ CONFIG_SCSI_LOWLEVEL=y
399# CONFIG_SCSI_AIC79XX is not set 408# CONFIG_SCSI_AIC79XX is not set
400# CONFIG_SCSI_AIC94XX is not set 409# CONFIG_SCSI_AIC94XX is not set
401# CONFIG_SCSI_DPT_I2O is not set 410# CONFIG_SCSI_DPT_I2O is not set
411# CONFIG_SCSI_ADVANSYS is not set
402# CONFIG_SCSI_ARCMSR is not set 412# CONFIG_SCSI_ARCMSR is not set
403# CONFIG_MEGARAID_NEWGEN is not set 413# CONFIG_MEGARAID_NEWGEN is not set
404# CONFIG_MEGARAID_LEGACY is not set 414# CONFIG_MEGARAID_LEGACY is not set
@@ -425,14 +435,7 @@ CONFIG_SCSI_LOWLEVEL=y
425# CONFIG_SCSI_SRP is not set 435# CONFIG_SCSI_SRP is not set
426# CONFIG_ATA is not set 436# CONFIG_ATA is not set
427# CONFIG_MD is not set 437# CONFIG_MD is not set
428
429#
430# Fusion MPT device support
431#
432# CONFIG_FUSION is not set 438# CONFIG_FUSION is not set
433# CONFIG_FUSION_SPI is not set
434# CONFIG_FUSION_FC is not set
435# CONFIG_FUSION_SAS is not set
436 439
437# 440#
438# IEEE 1394 (FireWire) support 441# IEEE 1394 (FireWire) support
@@ -448,6 +451,8 @@ CONFIG_NETDEVICES=y
448# CONFIG_MACVLAN is not set 451# CONFIG_MACVLAN is not set
449# CONFIG_EQUALIZER is not set 452# CONFIG_EQUALIZER is not set
450# CONFIG_TUN is not set 453# CONFIG_TUN is not set
454# CONFIG_VETH is not set
455# CONFIG_IP1000 is not set
451# CONFIG_ARCNET is not set 456# CONFIG_ARCNET is not set
452CONFIG_PHYLIB=y 457CONFIG_PHYLIB=y
453 458
@@ -464,6 +469,7 @@ CONFIG_PHYLIB=y
464# CONFIG_BROADCOM_PHY is not set 469# CONFIG_BROADCOM_PHY is not set
465CONFIG_ICPLUS_PHY=y 470CONFIG_ICPLUS_PHY=y
466# CONFIG_FIXED_PHY is not set 471# CONFIG_FIXED_PHY is not set
472# CONFIG_MDIO_BITBANG is not set
467CONFIG_NET_ETHERNET=y 473CONFIG_NET_ETHERNET=y
468CONFIG_MII=y 474CONFIG_MII=y
469# CONFIG_HAPPYMEAL is not set 475# CONFIG_HAPPYMEAL is not set
@@ -472,13 +478,19 @@ CONFIG_MII=y
472# CONFIG_NET_VENDOR_3COM is not set 478# CONFIG_NET_VENDOR_3COM is not set
473# CONFIG_NET_TULIP is not set 479# CONFIG_NET_TULIP is not set
474# CONFIG_HP100 is not set 480# CONFIG_HP100 is not set
481# CONFIG_IBM_NEW_EMAC_ZMII is not set
482# CONFIG_IBM_NEW_EMAC_RGMII is not set
483# CONFIG_IBM_NEW_EMAC_TAH is not set
484# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
475# CONFIG_NET_PCI is not set 485# CONFIG_NET_PCI is not set
486# CONFIG_B44 is not set
476CONFIG_NETDEV_1000=y 487CONFIG_NETDEV_1000=y
477# CONFIG_ACENIC is not set 488# CONFIG_ACENIC is not set
478# CONFIG_DL2K is not set 489# CONFIG_DL2K is not set
479CONFIG_E1000=y 490CONFIG_E1000=y
480# CONFIG_E1000_NAPI is not set 491# CONFIG_E1000_NAPI is not set
481# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 492# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
493# CONFIG_E1000E is not set
482# CONFIG_NS83820 is not set 494# CONFIG_NS83820 is not set
483# CONFIG_HAMACHI is not set 495# CONFIG_HAMACHI is not set
484# CONFIG_YELLOWFIN is not set 496# CONFIG_YELLOWFIN is not set
@@ -486,6 +498,7 @@ CONFIG_E1000=y
486# CONFIG_SIS190 is not set 498# CONFIG_SIS190 is not set
487# CONFIG_SKGE is not set 499# CONFIG_SKGE is not set
488# CONFIG_SKY2 is not set 500# CONFIG_SKY2 is not set
501# CONFIG_SK98LIN is not set
489# CONFIG_VIA_VELOCITY is not set 502# CONFIG_VIA_VELOCITY is not set
490# CONFIG_TIGON3 is not set 503# CONFIG_TIGON3 is not set
491# CONFIG_BNX2 is not set 504# CONFIG_BNX2 is not set
@@ -500,11 +513,14 @@ CONFIG_UGETH_NAPI=y
500CONFIG_NETDEV_10000=y 513CONFIG_NETDEV_10000=y
501# CONFIG_CHELSIO_T1 is not set 514# CONFIG_CHELSIO_T1 is not set
502# CONFIG_CHELSIO_T3 is not set 515# CONFIG_CHELSIO_T3 is not set
516# CONFIG_IXGBE is not set
503# CONFIG_IXGB is not set 517# CONFIG_IXGB is not set
504# CONFIG_S2IO is not set 518# CONFIG_S2IO is not set
505# CONFIG_MYRI10GE is not set 519# CONFIG_MYRI10GE is not set
506# CONFIG_NETXEN_NIC is not set 520# CONFIG_NETXEN_NIC is not set
521# CONFIG_NIU is not set
507# CONFIG_MLX4_CORE is not set 522# CONFIG_MLX4_CORE is not set
523# CONFIG_TEHUTI is not set
508# CONFIG_TR is not set 524# CONFIG_TR is not set
509 525
510# 526#
@@ -520,7 +536,6 @@ CONFIG_NETDEV_10000=y
520# CONFIG_USB_KAWETH is not set 536# CONFIG_USB_KAWETH is not set
521# CONFIG_USB_PEGASUS is not set 537# CONFIG_USB_PEGASUS is not set
522# CONFIG_USB_RTL8150 is not set 538# CONFIG_USB_RTL8150 is not set
523# CONFIG_USB_USBNET_MII is not set
524# CONFIG_USB_USBNET is not set 539# CONFIG_USB_USBNET is not set
525# CONFIG_WAN is not set 540# CONFIG_WAN is not set
526# CONFIG_FDDI is not set 541# CONFIG_FDDI is not set
@@ -547,7 +562,6 @@ CONFIG_INPUT=y
547# 562#
548# CONFIG_INPUT_MOUSEDEV is not set 563# CONFIG_INPUT_MOUSEDEV is not set
549# CONFIG_INPUT_JOYDEV is not set 564# CONFIG_INPUT_JOYDEV is not set
550# CONFIG_INPUT_TSDEV is not set
551# CONFIG_INPUT_EVDEV is not set 565# CONFIG_INPUT_EVDEV is not set
552# CONFIG_INPUT_EVBUG is not set 566# CONFIG_INPUT_EVBUG is not set
553 567
@@ -595,33 +609,12 @@ CONFIG_UNIX98_PTYS=y
595CONFIG_LEGACY_PTYS=y 609CONFIG_LEGACY_PTYS=y
596CONFIG_LEGACY_PTY_COUNT=256 610CONFIG_LEGACY_PTY_COUNT=256
597# CONFIG_IPMI_HANDLER is not set 611# CONFIG_IPMI_HANDLER is not set
598CONFIG_WATCHDOG=y
599# CONFIG_WATCHDOG_NOWAYOUT is not set
600
601#
602# Watchdog Device Drivers
603#
604# CONFIG_SOFT_WATCHDOG is not set
605CONFIG_83xx_WDT=y
606
607#
608# PCI-based Watchdog Cards
609#
610# CONFIG_PCIPCWATCHDOG is not set
611# CONFIG_WDTPCI is not set
612
613#
614# USB-based Watchdog Cards
615#
616# CONFIG_USBPCWATCHDOG is not set
617CONFIG_HW_RANDOM=y 612CONFIG_HW_RANDOM=y
618# CONFIG_NVRAM is not set 613# CONFIG_NVRAM is not set
619CONFIG_GEN_RTC=y 614CONFIG_GEN_RTC=y
620# CONFIG_GEN_RTC_X is not set 615# CONFIG_GEN_RTC_X is not set
621# CONFIG_R3964 is not set 616# CONFIG_R3964 is not set
622# CONFIG_APPLICOM is not set 617# CONFIG_APPLICOM is not set
623# CONFIG_AGP is not set
624# CONFIG_DRM is not set
625# CONFIG_RAW_DRIVER is not set 618# CONFIG_RAW_DRIVER is not set
626# CONFIG_TCG_TPM is not set 619# CONFIG_TCG_TPM is not set
627CONFIG_DEVPORT=y 620CONFIG_DEVPORT=y
@@ -704,8 +697,6 @@ CONFIG_SPI_MPC83xx=y
704# CONFIG_POWER_SUPPLY is not set 697# CONFIG_POWER_SUPPLY is not set
705CONFIG_HWMON=y 698CONFIG_HWMON=y
706# CONFIG_HWMON_VID is not set 699# CONFIG_HWMON_VID is not set
707# CONFIG_SENSORS_ABITUGURU is not set
708# CONFIG_SENSORS_ABITUGURU3 is not set
709# CONFIG_SENSORS_AD7418 is not set 700# CONFIG_SENSORS_AD7418 is not set
710# CONFIG_SENSORS_ADM1021 is not set 701# CONFIG_SENSORS_ADM1021 is not set
711# CONFIG_SENSORS_ADM1025 is not set 702# CONFIG_SENSORS_ADM1025 is not set
@@ -713,12 +704,13 @@ CONFIG_HWMON=y
713# CONFIG_SENSORS_ADM1029 is not set 704# CONFIG_SENSORS_ADM1029 is not set
714# CONFIG_SENSORS_ADM1031 is not set 705# CONFIG_SENSORS_ADM1031 is not set
715# CONFIG_SENSORS_ADM9240 is not set 706# CONFIG_SENSORS_ADM9240 is not set
716# CONFIG_SENSORS_ASB100 is not set 707# CONFIG_SENSORS_ADT7470 is not set
717# CONFIG_SENSORS_ATXP1 is not set 708# CONFIG_SENSORS_ATXP1 is not set
718# CONFIG_SENSORS_DS1621 is not set 709# CONFIG_SENSORS_DS1621 is not set
710# CONFIG_SENSORS_I5K_AMB is not set
719# CONFIG_SENSORS_F71805F is not set 711# CONFIG_SENSORS_F71805F is not set
720# CONFIG_SENSORS_FSCHER is not set 712# CONFIG_SENSORS_F71882FG is not set
721# CONFIG_SENSORS_FSCPOS is not set 713# CONFIG_SENSORS_F75375S is not set
722# CONFIG_SENSORS_GL518SM is not set 714# CONFIG_SENSORS_GL518SM is not set
723# CONFIG_SENSORS_GL520SM is not set 715# CONFIG_SENSORS_GL520SM is not set
724# CONFIG_SENSORS_IT87 is not set 716# CONFIG_SENSORS_IT87 is not set
@@ -755,6 +747,31 @@ CONFIG_HWMON=y
755# CONFIG_SENSORS_W83627HF is not set 747# CONFIG_SENSORS_W83627HF is not set
756# CONFIG_SENSORS_W83627EHF is not set 748# CONFIG_SENSORS_W83627EHF is not set
757# CONFIG_HWMON_DEBUG_CHIP is not set 749# CONFIG_HWMON_DEBUG_CHIP is not set
750CONFIG_WATCHDOG=y
751# CONFIG_WATCHDOG_NOWAYOUT is not set
752
753#
754# Watchdog Device Drivers
755#
756# CONFIG_SOFT_WATCHDOG is not set
757CONFIG_83xx_WDT=y
758
759#
760# PCI-based Watchdog Cards
761#
762# CONFIG_PCIPCWATCHDOG is not set
763# CONFIG_WDTPCI is not set
764
765#
766# USB-based Watchdog Cards
767#
768# CONFIG_USBPCWATCHDOG is not set
769
770#
771# Sonics Silicon Backplane
772#
773CONFIG_SSB_POSSIBLE=y
774# CONFIG_SSB is not set
758 775
759# 776#
760# Multifunction device drivers 777# Multifunction device drivers
@@ -772,16 +789,17 @@ CONFIG_DAB=y
772# 789#
773# Graphics support 790# Graphics support
774# 791#
792# CONFIG_AGP is not set
793# CONFIG_DRM is not set
794# CONFIG_VGASTATE is not set
795CONFIG_VIDEO_OUTPUT_CONTROL=m
796# CONFIG_FB is not set
775# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 797# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
776 798
777# 799#
778# Display device support 800# Display device support
779# 801#
780# CONFIG_DISPLAY_SUPPORT is not set 802# CONFIG_DISPLAY_SUPPORT is not set
781# CONFIG_VGASTATE is not set
782CONFIG_VIDEO_OUTPUT_CONTROL=m
783# CONFIG_FB is not set
784# CONFIG_FB_IBM_GXT4500 is not set
785 803
786# 804#
787# Sound 805# Sound
@@ -790,6 +808,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
790CONFIG_HID_SUPPORT=y 808CONFIG_HID_SUPPORT=y
791CONFIG_HID=y 809CONFIG_HID=y
792# CONFIG_HID_DEBUG is not set 810# CONFIG_HID_DEBUG is not set
811# CONFIG_HIDRAW is not set
793 812
794# 813#
795# USB Input Devices 814# USB Input Devices
@@ -853,6 +872,7 @@ CONFIG_USB_STORAGE=y
853# CONFIG_USB_STORAGE_DEBUG is not set 872# CONFIG_USB_STORAGE_DEBUG is not set
854# CONFIG_USB_STORAGE_DATAFAB is not set 873# CONFIG_USB_STORAGE_DATAFAB is not set
855# CONFIG_USB_STORAGE_FREECOM is not set 874# CONFIG_USB_STORAGE_FREECOM is not set
875# CONFIG_USB_STORAGE_ISD200 is not set
856# CONFIG_USB_STORAGE_DPCM is not set 876# CONFIG_USB_STORAGE_DPCM is not set
857# CONFIG_USB_STORAGE_USBAT is not set 877# CONFIG_USB_STORAGE_USBAT is not set
858# CONFIG_USB_STORAGE_SDDR09 is not set 878# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -934,19 +954,6 @@ CONFIG_MMC_SPI=y
934# CONFIG_RTC_CLASS is not set 954# CONFIG_RTC_CLASS is not set
935 955
936# 956#
937# DMA Engine support
938#
939# CONFIG_DMA_ENGINE is not set
940
941#
942# DMA Clients
943#
944
945#
946# DMA Devices
947#
948
949#
950# Userspace I/O 957# Userspace I/O
951# 958#
952# CONFIG_UIO is not set 959# CONFIG_UIO is not set
@@ -963,7 +970,6 @@ CONFIG_EXT3_FS_XATTR=y
963# CONFIG_EXT3_FS_SECURITY is not set 970# CONFIG_EXT3_FS_SECURITY is not set
964# CONFIG_EXT4DEV_FS is not set 971# CONFIG_EXT4DEV_FS is not set
965CONFIG_JBD=y 972CONFIG_JBD=y
966# CONFIG_JBD_DEBUG is not set
967CONFIG_FS_MBCACHE=y 973CONFIG_FS_MBCACHE=y
968# CONFIG_REISERFS_FS is not set 974# CONFIG_REISERFS_FS is not set
969# CONFIG_JFS_FS is not set 975# CONFIG_JFS_FS is not set
@@ -1007,7 +1013,6 @@ CONFIG_SYSFS=y
1007CONFIG_TMPFS=y 1013CONFIG_TMPFS=y
1008# CONFIG_TMPFS_POSIX_ACL is not set 1014# CONFIG_TMPFS_POSIX_ACL is not set
1009# CONFIG_HUGETLB_PAGE is not set 1015# CONFIG_HUGETLB_PAGE is not set
1010CONFIG_RAMFS=y
1011# CONFIG_CONFIGFS_FS is not set 1016# CONFIG_CONFIGFS_FS is not set
1012 1017
1013# 1018#
@@ -1026,10 +1031,7 @@ CONFIG_RAMFS=y
1026# CONFIG_QNX4FS_FS is not set 1031# CONFIG_QNX4FS_FS is not set
1027# CONFIG_SYSV_FS is not set 1032# CONFIG_SYSV_FS is not set
1028# CONFIG_UFS_FS is not set 1033# CONFIG_UFS_FS is not set
1029 1034CONFIG_NETWORK_FILESYSTEMS=y
1030#
1031# Network File Systems
1032#
1033CONFIG_NFS_FS=y 1035CONFIG_NFS_FS=y
1034CONFIG_NFS_V3=y 1036CONFIG_NFS_V3=y
1035# CONFIG_NFS_V3_ACL is not set 1037# CONFIG_NFS_V3_ACL is not set
@@ -1073,10 +1075,6 @@ CONFIG_LDM_PARTITION=y
1073# CONFIG_KARMA_PARTITION is not set 1075# CONFIG_KARMA_PARTITION is not set
1074# CONFIG_EFI_PARTITION is not set 1076# CONFIG_EFI_PARTITION is not set
1075# CONFIG_SYSV68_PARTITION is not set 1077# CONFIG_SYSV68_PARTITION is not set
1076
1077#
1078# Native Language Support
1079#
1080CONFIG_NLS=y 1078CONFIG_NLS=y
1081CONFIG_NLS_DEFAULT="iso8859-1" 1079CONFIG_NLS_DEFAULT="iso8859-1"
1082CONFIG_NLS_CODEPAGE_437=y 1080CONFIG_NLS_CODEPAGE_437=y
@@ -1117,10 +1115,6 @@ CONFIG_NLS_ISO8859_1=y
1117# CONFIG_NLS_KOI8_R is not set 1115# CONFIG_NLS_KOI8_R is not set
1118# CONFIG_NLS_KOI8_U is not set 1116# CONFIG_NLS_KOI8_U is not set
1119# CONFIG_NLS_UTF8 is not set 1117# CONFIG_NLS_UTF8 is not set
1120
1121#
1122# Distributed Lock Manager
1123#
1124# CONFIG_DLM is not set 1118# CONFIG_DLM is not set
1125# CONFIG_UCC_SLOW is not set 1119# CONFIG_UCC_SLOW is not set
1126CONFIG_UCC_FAST=y 1120CONFIG_UCC_FAST=y
@@ -1140,23 +1134,22 @@ CONFIG_PLIST=y
1140CONFIG_HAS_IOMEM=y 1134CONFIG_HAS_IOMEM=y
1141CONFIG_HAS_IOPORT=y 1135CONFIG_HAS_IOPORT=y
1142CONFIG_HAS_DMA=y 1136CONFIG_HAS_DMA=y
1143 1137# CONFIG_INSTRUMENTATION is not set
1144#
1145# Instrumentation Support
1146#
1147# CONFIG_PROFILING is not set
1148 1138
1149# 1139#
1150# Kernel hacking 1140# Kernel hacking
1151# 1141#
1152# CONFIG_PRINTK_TIME is not set 1142# CONFIG_PRINTK_TIME is not set
1143CONFIG_ENABLE_WARN_DEPRECATED=y
1153CONFIG_ENABLE_MUST_CHECK=y 1144CONFIG_ENABLE_MUST_CHECK=y
1154# CONFIG_MAGIC_SYSRQ is not set 1145# CONFIG_MAGIC_SYSRQ is not set
1155# CONFIG_UNUSED_SYMBOLS is not set 1146# CONFIG_UNUSED_SYMBOLS is not set
1156# CONFIG_DEBUG_FS is not set 1147# CONFIG_DEBUG_FS is not set
1157# CONFIG_HEADERS_CHECK is not set 1148# CONFIG_HEADERS_CHECK is not set
1158# CONFIG_DEBUG_KERNEL is not set 1149# CONFIG_DEBUG_KERNEL is not set
1150# CONFIG_SLUB_DEBUG_ON is not set
1159# CONFIG_DEBUG_BUGVERBOSE is not set 1151# CONFIG_DEBUG_BUGVERBOSE is not set
1152# CONFIG_SAMPLES is not set
1160# CONFIG_PPC_EARLY_DEBUG is not set 1153# CONFIG_PPC_EARLY_DEBUG is not set
1161 1154
1162# 1155#
@@ -1164,6 +1157,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1164# 1157#
1165# CONFIG_KEYS is not set 1158# CONFIG_KEYS is not set
1166# CONFIG_SECURITY is not set 1159# CONFIG_SECURITY is not set
1160# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1167CONFIG_CRYPTO=y 1161CONFIG_CRYPTO=y
1168CONFIG_CRYPTO_ALGAPI=y 1162CONFIG_CRYPTO_ALGAPI=y
1169CONFIG_CRYPTO_BLKCIPHER=y 1163CONFIG_CRYPTO_BLKCIPHER=y
@@ -1183,6 +1177,7 @@ CONFIG_CRYPTO_ECB=m
1183CONFIG_CRYPTO_CBC=y 1177CONFIG_CRYPTO_CBC=y
1184CONFIG_CRYPTO_PCBC=m 1178CONFIG_CRYPTO_PCBC=m
1185# CONFIG_CRYPTO_LRW is not set 1179# CONFIG_CRYPTO_LRW is not set
1180# CONFIG_CRYPTO_XTS is not set
1186# CONFIG_CRYPTO_CRYPTD is not set 1181# CONFIG_CRYPTO_CRYPTD is not set
1187CONFIG_CRYPTO_DES=y 1182CONFIG_CRYPTO_DES=y
1188# CONFIG_CRYPTO_FCRYPT is not set 1183# CONFIG_CRYPTO_FCRYPT is not set
@@ -1196,9 +1191,13 @@ CONFIG_CRYPTO_DES=y
1196# CONFIG_CRYPTO_ARC4 is not set 1191# CONFIG_CRYPTO_ARC4 is not set
1197# CONFIG_CRYPTO_KHAZAD is not set 1192# CONFIG_CRYPTO_KHAZAD is not set
1198# CONFIG_CRYPTO_ANUBIS is not set 1193# CONFIG_CRYPTO_ANUBIS is not set
1194# CONFIG_CRYPTO_SEED is not set
1199# CONFIG_CRYPTO_DEFLATE is not set 1195# CONFIG_CRYPTO_DEFLATE is not set
1200# CONFIG_CRYPTO_MICHAEL_MIC is not set 1196# CONFIG_CRYPTO_MICHAEL_MIC is not set
1201# CONFIG_CRYPTO_CRC32C is not set 1197# CONFIG_CRYPTO_CRC32C is not set
1202# CONFIG_CRYPTO_CAMELLIA is not set 1198# CONFIG_CRYPTO_CAMELLIA is not set
1203# CONFIG_CRYPTO_TEST is not set 1199# CONFIG_CRYPTO_TEST is not set
1200# CONFIG_CRYPTO_AUTHENC is not set
1204CONFIG_CRYPTO_HW=y 1201CONFIG_CRYPTO_HW=y
1202# CONFIG_PPC_CLOCK is not set
1203CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index ba512d13f3a3..6feb86e2b786 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:41 2007 4# Thu Dec 6 16:48:37 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -156,6 +162,10 @@ CONFIG_MPC834x=y
156# Kernel options 162# Kernel options
157# 163#
158# CONFIG_HIGHMEM is not set 164# CONFIG_HIGHMEM is not set
165CONFIG_TICK_ONESHOT=y
166CONFIG_NO_HZ=y
167CONFIG_HIGH_RES_TIMERS=y
168CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 169# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 170CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 171# CONFIG_HZ_300 is not set
@@ -176,6 +186,7 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
179CONFIG_SPLIT_PTLOCK_CPUS=4 190CONFIG_SPLIT_PTLOCK_CPUS=4
180# CONFIG_RESOURCES_64BIT is not set 191# CONFIG_RESOURCES_64BIT is not set
181CONFIG_ZONE_DMA_FLAG=1 192CONFIG_ZONE_DMA_FLAG=1
@@ -184,6 +195,8 @@ CONFIG_VIRT_TO_BUS=y
184CONFIG_PROC_DEVICETREE=y 195CONFIG_PROC_DEVICETREE=y
185# CONFIG_CMDLINE_BOOL is not set 196# CONFIG_CMDLINE_BOOL is not set
186# CONFIG_PM is not set 197# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
187CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
188CONFIG_WANT_DEVICE_TREE=y 201CONFIG_WANT_DEVICE_TREE=y
189CONFIG_DEVICE_TREE="" 202CONFIG_DEVICE_TREE=""
@@ -202,10 +215,7 @@ CONFIG_PCI_SYSCALL=y
202# CONFIG_PCIEPORTBUS is not set 215# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y 216CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set 217# CONFIG_PCI_MSI is not set
205 218CONFIG_PCI_LEGACY=y
206#
207# PCCARD (PCMCIA/CardBus) support
208#
209# CONFIG_PCCARD is not set 219# CONFIG_PCCARD is not set
210# CONFIG_HOTPLUG_PCI is not set 220# CONFIG_HOTPLUG_PCI is not set
211 221
@@ -220,7 +230,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
220CONFIG_HIGHMEM_START=0xfe000000 230CONFIG_HIGHMEM_START=0xfe000000
221CONFIG_LOWMEM_SIZE=0x30000000 231CONFIG_LOWMEM_SIZE=0x30000000
222CONFIG_KERNEL_START=0xc0000000 232CONFIG_KERNEL_START=0xc0000000
223CONFIG_TASK_SIZE=0x80000000 233CONFIG_TASK_SIZE=0xc0000000
224CONFIG_BOOT_LOAD=0x00800000 234CONFIG_BOOT_LOAD=0x00800000
225 235
226# 236#
@@ -260,6 +270,7 @@ CONFIG_SYN_COOKIES=y
260CONFIG_INET_XFRM_MODE_TRANSPORT=y 270CONFIG_INET_XFRM_MODE_TRANSPORT=y
261CONFIG_INET_XFRM_MODE_TUNNEL=y 271CONFIG_INET_XFRM_MODE_TUNNEL=y
262CONFIG_INET_XFRM_MODE_BEET=y 272CONFIG_INET_XFRM_MODE_BEET=y
273# CONFIG_INET_LRO is not set
263CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
@@ -285,10 +296,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
285# CONFIG_LAPB is not set 296# CONFIG_LAPB is not set
286# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
292# CONFIG_NET_SCHED is not set 299# CONFIG_NET_SCHED is not set
293 300
294# 301#
@@ -317,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# 324#
318# Generic Driver Options 325# Generic Driver Options
319# 326#
327CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
320CONFIG_STANDALONE=y 328CONFIG_STANDALONE=y
321CONFIG_PREVENT_FIRMWARE_BUILD=y 329CONFIG_PREVENT_FIRMWARE_BUILD=y
322# CONFIG_FW_LOADER is not set 330# CONFIG_FW_LOADER is not set
@@ -339,6 +347,7 @@ CONFIG_MTD_CHAR=y
339# CONFIG_INFTL is not set 347# CONFIG_INFTL is not set
340# CONFIG_RFD_FTL is not set 348# CONFIG_RFD_FTL is not set
341# CONFIG_SSFDC is not set 349# CONFIG_SSFDC is not set
350# CONFIG_MTD_OOPS is not set
342 351
343# 352#
344# RAM/ROM/Flash chip drivers 353# RAM/ROM/Flash chip drivers
@@ -374,6 +383,7 @@ CONFIG_MTD_PHYSMAP_START=0xfe000000
374CONFIG_MTD_PHYSMAP_LEN=0x1000000 383CONFIG_MTD_PHYSMAP_LEN=0x1000000
375CONFIG_MTD_PHYSMAP_BANKWIDTH=2 384CONFIG_MTD_PHYSMAP_BANKWIDTH=2
376# CONFIG_MTD_PHYSMAP_OF is not set 385# CONFIG_MTD_PHYSMAP_OF is not set
386# CONFIG_MTD_INTEL_VR_NOR is not set
377# CONFIG_MTD_PLATRAM is not set 387# CONFIG_MTD_PLATRAM is not set
378 388
379# 389#
@@ -467,6 +477,7 @@ CONFIG_SCSI_SPI_ATTRS=y
467# CONFIG_SCSI_FC_ATTRS is not set 477# CONFIG_SCSI_FC_ATTRS is not set
468# CONFIG_SCSI_ISCSI_ATTRS is not set 478# CONFIG_SCSI_ISCSI_ATTRS is not set
469# CONFIG_SCSI_SAS_LIBSAS is not set 479# CONFIG_SCSI_SAS_LIBSAS is not set
480# CONFIG_SCSI_SRP_ATTRS is not set
470CONFIG_SCSI_LOWLEVEL=y 481CONFIG_SCSI_LOWLEVEL=y
471# CONFIG_ISCSI_TCP is not set 482# CONFIG_ISCSI_TCP is not set
472# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 483# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -478,6 +489,7 @@ CONFIG_SCSI_LOWLEVEL=y
478# CONFIG_SCSI_AIC79XX is not set 489# CONFIG_SCSI_AIC79XX is not set
479# CONFIG_SCSI_AIC94XX is not set 490# CONFIG_SCSI_AIC94XX is not set
480# CONFIG_SCSI_DPT_I2O is not set 491# CONFIG_SCSI_DPT_I2O is not set
492# CONFIG_SCSI_ADVANSYS is not set
481# CONFIG_SCSI_ARCMSR is not set 493# CONFIG_SCSI_ARCMSR is not set
482# CONFIG_MEGARAID_NEWGEN is not set 494# CONFIG_MEGARAID_NEWGEN is not set
483# CONFIG_MEGARAID_LEGACY is not set 495# CONFIG_MEGARAID_LEGACY is not set
@@ -545,6 +557,7 @@ CONFIG_SATA_SIL=y
545# CONFIG_PATA_OLDPIIX is not set 557# CONFIG_PATA_OLDPIIX is not set
546# CONFIG_PATA_NETCELL is not set 558# CONFIG_PATA_NETCELL is not set
547# CONFIG_PATA_NS87410 is not set 559# CONFIG_PATA_NS87410 is not set
560# CONFIG_PATA_NS87415 is not set
548# CONFIG_PATA_OPTI is not set 561# CONFIG_PATA_OPTI is not set
549# CONFIG_PATA_OPTIDMA is not set 562# CONFIG_PATA_OPTIDMA is not set
550# CONFIG_PATA_PDC_OLD is not set 563# CONFIG_PATA_PDC_OLD is not set
@@ -568,14 +581,7 @@ CONFIG_MD_RAID1=y
568# CONFIG_MD_MULTIPATH is not set 581# CONFIG_MD_MULTIPATH is not set
569# CONFIG_MD_FAULTY is not set 582# CONFIG_MD_FAULTY is not set
570# CONFIG_BLK_DEV_DM is not set 583# CONFIG_BLK_DEV_DM is not set
571
572#
573# Fusion MPT device support
574#
575# CONFIG_FUSION is not set 584# CONFIG_FUSION is not set
576# CONFIG_FUSION_SPI is not set
577# CONFIG_FUSION_FC is not set
578# CONFIG_FUSION_SAS is not set
579 585
580# 586#
581# IEEE 1394 (FireWire) support 587# IEEE 1394 (FireWire) support
@@ -591,6 +597,8 @@ CONFIG_NETDEVICES=y
591# CONFIG_MACVLAN is not set 597# CONFIG_MACVLAN is not set
592# CONFIG_EQUALIZER is not set 598# CONFIG_EQUALIZER is not set
593# CONFIG_TUN is not set 599# CONFIG_TUN is not set
600# CONFIG_VETH is not set
601# CONFIG_IP1000 is not set
594# CONFIG_ARCNET is not set 602# CONFIG_ARCNET is not set
595CONFIG_PHYLIB=y 603CONFIG_PHYLIB=y
596 604
@@ -607,11 +615,13 @@ CONFIG_CICADA_PHY=y
607# CONFIG_BROADCOM_PHY is not set 615# CONFIG_BROADCOM_PHY is not set
608# CONFIG_ICPLUS_PHY is not set 616# CONFIG_ICPLUS_PHY is not set
609# CONFIG_FIXED_PHY is not set 617# CONFIG_FIXED_PHY is not set
618# CONFIG_MDIO_BITBANG is not set
610# CONFIG_NET_ETHERNET is not set 619# CONFIG_NET_ETHERNET is not set
611CONFIG_NETDEV_1000=y 620CONFIG_NETDEV_1000=y
612# CONFIG_ACENIC is not set 621# CONFIG_ACENIC is not set
613# CONFIG_DL2K is not set 622# CONFIG_DL2K is not set
614# CONFIG_E1000 is not set 623# CONFIG_E1000 is not set
624# CONFIG_E1000E is not set
615# CONFIG_NS83820 is not set 625# CONFIG_NS83820 is not set
616# CONFIG_HAMACHI is not set 626# CONFIG_HAMACHI is not set
617# CONFIG_YELLOWFIN is not set 627# CONFIG_YELLOWFIN is not set
@@ -619,6 +629,7 @@ CONFIG_NETDEV_1000=y
619# CONFIG_SIS190 is not set 629# CONFIG_SIS190 is not set
620# CONFIG_SKGE is not set 630# CONFIG_SKGE is not set
621# CONFIG_SKY2 is not set 631# CONFIG_SKY2 is not set
632# CONFIG_SK98LIN is not set
622# CONFIG_VIA_VELOCITY is not set 633# CONFIG_VIA_VELOCITY is not set
623# CONFIG_TIGON3 is not set 634# CONFIG_TIGON3 is not set
624# CONFIG_BNX2 is not set 635# CONFIG_BNX2 is not set
@@ -629,11 +640,14 @@ CONFIG_GFAR_NAPI=y
629CONFIG_NETDEV_10000=y 640CONFIG_NETDEV_10000=y
630# CONFIG_CHELSIO_T1 is not set 641# CONFIG_CHELSIO_T1 is not set
631# CONFIG_CHELSIO_T3 is not set 642# CONFIG_CHELSIO_T3 is not set
643# CONFIG_IXGBE is not set
632# CONFIG_IXGB is not set 644# CONFIG_IXGB is not set
633# CONFIG_S2IO is not set 645# CONFIG_S2IO is not set
634# CONFIG_MYRI10GE is not set 646# CONFIG_MYRI10GE is not set
635# CONFIG_NETXEN_NIC is not set 647# CONFIG_NETXEN_NIC is not set
648# CONFIG_NIU is not set
636# CONFIG_MLX4_CORE is not set 649# CONFIG_MLX4_CORE is not set
650# CONFIG_TEHUTI is not set
637# CONFIG_TR is not set 651# CONFIG_TR is not set
638 652
639# 653#
@@ -649,7 +663,6 @@ CONFIG_NETDEV_10000=y
649# CONFIG_USB_KAWETH is not set 663# CONFIG_USB_KAWETH is not set
650# CONFIG_USB_PEGASUS is not set 664# CONFIG_USB_PEGASUS is not set
651# CONFIG_USB_RTL8150 is not set 665# CONFIG_USB_RTL8150 is not set
652# CONFIG_USB_USBNET_MII is not set
653# CONFIG_USB_USBNET is not set 666# CONFIG_USB_USBNET is not set
654# CONFIG_WAN is not set 667# CONFIG_WAN is not set
655# CONFIG_FDDI is not set 668# CONFIG_FDDI is not set
@@ -703,32 +716,11 @@ CONFIG_UNIX98_PTYS=y
703CONFIG_LEGACY_PTYS=y 716CONFIG_LEGACY_PTYS=y
704CONFIG_LEGACY_PTY_COUNT=256 717CONFIG_LEGACY_PTY_COUNT=256
705# CONFIG_IPMI_HANDLER is not set 718# CONFIG_IPMI_HANDLER is not set
706CONFIG_WATCHDOG=y
707# CONFIG_WATCHDOG_NOWAYOUT is not set
708
709#
710# Watchdog Device Drivers
711#
712# CONFIG_SOFT_WATCHDOG is not set
713CONFIG_83xx_WDT=y
714
715#
716# PCI-based Watchdog Cards
717#
718# CONFIG_PCIPCWATCHDOG is not set
719# CONFIG_WDTPCI is not set
720
721#
722# USB-based Watchdog Cards
723#
724# CONFIG_USBPCWATCHDOG is not set
725CONFIG_HW_RANDOM=y 719CONFIG_HW_RANDOM=y
726# CONFIG_NVRAM is not set 720# CONFIG_NVRAM is not set
727# CONFIG_GEN_RTC is not set 721# CONFIG_GEN_RTC is not set
728# CONFIG_R3964 is not set 722# CONFIG_R3964 is not set
729# CONFIG_APPLICOM is not set 723# CONFIG_APPLICOM is not set
730# CONFIG_AGP is not set
731# CONFIG_DRM is not set
732# CONFIG_RAW_DRIVER is not set 724# CONFIG_RAW_DRIVER is not set
733# CONFIG_TCG_TPM is not set 725# CONFIG_TCG_TPM is not set
734CONFIG_DEVPORT=y 726CONFIG_DEVPORT=y
@@ -810,6 +802,31 @@ CONFIG_SPI_MPC83xx=y
810# CONFIG_W1 is not set 802# CONFIG_W1 is not set
811# CONFIG_POWER_SUPPLY is not set 803# CONFIG_POWER_SUPPLY is not set
812# CONFIG_HWMON is not set 804# CONFIG_HWMON is not set
805CONFIG_WATCHDOG=y
806# CONFIG_WATCHDOG_NOWAYOUT is not set
807
808#
809# Watchdog Device Drivers
810#
811# CONFIG_SOFT_WATCHDOG is not set
812CONFIG_83xx_WDT=y
813
814#
815# PCI-based Watchdog Cards
816#
817# CONFIG_PCIPCWATCHDOG is not set
818# CONFIG_WDTPCI is not set
819
820#
821# USB-based Watchdog Cards
822#
823# CONFIG_USBPCWATCHDOG is not set
824
825#
826# Sonics Silicon Backplane
827#
828CONFIG_SSB_POSSIBLE=y
829# CONFIG_SSB is not set
813 830
814# 831#
815# Multifunction device drivers 832# Multifunction device drivers
@@ -827,16 +844,17 @@ CONFIG_DAB=y
827# 844#
828# Graphics support 845# Graphics support
829# 846#
847# CONFIG_AGP is not set
848# CONFIG_DRM is not set
849# CONFIG_VGASTATE is not set
850CONFIG_VIDEO_OUTPUT_CONTROL=m
851# CONFIG_FB is not set
830# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 852# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
831 853
832# 854#
833# Display device support 855# Display device support
834# 856#
835# CONFIG_DISPLAY_SUPPORT is not set 857# CONFIG_DISPLAY_SUPPORT is not set
836# CONFIG_VGASTATE is not set
837CONFIG_VIDEO_OUTPUT_CONTROL=m
838# CONFIG_FB is not set
839# CONFIG_FB_IBM_GXT4500 is not set
840 858
841# 859#
842# Sound 860# Sound
@@ -888,6 +906,7 @@ CONFIG_USB_STORAGE=y
888# CONFIG_USB_STORAGE_DEBUG is not set 906# CONFIG_USB_STORAGE_DEBUG is not set
889# CONFIG_USB_STORAGE_DATAFAB is not set 907# CONFIG_USB_STORAGE_DATAFAB is not set
890# CONFIG_USB_STORAGE_FREECOM is not set 908# CONFIG_USB_STORAGE_FREECOM is not set
909# CONFIG_USB_STORAGE_ISD200 is not set
891# CONFIG_USB_STORAGE_DPCM is not set 910# CONFIG_USB_STORAGE_DPCM is not set
892# CONFIG_USB_STORAGE_USBAT is not set 911# CONFIG_USB_STORAGE_USBAT is not set
893# CONFIG_USB_STORAGE_SDDR09 is not set 912# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -968,6 +987,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
968# I2C RTC drivers 987# I2C RTC drivers
969# 988#
970CONFIG_RTC_DRV_DS1307=y 989CONFIG_RTC_DRV_DS1307=y
990# CONFIG_RTC_DRV_DS1374 is not set
971# CONFIG_RTC_DRV_DS1672 is not set 991# CONFIG_RTC_DRV_DS1672 is not set
972# CONFIG_RTC_DRV_MAX6900 is not set 992# CONFIG_RTC_DRV_MAX6900 is not set
973# CONFIG_RTC_DRV_RS5C372 is not set 993# CONFIG_RTC_DRV_RS5C372 is not set
@@ -999,21 +1019,6 @@ CONFIG_RTC_DRV_DS1307=y
999# 1019#
1000 1020
1001# 1021#
1002# DMA Engine support
1003#
1004CONFIG_DMA_ENGINE=y
1005
1006#
1007# DMA Clients
1008#
1009CONFIG_NET_DMA=y
1010
1011#
1012# DMA Devices
1013#
1014CONFIG_INTEL_IOATDMA=y
1015
1016#
1017# Userspace I/O 1022# Userspace I/O
1018# 1023#
1019# CONFIG_UIO is not set 1024# CONFIG_UIO is not set
@@ -1030,7 +1035,6 @@ CONFIG_EXT3_FS_XATTR=y
1030# CONFIG_EXT3_FS_SECURITY is not set 1035# CONFIG_EXT3_FS_SECURITY is not set
1031# CONFIG_EXT4DEV_FS is not set 1036# CONFIG_EXT4DEV_FS is not set
1032CONFIG_JBD=y 1037CONFIG_JBD=y
1033# CONFIG_JBD_DEBUG is not set
1034CONFIG_FS_MBCACHE=y 1038CONFIG_FS_MBCACHE=y
1035# CONFIG_REISERFS_FS is not set 1039# CONFIG_REISERFS_FS is not set
1036# CONFIG_JFS_FS is not set 1040# CONFIG_JFS_FS is not set
@@ -1074,7 +1078,6 @@ CONFIG_SYSFS=y
1074CONFIG_TMPFS=y 1078CONFIG_TMPFS=y
1075# CONFIG_TMPFS_POSIX_ACL is not set 1079# CONFIG_TMPFS_POSIX_ACL is not set
1076# CONFIG_HUGETLB_PAGE is not set 1080# CONFIG_HUGETLB_PAGE is not set
1077CONFIG_RAMFS=y
1078# CONFIG_CONFIGFS_FS is not set 1081# CONFIG_CONFIGFS_FS is not set
1079 1082
1080# 1083#
@@ -1094,10 +1097,7 @@ CONFIG_RAMFS=y
1094# CONFIG_QNX4FS_FS is not set 1097# CONFIG_QNX4FS_FS is not set
1095# CONFIG_SYSV_FS is not set 1098# CONFIG_SYSV_FS is not set
1096# CONFIG_UFS_FS is not set 1099# CONFIG_UFS_FS is not set
1097 1100CONFIG_NETWORK_FILESYSTEMS=y
1098#
1099# Network File Systems
1100#
1101CONFIG_NFS_FS=y 1101CONFIG_NFS_FS=y
1102CONFIG_NFS_V3=y 1102CONFIG_NFS_V3=y
1103# CONFIG_NFS_V3_ACL is not set 1103# CONFIG_NFS_V3_ACL is not set
@@ -1140,10 +1140,6 @@ CONFIG_MSDOS_PARTITION=y
1140# CONFIG_KARMA_PARTITION is not set 1140# CONFIG_KARMA_PARTITION is not set
1141# CONFIG_EFI_PARTITION is not set 1141# CONFIG_EFI_PARTITION is not set
1142# CONFIG_SYSV68_PARTITION is not set 1142# CONFIG_SYSV68_PARTITION is not set
1143
1144#
1145# Native Language Support
1146#
1147CONFIG_NLS=y 1143CONFIG_NLS=y
1148CONFIG_NLS_DEFAULT="iso8859-1" 1144CONFIG_NLS_DEFAULT="iso8859-1"
1149# CONFIG_NLS_CODEPAGE_437 is not set 1145# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1184,10 +1180,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1184# CONFIG_NLS_KOI8_R is not set 1180# CONFIG_NLS_KOI8_R is not set
1185# CONFIG_NLS_KOI8_U is not set 1181# CONFIG_NLS_KOI8_U is not set
1186# CONFIG_NLS_UTF8 is not set 1182# CONFIG_NLS_UTF8 is not set
1187
1188#
1189# Distributed Lock Manager
1190#
1191# CONFIG_DLM is not set 1183# CONFIG_DLM is not set
1192# CONFIG_UCC_SLOW is not set 1184# CONFIG_UCC_SLOW is not set
1193 1185
@@ -1205,23 +1197,22 @@ CONFIG_PLIST=y
1205CONFIG_HAS_IOMEM=y 1197CONFIG_HAS_IOMEM=y
1206CONFIG_HAS_IOPORT=y 1198CONFIG_HAS_IOPORT=y
1207CONFIG_HAS_DMA=y 1199CONFIG_HAS_DMA=y
1208 1200# CONFIG_INSTRUMENTATION is not set
1209#
1210# Instrumentation Support
1211#
1212# CONFIG_PROFILING is not set
1213 1201
1214# 1202#
1215# Kernel hacking 1203# Kernel hacking
1216# 1204#
1217# CONFIG_PRINTK_TIME is not set 1205# CONFIG_PRINTK_TIME is not set
1206CONFIG_ENABLE_WARN_DEPRECATED=y
1218CONFIG_ENABLE_MUST_CHECK=y 1207CONFIG_ENABLE_MUST_CHECK=y
1219# CONFIG_MAGIC_SYSRQ is not set 1208# CONFIG_MAGIC_SYSRQ is not set
1220# CONFIG_UNUSED_SYMBOLS is not set 1209# CONFIG_UNUSED_SYMBOLS is not set
1221# CONFIG_DEBUG_FS is not set 1210# CONFIG_DEBUG_FS is not set
1222# CONFIG_HEADERS_CHECK is not set 1211# CONFIG_HEADERS_CHECK is not set
1223# CONFIG_DEBUG_KERNEL is not set 1212# CONFIG_DEBUG_KERNEL is not set
1213# CONFIG_SLUB_DEBUG_ON is not set
1224# CONFIG_DEBUG_BUGVERBOSE is not set 1214# CONFIG_DEBUG_BUGVERBOSE is not set
1215# CONFIG_SAMPLES is not set
1225# CONFIG_PPC_EARLY_DEBUG is not set 1216# CONFIG_PPC_EARLY_DEBUG is not set
1226 1217
1227# 1218#
@@ -1229,6 +1220,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1229# 1220#
1230# CONFIG_KEYS is not set 1221# CONFIG_KEYS is not set
1231# CONFIG_SECURITY is not set 1222# CONFIG_SECURITY is not set
1223# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1232CONFIG_CRYPTO=y 1224CONFIG_CRYPTO=y
1233CONFIG_CRYPTO_ALGAPI=y 1225CONFIG_CRYPTO_ALGAPI=y
1234CONFIG_CRYPTO_BLKCIPHER=y 1226CONFIG_CRYPTO_BLKCIPHER=y
@@ -1248,6 +1240,7 @@ CONFIG_CRYPTO_MD5=y
1248CONFIG_CRYPTO_CBC=y 1240CONFIG_CRYPTO_CBC=y
1249CONFIG_CRYPTO_PCBC=m 1241CONFIG_CRYPTO_PCBC=m
1250# CONFIG_CRYPTO_LRW is not set 1242# CONFIG_CRYPTO_LRW is not set
1243# CONFIG_CRYPTO_XTS is not set
1251# CONFIG_CRYPTO_CRYPTD is not set 1244# CONFIG_CRYPTO_CRYPTD is not set
1252CONFIG_CRYPTO_DES=y 1245CONFIG_CRYPTO_DES=y
1253# CONFIG_CRYPTO_FCRYPT is not set 1246# CONFIG_CRYPTO_FCRYPT is not set
@@ -1261,9 +1254,12 @@ CONFIG_CRYPTO_DES=y
1261# CONFIG_CRYPTO_ARC4 is not set 1254# CONFIG_CRYPTO_ARC4 is not set
1262# CONFIG_CRYPTO_KHAZAD is not set 1255# CONFIG_CRYPTO_KHAZAD is not set
1263# CONFIG_CRYPTO_ANUBIS is not set 1256# CONFIG_CRYPTO_ANUBIS is not set
1257# CONFIG_CRYPTO_SEED is not set
1264# CONFIG_CRYPTO_DEFLATE is not set 1258# CONFIG_CRYPTO_DEFLATE is not set
1265# CONFIG_CRYPTO_MICHAEL_MIC is not set 1259# CONFIG_CRYPTO_MICHAEL_MIC is not set
1266# CONFIG_CRYPTO_CRC32C is not set 1260# CONFIG_CRYPTO_CRC32C is not set
1267# CONFIG_CRYPTO_CAMELLIA is not set 1261# CONFIG_CRYPTO_CAMELLIA is not set
1268# CONFIG_CRYPTO_TEST is not set 1262# CONFIG_CRYPTO_TEST is not set
1263# CONFIG_CRYPTO_AUTHENC is not set
1269CONFIG_CRYPTO_HW=y 1264CONFIG_CRYPTO_HW=y
1265# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 9faa948c22ad..67cb09cc3ace 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:41 2007 4# Thu Dec 6 16:48:39 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -156,6 +162,10 @@ CONFIG_MPC834x=y
156# Kernel options 162# Kernel options
157# 163#
158# CONFIG_HIGHMEM is not set 164# CONFIG_HIGHMEM is not set
165CONFIG_TICK_ONESHOT=y
166CONFIG_NO_HZ=y
167CONFIG_HIGH_RES_TIMERS=y
168CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 169# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 170CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 171# CONFIG_HZ_300 is not set
@@ -176,6 +186,7 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
179CONFIG_SPLIT_PTLOCK_CPUS=4 190CONFIG_SPLIT_PTLOCK_CPUS=4
180# CONFIG_RESOURCES_64BIT is not set 191# CONFIG_RESOURCES_64BIT is not set
181CONFIG_ZONE_DMA_FLAG=1 192CONFIG_ZONE_DMA_FLAG=1
@@ -184,6 +195,8 @@ CONFIG_VIRT_TO_BUS=y
184CONFIG_PROC_DEVICETREE=y 195CONFIG_PROC_DEVICETREE=y
185# CONFIG_CMDLINE_BOOL is not set 196# CONFIG_CMDLINE_BOOL is not set
186# CONFIG_PM is not set 197# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
187CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
188CONFIG_WANT_DEVICE_TREE=y 201CONFIG_WANT_DEVICE_TREE=y
189CONFIG_DEVICE_TREE="" 202CONFIG_DEVICE_TREE=""
@@ -202,10 +215,7 @@ CONFIG_PCI_SYSCALL=y
202# CONFIG_PCIEPORTBUS is not set 215# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y 216CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set 217# CONFIG_PCI_MSI is not set
205 218CONFIG_PCI_LEGACY=y
206#
207# PCCARD (PCMCIA/CardBus) support
208#
209# CONFIG_PCCARD is not set 219# CONFIG_PCCARD is not set
210# CONFIG_HOTPLUG_PCI is not set 220# CONFIG_HOTPLUG_PCI is not set
211 221
@@ -220,7 +230,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
220CONFIG_HIGHMEM_START=0xfe000000 230CONFIG_HIGHMEM_START=0xfe000000
221CONFIG_LOWMEM_SIZE=0x30000000 231CONFIG_LOWMEM_SIZE=0x30000000
222CONFIG_KERNEL_START=0xc0000000 232CONFIG_KERNEL_START=0xc0000000
223CONFIG_TASK_SIZE=0x80000000 233CONFIG_TASK_SIZE=0xc0000000
224CONFIG_BOOT_LOAD=0x00800000 234CONFIG_BOOT_LOAD=0x00800000
225 235
226# 236#
@@ -260,6 +270,7 @@ CONFIG_SYN_COOKIES=y
260CONFIG_INET_XFRM_MODE_TRANSPORT=y 270CONFIG_INET_XFRM_MODE_TRANSPORT=y
261CONFIG_INET_XFRM_MODE_TUNNEL=y 271CONFIG_INET_XFRM_MODE_TUNNEL=y
262CONFIG_INET_XFRM_MODE_BEET=y 272CONFIG_INET_XFRM_MODE_BEET=y
273# CONFIG_INET_LRO is not set
263CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
@@ -285,10 +296,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
285# CONFIG_LAPB is not set 296# CONFIG_LAPB is not set
286# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
292# CONFIG_NET_SCHED is not set 299# CONFIG_NET_SCHED is not set
293 300
294# 301#
@@ -317,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# 324#
318# Generic Driver Options 325# Generic Driver Options
319# 326#
327CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
320CONFIG_STANDALONE=y 328CONFIG_STANDALONE=y
321CONFIG_PREVENT_FIRMWARE_BUILD=y 329CONFIG_PREVENT_FIRMWARE_BUILD=y
322# CONFIG_FW_LOADER is not set 330# CONFIG_FW_LOADER is not set
@@ -339,6 +347,7 @@ CONFIG_MTD_CHAR=y
339# CONFIG_INFTL is not set 347# CONFIG_INFTL is not set
340# CONFIG_RFD_FTL is not set 348# CONFIG_RFD_FTL is not set
341# CONFIG_SSFDC is not set 349# CONFIG_SSFDC is not set
350# CONFIG_MTD_OOPS is not set
342 351
343# 352#
344# RAM/ROM/Flash chip drivers 353# RAM/ROM/Flash chip drivers
@@ -374,6 +383,7 @@ CONFIG_MTD_PHYSMAP_START=0xfe000000
374CONFIG_MTD_PHYSMAP_LEN=0x800000 383CONFIG_MTD_PHYSMAP_LEN=0x800000
375CONFIG_MTD_PHYSMAP_BANKWIDTH=2 384CONFIG_MTD_PHYSMAP_BANKWIDTH=2
376# CONFIG_MTD_PHYSMAP_OF is not set 385# CONFIG_MTD_PHYSMAP_OF is not set
386# CONFIG_MTD_INTEL_VR_NOR is not set
377# CONFIG_MTD_PLATRAM is not set 387# CONFIG_MTD_PLATRAM is not set
378 388
379# 389#
@@ -413,6 +423,7 @@ CONFIG_BLK_DEV_LOOP=y
413# CONFIG_BLK_DEV_CRYPTOLOOP is not set 423# CONFIG_BLK_DEV_CRYPTOLOOP is not set
414# CONFIG_BLK_DEV_NBD is not set 424# CONFIG_BLK_DEV_NBD is not set
415# CONFIG_BLK_DEV_SX8 is not set 425# CONFIG_BLK_DEV_SX8 is not set
426# CONFIG_BLK_DEV_UB is not set
416CONFIG_BLK_DEV_RAM=y 427CONFIG_BLK_DEV_RAM=y
417CONFIG_BLK_DEV_RAM_COUNT=16 428CONFIG_BLK_DEV_RAM_COUNT=16
418CONFIG_BLK_DEV_RAM_SIZE=32768 429CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -462,6 +473,7 @@ CONFIG_SCSI_SPI_ATTRS=y
462# CONFIG_SCSI_FC_ATTRS is not set 473# CONFIG_SCSI_FC_ATTRS is not set
463# CONFIG_SCSI_ISCSI_ATTRS is not set 474# CONFIG_SCSI_ISCSI_ATTRS is not set
464# CONFIG_SCSI_SAS_LIBSAS is not set 475# CONFIG_SCSI_SAS_LIBSAS is not set
476# CONFIG_SCSI_SRP_ATTRS is not set
465CONFIG_SCSI_LOWLEVEL=y 477CONFIG_SCSI_LOWLEVEL=y
466# CONFIG_ISCSI_TCP is not set 478# CONFIG_ISCSI_TCP is not set
467# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 479# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -473,6 +485,7 @@ CONFIG_SCSI_LOWLEVEL=y
473# CONFIG_SCSI_AIC79XX is not set 485# CONFIG_SCSI_AIC79XX is not set
474# CONFIG_SCSI_AIC94XX is not set 486# CONFIG_SCSI_AIC94XX is not set
475# CONFIG_SCSI_DPT_I2O is not set 487# CONFIG_SCSI_DPT_I2O is not set
488# CONFIG_SCSI_ADVANSYS is not set
476# CONFIG_SCSI_ARCMSR is not set 489# CONFIG_SCSI_ARCMSR is not set
477# CONFIG_MEGARAID_NEWGEN is not set 490# CONFIG_MEGARAID_NEWGEN is not set
478# CONFIG_MEGARAID_LEGACY is not set 491# CONFIG_MEGARAID_LEGACY is not set
@@ -499,14 +512,7 @@ CONFIG_SCSI_LOWLEVEL=y
499# CONFIG_SCSI_SRP is not set 512# CONFIG_SCSI_SRP is not set
500# CONFIG_ATA is not set 513# CONFIG_ATA is not set
501# CONFIG_MD is not set 514# CONFIG_MD is not set
502
503#
504# Fusion MPT device support
505#
506# CONFIG_FUSION is not set 515# CONFIG_FUSION is not set
507# CONFIG_FUSION_SPI is not set
508# CONFIG_FUSION_FC is not set
509# CONFIG_FUSION_SAS is not set
510 516
511# 517#
512# IEEE 1394 (FireWire) support 518# IEEE 1394 (FireWire) support
@@ -522,6 +528,8 @@ CONFIG_NETDEVICES=y
522# CONFIG_MACVLAN is not set 528# CONFIG_MACVLAN is not set
523# CONFIG_EQUALIZER is not set 529# CONFIG_EQUALIZER is not set
524# CONFIG_TUN is not set 530# CONFIG_TUN is not set
531# CONFIG_VETH is not set
532# CONFIG_IP1000 is not set
525# CONFIG_ARCNET is not set 533# CONFIG_ARCNET is not set
526CONFIG_PHYLIB=y 534CONFIG_PHYLIB=y
527 535
@@ -538,11 +546,13 @@ CONFIG_CICADA_PHY=y
538# CONFIG_BROADCOM_PHY is not set 546# CONFIG_BROADCOM_PHY is not set
539# CONFIG_ICPLUS_PHY is not set 547# CONFIG_ICPLUS_PHY is not set
540# CONFIG_FIXED_PHY is not set 548# CONFIG_FIXED_PHY is not set
549# CONFIG_MDIO_BITBANG is not set
541# CONFIG_NET_ETHERNET is not set 550# CONFIG_NET_ETHERNET is not set
542CONFIG_NETDEV_1000=y 551CONFIG_NETDEV_1000=y
543# CONFIG_ACENIC is not set 552# CONFIG_ACENIC is not set
544# CONFIG_DL2K is not set 553# CONFIG_DL2K is not set
545# CONFIG_E1000 is not set 554# CONFIG_E1000 is not set
555# CONFIG_E1000E is not set
546# CONFIG_NS83820 is not set 556# CONFIG_NS83820 is not set
547# CONFIG_HAMACHI is not set 557# CONFIG_HAMACHI is not set
548# CONFIG_YELLOWFIN is not set 558# CONFIG_YELLOWFIN is not set
@@ -550,6 +560,7 @@ CONFIG_NETDEV_1000=y
550# CONFIG_SIS190 is not set 560# CONFIG_SIS190 is not set
551# CONFIG_SKGE is not set 561# CONFIG_SKGE is not set
552# CONFIG_SKY2 is not set 562# CONFIG_SKY2 is not set
563# CONFIG_SK98LIN is not set
553# CONFIG_VIA_VELOCITY is not set 564# CONFIG_VIA_VELOCITY is not set
554# CONFIG_TIGON3 is not set 565# CONFIG_TIGON3 is not set
555# CONFIG_BNX2 is not set 566# CONFIG_BNX2 is not set
@@ -560,11 +571,14 @@ CONFIG_GFAR_NAPI=y
560CONFIG_NETDEV_10000=y 571CONFIG_NETDEV_10000=y
561# CONFIG_CHELSIO_T1 is not set 572# CONFIG_CHELSIO_T1 is not set
562# CONFIG_CHELSIO_T3 is not set 573# CONFIG_CHELSIO_T3 is not set
574# CONFIG_IXGBE is not set
563# CONFIG_IXGB is not set 575# CONFIG_IXGB is not set
564# CONFIG_S2IO is not set 576# CONFIG_S2IO is not set
565# CONFIG_MYRI10GE is not set 577# CONFIG_MYRI10GE is not set
566# CONFIG_NETXEN_NIC is not set 578# CONFIG_NETXEN_NIC is not set
579# CONFIG_NIU is not set
567# CONFIG_MLX4_CORE is not set 580# CONFIG_MLX4_CORE is not set
581# CONFIG_TEHUTI is not set
568# CONFIG_TR is not set 582# CONFIG_TR is not set
569 583
570# 584#
@@ -572,6 +586,15 @@ CONFIG_NETDEV_10000=y
572# 586#
573# CONFIG_WLAN_PRE80211 is not set 587# CONFIG_WLAN_PRE80211 is not set
574# CONFIG_WLAN_80211 is not set 588# CONFIG_WLAN_80211 is not set
589
590#
591# USB Network Adapters
592#
593# CONFIG_USB_CATC is not set
594# CONFIG_USB_KAWETH is not set
595# CONFIG_USB_PEGASUS is not set
596# CONFIG_USB_RTL8150 is not set
597# CONFIG_USB_USBNET is not set
575# CONFIG_WAN is not set 598# CONFIG_WAN is not set
576# CONFIG_FDDI is not set 599# CONFIG_FDDI is not set
577# CONFIG_HIPPI is not set 600# CONFIG_HIPPI is not set
@@ -624,27 +647,11 @@ CONFIG_UNIX98_PTYS=y
624CONFIG_LEGACY_PTYS=y 647CONFIG_LEGACY_PTYS=y
625CONFIG_LEGACY_PTY_COUNT=256 648CONFIG_LEGACY_PTY_COUNT=256
626# CONFIG_IPMI_HANDLER is not set 649# CONFIG_IPMI_HANDLER is not set
627CONFIG_WATCHDOG=y
628# CONFIG_WATCHDOG_NOWAYOUT is not set
629
630#
631# Watchdog Device Drivers
632#
633# CONFIG_SOFT_WATCHDOG is not set
634CONFIG_83xx_WDT=y
635
636#
637# PCI-based Watchdog Cards
638#
639# CONFIG_PCIPCWATCHDOG is not set
640# CONFIG_WDTPCI is not set
641CONFIG_HW_RANDOM=y 650CONFIG_HW_RANDOM=y
642# CONFIG_NVRAM is not set 651# CONFIG_NVRAM is not set
643# CONFIG_GEN_RTC is not set 652# CONFIG_GEN_RTC is not set
644# CONFIG_R3964 is not set 653# CONFIG_R3964 is not set
645# CONFIG_APPLICOM is not set 654# CONFIG_APPLICOM is not set
646# CONFIG_AGP is not set
647# CONFIG_DRM is not set
648# CONFIG_RAW_DRIVER is not set 655# CONFIG_RAW_DRIVER is not set
649# CONFIG_TCG_TPM is not set 656# CONFIG_TCG_TPM is not set
650CONFIG_DEVPORT=y 657CONFIG_DEVPORT=y
@@ -682,6 +689,7 @@ CONFIG_I2C_MPC=y
682# CONFIG_I2C_SIS96X is not set 689# CONFIG_I2C_SIS96X is not set
683# CONFIG_I2C_TAOS_EVM is not set 690# CONFIG_I2C_TAOS_EVM is not set
684# CONFIG_I2C_STUB is not set 691# CONFIG_I2C_STUB is not set
692# CONFIG_I2C_TINY_USB is not set
685# CONFIG_I2C_VIA is not set 693# CONFIG_I2C_VIA is not set
686# CONFIG_I2C_VIAPRO is not set 694# CONFIG_I2C_VIAPRO is not set
687# CONFIG_I2C_VOODOO3 is not set 695# CONFIG_I2C_VOODOO3 is not set
@@ -725,6 +733,31 @@ CONFIG_SPI_MPC83xx=y
725# CONFIG_W1 is not set 733# CONFIG_W1 is not set
726# CONFIG_POWER_SUPPLY is not set 734# CONFIG_POWER_SUPPLY is not set
727# CONFIG_HWMON is not set 735# CONFIG_HWMON is not set
736CONFIG_WATCHDOG=y
737# CONFIG_WATCHDOG_NOWAYOUT is not set
738
739#
740# Watchdog Device Drivers
741#
742# CONFIG_SOFT_WATCHDOG is not set
743CONFIG_83xx_WDT=y
744
745#
746# PCI-based Watchdog Cards
747#
748# CONFIG_PCIPCWATCHDOG is not set
749# CONFIG_WDTPCI is not set
750
751#
752# USB-based Watchdog Cards
753#
754# CONFIG_USBPCWATCHDOG is not set
755
756#
757# Sonics Silicon Backplane
758#
759CONFIG_SSB_POSSIBLE=y
760# CONFIG_SSB is not set
728 761
729# 762#
730# Multifunction device drivers 763# Multifunction device drivers
@@ -737,20 +770,22 @@ CONFIG_SPI_MPC83xx=y
737# CONFIG_VIDEO_DEV is not set 770# CONFIG_VIDEO_DEV is not set
738# CONFIG_DVB_CORE is not set 771# CONFIG_DVB_CORE is not set
739CONFIG_DAB=y 772CONFIG_DAB=y
773# CONFIG_USB_DABUSB is not set
740 774
741# 775#
742# Graphics support 776# Graphics support
743# 777#
778# CONFIG_AGP is not set
779# CONFIG_DRM is not set
780# CONFIG_VGASTATE is not set
781CONFIG_VIDEO_OUTPUT_CONTROL=m
782# CONFIG_FB is not set
744# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 783# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
745 784
746# 785#
747# Display device support 786# Display device support
748# 787#
749# CONFIG_DISPLAY_SUPPORT is not set 788# CONFIG_DISPLAY_SUPPORT is not set
750# CONFIG_VGASTATE is not set
751CONFIG_VIDEO_OUTPUT_CONTROL=m
752# CONFIG_FB is not set
753# CONFIG_FB_IBM_GXT4500 is not set
754 789
755# 790#
756# Sound 791# Sound
@@ -802,6 +837,7 @@ CONFIG_USB_STORAGE=y
802# CONFIG_USB_STORAGE_DEBUG is not set 837# CONFIG_USB_STORAGE_DEBUG is not set
803# CONFIG_USB_STORAGE_DATAFAB is not set 838# CONFIG_USB_STORAGE_DATAFAB is not set
804# CONFIG_USB_STORAGE_FREECOM is not set 839# CONFIG_USB_STORAGE_FREECOM is not set
840# CONFIG_USB_STORAGE_ISD200 is not set
805# CONFIG_USB_STORAGE_DPCM is not set 841# CONFIG_USB_STORAGE_DPCM is not set
806# CONFIG_USB_STORAGE_USBAT is not set 842# CONFIG_USB_STORAGE_USBAT is not set
807# CONFIG_USB_STORAGE_SDDR09 is not set 843# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -881,6 +917,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
881# I2C RTC drivers 917# I2C RTC drivers
882# 918#
883CONFIG_RTC_DRV_DS1307=y 919CONFIG_RTC_DRV_DS1307=y
920# CONFIG_RTC_DRV_DS1374 is not set
884# CONFIG_RTC_DRV_DS1672 is not set 921# CONFIG_RTC_DRV_DS1672 is not set
885# CONFIG_RTC_DRV_MAX6900 is not set 922# CONFIG_RTC_DRV_MAX6900 is not set
886# CONFIG_RTC_DRV_RS5C372 is not set 923# CONFIG_RTC_DRV_RS5C372 is not set
@@ -912,21 +949,6 @@ CONFIG_RTC_DRV_DS1307=y
912# 949#
913 950
914# 951#
915# DMA Engine support
916#
917CONFIG_DMA_ENGINE=y
918
919#
920# DMA Clients
921#
922CONFIG_NET_DMA=y
923
924#
925# DMA Devices
926#
927CONFIG_INTEL_IOATDMA=y
928
929#
930# Userspace I/O 952# Userspace I/O
931# 953#
932# CONFIG_UIO is not set 954# CONFIG_UIO is not set
@@ -943,7 +965,6 @@ CONFIG_EXT3_FS_XATTR=y
943# CONFIG_EXT3_FS_SECURITY is not set 965# CONFIG_EXT3_FS_SECURITY is not set
944# CONFIG_EXT4DEV_FS is not set 966# CONFIG_EXT4DEV_FS is not set
945CONFIG_JBD=y 967CONFIG_JBD=y
946# CONFIG_JBD_DEBUG is not set
947CONFIG_FS_MBCACHE=y 968CONFIG_FS_MBCACHE=y
948# CONFIG_REISERFS_FS is not set 969# CONFIG_REISERFS_FS is not set
949# CONFIG_JFS_FS is not set 970# CONFIG_JFS_FS is not set
@@ -987,7 +1008,6 @@ CONFIG_SYSFS=y
987CONFIG_TMPFS=y 1008CONFIG_TMPFS=y
988# CONFIG_TMPFS_POSIX_ACL is not set 1009# CONFIG_TMPFS_POSIX_ACL is not set
989# CONFIG_HUGETLB_PAGE is not set 1010# CONFIG_HUGETLB_PAGE is not set
990CONFIG_RAMFS=y
991# CONFIG_CONFIGFS_FS is not set 1011# CONFIG_CONFIGFS_FS is not set
992 1012
993# 1013#
@@ -1007,10 +1027,7 @@ CONFIG_RAMFS=y
1007# CONFIG_QNX4FS_FS is not set 1027# CONFIG_QNX4FS_FS is not set
1008# CONFIG_SYSV_FS is not set 1028# CONFIG_SYSV_FS is not set
1009# CONFIG_UFS_FS is not set 1029# CONFIG_UFS_FS is not set
1010 1030CONFIG_NETWORK_FILESYSTEMS=y
1011#
1012# Network File Systems
1013#
1014CONFIG_NFS_FS=y 1031CONFIG_NFS_FS=y
1015CONFIG_NFS_V3=y 1032CONFIG_NFS_V3=y
1016# CONFIG_NFS_V3_ACL is not set 1033# CONFIG_NFS_V3_ACL is not set
@@ -1053,10 +1070,6 @@ CONFIG_MSDOS_PARTITION=y
1053# CONFIG_KARMA_PARTITION is not set 1070# CONFIG_KARMA_PARTITION is not set
1054# CONFIG_EFI_PARTITION is not set 1071# CONFIG_EFI_PARTITION is not set
1055# CONFIG_SYSV68_PARTITION is not set 1072# CONFIG_SYSV68_PARTITION is not set
1056
1057#
1058# Native Language Support
1059#
1060CONFIG_NLS=y 1073CONFIG_NLS=y
1061CONFIG_NLS_DEFAULT="iso8859-1" 1074CONFIG_NLS_DEFAULT="iso8859-1"
1062# CONFIG_NLS_CODEPAGE_437 is not set 1075# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1097,10 +1110,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1097# CONFIG_NLS_KOI8_R is not set 1110# CONFIG_NLS_KOI8_R is not set
1098# CONFIG_NLS_KOI8_U is not set 1111# CONFIG_NLS_KOI8_U is not set
1099# CONFIG_NLS_UTF8 is not set 1112# CONFIG_NLS_UTF8 is not set
1100
1101#
1102# Distributed Lock Manager
1103#
1104# CONFIG_DLM is not set 1113# CONFIG_DLM is not set
1105# CONFIG_UCC_SLOW is not set 1114# CONFIG_UCC_SLOW is not set
1106 1115
@@ -1118,23 +1127,22 @@ CONFIG_PLIST=y
1118CONFIG_HAS_IOMEM=y 1127CONFIG_HAS_IOMEM=y
1119CONFIG_HAS_IOPORT=y 1128CONFIG_HAS_IOPORT=y
1120CONFIG_HAS_DMA=y 1129CONFIG_HAS_DMA=y
1121 1130# CONFIG_INSTRUMENTATION is not set
1122#
1123# Instrumentation Support
1124#
1125# CONFIG_PROFILING is not set
1126 1131
1127# 1132#
1128# Kernel hacking 1133# Kernel hacking
1129# 1134#
1130# CONFIG_PRINTK_TIME is not set 1135# CONFIG_PRINTK_TIME is not set
1136CONFIG_ENABLE_WARN_DEPRECATED=y
1131CONFIG_ENABLE_MUST_CHECK=y 1137CONFIG_ENABLE_MUST_CHECK=y
1132# CONFIG_MAGIC_SYSRQ is not set 1138# CONFIG_MAGIC_SYSRQ is not set
1133# CONFIG_UNUSED_SYMBOLS is not set 1139# CONFIG_UNUSED_SYMBOLS is not set
1134# CONFIG_DEBUG_FS is not set 1140# CONFIG_DEBUG_FS is not set
1135# CONFIG_HEADERS_CHECK is not set 1141# CONFIG_HEADERS_CHECK is not set
1136# CONFIG_DEBUG_KERNEL is not set 1142# CONFIG_DEBUG_KERNEL is not set
1143# CONFIG_SLUB_DEBUG_ON is not set
1137# CONFIG_DEBUG_BUGVERBOSE is not set 1144# CONFIG_DEBUG_BUGVERBOSE is not set
1145# CONFIG_SAMPLES is not set
1138# CONFIG_PPC_EARLY_DEBUG is not set 1146# CONFIG_PPC_EARLY_DEBUG is not set
1139 1147
1140# 1148#
@@ -1142,6 +1150,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1142# 1150#
1143# CONFIG_KEYS is not set 1151# CONFIG_KEYS is not set
1144# CONFIG_SECURITY is not set 1152# CONFIG_SECURITY is not set
1153# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1145CONFIG_CRYPTO=y 1154CONFIG_CRYPTO=y
1146CONFIG_CRYPTO_ALGAPI=y 1155CONFIG_CRYPTO_ALGAPI=y
1147CONFIG_CRYPTO_BLKCIPHER=y 1156CONFIG_CRYPTO_BLKCIPHER=y
@@ -1161,6 +1170,7 @@ CONFIG_CRYPTO_MD5=y
1161CONFIG_CRYPTO_CBC=y 1170CONFIG_CRYPTO_CBC=y
1162CONFIG_CRYPTO_PCBC=m 1171CONFIG_CRYPTO_PCBC=m
1163# CONFIG_CRYPTO_LRW is not set 1172# CONFIG_CRYPTO_LRW is not set
1173# CONFIG_CRYPTO_XTS is not set
1164# CONFIG_CRYPTO_CRYPTD is not set 1174# CONFIG_CRYPTO_CRYPTD is not set
1165CONFIG_CRYPTO_DES=y 1175CONFIG_CRYPTO_DES=y
1166# CONFIG_CRYPTO_FCRYPT is not set 1176# CONFIG_CRYPTO_FCRYPT is not set
@@ -1174,9 +1184,12 @@ CONFIG_CRYPTO_DES=y
1174# CONFIG_CRYPTO_ARC4 is not set 1184# CONFIG_CRYPTO_ARC4 is not set
1175# CONFIG_CRYPTO_KHAZAD is not set 1185# CONFIG_CRYPTO_KHAZAD is not set
1176# CONFIG_CRYPTO_ANUBIS is not set 1186# CONFIG_CRYPTO_ANUBIS is not set
1187# CONFIG_CRYPTO_SEED is not set
1177# CONFIG_CRYPTO_DEFLATE is not set 1188# CONFIG_CRYPTO_DEFLATE is not set
1178# CONFIG_CRYPTO_MICHAEL_MIC is not set 1189# CONFIG_CRYPTO_MICHAEL_MIC is not set
1179# CONFIG_CRYPTO_CRC32C is not set 1190# CONFIG_CRYPTO_CRC32C is not set
1180# CONFIG_CRYPTO_CAMELLIA is not set 1191# CONFIG_CRYPTO_CAMELLIA is not set
1181# CONFIG_CRYPTO_TEST is not set 1192# CONFIG_CRYPTO_TEST is not set
1193# CONFIG_CRYPTO_AUTHENC is not set
1182CONFIG_CRYPTO_HW=y 1194CONFIG_CRYPTO_HW=y
1195# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 356f736a5d3d..217539f3ecef 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:41 2007 4# Thu Dec 6 16:48:41 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -156,6 +162,10 @@ CONFIG_MPC834x=y
156# Kernel options 162# Kernel options
157# 163#
158# CONFIG_HIGHMEM is not set 164# CONFIG_HIGHMEM is not set
165CONFIG_TICK_ONESHOT=y
166CONFIG_NO_HZ=y
167CONFIG_HIGH_RES_TIMERS=y
168CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 169# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 170CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 171# CONFIG_HZ_300 is not set
@@ -176,6 +186,7 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
179CONFIG_SPLIT_PTLOCK_CPUS=4 190CONFIG_SPLIT_PTLOCK_CPUS=4
180# CONFIG_RESOURCES_64BIT is not set 191# CONFIG_RESOURCES_64BIT is not set
181CONFIG_ZONE_DMA_FLAG=1 192CONFIG_ZONE_DMA_FLAG=1
@@ -184,6 +195,8 @@ CONFIG_VIRT_TO_BUS=y
184CONFIG_PROC_DEVICETREE=y 195CONFIG_PROC_DEVICETREE=y
185# CONFIG_CMDLINE_BOOL is not set 196# CONFIG_CMDLINE_BOOL is not set
186# CONFIG_PM is not set 197# CONFIG_PM is not set
198CONFIG_SUSPEND_UP_POSSIBLE=y
199CONFIG_HIBERNATION_UP_POSSIBLE=y
187CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
188CONFIG_WANT_DEVICE_TREE=y 201CONFIG_WANT_DEVICE_TREE=y
189CONFIG_DEVICE_TREE="" 202CONFIG_DEVICE_TREE=""
@@ -202,10 +215,7 @@ CONFIG_PCI_SYSCALL=y
202# CONFIG_PCIEPORTBUS is not set 215# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y 216CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set 217# CONFIG_PCI_MSI is not set
205 218CONFIG_PCI_LEGACY=y
206#
207# PCCARD (PCMCIA/CardBus) support
208#
209# CONFIG_PCCARD is not set 219# CONFIG_PCCARD is not set
210# CONFIG_HOTPLUG_PCI is not set 220# CONFIG_HOTPLUG_PCI is not set
211 221
@@ -220,7 +230,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
220CONFIG_HIGHMEM_START=0xfe000000 230CONFIG_HIGHMEM_START=0xfe000000
221CONFIG_LOWMEM_SIZE=0x30000000 231CONFIG_LOWMEM_SIZE=0x30000000
222CONFIG_KERNEL_START=0xc0000000 232CONFIG_KERNEL_START=0xc0000000
223CONFIG_TASK_SIZE=0x80000000 233CONFIG_TASK_SIZE=0xc0000000
224CONFIG_BOOT_LOAD=0x00800000 234CONFIG_BOOT_LOAD=0x00800000
225 235
226# 236#
@@ -260,6 +270,7 @@ CONFIG_SYN_COOKIES=y
260CONFIG_INET_XFRM_MODE_TRANSPORT=y 270CONFIG_INET_XFRM_MODE_TRANSPORT=y
261CONFIG_INET_XFRM_MODE_TUNNEL=y 271CONFIG_INET_XFRM_MODE_TUNNEL=y
262CONFIG_INET_XFRM_MODE_BEET=y 272CONFIG_INET_XFRM_MODE_BEET=y
273# CONFIG_INET_LRO is not set
263CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
@@ -285,10 +296,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
285# CONFIG_LAPB is not set 296# CONFIG_LAPB is not set
286# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
292# CONFIG_NET_SCHED is not set 299# CONFIG_NET_SCHED is not set
293 300
294# 301#
@@ -317,6 +324,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# 324#
318# Generic Driver Options 325# Generic Driver Options
319# 326#
327CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
320CONFIG_STANDALONE=y 328CONFIG_STANDALONE=y
321CONFIG_PREVENT_FIRMWARE_BUILD=y 329CONFIG_PREVENT_FIRMWARE_BUILD=y
322# CONFIG_FW_LOADER is not set 330# CONFIG_FW_LOADER is not set
@@ -358,10 +366,6 @@ CONFIG_MISC_DEVICES=y
358# CONFIG_SCSI_NETLINK is not set 366# CONFIG_SCSI_NETLINK is not set
359# CONFIG_ATA is not set 367# CONFIG_ATA is not set
360# CONFIG_MD is not set 368# CONFIG_MD is not set
361
362#
363# Fusion MPT device support
364#
365# CONFIG_FUSION is not set 369# CONFIG_FUSION is not set
366 370
367# 371#
@@ -378,6 +382,8 @@ CONFIG_NETDEVICES=y
378# CONFIG_MACVLAN is not set 382# CONFIG_MACVLAN is not set
379# CONFIG_EQUALIZER is not set 383# CONFIG_EQUALIZER is not set
380# CONFIG_TUN is not set 384# CONFIG_TUN is not set
385# CONFIG_VETH is not set
386# CONFIG_IP1000 is not set
381# CONFIG_ARCNET is not set 387# CONFIG_ARCNET is not set
382CONFIG_PHYLIB=y 388CONFIG_PHYLIB=y
383 389
@@ -394,6 +400,7 @@ CONFIG_MARVELL_PHY=y
394# CONFIG_BROADCOM_PHY is not set 400# CONFIG_BROADCOM_PHY is not set
395# CONFIG_ICPLUS_PHY is not set 401# CONFIG_ICPLUS_PHY is not set
396# CONFIG_FIXED_PHY is not set 402# CONFIG_FIXED_PHY is not set
403# CONFIG_MDIO_BITBANG is not set
397CONFIG_NET_ETHERNET=y 404CONFIG_NET_ETHERNET=y
398CONFIG_MII=y 405CONFIG_MII=y
399# CONFIG_HAPPYMEAL is not set 406# CONFIG_HAPPYMEAL is not set
@@ -402,13 +409,16 @@ CONFIG_MII=y
402# CONFIG_NET_VENDOR_3COM is not set 409# CONFIG_NET_VENDOR_3COM is not set
403# CONFIG_NET_TULIP is not set 410# CONFIG_NET_TULIP is not set
404# CONFIG_HP100 is not set 411# CONFIG_HP100 is not set
412# CONFIG_IBM_NEW_EMAC_ZMII is not set
413# CONFIG_IBM_NEW_EMAC_RGMII is not set
414# CONFIG_IBM_NEW_EMAC_TAH is not set
415# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
405CONFIG_NET_PCI=y 416CONFIG_NET_PCI=y
406# CONFIG_PCNET32 is not set 417# CONFIG_PCNET32 is not set
407# CONFIG_AMD8111_ETH is not set 418# CONFIG_AMD8111_ETH is not set
408# CONFIG_ADAPTEC_STARFIRE is not set 419# CONFIG_ADAPTEC_STARFIRE is not set
409# CONFIG_B44 is not set 420# CONFIG_B44 is not set
410# CONFIG_FORCEDETH is not set 421# CONFIG_FORCEDETH is not set
411# CONFIG_DGRS is not set
412# CONFIG_EEPRO100 is not set 422# CONFIG_EEPRO100 is not set
413CONFIG_E100=y 423CONFIG_E100=y
414# CONFIG_FEALNX is not set 424# CONFIG_FEALNX is not set
@@ -426,6 +436,7 @@ CONFIG_NETDEV_1000=y
426# CONFIG_ACENIC is not set 436# CONFIG_ACENIC is not set
427# CONFIG_DL2K is not set 437# CONFIG_DL2K is not set
428# CONFIG_E1000 is not set 438# CONFIG_E1000 is not set
439# CONFIG_E1000E is not set
429# CONFIG_NS83820 is not set 440# CONFIG_NS83820 is not set
430# CONFIG_HAMACHI is not set 441# CONFIG_HAMACHI is not set
431# CONFIG_YELLOWFIN is not set 442# CONFIG_YELLOWFIN is not set
@@ -433,6 +444,7 @@ CONFIG_NETDEV_1000=y
433# CONFIG_SIS190 is not set 444# CONFIG_SIS190 is not set
434# CONFIG_SKGE is not set 445# CONFIG_SKGE is not set
435# CONFIG_SKY2 is not set 446# CONFIG_SKY2 is not set
447# CONFIG_SK98LIN is not set
436# CONFIG_VIA_VELOCITY is not set 448# CONFIG_VIA_VELOCITY is not set
437# CONFIG_TIGON3 is not set 449# CONFIG_TIGON3 is not set
438# CONFIG_BNX2 is not set 450# CONFIG_BNX2 is not set
@@ -443,11 +455,14 @@ CONFIG_GIANFAR=y
443CONFIG_NETDEV_10000=y 455CONFIG_NETDEV_10000=y
444# CONFIG_CHELSIO_T1 is not set 456# CONFIG_CHELSIO_T1 is not set
445# CONFIG_CHELSIO_T3 is not set 457# CONFIG_CHELSIO_T3 is not set
458# CONFIG_IXGBE is not set
446# CONFIG_IXGB is not set 459# CONFIG_IXGB is not set
447# CONFIG_S2IO is not set 460# CONFIG_S2IO is not set
448# CONFIG_MYRI10GE is not set 461# CONFIG_MYRI10GE is not set
449# CONFIG_NETXEN_NIC is not set 462# CONFIG_NETXEN_NIC is not set
463# CONFIG_NIU is not set
450# CONFIG_MLX4_CORE is not set 464# CONFIG_MLX4_CORE is not set
465# CONFIG_TEHUTI is not set
451# CONFIG_TR is not set 466# CONFIG_TR is not set
452 467
453# 468#
@@ -479,7 +494,6 @@ CONFIG_INPUT=y
479# 494#
480# CONFIG_INPUT_MOUSEDEV is not set 495# CONFIG_INPUT_MOUSEDEV is not set
481# CONFIG_INPUT_JOYDEV is not set 496# CONFIG_INPUT_JOYDEV is not set
482# CONFIG_INPUT_TSDEV is not set
483# CONFIG_INPUT_EVDEV is not set 497# CONFIG_INPUT_EVDEV is not set
484# CONFIG_INPUT_EVBUG is not set 498# CONFIG_INPUT_EVBUG is not set
485 499
@@ -527,28 +541,12 @@ CONFIG_UNIX98_PTYS=y
527CONFIG_LEGACY_PTYS=y 541CONFIG_LEGACY_PTYS=y
528CONFIG_LEGACY_PTY_COUNT=256 542CONFIG_LEGACY_PTY_COUNT=256
529# CONFIG_IPMI_HANDLER is not set 543# CONFIG_IPMI_HANDLER is not set
530CONFIG_WATCHDOG=y
531# CONFIG_WATCHDOG_NOWAYOUT is not set
532
533#
534# Watchdog Device Drivers
535#
536# CONFIG_SOFT_WATCHDOG is not set
537CONFIG_83xx_WDT=y
538
539#
540# PCI-based Watchdog Cards
541#
542# CONFIG_PCIPCWATCHDOG is not set
543# CONFIG_WDTPCI is not set
544# CONFIG_HW_RANDOM is not set 544# CONFIG_HW_RANDOM is not set
545# CONFIG_NVRAM is not set 545# CONFIG_NVRAM is not set
546CONFIG_GEN_RTC=y 546CONFIG_GEN_RTC=y
547# CONFIG_GEN_RTC_X is not set 547# CONFIG_GEN_RTC_X is not set
548# CONFIG_R3964 is not set 548# CONFIG_R3964 is not set
549# CONFIG_APPLICOM is not set 549# CONFIG_APPLICOM is not set
550# CONFIG_AGP is not set
551# CONFIG_DRM is not set
552# CONFIG_RAW_DRIVER is not set 550# CONFIG_RAW_DRIVER is not set
553# CONFIG_TCG_TPM is not set 551# CONFIG_TCG_TPM is not set
554CONFIG_DEVPORT=y 552CONFIG_DEVPORT=y
@@ -617,8 +615,6 @@ CONFIG_I2C_MPC=y
617# CONFIG_POWER_SUPPLY is not set 615# CONFIG_POWER_SUPPLY is not set
618CONFIG_HWMON=y 616CONFIG_HWMON=y
619# CONFIG_HWMON_VID is not set 617# CONFIG_HWMON_VID is not set
620# CONFIG_SENSORS_ABITUGURU is not set
621# CONFIG_SENSORS_ABITUGURU3 is not set
622# CONFIG_SENSORS_AD7418 is not set 618# CONFIG_SENSORS_AD7418 is not set
623# CONFIG_SENSORS_ADM1021 is not set 619# CONFIG_SENSORS_ADM1021 is not set
624# CONFIG_SENSORS_ADM1025 is not set 620# CONFIG_SENSORS_ADM1025 is not set
@@ -626,12 +622,13 @@ CONFIG_HWMON=y
626# CONFIG_SENSORS_ADM1029 is not set 622# CONFIG_SENSORS_ADM1029 is not set
627# CONFIG_SENSORS_ADM1031 is not set 623# CONFIG_SENSORS_ADM1031 is not set
628# CONFIG_SENSORS_ADM9240 is not set 624# CONFIG_SENSORS_ADM9240 is not set
629# CONFIG_SENSORS_ASB100 is not set 625# CONFIG_SENSORS_ADT7470 is not set
630# CONFIG_SENSORS_ATXP1 is not set 626# CONFIG_SENSORS_ATXP1 is not set
631# CONFIG_SENSORS_DS1621 is not set 627# CONFIG_SENSORS_DS1621 is not set
628# CONFIG_SENSORS_I5K_AMB is not set
632# CONFIG_SENSORS_F71805F is not set 629# CONFIG_SENSORS_F71805F is not set
633# CONFIG_SENSORS_FSCHER is not set 630# CONFIG_SENSORS_F71882FG is not set
634# CONFIG_SENSORS_FSCPOS is not set 631# CONFIG_SENSORS_F75375S is not set
635# CONFIG_SENSORS_GL518SM is not set 632# CONFIG_SENSORS_GL518SM is not set
636# CONFIG_SENSORS_GL520SM is not set 633# CONFIG_SENSORS_GL520SM is not set
637# CONFIG_SENSORS_IT87 is not set 634# CONFIG_SENSORS_IT87 is not set
@@ -667,6 +664,26 @@ CONFIG_HWMON=y
667# CONFIG_SENSORS_W83627HF is not set 664# CONFIG_SENSORS_W83627HF is not set
668# CONFIG_SENSORS_W83627EHF is not set 665# CONFIG_SENSORS_W83627EHF is not set
669# CONFIG_HWMON_DEBUG_CHIP is not set 666# CONFIG_HWMON_DEBUG_CHIP is not set
667CONFIG_WATCHDOG=y
668# CONFIG_WATCHDOG_NOWAYOUT is not set
669
670#
671# Watchdog Device Drivers
672#
673# CONFIG_SOFT_WATCHDOG is not set
674CONFIG_83xx_WDT=y
675
676#
677# PCI-based Watchdog Cards
678#
679# CONFIG_PCIPCWATCHDOG is not set
680# CONFIG_WDTPCI is not set
681
682#
683# Sonics Silicon Backplane
684#
685CONFIG_SSB_POSSIBLE=y
686# CONFIG_SSB is not set
670 687
671# 688#
672# Multifunction device drivers 689# Multifunction device drivers
@@ -683,16 +700,17 @@ CONFIG_DAB=y
683# 700#
684# Graphics support 701# Graphics support
685# 702#
703# CONFIG_AGP is not set
704# CONFIG_DRM is not set
705# CONFIG_VGASTATE is not set
706CONFIG_VIDEO_OUTPUT_CONTROL=m
707# CONFIG_FB is not set
686# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 708# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
687 709
688# 710#
689# Display device support 711# Display device support
690# 712#
691# CONFIG_DISPLAY_SUPPORT is not set 713# CONFIG_DISPLAY_SUPPORT is not set
692# CONFIG_VGASTATE is not set
693CONFIG_VIDEO_OUTPUT_CONTROL=m
694# CONFIG_FB is not set
695# CONFIG_FB_IBM_GXT4500 is not set
696 714
697# 715#
698# Sound 716# Sound
@@ -701,6 +719,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
701CONFIG_HID_SUPPORT=y 719CONFIG_HID_SUPPORT=y
702CONFIG_HID=y 720CONFIG_HID=y
703# CONFIG_HID_DEBUG is not set 721# CONFIG_HID_DEBUG is not set
722# CONFIG_HIDRAW is not set
704CONFIG_USB_SUPPORT=y 723CONFIG_USB_SUPPORT=y
705CONFIG_USB_ARCH_HAS_HCD=y 724CONFIG_USB_ARCH_HAS_HCD=y
706CONFIG_USB_ARCH_HAS_OHCI=y 725CONFIG_USB_ARCH_HAS_OHCI=y
@@ -770,19 +789,6 @@ CONFIG_RTC_DRV_DS1374=y
770# 789#
771 790
772# 791#
773# DMA Engine support
774#
775# CONFIG_DMA_ENGINE is not set
776
777#
778# DMA Clients
779#
780
781#
782# DMA Devices
783#
784
785#
786# Userspace I/O 792# Userspace I/O
787# 793#
788# CONFIG_UIO is not set 794# CONFIG_UIO is not set
@@ -799,7 +805,6 @@ CONFIG_EXT3_FS_XATTR=y
799# CONFIG_EXT3_FS_SECURITY is not set 805# CONFIG_EXT3_FS_SECURITY is not set
800# CONFIG_EXT4DEV_FS is not set 806# CONFIG_EXT4DEV_FS is not set
801CONFIG_JBD=y 807CONFIG_JBD=y
802# CONFIG_JBD_DEBUG is not set
803CONFIG_FS_MBCACHE=y 808CONFIG_FS_MBCACHE=y
804# CONFIG_REISERFS_FS is not set 809# CONFIG_REISERFS_FS is not set
805# CONFIG_JFS_FS is not set 810# CONFIG_JFS_FS is not set
@@ -840,7 +845,6 @@ CONFIG_SYSFS=y
840CONFIG_TMPFS=y 845CONFIG_TMPFS=y
841# CONFIG_TMPFS_POSIX_ACL is not set 846# CONFIG_TMPFS_POSIX_ACL is not set
842# CONFIG_HUGETLB_PAGE is not set 847# CONFIG_HUGETLB_PAGE is not set
843CONFIG_RAMFS=y
844# CONFIG_CONFIGFS_FS is not set 848# CONFIG_CONFIGFS_FS is not set
845 849
846# 850#
@@ -859,10 +863,7 @@ CONFIG_RAMFS=y
859# CONFIG_QNX4FS_FS is not set 863# CONFIG_QNX4FS_FS is not set
860# CONFIG_SYSV_FS is not set 864# CONFIG_SYSV_FS is not set
861# CONFIG_UFS_FS is not set 865# CONFIG_UFS_FS is not set
862 866CONFIG_NETWORK_FILESYSTEMS=y
863#
864# Network File Systems
865#
866CONFIG_NFS_FS=y 867CONFIG_NFS_FS=y
867CONFIG_NFS_V3=y 868CONFIG_NFS_V3=y
868# CONFIG_NFS_V3_ACL is not set 869# CONFIG_NFS_V3_ACL is not set
@@ -901,15 +902,7 @@ CONFIG_PARTITION_ADVANCED=y
901# CONFIG_KARMA_PARTITION is not set 902# CONFIG_KARMA_PARTITION is not set
902# CONFIG_EFI_PARTITION is not set 903# CONFIG_EFI_PARTITION is not set
903# CONFIG_SYSV68_PARTITION is not set 904# CONFIG_SYSV68_PARTITION is not set
904
905#
906# Native Language Support
907#
908# CONFIG_NLS is not set 905# CONFIG_NLS is not set
909
910#
911# Distributed Lock Manager
912#
913# CONFIG_DLM is not set 906# CONFIG_DLM is not set
914# CONFIG_UCC_SLOW is not set 907# CONFIG_UCC_SLOW is not set
915 908
@@ -927,23 +920,22 @@ CONFIG_PLIST=y
927CONFIG_HAS_IOMEM=y 920CONFIG_HAS_IOMEM=y
928CONFIG_HAS_IOPORT=y 921CONFIG_HAS_IOPORT=y
929CONFIG_HAS_DMA=y 922CONFIG_HAS_DMA=y
930 923# CONFIG_INSTRUMENTATION is not set
931#
932# Instrumentation Support
933#
934# CONFIG_PROFILING is not set
935 924
936# 925#
937# Kernel hacking 926# Kernel hacking
938# 927#
939# CONFIG_PRINTK_TIME is not set 928# CONFIG_PRINTK_TIME is not set
929CONFIG_ENABLE_WARN_DEPRECATED=y
940CONFIG_ENABLE_MUST_CHECK=y 930CONFIG_ENABLE_MUST_CHECK=y
941# CONFIG_MAGIC_SYSRQ is not set 931# CONFIG_MAGIC_SYSRQ is not set
942# CONFIG_UNUSED_SYMBOLS is not set 932# CONFIG_UNUSED_SYMBOLS is not set
943# CONFIG_DEBUG_FS is not set 933# CONFIG_DEBUG_FS is not set
944# CONFIG_HEADERS_CHECK is not set 934# CONFIG_HEADERS_CHECK is not set
945# CONFIG_DEBUG_KERNEL is not set 935# CONFIG_DEBUG_KERNEL is not set
936# CONFIG_SLUB_DEBUG_ON is not set
946# CONFIG_DEBUG_BUGVERBOSE is not set 937# CONFIG_DEBUG_BUGVERBOSE is not set
938# CONFIG_SAMPLES is not set
947# CONFIG_PPC_EARLY_DEBUG is not set 939# CONFIG_PPC_EARLY_DEBUG is not set
948 940
949# 941#
@@ -951,6 +943,7 @@ CONFIG_ENABLE_MUST_CHECK=y
951# 943#
952# CONFIG_KEYS is not set 944# CONFIG_KEYS is not set
953# CONFIG_SECURITY is not set 945# CONFIG_SECURITY is not set
946# CONFIG_SECURITY_FILE_CAPABILITIES is not set
954CONFIG_CRYPTO=y 947CONFIG_CRYPTO=y
955CONFIG_CRYPTO_ALGAPI=y 948CONFIG_CRYPTO_ALGAPI=y
956CONFIG_CRYPTO_BLKCIPHER=y 949CONFIG_CRYPTO_BLKCIPHER=y
@@ -970,6 +963,7 @@ CONFIG_CRYPTO_ECB=m
970CONFIG_CRYPTO_CBC=y 963CONFIG_CRYPTO_CBC=y
971CONFIG_CRYPTO_PCBC=m 964CONFIG_CRYPTO_PCBC=m
972# CONFIG_CRYPTO_LRW is not set 965# CONFIG_CRYPTO_LRW is not set
966# CONFIG_CRYPTO_XTS is not set
973# CONFIG_CRYPTO_CRYPTD is not set 967# CONFIG_CRYPTO_CRYPTD is not set
974CONFIG_CRYPTO_DES=y 968CONFIG_CRYPTO_DES=y
975# CONFIG_CRYPTO_FCRYPT is not set 969# CONFIG_CRYPTO_FCRYPT is not set
@@ -983,9 +977,12 @@ CONFIG_CRYPTO_DES=y
983# CONFIG_CRYPTO_ARC4 is not set 977# CONFIG_CRYPTO_ARC4 is not set
984# CONFIG_CRYPTO_KHAZAD is not set 978# CONFIG_CRYPTO_KHAZAD is not set
985# CONFIG_CRYPTO_ANUBIS is not set 979# CONFIG_CRYPTO_ANUBIS is not set
980# CONFIG_CRYPTO_SEED is not set
986# CONFIG_CRYPTO_DEFLATE is not set 981# CONFIG_CRYPTO_DEFLATE is not set
987# CONFIG_CRYPTO_MICHAEL_MIC is not set 982# CONFIG_CRYPTO_MICHAEL_MIC is not set
988# CONFIG_CRYPTO_CRC32C is not set 983# CONFIG_CRYPTO_CRC32C is not set
989# CONFIG_CRYPTO_CAMELLIA is not set 984# CONFIG_CRYPTO_CAMELLIA is not set
990# CONFIG_CRYPTO_TEST is not set 985# CONFIG_CRYPTO_TEST is not set
986# CONFIG_CRYPTO_AUTHENC is not set
991CONFIG_CRYPTO_HW=y 987CONFIG_CRYPTO_HW=y
988# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index 1b4d37570eb1..c44fc56263e2 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:42 2007 4# Thu Dec 6 16:48:43 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -62,9 +67,12 @@ CONFIG_SYSVIPC_SYSCTL=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
64# CONFIG_USER_NS is not set 69# CONFIG_USER_NS is not set
70# CONFIG_PID_NS is not set
65# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
66# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +91,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
84# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
85CONFIG_SIGNALFD=y 93CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 95CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
@@ -123,7 +130,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
123# Platform support 130# Platform support
124# 131#
125# CONFIG_PPC_MULTIPLATFORM is not set 132# CONFIG_PPC_MULTIPLATFORM is not set
126# CONFIG_EMBEDDED6xx is not set
127# CONFIG_PPC_82xx is not set 133# CONFIG_PPC_82xx is not set
128CONFIG_PPC_83xx=y 134CONFIG_PPC_83xx=y
129# CONFIG_PPC_86xx is not set 135# CONFIG_PPC_86xx is not set
@@ -157,6 +163,10 @@ CONFIG_QUICC_ENGINE=y
157# Kernel options 163# Kernel options
158# 164#
159# CONFIG_HIGHMEM is not set 165# CONFIG_HIGHMEM is not set
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
160# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
161CONFIG_HZ_250=y 171CONFIG_HZ_250=y
162# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -177,6 +187,7 @@ CONFIG_FLATMEM_MANUAL=y
177CONFIG_FLATMEM=y 187CONFIG_FLATMEM=y
178CONFIG_FLAT_NODE_MEM_MAP=y 188CONFIG_FLAT_NODE_MEM_MAP=y
179# CONFIG_SPARSEMEM_STATIC is not set 189# CONFIG_SPARSEMEM_STATIC is not set
190# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
180CONFIG_SPLIT_PTLOCK_CPUS=4 191CONFIG_SPLIT_PTLOCK_CPUS=4
181# CONFIG_RESOURCES_64BIT is not set 192# CONFIG_RESOURCES_64BIT is not set
182CONFIG_ZONE_DMA_FLAG=1 193CONFIG_ZONE_DMA_FLAG=1
@@ -185,6 +196,8 @@ CONFIG_VIRT_TO_BUS=y
185CONFIG_PROC_DEVICETREE=y 196CONFIG_PROC_DEVICETREE=y
186# CONFIG_CMDLINE_BOOL is not set 197# CONFIG_CMDLINE_BOOL is not set
187# CONFIG_PM is not set 198# CONFIG_PM is not set
199CONFIG_SUSPEND_UP_POSSIBLE=y
200CONFIG_HIBERNATION_UP_POSSIBLE=y
188CONFIG_SECCOMP=y 201CONFIG_SECCOMP=y
189CONFIG_WANT_DEVICE_TREE=y 202CONFIG_WANT_DEVICE_TREE=y
190CONFIG_DEVICE_TREE="" 203CONFIG_DEVICE_TREE=""
@@ -203,10 +216,7 @@ CONFIG_PCI_SYSCALL=y
203# CONFIG_PCIEPORTBUS is not set 216# CONFIG_PCIEPORTBUS is not set
204CONFIG_ARCH_SUPPORTS_MSI=y 217CONFIG_ARCH_SUPPORTS_MSI=y
205# CONFIG_PCI_MSI is not set 218# CONFIG_PCI_MSI is not set
206 219CONFIG_PCI_LEGACY=y
207#
208# PCCARD (PCMCIA/CardBus) support
209#
210# CONFIG_PCCARD is not set 220# CONFIG_PCCARD is not set
211# CONFIG_HOTPLUG_PCI is not set 221# CONFIG_HOTPLUG_PCI is not set
212 222
@@ -221,7 +231,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
221CONFIG_HIGHMEM_START=0xfe000000 231CONFIG_HIGHMEM_START=0xfe000000
222CONFIG_LOWMEM_SIZE=0x30000000 232CONFIG_LOWMEM_SIZE=0x30000000
223CONFIG_KERNEL_START=0xc0000000 233CONFIG_KERNEL_START=0xc0000000
224CONFIG_TASK_SIZE=0x80000000 234CONFIG_TASK_SIZE=0xc0000000
225CONFIG_BOOT_LOAD=0x00800000 235CONFIG_BOOT_LOAD=0x00800000
226 236
227# 237#
@@ -261,6 +271,7 @@ CONFIG_SYN_COOKIES=y
261CONFIG_INET_XFRM_MODE_TRANSPORT=y 271CONFIG_INET_XFRM_MODE_TRANSPORT=y
262CONFIG_INET_XFRM_MODE_TUNNEL=y 272CONFIG_INET_XFRM_MODE_TUNNEL=y
263CONFIG_INET_XFRM_MODE_BEET=y 273CONFIG_INET_XFRM_MODE_BEET=y
274# CONFIG_INET_LRO is not set
264CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
265CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
266# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,10 +297,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
286# CONFIG_LAPB is not set 297# CONFIG_LAPB is not set
287# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
288# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
289
290#
291# QoS and/or fair queueing
292#
293# CONFIG_NET_SCHED is not set 300# CONFIG_NET_SCHED is not set
294 301
295# 302#
@@ -318,6 +325,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# 325#
319# Generic Driver Options 326# Generic Driver Options
320# 327#
328CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
321CONFIG_STANDALONE=y 329CONFIG_STANDALONE=y
322CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
323# CONFIG_FW_LOADER is not set 331# CONFIG_FW_LOADER is not set
@@ -386,6 +394,7 @@ CONFIG_SCSI_WAIT_SCAN=m
386# CONFIG_SCSI_FC_ATTRS is not set 394# CONFIG_SCSI_FC_ATTRS is not set
387# CONFIG_SCSI_ISCSI_ATTRS is not set 395# CONFIG_SCSI_ISCSI_ATTRS is not set
388# CONFIG_SCSI_SAS_LIBSAS is not set 396# CONFIG_SCSI_SAS_LIBSAS is not set
397# CONFIG_SCSI_SRP_ATTRS is not set
389CONFIG_SCSI_LOWLEVEL=y 398CONFIG_SCSI_LOWLEVEL=y
390# CONFIG_ISCSI_TCP is not set 399# CONFIG_ISCSI_TCP is not set
391# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 400# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -397,6 +406,7 @@ CONFIG_SCSI_LOWLEVEL=y
397# CONFIG_SCSI_AIC79XX is not set 406# CONFIG_SCSI_AIC79XX is not set
398# CONFIG_SCSI_AIC94XX is not set 407# CONFIG_SCSI_AIC94XX is not set
399# CONFIG_SCSI_DPT_I2O is not set 408# CONFIG_SCSI_DPT_I2O is not set
409# CONFIG_SCSI_ADVANSYS is not set
400# CONFIG_SCSI_ARCMSR is not set 410# CONFIG_SCSI_ARCMSR is not set
401# CONFIG_MEGARAID_NEWGEN is not set 411# CONFIG_MEGARAID_NEWGEN is not set
402# CONFIG_MEGARAID_LEGACY is not set 412# CONFIG_MEGARAID_LEGACY is not set
@@ -423,14 +433,7 @@ CONFIG_SCSI_LOWLEVEL=y
423# CONFIG_SCSI_SRP is not set 433# CONFIG_SCSI_SRP is not set
424# CONFIG_ATA is not set 434# CONFIG_ATA is not set
425# CONFIG_MD is not set 435# CONFIG_MD is not set
426
427#
428# Fusion MPT device support
429#
430# CONFIG_FUSION is not set 436# CONFIG_FUSION is not set
431# CONFIG_FUSION_SPI is not set
432# CONFIG_FUSION_FC is not set
433# CONFIG_FUSION_SAS is not set
434 437
435# 438#
436# IEEE 1394 (FireWire) support 439# IEEE 1394 (FireWire) support
@@ -446,6 +449,8 @@ CONFIG_NETDEVICES=y
446# CONFIG_MACVLAN is not set 449# CONFIG_MACVLAN is not set
447# CONFIG_EQUALIZER is not set 450# CONFIG_EQUALIZER is not set
448# CONFIG_TUN is not set 451# CONFIG_TUN is not set
452# CONFIG_VETH is not set
453# CONFIG_IP1000 is not set
449# CONFIG_ARCNET is not set 454# CONFIG_ARCNET is not set
450CONFIG_PHYLIB=y 455CONFIG_PHYLIB=y
451 456
@@ -462,6 +467,7 @@ CONFIG_MARVELL_PHY=y
462# CONFIG_BROADCOM_PHY is not set 467# CONFIG_BROADCOM_PHY is not set
463# CONFIG_ICPLUS_PHY is not set 468# CONFIG_ICPLUS_PHY is not set
464# CONFIG_FIXED_PHY is not set 469# CONFIG_FIXED_PHY is not set
470# CONFIG_MDIO_BITBANG is not set
465CONFIG_NET_ETHERNET=y 471CONFIG_NET_ETHERNET=y
466CONFIG_MII=y 472CONFIG_MII=y
467# CONFIG_HAPPYMEAL is not set 473# CONFIG_HAPPYMEAL is not set
@@ -470,11 +476,17 @@ CONFIG_MII=y
470# CONFIG_NET_VENDOR_3COM is not set 476# CONFIG_NET_VENDOR_3COM is not set
471# CONFIG_NET_TULIP is not set 477# CONFIG_NET_TULIP is not set
472# CONFIG_HP100 is not set 478# CONFIG_HP100 is not set
479# CONFIG_IBM_NEW_EMAC_ZMII is not set
480# CONFIG_IBM_NEW_EMAC_RGMII is not set
481# CONFIG_IBM_NEW_EMAC_TAH is not set
482# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
473# CONFIG_NET_PCI is not set 483# CONFIG_NET_PCI is not set
484# CONFIG_B44 is not set
474CONFIG_NETDEV_1000=y 485CONFIG_NETDEV_1000=y
475# CONFIG_ACENIC is not set 486# CONFIG_ACENIC is not set
476# CONFIG_DL2K is not set 487# CONFIG_DL2K is not set
477# CONFIG_E1000 is not set 488# CONFIG_E1000 is not set
489# CONFIG_E1000E is not set
478# CONFIG_NS83820 is not set 490# CONFIG_NS83820 is not set
479# CONFIG_HAMACHI is not set 491# CONFIG_HAMACHI is not set
480# CONFIG_YELLOWFIN is not set 492# CONFIG_YELLOWFIN is not set
@@ -482,6 +494,7 @@ CONFIG_NETDEV_1000=y
482# CONFIG_SIS190 is not set 494# CONFIG_SIS190 is not set
483# CONFIG_SKGE is not set 495# CONFIG_SKGE is not set
484# CONFIG_SKY2 is not set 496# CONFIG_SKY2 is not set
497# CONFIG_SK98LIN is not set
485# CONFIG_VIA_VELOCITY is not set 498# CONFIG_VIA_VELOCITY is not set
486# CONFIG_TIGON3 is not set 499# CONFIG_TIGON3 is not set
487# CONFIG_BNX2 is not set 500# CONFIG_BNX2 is not set
@@ -496,11 +509,14 @@ CONFIG_UCC_GETH=y
496CONFIG_NETDEV_10000=y 509CONFIG_NETDEV_10000=y
497# CONFIG_CHELSIO_T1 is not set 510# CONFIG_CHELSIO_T1 is not set
498# CONFIG_CHELSIO_T3 is not set 511# CONFIG_CHELSIO_T3 is not set
512# CONFIG_IXGBE is not set
499# CONFIG_IXGB is not set 513# CONFIG_IXGB is not set
500# CONFIG_S2IO is not set 514# CONFIG_S2IO is not set
501# CONFIG_MYRI10GE is not set 515# CONFIG_MYRI10GE is not set
502# CONFIG_NETXEN_NIC is not set 516# CONFIG_NETXEN_NIC is not set
517# CONFIG_NIU is not set
503# CONFIG_MLX4_CORE is not set 518# CONFIG_MLX4_CORE is not set
519# CONFIG_TEHUTI is not set
504# CONFIG_TR is not set 520# CONFIG_TR is not set
505 521
506# 522#
@@ -533,7 +549,6 @@ CONFIG_INPUT=y
533# 549#
534# CONFIG_INPUT_MOUSEDEV is not set 550# CONFIG_INPUT_MOUSEDEV is not set
535# CONFIG_INPUT_JOYDEV is not set 551# CONFIG_INPUT_JOYDEV is not set
536# CONFIG_INPUT_TSDEV is not set
537# CONFIG_INPUT_EVDEV is not set 552# CONFIG_INPUT_EVDEV is not set
538# CONFIG_INPUT_EVBUG is not set 553# CONFIG_INPUT_EVBUG is not set
539 554
@@ -581,28 +596,12 @@ CONFIG_UNIX98_PTYS=y
581CONFIG_LEGACY_PTYS=y 596CONFIG_LEGACY_PTYS=y
582CONFIG_LEGACY_PTY_COUNT=256 597CONFIG_LEGACY_PTY_COUNT=256
583# CONFIG_IPMI_HANDLER is not set 598# CONFIG_IPMI_HANDLER is not set
584CONFIG_WATCHDOG=y
585# CONFIG_WATCHDOG_NOWAYOUT is not set
586
587#
588# Watchdog Device Drivers
589#
590# CONFIG_SOFT_WATCHDOG is not set
591CONFIG_83xx_WDT=y
592
593#
594# PCI-based Watchdog Cards
595#
596# CONFIG_PCIPCWATCHDOG is not set
597# CONFIG_WDTPCI is not set
598CONFIG_HW_RANDOM=y 599CONFIG_HW_RANDOM=y
599# CONFIG_NVRAM is not set 600# CONFIG_NVRAM is not set
600CONFIG_GEN_RTC=y 601CONFIG_GEN_RTC=y
601# CONFIG_GEN_RTC_X is not set 602# CONFIG_GEN_RTC_X is not set
602# CONFIG_R3964 is not set 603# CONFIG_R3964 is not set
603# CONFIG_APPLICOM is not set 604# CONFIG_APPLICOM is not set
604# CONFIG_AGP is not set
605# CONFIG_DRM is not set
606# CONFIG_RAW_DRIVER is not set 605# CONFIG_RAW_DRIVER is not set
607# CONFIG_TCG_TPM is not set 606# CONFIG_TCG_TPM is not set
608CONFIG_DEVPORT=y 607CONFIG_DEVPORT=y
@@ -671,8 +670,6 @@ CONFIG_I2C_MPC=y
671# CONFIG_POWER_SUPPLY is not set 670# CONFIG_POWER_SUPPLY is not set
672CONFIG_HWMON=y 671CONFIG_HWMON=y
673# CONFIG_HWMON_VID is not set 672# CONFIG_HWMON_VID is not set
674# CONFIG_SENSORS_ABITUGURU is not set
675# CONFIG_SENSORS_ABITUGURU3 is not set
676# CONFIG_SENSORS_AD7418 is not set 673# CONFIG_SENSORS_AD7418 is not set
677# CONFIG_SENSORS_ADM1021 is not set 674# CONFIG_SENSORS_ADM1021 is not set
678# CONFIG_SENSORS_ADM1025 is not set 675# CONFIG_SENSORS_ADM1025 is not set
@@ -680,12 +677,13 @@ CONFIG_HWMON=y
680# CONFIG_SENSORS_ADM1029 is not set 677# CONFIG_SENSORS_ADM1029 is not set
681# CONFIG_SENSORS_ADM1031 is not set 678# CONFIG_SENSORS_ADM1031 is not set
682# CONFIG_SENSORS_ADM9240 is not set 679# CONFIG_SENSORS_ADM9240 is not set
683# CONFIG_SENSORS_ASB100 is not set 680# CONFIG_SENSORS_ADT7470 is not set
684# CONFIG_SENSORS_ATXP1 is not set 681# CONFIG_SENSORS_ATXP1 is not set
685# CONFIG_SENSORS_DS1621 is not set 682# CONFIG_SENSORS_DS1621 is not set
683# CONFIG_SENSORS_I5K_AMB is not set
686# CONFIG_SENSORS_F71805F is not set 684# CONFIG_SENSORS_F71805F is not set
687# CONFIG_SENSORS_FSCHER is not set 685# CONFIG_SENSORS_F71882FG is not set
688# CONFIG_SENSORS_FSCPOS is not set 686# CONFIG_SENSORS_F75375S is not set
689# CONFIG_SENSORS_GL518SM is not set 687# CONFIG_SENSORS_GL518SM is not set
690# CONFIG_SENSORS_GL520SM is not set 688# CONFIG_SENSORS_GL520SM is not set
691# CONFIG_SENSORS_IT87 is not set 689# CONFIG_SENSORS_IT87 is not set
@@ -721,6 +719,26 @@ CONFIG_HWMON=y
721# CONFIG_SENSORS_W83627HF is not set 719# CONFIG_SENSORS_W83627HF is not set
722# CONFIG_SENSORS_W83627EHF is not set 720# CONFIG_SENSORS_W83627EHF is not set
723# CONFIG_HWMON_DEBUG_CHIP is not set 721# CONFIG_HWMON_DEBUG_CHIP is not set
722CONFIG_WATCHDOG=y
723# CONFIG_WATCHDOG_NOWAYOUT is not set
724
725#
726# Watchdog Device Drivers
727#
728# CONFIG_SOFT_WATCHDOG is not set
729CONFIG_83xx_WDT=y
730
731#
732# PCI-based Watchdog Cards
733#
734# CONFIG_PCIPCWATCHDOG is not set
735# CONFIG_WDTPCI is not set
736
737#
738# Sonics Silicon Backplane
739#
740CONFIG_SSB_POSSIBLE=y
741# CONFIG_SSB is not set
724 742
725# 743#
726# Multifunction device drivers 744# Multifunction device drivers
@@ -737,16 +755,17 @@ CONFIG_DAB=y
737# 755#
738# Graphics support 756# Graphics support
739# 757#
758# CONFIG_AGP is not set
759# CONFIG_DRM is not set
760# CONFIG_VGASTATE is not set
761CONFIG_VIDEO_OUTPUT_CONTROL=m
762# CONFIG_FB is not set
740# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 763# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
741 764
742# 765#
743# Display device support 766# Display device support
744# 767#
745# CONFIG_DISPLAY_SUPPORT is not set 768# CONFIG_DISPLAY_SUPPORT is not set
746# CONFIG_VGASTATE is not set
747CONFIG_VIDEO_OUTPUT_CONTROL=m
748# CONFIG_FB is not set
749# CONFIG_FB_IBM_GXT4500 is not set
750 769
751# 770#
752# Sound 771# Sound
@@ -755,6 +774,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
755CONFIG_HID_SUPPORT=y 774CONFIG_HID_SUPPORT=y
756CONFIG_HID=y 775CONFIG_HID=y
757# CONFIG_HID_DEBUG is not set 776# CONFIG_HID_DEBUG is not set
777# CONFIG_HIDRAW is not set
758CONFIG_USB_SUPPORT=y 778CONFIG_USB_SUPPORT=y
759CONFIG_USB_ARCH_HAS_HCD=y 779CONFIG_USB_ARCH_HAS_HCD=y
760CONFIG_USB_ARCH_HAS_OHCI=y 780CONFIG_USB_ARCH_HAS_OHCI=y
@@ -822,19 +842,6 @@ CONFIG_RTC_DRV_DS1374=y
822# 842#
823 843
824# 844#
825# DMA Engine support
826#
827# CONFIG_DMA_ENGINE is not set
828
829#
830# DMA Clients
831#
832
833#
834# DMA Devices
835#
836
837#
838# Userspace I/O 845# Userspace I/O
839# 846#
840# CONFIG_UIO is not set 847# CONFIG_UIO is not set
@@ -851,7 +858,6 @@ CONFIG_EXT3_FS_XATTR=y
851# CONFIG_EXT3_FS_SECURITY is not set 858# CONFIG_EXT3_FS_SECURITY is not set
852# CONFIG_EXT4DEV_FS is not set 859# CONFIG_EXT4DEV_FS is not set
853CONFIG_JBD=y 860CONFIG_JBD=y
854# CONFIG_JBD_DEBUG is not set
855CONFIG_FS_MBCACHE=y 861CONFIG_FS_MBCACHE=y
856# CONFIG_REISERFS_FS is not set 862# CONFIG_REISERFS_FS is not set
857# CONFIG_JFS_FS is not set 863# CONFIG_JFS_FS is not set
@@ -892,7 +898,6 @@ CONFIG_SYSFS=y
892CONFIG_TMPFS=y 898CONFIG_TMPFS=y
893# CONFIG_TMPFS_POSIX_ACL is not set 899# CONFIG_TMPFS_POSIX_ACL is not set
894# CONFIG_HUGETLB_PAGE is not set 900# CONFIG_HUGETLB_PAGE is not set
895CONFIG_RAMFS=y
896# CONFIG_CONFIGFS_FS is not set 901# CONFIG_CONFIGFS_FS is not set
897 902
898# 903#
@@ -911,10 +916,7 @@ CONFIG_RAMFS=y
911# CONFIG_QNX4FS_FS is not set 916# CONFIG_QNX4FS_FS is not set
912# CONFIG_SYSV_FS is not set 917# CONFIG_SYSV_FS is not set
913# CONFIG_UFS_FS is not set 918# CONFIG_UFS_FS is not set
914 919CONFIG_NETWORK_FILESYSTEMS=y
915#
916# Network File Systems
917#
918CONFIG_NFS_FS=y 920CONFIG_NFS_FS=y
919CONFIG_NFS_V3=y 921CONFIG_NFS_V3=y
920# CONFIG_NFS_V3_ACL is not set 922# CONFIG_NFS_V3_ACL is not set
@@ -953,15 +955,7 @@ CONFIG_PARTITION_ADVANCED=y
953# CONFIG_KARMA_PARTITION is not set 955# CONFIG_KARMA_PARTITION is not set
954# CONFIG_EFI_PARTITION is not set 956# CONFIG_EFI_PARTITION is not set
955# CONFIG_SYSV68_PARTITION is not set 957# CONFIG_SYSV68_PARTITION is not set
956
957#
958# Native Language Support
959#
960# CONFIG_NLS is not set 958# CONFIG_NLS is not set
961
962#
963# Distributed Lock Manager
964#
965# CONFIG_DLM is not set 959# CONFIG_DLM is not set
966# CONFIG_UCC_SLOW is not set 960# CONFIG_UCC_SLOW is not set
967CONFIG_UCC_FAST=y 961CONFIG_UCC_FAST=y
@@ -981,23 +975,22 @@ CONFIG_PLIST=y
981CONFIG_HAS_IOMEM=y 975CONFIG_HAS_IOMEM=y
982CONFIG_HAS_IOPORT=y 976CONFIG_HAS_IOPORT=y
983CONFIG_HAS_DMA=y 977CONFIG_HAS_DMA=y
984 978# CONFIG_INSTRUMENTATION is not set
985#
986# Instrumentation Support
987#
988# CONFIG_PROFILING is not set
989 979
990# 980#
991# Kernel hacking 981# Kernel hacking
992# 982#
993# CONFIG_PRINTK_TIME is not set 983# CONFIG_PRINTK_TIME is not set
984CONFIG_ENABLE_WARN_DEPRECATED=y
994CONFIG_ENABLE_MUST_CHECK=y 985CONFIG_ENABLE_MUST_CHECK=y
995# CONFIG_MAGIC_SYSRQ is not set 986# CONFIG_MAGIC_SYSRQ is not set
996# CONFIG_UNUSED_SYMBOLS is not set 987# CONFIG_UNUSED_SYMBOLS is not set
997# CONFIG_DEBUG_FS is not set 988# CONFIG_DEBUG_FS is not set
998# CONFIG_HEADERS_CHECK is not set 989# CONFIG_HEADERS_CHECK is not set
999# CONFIG_DEBUG_KERNEL is not set 990# CONFIG_DEBUG_KERNEL is not set
991# CONFIG_SLUB_DEBUG_ON is not set
1000# CONFIG_DEBUG_BUGVERBOSE is not set 992# CONFIG_DEBUG_BUGVERBOSE is not set
993# CONFIG_SAMPLES is not set
1001# CONFIG_PPC_EARLY_DEBUG is not set 994# CONFIG_PPC_EARLY_DEBUG is not set
1002 995
1003# 996#
@@ -1005,6 +998,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1005# 998#
1006# CONFIG_KEYS is not set 999# CONFIG_KEYS is not set
1007# CONFIG_SECURITY is not set 1000# CONFIG_SECURITY is not set
1001# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1008CONFIG_CRYPTO=y 1002CONFIG_CRYPTO=y
1009CONFIG_CRYPTO_ALGAPI=y 1003CONFIG_CRYPTO_ALGAPI=y
1010CONFIG_CRYPTO_BLKCIPHER=y 1004CONFIG_CRYPTO_BLKCIPHER=y
@@ -1024,6 +1018,7 @@ CONFIG_CRYPTO_ECB=m
1024CONFIG_CRYPTO_CBC=y 1018CONFIG_CRYPTO_CBC=y
1025CONFIG_CRYPTO_PCBC=m 1019CONFIG_CRYPTO_PCBC=m
1026# CONFIG_CRYPTO_LRW is not set 1020# CONFIG_CRYPTO_LRW is not set
1021# CONFIG_CRYPTO_XTS is not set
1027# CONFIG_CRYPTO_CRYPTD is not set 1022# CONFIG_CRYPTO_CRYPTD is not set
1028CONFIG_CRYPTO_DES=y 1023CONFIG_CRYPTO_DES=y
1029# CONFIG_CRYPTO_FCRYPT is not set 1024# CONFIG_CRYPTO_FCRYPT is not set
@@ -1037,9 +1032,13 @@ CONFIG_CRYPTO_DES=y
1037# CONFIG_CRYPTO_ARC4 is not set 1032# CONFIG_CRYPTO_ARC4 is not set
1038# CONFIG_CRYPTO_KHAZAD is not set 1033# CONFIG_CRYPTO_KHAZAD is not set
1039# CONFIG_CRYPTO_ANUBIS is not set 1034# CONFIG_CRYPTO_ANUBIS is not set
1035# CONFIG_CRYPTO_SEED is not set
1040# CONFIG_CRYPTO_DEFLATE is not set 1036# CONFIG_CRYPTO_DEFLATE is not set
1041# CONFIG_CRYPTO_MICHAEL_MIC is not set 1037# CONFIG_CRYPTO_MICHAEL_MIC is not set
1042# CONFIG_CRYPTO_CRC32C is not set 1038# CONFIG_CRYPTO_CRC32C is not set
1043# CONFIG_CRYPTO_CAMELLIA is not set 1039# CONFIG_CRYPTO_CAMELLIA is not set
1044# CONFIG_CRYPTO_TEST is not set 1040# CONFIG_CRYPTO_TEST is not set
1041# CONFIG_CRYPTO_AUTHENC is not set
1045CONFIG_CRYPTO_HW=y 1042CONFIG_CRYPTO_HW=y
1043# CONFIG_PPC_CLOCK is not set
1044CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index b953b2c51453..3791e29e7d06 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:42 2007 4# Thu Dec 6 16:48:44 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_FSL_BOOKE=y
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,9 +68,12 @@ CONFIG_SYSVIPC_SYSCTL=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
65# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
68CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76# CONFIG_FAIR_GROUP_SCHED is not set
69CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
71CONFIG_BLK_DEV_INITRD=y 79CONFIG_BLK_DEV_INITRD=y
@@ -86,7 +94,6 @@ CONFIG_FUTEX=y
86CONFIG_ANON_INODES=y 94CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 95CONFIG_EPOLL=y
88CONFIG_SIGNALFD=y 96CONFIG_SIGNALFD=y
89CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 98CONFIG_SHMEM=y
92CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
@@ -129,7 +136,7 @@ CONFIG_MPC8540_ADS=y
129# CONFIG_MPC8560_ADS is not set 136# CONFIG_MPC8560_ADS is not set
130# CONFIG_MPC85xx_CDS is not set 137# CONFIG_MPC85xx_CDS is not set
131# CONFIG_MPC85xx_MDS is not set 138# CONFIG_MPC85xx_MDS is not set
132# CONFIG_MPC8544_DS is not set 139# CONFIG_MPC85xx_DS is not set
133CONFIG_MPC8540=y 140CONFIG_MPC8540=y
134CONFIG_MPC85xx=y 141CONFIG_MPC85xx=y
135CONFIG_MPIC=y 142CONFIG_MPIC=y
@@ -149,6 +156,10 @@ CONFIG_MPIC=y
149# Kernel options 156# Kernel options
150# 157#
151# CONFIG_HIGHMEM is not set 158# CONFIG_HIGHMEM is not set
159CONFIG_TICK_ONESHOT=y
160CONFIG_NO_HZ=y
161CONFIG_HIGH_RES_TIMERS=y
162CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
152# CONFIG_HZ_100 is not set 163# CONFIG_HZ_100 is not set
153CONFIG_HZ_250=y 164CONFIG_HZ_250=y
154# CONFIG_HZ_300 is not set 165# CONFIG_HZ_300 is not set
@@ -170,6 +181,7 @@ CONFIG_FLATMEM_MANUAL=y
170CONFIG_FLATMEM=y 181CONFIG_FLATMEM=y
171CONFIG_FLAT_NODE_MEM_MAP=y 182CONFIG_FLAT_NODE_MEM_MAP=y
172# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
184# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
173CONFIG_SPLIT_PTLOCK_CPUS=4 185CONFIG_SPLIT_PTLOCK_CPUS=4
174# CONFIG_RESOURCES_64BIT is not set 186# CONFIG_RESOURCES_64BIT is not set
175CONFIG_ZONE_DMA_FLAG=1 187CONFIG_ZONE_DMA_FLAG=1
@@ -178,6 +190,8 @@ CONFIG_VIRT_TO_BUS=y
178CONFIG_PROC_DEVICETREE=y 190CONFIG_PROC_DEVICETREE=y
179# CONFIG_CMDLINE_BOOL is not set 191# CONFIG_CMDLINE_BOOL is not set
180# CONFIG_PM is not set 192# CONFIG_PM is not set
193CONFIG_SUSPEND_UP_POSSIBLE=y
194CONFIG_HIBERNATION_UP_POSSIBLE=y
181# CONFIG_SECCOMP is not set 195# CONFIG_SECCOMP is not set
182CONFIG_WANT_DEVICE_TREE=y 196CONFIG_WANT_DEVICE_TREE=y
183CONFIG_DEVICE_TREE="" 197CONFIG_DEVICE_TREE=""
@@ -193,10 +207,6 @@ CONFIG_FSL_SOC=y
193# CONFIG_PCI_DOMAINS is not set 207# CONFIG_PCI_DOMAINS is not set
194# CONFIG_PCI_SYSCALL is not set 208# CONFIG_PCI_SYSCALL is not set
195# CONFIG_ARCH_SUPPORTS_MSI is not set 209# CONFIG_ARCH_SUPPORTS_MSI is not set
196
197#
198# PCCARD (PCMCIA/CardBus) support
199#
200# CONFIG_PCCARD is not set 210# CONFIG_PCCARD is not set
201 211
202# 212#
@@ -210,7 +220,7 @@ CONFIG_FSL_SOC=y
210CONFIG_HIGHMEM_START=0xfe000000 220CONFIG_HIGHMEM_START=0xfe000000
211CONFIG_LOWMEM_SIZE=0x30000000 221CONFIG_LOWMEM_SIZE=0x30000000
212CONFIG_KERNEL_START=0xc0000000 222CONFIG_KERNEL_START=0xc0000000
213CONFIG_TASK_SIZE=0x80000000 223CONFIG_TASK_SIZE=0xc0000000
214CONFIG_BOOT_LOAD=0x00800000 224CONFIG_BOOT_LOAD=0x00800000
215 225
216# 226#
@@ -250,6 +260,7 @@ CONFIG_SYN_COOKIES=y
250CONFIG_INET_XFRM_MODE_TRANSPORT=y 260CONFIG_INET_XFRM_MODE_TRANSPORT=y
251CONFIG_INET_XFRM_MODE_TUNNEL=y 261CONFIG_INET_XFRM_MODE_TUNNEL=y
252CONFIG_INET_XFRM_MODE_BEET=y 262CONFIG_INET_XFRM_MODE_BEET=y
263# CONFIG_INET_LRO is not set
253CONFIG_INET_DIAG=y 264CONFIG_INET_DIAG=y
254CONFIG_INET_TCP_DIAG=y 265CONFIG_INET_TCP_DIAG=y
255# CONFIG_TCP_CONG_ADVANCED is not set 266# CONFIG_TCP_CONG_ADVANCED is not set
@@ -275,10 +286,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
275# CONFIG_LAPB is not set 286# CONFIG_LAPB is not set
276# CONFIG_ECONET is not set 287# CONFIG_ECONET is not set
277# CONFIG_WAN_ROUTER is not set 288# CONFIG_WAN_ROUTER is not set
278
279#
280# QoS and/or fair queueing
281#
282# CONFIG_NET_SCHED is not set 289# CONFIG_NET_SCHED is not set
283 290
284# 291#
@@ -307,6 +314,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
307# 314#
308# Generic Driver Options 315# Generic Driver Options
309# 316#
317CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
310CONFIG_STANDALONE=y 318CONFIG_STANDALONE=y
311CONFIG_PREVENT_FIRMWARE_BUILD=y 319CONFIG_PREVENT_FIRMWARE_BUILD=y
312# CONFIG_FW_LOADER is not set 320# CONFIG_FW_LOADER is not set
@@ -350,6 +358,7 @@ CONFIG_NETDEVICES=y
350# CONFIG_MACVLAN is not set 358# CONFIG_MACVLAN is not set
351# CONFIG_EQUALIZER is not set 359# CONFIG_EQUALIZER is not set
352# CONFIG_TUN is not set 360# CONFIG_TUN is not set
361# CONFIG_VETH is not set
353CONFIG_PHYLIB=y 362CONFIG_PHYLIB=y
354 363
355# 364#
@@ -365,8 +374,14 @@ CONFIG_PHYLIB=y
365# CONFIG_BROADCOM_PHY is not set 374# CONFIG_BROADCOM_PHY is not set
366# CONFIG_ICPLUS_PHY is not set 375# CONFIG_ICPLUS_PHY is not set
367# CONFIG_FIXED_PHY is not set 376# CONFIG_FIXED_PHY is not set
377# CONFIG_MDIO_BITBANG is not set
368CONFIG_NET_ETHERNET=y 378CONFIG_NET_ETHERNET=y
369CONFIG_MII=y 379CONFIG_MII=y
380# CONFIG_IBM_NEW_EMAC_ZMII is not set
381# CONFIG_IBM_NEW_EMAC_RGMII is not set
382# CONFIG_IBM_NEW_EMAC_TAH is not set
383# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
384# CONFIG_B44 is not set
370CONFIG_NETDEV_1000=y 385CONFIG_NETDEV_1000=y
371CONFIG_GIANFAR=y 386CONFIG_GIANFAR=y
372CONFIG_GFAR_NAPI=y 387CONFIG_GFAR_NAPI=y
@@ -399,7 +414,6 @@ CONFIG_INPUT=y
399# 414#
400# CONFIG_INPUT_MOUSEDEV is not set 415# CONFIG_INPUT_MOUSEDEV is not set
401# CONFIG_INPUT_JOYDEV is not set 416# CONFIG_INPUT_JOYDEV is not set
402# CONFIG_INPUT_TSDEV is not set
403# CONFIG_INPUT_EVDEV is not set 417# CONFIG_INPUT_EVDEV is not set
404# CONFIG_INPUT_EVBUG is not set 418# CONFIG_INPUT_EVBUG is not set
405 419
@@ -446,7 +460,6 @@ CONFIG_UNIX98_PTYS=y
446CONFIG_LEGACY_PTYS=y 460CONFIG_LEGACY_PTYS=y
447CONFIG_LEGACY_PTY_COUNT=256 461CONFIG_LEGACY_PTY_COUNT=256
448# CONFIG_IPMI_HANDLER is not set 462# CONFIG_IPMI_HANDLER is not set
449# CONFIG_WATCHDOG is not set
450# CONFIG_HW_RANDOM is not set 463# CONFIG_HW_RANDOM is not set
451# CONFIG_NVRAM is not set 464# CONFIG_NVRAM is not set
452CONFIG_GEN_RTC=y 465CONFIG_GEN_RTC=y
@@ -465,9 +478,8 @@ CONFIG_GEN_RTC=y
465# CONFIG_POWER_SUPPLY is not set 478# CONFIG_POWER_SUPPLY is not set
466CONFIG_HWMON=y 479CONFIG_HWMON=y
467# CONFIG_HWMON_VID is not set 480# CONFIG_HWMON_VID is not set
468# CONFIG_SENSORS_ABITUGURU is not set
469# CONFIG_SENSORS_ABITUGURU3 is not set
470# CONFIG_SENSORS_F71805F is not set 481# CONFIG_SENSORS_F71805F is not set
482# CONFIG_SENSORS_F71882FG is not set
471# CONFIG_SENSORS_IT87 is not set 483# CONFIG_SENSORS_IT87 is not set
472# CONFIG_SENSORS_PC87360 is not set 484# CONFIG_SENSORS_PC87360 is not set
473# CONFIG_SENSORS_PC87427 is not set 485# CONFIG_SENSORS_PC87427 is not set
@@ -477,6 +489,13 @@ CONFIG_HWMON=y
477# CONFIG_SENSORS_W83627HF is not set 489# CONFIG_SENSORS_W83627HF is not set
478# CONFIG_SENSORS_W83627EHF is not set 490# CONFIG_SENSORS_W83627EHF is not set
479# CONFIG_HWMON_DEBUG_CHIP is not set 491# CONFIG_HWMON_DEBUG_CHIP is not set
492# CONFIG_WATCHDOG is not set
493
494#
495# Sonics Silicon Backplane
496#
497CONFIG_SSB_POSSIBLE=y
498# CONFIG_SSB is not set
480 499
481# 500#
482# Multifunction device drivers 501# Multifunction device drivers
@@ -493,16 +512,15 @@ CONFIG_DAB=y
493# 512#
494# Graphics support 513# Graphics support
495# 514#
515# CONFIG_VGASTATE is not set
516CONFIG_VIDEO_OUTPUT_CONTROL=y
517# CONFIG_FB is not set
496# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 518# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
497 519
498# 520#
499# Display device support 521# Display device support
500# 522#
501# CONFIG_DISPLAY_SUPPORT is not set 523# CONFIG_DISPLAY_SUPPORT is not set
502# CONFIG_VGASTATE is not set
503CONFIG_VIDEO_OUTPUT_CONTROL=y
504# CONFIG_FB is not set
505# CONFIG_FB_IBM_GXT4500 is not set
506 524
507# 525#
508# Sound 526# Sound
@@ -511,6 +529,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
511CONFIG_HID_SUPPORT=y 529CONFIG_HID_SUPPORT=y
512CONFIG_HID=y 530CONFIG_HID=y
513# CONFIG_HID_DEBUG is not set 531# CONFIG_HID_DEBUG is not set
532# CONFIG_HIDRAW is not set
514CONFIG_USB_SUPPORT=y 533CONFIG_USB_SUPPORT=y
515# CONFIG_USB_ARCH_HAS_HCD is not set 534# CONFIG_USB_ARCH_HAS_HCD is not set
516# CONFIG_USB_ARCH_HAS_OHCI is not set 535# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -530,19 +549,6 @@ CONFIG_USB_SUPPORT=y
530# CONFIG_RTC_CLASS is not set 549# CONFIG_RTC_CLASS is not set
531 550
532# 551#
533# DMA Engine support
534#
535# CONFIG_DMA_ENGINE is not set
536
537#
538# DMA Clients
539#
540
541#
542# DMA Devices
543#
544
545#
546# Userspace I/O 552# Userspace I/O
547# 553#
548# CONFIG_UIO is not set 554# CONFIG_UIO is not set
@@ -559,7 +565,6 @@ CONFIG_EXT3_FS_XATTR=y
559# CONFIG_EXT3_FS_SECURITY is not set 565# CONFIG_EXT3_FS_SECURITY is not set
560# CONFIG_EXT4DEV_FS is not set 566# CONFIG_EXT4DEV_FS is not set
561CONFIG_JBD=y 567CONFIG_JBD=y
562# CONFIG_JBD_DEBUG is not set
563CONFIG_FS_MBCACHE=y 568CONFIG_FS_MBCACHE=y
564# CONFIG_REISERFS_FS is not set 569# CONFIG_REISERFS_FS is not set
565# CONFIG_JFS_FS is not set 570# CONFIG_JFS_FS is not set
@@ -600,7 +605,6 @@ CONFIG_SYSFS=y
600CONFIG_TMPFS=y 605CONFIG_TMPFS=y
601# CONFIG_TMPFS_POSIX_ACL is not set 606# CONFIG_TMPFS_POSIX_ACL is not set
602# CONFIG_HUGETLB_PAGE is not set 607# CONFIG_HUGETLB_PAGE is not set
603CONFIG_RAMFS=y
604# CONFIG_CONFIGFS_FS is not set 608# CONFIG_CONFIGFS_FS is not set
605 609
606# 610#
@@ -619,10 +623,7 @@ CONFIG_RAMFS=y
619# CONFIG_QNX4FS_FS is not set 623# CONFIG_QNX4FS_FS is not set
620# CONFIG_SYSV_FS is not set 624# CONFIG_SYSV_FS is not set
621# CONFIG_UFS_FS is not set 625# CONFIG_UFS_FS is not set
622 626CONFIG_NETWORK_FILESYSTEMS=y
623#
624# Network File Systems
625#
626CONFIG_NFS_FS=y 627CONFIG_NFS_FS=y
627# CONFIG_NFS_V3 is not set 628# CONFIG_NFS_V3 is not set
628# CONFIG_NFS_V4 is not set 629# CONFIG_NFS_V4 is not set
@@ -658,15 +659,7 @@ CONFIG_PARTITION_ADVANCED=y
658# CONFIG_KARMA_PARTITION is not set 659# CONFIG_KARMA_PARTITION is not set
659# CONFIG_EFI_PARTITION is not set 660# CONFIG_EFI_PARTITION is not set
660# CONFIG_SYSV68_PARTITION is not set 661# CONFIG_SYSV68_PARTITION is not set
661
662#
663# Native Language Support
664#
665# CONFIG_NLS is not set 662# CONFIG_NLS is not set
666
667#
668# Distributed Lock Manager
669#
670# CONFIG_DLM is not set 663# CONFIG_DLM is not set
671# CONFIG_UCC_SLOW is not set 664# CONFIG_UCC_SLOW is not set
672 665
@@ -684,16 +677,13 @@ CONFIG_PLIST=y
684CONFIG_HAS_IOMEM=y 677CONFIG_HAS_IOMEM=y
685CONFIG_HAS_IOPORT=y 678CONFIG_HAS_IOPORT=y
686CONFIG_HAS_DMA=y 679CONFIG_HAS_DMA=y
687 680# CONFIG_INSTRUMENTATION is not set
688#
689# Instrumentation Support
690#
691# CONFIG_PROFILING is not set
692 681
693# 682#
694# Kernel hacking 683# Kernel hacking
695# 684#
696# CONFIG_PRINTK_TIME is not set 685# CONFIG_PRINTK_TIME is not set
686CONFIG_ENABLE_WARN_DEPRECATED=y
697CONFIG_ENABLE_MUST_CHECK=y 687CONFIG_ENABLE_MUST_CHECK=y
698# CONFIG_MAGIC_SYSRQ is not set 688# CONFIG_MAGIC_SYSRQ is not set
699# CONFIG_UNUSED_SYMBOLS is not set 689# CONFIG_UNUSED_SYMBOLS is not set
@@ -717,8 +707,11 @@ CONFIG_DEBUG_MUTEXES=y
717# CONFIG_DEBUG_INFO is not set 707# CONFIG_DEBUG_INFO is not set
718# CONFIG_DEBUG_VM is not set 708# CONFIG_DEBUG_VM is not set
719# CONFIG_DEBUG_LIST is not set 709# CONFIG_DEBUG_LIST is not set
710# CONFIG_DEBUG_SG is not set
720CONFIG_FORCED_INLINING=y 711CONFIG_FORCED_INLINING=y
712# CONFIG_BOOT_PRINTK_DELAY is not set
721# CONFIG_FAULT_INJECTION is not set 713# CONFIG_FAULT_INJECTION is not set
714# CONFIG_SAMPLES is not set
722# CONFIG_DEBUG_STACKOVERFLOW is not set 715# CONFIG_DEBUG_STACKOVERFLOW is not set
723# CONFIG_DEBUG_STACK_USAGE is not set 716# CONFIG_DEBUG_STACK_USAGE is not set
724# CONFIG_DEBUG_PAGEALLOC is not set 717# CONFIG_DEBUG_PAGEALLOC is not set
@@ -731,4 +724,6 @@ CONFIG_FORCED_INLINING=y
731# 724#
732# CONFIG_KEYS is not set 725# CONFIG_KEYS is not set
733# CONFIG_SECURITY is not set 726# CONFIG_SECURITY is not set
727# CONFIG_SECURITY_FILE_CAPABILITIES is not set
734# CONFIG_CRYPTO is not set 728# CONFIG_CRYPTO is not set
729# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index 9a3e08bcd188..18623a8ee75c 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Wed Aug 29 16:41:04 2007 4# Thu Dec 6 16:48:46 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_FSL_BOOKE=y
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -64,11 +69,14 @@ CONFIG_BSD_PROCESS_ACCT=y
64# CONFIG_BSD_PROCESS_ACCT_V3 is not set 69# CONFIG_BSD_PROCESS_ACCT_V3 is not set
65# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
67CONFIG_AUDIT=y 73CONFIG_AUDIT=y
68# CONFIG_AUDITSYSCALL is not set 74# CONFIG_AUDITSYSCALL is not set
69CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79# CONFIG_FAIR_GROUP_SCHED is not set
72CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
74CONFIG_BLK_DEV_INITRD=y 82CONFIG_BLK_DEV_INITRD=y
@@ -89,7 +97,6 @@ CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 98CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 101CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -156,6 +163,10 @@ CONFIG_FSL_ULI1575=y
156# Kernel options 163# Kernel options
157# 164#
158CONFIG_HIGHMEM=y 165CONFIG_HIGHMEM=y
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 171CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -177,6 +188,7 @@ CONFIG_FLATMEM_MANUAL=y
177CONFIG_FLATMEM=y 188CONFIG_FLATMEM=y
178CONFIG_FLAT_NODE_MEM_MAP=y 189CONFIG_FLAT_NODE_MEM_MAP=y
179# CONFIG_SPARSEMEM_STATIC is not set 190# CONFIG_SPARSEMEM_STATIC is not set
191# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
180CONFIG_SPLIT_PTLOCK_CPUS=4 192CONFIG_SPLIT_PTLOCK_CPUS=4
181# CONFIG_RESOURCES_64BIT is not set 193# CONFIG_RESOURCES_64BIT is not set
182CONFIG_ZONE_DMA_FLAG=1 194CONFIG_ZONE_DMA_FLAG=1
@@ -185,6 +197,8 @@ CONFIG_VIRT_TO_BUS=y
185CONFIG_PROC_DEVICETREE=y 197CONFIG_PROC_DEVICETREE=y
186# CONFIG_CMDLINE_BOOL is not set 198# CONFIG_CMDLINE_BOOL is not set
187# CONFIG_PM is not set 199# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
188CONFIG_SECCOMP=y 202CONFIG_SECCOMP=y
189CONFIG_WANT_DEVICE_TREE=y 203CONFIG_WANT_DEVICE_TREE=y
190CONFIG_DEVICE_TREE="" 204CONFIG_DEVICE_TREE=""
@@ -194,6 +208,7 @@ CONFIG_ISA_DMA_API=y
194# Bus options 208# Bus options
195# 209#
196CONFIG_ZONE_DMA=y 210CONFIG_ZONE_DMA=y
211CONFIG_GENERIC_ISA_DMA=y
197CONFIG_PPC_INDIRECT_PCI=y 212CONFIG_PPC_INDIRECT_PCI=y
198CONFIG_FSL_SOC=y 213CONFIG_FSL_SOC=y
199CONFIG_FSL_PCI=y 214CONFIG_FSL_PCI=y
@@ -203,11 +218,8 @@ CONFIG_PCI_SYSCALL=y
203# CONFIG_PCIEPORTBUS is not set 218# CONFIG_PCIEPORTBUS is not set
204CONFIG_ARCH_SUPPORTS_MSI=y 219CONFIG_ARCH_SUPPORTS_MSI=y
205# CONFIG_PCI_MSI is not set 220# CONFIG_PCI_MSI is not set
221CONFIG_PCI_LEGACY=y
206# CONFIG_PCI_DEBUG is not set 222# CONFIG_PCI_DEBUG is not set
207
208#
209# PCCARD (PCMCIA/CardBus) support
210#
211# CONFIG_PCCARD is not set 223# CONFIG_PCCARD is not set
212# CONFIG_HOTPLUG_PCI is not set 224# CONFIG_HOTPLUG_PCI is not set
213 225
@@ -222,7 +234,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
222CONFIG_HIGHMEM_START=0xfe000000 234CONFIG_HIGHMEM_START=0xfe000000
223CONFIG_LOWMEM_SIZE=0x30000000 235CONFIG_LOWMEM_SIZE=0x30000000
224CONFIG_KERNEL_START=0xc0000000 236CONFIG_KERNEL_START=0xc0000000
225CONFIG_TASK_SIZE=0x80000000 237CONFIG_TASK_SIZE=0xc0000000
226CONFIG_BOOT_LOAD=0x00800000 238CONFIG_BOOT_LOAD=0x00800000
227 239
228# 240#
@@ -271,6 +283,7 @@ CONFIG_INET_TUNNEL=y
271# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 283# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
272# CONFIG_INET_XFRM_MODE_TUNNEL is not set 284# CONFIG_INET_XFRM_MODE_TUNNEL is not set
273# CONFIG_INET_XFRM_MODE_BEET is not set 285# CONFIG_INET_XFRM_MODE_BEET is not set
286# CONFIG_INET_LRO is not set
274CONFIG_INET_DIAG=y 287CONFIG_INET_DIAG=y
275CONFIG_INET_TCP_DIAG=y 288CONFIG_INET_TCP_DIAG=y
276# CONFIG_TCP_CONG_ADVANCED is not set 289# CONFIG_TCP_CONG_ADVANCED is not set
@@ -315,10 +328,6 @@ CONFIG_SCTP_HMAC_MD5=y
315# CONFIG_LAPB is not set 328# CONFIG_LAPB is not set
316# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
318
319#
320# QoS and/or fair queueing
321#
322# CONFIG_NET_SCHED is not set 331# CONFIG_NET_SCHED is not set
323 332
324# 333#
@@ -348,6 +357,7 @@ CONFIG_FIB_RULES=y
348# 357#
349# Generic Driver Options 358# Generic Driver Options
350# 359#
360CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
351CONFIG_STANDALONE=y 361CONFIG_STANDALONE=y
352CONFIG_PREVENT_FIRMWARE_BUILD=y 362CONFIG_PREVENT_FIRMWARE_BUILD=y
353CONFIG_FW_LOADER=y 363CONFIG_FW_LOADER=y
@@ -420,6 +430,7 @@ CONFIG_SCSI_WAIT_SCAN=m
420# CONFIG_SCSI_FC_ATTRS is not set 430# CONFIG_SCSI_FC_ATTRS is not set
421# CONFIG_SCSI_ISCSI_ATTRS is not set 431# CONFIG_SCSI_ISCSI_ATTRS is not set
422# CONFIG_SCSI_SAS_LIBSAS is not set 432# CONFIG_SCSI_SAS_LIBSAS is not set
433# CONFIG_SCSI_SRP_ATTRS is not set
423CONFIG_SCSI_LOWLEVEL=y 434CONFIG_SCSI_LOWLEVEL=y
424# CONFIG_ISCSI_TCP is not set 435# CONFIG_ISCSI_TCP is not set
425# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 436# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -431,6 +442,7 @@ CONFIG_SCSI_LOWLEVEL=y
431# CONFIG_SCSI_AIC79XX is not set 442# CONFIG_SCSI_AIC79XX is not set
432# CONFIG_SCSI_AIC94XX is not set 443# CONFIG_SCSI_AIC94XX is not set
433# CONFIG_SCSI_DPT_I2O is not set 444# CONFIG_SCSI_DPT_I2O is not set
445# CONFIG_SCSI_ADVANSYS is not set
434# CONFIG_SCSI_ARCMSR is not set 446# CONFIG_SCSI_ARCMSR is not set
435# CONFIG_MEGARAID_NEWGEN is not set 447# CONFIG_MEGARAID_NEWGEN is not set
436# CONFIG_MEGARAID_LEGACY is not set 448# CONFIG_MEGARAID_LEGACY is not set
@@ -498,6 +510,7 @@ CONFIG_PATA_ALI=y
498# CONFIG_PATA_OLDPIIX is not set 510# CONFIG_PATA_OLDPIIX is not set
499# CONFIG_PATA_NETCELL is not set 511# CONFIG_PATA_NETCELL is not set
500# CONFIG_PATA_NS87410 is not set 512# CONFIG_PATA_NS87410 is not set
513# CONFIG_PATA_NS87415 is not set
501# CONFIG_PATA_OPTI is not set 514# CONFIG_PATA_OPTI is not set
502# CONFIG_PATA_OPTIDMA is not set 515# CONFIG_PATA_OPTIDMA is not set
503# CONFIG_PATA_PDC_OLD is not set 516# CONFIG_PATA_PDC_OLD is not set
@@ -512,14 +525,7 @@ CONFIG_PATA_ALI=y
512# CONFIG_PATA_WINBOND is not set 525# CONFIG_PATA_WINBOND is not set
513# CONFIG_PATA_PLATFORM is not set 526# CONFIG_PATA_PLATFORM is not set
514# CONFIG_MD is not set 527# CONFIG_MD is not set
515
516#
517# Fusion MPT device support
518#
519# CONFIG_FUSION is not set 528# CONFIG_FUSION is not set
520# CONFIG_FUSION_SPI is not set
521# CONFIG_FUSION_FC is not set
522# CONFIG_FUSION_SAS is not set
523 529
524# 530#
525# IEEE 1394 (FireWire) support 531# IEEE 1394 (FireWire) support
@@ -535,6 +541,8 @@ CONFIG_DUMMY=y
535# CONFIG_MACVLAN is not set 541# CONFIG_MACVLAN is not set
536# CONFIG_EQUALIZER is not set 542# CONFIG_EQUALIZER is not set
537# CONFIG_TUN is not set 543# CONFIG_TUN is not set
544# CONFIG_VETH is not set
545# CONFIG_IP1000 is not set
538# CONFIG_ARCNET is not set 546# CONFIG_ARCNET is not set
539CONFIG_PHYLIB=y 547CONFIG_PHYLIB=y
540 548
@@ -551,6 +559,7 @@ CONFIG_VITESSE_PHY=y
551# CONFIG_BROADCOM_PHY is not set 559# CONFIG_BROADCOM_PHY is not set
552# CONFIG_ICPLUS_PHY is not set 560# CONFIG_ICPLUS_PHY is not set
553# CONFIG_FIXED_PHY is not set 561# CONFIG_FIXED_PHY is not set
562# CONFIG_MDIO_BITBANG is not set
554CONFIG_NET_ETHERNET=y 563CONFIG_NET_ETHERNET=y
555CONFIG_MII=y 564CONFIG_MII=y
556# CONFIG_HAPPYMEAL is not set 565# CONFIG_HAPPYMEAL is not set
@@ -559,11 +568,17 @@ CONFIG_MII=y
559# CONFIG_NET_VENDOR_3COM is not set 568# CONFIG_NET_VENDOR_3COM is not set
560# CONFIG_NET_TULIP is not set 569# CONFIG_NET_TULIP is not set
561# CONFIG_HP100 is not set 570# CONFIG_HP100 is not set
571# CONFIG_IBM_NEW_EMAC_ZMII is not set
572# CONFIG_IBM_NEW_EMAC_RGMII is not set
573# CONFIG_IBM_NEW_EMAC_TAH is not set
574# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
562# CONFIG_NET_PCI is not set 575# CONFIG_NET_PCI is not set
576# CONFIG_B44 is not set
563CONFIG_NETDEV_1000=y 577CONFIG_NETDEV_1000=y
564# CONFIG_ACENIC is not set 578# CONFIG_ACENIC is not set
565# CONFIG_DL2K is not set 579# CONFIG_DL2K is not set
566# CONFIG_E1000 is not set 580# CONFIG_E1000 is not set
581# CONFIG_E1000E is not set
567# CONFIG_NS83820 is not set 582# CONFIG_NS83820 is not set
568# CONFIG_HAMACHI is not set 583# CONFIG_HAMACHI is not set
569# CONFIG_YELLOWFIN is not set 584# CONFIG_YELLOWFIN is not set
@@ -571,6 +586,7 @@ CONFIG_NETDEV_1000=y
571# CONFIG_SIS190 is not set 586# CONFIG_SIS190 is not set
572# CONFIG_SKGE is not set 587# CONFIG_SKGE is not set
573# CONFIG_SKY2 is not set 588# CONFIG_SKY2 is not set
589# CONFIG_SK98LIN is not set
574# CONFIG_VIA_VELOCITY is not set 590# CONFIG_VIA_VELOCITY is not set
575# CONFIG_TIGON3 is not set 591# CONFIG_TIGON3 is not set
576# CONFIG_BNX2 is not set 592# CONFIG_BNX2 is not set
@@ -581,11 +597,14 @@ CONFIG_GFAR_NAPI=y
581CONFIG_NETDEV_10000=y 597CONFIG_NETDEV_10000=y
582# CONFIG_CHELSIO_T1 is not set 598# CONFIG_CHELSIO_T1 is not set
583# CONFIG_CHELSIO_T3 is not set 599# CONFIG_CHELSIO_T3 is not set
600# CONFIG_IXGBE is not set
584# CONFIG_IXGB is not set 601# CONFIG_IXGB is not set
585# CONFIG_S2IO is not set 602# CONFIG_S2IO is not set
586# CONFIG_MYRI10GE is not set 603# CONFIG_MYRI10GE is not set
587# CONFIG_NETXEN_NIC is not set 604# CONFIG_NETXEN_NIC is not set
605# CONFIG_NIU is not set
588# CONFIG_MLX4_CORE is not set 606# CONFIG_MLX4_CORE is not set
607# CONFIG_TEHUTI is not set
589# CONFIG_TR is not set 608# CONFIG_TR is not set
590 609
591# 610#
@@ -601,7 +620,6 @@ CONFIG_NETDEV_10000=y
601# CONFIG_USB_KAWETH is not set 620# CONFIG_USB_KAWETH is not set
602# CONFIG_USB_PEGASUS is not set 621# CONFIG_USB_PEGASUS is not set
603# CONFIG_USB_RTL8150 is not set 622# CONFIG_USB_RTL8150 is not set
604# CONFIG_USB_USBNET_MII is not set
605# CONFIG_USB_USBNET is not set 623# CONFIG_USB_USBNET is not set
606# CONFIG_WAN is not set 624# CONFIG_WAN is not set
607# CONFIG_FDDI is not set 625# CONFIG_FDDI is not set
@@ -628,7 +646,6 @@ CONFIG_INPUT=y
628# 646#
629# CONFIG_INPUT_MOUSEDEV is not set 647# CONFIG_INPUT_MOUSEDEV is not set
630# CONFIG_INPUT_JOYDEV is not set 648# CONFIG_INPUT_JOYDEV is not set
631# CONFIG_INPUT_TSDEV is not set
632# CONFIG_INPUT_EVDEV is not set 649# CONFIG_INPUT_EVDEV is not set
633# CONFIG_INPUT_EVBUG is not set 650# CONFIG_INPUT_EVBUG is not set
634 651
@@ -688,15 +705,12 @@ CONFIG_UNIX98_PTYS=y
688CONFIG_LEGACY_PTYS=y 705CONFIG_LEGACY_PTYS=y
689CONFIG_LEGACY_PTY_COUNT=256 706CONFIG_LEGACY_PTY_COUNT=256
690# CONFIG_IPMI_HANDLER is not set 707# CONFIG_IPMI_HANDLER is not set
691# CONFIG_WATCHDOG is not set
692# CONFIG_HW_RANDOM is not set 708# CONFIG_HW_RANDOM is not set
693CONFIG_NVRAM=y 709CONFIG_NVRAM=y
694CONFIG_GEN_RTC=y 710CONFIG_GEN_RTC=y
695CONFIG_GEN_RTC_X=y 711CONFIG_GEN_RTC_X=y
696# CONFIG_R3964 is not set 712# CONFIG_R3964 is not set
697# CONFIG_APPLICOM is not set 713# CONFIG_APPLICOM is not set
698# CONFIG_AGP is not set
699# CONFIG_DRM is not set
700# CONFIG_RAW_DRIVER is not set 714# CONFIG_RAW_DRIVER is not set
701# CONFIG_TCG_TPM is not set 715# CONFIG_TCG_TPM is not set
702CONFIG_DEVPORT=y 716CONFIG_DEVPORT=y
@@ -765,6 +779,13 @@ CONFIG_SENSORS_EEPROM=y
765# CONFIG_W1 is not set 779# CONFIG_W1 is not set
766# CONFIG_POWER_SUPPLY is not set 780# CONFIG_POWER_SUPPLY is not set
767# CONFIG_HWMON is not set 781# CONFIG_HWMON is not set
782# CONFIG_WATCHDOG is not set
783
784#
785# Sonics Silicon Backplane
786#
787CONFIG_SSB_POSSIBLE=y
788# CONFIG_SSB is not set
768 789
769# 790#
770# Multifunction device drivers 791# Multifunction device drivers
@@ -859,6 +880,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
859# CONFIG_DVB_OR51132 is not set 880# CONFIG_DVB_OR51132 is not set
860# CONFIG_DVB_BCM3510 is not set 881# CONFIG_DVB_BCM3510 is not set
861# CONFIG_DVB_LGDT330X is not set 882# CONFIG_DVB_LGDT330X is not set
883# CONFIG_DVB_S5H1409 is not set
862 884
863# 885#
864# Tuners/PLL support 886# Tuners/PLL support
@@ -868,6 +890,9 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
868# CONFIG_DVB_TDA827X is not set 890# CONFIG_DVB_TDA827X is not set
869# CONFIG_DVB_TUNER_QT1010 is not set 891# CONFIG_DVB_TUNER_QT1010 is not set
870# CONFIG_DVB_TUNER_MT2060 is not set 892# CONFIG_DVB_TUNER_MT2060 is not set
893# CONFIG_DVB_TUNER_MT2266 is not set
894# CONFIG_DVB_TUNER_MT2131 is not set
895# CONFIG_DVB_TUNER_DIB0070 is not set
871 896
872# 897#
873# Miscellaneous devices 898# Miscellaneous devices
@@ -881,16 +906,17 @@ CONFIG_DAB=y
881# 906#
882# Graphics support 907# Graphics support
883# 908#
909# CONFIG_AGP is not set
910# CONFIG_DRM is not set
911# CONFIG_VGASTATE is not set
912CONFIG_VIDEO_OUTPUT_CONTROL=y
913# CONFIG_FB is not set
884# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 914# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
885 915
886# 916#
887# Display device support 917# Display device support
888# 918#
889# CONFIG_DISPLAY_SUPPORT is not set 919# CONFIG_DISPLAY_SUPPORT is not set
890# CONFIG_VGASTATE is not set
891CONFIG_VIDEO_OUTPUT_CONTROL=y
892# CONFIG_FB is not set
893# CONFIG_FB_IBM_GXT4500 is not set
894 920
895# 921#
896# Console display driver support 922# Console display driver support
@@ -1022,6 +1048,7 @@ CONFIG_AC97_BUS=y
1022CONFIG_HID_SUPPORT=y 1048CONFIG_HID_SUPPORT=y
1023CONFIG_HID=y 1049CONFIG_HID=y
1024# CONFIG_HID_DEBUG is not set 1050# CONFIG_HID_DEBUG is not set
1051# CONFIG_HIDRAW is not set
1025 1052
1026# 1053#
1027# USB Input Devices 1054# USB Input Devices
@@ -1082,6 +1109,7 @@ CONFIG_USB_STORAGE=y
1082# CONFIG_USB_STORAGE_DEBUG is not set 1109# CONFIG_USB_STORAGE_DEBUG is not set
1083# CONFIG_USB_STORAGE_DATAFAB is not set 1110# CONFIG_USB_STORAGE_DATAFAB is not set
1084# CONFIG_USB_STORAGE_FREECOM is not set 1111# CONFIG_USB_STORAGE_FREECOM is not set
1112# CONFIG_USB_STORAGE_ISD200 is not set
1085# CONFIG_USB_STORAGE_DPCM is not set 1113# CONFIG_USB_STORAGE_DPCM is not set
1086# CONFIG_USB_STORAGE_USBAT is not set 1114# CONFIG_USB_STORAGE_USBAT is not set
1087# CONFIG_USB_STORAGE_SDDR09 is not set 1115# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -1162,6 +1190,7 @@ CONFIG_RTC_INTF_DEV=y
1162# I2C RTC drivers 1190# I2C RTC drivers
1163# 1191#
1164# CONFIG_RTC_DRV_DS1307 is not set 1192# CONFIG_RTC_DRV_DS1307 is not set
1193# CONFIG_RTC_DRV_DS1374 is not set
1165# CONFIG_RTC_DRV_DS1672 is not set 1194# CONFIG_RTC_DRV_DS1672 is not set
1166# CONFIG_RTC_DRV_MAX6900 is not set 1195# CONFIG_RTC_DRV_MAX6900 is not set
1167# CONFIG_RTC_DRV_RS5C372 is not set 1196# CONFIG_RTC_DRV_RS5C372 is not set
@@ -1191,19 +1220,6 @@ CONFIG_RTC_DRV_CMOS=y
1191# 1220#
1192 1221
1193# 1222#
1194# DMA Engine support
1195#
1196# CONFIG_DMA_ENGINE is not set
1197
1198#
1199# DMA Clients
1200#
1201
1202#
1203# DMA Devices
1204#
1205
1206#
1207# Userspace I/O 1223# Userspace I/O
1208# 1224#
1209# CONFIG_UIO is not set 1225# CONFIG_UIO is not set
@@ -1220,7 +1236,6 @@ CONFIG_EXT3_FS_XATTR=y
1220# CONFIG_EXT3_FS_SECURITY is not set 1236# CONFIG_EXT3_FS_SECURITY is not set
1221# CONFIG_EXT4DEV_FS is not set 1237# CONFIG_EXT4DEV_FS is not set
1222CONFIG_JBD=y 1238CONFIG_JBD=y
1223# CONFIG_JBD_DEBUG is not set
1224CONFIG_FS_MBCACHE=y 1239CONFIG_FS_MBCACHE=y
1225# CONFIG_REISERFS_FS is not set 1240# CONFIG_REISERFS_FS is not set
1226# CONFIG_JFS_FS is not set 1241# CONFIG_JFS_FS is not set
@@ -1269,7 +1284,6 @@ CONFIG_SYSFS=y
1269CONFIG_TMPFS=y 1284CONFIG_TMPFS=y
1270# CONFIG_TMPFS_POSIX_ACL is not set 1285# CONFIG_TMPFS_POSIX_ACL is not set
1271# CONFIG_HUGETLB_PAGE is not set 1286# CONFIG_HUGETLB_PAGE is not set
1272CONFIG_RAMFS=y
1273# CONFIG_CONFIGFS_FS is not set 1287# CONFIG_CONFIGFS_FS is not set
1274 1288
1275# 1289#
@@ -1292,10 +1306,7 @@ CONFIG_SYSV_FS=m
1292CONFIG_UFS_FS=m 1306CONFIG_UFS_FS=m
1293# CONFIG_UFS_FS_WRITE is not set 1307# CONFIG_UFS_FS_WRITE is not set
1294# CONFIG_UFS_DEBUG is not set 1308# CONFIG_UFS_DEBUG is not set
1295 1309CONFIG_NETWORK_FILESYSTEMS=y
1296#
1297# Network File Systems
1298#
1299CONFIG_NFS_FS=y 1310CONFIG_NFS_FS=y
1300CONFIG_NFS_V3=y 1311CONFIG_NFS_V3=y
1301# CONFIG_NFS_V3_ACL is not set 1312# CONFIG_NFS_V3_ACL is not set
@@ -1341,10 +1352,6 @@ CONFIG_MSDOS_PARTITION=y
1341# CONFIG_KARMA_PARTITION is not set 1352# CONFIG_KARMA_PARTITION is not set
1342# CONFIG_EFI_PARTITION is not set 1353# CONFIG_EFI_PARTITION is not set
1343# CONFIG_SYSV68_PARTITION is not set 1354# CONFIG_SYSV68_PARTITION is not set
1344
1345#
1346# Native Language Support
1347#
1348CONFIG_NLS=y 1355CONFIG_NLS=y
1349CONFIG_NLS_DEFAULT="iso8859-1" 1356CONFIG_NLS_DEFAULT="iso8859-1"
1350# CONFIG_NLS_CODEPAGE_437 is not set 1357# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1385,10 +1392,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1385# CONFIG_NLS_KOI8_R is not set 1392# CONFIG_NLS_KOI8_R is not set
1386# CONFIG_NLS_KOI8_U is not set 1393# CONFIG_NLS_KOI8_U is not set
1387CONFIG_NLS_UTF8=m 1394CONFIG_NLS_UTF8=m
1388
1389#
1390# Distributed Lock Manager
1391#
1392# CONFIG_DLM is not set 1395# CONFIG_DLM is not set
1393# CONFIG_UCC_SLOW is not set 1396# CONFIG_UCC_SLOW is not set
1394 1397
@@ -1407,16 +1410,13 @@ CONFIG_PLIST=y
1407CONFIG_HAS_IOMEM=y 1410CONFIG_HAS_IOMEM=y
1408CONFIG_HAS_IOPORT=y 1411CONFIG_HAS_IOPORT=y
1409CONFIG_HAS_DMA=y 1412CONFIG_HAS_DMA=y
1410 1413# CONFIG_INSTRUMENTATION is not set
1411#
1412# Instrumentation Support
1413#
1414# CONFIG_PROFILING is not set
1415 1414
1416# 1415#
1417# Kernel hacking 1416# Kernel hacking
1418# 1417#
1419# CONFIG_PRINTK_TIME is not set 1418# CONFIG_PRINTK_TIME is not set
1419CONFIG_ENABLE_WARN_DEPRECATED=y
1420CONFIG_ENABLE_MUST_CHECK=y 1420CONFIG_ENABLE_MUST_CHECK=y
1421# CONFIG_MAGIC_SYSRQ is not set 1421# CONFIG_MAGIC_SYSRQ is not set
1422# CONFIG_UNUSED_SYMBOLS is not set 1422# CONFIG_UNUSED_SYMBOLS is not set
@@ -1441,9 +1441,12 @@ CONFIG_SCHED_DEBUG=y
1441CONFIG_DEBUG_INFO=y 1441CONFIG_DEBUG_INFO=y
1442# CONFIG_DEBUG_VM is not set 1442# CONFIG_DEBUG_VM is not set
1443# CONFIG_DEBUG_LIST is not set 1443# CONFIG_DEBUG_LIST is not set
1444# CONFIG_DEBUG_SG is not set
1444CONFIG_FORCED_INLINING=y 1445CONFIG_FORCED_INLINING=y
1446# CONFIG_BOOT_PRINTK_DELAY is not set
1445# CONFIG_RCU_TORTURE_TEST is not set 1447# CONFIG_RCU_TORTURE_TEST is not set
1446# CONFIG_FAULT_INJECTION is not set 1448# CONFIG_FAULT_INJECTION is not set
1449# CONFIG_SAMPLES is not set
1447# CONFIG_DEBUG_STACKOVERFLOW is not set 1450# CONFIG_DEBUG_STACKOVERFLOW is not set
1448# CONFIG_DEBUG_STACK_USAGE is not set 1451# CONFIG_DEBUG_STACK_USAGE is not set
1449# CONFIG_DEBUG_PAGEALLOC is not set 1452# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1456,6 +1459,7 @@ CONFIG_FORCED_INLINING=y
1456# 1459#
1457# CONFIG_KEYS is not set 1460# CONFIG_KEYS is not set
1458# CONFIG_SECURITY is not set 1461# CONFIG_SECURITY is not set
1462# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1459CONFIG_CRYPTO=y 1463CONFIG_CRYPTO=y
1460CONFIG_CRYPTO_ALGAPI=y 1464CONFIG_CRYPTO_ALGAPI=y
1461CONFIG_CRYPTO_BLKCIPHER=y 1465CONFIG_CRYPTO_BLKCIPHER=y
@@ -1466,7 +1470,7 @@ CONFIG_CRYPTO_HMAC=y
1466# CONFIG_CRYPTO_NULL is not set 1470# CONFIG_CRYPTO_NULL is not set
1467# CONFIG_CRYPTO_MD4 is not set 1471# CONFIG_CRYPTO_MD4 is not set
1468CONFIG_CRYPTO_MD5=y 1472CONFIG_CRYPTO_MD5=y
1469# CONFIG_CRYPTO_SHA1 is not set 1473CONFIG_CRYPTO_SHA1=m
1470# CONFIG_CRYPTO_SHA256 is not set 1474# CONFIG_CRYPTO_SHA256 is not set
1471# CONFIG_CRYPTO_SHA512 is not set 1475# CONFIG_CRYPTO_SHA512 is not set
1472# CONFIG_CRYPTO_WP512 is not set 1476# CONFIG_CRYPTO_WP512 is not set
@@ -1476,6 +1480,7 @@ CONFIG_CRYPTO_MD5=y
1476CONFIG_CRYPTO_CBC=y 1480CONFIG_CRYPTO_CBC=y
1477CONFIG_CRYPTO_PCBC=m 1481CONFIG_CRYPTO_PCBC=m
1478# CONFIG_CRYPTO_LRW is not set 1482# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_XTS is not set
1479# CONFIG_CRYPTO_CRYPTD is not set 1484# CONFIG_CRYPTO_CRYPTD is not set
1480CONFIG_CRYPTO_DES=y 1485CONFIG_CRYPTO_DES=y
1481# CONFIG_CRYPTO_FCRYPT is not set 1486# CONFIG_CRYPTO_FCRYPT is not set
@@ -1489,9 +1494,12 @@ CONFIG_CRYPTO_DES=y
1489# CONFIG_CRYPTO_ARC4 is not set 1494# CONFIG_CRYPTO_ARC4 is not set
1490# CONFIG_CRYPTO_KHAZAD is not set 1495# CONFIG_CRYPTO_KHAZAD is not set
1491# CONFIG_CRYPTO_ANUBIS is not set 1496# CONFIG_CRYPTO_ANUBIS is not set
1497# CONFIG_CRYPTO_SEED is not set
1492# CONFIG_CRYPTO_DEFLATE is not set 1498# CONFIG_CRYPTO_DEFLATE is not set
1493# CONFIG_CRYPTO_MICHAEL_MIC is not set 1499# CONFIG_CRYPTO_MICHAEL_MIC is not set
1494# CONFIG_CRYPTO_CRC32C is not set 1500# CONFIG_CRYPTO_CRC32C is not set
1495# CONFIG_CRYPTO_CAMELLIA is not set 1501# CONFIG_CRYPTO_CAMELLIA is not set
1496# CONFIG_CRYPTO_TEST is not set 1502# CONFIG_CRYPTO_TEST is not set
1503# CONFIG_CRYPTO_AUTHENC is not set
1497CONFIG_CRYPTO_HW=y 1504CONFIG_CRYPTO_HW=y
1505# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index 0211e6b68e1a..51f9693bacd4 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.23-rc9 3# Linux kernel version: 2.6.24-rc4
4# Thu Oct 11 09:16:32 2007 4# Thu Dec 6 16:48:48 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -68,9 +68,12 @@ CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76# CONFIG_FAIR_GROUP_SCHED is not set
74CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
75# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
76CONFIG_BLK_DEV_INITRD=y 79CONFIG_BLK_DEV_INITRD=y
@@ -158,6 +161,7 @@ CONFIG_CPM=y
158# CONFIG_TICK_ONESHOT is not set 161# CONFIG_TICK_ONESHOT is not set
159# CONFIG_NO_HZ is not set 162# CONFIG_NO_HZ is not set
160# CONFIG_HIGH_RES_TIMERS is not set 163# CONFIG_HIGH_RES_TIMERS is not set
164CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
161# CONFIG_HZ_100 is not set 165# CONFIG_HZ_100 is not set
162CONFIG_HZ_250=y 166CONFIG_HZ_250=y
163# CONFIG_HZ_300 is not set 167# CONFIG_HZ_300 is not set
@@ -179,6 +183,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 183CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 184CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 185# CONFIG_SPARSEMEM_STATIC is not set
186# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
182CONFIG_SPLIT_PTLOCK_CPUS=4 187CONFIG_SPLIT_PTLOCK_CPUS=4
183# CONFIG_RESOURCES_64BIT is not set 188# CONFIG_RESOURCES_64BIT is not set
184CONFIG_ZONE_DMA_FLAG=1 189CONFIG_ZONE_DMA_FLAG=1
@@ -207,11 +212,8 @@ CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 212# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 213CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 214# CONFIG_PCI_MSI is not set
215CONFIG_PCI_LEGACY=y
210CONFIG_PCI_DEBUG=y 216CONFIG_PCI_DEBUG=y
211
212#
213# PCCARD (PCMCIA/CardBus) support
214#
215# CONFIG_PCCARD is not set 217# CONFIG_PCCARD is not set
216# CONFIG_HOTPLUG_PCI is not set 218# CONFIG_HOTPLUG_PCI is not set
217 219
@@ -226,7 +228,7 @@ CONFIG_PCI_DEBUG=y
226CONFIG_HIGHMEM_START=0xfe000000 228CONFIG_HIGHMEM_START=0xfe000000
227CONFIG_LOWMEM_SIZE=0x30000000 229CONFIG_LOWMEM_SIZE=0x30000000
228CONFIG_KERNEL_START=0xc0000000 230CONFIG_KERNEL_START=0xc0000000
229CONFIG_TASK_SIZE=0x80000000 231CONFIG_TASK_SIZE=0xc0000000
230CONFIG_BOOT_LOAD=0x00800000 232CONFIG_BOOT_LOAD=0x00800000
231 233
232# 234#
@@ -266,6 +268,7 @@ CONFIG_SYN_COOKIES=y
266CONFIG_INET_XFRM_MODE_TRANSPORT=y 268CONFIG_INET_XFRM_MODE_TRANSPORT=y
267CONFIG_INET_XFRM_MODE_TUNNEL=y 269CONFIG_INET_XFRM_MODE_TUNNEL=y
268CONFIG_INET_XFRM_MODE_BEET=y 270CONFIG_INET_XFRM_MODE_BEET=y
271# CONFIG_INET_LRO is not set
269CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
270CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
271# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
@@ -291,10 +294,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_LAPB is not set 294# CONFIG_LAPB is not set
292# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
293# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
294
295#
296# QoS and/or fair queueing
297#
298# CONFIG_NET_SCHED is not set 297# CONFIG_NET_SCHED is not set
299 298
300# 299#
@@ -323,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# 322#
324# Generic Driver Options 323# Generic Driver Options
325# 324#
325CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
326CONFIG_STANDALONE=y 326CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 327CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set 328# CONFIG_FW_LOADER is not set
@@ -366,10 +366,6 @@ CONFIG_MISC_DEVICES=y
366# CONFIG_SCSI_NETLINK is not set 366# CONFIG_SCSI_NETLINK is not set
367# CONFIG_ATA is not set 367# CONFIG_ATA is not set
368# CONFIG_MD is not set 368# CONFIG_MD is not set
369
370#
371# Fusion MPT device support
372#
373# CONFIG_FUSION is not set 369# CONFIG_FUSION is not set
374 370
375# 371#
@@ -386,6 +382,8 @@ CONFIG_NETDEVICES=y
386# CONFIG_MACVLAN is not set 382# CONFIG_MACVLAN is not set
387# CONFIG_EQUALIZER is not set 383# CONFIG_EQUALIZER is not set
388# CONFIG_TUN is not set 384# CONFIG_TUN is not set
385# CONFIG_VETH is not set
386# CONFIG_IP1000 is not set
389# CONFIG_ARCNET is not set 387# CONFIG_ARCNET is not set
390CONFIG_PHYLIB=y 388CONFIG_PHYLIB=y
391 389
@@ -402,6 +400,7 @@ CONFIG_DAVICOM_PHY=y
402# CONFIG_BROADCOM_PHY is not set 400# CONFIG_BROADCOM_PHY is not set
403# CONFIG_ICPLUS_PHY is not set 401# CONFIG_ICPLUS_PHY is not set
404# CONFIG_FIXED_PHY is not set 402# CONFIG_FIXED_PHY is not set
403# CONFIG_MDIO_BITBANG is not set
405CONFIG_NET_ETHERNET=y 404CONFIG_NET_ETHERNET=y
406CONFIG_MII=y 405CONFIG_MII=y
407# CONFIG_HAPPYMEAL is not set 406# CONFIG_HAPPYMEAL is not set
@@ -410,16 +409,23 @@ CONFIG_MII=y
410# CONFIG_NET_VENDOR_3COM is not set 409# CONFIG_NET_VENDOR_3COM is not set
411# CONFIG_NET_TULIP is not set 410# CONFIG_NET_TULIP is not set
412# CONFIG_HP100 is not set 411# CONFIG_HP100 is not set
412# CONFIG_IBM_NEW_EMAC_ZMII is not set
413# CONFIG_IBM_NEW_EMAC_RGMII is not set
414# CONFIG_IBM_NEW_EMAC_TAH is not set
415# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
413# CONFIG_NET_PCI is not set 416# CONFIG_NET_PCI is not set
417# CONFIG_B44 is not set
414CONFIG_FS_ENET=y 418CONFIG_FS_ENET=y
415# CONFIG_FS_ENET_HAS_SCC is not set 419# CONFIG_FS_ENET_HAS_SCC is not set
416CONFIG_FS_ENET_HAS_FCC=y 420CONFIG_FS_ENET_HAS_FCC=y
421# CONFIG_FS_ENET_MDIO_FCC is not set
417CONFIG_NETDEV_1000=y 422CONFIG_NETDEV_1000=y
418# CONFIG_ACENIC is not set 423# CONFIG_ACENIC is not set
419# CONFIG_DL2K is not set 424# CONFIG_DL2K is not set
420CONFIG_E1000=y 425CONFIG_E1000=y
421CONFIG_E1000_NAPI=y 426CONFIG_E1000_NAPI=y
422# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 427# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
428# CONFIG_E1000E is not set
423# CONFIG_NS83820 is not set 429# CONFIG_NS83820 is not set
424# CONFIG_HAMACHI is not set 430# CONFIG_HAMACHI is not set
425# CONFIG_YELLOWFIN is not set 431# CONFIG_YELLOWFIN is not set
@@ -438,11 +444,14 @@ CONFIG_GFAR_NAPI=y
438CONFIG_NETDEV_10000=y 444CONFIG_NETDEV_10000=y
439# CONFIG_CHELSIO_T1 is not set 445# CONFIG_CHELSIO_T1 is not set
440# CONFIG_CHELSIO_T3 is not set 446# CONFIG_CHELSIO_T3 is not set
447# CONFIG_IXGBE is not set
441# CONFIG_IXGB is not set 448# CONFIG_IXGB is not set
442# CONFIG_S2IO is not set 449# CONFIG_S2IO is not set
443# CONFIG_MYRI10GE is not set 450# CONFIG_MYRI10GE is not set
444# CONFIG_NETXEN_NIC is not set 451# CONFIG_NETXEN_NIC is not set
452# CONFIG_NIU is not set
445# CONFIG_MLX4_CORE is not set 453# CONFIG_MLX4_CORE is not set
454# CONFIG_TEHUTI is not set
446# CONFIG_TR is not set 455# CONFIG_TR is not set
447 456
448# 457#
@@ -474,7 +483,6 @@ CONFIG_INPUT=y
474# 483#
475# CONFIG_INPUT_MOUSEDEV is not set 484# CONFIG_INPUT_MOUSEDEV is not set
476# CONFIG_INPUT_JOYDEV is not set 485# CONFIG_INPUT_JOYDEV is not set
477# CONFIG_INPUT_TSDEV is not set
478# CONFIG_INPUT_EVDEV is not set 486# CONFIG_INPUT_EVDEV is not set
479# CONFIG_INPUT_EVBUG is not set 487# CONFIG_INPUT_EVBUG is not set
480 488
@@ -524,15 +532,12 @@ CONFIG_UNIX98_PTYS=y
524CONFIG_LEGACY_PTYS=y 532CONFIG_LEGACY_PTYS=y
525CONFIG_LEGACY_PTY_COUNT=256 533CONFIG_LEGACY_PTY_COUNT=256
526# CONFIG_IPMI_HANDLER is not set 534# CONFIG_IPMI_HANDLER is not set
527# CONFIG_WATCHDOG is not set
528CONFIG_HW_RANDOM=y 535CONFIG_HW_RANDOM=y
529# CONFIG_NVRAM is not set 536# CONFIG_NVRAM is not set
530CONFIG_GEN_RTC=y 537CONFIG_GEN_RTC=y
531# CONFIG_GEN_RTC_X is not set 538# CONFIG_GEN_RTC_X is not set
532# CONFIG_R3964 is not set 539# CONFIG_R3964 is not set
533# CONFIG_APPLICOM is not set 540# CONFIG_APPLICOM is not set
534# CONFIG_AGP is not set
535# CONFIG_DRM is not set
536# CONFIG_RAW_DRIVER is not set 541# CONFIG_RAW_DRIVER is not set
537# CONFIG_TCG_TPM is not set 542# CONFIG_TCG_TPM is not set
538CONFIG_DEVPORT=y 543CONFIG_DEVPORT=y
@@ -547,9 +552,9 @@ CONFIG_DEVPORT=y
547# CONFIG_POWER_SUPPLY is not set 552# CONFIG_POWER_SUPPLY is not set
548CONFIG_HWMON=y 553CONFIG_HWMON=y
549# CONFIG_HWMON_VID is not set 554# CONFIG_HWMON_VID is not set
550# CONFIG_SENSORS_ABITUGURU is not set 555# CONFIG_SENSORS_I5K_AMB is not set
551# CONFIG_SENSORS_ABITUGURU3 is not set
552# CONFIG_SENSORS_F71805F is not set 556# CONFIG_SENSORS_F71805F is not set
557# CONFIG_SENSORS_F71882FG is not set
553# CONFIG_SENSORS_IT87 is not set 558# CONFIG_SENSORS_IT87 is not set
554# CONFIG_SENSORS_PC87360 is not set 559# CONFIG_SENSORS_PC87360 is not set
555# CONFIG_SENSORS_PC87427 is not set 560# CONFIG_SENSORS_PC87427 is not set
@@ -562,6 +567,13 @@ CONFIG_HWMON=y
562# CONFIG_SENSORS_W83627HF is not set 567# CONFIG_SENSORS_W83627HF is not set
563# CONFIG_SENSORS_W83627EHF is not set 568# CONFIG_SENSORS_W83627EHF is not set
564# CONFIG_HWMON_DEBUG_CHIP is not set 569# CONFIG_HWMON_DEBUG_CHIP is not set
570# CONFIG_WATCHDOG is not set
571
572#
573# Sonics Silicon Backplane
574#
575CONFIG_SSB_POSSIBLE=y
576# CONFIG_SSB is not set
565 577
566# 578#
567# Multifunction device drivers 579# Multifunction device drivers
@@ -578,16 +590,17 @@ CONFIG_DAB=y
578# 590#
579# Graphics support 591# Graphics support
580# 592#
593# CONFIG_AGP is not set
594# CONFIG_DRM is not set
595# CONFIG_VGASTATE is not set
596CONFIG_VIDEO_OUTPUT_CONTROL=y
597# CONFIG_FB is not set
581# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 598# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
582 599
583# 600#
584# Display device support 601# Display device support
585# 602#
586# CONFIG_DISPLAY_SUPPORT is not set 603# CONFIG_DISPLAY_SUPPORT is not set
587# CONFIG_VGASTATE is not set
588CONFIG_VIDEO_OUTPUT_CONTROL=y
589# CONFIG_FB is not set
590# CONFIG_FB_IBM_GXT4500 is not set
591 604
592# 605#
593# Sound 606# Sound
@@ -596,6 +609,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
596CONFIG_HID_SUPPORT=y 609CONFIG_HID_SUPPORT=y
597CONFIG_HID=y 610CONFIG_HID=y
598# CONFIG_HID_DEBUG is not set 611# CONFIG_HID_DEBUG is not set
612# CONFIG_HIDRAW is not set
599CONFIG_USB_SUPPORT=y 613CONFIG_USB_SUPPORT=y
600CONFIG_USB_ARCH_HAS_HCD=y 614CONFIG_USB_ARCH_HAS_HCD=y
601CONFIG_USB_ARCH_HAS_OHCI=y 615CONFIG_USB_ARCH_HAS_OHCI=y
@@ -617,19 +631,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
617# CONFIG_RTC_CLASS is not set 631# CONFIG_RTC_CLASS is not set
618 632
619# 633#
620# DMA Engine support
621#
622# CONFIG_DMA_ENGINE is not set
623
624#
625# DMA Clients
626#
627
628#
629# DMA Devices
630#
631
632#
633# Userspace I/O 634# Userspace I/O
634# 635#
635# CONFIG_UIO is not set 636# CONFIG_UIO is not set
@@ -646,7 +647,6 @@ CONFIG_EXT3_FS_XATTR=y
646# CONFIG_EXT3_FS_SECURITY is not set 647# CONFIG_EXT3_FS_SECURITY is not set
647# CONFIG_EXT4DEV_FS is not set 648# CONFIG_EXT4DEV_FS is not set
648CONFIG_JBD=y 649CONFIG_JBD=y
649# CONFIG_JBD_DEBUG is not set
650CONFIG_FS_MBCACHE=y 650CONFIG_FS_MBCACHE=y
651# CONFIG_REISERFS_FS is not set 651# CONFIG_REISERFS_FS is not set
652# CONFIG_JFS_FS is not set 652# CONFIG_JFS_FS is not set
@@ -687,7 +687,6 @@ CONFIG_SYSFS=y
687CONFIG_TMPFS=y 687CONFIG_TMPFS=y
688# CONFIG_TMPFS_POSIX_ACL is not set 688# CONFIG_TMPFS_POSIX_ACL is not set
689# CONFIG_HUGETLB_PAGE is not set 689# CONFIG_HUGETLB_PAGE is not set
690CONFIG_RAMFS=y
691# CONFIG_CONFIGFS_FS is not set 690# CONFIG_CONFIGFS_FS is not set
692 691
693# 692#
@@ -706,10 +705,7 @@ CONFIG_RAMFS=y
706# CONFIG_QNX4FS_FS is not set 705# CONFIG_QNX4FS_FS is not set
707# CONFIG_SYSV_FS is not set 706# CONFIG_SYSV_FS is not set
708# CONFIG_UFS_FS is not set 707# CONFIG_UFS_FS is not set
709 708CONFIG_NETWORK_FILESYSTEMS=y
710#
711# Network File Systems
712#
713CONFIG_NFS_FS=y 709CONFIG_NFS_FS=y
714# CONFIG_NFS_V3 is not set 710# CONFIG_NFS_V3 is not set
715# CONFIG_NFS_V4 is not set 711# CONFIG_NFS_V4 is not set
@@ -745,15 +741,7 @@ CONFIG_PARTITION_ADVANCED=y
745# CONFIG_KARMA_PARTITION is not set 741# CONFIG_KARMA_PARTITION is not set
746# CONFIG_EFI_PARTITION is not set 742# CONFIG_EFI_PARTITION is not set
747# CONFIG_SYSV68_PARTITION is not set 743# CONFIG_SYSV68_PARTITION is not set
748
749#
750# Native Language Support
751#
752# CONFIG_NLS is not set 744# CONFIG_NLS is not set
753
754#
755# Distributed Lock Manager
756#
757# CONFIG_DLM is not set 745# CONFIG_DLM is not set
758# CONFIG_UCC_SLOW is not set 746# CONFIG_UCC_SLOW is not set
759 747
@@ -771,16 +759,13 @@ CONFIG_PLIST=y
771CONFIG_HAS_IOMEM=y 759CONFIG_HAS_IOMEM=y
772CONFIG_HAS_IOPORT=y 760CONFIG_HAS_IOPORT=y
773CONFIG_HAS_DMA=y 761CONFIG_HAS_DMA=y
774 762# CONFIG_INSTRUMENTATION is not set
775#
776# Instrumentation Support
777#
778# CONFIG_PROFILING is not set
779 763
780# 764#
781# Kernel hacking 765# Kernel hacking
782# 766#
783# CONFIG_PRINTK_TIME is not set 767# CONFIG_PRINTK_TIME is not set
768CONFIG_ENABLE_WARN_DEPRECATED=y
784CONFIG_ENABLE_MUST_CHECK=y 769CONFIG_ENABLE_MUST_CHECK=y
785# CONFIG_MAGIC_SYSRQ is not set 770# CONFIG_MAGIC_SYSRQ is not set
786# CONFIG_UNUSED_SYMBOLS is not set 771# CONFIG_UNUSED_SYMBOLS is not set
@@ -804,8 +789,11 @@ CONFIG_DEBUG_MUTEXES=y
804# CONFIG_DEBUG_INFO is not set 789# CONFIG_DEBUG_INFO is not set
805# CONFIG_DEBUG_VM is not set 790# CONFIG_DEBUG_VM is not set
806# CONFIG_DEBUG_LIST is not set 791# CONFIG_DEBUG_LIST is not set
792# CONFIG_DEBUG_SG is not set
807CONFIG_FORCED_INLINING=y 793CONFIG_FORCED_INLINING=y
794# CONFIG_BOOT_PRINTK_DELAY is not set
808# CONFIG_FAULT_INJECTION is not set 795# CONFIG_FAULT_INJECTION is not set
796# CONFIG_SAMPLES is not set
809# CONFIG_DEBUG_STACKOVERFLOW is not set 797# CONFIG_DEBUG_STACKOVERFLOW is not set
810# CONFIG_DEBUG_STACK_USAGE is not set 798# CONFIG_DEBUG_STACK_USAGE is not set
811# CONFIG_DEBUG_PAGEALLOC is not set 799# CONFIG_DEBUG_PAGEALLOC is not set
@@ -819,5 +807,7 @@ CONFIG_FORCED_INLINING=y
819# 807#
820# CONFIG_KEYS is not set 808# CONFIG_KEYS is not set
821# CONFIG_SECURITY is not set 809# CONFIG_SECURITY is not set
810# CONFIG_SECURITY_FILE_CAPABILITIES is not set
822# CONFIG_CRYPTO is not set 811# CONFIG_CRYPTO is not set
823# CONFIG_PPC_CLOCK is not set 812# CONFIG_PPC_CLOCK is not set
813CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index d665e7a797c0..f51b58ae329a 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:43 2007 4# Thu Dec 6 16:48:50 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_FSL_BOOKE=y
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,9 +68,12 @@ CONFIG_SYSVIPC_SYSCTL=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
65# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
68CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76# CONFIG_FAIR_GROUP_SCHED is not set
69CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
71CONFIG_BLK_DEV_INITRD=y 79CONFIG_BLK_DEV_INITRD=y
@@ -84,7 +92,6 @@ CONFIG_FUTEX=y
84CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
85# CONFIG_EPOLL is not set 93# CONFIG_EPOLL is not set
86CONFIG_SIGNALFD=y 94CONFIG_SIGNALFD=y
87CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 95CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 96CONFIG_SHMEM=y
90CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
@@ -132,7 +139,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
132# CONFIG_MPC8560_ADS is not set 139# CONFIG_MPC8560_ADS is not set
133# CONFIG_MPC85xx_CDS is not set 140# CONFIG_MPC85xx_CDS is not set
134CONFIG_MPC85xx_MDS=y 141CONFIG_MPC85xx_MDS=y
135# CONFIG_MPC8544_DS is not set 142# CONFIG_MPC85xx_DS is not set
136CONFIG_MPC85xx=y 143CONFIG_MPC85xx=y
137CONFIG_MPIC=y 144CONFIG_MPIC=y
138# CONFIG_MPIC_WEIRD is not set 145# CONFIG_MPIC_WEIRD is not set
@@ -144,6 +151,7 @@ CONFIG_MPIC=y
144# CONFIG_PPC_INDIRECT_IO is not set 151# CONFIG_PPC_INDIRECT_IO is not set
145# CONFIG_GENERIC_IOMAP is not set 152# CONFIG_GENERIC_IOMAP is not set
146# CONFIG_CPU_FREQ is not set 153# CONFIG_CPU_FREQ is not set
154CONFIG_QUICC_ENGINE=y
147# CONFIG_CPM2 is not set 155# CONFIG_CPM2 is not set
148# CONFIG_FSL_ULI1575 is not set 156# CONFIG_FSL_ULI1575 is not set
149 157
@@ -151,6 +159,10 @@ CONFIG_MPIC=y
151# Kernel options 159# Kernel options
152# 160#
153# CONFIG_HIGHMEM is not set 161# CONFIG_HIGHMEM is not set
162CONFIG_TICK_ONESHOT=y
163CONFIG_NO_HZ=y
164CONFIG_HIGH_RES_TIMERS=y
165CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
154# CONFIG_HZ_100 is not set 166# CONFIG_HZ_100 is not set
155CONFIG_HZ_250=y 167CONFIG_HZ_250=y
156# CONFIG_HZ_300 is not set 168# CONFIG_HZ_300 is not set
@@ -172,6 +184,7 @@ CONFIG_FLATMEM_MANUAL=y
172CONFIG_FLATMEM=y 184CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 185CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 186# CONFIG_SPARSEMEM_STATIC is not set
187# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
175CONFIG_SPLIT_PTLOCK_CPUS=4 188CONFIG_SPLIT_PTLOCK_CPUS=4
176# CONFIG_RESOURCES_64BIT is not set 189# CONFIG_RESOURCES_64BIT is not set
177CONFIG_ZONE_DMA_FLAG=1 190CONFIG_ZONE_DMA_FLAG=1
@@ -180,6 +193,8 @@ CONFIG_VIRT_TO_BUS=y
180CONFIG_PROC_DEVICETREE=y 193CONFIG_PROC_DEVICETREE=y
181# CONFIG_CMDLINE_BOOL is not set 194# CONFIG_CMDLINE_BOOL is not set
182# CONFIG_PM is not set 195# CONFIG_PM is not set
196CONFIG_SUSPEND_UP_POSSIBLE=y
197CONFIG_HIBERNATION_UP_POSSIBLE=y
183CONFIG_SECCOMP=y 198CONFIG_SECCOMP=y
184CONFIG_WANT_DEVICE_TREE=y 199CONFIG_WANT_DEVICE_TREE=y
185CONFIG_DEVICE_TREE="" 200CONFIG_DEVICE_TREE=""
@@ -198,11 +213,8 @@ CONFIG_PCI_SYSCALL=y
198# CONFIG_PCIEPORTBUS is not set 213# CONFIG_PCIEPORTBUS is not set
199CONFIG_ARCH_SUPPORTS_MSI=y 214CONFIG_ARCH_SUPPORTS_MSI=y
200# CONFIG_PCI_MSI is not set 215# CONFIG_PCI_MSI is not set
216CONFIG_PCI_LEGACY=y
201# CONFIG_PCI_DEBUG is not set 217# CONFIG_PCI_DEBUG is not set
202
203#
204# PCCARD (PCMCIA/CardBus) support
205#
206# CONFIG_PCCARD is not set 218# CONFIG_PCCARD is not set
207# CONFIG_HOTPLUG_PCI is not set 219# CONFIG_HOTPLUG_PCI is not set
208 220
@@ -217,7 +229,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
217CONFIG_HIGHMEM_START=0xfe000000 229CONFIG_HIGHMEM_START=0xfe000000
218CONFIG_LOWMEM_SIZE=0x30000000 230CONFIG_LOWMEM_SIZE=0x30000000
219CONFIG_KERNEL_START=0xc0000000 231CONFIG_KERNEL_START=0xc0000000
220CONFIG_TASK_SIZE=0x80000000 232CONFIG_TASK_SIZE=0xc0000000
221CONFIG_BOOT_LOAD=0x00800000 233CONFIG_BOOT_LOAD=0x00800000
222 234
223# 235#
@@ -257,6 +269,7 @@ CONFIG_SYN_COOKIES=y
257CONFIG_INET_XFRM_MODE_TRANSPORT=y 269CONFIG_INET_XFRM_MODE_TRANSPORT=y
258CONFIG_INET_XFRM_MODE_TUNNEL=y 270CONFIG_INET_XFRM_MODE_TUNNEL=y
259CONFIG_INET_XFRM_MODE_BEET=y 271CONFIG_INET_XFRM_MODE_BEET=y
272# CONFIG_INET_LRO is not set
260CONFIG_INET_DIAG=y 273CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 274CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set 275# CONFIG_TCP_CONG_ADVANCED is not set
@@ -282,10 +295,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
282# CONFIG_LAPB is not set 295# CONFIG_LAPB is not set
283# CONFIG_ECONET is not set 296# CONFIG_ECONET is not set
284# CONFIG_WAN_ROUTER is not set 297# CONFIG_WAN_ROUTER is not set
285
286#
287# QoS and/or fair queueing
288#
289# CONFIG_NET_SCHED is not set 298# CONFIG_NET_SCHED is not set
290 299
291# 300#
@@ -314,6 +323,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
314# 323#
315# Generic Driver Options 324# Generic Driver Options
316# 325#
326CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
317CONFIG_STANDALONE=y 327CONFIG_STANDALONE=y
318CONFIG_PREVENT_FIRMWARE_BUILD=y 328CONFIG_PREVENT_FIRMWARE_BUILD=y
319# CONFIG_FW_LOADER is not set 329# CONFIG_FW_LOADER is not set
@@ -384,6 +394,7 @@ CONFIG_SCSI_WAIT_SCAN=m
384# CONFIG_SCSI_FC_ATTRS is not set 394# CONFIG_SCSI_FC_ATTRS is not set
385# CONFIG_SCSI_ISCSI_ATTRS is not set 395# CONFIG_SCSI_ISCSI_ATTRS is not set
386# CONFIG_SCSI_SAS_LIBSAS is not set 396# CONFIG_SCSI_SAS_LIBSAS is not set
397# CONFIG_SCSI_SRP_ATTRS is not set
387CONFIG_SCSI_LOWLEVEL=y 398CONFIG_SCSI_LOWLEVEL=y
388# CONFIG_ISCSI_TCP is not set 399# CONFIG_ISCSI_TCP is not set
389# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 400# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -395,6 +406,7 @@ CONFIG_SCSI_LOWLEVEL=y
395# CONFIG_SCSI_AIC79XX is not set 406# CONFIG_SCSI_AIC79XX is not set
396# CONFIG_SCSI_AIC94XX is not set 407# CONFIG_SCSI_AIC94XX is not set
397# CONFIG_SCSI_DPT_I2O is not set 408# CONFIG_SCSI_DPT_I2O is not set
409# CONFIG_SCSI_ADVANSYS is not set
398# CONFIG_SCSI_ARCMSR is not set 410# CONFIG_SCSI_ARCMSR is not set
399# CONFIG_MEGARAID_NEWGEN is not set 411# CONFIG_MEGARAID_NEWGEN is not set
400# CONFIG_MEGARAID_LEGACY is not set 412# CONFIG_MEGARAID_LEGACY is not set
@@ -421,14 +433,7 @@ CONFIG_SCSI_LOWLEVEL=y
421# CONFIG_SCSI_SRP is not set 433# CONFIG_SCSI_SRP is not set
422# CONFIG_ATA is not set 434# CONFIG_ATA is not set
423# CONFIG_MD is not set 435# CONFIG_MD is not set
424
425#
426# Fusion MPT device support
427#
428# CONFIG_FUSION is not set 436# CONFIG_FUSION is not set
429# CONFIG_FUSION_SPI is not set
430# CONFIG_FUSION_FC is not set
431# CONFIG_FUSION_SAS is not set
432 437
433# 438#
434# IEEE 1394 (FireWire) support 439# IEEE 1394 (FireWire) support
@@ -444,6 +449,8 @@ CONFIG_NETDEVICES=y
444# CONFIG_MACVLAN is not set 449# CONFIG_MACVLAN is not set
445# CONFIG_EQUALIZER is not set 450# CONFIG_EQUALIZER is not set
446# CONFIG_TUN is not set 451# CONFIG_TUN is not set
452# CONFIG_VETH is not set
453# CONFIG_IP1000 is not set
447# CONFIG_ARCNET is not set 454# CONFIG_ARCNET is not set
448CONFIG_PHYLIB=y 455CONFIG_PHYLIB=y
449 456
@@ -460,6 +467,7 @@ CONFIG_MARVELL_PHY=y
460# CONFIG_BROADCOM_PHY is not set 467# CONFIG_BROADCOM_PHY is not set
461# CONFIG_ICPLUS_PHY is not set 468# CONFIG_ICPLUS_PHY is not set
462# CONFIG_FIXED_PHY is not set 469# CONFIG_FIXED_PHY is not set
470# CONFIG_MDIO_BITBANG is not set
463CONFIG_NET_ETHERNET=y 471CONFIG_NET_ETHERNET=y
464CONFIG_MII=y 472CONFIG_MII=y
465# CONFIG_HAPPYMEAL is not set 473# CONFIG_HAPPYMEAL is not set
@@ -468,11 +476,17 @@ CONFIG_MII=y
468# CONFIG_NET_VENDOR_3COM is not set 476# CONFIG_NET_VENDOR_3COM is not set
469# CONFIG_NET_TULIP is not set 477# CONFIG_NET_TULIP is not set
470# CONFIG_HP100 is not set 478# CONFIG_HP100 is not set
479# CONFIG_IBM_NEW_EMAC_ZMII is not set
480# CONFIG_IBM_NEW_EMAC_RGMII is not set
481# CONFIG_IBM_NEW_EMAC_TAH is not set
482# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
471# CONFIG_NET_PCI is not set 483# CONFIG_NET_PCI is not set
484# CONFIG_B44 is not set
472CONFIG_NETDEV_1000=y 485CONFIG_NETDEV_1000=y
473# CONFIG_ACENIC is not set 486# CONFIG_ACENIC is not set
474# CONFIG_DL2K is not set 487# CONFIG_DL2K is not set
475# CONFIG_E1000 is not set 488# CONFIG_E1000 is not set
489# CONFIG_E1000E is not set
476# CONFIG_NS83820 is not set 490# CONFIG_NS83820 is not set
477# CONFIG_HAMACHI is not set 491# CONFIG_HAMACHI is not set
478# CONFIG_YELLOWFIN is not set 492# CONFIG_YELLOWFIN is not set
@@ -480,21 +494,26 @@ CONFIG_NETDEV_1000=y
480# CONFIG_SIS190 is not set 494# CONFIG_SIS190 is not set
481# CONFIG_SKGE is not set 495# CONFIG_SKGE is not set
482# CONFIG_SKY2 is not set 496# CONFIG_SKY2 is not set
497# CONFIG_SK98LIN is not set
483# CONFIG_VIA_VELOCITY is not set 498# CONFIG_VIA_VELOCITY is not set
484# CONFIG_TIGON3 is not set 499# CONFIG_TIGON3 is not set
485# CONFIG_BNX2 is not set 500# CONFIG_BNX2 is not set
486CONFIG_GIANFAR=y 501CONFIG_GIANFAR=y
487CONFIG_GFAR_NAPI=y 502CONFIG_GFAR_NAPI=y
503# CONFIG_UCC_GETH is not set
488# CONFIG_QLA3XXX is not set 504# CONFIG_QLA3XXX is not set
489# CONFIG_ATL1 is not set 505# CONFIG_ATL1 is not set
490CONFIG_NETDEV_10000=y 506CONFIG_NETDEV_10000=y
491# CONFIG_CHELSIO_T1 is not set 507# CONFIG_CHELSIO_T1 is not set
492# CONFIG_CHELSIO_T3 is not set 508# CONFIG_CHELSIO_T3 is not set
509# CONFIG_IXGBE is not set
493# CONFIG_IXGB is not set 510# CONFIG_IXGB is not set
494# CONFIG_S2IO is not set 511# CONFIG_S2IO is not set
495# CONFIG_MYRI10GE is not set 512# CONFIG_MYRI10GE is not set
496# CONFIG_NETXEN_NIC is not set 513# CONFIG_NETXEN_NIC is not set
514# CONFIG_NIU is not set
497# CONFIG_MLX4_CORE is not set 515# CONFIG_MLX4_CORE is not set
516# CONFIG_TEHUTI is not set
498# CONFIG_TR is not set 517# CONFIG_TR is not set
499 518
500# 519#
@@ -527,7 +546,6 @@ CONFIG_INPUT=y
527# 546#
528# CONFIG_INPUT_MOUSEDEV is not set 547# CONFIG_INPUT_MOUSEDEV is not set
529# CONFIG_INPUT_JOYDEV is not set 548# CONFIG_INPUT_JOYDEV is not set
530# CONFIG_INPUT_TSDEV is not set
531# CONFIG_INPUT_EVDEV is not set 549# CONFIG_INPUT_EVDEV is not set
532# CONFIG_INPUT_EVBUG is not set 550# CONFIG_INPUT_EVBUG is not set
533 551
@@ -576,28 +594,12 @@ CONFIG_UNIX98_PTYS=y
576CONFIG_LEGACY_PTYS=y 594CONFIG_LEGACY_PTYS=y
577CONFIG_LEGACY_PTY_COUNT=256 595CONFIG_LEGACY_PTY_COUNT=256
578# CONFIG_IPMI_HANDLER is not set 596# CONFIG_IPMI_HANDLER is not set
579CONFIG_WATCHDOG=y
580# CONFIG_WATCHDOG_NOWAYOUT is not set
581
582#
583# Watchdog Device Drivers
584#
585# CONFIG_SOFT_WATCHDOG is not set
586# CONFIG_BOOKE_WDT is not set
587
588#
589# PCI-based Watchdog Cards
590#
591# CONFIG_PCIPCWATCHDOG is not set
592# CONFIG_WDTPCI is not set
593CONFIG_HW_RANDOM=y 597CONFIG_HW_RANDOM=y
594# CONFIG_NVRAM is not set 598# CONFIG_NVRAM is not set
595CONFIG_GEN_RTC=y 599CONFIG_GEN_RTC=y
596# CONFIG_GEN_RTC_X is not set 600# CONFIG_GEN_RTC_X is not set
597# CONFIG_R3964 is not set 601# CONFIG_R3964 is not set
598# CONFIG_APPLICOM is not set 602# CONFIG_APPLICOM is not set
599# CONFIG_AGP is not set
600# CONFIG_DRM is not set
601# CONFIG_RAW_DRIVER is not set 603# CONFIG_RAW_DRIVER is not set
602# CONFIG_TCG_TPM is not set 604# CONFIG_TCG_TPM is not set
603CONFIG_DEVPORT=y 605CONFIG_DEVPORT=y
@@ -666,8 +668,6 @@ CONFIG_I2C_MPC=y
666# CONFIG_POWER_SUPPLY is not set 668# CONFIG_POWER_SUPPLY is not set
667CONFIG_HWMON=y 669CONFIG_HWMON=y
668# CONFIG_HWMON_VID is not set 670# CONFIG_HWMON_VID is not set
669# CONFIG_SENSORS_ABITUGURU is not set
670# CONFIG_SENSORS_ABITUGURU3 is not set
671# CONFIG_SENSORS_AD7418 is not set 671# CONFIG_SENSORS_AD7418 is not set
672# CONFIG_SENSORS_ADM1021 is not set 672# CONFIG_SENSORS_ADM1021 is not set
673# CONFIG_SENSORS_ADM1025 is not set 673# CONFIG_SENSORS_ADM1025 is not set
@@ -675,12 +675,13 @@ CONFIG_HWMON=y
675# CONFIG_SENSORS_ADM1029 is not set 675# CONFIG_SENSORS_ADM1029 is not set
676# CONFIG_SENSORS_ADM1031 is not set 676# CONFIG_SENSORS_ADM1031 is not set
677# CONFIG_SENSORS_ADM9240 is not set 677# CONFIG_SENSORS_ADM9240 is not set
678# CONFIG_SENSORS_ASB100 is not set 678# CONFIG_SENSORS_ADT7470 is not set
679# CONFIG_SENSORS_ATXP1 is not set 679# CONFIG_SENSORS_ATXP1 is not set
680# CONFIG_SENSORS_DS1621 is not set 680# CONFIG_SENSORS_DS1621 is not set
681# CONFIG_SENSORS_I5K_AMB is not set
681# CONFIG_SENSORS_F71805F is not set 682# CONFIG_SENSORS_F71805F is not set
682# CONFIG_SENSORS_FSCHER is not set 683# CONFIG_SENSORS_F71882FG is not set
683# CONFIG_SENSORS_FSCPOS is not set 684# CONFIG_SENSORS_F75375S is not set
684# CONFIG_SENSORS_GL518SM is not set 685# CONFIG_SENSORS_GL518SM is not set
685# CONFIG_SENSORS_GL520SM is not set 686# CONFIG_SENSORS_GL520SM is not set
686# CONFIG_SENSORS_IT87 is not set 687# CONFIG_SENSORS_IT87 is not set
@@ -716,6 +717,26 @@ CONFIG_HWMON=y
716# CONFIG_SENSORS_W83627HF is not set 717# CONFIG_SENSORS_W83627HF is not set
717# CONFIG_SENSORS_W83627EHF is not set 718# CONFIG_SENSORS_W83627EHF is not set
718# CONFIG_HWMON_DEBUG_CHIP is not set 719# CONFIG_HWMON_DEBUG_CHIP is not set
720CONFIG_WATCHDOG=y
721# CONFIG_WATCHDOG_NOWAYOUT is not set
722
723#
724# Watchdog Device Drivers
725#
726# CONFIG_SOFT_WATCHDOG is not set
727# CONFIG_BOOKE_WDT is not set
728
729#
730# PCI-based Watchdog Cards
731#
732# CONFIG_PCIPCWATCHDOG is not set
733# CONFIG_WDTPCI is not set
734
735#
736# Sonics Silicon Backplane
737#
738CONFIG_SSB_POSSIBLE=y
739# CONFIG_SSB is not set
719 740
720# 741#
721# Multifunction device drivers 742# Multifunction device drivers
@@ -732,16 +753,17 @@ CONFIG_DAB=y
732# 753#
733# Graphics support 754# Graphics support
734# 755#
756# CONFIG_AGP is not set
757# CONFIG_DRM is not set
758# CONFIG_VGASTATE is not set
759CONFIG_VIDEO_OUTPUT_CONTROL=m
760# CONFIG_FB is not set
735# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 761# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
736 762
737# 763#
738# Display device support 764# Display device support
739# 765#
740# CONFIG_DISPLAY_SUPPORT is not set 766# CONFIG_DISPLAY_SUPPORT is not set
741# CONFIG_VGASTATE is not set
742CONFIG_VIDEO_OUTPUT_CONTROL=m
743# CONFIG_FB is not set
744# CONFIG_FB_IBM_GXT4500 is not set
745 767
746# 768#
747# Sound 769# Sound
@@ -750,6 +772,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
750CONFIG_HID_SUPPORT=y 772CONFIG_HID_SUPPORT=y
751CONFIG_HID=y 773CONFIG_HID=y
752# CONFIG_HID_DEBUG is not set 774# CONFIG_HID_DEBUG is not set
775# CONFIG_HIDRAW is not set
753CONFIG_USB_SUPPORT=y 776CONFIG_USB_SUPPORT=y
754CONFIG_USB_ARCH_HAS_HCD=y 777CONFIG_USB_ARCH_HAS_HCD=y
755CONFIG_USB_ARCH_HAS_OHCI=y 778CONFIG_USB_ARCH_HAS_OHCI=y
@@ -817,19 +840,6 @@ CONFIG_RTC_DRV_DS1374=y
817# 840#
818 841
819# 842#
820# DMA Engine support
821#
822# CONFIG_DMA_ENGINE is not set
823
824#
825# DMA Clients
826#
827
828#
829# DMA Devices
830#
831
832#
833# Userspace I/O 843# Userspace I/O
834# 844#
835# CONFIG_UIO is not set 845# CONFIG_UIO is not set
@@ -846,7 +856,6 @@ CONFIG_EXT3_FS_XATTR=y
846# CONFIG_EXT3_FS_SECURITY is not set 856# CONFIG_EXT3_FS_SECURITY is not set
847# CONFIG_EXT4DEV_FS is not set 857# CONFIG_EXT4DEV_FS is not set
848CONFIG_JBD=y 858CONFIG_JBD=y
849# CONFIG_JBD_DEBUG is not set
850CONFIG_FS_MBCACHE=y 859CONFIG_FS_MBCACHE=y
851# CONFIG_REISERFS_FS is not set 860# CONFIG_REISERFS_FS is not set
852# CONFIG_JFS_FS is not set 861# CONFIG_JFS_FS is not set
@@ -887,7 +896,6 @@ CONFIG_SYSFS=y
887CONFIG_TMPFS=y 896CONFIG_TMPFS=y
888# CONFIG_TMPFS_POSIX_ACL is not set 897# CONFIG_TMPFS_POSIX_ACL is not set
889# CONFIG_HUGETLB_PAGE is not set 898# CONFIG_HUGETLB_PAGE is not set
890CONFIG_RAMFS=y
891# CONFIG_CONFIGFS_FS is not set 899# CONFIG_CONFIGFS_FS is not set
892 900
893# 901#
@@ -906,10 +914,7 @@ CONFIG_RAMFS=y
906# CONFIG_QNX4FS_FS is not set 914# CONFIG_QNX4FS_FS is not set
907# CONFIG_SYSV_FS is not set 915# CONFIG_SYSV_FS is not set
908# CONFIG_UFS_FS is not set 916# CONFIG_UFS_FS is not set
909 917CONFIG_NETWORK_FILESYSTEMS=y
910#
911# Network File Systems
912#
913CONFIG_NFS_FS=y 918CONFIG_NFS_FS=y
914CONFIG_NFS_V3=y 919CONFIG_NFS_V3=y
915# CONFIG_NFS_V3_ACL is not set 920# CONFIG_NFS_V3_ACL is not set
@@ -948,15 +953,7 @@ CONFIG_PARTITION_ADVANCED=y
948# CONFIG_KARMA_PARTITION is not set 953# CONFIG_KARMA_PARTITION is not set
949# CONFIG_EFI_PARTITION is not set 954# CONFIG_EFI_PARTITION is not set
950# CONFIG_SYSV68_PARTITION is not set 955# CONFIG_SYSV68_PARTITION is not set
951
952#
953# Native Language Support
954#
955# CONFIG_NLS is not set 956# CONFIG_NLS is not set
956
957#
958# Distributed Lock Manager
959#
960# CONFIG_DLM is not set 957# CONFIG_DLM is not set
961# CONFIG_UCC_SLOW is not set 958# CONFIG_UCC_SLOW is not set
962 959
@@ -974,17 +971,13 @@ CONFIG_PLIST=y
974CONFIG_HAS_IOMEM=y 971CONFIG_HAS_IOMEM=y
975CONFIG_HAS_IOPORT=y 972CONFIG_HAS_IOPORT=y
976CONFIG_HAS_DMA=y 973CONFIG_HAS_DMA=y
977 974# CONFIG_INSTRUMENTATION is not set
978#
979# Instrumentation Support
980#
981CONFIG_PROFILING=y
982CONFIG_OPROFILE=y
983 975
984# 976#
985# Kernel hacking 977# Kernel hacking
986# 978#
987# CONFIG_PRINTK_TIME is not set 979# CONFIG_PRINTK_TIME is not set
980CONFIG_ENABLE_WARN_DEPRECATED=y
988CONFIG_ENABLE_MUST_CHECK=y 981CONFIG_ENABLE_MUST_CHECK=y
989# CONFIG_MAGIC_SYSRQ is not set 982# CONFIG_MAGIC_SYSRQ is not set
990# CONFIG_UNUSED_SYMBOLS is not set 983# CONFIG_UNUSED_SYMBOLS is not set
@@ -1008,9 +1001,12 @@ CONFIG_SCHED_DEBUG=y
1008# CONFIG_DEBUG_INFO is not set 1001# CONFIG_DEBUG_INFO is not set
1009# CONFIG_DEBUG_VM is not set 1002# CONFIG_DEBUG_VM is not set
1010# CONFIG_DEBUG_LIST is not set 1003# CONFIG_DEBUG_LIST is not set
1004# CONFIG_DEBUG_SG is not set
1011CONFIG_FORCED_INLINING=y 1005CONFIG_FORCED_INLINING=y
1006# CONFIG_BOOT_PRINTK_DELAY is not set
1012# CONFIG_RCU_TORTURE_TEST is not set 1007# CONFIG_RCU_TORTURE_TEST is not set
1013# CONFIG_FAULT_INJECTION is not set 1008# CONFIG_FAULT_INJECTION is not set
1009# CONFIG_SAMPLES is not set
1014# CONFIG_DEBUG_STACKOVERFLOW is not set 1010# CONFIG_DEBUG_STACKOVERFLOW is not set
1015# CONFIG_DEBUG_STACK_USAGE is not set 1011# CONFIG_DEBUG_STACK_USAGE is not set
1016# CONFIG_DEBUG_PAGEALLOC is not set 1012# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1027,12 +1023,14 @@ CONFIG_PPC_EARLY_DEBUG=y
1027# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 1023# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
1028# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 1024# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
1029# CONFIG_PPC_EARLY_DEBUG_44x is not set 1025# CONFIG_PPC_EARLY_DEBUG_44x is not set
1026# CONFIG_PPC_EARLY_DEBUG_CPM is not set
1030 1027
1031# 1028#
1032# Security options 1029# Security options
1033# 1030#
1034# CONFIG_KEYS is not set 1031# CONFIG_KEYS is not set
1035# CONFIG_SECURITY is not set 1032# CONFIG_SECURITY is not set
1033# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1036CONFIG_CRYPTO=y 1034CONFIG_CRYPTO=y
1037CONFIG_CRYPTO_ALGAPI=y 1035CONFIG_CRYPTO_ALGAPI=y
1038CONFIG_CRYPTO_BLKCIPHER=y 1036CONFIG_CRYPTO_BLKCIPHER=y
@@ -1052,6 +1050,7 @@ CONFIG_CRYPTO_ECB=m
1052CONFIG_CRYPTO_CBC=y 1050CONFIG_CRYPTO_CBC=y
1053CONFIG_CRYPTO_PCBC=m 1051CONFIG_CRYPTO_PCBC=m
1054# CONFIG_CRYPTO_LRW is not set 1052# CONFIG_CRYPTO_LRW is not set
1053# CONFIG_CRYPTO_XTS is not set
1055# CONFIG_CRYPTO_CRYPTD is not set 1054# CONFIG_CRYPTO_CRYPTD is not set
1056CONFIG_CRYPTO_DES=y 1055CONFIG_CRYPTO_DES=y
1057# CONFIG_CRYPTO_FCRYPT is not set 1056# CONFIG_CRYPTO_FCRYPT is not set
@@ -1065,9 +1064,13 @@ CONFIG_CRYPTO_DES=y
1065# CONFIG_CRYPTO_ARC4 is not set 1064# CONFIG_CRYPTO_ARC4 is not set
1066# CONFIG_CRYPTO_KHAZAD is not set 1065# CONFIG_CRYPTO_KHAZAD is not set
1067# CONFIG_CRYPTO_ANUBIS is not set 1066# CONFIG_CRYPTO_ANUBIS is not set
1067# CONFIG_CRYPTO_SEED is not set
1068# CONFIG_CRYPTO_DEFLATE is not set 1068# CONFIG_CRYPTO_DEFLATE is not set
1069# CONFIG_CRYPTO_MICHAEL_MIC is not set 1069# CONFIG_CRYPTO_MICHAEL_MIC is not set
1070# CONFIG_CRYPTO_CRC32C is not set 1070# CONFIG_CRYPTO_CRC32C is not set
1071# CONFIG_CRYPTO_CAMELLIA is not set 1071# CONFIG_CRYPTO_CAMELLIA is not set
1072# CONFIG_CRYPTO_TEST is not set 1072# CONFIG_CRYPTO_TEST is not set
1073# CONFIG_CRYPTO_AUTHENC is not set
1073CONFIG_CRYPTO_HW=y 1074CONFIG_CRYPTO_HW=y
1075# CONFIG_PPC_CLOCK is not set
1076CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig
index 4e85b2e88525..b40802d17e03 100644
--- a/arch/powerpc/configs/mpc8572_ds_defconfig
+++ b/arch/powerpc/configs/mpc8572_ds_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Sep 11 01:19:35 2007 4# Thu Dec 6 16:48:52 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_FSL_BOOKE=y
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -64,11 +69,14 @@ CONFIG_BSD_PROCESS_ACCT=y
64# CONFIG_BSD_PROCESS_ACCT_V3 is not set 69# CONFIG_BSD_PROCESS_ACCT_V3 is not set
65# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
67CONFIG_AUDIT=y 73CONFIG_AUDIT=y
68# CONFIG_AUDITSYSCALL is not set 74# CONFIG_AUDITSYSCALL is not set
69CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79# CONFIG_FAIR_GROUP_SCHED is not set
72CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
74CONFIG_BLK_DEV_INITRD=y 82CONFIG_BLK_DEV_INITRD=y
@@ -89,7 +97,6 @@ CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 98CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 101CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -156,6 +163,10 @@ CONFIG_FSL_ULI1575=y
156# Kernel options 163# Kernel options
157# 164#
158CONFIG_HIGHMEM=y 165CONFIG_HIGHMEM=y
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
159# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
160CONFIG_HZ_250=y 171CONFIG_HZ_250=y
161# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -177,6 +188,7 @@ CONFIG_FLATMEM_MANUAL=y
177CONFIG_FLATMEM=y 188CONFIG_FLATMEM=y
178CONFIG_FLAT_NODE_MEM_MAP=y 189CONFIG_FLAT_NODE_MEM_MAP=y
179# CONFIG_SPARSEMEM_STATIC is not set 190# CONFIG_SPARSEMEM_STATIC is not set
191# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
180CONFIG_SPLIT_PTLOCK_CPUS=4 192CONFIG_SPLIT_PTLOCK_CPUS=4
181# CONFIG_RESOURCES_64BIT is not set 193# CONFIG_RESOURCES_64BIT is not set
182CONFIG_ZONE_DMA_FLAG=1 194CONFIG_ZONE_DMA_FLAG=1
@@ -185,6 +197,8 @@ CONFIG_VIRT_TO_BUS=y
185CONFIG_PROC_DEVICETREE=y 197CONFIG_PROC_DEVICETREE=y
186# CONFIG_CMDLINE_BOOL is not set 198# CONFIG_CMDLINE_BOOL is not set
187# CONFIG_PM is not set 199# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
188CONFIG_SECCOMP=y 202CONFIG_SECCOMP=y
189CONFIG_WANT_DEVICE_TREE=y 203CONFIG_WANT_DEVICE_TREE=y
190CONFIG_DEVICE_TREE="" 204CONFIG_DEVICE_TREE=""
@@ -194,6 +208,7 @@ CONFIG_ISA_DMA_API=y
194# Bus options 208# Bus options
195# 209#
196CONFIG_ZONE_DMA=y 210CONFIG_ZONE_DMA=y
211CONFIG_GENERIC_ISA_DMA=y
197CONFIG_PPC_INDIRECT_PCI=y 212CONFIG_PPC_INDIRECT_PCI=y
198CONFIG_FSL_SOC=y 213CONFIG_FSL_SOC=y
199CONFIG_FSL_PCI=y 214CONFIG_FSL_PCI=y
@@ -203,11 +218,8 @@ CONFIG_PCI_SYSCALL=y
203# CONFIG_PCIEPORTBUS is not set 218# CONFIG_PCIEPORTBUS is not set
204CONFIG_ARCH_SUPPORTS_MSI=y 219CONFIG_ARCH_SUPPORTS_MSI=y
205# CONFIG_PCI_MSI is not set 220# CONFIG_PCI_MSI is not set
221CONFIG_PCI_LEGACY=y
206# CONFIG_PCI_DEBUG is not set 222# CONFIG_PCI_DEBUG is not set
207
208#
209# PCCARD (PCMCIA/CardBus) support
210#
211# CONFIG_PCCARD is not set 223# CONFIG_PCCARD is not set
212# CONFIG_HOTPLUG_PCI is not set 224# CONFIG_HOTPLUG_PCI is not set
213 225
@@ -222,7 +234,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
222CONFIG_HIGHMEM_START=0xfe000000 234CONFIG_HIGHMEM_START=0xfe000000
223CONFIG_LOWMEM_SIZE=0x30000000 235CONFIG_LOWMEM_SIZE=0x30000000
224CONFIG_KERNEL_START=0xc0000000 236CONFIG_KERNEL_START=0xc0000000
225CONFIG_TASK_SIZE=0x80000000 237CONFIG_TASK_SIZE=0xc0000000
226CONFIG_BOOT_LOAD=0x00800000 238CONFIG_BOOT_LOAD=0x00800000
227 239
228# 240#
@@ -271,6 +283,7 @@ CONFIG_INET_TUNNEL=y
271# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 283# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
272# CONFIG_INET_XFRM_MODE_TUNNEL is not set 284# CONFIG_INET_XFRM_MODE_TUNNEL is not set
273# CONFIG_INET_XFRM_MODE_BEET is not set 285# CONFIG_INET_XFRM_MODE_BEET is not set
286# CONFIG_INET_LRO is not set
274CONFIG_INET_DIAG=y 287CONFIG_INET_DIAG=y
275CONFIG_INET_TCP_DIAG=y 288CONFIG_INET_TCP_DIAG=y
276# CONFIG_TCP_CONG_ADVANCED is not set 289# CONFIG_TCP_CONG_ADVANCED is not set
@@ -315,10 +328,6 @@ CONFIG_SCTP_HMAC_MD5=y
315# CONFIG_LAPB is not set 328# CONFIG_LAPB is not set
316# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
318
319#
320# QoS and/or fair queueing
321#
322# CONFIG_NET_SCHED is not set 331# CONFIG_NET_SCHED is not set
323 332
324# 333#
@@ -348,6 +357,7 @@ CONFIG_FIB_RULES=y
348# 357#
349# Generic Driver Options 358# Generic Driver Options
350# 359#
360CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
351CONFIG_STANDALONE=y 361CONFIG_STANDALONE=y
352CONFIG_PREVENT_FIRMWARE_BUILD=y 362CONFIG_PREVENT_FIRMWARE_BUILD=y
353CONFIG_FW_LOADER=y 363CONFIG_FW_LOADER=y
@@ -420,6 +430,7 @@ CONFIG_SCSI_WAIT_SCAN=m
420# CONFIG_SCSI_FC_ATTRS is not set 430# CONFIG_SCSI_FC_ATTRS is not set
421# CONFIG_SCSI_ISCSI_ATTRS is not set 431# CONFIG_SCSI_ISCSI_ATTRS is not set
422# CONFIG_SCSI_SAS_LIBSAS is not set 432# CONFIG_SCSI_SAS_LIBSAS is not set
433# CONFIG_SCSI_SRP_ATTRS is not set
423CONFIG_SCSI_LOWLEVEL=y 434CONFIG_SCSI_LOWLEVEL=y
424# CONFIG_ISCSI_TCP is not set 435# CONFIG_ISCSI_TCP is not set
425# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 436# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -431,6 +442,7 @@ CONFIG_SCSI_LOWLEVEL=y
431# CONFIG_SCSI_AIC79XX is not set 442# CONFIG_SCSI_AIC79XX is not set
432# CONFIG_SCSI_AIC94XX is not set 443# CONFIG_SCSI_AIC94XX is not set
433# CONFIG_SCSI_DPT_I2O is not set 444# CONFIG_SCSI_DPT_I2O is not set
445# CONFIG_SCSI_ADVANSYS is not set
434# CONFIG_SCSI_ARCMSR is not set 446# CONFIG_SCSI_ARCMSR is not set
435# CONFIG_MEGARAID_NEWGEN is not set 447# CONFIG_MEGARAID_NEWGEN is not set
436# CONFIG_MEGARAID_LEGACY is not set 448# CONFIG_MEGARAID_LEGACY is not set
@@ -498,6 +510,7 @@ CONFIG_PATA_ALI=y
498# CONFIG_PATA_OLDPIIX is not set 510# CONFIG_PATA_OLDPIIX is not set
499# CONFIG_PATA_NETCELL is not set 511# CONFIG_PATA_NETCELL is not set
500# CONFIG_PATA_NS87410 is not set 512# CONFIG_PATA_NS87410 is not set
513# CONFIG_PATA_NS87415 is not set
501# CONFIG_PATA_OPTI is not set 514# CONFIG_PATA_OPTI is not set
502# CONFIG_PATA_OPTIDMA is not set 515# CONFIG_PATA_OPTIDMA is not set
503# CONFIG_PATA_PDC_OLD is not set 516# CONFIG_PATA_PDC_OLD is not set
@@ -512,14 +525,7 @@ CONFIG_PATA_ALI=y
512# CONFIG_PATA_WINBOND is not set 525# CONFIG_PATA_WINBOND is not set
513# CONFIG_PATA_PLATFORM is not set 526# CONFIG_PATA_PLATFORM is not set
514# CONFIG_MD is not set 527# CONFIG_MD is not set
515
516#
517# Fusion MPT device support
518#
519# CONFIG_FUSION is not set 528# CONFIG_FUSION is not set
520# CONFIG_FUSION_SPI is not set
521# CONFIG_FUSION_FC is not set
522# CONFIG_FUSION_SAS is not set
523 529
524# 530#
525# IEEE 1394 (FireWire) support 531# IEEE 1394 (FireWire) support
@@ -535,6 +541,8 @@ CONFIG_DUMMY=y
535# CONFIG_MACVLAN is not set 541# CONFIG_MACVLAN is not set
536# CONFIG_EQUALIZER is not set 542# CONFIG_EQUALIZER is not set
537# CONFIG_TUN is not set 543# CONFIG_TUN is not set
544# CONFIG_VETH is not set
545# CONFIG_IP1000 is not set
538# CONFIG_ARCNET is not set 546# CONFIG_ARCNET is not set
539CONFIG_PHYLIB=y 547CONFIG_PHYLIB=y
540 548
@@ -551,6 +559,7 @@ CONFIG_VITESSE_PHY=y
551# CONFIG_BROADCOM_PHY is not set 559# CONFIG_BROADCOM_PHY is not set
552# CONFIG_ICPLUS_PHY is not set 560# CONFIG_ICPLUS_PHY is not set
553# CONFIG_FIXED_PHY is not set 561# CONFIG_FIXED_PHY is not set
562# CONFIG_MDIO_BITBANG is not set
554CONFIG_NET_ETHERNET=y 563CONFIG_NET_ETHERNET=y
555CONFIG_MII=y 564CONFIG_MII=y
556# CONFIG_HAPPYMEAL is not set 565# CONFIG_HAPPYMEAL is not set
@@ -559,11 +568,17 @@ CONFIG_MII=y
559# CONFIG_NET_VENDOR_3COM is not set 568# CONFIG_NET_VENDOR_3COM is not set
560# CONFIG_NET_TULIP is not set 569# CONFIG_NET_TULIP is not set
561# CONFIG_HP100 is not set 570# CONFIG_HP100 is not set
571# CONFIG_IBM_NEW_EMAC_ZMII is not set
572# CONFIG_IBM_NEW_EMAC_RGMII is not set
573# CONFIG_IBM_NEW_EMAC_TAH is not set
574# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
562# CONFIG_NET_PCI is not set 575# CONFIG_NET_PCI is not set
576# CONFIG_B44 is not set
563CONFIG_NETDEV_1000=y 577CONFIG_NETDEV_1000=y
564# CONFIG_ACENIC is not set 578# CONFIG_ACENIC is not set
565# CONFIG_DL2K is not set 579# CONFIG_DL2K is not set
566# CONFIG_E1000 is not set 580# CONFIG_E1000 is not set
581# CONFIG_E1000E is not set
567# CONFIG_NS83820 is not set 582# CONFIG_NS83820 is not set
568# CONFIG_HAMACHI is not set 583# CONFIG_HAMACHI is not set
569# CONFIG_YELLOWFIN is not set 584# CONFIG_YELLOWFIN is not set
@@ -571,6 +586,7 @@ CONFIG_NETDEV_1000=y
571# CONFIG_SIS190 is not set 586# CONFIG_SIS190 is not set
572# CONFIG_SKGE is not set 587# CONFIG_SKGE is not set
573# CONFIG_SKY2 is not set 588# CONFIG_SKY2 is not set
589# CONFIG_SK98LIN is not set
574# CONFIG_VIA_VELOCITY is not set 590# CONFIG_VIA_VELOCITY is not set
575# CONFIG_TIGON3 is not set 591# CONFIG_TIGON3 is not set
576# CONFIG_BNX2 is not set 592# CONFIG_BNX2 is not set
@@ -581,11 +597,14 @@ CONFIG_GFAR_NAPI=y
581CONFIG_NETDEV_10000=y 597CONFIG_NETDEV_10000=y
582# CONFIG_CHELSIO_T1 is not set 598# CONFIG_CHELSIO_T1 is not set
583# CONFIG_CHELSIO_T3 is not set 599# CONFIG_CHELSIO_T3 is not set
600# CONFIG_IXGBE is not set
584# CONFIG_IXGB is not set 601# CONFIG_IXGB is not set
585# CONFIG_S2IO is not set 602# CONFIG_S2IO is not set
586# CONFIG_MYRI10GE is not set 603# CONFIG_MYRI10GE is not set
587# CONFIG_NETXEN_NIC is not set 604# CONFIG_NETXEN_NIC is not set
605# CONFIG_NIU is not set
588# CONFIG_MLX4_CORE is not set 606# CONFIG_MLX4_CORE is not set
607# CONFIG_TEHUTI is not set
589# CONFIG_TR is not set 608# CONFIG_TR is not set
590 609
591# 610#
@@ -601,7 +620,6 @@ CONFIG_NETDEV_10000=y
601# CONFIG_USB_KAWETH is not set 620# CONFIG_USB_KAWETH is not set
602# CONFIG_USB_PEGASUS is not set 621# CONFIG_USB_PEGASUS is not set
603# CONFIG_USB_RTL8150 is not set 622# CONFIG_USB_RTL8150 is not set
604# CONFIG_USB_USBNET_MII is not set
605# CONFIG_USB_USBNET is not set 623# CONFIG_USB_USBNET is not set
606# CONFIG_WAN is not set 624# CONFIG_WAN is not set
607# CONFIG_FDDI is not set 625# CONFIG_FDDI is not set
@@ -628,7 +646,6 @@ CONFIG_INPUT=y
628# 646#
629# CONFIG_INPUT_MOUSEDEV is not set 647# CONFIG_INPUT_MOUSEDEV is not set
630# CONFIG_INPUT_JOYDEV is not set 648# CONFIG_INPUT_JOYDEV is not set
631# CONFIG_INPUT_TSDEV is not set
632# CONFIG_INPUT_EVDEV is not set 649# CONFIG_INPUT_EVDEV is not set
633# CONFIG_INPUT_EVBUG is not set 650# CONFIG_INPUT_EVBUG is not set
634 651
@@ -688,15 +705,12 @@ CONFIG_UNIX98_PTYS=y
688CONFIG_LEGACY_PTYS=y 705CONFIG_LEGACY_PTYS=y
689CONFIG_LEGACY_PTY_COUNT=256 706CONFIG_LEGACY_PTY_COUNT=256
690# CONFIG_IPMI_HANDLER is not set 707# CONFIG_IPMI_HANDLER is not set
691# CONFIG_WATCHDOG is not set
692# CONFIG_HW_RANDOM is not set 708# CONFIG_HW_RANDOM is not set
693CONFIG_NVRAM=y 709CONFIG_NVRAM=y
694CONFIG_GEN_RTC=y 710CONFIG_GEN_RTC=y
695CONFIG_GEN_RTC_X=y 711CONFIG_GEN_RTC_X=y
696# CONFIG_R3964 is not set 712# CONFIG_R3964 is not set
697# CONFIG_APPLICOM is not set 713# CONFIG_APPLICOM is not set
698# CONFIG_AGP is not set
699# CONFIG_DRM is not set
700# CONFIG_RAW_DRIVER is not set 714# CONFIG_RAW_DRIVER is not set
701# CONFIG_TCG_TPM is not set 715# CONFIG_TCG_TPM is not set
702CONFIG_DEVPORT=y 716CONFIG_DEVPORT=y
@@ -765,6 +779,13 @@ CONFIG_SENSORS_EEPROM=y
765# CONFIG_W1 is not set 779# CONFIG_W1 is not set
766# CONFIG_POWER_SUPPLY is not set 780# CONFIG_POWER_SUPPLY is not set
767# CONFIG_HWMON is not set 781# CONFIG_HWMON is not set
782# CONFIG_WATCHDOG is not set
783
784#
785# Sonics Silicon Backplane
786#
787CONFIG_SSB_POSSIBLE=y
788# CONFIG_SSB is not set
768 789
769# 790#
770# Multifunction device drivers 791# Multifunction device drivers
@@ -859,6 +880,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
859# CONFIG_DVB_OR51132 is not set 880# CONFIG_DVB_OR51132 is not set
860# CONFIG_DVB_BCM3510 is not set 881# CONFIG_DVB_BCM3510 is not set
861# CONFIG_DVB_LGDT330X is not set 882# CONFIG_DVB_LGDT330X is not set
883# CONFIG_DVB_S5H1409 is not set
862 884
863# 885#
864# Tuners/PLL support 886# Tuners/PLL support
@@ -868,6 +890,9 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
868# CONFIG_DVB_TDA827X is not set 890# CONFIG_DVB_TDA827X is not set
869# CONFIG_DVB_TUNER_QT1010 is not set 891# CONFIG_DVB_TUNER_QT1010 is not set
870# CONFIG_DVB_TUNER_MT2060 is not set 892# CONFIG_DVB_TUNER_MT2060 is not set
893# CONFIG_DVB_TUNER_MT2266 is not set
894# CONFIG_DVB_TUNER_MT2131 is not set
895# CONFIG_DVB_TUNER_DIB0070 is not set
871 896
872# 897#
873# Miscellaneous devices 898# Miscellaneous devices
@@ -881,16 +906,17 @@ CONFIG_DAB=y
881# 906#
882# Graphics support 907# Graphics support
883# 908#
909# CONFIG_AGP is not set
910# CONFIG_DRM is not set
911# CONFIG_VGASTATE is not set
912CONFIG_VIDEO_OUTPUT_CONTROL=y
913# CONFIG_FB is not set
884# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 914# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
885 915
886# 916#
887# Display device support 917# Display device support
888# 918#
889# CONFIG_DISPLAY_SUPPORT is not set 919# CONFIG_DISPLAY_SUPPORT is not set
890# CONFIG_VGASTATE is not set
891CONFIG_VIDEO_OUTPUT_CONTROL=y
892# CONFIG_FB is not set
893# CONFIG_FB_IBM_GXT4500 is not set
894 920
895# 921#
896# Console display driver support 922# Console display driver support
@@ -1022,6 +1048,7 @@ CONFIG_AC97_BUS=y
1022CONFIG_HID_SUPPORT=y 1048CONFIG_HID_SUPPORT=y
1023CONFIG_HID=y 1049CONFIG_HID=y
1024# CONFIG_HID_DEBUG is not set 1050# CONFIG_HID_DEBUG is not set
1051# CONFIG_HIDRAW is not set
1025 1052
1026# 1053#
1027# USB Input Devices 1054# USB Input Devices
@@ -1082,6 +1109,7 @@ CONFIG_USB_STORAGE=y
1082# CONFIG_USB_STORAGE_DEBUG is not set 1109# CONFIG_USB_STORAGE_DEBUG is not set
1083# CONFIG_USB_STORAGE_DATAFAB is not set 1110# CONFIG_USB_STORAGE_DATAFAB is not set
1084# CONFIG_USB_STORAGE_FREECOM is not set 1111# CONFIG_USB_STORAGE_FREECOM is not set
1112# CONFIG_USB_STORAGE_ISD200 is not set
1085# CONFIG_USB_STORAGE_DPCM is not set 1113# CONFIG_USB_STORAGE_DPCM is not set
1086# CONFIG_USB_STORAGE_USBAT is not set 1114# CONFIG_USB_STORAGE_USBAT is not set
1087# CONFIG_USB_STORAGE_SDDR09 is not set 1115# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -1162,6 +1190,7 @@ CONFIG_RTC_INTF_DEV=y
1162# I2C RTC drivers 1190# I2C RTC drivers
1163# 1191#
1164# CONFIG_RTC_DRV_DS1307 is not set 1192# CONFIG_RTC_DRV_DS1307 is not set
1193# CONFIG_RTC_DRV_DS1374 is not set
1165# CONFIG_RTC_DRV_DS1672 is not set 1194# CONFIG_RTC_DRV_DS1672 is not set
1166# CONFIG_RTC_DRV_MAX6900 is not set 1195# CONFIG_RTC_DRV_MAX6900 is not set
1167# CONFIG_RTC_DRV_RS5C372 is not set 1196# CONFIG_RTC_DRV_RS5C372 is not set
@@ -1191,19 +1220,6 @@ CONFIG_RTC_DRV_CMOS=y
1191# 1220#
1192 1221
1193# 1222#
1194# DMA Engine support
1195#
1196# CONFIG_DMA_ENGINE is not set
1197
1198#
1199# DMA Clients
1200#
1201
1202#
1203# DMA Devices
1204#
1205
1206#
1207# Userspace I/O 1223# Userspace I/O
1208# 1224#
1209# CONFIG_UIO is not set 1225# CONFIG_UIO is not set
@@ -1220,7 +1236,6 @@ CONFIG_EXT3_FS_XATTR=y
1220# CONFIG_EXT3_FS_SECURITY is not set 1236# CONFIG_EXT3_FS_SECURITY is not set
1221# CONFIG_EXT4DEV_FS is not set 1237# CONFIG_EXT4DEV_FS is not set
1222CONFIG_JBD=y 1238CONFIG_JBD=y
1223# CONFIG_JBD_DEBUG is not set
1224CONFIG_FS_MBCACHE=y 1239CONFIG_FS_MBCACHE=y
1225# CONFIG_REISERFS_FS is not set 1240# CONFIG_REISERFS_FS is not set
1226# CONFIG_JFS_FS is not set 1241# CONFIG_JFS_FS is not set
@@ -1269,7 +1284,6 @@ CONFIG_SYSFS=y
1269CONFIG_TMPFS=y 1284CONFIG_TMPFS=y
1270# CONFIG_TMPFS_POSIX_ACL is not set 1285# CONFIG_TMPFS_POSIX_ACL is not set
1271# CONFIG_HUGETLB_PAGE is not set 1286# CONFIG_HUGETLB_PAGE is not set
1272CONFIG_RAMFS=y
1273# CONFIG_CONFIGFS_FS is not set 1287# CONFIG_CONFIGFS_FS is not set
1274 1288
1275# 1289#
@@ -1292,10 +1306,7 @@ CONFIG_SYSV_FS=m
1292CONFIG_UFS_FS=m 1306CONFIG_UFS_FS=m
1293# CONFIG_UFS_FS_WRITE is not set 1307# CONFIG_UFS_FS_WRITE is not set
1294# CONFIG_UFS_DEBUG is not set 1308# CONFIG_UFS_DEBUG is not set
1295 1309CONFIG_NETWORK_FILESYSTEMS=y
1296#
1297# Network File Systems
1298#
1299CONFIG_NFS_FS=y 1310CONFIG_NFS_FS=y
1300CONFIG_NFS_V3=y 1311CONFIG_NFS_V3=y
1301# CONFIG_NFS_V3_ACL is not set 1312# CONFIG_NFS_V3_ACL is not set
@@ -1341,10 +1352,6 @@ CONFIG_MSDOS_PARTITION=y
1341# CONFIG_KARMA_PARTITION is not set 1352# CONFIG_KARMA_PARTITION is not set
1342# CONFIG_EFI_PARTITION is not set 1353# CONFIG_EFI_PARTITION is not set
1343# CONFIG_SYSV68_PARTITION is not set 1354# CONFIG_SYSV68_PARTITION is not set
1344
1345#
1346# Native Language Support
1347#
1348CONFIG_NLS=y 1355CONFIG_NLS=y
1349CONFIG_NLS_DEFAULT="iso8859-1" 1356CONFIG_NLS_DEFAULT="iso8859-1"
1350# CONFIG_NLS_CODEPAGE_437 is not set 1357# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1385,10 +1392,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1385# CONFIG_NLS_KOI8_R is not set 1392# CONFIG_NLS_KOI8_R is not set
1386# CONFIG_NLS_KOI8_U is not set 1393# CONFIG_NLS_KOI8_U is not set
1387CONFIG_NLS_UTF8=m 1394CONFIG_NLS_UTF8=m
1388
1389#
1390# Distributed Lock Manager
1391#
1392# CONFIG_DLM is not set 1395# CONFIG_DLM is not set
1393# CONFIG_UCC_SLOW is not set 1396# CONFIG_UCC_SLOW is not set
1394 1397
@@ -1407,16 +1410,13 @@ CONFIG_PLIST=y
1407CONFIG_HAS_IOMEM=y 1410CONFIG_HAS_IOMEM=y
1408CONFIG_HAS_IOPORT=y 1411CONFIG_HAS_IOPORT=y
1409CONFIG_HAS_DMA=y 1412CONFIG_HAS_DMA=y
1410 1413# CONFIG_INSTRUMENTATION is not set
1411#
1412# Instrumentation Support
1413#
1414# CONFIG_PROFILING is not set
1415 1414
1416# 1415#
1417# Kernel hacking 1416# Kernel hacking
1418# 1417#
1419# CONFIG_PRINTK_TIME is not set 1418# CONFIG_PRINTK_TIME is not set
1419CONFIG_ENABLE_WARN_DEPRECATED=y
1420CONFIG_ENABLE_MUST_CHECK=y 1420CONFIG_ENABLE_MUST_CHECK=y
1421# CONFIG_MAGIC_SYSRQ is not set 1421# CONFIG_MAGIC_SYSRQ is not set
1422# CONFIG_UNUSED_SYMBOLS is not set 1422# CONFIG_UNUSED_SYMBOLS is not set
@@ -1441,9 +1441,12 @@ CONFIG_SCHED_DEBUG=y
1441CONFIG_DEBUG_INFO=y 1441CONFIG_DEBUG_INFO=y
1442# CONFIG_DEBUG_VM is not set 1442# CONFIG_DEBUG_VM is not set
1443# CONFIG_DEBUG_LIST is not set 1443# CONFIG_DEBUG_LIST is not set
1444# CONFIG_DEBUG_SG is not set
1444CONFIG_FORCED_INLINING=y 1445CONFIG_FORCED_INLINING=y
1446# CONFIG_BOOT_PRINTK_DELAY is not set
1445# CONFIG_RCU_TORTURE_TEST is not set 1447# CONFIG_RCU_TORTURE_TEST is not set
1446# CONFIG_FAULT_INJECTION is not set 1448# CONFIG_FAULT_INJECTION is not set
1449# CONFIG_SAMPLES is not set
1447# CONFIG_DEBUG_STACKOVERFLOW is not set 1450# CONFIG_DEBUG_STACKOVERFLOW is not set
1448# CONFIG_DEBUG_STACK_USAGE is not set 1451# CONFIG_DEBUG_STACK_USAGE is not set
1449# CONFIG_DEBUG_PAGEALLOC is not set 1452# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1456,6 +1459,7 @@ CONFIG_FORCED_INLINING=y
1456# 1459#
1457# CONFIG_KEYS is not set 1460# CONFIG_KEYS is not set
1458# CONFIG_SECURITY is not set 1461# CONFIG_SECURITY is not set
1462# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1459CONFIG_CRYPTO=y 1463CONFIG_CRYPTO=y
1460CONFIG_CRYPTO_ALGAPI=y 1464CONFIG_CRYPTO_ALGAPI=y
1461CONFIG_CRYPTO_BLKCIPHER=y 1465CONFIG_CRYPTO_BLKCIPHER=y
@@ -1466,7 +1470,7 @@ CONFIG_CRYPTO_HMAC=y
1466# CONFIG_CRYPTO_NULL is not set 1470# CONFIG_CRYPTO_NULL is not set
1467# CONFIG_CRYPTO_MD4 is not set 1471# CONFIG_CRYPTO_MD4 is not set
1468CONFIG_CRYPTO_MD5=y 1472CONFIG_CRYPTO_MD5=y
1469# CONFIG_CRYPTO_SHA1 is not set 1473CONFIG_CRYPTO_SHA1=m
1470# CONFIG_CRYPTO_SHA256 is not set 1474# CONFIG_CRYPTO_SHA256 is not set
1471# CONFIG_CRYPTO_SHA512 is not set 1475# CONFIG_CRYPTO_SHA512 is not set
1472# CONFIG_CRYPTO_WP512 is not set 1476# CONFIG_CRYPTO_WP512 is not set
@@ -1476,6 +1480,7 @@ CONFIG_CRYPTO_MD5=y
1476CONFIG_CRYPTO_CBC=y 1480CONFIG_CRYPTO_CBC=y
1477CONFIG_CRYPTO_PCBC=m 1481CONFIG_CRYPTO_PCBC=m
1478# CONFIG_CRYPTO_LRW is not set 1482# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_XTS is not set
1479# CONFIG_CRYPTO_CRYPTD is not set 1484# CONFIG_CRYPTO_CRYPTD is not set
1480CONFIG_CRYPTO_DES=y 1485CONFIG_CRYPTO_DES=y
1481# CONFIG_CRYPTO_FCRYPT is not set 1486# CONFIG_CRYPTO_FCRYPT is not set
@@ -1489,9 +1494,12 @@ CONFIG_CRYPTO_DES=y
1489# CONFIG_CRYPTO_ARC4 is not set 1494# CONFIG_CRYPTO_ARC4 is not set
1490# CONFIG_CRYPTO_KHAZAD is not set 1495# CONFIG_CRYPTO_KHAZAD is not set
1491# CONFIG_CRYPTO_ANUBIS is not set 1496# CONFIG_CRYPTO_ANUBIS is not set
1497# CONFIG_CRYPTO_SEED is not set
1492# CONFIG_CRYPTO_DEFLATE is not set 1498# CONFIG_CRYPTO_DEFLATE is not set
1493# CONFIG_CRYPTO_MICHAEL_MIC is not set 1499# CONFIG_CRYPTO_MICHAEL_MIC is not set
1494# CONFIG_CRYPTO_CRC32C is not set 1500# CONFIG_CRYPTO_CRC32C is not set
1495# CONFIG_CRYPTO_CAMELLIA is not set 1501# CONFIG_CRYPTO_CAMELLIA is not set
1496# CONFIG_CRYPTO_TEST is not set 1502# CONFIG_CRYPTO_TEST is not set
1503# CONFIG_CRYPTO_AUTHENC is not set
1497CONFIG_CRYPTO_HW=y 1504CONFIG_CRYPTO_HW=y
1505# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index a4f33d110542..2f9ad589b004 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:43 2007 4# Thu Dec 6 16:48:54 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_FSL_BOOKE=y
22CONFIG_SPE=y 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,9 +68,12 @@ CONFIG_SYSVIPC_SYSCTL=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
65# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
68CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76# CONFIG_FAIR_GROUP_SCHED is not set
69CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
71CONFIG_BLK_DEV_INITRD=y 79CONFIG_BLK_DEV_INITRD=y
@@ -86,7 +94,6 @@ CONFIG_FUTEX=y
86CONFIG_ANON_INODES=y 94CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 95CONFIG_EPOLL=y
88CONFIG_SIGNALFD=y 96CONFIG_SIGNALFD=y
89CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 98CONFIG_SHMEM=y
92CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
@@ -129,7 +136,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
129# CONFIG_MPC8560_ADS is not set 136# CONFIG_MPC8560_ADS is not set
130CONFIG_MPC85xx_CDS=y 137CONFIG_MPC85xx_CDS=y
131# CONFIG_MPC85xx_MDS is not set 138# CONFIG_MPC85xx_MDS is not set
132# CONFIG_MPC8544_DS is not set 139# CONFIG_MPC85xx_DS is not set
133CONFIG_MPC8540=y 140CONFIG_MPC8540=y
134CONFIG_MPC85xx=y 141CONFIG_MPC85xx=y
135CONFIG_MPIC=y 142CONFIG_MPIC=y
@@ -149,6 +156,10 @@ CONFIG_PPC_I8259=y
149# Kernel options 156# Kernel options
150# 157#
151# CONFIG_HIGHMEM is not set 158# CONFIG_HIGHMEM is not set
159CONFIG_TICK_ONESHOT=y
160CONFIG_NO_HZ=y
161CONFIG_HIGH_RES_TIMERS=y
162CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
152# CONFIG_HZ_100 is not set 163# CONFIG_HZ_100 is not set
153CONFIG_HZ_250=y 164CONFIG_HZ_250=y
154# CONFIG_HZ_300 is not set 165# CONFIG_HZ_300 is not set
@@ -170,6 +181,7 @@ CONFIG_FLATMEM_MANUAL=y
170CONFIG_FLATMEM=y 181CONFIG_FLATMEM=y
171CONFIG_FLAT_NODE_MEM_MAP=y 182CONFIG_FLAT_NODE_MEM_MAP=y
172# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
184# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
173CONFIG_SPLIT_PTLOCK_CPUS=4 185CONFIG_SPLIT_PTLOCK_CPUS=4
174# CONFIG_RESOURCES_64BIT is not set 186# CONFIG_RESOURCES_64BIT is not set
175CONFIG_ZONE_DMA_FLAG=1 187CONFIG_ZONE_DMA_FLAG=1
@@ -178,6 +190,8 @@ CONFIG_VIRT_TO_BUS=y
178CONFIG_PROC_DEVICETREE=y 190CONFIG_PROC_DEVICETREE=y
179# CONFIG_CMDLINE_BOOL is not set 191# CONFIG_CMDLINE_BOOL is not set
180# CONFIG_PM is not set 192# CONFIG_PM is not set
193CONFIG_SUSPEND_UP_POSSIBLE=y
194CONFIG_HIBERNATION_UP_POSSIBLE=y
181# CONFIG_SECCOMP is not set 195# CONFIG_SECCOMP is not set
182CONFIG_WANT_DEVICE_TREE=y 196CONFIG_WANT_DEVICE_TREE=y
183CONFIG_DEVICE_TREE="" 197CONFIG_DEVICE_TREE=""
@@ -196,11 +210,8 @@ CONFIG_PCI_SYSCALL=y
196# CONFIG_PCIEPORTBUS is not set 210# CONFIG_PCIEPORTBUS is not set
197CONFIG_ARCH_SUPPORTS_MSI=y 211CONFIG_ARCH_SUPPORTS_MSI=y
198# CONFIG_PCI_MSI is not set 212# CONFIG_PCI_MSI is not set
213CONFIG_PCI_LEGACY=y
199# CONFIG_PCI_DEBUG is not set 214# CONFIG_PCI_DEBUG is not set
200
201#
202# PCCARD (PCMCIA/CardBus) support
203#
204# CONFIG_PCCARD is not set 215# CONFIG_PCCARD is not set
205# CONFIG_HOTPLUG_PCI is not set 216# CONFIG_HOTPLUG_PCI is not set
206 217
@@ -215,7 +226,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
215CONFIG_HIGHMEM_START=0xfe000000 226CONFIG_HIGHMEM_START=0xfe000000
216CONFIG_LOWMEM_SIZE=0x30000000 227CONFIG_LOWMEM_SIZE=0x30000000
217CONFIG_KERNEL_START=0xc0000000 228CONFIG_KERNEL_START=0xc0000000
218CONFIG_TASK_SIZE=0x80000000 229CONFIG_TASK_SIZE=0xc0000000
219CONFIG_BOOT_LOAD=0x00800000 230CONFIG_BOOT_LOAD=0x00800000
220 231
221# 232#
@@ -255,6 +266,7 @@ CONFIG_SYN_COOKIES=y
255CONFIG_INET_XFRM_MODE_TRANSPORT=y 266CONFIG_INET_XFRM_MODE_TRANSPORT=y
256CONFIG_INET_XFRM_MODE_TUNNEL=y 267CONFIG_INET_XFRM_MODE_TUNNEL=y
257CONFIG_INET_XFRM_MODE_BEET=y 268CONFIG_INET_XFRM_MODE_BEET=y
269# CONFIG_INET_LRO is not set
258CONFIG_INET_DIAG=y 270CONFIG_INET_DIAG=y
259CONFIG_INET_TCP_DIAG=y 271CONFIG_INET_TCP_DIAG=y
260# CONFIG_TCP_CONG_ADVANCED is not set 272# CONFIG_TCP_CONG_ADVANCED is not set
@@ -280,10 +292,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
280# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
281# CONFIG_ECONET is not set 293# CONFIG_ECONET is not set
282# CONFIG_WAN_ROUTER is not set 294# CONFIG_WAN_ROUTER is not set
283
284#
285# QoS and/or fair queueing
286#
287# CONFIG_NET_SCHED is not set 295# CONFIG_NET_SCHED is not set
288 296
289# 297#
@@ -312,6 +320,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
312# 320#
313# Generic Driver Options 321# Generic Driver Options
314# 322#
323CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
315CONFIG_STANDALONE=y 324CONFIG_STANDALONE=y
316CONFIG_PREVENT_FIRMWARE_BUILD=y 325CONFIG_PREVENT_FIRMWARE_BUILD=y
317# CONFIG_FW_LOADER is not set 326# CONFIG_FW_LOADER is not set
@@ -364,6 +373,11 @@ CONFIG_IDE_PROC_FS=y
364# IDE chipset support/bugfixes 373# IDE chipset support/bugfixes
365# 374#
366CONFIG_IDE_GENERIC=y 375CONFIG_IDE_GENERIC=y
376# CONFIG_BLK_DEV_PLATFORM is not set
377
378#
379# PCI IDE chipsets support
380#
367CONFIG_BLK_DEV_IDEPCI=y 381CONFIG_BLK_DEV_IDEPCI=y
368CONFIG_IDEPCI_SHARE_IRQ=y 382CONFIG_IDEPCI_SHARE_IRQ=y
369CONFIG_IDEPCI_PCIBUS_ORDER=y 383CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -371,8 +385,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
371CONFIG_BLK_DEV_GENERIC=y 385CONFIG_BLK_DEV_GENERIC=y
372# CONFIG_BLK_DEV_OPTI621 is not set 386# CONFIG_BLK_DEV_OPTI621 is not set
373CONFIG_BLK_DEV_IDEDMA_PCI=y 387CONFIG_BLK_DEV_IDEDMA_PCI=y
374# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
375# CONFIG_IDEDMA_ONLYDISK is not set
376# CONFIG_BLK_DEV_AEC62XX is not set 388# CONFIG_BLK_DEV_AEC62XX is not set
377# CONFIG_BLK_DEV_ALI15X3 is not set 389# CONFIG_BLK_DEV_ALI15X3 is not set
378# CONFIG_BLK_DEV_AMD74XX is not set 390# CONFIG_BLK_DEV_AMD74XX is not set
@@ -400,7 +412,7 @@ CONFIG_BLK_DEV_VIA82CXXX=y
400# CONFIG_BLK_DEV_TC86C001 is not set 412# CONFIG_BLK_DEV_TC86C001 is not set
401# CONFIG_IDE_ARM is not set 413# CONFIG_IDE_ARM is not set
402CONFIG_BLK_DEV_IDEDMA=y 414CONFIG_BLK_DEV_IDEDMA=y
403# CONFIG_IDEDMA_IVB is not set 415CONFIG_IDE_ARCH_OBSOLETE_INIT=y
404# CONFIG_BLK_DEV_HD is not set 416# CONFIG_BLK_DEV_HD is not set
405 417
406# 418#
@@ -412,10 +424,6 @@ CONFIG_BLK_DEV_IDEDMA=y
412# CONFIG_SCSI_NETLINK is not set 424# CONFIG_SCSI_NETLINK is not set
413# CONFIG_ATA is not set 425# CONFIG_ATA is not set
414# CONFIG_MD is not set 426# CONFIG_MD is not set
415
416#
417# Fusion MPT device support
418#
419# CONFIG_FUSION is not set 427# CONFIG_FUSION is not set
420 428
421# 429#
@@ -432,6 +440,8 @@ CONFIG_NETDEVICES=y
432# CONFIG_MACVLAN is not set 440# CONFIG_MACVLAN is not set
433# CONFIG_EQUALIZER is not set 441# CONFIG_EQUALIZER is not set
434# CONFIG_TUN is not set 442# CONFIG_TUN is not set
443# CONFIG_VETH is not set
444# CONFIG_IP1000 is not set
435# CONFIG_ARCNET is not set 445# CONFIG_ARCNET is not set
436CONFIG_PHYLIB=y 446CONFIG_PHYLIB=y
437 447
@@ -448,6 +458,7 @@ CONFIG_PHYLIB=y
448# CONFIG_BROADCOM_PHY is not set 458# CONFIG_BROADCOM_PHY is not set
449# CONFIG_ICPLUS_PHY is not set 459# CONFIG_ICPLUS_PHY is not set
450# CONFIG_FIXED_PHY is not set 460# CONFIG_FIXED_PHY is not set
461# CONFIG_MDIO_BITBANG is not set
451CONFIG_NET_ETHERNET=y 462CONFIG_NET_ETHERNET=y
452CONFIG_MII=y 463CONFIG_MII=y
453# CONFIG_HAPPYMEAL is not set 464# CONFIG_HAPPYMEAL is not set
@@ -456,13 +467,19 @@ CONFIG_MII=y
456# CONFIG_NET_VENDOR_3COM is not set 467# CONFIG_NET_VENDOR_3COM is not set
457# CONFIG_NET_TULIP is not set 468# CONFIG_NET_TULIP is not set
458# CONFIG_HP100 is not set 469# CONFIG_HP100 is not set
470# CONFIG_IBM_NEW_EMAC_ZMII is not set
471# CONFIG_IBM_NEW_EMAC_RGMII is not set
472# CONFIG_IBM_NEW_EMAC_TAH is not set
473# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
459# CONFIG_NET_PCI is not set 474# CONFIG_NET_PCI is not set
475# CONFIG_B44 is not set
460CONFIG_NETDEV_1000=y 476CONFIG_NETDEV_1000=y
461# CONFIG_ACENIC is not set 477# CONFIG_ACENIC is not set
462# CONFIG_DL2K is not set 478# CONFIG_DL2K is not set
463CONFIG_E1000=y 479CONFIG_E1000=y
464CONFIG_E1000_NAPI=y 480CONFIG_E1000_NAPI=y
465# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 481# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
482# CONFIG_E1000E is not set
466# CONFIG_NS83820 is not set 483# CONFIG_NS83820 is not set
467# CONFIG_HAMACHI is not set 484# CONFIG_HAMACHI is not set
468# CONFIG_YELLOWFIN is not set 485# CONFIG_YELLOWFIN is not set
@@ -470,6 +487,7 @@ CONFIG_E1000_NAPI=y
470# CONFIG_SIS190 is not set 487# CONFIG_SIS190 is not set
471# CONFIG_SKGE is not set 488# CONFIG_SKGE is not set
472# CONFIG_SKY2 is not set 489# CONFIG_SKY2 is not set
490# CONFIG_SK98LIN is not set
473# CONFIG_VIA_VELOCITY is not set 491# CONFIG_VIA_VELOCITY is not set
474# CONFIG_TIGON3 is not set 492# CONFIG_TIGON3 is not set
475# CONFIG_BNX2 is not set 493# CONFIG_BNX2 is not set
@@ -480,11 +498,14 @@ CONFIG_GFAR_NAPI=y
480CONFIG_NETDEV_10000=y 498CONFIG_NETDEV_10000=y
481# CONFIG_CHELSIO_T1 is not set 499# CONFIG_CHELSIO_T1 is not set
482# CONFIG_CHELSIO_T3 is not set 500# CONFIG_CHELSIO_T3 is not set
501# CONFIG_IXGBE is not set
483# CONFIG_IXGB is not set 502# CONFIG_IXGB is not set
484# CONFIG_S2IO is not set 503# CONFIG_S2IO is not set
485# CONFIG_MYRI10GE is not set 504# CONFIG_MYRI10GE is not set
486# CONFIG_NETXEN_NIC is not set 505# CONFIG_NETXEN_NIC is not set
506# CONFIG_NIU is not set
487# CONFIG_MLX4_CORE is not set 507# CONFIG_MLX4_CORE is not set
508# CONFIG_TEHUTI is not set
488# CONFIG_TR is not set 509# CONFIG_TR is not set
489 510
490# 511#
@@ -516,7 +537,6 @@ CONFIG_INPUT=y
516# 537#
517# CONFIG_INPUT_MOUSEDEV is not set 538# CONFIG_INPUT_MOUSEDEV is not set
518# CONFIG_INPUT_JOYDEV is not set 539# CONFIG_INPUT_JOYDEV is not set
519# CONFIG_INPUT_TSDEV is not set
520# CONFIG_INPUT_EVDEV is not set 540# CONFIG_INPUT_EVDEV is not set
521# CONFIG_INPUT_EVBUG is not set 541# CONFIG_INPUT_EVBUG is not set
522 542
@@ -565,15 +585,12 @@ CONFIG_UNIX98_PTYS=y
565CONFIG_LEGACY_PTYS=y 585CONFIG_LEGACY_PTYS=y
566CONFIG_LEGACY_PTY_COUNT=256 586CONFIG_LEGACY_PTY_COUNT=256
567# CONFIG_IPMI_HANDLER is not set 587# CONFIG_IPMI_HANDLER is not set
568# CONFIG_WATCHDOG is not set
569# CONFIG_HW_RANDOM is not set 588# CONFIG_HW_RANDOM is not set
570# CONFIG_NVRAM is not set 589# CONFIG_NVRAM is not set
571CONFIG_GEN_RTC=y 590CONFIG_GEN_RTC=y
572# CONFIG_GEN_RTC_X is not set 591# CONFIG_GEN_RTC_X is not set
573# CONFIG_R3964 is not set 592# CONFIG_R3964 is not set
574# CONFIG_APPLICOM is not set 593# CONFIG_APPLICOM is not set
575# CONFIG_AGP is not set
576# CONFIG_DRM is not set
577# CONFIG_RAW_DRIVER is not set 594# CONFIG_RAW_DRIVER is not set
578# CONFIG_TCG_TPM is not set 595# CONFIG_TCG_TPM is not set
579CONFIG_DEVPORT=y 596CONFIG_DEVPORT=y
@@ -588,9 +605,9 @@ CONFIG_DEVPORT=y
588# CONFIG_POWER_SUPPLY is not set 605# CONFIG_POWER_SUPPLY is not set
589CONFIG_HWMON=y 606CONFIG_HWMON=y
590# CONFIG_HWMON_VID is not set 607# CONFIG_HWMON_VID is not set
591# CONFIG_SENSORS_ABITUGURU is not set 608# CONFIG_SENSORS_I5K_AMB is not set
592# CONFIG_SENSORS_ABITUGURU3 is not set
593# CONFIG_SENSORS_F71805F is not set 609# CONFIG_SENSORS_F71805F is not set
610# CONFIG_SENSORS_F71882FG is not set
594# CONFIG_SENSORS_IT87 is not set 611# CONFIG_SENSORS_IT87 is not set
595# CONFIG_SENSORS_PC87360 is not set 612# CONFIG_SENSORS_PC87360 is not set
596# CONFIG_SENSORS_PC87427 is not set 613# CONFIG_SENSORS_PC87427 is not set
@@ -603,6 +620,13 @@ CONFIG_HWMON=y
603# CONFIG_SENSORS_W83627HF is not set 620# CONFIG_SENSORS_W83627HF is not set
604# CONFIG_SENSORS_W83627EHF is not set 621# CONFIG_SENSORS_W83627EHF is not set
605# CONFIG_HWMON_DEBUG_CHIP is not set 622# CONFIG_HWMON_DEBUG_CHIP is not set
623# CONFIG_WATCHDOG is not set
624
625#
626# Sonics Silicon Backplane
627#
628CONFIG_SSB_POSSIBLE=y
629# CONFIG_SSB is not set
606 630
607# 631#
608# Multifunction device drivers 632# Multifunction device drivers
@@ -619,16 +643,17 @@ CONFIG_DAB=y
619# 643#
620# Graphics support 644# Graphics support
621# 645#
646# CONFIG_AGP is not set
647# CONFIG_DRM is not set
648# CONFIG_VGASTATE is not set
649CONFIG_VIDEO_OUTPUT_CONTROL=y
650# CONFIG_FB is not set
622# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 651# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
623 652
624# 653#
625# Display device support 654# Display device support
626# 655#
627# CONFIG_DISPLAY_SUPPORT is not set 656# CONFIG_DISPLAY_SUPPORT is not set
628# CONFIG_VGASTATE is not set
629CONFIG_VIDEO_OUTPUT_CONTROL=y
630# CONFIG_FB is not set
631# CONFIG_FB_IBM_GXT4500 is not set
632 657
633# 658#
634# Sound 659# Sound
@@ -637,6 +662,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
637CONFIG_HID_SUPPORT=y 662CONFIG_HID_SUPPORT=y
638CONFIG_HID=y 663CONFIG_HID=y
639# CONFIG_HID_DEBUG is not set 664# CONFIG_HID_DEBUG is not set
665# CONFIG_HIDRAW is not set
640CONFIG_USB_SUPPORT=y 666CONFIG_USB_SUPPORT=y
641CONFIG_USB_ARCH_HAS_HCD=y 667CONFIG_USB_ARCH_HAS_HCD=y
642CONFIG_USB_ARCH_HAS_OHCI=y 668CONFIG_USB_ARCH_HAS_OHCI=y
@@ -658,19 +684,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
658# CONFIG_RTC_CLASS is not set 684# CONFIG_RTC_CLASS is not set
659 685
660# 686#
661# DMA Engine support
662#
663# CONFIG_DMA_ENGINE is not set
664
665#
666# DMA Clients
667#
668
669#
670# DMA Devices
671#
672
673#
674# Userspace I/O 687# Userspace I/O
675# 688#
676# CONFIG_UIO is not set 689# CONFIG_UIO is not set
@@ -687,7 +700,6 @@ CONFIG_EXT3_FS_XATTR=y
687# CONFIG_EXT3_FS_SECURITY is not set 700# CONFIG_EXT3_FS_SECURITY is not set
688# CONFIG_EXT4DEV_FS is not set 701# CONFIG_EXT4DEV_FS is not set
689CONFIG_JBD=y 702CONFIG_JBD=y
690# CONFIG_JBD_DEBUG is not set
691CONFIG_FS_MBCACHE=y 703CONFIG_FS_MBCACHE=y
692# CONFIG_REISERFS_FS is not set 704# CONFIG_REISERFS_FS is not set
693# CONFIG_JFS_FS is not set 705# CONFIG_JFS_FS is not set
@@ -728,7 +740,6 @@ CONFIG_SYSFS=y
728CONFIG_TMPFS=y 740CONFIG_TMPFS=y
729# CONFIG_TMPFS_POSIX_ACL is not set 741# CONFIG_TMPFS_POSIX_ACL is not set
730# CONFIG_HUGETLB_PAGE is not set 742# CONFIG_HUGETLB_PAGE is not set
731CONFIG_RAMFS=y
732# CONFIG_CONFIGFS_FS is not set 743# CONFIG_CONFIGFS_FS is not set
733 744
734# 745#
@@ -747,10 +758,7 @@ CONFIG_RAMFS=y
747# CONFIG_QNX4FS_FS is not set 758# CONFIG_QNX4FS_FS is not set
748# CONFIG_SYSV_FS is not set 759# CONFIG_SYSV_FS is not set
749# CONFIG_UFS_FS is not set 760# CONFIG_UFS_FS is not set
750 761CONFIG_NETWORK_FILESYSTEMS=y
751#
752# Network File Systems
753#
754CONFIG_NFS_FS=y 762CONFIG_NFS_FS=y
755# CONFIG_NFS_V3 is not set 763# CONFIG_NFS_V3 is not set
756# CONFIG_NFS_V4 is not set 764# CONFIG_NFS_V4 is not set
@@ -786,15 +794,7 @@ CONFIG_PARTITION_ADVANCED=y
786# CONFIG_KARMA_PARTITION is not set 794# CONFIG_KARMA_PARTITION is not set
787# CONFIG_EFI_PARTITION is not set 795# CONFIG_EFI_PARTITION is not set
788# CONFIG_SYSV68_PARTITION is not set 796# CONFIG_SYSV68_PARTITION is not set
789
790#
791# Native Language Support
792#
793# CONFIG_NLS is not set 797# CONFIG_NLS is not set
794
795#
796# Distributed Lock Manager
797#
798# CONFIG_DLM is not set 798# CONFIG_DLM is not set
799# CONFIG_UCC_SLOW is not set 799# CONFIG_UCC_SLOW is not set
800 800
@@ -812,16 +812,13 @@ CONFIG_PLIST=y
812CONFIG_HAS_IOMEM=y 812CONFIG_HAS_IOMEM=y
813CONFIG_HAS_IOPORT=y 813CONFIG_HAS_IOPORT=y
814CONFIG_HAS_DMA=y 814CONFIG_HAS_DMA=y
815 815# CONFIG_INSTRUMENTATION is not set
816#
817# Instrumentation Support
818#
819# CONFIG_PROFILING is not set
820 816
821# 817#
822# Kernel hacking 818# Kernel hacking
823# 819#
824# CONFIG_PRINTK_TIME is not set 820# CONFIG_PRINTK_TIME is not set
821CONFIG_ENABLE_WARN_DEPRECATED=y
825CONFIG_ENABLE_MUST_CHECK=y 822CONFIG_ENABLE_MUST_CHECK=y
826# CONFIG_MAGIC_SYSRQ is not set 823# CONFIG_MAGIC_SYSRQ is not set
827# CONFIG_UNUSED_SYMBOLS is not set 824# CONFIG_UNUSED_SYMBOLS is not set
@@ -845,8 +842,11 @@ CONFIG_DEBUG_MUTEXES=y
845# CONFIG_DEBUG_INFO is not set 842# CONFIG_DEBUG_INFO is not set
846# CONFIG_DEBUG_VM is not set 843# CONFIG_DEBUG_VM is not set
847# CONFIG_DEBUG_LIST is not set 844# CONFIG_DEBUG_LIST is not set
845# CONFIG_DEBUG_SG is not set
848CONFIG_FORCED_INLINING=y 846CONFIG_FORCED_INLINING=y
847# CONFIG_BOOT_PRINTK_DELAY is not set
849# CONFIG_FAULT_INJECTION is not set 848# CONFIG_FAULT_INJECTION is not set
849# CONFIG_SAMPLES is not set
850# CONFIG_DEBUG_STACKOVERFLOW is not set 850# CONFIG_DEBUG_STACKOVERFLOW is not set
851# CONFIG_DEBUG_STACK_USAGE is not set 851# CONFIG_DEBUG_STACK_USAGE is not set
852# CONFIG_DEBUG_PAGEALLOC is not set 852# CONFIG_DEBUG_PAGEALLOC is not set
@@ -859,4 +859,6 @@ CONFIG_FORCED_INLINING=y
859# 859#
860# CONFIG_KEYS is not set 860# CONFIG_KEYS is not set
861# CONFIG_SECURITY is not set 861# CONFIG_SECURITY is not set
862# CONFIG_SECURITY_FILE_CAPABILITIES is not set
862# CONFIG_CRYPTO is not set 863# CONFIG_CRYPTO is not set
864# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig
index 0483211f52be..9614d24f832a 100644
--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/mpc8610_hpcd_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.23-rc6 3# Linux kernel version: 2.6.24-rc4
4# Tue Oct 2 11:42:56 2007 4# Thu Dec 6 16:48:56 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -61,10 +66,13 @@ CONFIG_LOCALVERSION=""
61# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
62# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
63# CONFIG_USER_NS is not set 68# CONFIG_USER_NS is not set
69# CONFIG_PID_NS is not set
64# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
65CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
66CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
67CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75# CONFIG_FAIR_GROUP_SCHED is not set
68CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
69# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
70CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -119,7 +127,6 @@ CONFIG_DEFAULT_IOSCHED="deadline"
119# Platform support 127# Platform support
120# 128#
121# CONFIG_PPC_MULTIPLATFORM is not set 129# CONFIG_PPC_MULTIPLATFORM is not set
122# CONFIG_EMBEDDED6xx is not set
123# CONFIG_PPC_82xx is not set 130# CONFIG_PPC_82xx is not set
124# CONFIG_PPC_83xx is not set 131# CONFIG_PPC_83xx is not set
125CONFIG_PPC_86xx=y 132CONFIG_PPC_86xx=y
@@ -148,6 +155,10 @@ CONFIG_MPIC=y
148# Kernel options 155# Kernel options
149# 156#
150CONFIG_HIGHMEM=y 157CONFIG_HIGHMEM=y
158CONFIG_TICK_ONESHOT=y
159CONFIG_NO_HZ=y
160CONFIG_HIGH_RES_TIMERS=y
161CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
151# CONFIG_HZ_100 is not set 162# CONFIG_HZ_100 is not set
152# CONFIG_HZ_250 is not set 163# CONFIG_HZ_250 is not set
153# CONFIG_HZ_300 is not set 164# CONFIG_HZ_300 is not set
@@ -168,6 +179,7 @@ CONFIG_FLATMEM_MANUAL=y
168CONFIG_FLATMEM=y 179CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 180CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 181# CONFIG_SPARSEMEM_STATIC is not set
182# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
171CONFIG_SPLIT_PTLOCK_CPUS=4 183CONFIG_SPLIT_PTLOCK_CPUS=4
172# CONFIG_RESOURCES_64BIT is not set 184# CONFIG_RESOURCES_64BIT is not set
173CONFIG_ZONE_DMA_FLAG=1 185CONFIG_ZONE_DMA_FLAG=1
@@ -197,11 +209,8 @@ CONFIG_PCIEPORTBUS=y
197CONFIG_PCIEAER=y 209CONFIG_PCIEAER=y
198CONFIG_ARCH_SUPPORTS_MSI=y 210CONFIG_ARCH_SUPPORTS_MSI=y
199# CONFIG_PCI_MSI is not set 211# CONFIG_PCI_MSI is not set
212CONFIG_PCI_LEGACY=y
200CONFIG_PCI_DEBUG=y 213CONFIG_PCI_DEBUG=y
201
202#
203# PCCARD (PCMCIA/CardBus) support
204#
205# CONFIG_PCCARD is not set 214# CONFIG_PCCARD is not set
206# CONFIG_HOTPLUG_PCI is not set 215# CONFIG_HOTPLUG_PCI is not set
207 216
@@ -216,7 +225,7 @@ CONFIG_PCI_DEBUG=y
216CONFIG_HIGHMEM_START=0xfe000000 225CONFIG_HIGHMEM_START=0xfe000000
217CONFIG_LOWMEM_SIZE=0x30000000 226CONFIG_LOWMEM_SIZE=0x30000000
218CONFIG_KERNEL_START=0xc0000000 227CONFIG_KERNEL_START=0xc0000000
219CONFIG_TASK_SIZE=0x80000000 228CONFIG_TASK_SIZE=0xc0000000
220CONFIG_BOOT_LOAD=0x00800000 229CONFIG_BOOT_LOAD=0x00800000
221 230
222# 231#
@@ -255,6 +264,7 @@ CONFIG_INET_TUNNEL=y
255CONFIG_INET_XFRM_MODE_TRANSPORT=y 264CONFIG_INET_XFRM_MODE_TRANSPORT=y
256CONFIG_INET_XFRM_MODE_TUNNEL=y 265CONFIG_INET_XFRM_MODE_TUNNEL=y
257CONFIG_INET_XFRM_MODE_BEET=y 266CONFIG_INET_XFRM_MODE_BEET=y
267# CONFIG_INET_LRO is not set
258CONFIG_INET_DIAG=y 268CONFIG_INET_DIAG=y
259CONFIG_INET_TCP_DIAG=y 269CONFIG_INET_TCP_DIAG=y
260# CONFIG_TCP_CONG_ADVANCED is not set 270# CONFIG_TCP_CONG_ADVANCED is not set
@@ -294,10 +304,6 @@ CONFIG_IPV6_SIT=y
294# CONFIG_LAPB is not set 304# CONFIG_LAPB is not set
295# CONFIG_ECONET is not set 305# CONFIG_ECONET is not set
296# CONFIG_WAN_ROUTER is not set 306# CONFIG_WAN_ROUTER is not set
297
298#
299# QoS and/or fair queueing
300#
301# CONFIG_NET_SCHED is not set 307# CONFIG_NET_SCHED is not set
302 308
303# 309#
@@ -326,6 +332,7 @@ CONFIG_IPV6_SIT=y
326# 332#
327# Generic Driver Options 333# Generic Driver Options
328# 334#
335CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
329CONFIG_STANDALONE=y 336CONFIG_STANDALONE=y
330CONFIG_PREVENT_FIRMWARE_BUILD=y 337CONFIG_PREVENT_FIRMWARE_BUILD=y
331CONFIG_FW_LOADER=y 338CONFIG_FW_LOADER=y
@@ -399,6 +406,7 @@ CONFIG_CHR_DEV_SG=y
399# CONFIG_SCSI_FC_ATTRS is not set 406# CONFIG_SCSI_FC_ATTRS is not set
400# CONFIG_SCSI_ISCSI_ATTRS is not set 407# CONFIG_SCSI_ISCSI_ATTRS is not set
401# CONFIG_SCSI_SAS_LIBSAS is not set 408# CONFIG_SCSI_SAS_LIBSAS is not set
409# CONFIG_SCSI_SRP_ATTRS is not set
402CONFIG_SCSI_LOWLEVEL=y 410CONFIG_SCSI_LOWLEVEL=y
403# CONFIG_ISCSI_TCP is not set 411# CONFIG_ISCSI_TCP is not set
404# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 412# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -410,6 +418,7 @@ CONFIG_SCSI_LOWLEVEL=y
410# CONFIG_SCSI_AIC79XX is not set 418# CONFIG_SCSI_AIC79XX is not set
411# CONFIG_SCSI_AIC94XX is not set 419# CONFIG_SCSI_AIC94XX is not set
412# CONFIG_SCSI_DPT_I2O is not set 420# CONFIG_SCSI_DPT_I2O is not set
421# CONFIG_SCSI_ADVANSYS is not set
413# CONFIG_SCSI_ARCMSR is not set 422# CONFIG_SCSI_ARCMSR is not set
414# CONFIG_MEGARAID_NEWGEN is not set 423# CONFIG_MEGARAID_NEWGEN is not set
415# CONFIG_MEGARAID_LEGACY is not set 424# CONFIG_MEGARAID_LEGACY is not set
@@ -477,6 +486,7 @@ CONFIG_PATA_ALI=y
477# CONFIG_PATA_OLDPIIX is not set 486# CONFIG_PATA_OLDPIIX is not set
478# CONFIG_PATA_NETCELL is not set 487# CONFIG_PATA_NETCELL is not set
479# CONFIG_PATA_NS87410 is not set 488# CONFIG_PATA_NS87410 is not set
489# CONFIG_PATA_NS87415 is not set
480# CONFIG_PATA_OPTI is not set 490# CONFIG_PATA_OPTI is not set
481# CONFIG_PATA_OPTIDMA is not set 491# CONFIG_PATA_OPTIDMA is not set
482# CONFIG_PATA_PDC_OLD is not set 492# CONFIG_PATA_PDC_OLD is not set
@@ -491,14 +501,7 @@ CONFIG_PATA_ALI=y
491# CONFIG_PATA_WINBOND is not set 501# CONFIG_PATA_WINBOND is not set
492# CONFIG_PATA_PLATFORM is not set 502# CONFIG_PATA_PLATFORM is not set
493# CONFIG_MD is not set 503# CONFIG_MD is not set
494
495#
496# Fusion MPT device support
497#
498# CONFIG_FUSION is not set 504# CONFIG_FUSION is not set
499# CONFIG_FUSION_SPI is not set
500# CONFIG_FUSION_FC is not set
501# CONFIG_FUSION_SAS is not set
502 505
503# 506#
504# IEEE 1394 (FireWire) support 507# IEEE 1394 (FireWire) support
@@ -514,6 +517,8 @@ CONFIG_DUMMY=y
514# CONFIG_MACVLAN is not set 517# CONFIG_MACVLAN is not set
515# CONFIG_EQUALIZER is not set 518# CONFIG_EQUALIZER is not set
516# CONFIG_TUN is not set 519# CONFIG_TUN is not set
520# CONFIG_VETH is not set
521# CONFIG_IP1000 is not set
517# CONFIG_ARCNET is not set 522# CONFIG_ARCNET is not set
518CONFIG_PHYLIB=y 523CONFIG_PHYLIB=y
519 524
@@ -530,6 +535,7 @@ CONFIG_PHYLIB=y
530# CONFIG_BROADCOM_PHY is not set 535# CONFIG_BROADCOM_PHY is not set
531# CONFIG_ICPLUS_PHY is not set 536# CONFIG_ICPLUS_PHY is not set
532# CONFIG_FIXED_PHY is not set 537# CONFIG_FIXED_PHY is not set
538# CONFIG_MDIO_BITBANG is not set
533CONFIG_NET_ETHERNET=y 539CONFIG_NET_ETHERNET=y
534CONFIG_MII=y 540CONFIG_MII=y
535# CONFIG_HAPPYMEAL is not set 541# CONFIG_HAPPYMEAL is not set
@@ -547,13 +553,16 @@ CONFIG_TULIP_MMIO=y
547# CONFIG_DM9102 is not set 553# CONFIG_DM9102 is not set
548# CONFIG_ULI526X is not set 554# CONFIG_ULI526X is not set
549# CONFIG_HP100 is not set 555# CONFIG_HP100 is not set
556# CONFIG_IBM_NEW_EMAC_ZMII is not set
557# CONFIG_IBM_NEW_EMAC_RGMII is not set
558# CONFIG_IBM_NEW_EMAC_TAH is not set
559# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
550CONFIG_NET_PCI=y 560CONFIG_NET_PCI=y
551# CONFIG_PCNET32 is not set 561# CONFIG_PCNET32 is not set
552# CONFIG_AMD8111_ETH is not set 562# CONFIG_AMD8111_ETH is not set
553# CONFIG_ADAPTEC_STARFIRE is not set 563# CONFIG_ADAPTEC_STARFIRE is not set
554# CONFIG_B44 is not set 564# CONFIG_B44 is not set
555# CONFIG_FORCEDETH is not set 565# CONFIG_FORCEDETH is not set
556# CONFIG_DGRS is not set
557# CONFIG_EEPRO100 is not set 566# CONFIG_EEPRO100 is not set
558# CONFIG_E100 is not set 567# CONFIG_E100 is not set
559# CONFIG_FEALNX is not set 568# CONFIG_FEALNX is not set
@@ -575,6 +584,7 @@ CONFIG_NETDEV_1000=y
575# CONFIG_ACENIC is not set 584# CONFIG_ACENIC is not set
576# CONFIG_DL2K is not set 585# CONFIG_DL2K is not set
577# CONFIG_E1000 is not set 586# CONFIG_E1000 is not set
587# CONFIG_E1000E is not set
578# CONFIG_NS83820 is not set 588# CONFIG_NS83820 is not set
579# CONFIG_HAMACHI is not set 589# CONFIG_HAMACHI is not set
580# CONFIG_YELLOWFIN is not set 590# CONFIG_YELLOWFIN is not set
@@ -592,11 +602,14 @@ CONFIG_NETDEV_1000=y
592CONFIG_NETDEV_10000=y 602CONFIG_NETDEV_10000=y
593# CONFIG_CHELSIO_T1 is not set 603# CONFIG_CHELSIO_T1 is not set
594# CONFIG_CHELSIO_T3 is not set 604# CONFIG_CHELSIO_T3 is not set
605# CONFIG_IXGBE is not set
595# CONFIG_IXGB is not set 606# CONFIG_IXGB is not set
596# CONFIG_S2IO is not set 607# CONFIG_S2IO is not set
597# CONFIG_MYRI10GE is not set 608# CONFIG_MYRI10GE is not set
598# CONFIG_NETXEN_NIC is not set 609# CONFIG_NETXEN_NIC is not set
610# CONFIG_NIU is not set
599# CONFIG_MLX4_CORE is not set 611# CONFIG_MLX4_CORE is not set
612# CONFIG_TEHUTI is not set
600# CONFIG_TR is not set 613# CONFIG_TR is not set
601 614
602# 615#
@@ -629,7 +642,6 @@ CONFIG_INPUT=y
629# 642#
630# CONFIG_INPUT_MOUSEDEV is not set 643# CONFIG_INPUT_MOUSEDEV is not set
631# CONFIG_INPUT_JOYDEV is not set 644# CONFIG_INPUT_JOYDEV is not set
632# CONFIG_INPUT_TSDEV is not set
633# CONFIG_INPUT_EVDEV is not set 645# CONFIG_INPUT_EVDEV is not set
634# CONFIG_INPUT_EVBUG is not set 646# CONFIG_INPUT_EVBUG is not set
635 647
@@ -688,14 +700,11 @@ CONFIG_SERIAL_OF_PLATFORM=y
688CONFIG_UNIX98_PTYS=y 700CONFIG_UNIX98_PTYS=y
689# CONFIG_LEGACY_PTYS is not set 701# CONFIG_LEGACY_PTYS is not set
690# CONFIG_IPMI_HANDLER is not set 702# CONFIG_IPMI_HANDLER is not set
691# CONFIG_WATCHDOG is not set
692# CONFIG_HW_RANDOM is not set 703# CONFIG_HW_RANDOM is not set
693# CONFIG_NVRAM is not set 704# CONFIG_NVRAM is not set
694# CONFIG_GEN_RTC is not set 705# CONFIG_GEN_RTC is not set
695# CONFIG_R3964 is not set 706# CONFIG_R3964 is not set
696# CONFIG_APPLICOM is not set 707# CONFIG_APPLICOM is not set
697# CONFIG_AGP is not set
698# CONFIG_DRM is not set
699# CONFIG_RAW_DRIVER is not set 708# CONFIG_RAW_DRIVER is not set
700# CONFIG_TCG_TPM is not set 709# CONFIG_TCG_TPM is not set
701CONFIG_DEVPORT=y 710CONFIG_DEVPORT=y
@@ -709,6 +718,13 @@ CONFIG_DEVPORT=y
709# CONFIG_W1 is not set 718# CONFIG_W1 is not set
710# CONFIG_POWER_SUPPLY is not set 719# CONFIG_POWER_SUPPLY is not set
711# CONFIG_HWMON is not set 720# CONFIG_HWMON is not set
721# CONFIG_WATCHDOG is not set
722
723#
724# Sonics Silicon Backplane
725#
726CONFIG_SSB_POSSIBLE=y
727# CONFIG_SSB is not set
712 728
713# 729#
714# Multifunction device drivers 730# Multifunction device drivers
@@ -725,16 +741,17 @@ CONFIG_DAB=y
725# 741#
726# Graphics support 742# Graphics support
727# 743#
744# CONFIG_AGP is not set
745# CONFIG_DRM is not set
746# CONFIG_VGASTATE is not set
747CONFIG_VIDEO_OUTPUT_CONTROL=y
748# CONFIG_FB is not set
728# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 749# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
729 750
730# 751#
731# Display device support 752# Display device support
732# 753#
733# CONFIG_DISPLAY_SUPPORT is not set 754# CONFIG_DISPLAY_SUPPORT is not set
734# CONFIG_VGASTATE is not set
735CONFIG_VIDEO_OUTPUT_CONTROL=y
736# CONFIG_FB is not set
737# CONFIG_FB_IBM_GXT4500 is not set
738 755
739# 756#
740# Console display driver support 757# Console display driver support
@@ -750,6 +767,7 @@ CONFIG_DUMMY_CONSOLE=y
750CONFIG_HID_SUPPORT=y 767CONFIG_HID_SUPPORT=y
751CONFIG_HID=y 768CONFIG_HID=y
752# CONFIG_HID_DEBUG is not set 769# CONFIG_HID_DEBUG is not set
770# CONFIG_HIDRAW is not set
753CONFIG_USB_SUPPORT=y 771CONFIG_USB_SUPPORT=y
754CONFIG_USB_ARCH_HAS_HCD=y 772CONFIG_USB_ARCH_HAS_HCD=y
755CONFIG_USB_ARCH_HAS_OHCI=y 773CONFIG_USB_ARCH_HAS_OHCI=y
@@ -771,19 +789,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
771# CONFIG_RTC_CLASS is not set 789# CONFIG_RTC_CLASS is not set
772 790
773# 791#
774# DMA Engine support
775#
776# CONFIG_DMA_ENGINE is not set
777
778#
779# DMA Clients
780#
781
782#
783# DMA Devices
784#
785
786#
787# Userspace I/O 792# Userspace I/O
788# 793#
789# CONFIG_UIO is not set 794# CONFIG_UIO is not set
@@ -800,7 +805,6 @@ CONFIG_EXT3_FS_XATTR=y
800# CONFIG_EXT3_FS_SECURITY is not set 805# CONFIG_EXT3_FS_SECURITY is not set
801# CONFIG_EXT4DEV_FS is not set 806# CONFIG_EXT4DEV_FS is not set
802CONFIG_JBD=y 807CONFIG_JBD=y
803# CONFIG_JBD_DEBUG is not set
804CONFIG_FS_MBCACHE=y 808CONFIG_FS_MBCACHE=y
805# CONFIG_REISERFS_FS is not set 809# CONFIG_REISERFS_FS is not set
806# CONFIG_JFS_FS is not set 810# CONFIG_JFS_FS is not set
@@ -840,7 +844,6 @@ CONFIG_SYSFS=y
840CONFIG_TMPFS=y 844CONFIG_TMPFS=y
841# CONFIG_TMPFS_POSIX_ACL is not set 845# CONFIG_TMPFS_POSIX_ACL is not set
842# CONFIG_HUGETLB_PAGE is not set 846# CONFIG_HUGETLB_PAGE is not set
843CONFIG_RAMFS=y
844# CONFIG_CONFIGFS_FS is not set 847# CONFIG_CONFIGFS_FS is not set
845 848
846# 849#
@@ -859,10 +862,7 @@ CONFIG_RAMFS=y
859# CONFIG_QNX4FS_FS is not set 862# CONFIG_QNX4FS_FS is not set
860# CONFIG_SYSV_FS is not set 863# CONFIG_SYSV_FS is not set
861# CONFIG_UFS_FS is not set 864# CONFIG_UFS_FS is not set
862 865CONFIG_NETWORK_FILESYSTEMS=y
863#
864# Network File Systems
865#
866CONFIG_NFS_FS=y 866CONFIG_NFS_FS=y
867CONFIG_NFS_V3=y 867CONFIG_NFS_V3=y
868# CONFIG_NFS_V3_ACL is not set 868# CONFIG_NFS_V3_ACL is not set
@@ -908,10 +908,6 @@ CONFIG_LDM_PARTITION=y
908# CONFIG_KARMA_PARTITION is not set 908# CONFIG_KARMA_PARTITION is not set
909# CONFIG_EFI_PARTITION is not set 909# CONFIG_EFI_PARTITION is not set
910# CONFIG_SYSV68_PARTITION is not set 910# CONFIG_SYSV68_PARTITION is not set
911
912#
913# Native Language Support
914#
915CONFIG_NLS=y 911CONFIG_NLS=y
916CONFIG_NLS_DEFAULT="iso8859-1" 912CONFIG_NLS_DEFAULT="iso8859-1"
917# CONFIG_NLS_CODEPAGE_437 is not set 913# CONFIG_NLS_CODEPAGE_437 is not set
@@ -952,10 +948,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
952# CONFIG_NLS_KOI8_R is not set 948# CONFIG_NLS_KOI8_R is not set
953# CONFIG_NLS_KOI8_U is not set 949# CONFIG_NLS_KOI8_U is not set
954# CONFIG_NLS_UTF8 is not set 950# CONFIG_NLS_UTF8 is not set
955
956#
957# Distributed Lock Manager
958#
959# CONFIG_DLM is not set 951# CONFIG_DLM is not set
960# CONFIG_UCC_SLOW is not set 952# CONFIG_UCC_SLOW is not set
961 953
@@ -973,16 +965,13 @@ CONFIG_PLIST=y
973CONFIG_HAS_IOMEM=y 965CONFIG_HAS_IOMEM=y
974CONFIG_HAS_IOPORT=y 966CONFIG_HAS_IOPORT=y
975CONFIG_HAS_DMA=y 967CONFIG_HAS_DMA=y
976 968# CONFIG_INSTRUMENTATION is not set
977#
978# Instrumentation Support
979#
980# CONFIG_PROFILING is not set
981 969
982# 970#
983# Kernel hacking 971# Kernel hacking
984# 972#
985# CONFIG_PRINTK_TIME is not set 973# CONFIG_PRINTK_TIME is not set
974CONFIG_ENABLE_WARN_DEPRECATED=y
986CONFIG_ENABLE_MUST_CHECK=y 975CONFIG_ENABLE_MUST_CHECK=y
987# CONFIG_MAGIC_SYSRQ is not set 976# CONFIG_MAGIC_SYSRQ is not set
988# CONFIG_UNUSED_SYMBOLS is not set 977# CONFIG_UNUSED_SYMBOLS is not set
@@ -1007,8 +996,11 @@ CONFIG_DEBUG_BUGVERBOSE=y
1007CONFIG_DEBUG_INFO=y 996CONFIG_DEBUG_INFO=y
1008# CONFIG_DEBUG_VM is not set 997# CONFIG_DEBUG_VM is not set
1009# CONFIG_DEBUG_LIST is not set 998# CONFIG_DEBUG_LIST is not set
999# CONFIG_DEBUG_SG is not set
1010CONFIG_FORCED_INLINING=y 1000CONFIG_FORCED_INLINING=y
1001# CONFIG_BOOT_PRINTK_DELAY is not set
1011# CONFIG_FAULT_INJECTION is not set 1002# CONFIG_FAULT_INJECTION is not set
1003# CONFIG_SAMPLES is not set
1012# CONFIG_DEBUG_STACKOVERFLOW is not set 1004# CONFIG_DEBUG_STACKOVERFLOW is not set
1013# CONFIG_DEBUG_STACK_USAGE is not set 1005# CONFIG_DEBUG_STACK_USAGE is not set
1014# CONFIG_DEBUG_PAGEALLOC is not set 1006# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1021,4 +1013,6 @@ CONFIG_FORCED_INLINING=y
1021# 1013#
1022# CONFIG_KEYS is not set 1014# CONFIG_KEYS is not set
1023# CONFIG_SECURITY is not set 1015# CONFIG_SECURITY is not set
1016# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1024# CONFIG_CRYPTO is not set 1017# CONFIG_CRYPTO is not set
1018# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index ed214fcd8abe..ff092fc4c6be 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Wed Aug 29 16:16:23 2007 4# Thu Dec 6 16:48:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_PPC_STD_MMU_32=y
22CONFIG_SMP=y 22CONFIG_SMP=y
23CONFIG_NR_CPUS=2 23CONFIG_NR_CPUS=2
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -64,12 +69,14 @@ CONFIG_BSD_PROCESS_ACCT=y
64# CONFIG_BSD_PROCESS_ACCT_V3 is not set 69# CONFIG_BSD_PROCESS_ACCT_V3 is not set
65# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
67CONFIG_AUDIT=y 73CONFIG_AUDIT=y
68# CONFIG_AUDITSYSCALL is not set 74# CONFIG_AUDITSYSCALL is not set
69CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CPUSETS is not set 78# CONFIG_CGROUPS is not set
79# CONFIG_FAIR_GROUP_SCHED is not set
73CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 82CONFIG_BLK_DEV_INITRD=y
@@ -90,7 +97,6 @@ CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
91CONFIG_EPOLL=y 98CONFIG_EPOLL=y
92CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
95CONFIG_SHMEM=y 101CONFIG_SHMEM=y
96CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -131,7 +137,6 @@ CONFIG_DEFAULT_IOSCHED="cfq"
131# Platform support 137# Platform support
132# 138#
133# CONFIG_PPC_MULTIPLATFORM is not set 139# CONFIG_PPC_MULTIPLATFORM is not set
134# CONFIG_EMBEDDED6xx is not set
135# CONFIG_PPC_82xx is not set 140# CONFIG_PPC_82xx is not set
136# CONFIG_PPC_83xx is not set 141# CONFIG_PPC_83xx is not set
137CONFIG_PPC_86xx=y 142CONFIG_PPC_86xx=y
@@ -141,6 +146,7 @@ CONFIG_PPC_86xx=y
141# CONFIG_PPC_CELL_NATIVE is not set 146# CONFIG_PPC_CELL_NATIVE is not set
142# CONFIG_PQ2ADS is not set 147# CONFIG_PQ2ADS is not set
143CONFIG_MPC8641_HPCN=y 148CONFIG_MPC8641_HPCN=y
149# CONFIG_MPC8610_HPCD is not set
144CONFIG_MPC8641=y 150CONFIG_MPC8641=y
145CONFIG_MPIC=y 151CONFIG_MPIC=y
146# CONFIG_MPIC_WEIRD is not set 152# CONFIG_MPIC_WEIRD is not set
@@ -159,6 +165,10 @@ CONFIG_FSL_ULI1575=y
159# Kernel options 165# Kernel options
160# 166#
161CONFIG_HIGHMEM=y 167CONFIG_HIGHMEM=y
168CONFIG_TICK_ONESHOT=y
169CONFIG_NO_HZ=y
170CONFIG_HIGH_RES_TIMERS=y
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
162# CONFIG_HZ_100 is not set 172# CONFIG_HZ_100 is not set
163# CONFIG_HZ_250 is not set 173# CONFIG_HZ_250 is not set
164# CONFIG_HZ_300 is not set 174# CONFIG_HZ_300 is not set
@@ -181,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
184CONFIG_SPLIT_PTLOCK_CPUS=4 195CONFIG_SPLIT_PTLOCK_CPUS=4
185# CONFIG_RESOURCES_64BIT is not set 196# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1 197CONFIG_ZONE_DMA_FLAG=1
@@ -207,11 +218,8 @@ CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 218# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 219CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 220# CONFIG_PCI_MSI is not set
221CONFIG_PCI_LEGACY=y
210# CONFIG_PCI_DEBUG is not set 222# CONFIG_PCI_DEBUG is not set
211
212#
213# PCCARD (PCMCIA/CardBus) support
214#
215# CONFIG_PCCARD is not set 223# CONFIG_PCCARD is not set
216# CONFIG_HOTPLUG_PCI is not set 224# CONFIG_HOTPLUG_PCI is not set
217 225
@@ -226,7 +234,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
226CONFIG_HIGHMEM_START=0xfe000000 234CONFIG_HIGHMEM_START=0xfe000000
227CONFIG_LOWMEM_SIZE=0x30000000 235CONFIG_LOWMEM_SIZE=0x30000000
228CONFIG_KERNEL_START=0xc0000000 236CONFIG_KERNEL_START=0xc0000000
229CONFIG_TASK_SIZE=0x80000000 237CONFIG_TASK_SIZE=0xc0000000
230CONFIG_BOOT_LOAD=0x00800000 238CONFIG_BOOT_LOAD=0x00800000
231 239
232# 240#
@@ -275,6 +283,7 @@ CONFIG_INET_TUNNEL=y
275# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 283# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
276# CONFIG_INET_XFRM_MODE_TUNNEL is not set 284# CONFIG_INET_XFRM_MODE_TUNNEL is not set
277# CONFIG_INET_XFRM_MODE_BEET is not set 285# CONFIG_INET_XFRM_MODE_BEET is not set
286# CONFIG_INET_LRO is not set
278CONFIG_INET_DIAG=y 287CONFIG_INET_DIAG=y
279CONFIG_INET_TCP_DIAG=y 288CONFIG_INET_TCP_DIAG=y
280# CONFIG_TCP_CONG_ADVANCED is not set 289# CONFIG_TCP_CONG_ADVANCED is not set
@@ -319,10 +328,6 @@ CONFIG_SCTP_HMAC_MD5=y
319# CONFIG_LAPB is not set 328# CONFIG_LAPB is not set
320# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
321# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
322
323#
324# QoS and/or fair queueing
325#
326# CONFIG_NET_SCHED is not set 331# CONFIG_NET_SCHED is not set
327 332
328# 333#
@@ -352,6 +357,7 @@ CONFIG_FIB_RULES=y
352# 357#
353# Generic Driver Options 358# Generic Driver Options
354# 359#
360CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
355CONFIG_STANDALONE=y 361CONFIG_STANDALONE=y
356CONFIG_PREVENT_FIRMWARE_BUILD=y 362CONFIG_PREVENT_FIRMWARE_BUILD=y
357CONFIG_FW_LOADER=y 363CONFIG_FW_LOADER=y
@@ -424,6 +430,7 @@ CONFIG_SCSI_WAIT_SCAN=m
424# CONFIG_SCSI_FC_ATTRS is not set 430# CONFIG_SCSI_FC_ATTRS is not set
425# CONFIG_SCSI_ISCSI_ATTRS is not set 431# CONFIG_SCSI_ISCSI_ATTRS is not set
426# CONFIG_SCSI_SAS_LIBSAS is not set 432# CONFIG_SCSI_SAS_LIBSAS is not set
433# CONFIG_SCSI_SRP_ATTRS is not set
427CONFIG_SCSI_LOWLEVEL=y 434CONFIG_SCSI_LOWLEVEL=y
428# CONFIG_ISCSI_TCP is not set 435# CONFIG_ISCSI_TCP is not set
429# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 436# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -435,6 +442,7 @@ CONFIG_SCSI_LOWLEVEL=y
435# CONFIG_SCSI_AIC79XX is not set 442# CONFIG_SCSI_AIC79XX is not set
436# CONFIG_SCSI_AIC94XX is not set 443# CONFIG_SCSI_AIC94XX is not set
437# CONFIG_SCSI_DPT_I2O is not set 444# CONFIG_SCSI_DPT_I2O is not set
445# CONFIG_SCSI_ADVANSYS is not set
438# CONFIG_SCSI_ARCMSR is not set 446# CONFIG_SCSI_ARCMSR is not set
439# CONFIG_MEGARAID_NEWGEN is not set 447# CONFIG_MEGARAID_NEWGEN is not set
440# CONFIG_MEGARAID_LEGACY is not set 448# CONFIG_MEGARAID_LEGACY is not set
@@ -502,6 +510,7 @@ CONFIG_PATA_ALI=y
502# CONFIG_PATA_OLDPIIX is not set 510# CONFIG_PATA_OLDPIIX is not set
503# CONFIG_PATA_NETCELL is not set 511# CONFIG_PATA_NETCELL is not set
504# CONFIG_PATA_NS87410 is not set 512# CONFIG_PATA_NS87410 is not set
513# CONFIG_PATA_NS87415 is not set
505# CONFIG_PATA_OPTI is not set 514# CONFIG_PATA_OPTI is not set
506# CONFIG_PATA_OPTIDMA is not set 515# CONFIG_PATA_OPTIDMA is not set
507# CONFIG_PATA_PDC_OLD is not set 516# CONFIG_PATA_PDC_OLD is not set
@@ -516,14 +525,7 @@ CONFIG_PATA_ALI=y
516# CONFIG_PATA_WINBOND is not set 525# CONFIG_PATA_WINBOND is not set
517# CONFIG_PATA_PLATFORM is not set 526# CONFIG_PATA_PLATFORM is not set
518# CONFIG_MD is not set 527# CONFIG_MD is not set
519
520#
521# Fusion MPT device support
522#
523# CONFIG_FUSION is not set 528# CONFIG_FUSION is not set
524# CONFIG_FUSION_SPI is not set
525# CONFIG_FUSION_FC is not set
526# CONFIG_FUSION_SAS is not set
527 529
528# 530#
529# IEEE 1394 (FireWire) support 531# IEEE 1394 (FireWire) support
@@ -539,6 +541,8 @@ CONFIG_DUMMY=y
539# CONFIG_MACVLAN is not set 541# CONFIG_MACVLAN is not set
540# CONFIG_EQUALIZER is not set 542# CONFIG_EQUALIZER is not set
541# CONFIG_TUN is not set 543# CONFIG_TUN is not set
544# CONFIG_VETH is not set
545# CONFIG_IP1000 is not set
542# CONFIG_ARCNET is not set 546# CONFIG_ARCNET is not set
543CONFIG_PHYLIB=y 547CONFIG_PHYLIB=y
544 548
@@ -555,6 +559,7 @@ CONFIG_VITESSE_PHY=y
555# CONFIG_BROADCOM_PHY is not set 559# CONFIG_BROADCOM_PHY is not set
556# CONFIG_ICPLUS_PHY is not set 560# CONFIG_ICPLUS_PHY is not set
557# CONFIG_FIXED_PHY is not set 561# CONFIG_FIXED_PHY is not set
562# CONFIG_MDIO_BITBANG is not set
558CONFIG_NET_ETHERNET=y 563CONFIG_NET_ETHERNET=y
559CONFIG_MII=y 564CONFIG_MII=y
560# CONFIG_HAPPYMEAL is not set 565# CONFIG_HAPPYMEAL is not set
@@ -563,11 +568,17 @@ CONFIG_MII=y
563# CONFIG_NET_VENDOR_3COM is not set 568# CONFIG_NET_VENDOR_3COM is not set
564# CONFIG_NET_TULIP is not set 569# CONFIG_NET_TULIP is not set
565# CONFIG_HP100 is not set 570# CONFIG_HP100 is not set
571# CONFIG_IBM_NEW_EMAC_ZMII is not set
572# CONFIG_IBM_NEW_EMAC_RGMII is not set
573# CONFIG_IBM_NEW_EMAC_TAH is not set
574# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
566# CONFIG_NET_PCI is not set 575# CONFIG_NET_PCI is not set
576# CONFIG_B44 is not set
567CONFIG_NETDEV_1000=y 577CONFIG_NETDEV_1000=y
568# CONFIG_ACENIC is not set 578# CONFIG_ACENIC is not set
569# CONFIG_DL2K is not set 579# CONFIG_DL2K is not set
570# CONFIG_E1000 is not set 580# CONFIG_E1000 is not set
581# CONFIG_E1000E is not set
571# CONFIG_NS83820 is not set 582# CONFIG_NS83820 is not set
572# CONFIG_HAMACHI is not set 583# CONFIG_HAMACHI is not set
573# CONFIG_YELLOWFIN is not set 584# CONFIG_YELLOWFIN is not set
@@ -575,6 +586,7 @@ CONFIG_NETDEV_1000=y
575# CONFIG_SIS190 is not set 586# CONFIG_SIS190 is not set
576# CONFIG_SKGE is not set 587# CONFIG_SKGE is not set
577# CONFIG_SKY2 is not set 588# CONFIG_SKY2 is not set
589# CONFIG_SK98LIN is not set
578# CONFIG_VIA_VELOCITY is not set 590# CONFIG_VIA_VELOCITY is not set
579# CONFIG_TIGON3 is not set 591# CONFIG_TIGON3 is not set
580# CONFIG_BNX2 is not set 592# CONFIG_BNX2 is not set
@@ -585,11 +597,14 @@ CONFIG_GFAR_NAPI=y
585CONFIG_NETDEV_10000=y 597CONFIG_NETDEV_10000=y
586# CONFIG_CHELSIO_T1 is not set 598# CONFIG_CHELSIO_T1 is not set
587# CONFIG_CHELSIO_T3 is not set 599# CONFIG_CHELSIO_T3 is not set
600# CONFIG_IXGBE is not set
588# CONFIG_IXGB is not set 601# CONFIG_IXGB is not set
589# CONFIG_S2IO is not set 602# CONFIG_S2IO is not set
590# CONFIG_MYRI10GE is not set 603# CONFIG_MYRI10GE is not set
591# CONFIG_NETXEN_NIC is not set 604# CONFIG_NETXEN_NIC is not set
605# CONFIG_NIU is not set
592# CONFIG_MLX4_CORE is not set 606# CONFIG_MLX4_CORE is not set
607# CONFIG_TEHUTI is not set
593# CONFIG_TR is not set 608# CONFIG_TR is not set
594 609
595# 610#
@@ -605,7 +620,6 @@ CONFIG_NETDEV_10000=y
605# CONFIG_USB_KAWETH is not set 620# CONFIG_USB_KAWETH is not set
606# CONFIG_USB_PEGASUS is not set 621# CONFIG_USB_PEGASUS is not set
607# CONFIG_USB_RTL8150 is not set 622# CONFIG_USB_RTL8150 is not set
608# CONFIG_USB_USBNET_MII is not set
609# CONFIG_USB_USBNET is not set 623# CONFIG_USB_USBNET is not set
610# CONFIG_WAN is not set 624# CONFIG_WAN is not set
611# CONFIG_FDDI is not set 625# CONFIG_FDDI is not set
@@ -632,7 +646,6 @@ CONFIG_INPUT=y
632# 646#
633# CONFIG_INPUT_MOUSEDEV is not set 647# CONFIG_INPUT_MOUSEDEV is not set
634# CONFIG_INPUT_JOYDEV is not set 648# CONFIG_INPUT_JOYDEV is not set
635# CONFIG_INPUT_TSDEV is not set
636# CONFIG_INPUT_EVDEV is not set 649# CONFIG_INPUT_EVDEV is not set
637# CONFIG_INPUT_EVBUG is not set 650# CONFIG_INPUT_EVBUG is not set
638 651
@@ -692,15 +705,12 @@ CONFIG_UNIX98_PTYS=y
692CONFIG_LEGACY_PTYS=y 705CONFIG_LEGACY_PTYS=y
693CONFIG_LEGACY_PTY_COUNT=256 706CONFIG_LEGACY_PTY_COUNT=256
694# CONFIG_IPMI_HANDLER is not set 707# CONFIG_IPMI_HANDLER is not set
695# CONFIG_WATCHDOG is not set
696# CONFIG_HW_RANDOM is not set 708# CONFIG_HW_RANDOM is not set
697CONFIG_NVRAM=y 709CONFIG_NVRAM=y
698CONFIG_GEN_RTC=y 710CONFIG_GEN_RTC=y
699CONFIG_GEN_RTC_X=y 711CONFIG_GEN_RTC_X=y
700# CONFIG_R3964 is not set 712# CONFIG_R3964 is not set
701# CONFIG_APPLICOM is not set 713# CONFIG_APPLICOM is not set
702# CONFIG_AGP is not set
703# CONFIG_DRM is not set
704# CONFIG_RAW_DRIVER is not set 714# CONFIG_RAW_DRIVER is not set
705# CONFIG_TCG_TPM is not set 715# CONFIG_TCG_TPM is not set
706CONFIG_DEVPORT=y 716CONFIG_DEVPORT=y
@@ -769,6 +779,13 @@ CONFIG_SENSORS_EEPROM=y
769# CONFIG_W1 is not set 779# CONFIG_W1 is not set
770# CONFIG_POWER_SUPPLY is not set 780# CONFIG_POWER_SUPPLY is not set
771# CONFIG_HWMON is not set 781# CONFIG_HWMON is not set
782# CONFIG_WATCHDOG is not set
783
784#
785# Sonics Silicon Backplane
786#
787CONFIG_SSB_POSSIBLE=y
788# CONFIG_SSB is not set
772 789
773# 790#
774# Multifunction device drivers 791# Multifunction device drivers
@@ -863,6 +880,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
863# CONFIG_DVB_OR51132 is not set 880# CONFIG_DVB_OR51132 is not set
864# CONFIG_DVB_BCM3510 is not set 881# CONFIG_DVB_BCM3510 is not set
865# CONFIG_DVB_LGDT330X is not set 882# CONFIG_DVB_LGDT330X is not set
883# CONFIG_DVB_S5H1409 is not set
866 884
867# 885#
868# Tuners/PLL support 886# Tuners/PLL support
@@ -872,6 +890,9 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
872# CONFIG_DVB_TDA827X is not set 890# CONFIG_DVB_TDA827X is not set
873# CONFIG_DVB_TUNER_QT1010 is not set 891# CONFIG_DVB_TUNER_QT1010 is not set
874# CONFIG_DVB_TUNER_MT2060 is not set 892# CONFIG_DVB_TUNER_MT2060 is not set
893# CONFIG_DVB_TUNER_MT2266 is not set
894# CONFIG_DVB_TUNER_MT2131 is not set
895# CONFIG_DVB_TUNER_DIB0070 is not set
875 896
876# 897#
877# Miscellaneous devices 898# Miscellaneous devices
@@ -885,16 +906,17 @@ CONFIG_DAB=y
885# 906#
886# Graphics support 907# Graphics support
887# 908#
909# CONFIG_AGP is not set
910# CONFIG_DRM is not set
911# CONFIG_VGASTATE is not set
912CONFIG_VIDEO_OUTPUT_CONTROL=y
913# CONFIG_FB is not set
888# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 914# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
889 915
890# 916#
891# Display device support 917# Display device support
892# 918#
893# CONFIG_DISPLAY_SUPPORT is not set 919# CONFIG_DISPLAY_SUPPORT is not set
894# CONFIG_VGASTATE is not set
895CONFIG_VIDEO_OUTPUT_CONTROL=y
896# CONFIG_FB is not set
897# CONFIG_FB_IBM_GXT4500 is not set
898 920
899# 921#
900# Console display driver support 922# Console display driver support
@@ -1026,6 +1048,7 @@ CONFIG_AC97_BUS=y
1026CONFIG_HID_SUPPORT=y 1048CONFIG_HID_SUPPORT=y
1027CONFIG_HID=y 1049CONFIG_HID=y
1028# CONFIG_HID_DEBUG is not set 1050# CONFIG_HID_DEBUG is not set
1051# CONFIG_HIDRAW is not set
1029 1052
1030# 1053#
1031# USB Input Devices 1054# USB Input Devices
@@ -1086,6 +1109,7 @@ CONFIG_USB_STORAGE=y
1086# CONFIG_USB_STORAGE_DEBUG is not set 1109# CONFIG_USB_STORAGE_DEBUG is not set
1087# CONFIG_USB_STORAGE_DATAFAB is not set 1110# CONFIG_USB_STORAGE_DATAFAB is not set
1088# CONFIG_USB_STORAGE_FREECOM is not set 1111# CONFIG_USB_STORAGE_FREECOM is not set
1112# CONFIG_USB_STORAGE_ISD200 is not set
1089# CONFIG_USB_STORAGE_DPCM is not set 1113# CONFIG_USB_STORAGE_DPCM is not set
1090# CONFIG_USB_STORAGE_USBAT is not set 1114# CONFIG_USB_STORAGE_USBAT is not set
1091# CONFIG_USB_STORAGE_SDDR09 is not set 1115# CONFIG_USB_STORAGE_SDDR09 is not set
@@ -1166,6 +1190,7 @@ CONFIG_RTC_INTF_DEV=y
1166# I2C RTC drivers 1190# I2C RTC drivers
1167# 1191#
1168# CONFIG_RTC_DRV_DS1307 is not set 1192# CONFIG_RTC_DRV_DS1307 is not set
1193# CONFIG_RTC_DRV_DS1374 is not set
1169# CONFIG_RTC_DRV_DS1672 is not set 1194# CONFIG_RTC_DRV_DS1672 is not set
1170# CONFIG_RTC_DRV_MAX6900 is not set 1195# CONFIG_RTC_DRV_MAX6900 is not set
1171# CONFIG_RTC_DRV_RS5C372 is not set 1196# CONFIG_RTC_DRV_RS5C372 is not set
@@ -1195,19 +1220,6 @@ CONFIG_RTC_DRV_CMOS=y
1195# 1220#
1196 1221
1197# 1222#
1198# DMA Engine support
1199#
1200# CONFIG_DMA_ENGINE is not set
1201
1202#
1203# DMA Clients
1204#
1205
1206#
1207# DMA Devices
1208#
1209
1210#
1211# Userspace I/O 1223# Userspace I/O
1212# 1224#
1213# CONFIG_UIO is not set 1225# CONFIG_UIO is not set
@@ -1224,7 +1236,6 @@ CONFIG_EXT3_FS_XATTR=y
1224# CONFIG_EXT3_FS_SECURITY is not set 1236# CONFIG_EXT3_FS_SECURITY is not set
1225# CONFIG_EXT4DEV_FS is not set 1237# CONFIG_EXT4DEV_FS is not set
1226CONFIG_JBD=y 1238CONFIG_JBD=y
1227# CONFIG_JBD_DEBUG is not set
1228CONFIG_FS_MBCACHE=y 1239CONFIG_FS_MBCACHE=y
1229# CONFIG_REISERFS_FS is not set 1240# CONFIG_REISERFS_FS is not set
1230# CONFIG_JFS_FS is not set 1241# CONFIG_JFS_FS is not set
@@ -1273,7 +1284,6 @@ CONFIG_SYSFS=y
1273CONFIG_TMPFS=y 1284CONFIG_TMPFS=y
1274# CONFIG_TMPFS_POSIX_ACL is not set 1285# CONFIG_TMPFS_POSIX_ACL is not set
1275# CONFIG_HUGETLB_PAGE is not set 1286# CONFIG_HUGETLB_PAGE is not set
1276CONFIG_RAMFS=y
1277# CONFIG_CONFIGFS_FS is not set 1287# CONFIG_CONFIGFS_FS is not set
1278 1288
1279# 1289#
@@ -1296,10 +1306,7 @@ CONFIG_SYSV_FS=m
1296CONFIG_UFS_FS=m 1306CONFIG_UFS_FS=m
1297# CONFIG_UFS_FS_WRITE is not set 1307# CONFIG_UFS_FS_WRITE is not set
1298# CONFIG_UFS_DEBUG is not set 1308# CONFIG_UFS_DEBUG is not set
1299 1309CONFIG_NETWORK_FILESYSTEMS=y
1300#
1301# Network File Systems
1302#
1303CONFIG_NFS_FS=y 1310CONFIG_NFS_FS=y
1304CONFIG_NFS_V3=y 1311CONFIG_NFS_V3=y
1305# CONFIG_NFS_V3_ACL is not set 1312# CONFIG_NFS_V3_ACL is not set
@@ -1345,10 +1352,6 @@ CONFIG_MSDOS_PARTITION=y
1345# CONFIG_KARMA_PARTITION is not set 1352# CONFIG_KARMA_PARTITION is not set
1346# CONFIG_EFI_PARTITION is not set 1353# CONFIG_EFI_PARTITION is not set
1347# CONFIG_SYSV68_PARTITION is not set 1354# CONFIG_SYSV68_PARTITION is not set
1348
1349#
1350# Native Language Support
1351#
1352CONFIG_NLS=y 1355CONFIG_NLS=y
1353CONFIG_NLS_DEFAULT="iso8859-1" 1356CONFIG_NLS_DEFAULT="iso8859-1"
1354# CONFIG_NLS_CODEPAGE_437 is not set 1357# CONFIG_NLS_CODEPAGE_437 is not set
@@ -1389,10 +1392,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1389# CONFIG_NLS_KOI8_R is not set 1392# CONFIG_NLS_KOI8_R is not set
1390# CONFIG_NLS_KOI8_U is not set 1393# CONFIG_NLS_KOI8_U is not set
1391CONFIG_NLS_UTF8=m 1394CONFIG_NLS_UTF8=m
1392
1393#
1394# Distributed Lock Manager
1395#
1396# CONFIG_DLM is not set 1395# CONFIG_DLM is not set
1397# CONFIG_UCC_SLOW is not set 1396# CONFIG_UCC_SLOW is not set
1398 1397
@@ -1411,17 +1410,13 @@ CONFIG_PLIST=y
1411CONFIG_HAS_IOMEM=y 1410CONFIG_HAS_IOMEM=y
1412CONFIG_HAS_IOPORT=y 1411CONFIG_HAS_IOPORT=y
1413CONFIG_HAS_DMA=y 1412CONFIG_HAS_DMA=y
1414 1413# CONFIG_INSTRUMENTATION is not set
1415#
1416# Instrumentation Support
1417#
1418# CONFIG_PROFILING is not set
1419# CONFIG_KPROBES is not set
1420 1414
1421# 1415#
1422# Kernel hacking 1416# Kernel hacking
1423# 1417#
1424# CONFIG_PRINTK_TIME is not set 1418# CONFIG_PRINTK_TIME is not set
1419CONFIG_ENABLE_WARN_DEPRECATED=y
1425CONFIG_ENABLE_MUST_CHECK=y 1420CONFIG_ENABLE_MUST_CHECK=y
1426# CONFIG_MAGIC_SYSRQ is not set 1421# CONFIG_MAGIC_SYSRQ is not set
1427# CONFIG_UNUSED_SYMBOLS is not set 1422# CONFIG_UNUSED_SYMBOLS is not set
@@ -1446,9 +1441,12 @@ CONFIG_SCHED_DEBUG=y
1446CONFIG_DEBUG_INFO=y 1441CONFIG_DEBUG_INFO=y
1447# CONFIG_DEBUG_VM is not set 1442# CONFIG_DEBUG_VM is not set
1448# CONFIG_DEBUG_LIST is not set 1443# CONFIG_DEBUG_LIST is not set
1444# CONFIG_DEBUG_SG is not set
1449CONFIG_FORCED_INLINING=y 1445CONFIG_FORCED_INLINING=y
1446# CONFIG_BOOT_PRINTK_DELAY is not set
1450# CONFIG_RCU_TORTURE_TEST is not set 1447# CONFIG_RCU_TORTURE_TEST is not set
1451# CONFIG_FAULT_INJECTION is not set 1448# CONFIG_FAULT_INJECTION is not set
1449# CONFIG_SAMPLES is not set
1452# CONFIG_DEBUG_STACKOVERFLOW is not set 1450# CONFIG_DEBUG_STACKOVERFLOW is not set
1453# CONFIG_DEBUG_STACK_USAGE is not set 1451# CONFIG_DEBUG_STACK_USAGE is not set
1454# CONFIG_DEBUG_PAGEALLOC is not set 1452# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1461,6 +1459,7 @@ CONFIG_FORCED_INLINING=y
1461# 1459#
1462# CONFIG_KEYS is not set 1460# CONFIG_KEYS is not set
1463# CONFIG_SECURITY is not set 1461# CONFIG_SECURITY is not set
1462# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1464CONFIG_CRYPTO=y 1463CONFIG_CRYPTO=y
1465CONFIG_CRYPTO_ALGAPI=y 1464CONFIG_CRYPTO_ALGAPI=y
1466CONFIG_CRYPTO_BLKCIPHER=y 1465CONFIG_CRYPTO_BLKCIPHER=y
@@ -1471,7 +1470,7 @@ CONFIG_CRYPTO_HMAC=y
1471# CONFIG_CRYPTO_NULL is not set 1470# CONFIG_CRYPTO_NULL is not set
1472# CONFIG_CRYPTO_MD4 is not set 1471# CONFIG_CRYPTO_MD4 is not set
1473CONFIG_CRYPTO_MD5=y 1472CONFIG_CRYPTO_MD5=y
1474# CONFIG_CRYPTO_SHA1 is not set 1473CONFIG_CRYPTO_SHA1=m
1475# CONFIG_CRYPTO_SHA256 is not set 1474# CONFIG_CRYPTO_SHA256 is not set
1476# CONFIG_CRYPTO_SHA512 is not set 1475# CONFIG_CRYPTO_SHA512 is not set
1477# CONFIG_CRYPTO_WP512 is not set 1476# CONFIG_CRYPTO_WP512 is not set
@@ -1481,6 +1480,7 @@ CONFIG_CRYPTO_MD5=y
1481CONFIG_CRYPTO_CBC=y 1480CONFIG_CRYPTO_CBC=y
1482CONFIG_CRYPTO_PCBC=m 1481CONFIG_CRYPTO_PCBC=m
1483# CONFIG_CRYPTO_LRW is not set 1482# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_XTS is not set
1484# CONFIG_CRYPTO_CRYPTD is not set 1484# CONFIG_CRYPTO_CRYPTD is not set
1485CONFIG_CRYPTO_DES=y 1485CONFIG_CRYPTO_DES=y
1486# CONFIG_CRYPTO_FCRYPT is not set 1486# CONFIG_CRYPTO_FCRYPT is not set
@@ -1494,9 +1494,12 @@ CONFIG_CRYPTO_DES=y
1494# CONFIG_CRYPTO_ARC4 is not set 1494# CONFIG_CRYPTO_ARC4 is not set
1495# CONFIG_CRYPTO_KHAZAD is not set 1495# CONFIG_CRYPTO_KHAZAD is not set
1496# CONFIG_CRYPTO_ANUBIS is not set 1496# CONFIG_CRYPTO_ANUBIS is not set
1497# CONFIG_CRYPTO_SEED is not set
1497# CONFIG_CRYPTO_DEFLATE is not set 1498# CONFIG_CRYPTO_DEFLATE is not set
1498# CONFIG_CRYPTO_MICHAEL_MIC is not set 1499# CONFIG_CRYPTO_MICHAEL_MIC is not set
1499# CONFIG_CRYPTO_CRC32C is not set 1500# CONFIG_CRYPTO_CRC32C is not set
1500# CONFIG_CRYPTO_CAMELLIA is not set 1501# CONFIG_CRYPTO_CAMELLIA is not set
1501# CONFIG_CRYPTO_TEST is not set 1502# CONFIG_CRYPTO_TEST is not set
1503# CONFIG_CRYPTO_AUTHENC is not set
1502CONFIG_CRYPTO_HW=y 1504CONFIG_CRYPTO_HW=y
1505# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 070b0a5b9c0d..a7ef231f2ab2 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:44 2007 4# Thu Dec 6 16:48:59 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,8 +18,13 @@ CONFIG_8xx=y
18# CONFIG_PPC_MM_SLICES is not set 18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32
21CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
22CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y
23CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
24CONFIG_IRQ_PER_CPU=y 29CONFIG_IRQ_PER_CPU=y
25CONFIG_RWSEM_XCHGADD_ALGORITHM=y 30CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -58,9 +63,12 @@ CONFIG_SYSVIPC_SYSCTL=y
58# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
59# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
60# CONFIG_USER_NS is not set 65# CONFIG_USER_NS is not set
66# CONFIG_PID_NS is not set
61# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
62# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
63CONFIG_LOG_BUF_SHIFT=14 69CONFIG_LOG_BUF_SHIFT=14
70# CONFIG_CGROUPS is not set
71# CONFIG_FAIR_GROUP_SCHED is not set
64CONFIG_SYSFS_DEPRECATED=y 72CONFIG_SYSFS_DEPRECATED=y
65# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
66# CONFIG_BLK_DEV_INITRD is not set 74# CONFIG_BLK_DEV_INITRD is not set
@@ -79,7 +87,6 @@ CONFIG_FUTEX=y
79CONFIG_ANON_INODES=y 87CONFIG_ANON_INODES=y
80# CONFIG_EPOLL is not set 88# CONFIG_EPOLL is not set
81CONFIG_SIGNALFD=y 89CONFIG_SIGNALFD=y
82CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 90CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 91CONFIG_SHMEM=y
85# CONFIG_VM_EVENT_COUNTERS is not set 92# CONFIG_VM_EVENT_COUNTERS is not set
@@ -121,6 +128,7 @@ CONFIG_CPM1=y
121# CONFIG_MPC8XXFADS is not set 128# CONFIG_MPC8XXFADS is not set
122CONFIG_MPC86XADS=y 129CONFIG_MPC86XADS=y
123# CONFIG_MPC885ADS is not set 130# CONFIG_MPC885ADS is not set
131# CONFIG_PPC_EP88XC is not set
124 132
125# 133#
126# MPC8xx CPM Options 134# MPC8xx CPM Options
@@ -131,6 +139,7 @@ CONFIG_MPC86XADS=y
131# 139#
132CONFIG_8xx_COPYBACK=y 140CONFIG_8xx_COPYBACK=y
133CONFIG_8xx_CPU6=y 141CONFIG_8xx_CPU6=y
142CONFIG_8xx_CPU15=y
134CONFIG_NO_UCODE_PATCH=y 143CONFIG_NO_UCODE_PATCH=y
135# CONFIG_USB_SOF_UCODE_PATCH is not set 144# CONFIG_USB_SOF_UCODE_PATCH is not set
136# CONFIG_I2C_SPI_UCODE_PATCH is not set 145# CONFIG_I2C_SPI_UCODE_PATCH is not set
@@ -148,11 +157,16 @@ CONFIG_NO_UCODE_PATCH=y
148# CONFIG_CPU_FREQ is not set 157# CONFIG_CPU_FREQ is not set
149# CONFIG_CPM2 is not set 158# CONFIG_CPM2 is not set
150# CONFIG_FSL_ULI1575 is not set 159# CONFIG_FSL_ULI1575 is not set
160CONFIG_CPM=y
151 161
152# 162#
153# Kernel options 163# Kernel options
154# 164#
155# CONFIG_HIGHMEM is not set 165# CONFIG_HIGHMEM is not set
166CONFIG_TICK_ONESHOT=y
167CONFIG_NO_HZ=y
168CONFIG_HIGH_RES_TIMERS=y
169CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
156# CONFIG_HZ_100 is not set 170# CONFIG_HZ_100 is not set
157# CONFIG_HZ_250 is not set 171# CONFIG_HZ_250 is not set
158# CONFIG_HZ_300 is not set 172# CONFIG_HZ_300 is not set
@@ -174,6 +188,7 @@ CONFIG_FLATMEM_MANUAL=y
174CONFIG_FLATMEM=y 188CONFIG_FLATMEM=y
175CONFIG_FLAT_NODE_MEM_MAP=y 189CONFIG_FLAT_NODE_MEM_MAP=y
176# CONFIG_SPARSEMEM_STATIC is not set 190# CONFIG_SPARSEMEM_STATIC is not set
191# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
177CONFIG_SPLIT_PTLOCK_CPUS=4 192CONFIG_SPLIT_PTLOCK_CPUS=4
178# CONFIG_RESOURCES_64BIT is not set 193# CONFIG_RESOURCES_64BIT is not set
179CONFIG_ZONE_DMA_FLAG=1 194CONFIG_ZONE_DMA_FLAG=1
@@ -182,8 +197,11 @@ CONFIG_VIRT_TO_BUS=y
182# CONFIG_PROC_DEVICETREE is not set 197# CONFIG_PROC_DEVICETREE is not set
183# CONFIG_CMDLINE_BOOL is not set 198# CONFIG_CMDLINE_BOOL is not set
184# CONFIG_PM is not set 199# CONFIG_PM is not set
200CONFIG_SUSPEND_UP_POSSIBLE=y
201CONFIG_HIBERNATION_UP_POSSIBLE=y
185# CONFIG_SECCOMP is not set 202# CONFIG_SECCOMP is not set
186# CONFIG_WANT_DEVICE_TREE is not set 203CONFIG_WANT_DEVICE_TREE=y
204CONFIG_DEVICE_TREE=""
187CONFIG_ISA_DMA_API=y 205CONFIG_ISA_DMA_API=y
188 206
189# 207#
@@ -198,10 +216,6 @@ CONFIG_FSL_SOC=y
198# CONFIG_ARCH_SUPPORTS_MSI is not set 216# CONFIG_ARCH_SUPPORTS_MSI is not set
199 217
200# 218#
201# PCCARD (PCMCIA/CardBus) support
202#
203
204#
205# Advanced setup 219# Advanced setup
206# 220#
207# CONFIG_ADVANCED_OPTIONS is not set 221# CONFIG_ADVANCED_OPTIONS is not set
@@ -213,7 +227,7 @@ CONFIG_HIGHMEM_START=0xfe000000
213CONFIG_LOWMEM_SIZE=0x30000000 227CONFIG_LOWMEM_SIZE=0x30000000
214CONFIG_KERNEL_START=0xc0000000 228CONFIG_KERNEL_START=0xc0000000
215CONFIG_TASK_SIZE=0x80000000 229CONFIG_TASK_SIZE=0x80000000
216CONFIG_CONSISTENT_START=0xff100000 230CONFIG_CONSISTENT_START=0xfd000000
217CONFIG_CONSISTENT_SIZE=0x00200000 231CONFIG_CONSISTENT_SIZE=0x00200000
218CONFIG_BOOT_LOAD=0x00400000 232CONFIG_BOOT_LOAD=0x00400000
219 233
@@ -254,6 +268,7 @@ CONFIG_SYN_COOKIES=y
254CONFIG_INET_XFRM_MODE_TRANSPORT=y 268CONFIG_INET_XFRM_MODE_TRANSPORT=y
255CONFIG_INET_XFRM_MODE_TUNNEL=y 269CONFIG_INET_XFRM_MODE_TUNNEL=y
256CONFIG_INET_XFRM_MODE_BEET=y 270CONFIG_INET_XFRM_MODE_BEET=y
271# CONFIG_INET_LRO is not set
257CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
258CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
259# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
@@ -279,10 +294,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_LAPB is not set 294# CONFIG_LAPB is not set
280# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
281# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
282
283#
284# QoS and/or fair queueing
285#
286# CONFIG_NET_SCHED is not set 297# CONFIG_NET_SCHED is not set
287 298
288# 299#
@@ -348,6 +359,7 @@ CONFIG_NETDEVICES=y
348# CONFIG_MACVLAN is not set 359# CONFIG_MACVLAN is not set
349# CONFIG_EQUALIZER is not set 360# CONFIG_EQUALIZER is not set
350# CONFIG_TUN is not set 361# CONFIG_TUN is not set
362# CONFIG_VETH is not set
351CONFIG_PHYLIB=y 363CONFIG_PHYLIB=y
352 364
353# 365#
@@ -365,11 +377,20 @@ CONFIG_PHYLIB=y
365CONFIG_FIXED_PHY=y 377CONFIG_FIXED_PHY=y
366CONFIG_FIXED_MII_10_FDX=y 378CONFIG_FIXED_MII_10_FDX=y
367CONFIG_FIXED_MII_100_FDX=y 379CONFIG_FIXED_MII_100_FDX=y
380# CONFIG_FIXED_MII_1000_FDX is not set
381CONFIG_FIXED_MII_AMNT=1
382# CONFIG_MDIO_BITBANG is not set
368CONFIG_NET_ETHERNET=y 383CONFIG_NET_ETHERNET=y
369CONFIG_MII=y 384CONFIG_MII=y
385# CONFIG_IBM_NEW_EMAC_ZMII is not set
386# CONFIG_IBM_NEW_EMAC_RGMII is not set
387# CONFIG_IBM_NEW_EMAC_TAH is not set
388# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
389# CONFIG_B44 is not set
370CONFIG_FS_ENET=y 390CONFIG_FS_ENET=y
371CONFIG_FS_ENET_HAS_SCC=y 391CONFIG_FS_ENET_HAS_SCC=y
372CONFIG_FS_ENET_HAS_FEC=y 392CONFIG_FS_ENET_HAS_FEC=y
393CONFIG_FS_ENET_MDIO_FEC=y
373CONFIG_NETDEV_1000=y 394CONFIG_NETDEV_1000=y
374CONFIG_NETDEV_10000=y 395CONFIG_NETDEV_10000=y
375 396
@@ -403,7 +424,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
403CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 424CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
404CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 425CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
405# CONFIG_INPUT_JOYDEV is not set 426# CONFIG_INPUT_JOYDEV is not set
406# CONFIG_INPUT_TSDEV is not set
407# CONFIG_INPUT_EVDEV is not set 427# CONFIG_INPUT_EVDEV is not set
408# CONFIG_INPUT_EVBUG is not set 428# CONFIG_INPUT_EVBUG is not set
409 429
@@ -470,7 +490,6 @@ CONFIG_SERIAL_CPM_SMC2=y
470CONFIG_UNIX98_PTYS=y 490CONFIG_UNIX98_PTYS=y
471# CONFIG_LEGACY_PTYS is not set 491# CONFIG_LEGACY_PTYS is not set
472# CONFIG_IPMI_HANDLER is not set 492# CONFIG_IPMI_HANDLER is not set
473# CONFIG_WATCHDOG is not set
474CONFIG_HW_RANDOM=y 493CONFIG_HW_RANDOM=y
475# CONFIG_NVRAM is not set 494# CONFIG_NVRAM is not set
476CONFIG_GEN_RTC=y 495CONFIG_GEN_RTC=y
@@ -489,9 +508,8 @@ CONFIG_GEN_RTC=y
489# CONFIG_POWER_SUPPLY is not set 508# CONFIG_POWER_SUPPLY is not set
490CONFIG_HWMON=y 509CONFIG_HWMON=y
491# CONFIG_HWMON_VID is not set 510# CONFIG_HWMON_VID is not set
492# CONFIG_SENSORS_ABITUGURU is not set
493# CONFIG_SENSORS_ABITUGURU3 is not set
494# CONFIG_SENSORS_F71805F is not set 511# CONFIG_SENSORS_F71805F is not set
512# CONFIG_SENSORS_F71882FG is not set
495# CONFIG_SENSORS_IT87 is not set 513# CONFIG_SENSORS_IT87 is not set
496# CONFIG_SENSORS_PC87360 is not set 514# CONFIG_SENSORS_PC87360 is not set
497# CONFIG_SENSORS_PC87427 is not set 515# CONFIG_SENSORS_PC87427 is not set
@@ -501,6 +519,13 @@ CONFIG_HWMON=y
501# CONFIG_SENSORS_W83627HF is not set 519# CONFIG_SENSORS_W83627HF is not set
502# CONFIG_SENSORS_W83627EHF is not set 520# CONFIG_SENSORS_W83627EHF is not set
503# CONFIG_HWMON_DEBUG_CHIP is not set 521# CONFIG_HWMON_DEBUG_CHIP is not set
522# CONFIG_WATCHDOG is not set
523
524#
525# Sonics Silicon Backplane
526#
527CONFIG_SSB_POSSIBLE=y
528# CONFIG_SSB is not set
504 529
505# 530#
506# Multifunction device drivers 531# Multifunction device drivers
@@ -517,16 +542,15 @@ CONFIG_DAB=y
517# 542#
518# Graphics support 543# Graphics support
519# 544#
545# CONFIG_VGASTATE is not set
546CONFIG_VIDEO_OUTPUT_CONTROL=y
547# CONFIG_FB is not set
520# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 548# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
521 549
522# 550#
523# Display device support 551# Display device support
524# 552#
525# CONFIG_DISPLAY_SUPPORT is not set 553# CONFIG_DISPLAY_SUPPORT is not set
526# CONFIG_VGASTATE is not set
527CONFIG_VIDEO_OUTPUT_CONTROL=y
528# CONFIG_FB is not set
529# CONFIG_FB_IBM_GXT4500 is not set
530 554
531# 555#
532# Sound 556# Sound
@@ -535,6 +559,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
535CONFIG_HID_SUPPORT=y 559CONFIG_HID_SUPPORT=y
536CONFIG_HID=y 560CONFIG_HID=y
537# CONFIG_HID_DEBUG is not set 561# CONFIG_HID_DEBUG is not set
562# CONFIG_HIDRAW is not set
538CONFIG_USB_SUPPORT=y 563CONFIG_USB_SUPPORT=y
539# CONFIG_USB_ARCH_HAS_HCD is not set 564# CONFIG_USB_ARCH_HAS_HCD is not set
540# CONFIG_USB_ARCH_HAS_OHCI is not set 565# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -554,19 +579,6 @@ CONFIG_USB_SUPPORT=y
554# CONFIG_RTC_CLASS is not set 579# CONFIG_RTC_CLASS is not set
555 580
556# 581#
557# DMA Engine support
558#
559# CONFIG_DMA_ENGINE is not set
560
561#
562# DMA Clients
563#
564
565#
566# DMA Devices
567#
568
569#
570# Userspace I/O 582# Userspace I/O
571# 583#
572# CONFIG_UIO is not set 584# CONFIG_UIO is not set
@@ -585,7 +597,6 @@ CONFIG_EXT3_FS_XATTR=y
585# CONFIG_EXT3_FS_SECURITY is not set 597# CONFIG_EXT3_FS_SECURITY is not set
586# CONFIG_EXT4DEV_FS is not set 598# CONFIG_EXT4DEV_FS is not set
587CONFIG_JBD=y 599CONFIG_JBD=y
588# CONFIG_JBD_DEBUG is not set
589CONFIG_FS_MBCACHE=y 600CONFIG_FS_MBCACHE=y
590# CONFIG_REISERFS_FS is not set 601# CONFIG_REISERFS_FS is not set
591# CONFIG_JFS_FS is not set 602# CONFIG_JFS_FS is not set
@@ -626,7 +637,6 @@ CONFIG_SYSFS=y
626CONFIG_TMPFS=y 637CONFIG_TMPFS=y
627# CONFIG_TMPFS_POSIX_ACL is not set 638# CONFIG_TMPFS_POSIX_ACL is not set
628# CONFIG_HUGETLB_PAGE is not set 639# CONFIG_HUGETLB_PAGE is not set
629CONFIG_RAMFS=y
630# CONFIG_CONFIGFS_FS is not set 640# CONFIG_CONFIGFS_FS is not set
631 641
632# 642#
@@ -645,10 +655,7 @@ CONFIG_CRAMFS=y
645# CONFIG_QNX4FS_FS is not set 655# CONFIG_QNX4FS_FS is not set
646# CONFIG_SYSV_FS is not set 656# CONFIG_SYSV_FS is not set
647# CONFIG_UFS_FS is not set 657# CONFIG_UFS_FS is not set
648 658CONFIG_NETWORK_FILESYSTEMS=y
649#
650# Network File Systems
651#
652CONFIG_NFS_FS=y 659CONFIG_NFS_FS=y
653CONFIG_NFS_V3=y 660CONFIG_NFS_V3=y
654# CONFIG_NFS_V3_ACL is not set 661# CONFIG_NFS_V3_ACL is not set
@@ -690,15 +697,7 @@ CONFIG_MSDOS_PARTITION=y
690# CONFIG_KARMA_PARTITION is not set 697# CONFIG_KARMA_PARTITION is not set
691# CONFIG_EFI_PARTITION is not set 698# CONFIG_EFI_PARTITION is not set
692# CONFIG_SYSV68_PARTITION is not set 699# CONFIG_SYSV68_PARTITION is not set
693
694#
695# Native Language Support
696#
697# CONFIG_NLS is not set 700# CONFIG_NLS is not set
698
699#
700# Distributed Lock Manager
701#
702# CONFIG_DLM is not set 701# CONFIG_DLM is not set
703# CONFIG_UCC_SLOW is not set 702# CONFIG_UCC_SLOW is not set
704 703
@@ -717,22 +716,21 @@ CONFIG_PLIST=y
717CONFIG_HAS_IOMEM=y 716CONFIG_HAS_IOMEM=y
718CONFIG_HAS_IOPORT=y 717CONFIG_HAS_IOPORT=y
719CONFIG_HAS_DMA=y 718CONFIG_HAS_DMA=y
720 719# CONFIG_INSTRUMENTATION is not set
721#
722# Instrumentation Support
723#
724# CONFIG_PROFILING is not set
725 720
726# 721#
727# Kernel hacking 722# Kernel hacking
728# 723#
729# CONFIG_PRINTK_TIME is not set 724# CONFIG_PRINTK_TIME is not set
725CONFIG_ENABLE_WARN_DEPRECATED=y
730CONFIG_ENABLE_MUST_CHECK=y 726CONFIG_ENABLE_MUST_CHECK=y
731# CONFIG_MAGIC_SYSRQ is not set 727# CONFIG_MAGIC_SYSRQ is not set
732# CONFIG_UNUSED_SYMBOLS is not set 728# CONFIG_UNUSED_SYMBOLS is not set
733# CONFIG_DEBUG_FS is not set 729# CONFIG_DEBUG_FS is not set
734# CONFIG_HEADERS_CHECK is not set 730# CONFIG_HEADERS_CHECK is not set
735# CONFIG_DEBUG_KERNEL is not set 731# CONFIG_DEBUG_KERNEL is not set
732# CONFIG_SLUB_DEBUG_ON is not set
733# CONFIG_SAMPLES is not set
736# CONFIG_PPC_EARLY_DEBUG is not set 734# CONFIG_PPC_EARLY_DEBUG is not set
737 735
738# 736#
@@ -740,4 +738,7 @@ CONFIG_ENABLE_MUST_CHECK=y
740# 738#
741# CONFIG_KEYS is not set 739# CONFIG_KEYS is not set
742# CONFIG_SECURITY is not set 740# CONFIG_SECURITY is not set
741# CONFIG_SECURITY_FILE_CAPABILITIES is not set
743# CONFIG_CRYPTO is not set 742# CONFIG_CRYPTO is not set
743# CONFIG_PPC_CLOCK is not set
744CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 482d99db6870..22f8171d6d45 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_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.23-rc3 3# Linux kernel version: 2.6.24-rc4
4# Mon Aug 27 15:23:16 2007 4# Thu Dec 6 16:49:01 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,8 +18,13 @@ CONFIG_8xx=y
18# CONFIG_PPC_MM_SLICES is not set 18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32
21CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
22CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y
23CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
24CONFIG_IRQ_PER_CPU=y 29CONFIG_IRQ_PER_CPU=y
25CONFIG_RWSEM_XCHGADD_ALGORITHM=y 30CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -59,9 +64,12 @@ CONFIG_SYSVIPC_SYSCTL=y
59# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
60# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
61# CONFIG_USER_NS is not set 66# CONFIG_USER_NS is not set
67# CONFIG_PID_NS is not set
62# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
63# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
64CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set
72# CONFIG_FAIR_GROUP_SCHED is not set
65CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
66# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
67# CONFIG_BLK_DEV_INITRD is not set 75# CONFIG_BLK_DEV_INITRD is not set
@@ -81,7 +89,6 @@ CONFIG_BUG=y
81CONFIG_ANON_INODES=y 89CONFIG_ANON_INODES=y
82CONFIG_EPOLL=y 90CONFIG_EPOLL=y
83CONFIG_SIGNALFD=y 91CONFIG_SIGNALFD=y
84CONFIG_TIMERFD=y
85CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
86CONFIG_SHMEM=y 93CONFIG_SHMEM=y
87# CONFIG_VM_EVENT_COUNTERS is not set 94# CONFIG_VM_EVENT_COUNTERS is not set
@@ -158,11 +165,17 @@ CONFIG_NO_UCODE_PATCH=y
158# CONFIG_CPU_FREQ is not set 165# CONFIG_CPU_FREQ is not set
159# CONFIG_CPM2 is not set 166# CONFIG_CPM2 is not set
160CONFIG_PPC_CPM_NEW_BINDING=y 167CONFIG_PPC_CPM_NEW_BINDING=y
168# CONFIG_FSL_ULI1575 is not set
169CONFIG_CPM=y
161 170
162# 171#
163# Kernel options 172# Kernel options
164# 173#
165# CONFIG_HIGHMEM is not set 174# CONFIG_HIGHMEM is not set
175CONFIG_TICK_ONESHOT=y
176CONFIG_NO_HZ=y
177CONFIG_HIGH_RES_TIMERS=y
178CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
166CONFIG_HZ_100=y 179CONFIG_HZ_100=y
167# CONFIG_HZ_250 is not set 180# CONFIG_HZ_250 is not set
168# CONFIG_HZ_300 is not set 181# CONFIG_HZ_300 is not set
@@ -174,6 +187,7 @@ CONFIG_PREEMPT_NONE=y
174CONFIG_BINFMT_ELF=y 187CONFIG_BINFMT_ELF=y
175# CONFIG_BINFMT_MISC is not set 188# CONFIG_BINFMT_MISC is not set
176# CONFIG_MATH_EMULATION is not set 189# CONFIG_MATH_EMULATION is not set
190CONFIG_8XX_MINIMAL_FPEMU=y
177CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 191CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
178CONFIG_ARCH_FLATMEM_ENABLE=y 192CONFIG_ARCH_FLATMEM_ENABLE=y
179CONFIG_ARCH_POPULATES_NODE_MAP=y 193CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -184,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
187CONFIG_SPLIT_PTLOCK_CPUS=4 202CONFIG_SPLIT_PTLOCK_CPUS=4
188# CONFIG_RESOURCES_64BIT is not set 203# CONFIG_RESOURCES_64BIT is not set
189CONFIG_ZONE_DMA_FLAG=1 204CONFIG_ZONE_DMA_FLAG=1
@@ -192,6 +207,8 @@ CONFIG_VIRT_TO_BUS=y
192CONFIG_PROC_DEVICETREE=y 207CONFIG_PROC_DEVICETREE=y
193# CONFIG_CMDLINE_BOOL is not set 208# CONFIG_CMDLINE_BOOL is not set
194# CONFIG_PM is not set 209# CONFIG_PM is not set
210CONFIG_SUSPEND_UP_POSSIBLE=y
211CONFIG_HIBERNATION_UP_POSSIBLE=y
195# CONFIG_SECCOMP is not set 212# CONFIG_SECCOMP is not set
196CONFIG_WANT_DEVICE_TREE=y 213CONFIG_WANT_DEVICE_TREE=y
197CONFIG_DEVICE_TREE="mpc885ads.dts" 214CONFIG_DEVICE_TREE="mpc885ads.dts"
@@ -207,10 +224,6 @@ CONFIG_FSL_SOC=y
207# CONFIG_PCI_SYSCALL is not set 224# CONFIG_PCI_SYSCALL is not set
208# CONFIG_PCI_QSPAN is not set 225# CONFIG_PCI_QSPAN is not set
209# CONFIG_ARCH_SUPPORTS_MSI is not set 226# CONFIG_ARCH_SUPPORTS_MSI is not set
210
211#
212# PCCARD (PCMCIA/CardBus) support
213#
214# CONFIG_PCCARD is not set 227# CONFIG_PCCARD is not set
215 228
216# 229#
@@ -225,7 +238,7 @@ CONFIG_HIGHMEM_START=0xfe000000
225CONFIG_LOWMEM_SIZE=0x30000000 238CONFIG_LOWMEM_SIZE=0x30000000
226CONFIG_KERNEL_START=0xc0000000 239CONFIG_KERNEL_START=0xc0000000
227CONFIG_TASK_SIZE=0x80000000 240CONFIG_TASK_SIZE=0x80000000
228CONFIG_CONSISTENT_START=0xff100000 241CONFIG_CONSISTENT_START=0xfd000000
229CONFIG_CONSISTENT_SIZE=0x00200000 242CONFIG_CONSISTENT_SIZE=0x00200000
230CONFIG_BOOT_LOAD=0x00400000 243CONFIG_BOOT_LOAD=0x00400000
231 244
@@ -262,6 +275,7 @@ CONFIG_SYN_COOKIES=y
262# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 275# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
263# CONFIG_INET_XFRM_MODE_TUNNEL is not set 276# CONFIG_INET_XFRM_MODE_TUNNEL is not set
264# CONFIG_INET_XFRM_MODE_BEET is not set 277# CONFIG_INET_XFRM_MODE_BEET is not set
278# CONFIG_INET_LRO is not set
265CONFIG_INET_DIAG=y 279CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y 280CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set 281# CONFIG_TCP_CONG_ADVANCED is not set
@@ -287,10 +301,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
287# CONFIG_LAPB is not set 301# CONFIG_LAPB is not set
288# CONFIG_ECONET is not set 302# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 303# CONFIG_WAN_ROUTER is not set
290
291#
292# QoS and/or fair queueing
293#
294# CONFIG_NET_SCHED is not set 304# CONFIG_NET_SCHED is not set
295 305
296# 306#
@@ -319,6 +329,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
319# 329#
320# Generic Driver Options 330# Generic Driver Options
321# 331#
332CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
322CONFIG_STANDALONE=y 333CONFIG_STANDALONE=y
323CONFIG_PREVENT_FIRMWARE_BUILD=y 334CONFIG_PREVENT_FIRMWARE_BUILD=y
324# CONFIG_FW_LOADER is not set 335# CONFIG_FW_LOADER is not set
@@ -342,6 +353,7 @@ CONFIG_MTD_BLOCK=y
342# CONFIG_INFTL is not set 353# CONFIG_INFTL is not set
343# CONFIG_RFD_FTL is not set 354# CONFIG_RFD_FTL is not set
344# CONFIG_SSFDC is not set 355# CONFIG_SSFDC is not set
356# CONFIG_MTD_OOPS is not set
345 357
346# 358#
347# RAM/ROM/Flash chip drivers 359# RAM/ROM/Flash chip drivers
@@ -425,6 +437,7 @@ CONFIG_NETDEVICES=y
425# CONFIG_MACVLAN is not set 437# CONFIG_MACVLAN is not set
426# CONFIG_EQUALIZER is not set 438# CONFIG_EQUALIZER is not set
427# CONFIG_TUN is not set 439# CONFIG_TUN is not set
440# CONFIG_VETH is not set
428CONFIG_PHYLIB=y 441CONFIG_PHYLIB=y
429 442
430# 443#
@@ -443,9 +456,15 @@ CONFIG_DAVICOM_PHY=y
443# CONFIG_MDIO_BITBANG is not set 456# CONFIG_MDIO_BITBANG is not set
444CONFIG_NET_ETHERNET=y 457CONFIG_NET_ETHERNET=y
445CONFIG_MII=y 458CONFIG_MII=y
459# CONFIG_IBM_NEW_EMAC_ZMII is not set
460# CONFIG_IBM_NEW_EMAC_RGMII is not set
461# CONFIG_IBM_NEW_EMAC_TAH is not set
462# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
463# CONFIG_B44 is not set
446CONFIG_FS_ENET=y 464CONFIG_FS_ENET=y
447# CONFIG_FS_ENET_HAS_SCC is not set 465# CONFIG_FS_ENET_HAS_SCC is not set
448CONFIG_FS_ENET_HAS_FEC=y 466CONFIG_FS_ENET_HAS_FEC=y
467CONFIG_FS_ENET_MDIO_FEC=y
449# CONFIG_NETDEV_1000 is not set 468# CONFIG_NETDEV_1000 is not set
450# CONFIG_NETDEV_10000 is not set 469# CONFIG_NETDEV_10000 is not set
451 470
@@ -503,7 +522,6 @@ CONFIG_SERIAL_CPM_SMC2=y
503CONFIG_UNIX98_PTYS=y 522CONFIG_UNIX98_PTYS=y
504# CONFIG_LEGACY_PTYS is not set 523# CONFIG_LEGACY_PTYS is not set
505# CONFIG_IPMI_HANDLER is not set 524# CONFIG_IPMI_HANDLER is not set
506# CONFIG_WATCHDOG is not set
507CONFIG_HW_RANDOM=y 525CONFIG_HW_RANDOM=y
508# CONFIG_NVRAM is not set 526# CONFIG_NVRAM is not set
509CONFIG_GEN_RTC=y 527CONFIG_GEN_RTC=y
@@ -521,6 +539,13 @@ CONFIG_GEN_RTC=y
521# CONFIG_W1 is not set 539# CONFIG_W1 is not set
522# CONFIG_POWER_SUPPLY is not set 540# CONFIG_POWER_SUPPLY is not set
523# CONFIG_HWMON is not set 541# CONFIG_HWMON is not set
542# CONFIG_WATCHDOG is not set
543
544#
545# Sonics Silicon Backplane
546#
547CONFIG_SSB_POSSIBLE=y
548# CONFIG_SSB is not set
524 549
525# 550#
526# Multifunction device drivers 551# Multifunction device drivers
@@ -537,16 +562,15 @@ CONFIG_DAB=y
537# 562#
538# Graphics support 563# Graphics support
539# 564#
565# CONFIG_VGASTATE is not set
566# CONFIG_VIDEO_OUTPUT_CONTROL is not set
567# CONFIG_FB is not set
540# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 568# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
541 569
542# 570#
543# Display device support 571# Display device support
544# 572#
545# CONFIG_DISPLAY_SUPPORT is not set 573# CONFIG_DISPLAY_SUPPORT is not set
546# CONFIG_VGASTATE is not set
547# CONFIG_VIDEO_OUTPUT_CONTROL is not set
548# CONFIG_FB is not set
549# CONFIG_FB_IBM_GXT4500 is not set
550 574
551# 575#
552# Sound 576# Sound
@@ -559,19 +583,6 @@ CONFIG_DAB=y
559# CONFIG_RTC_CLASS is not set 583# CONFIG_RTC_CLASS is not set
560 584
561# 585#
562# DMA Engine support
563#
564# CONFIG_DMA_ENGINE is not set
565
566#
567# DMA Clients
568#
569
570#
571# DMA Devices
572#
573
574#
575# Userspace I/O 586# Userspace I/O
576# 587#
577# CONFIG_UIO is not set 588# CONFIG_UIO is not set
@@ -620,7 +631,6 @@ CONFIG_SYSFS=y
620CONFIG_TMPFS=y 631CONFIG_TMPFS=y
621# CONFIG_TMPFS_POSIX_ACL is not set 632# CONFIG_TMPFS_POSIX_ACL is not set
622# CONFIG_HUGETLB_PAGE is not set 633# CONFIG_HUGETLB_PAGE is not set
623CONFIG_RAMFS=y
624# CONFIG_CONFIGFS_FS is not set 634# CONFIG_CONFIGFS_FS is not set
625 635
626# 636#
@@ -640,10 +650,7 @@ CONFIG_CRAMFS=y
640# CONFIG_QNX4FS_FS is not set 650# CONFIG_QNX4FS_FS is not set
641# CONFIG_SYSV_FS is not set 651# CONFIG_SYSV_FS is not set
642# CONFIG_UFS_FS is not set 652# CONFIG_UFS_FS is not set
643 653CONFIG_NETWORK_FILESYSTEMS=y
644#
645# Network File Systems
646#
647CONFIG_NFS_FS=y 654CONFIG_NFS_FS=y
648CONFIG_NFS_V3=y 655CONFIG_NFS_V3=y
649# CONFIG_NFS_V3_ACL is not set 656# CONFIG_NFS_V3_ACL is not set
@@ -685,15 +692,7 @@ CONFIG_MSDOS_PARTITION=y
685# CONFIG_KARMA_PARTITION is not set 692# CONFIG_KARMA_PARTITION is not set
686# CONFIG_EFI_PARTITION is not set 693# CONFIG_EFI_PARTITION is not set
687# CONFIG_SYSV68_PARTITION is not set 694# CONFIG_SYSV68_PARTITION is not set
688
689#
690# Native Language Support
691#
692# CONFIG_NLS is not set 695# CONFIG_NLS is not set
693
694#
695# Distributed Lock Manager
696#
697# CONFIG_DLM is not set 696# CONFIG_DLM is not set
698# CONFIG_UCC_SLOW is not set 697# CONFIG_UCC_SLOW is not set
699 698
@@ -710,16 +709,13 @@ CONFIG_ZLIB_INFLATE=y
710CONFIG_HAS_IOMEM=y 709CONFIG_HAS_IOMEM=y
711CONFIG_HAS_IOPORT=y 710CONFIG_HAS_IOPORT=y
712CONFIG_HAS_DMA=y 711CONFIG_HAS_DMA=y
713 712# CONFIG_INSTRUMENTATION is not set
714#
715# Instrumentation Support
716#
717# CONFIG_PROFILING is not set
718 713
719# 714#
720# Kernel hacking 715# Kernel hacking
721# 716#
722# CONFIG_PRINTK_TIME is not set 717# CONFIG_PRINTK_TIME is not set
718CONFIG_ENABLE_WARN_DEPRECATED=y
723CONFIG_ENABLE_MUST_CHECK=y 719CONFIG_ENABLE_MUST_CHECK=y
724CONFIG_MAGIC_SYSRQ=y 720CONFIG_MAGIC_SYSRQ=y
725# CONFIG_UNUSED_SYMBOLS is not set 721# CONFIG_UNUSED_SYMBOLS is not set
@@ -741,8 +737,11 @@ CONFIG_DEBUG_BUGVERBOSE=y
741CONFIG_DEBUG_INFO=y 737CONFIG_DEBUG_INFO=y
742# CONFIG_DEBUG_VM is not set 738# CONFIG_DEBUG_VM is not set
743# CONFIG_DEBUG_LIST is not set 739# CONFIG_DEBUG_LIST is not set
740# CONFIG_DEBUG_SG is not set
744CONFIG_FORCED_INLINING=y 741CONFIG_FORCED_INLINING=y
742# CONFIG_BOOT_PRINTK_DELAY is not set
745# CONFIG_FAULT_INJECTION is not set 743# CONFIG_FAULT_INJECTION is not set
744# CONFIG_SAMPLES is not set
746# CONFIG_DEBUG_STACKOVERFLOW is not set 745# CONFIG_DEBUG_STACKOVERFLOW is not set
747# CONFIG_DEBUG_STACK_USAGE is not set 746# CONFIG_DEBUG_STACK_USAGE is not set
748# CONFIG_DEBUG_PAGEALLOC is not set 747# CONFIG_DEBUG_PAGEALLOC is not set
@@ -755,4 +754,7 @@ CONFIG_FORCED_INLINING=y
755# 754#
756# CONFIG_KEYS is not set 755# CONFIG_KEYS is not set
757# CONFIG_SECURITY is not set 756# CONFIG_SECURITY is not set
757# CONFIG_SECURITY_FILE_CAPABILITIES is not set
758# CONFIG_CRYPTO is not set 758# CONFIG_CRYPTO is not set
759# CONFIG_PPC_CLOCK is not set
760CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 78c968aade4e..292de3d6ce92 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_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.24-rc2 3# Linux kernel version: 2.6.24-rc4
4# Tue Nov 6 23:23:50 2007 4# Thu Dec 6 16:49:03 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -68,6 +68,7 @@ CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 69# CONFIG_TASKSTATS is not set
70# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=17 74CONFIG_LOG_BUF_SHIFT=17
@@ -211,6 +212,7 @@ CONFIG_PREEMPT_NONE=y
211CONFIG_BINFMT_ELF=y 212CONFIG_BINFMT_ELF=y
212# CONFIG_BINFMT_MISC is not set 213# CONFIG_BINFMT_MISC is not set
213CONFIG_FORCE_MAX_ZONEORDER=9 214CONFIG_FORCE_MAX_ZONEORDER=9
215CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
214CONFIG_IOMMU_VMERGE=y 216CONFIG_IOMMU_VMERGE=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216# CONFIG_KEXEC is not set 218# CONFIG_KEXEC is not set
@@ -774,7 +776,6 @@ CONFIG_PASEMI_MAC=y
774# CONFIG_USB_KAWETH is not set 776# CONFIG_USB_KAWETH is not set
775# CONFIG_USB_PEGASUS is not set 777# CONFIG_USB_PEGASUS is not set
776# CONFIG_USB_RTL8150 is not set 778# CONFIG_USB_RTL8150 is not set
777# CONFIG_USB_USBNET_MII is not set
778# CONFIG_USB_USBNET is not set 779# CONFIG_USB_USBNET is not set
779# CONFIG_NET_PCMCIA is not set 780# CONFIG_NET_PCMCIA is not set
780# CONFIG_WAN is not set 781# CONFIG_WAN is not set
@@ -958,6 +959,7 @@ CONFIG_HWMON_VID=y
958# CONFIG_SENSORS_ADT7470 is not set 959# CONFIG_SENSORS_ADT7470 is not set
959# CONFIG_SENSORS_ATXP1 is not set 960# CONFIG_SENSORS_ATXP1 is not set
960# CONFIG_SENSORS_DS1621 is not set 961# CONFIG_SENSORS_DS1621 is not set
962# CONFIG_SENSORS_I5K_AMB is not set
961# CONFIG_SENSORS_F71805F is not set 963# CONFIG_SENSORS_F71805F is not set
962# CONFIG_SENSORS_F71882FG is not set 964# CONFIG_SENSORS_F71882FG is not set
963# CONFIG_SENSORS_F75375S is not set 965# CONFIG_SENSORS_F75375S is not set
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 8e5988c4a164..5416be4419bb 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:44:46 2007 4# Thu Dec 6 16:49:05 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,10 +68,15 @@ CONFIG_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
65# CONFIG_USER_NS is not set 70# CONFIG_USER_NS is not set
71# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
69CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set
77CONFIG_FAIR_GROUP_SCHED=y
78CONFIG_FAIR_USER_SCHED=y
79# CONFIG_FAIR_CGROUP_SCHED is not set
70CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
72CONFIG_BLK_DEV_INITRD=y 82CONFIG_BLK_DEV_INITRD=y
@@ -87,7 +97,6 @@ CONFIG_FUTEX=y
87CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 98CONFIG_EPOLL=y
89CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
90CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 101CONFIG_SHMEM=y
93CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
@@ -127,7 +136,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
127# Platform support 136# Platform support
128# 137#
129CONFIG_PPC_MULTIPLATFORM=y 138CONFIG_PPC_MULTIPLATFORM=y
130# CONFIG_EMBEDDED6xx is not set
131# CONFIG_PPC_82xx is not set 139# CONFIG_PPC_82xx is not set
132# CONFIG_PPC_83xx is not set 140# CONFIG_PPC_83xx is not set
133# CONFIG_PPC_86xx is not set 141# CONFIG_PPC_86xx is not set
@@ -141,6 +149,7 @@ CONFIG_PPC_PMAC=y
141# CONFIG_PPC_CELL is not set 149# CONFIG_PPC_CELL is not set
142# CONFIG_PPC_CELL_NATIVE is not set 150# CONFIG_PPC_CELL_NATIVE is not set
143# CONFIG_PQ2ADS is not set 151# CONFIG_PQ2ADS is not set
152# CONFIG_EMBEDDED6xx is not set
144CONFIG_PPC_NATIVE=y 153CONFIG_PPC_NATIVE=y
145CONFIG_MPIC=y 154CONFIG_MPIC=y
146# CONFIG_MPIC_WEIRD is not set 155# CONFIG_MPIC_WEIRD is not set
@@ -158,6 +167,8 @@ CONFIG_CPU_FREQ_STAT=y
158# CONFIG_CPU_FREQ_STAT_DETAILS is not set 167# CONFIG_CPU_FREQ_STAT_DETAILS is not set
159CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y 168CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
160# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set 169# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
170# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
171# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
161CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 172CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
162CONFIG_CPU_FREQ_GOV_POWERSAVE=y 173CONFIG_CPU_FREQ_GOV_POWERSAVE=y
163CONFIG_CPU_FREQ_GOV_USERSPACE=y 174CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -177,6 +188,10 @@ CONFIG_PPC601_SYNC_FIX=y
177# Kernel options 188# Kernel options
178# 189#
179# CONFIG_HIGHMEM is not set 190# CONFIG_HIGHMEM is not set
191CONFIG_TICK_ONESHOT=y
192CONFIG_NO_HZ=y
193CONFIG_HIGH_RES_TIMERS=y
194CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
180# CONFIG_HZ_100 is not set 195# CONFIG_HZ_100 is not set
181CONFIG_HZ_250=y 196CONFIG_HZ_250=y
182# CONFIG_HZ_300 is not set 197# CONFIG_HZ_300 is not set
@@ -198,6 +213,7 @@ CONFIG_FLATMEM_MANUAL=y
198CONFIG_FLATMEM=y 213CONFIG_FLATMEM=y
199CONFIG_FLAT_NODE_MEM_MAP=y 214CONFIG_FLAT_NODE_MEM_MAP=y
200# CONFIG_SPARSEMEM_STATIC is not set 215# CONFIG_SPARSEMEM_STATIC is not set
216# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4 217CONFIG_SPLIT_PTLOCK_CPUS=4
202# CONFIG_RESOURCES_64BIT is not set 218# CONFIG_RESOURCES_64BIT is not set
203CONFIG_ZONE_DMA_FLAG=1 219CONFIG_ZONE_DMA_FLAG=1
@@ -210,7 +226,9 @@ CONFIG_PM=y
210CONFIG_PM_DEBUG=y 226CONFIG_PM_DEBUG=y
211# CONFIG_PM_VERBOSE is not set 227# CONFIG_PM_VERBOSE is not set
212CONFIG_PM_SLEEP=y 228CONFIG_PM_SLEEP=y
229CONFIG_SUSPEND_UP_POSSIBLE=y
213CONFIG_SUSPEND=y 230CONFIG_SUSPEND=y
231CONFIG_HIBERNATION_UP_POSSIBLE=y
214CONFIG_HIBERNATION=y 232CONFIG_HIBERNATION=y
215CONFIG_PM_STD_PARTITION="" 233CONFIG_PM_STD_PARTITION=""
216CONFIG_APM_EMULATION=y 234CONFIG_APM_EMULATION=y
@@ -230,11 +248,8 @@ CONFIG_PCI_SYSCALL=y
230# CONFIG_PCIEPORTBUS is not set 248# CONFIG_PCIEPORTBUS is not set
231CONFIG_ARCH_SUPPORTS_MSI=y 249CONFIG_ARCH_SUPPORTS_MSI=y
232# CONFIG_PCI_MSI is not set 250# CONFIG_PCI_MSI is not set
251CONFIG_PCI_LEGACY=y
233# CONFIG_PCI_DEBUG is not set 252# CONFIG_PCI_DEBUG is not set
234
235#
236# PCCARD (PCMCIA/CardBus) support
237#
238CONFIG_PCCARD=m 253CONFIG_PCCARD=m
239# CONFIG_PCMCIA_DEBUG is not set 254# CONFIG_PCMCIA_DEBUG is not set
240CONFIG_PCMCIA=m 255CONFIG_PCMCIA=m
@@ -267,7 +282,7 @@ CONFIG_PCCARD_NONSTATIC=m
267CONFIG_HIGHMEM_START=0xfe000000 282CONFIG_HIGHMEM_START=0xfe000000
268CONFIG_LOWMEM_SIZE=0x30000000 283CONFIG_LOWMEM_SIZE=0x30000000
269CONFIG_KERNEL_START=0xc0000000 284CONFIG_KERNEL_START=0xc0000000
270CONFIG_TASK_SIZE=0x80000000 285CONFIG_TASK_SIZE=0xc0000000
271CONFIG_BOOT_LOAD=0x00800000 286CONFIG_BOOT_LOAD=0x00800000
272 287
273# 288#
@@ -305,6 +320,7 @@ CONFIG_INET_ESP=y
305# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 320# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
306# CONFIG_INET_XFRM_MODE_TUNNEL is not set 321# CONFIG_INET_XFRM_MODE_TUNNEL is not set
307CONFIG_INET_XFRM_MODE_BEET=y 322CONFIG_INET_XFRM_MODE_BEET=y
323# CONFIG_INET_LRO is not set
308CONFIG_INET_DIAG=y 324CONFIG_INET_DIAG=y
309CONFIG_INET_TCP_DIAG=y 325CONFIG_INET_TCP_DIAG=y
310# CONFIG_TCP_CONG_ADVANCED is not set 326# CONFIG_TCP_CONG_ADVANCED is not set
@@ -372,6 +388,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
372# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 388# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
373CONFIG_NETFILTER_XT_MATCH_STRING=m 389CONFIG_NETFILTER_XT_MATCH_STRING=m
374CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 390CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
391CONFIG_NETFILTER_XT_MATCH_TIME=m
375CONFIG_NETFILTER_XT_MATCH_U32=m 392CONFIG_NETFILTER_XT_MATCH_U32=m
376# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 393# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
377 394
@@ -448,13 +465,9 @@ CONFIG_IP_DCCP_CCID3_RTO=100
448# CONFIG_LAPB is not set 465# CONFIG_LAPB is not set
449# CONFIG_ECONET is not set 466# CONFIG_ECONET is not set
450# CONFIG_WAN_ROUTER is not set 467# CONFIG_WAN_ROUTER is not set
451
452#
453# QoS and/or fair queueing
454#
455# CONFIG_NET_SCHED is not set 468# CONFIG_NET_SCHED is not set
456CONFIG_NET_SCH_FIFO=y
457CONFIG_NET_CLS_ROUTE=y 469CONFIG_NET_CLS_ROUTE=y
470CONFIG_NET_SCH_FIFO=y
458 471
459# 472#
460# Network testing 473# Network testing
@@ -492,6 +505,8 @@ CONFIG_IRTTY_SIR=m
492# 505#
493# CONFIG_DONGLE is not set 506# CONFIG_DONGLE is not set
494# CONFIG_KINGSUN_DONGLE is not set 507# CONFIG_KINGSUN_DONGLE is not set
508# CONFIG_KSDAZZLE_DONGLE is not set
509# CONFIG_KS959_DONGLE is not set
495 510
496# 511#
497# Old SIR device drivers 512# Old SIR device drivers
@@ -545,8 +560,10 @@ CONFIG_BT_HCIBFUSB=m
545# Wireless 560# Wireless
546# 561#
547CONFIG_CFG80211=m 562CONFIG_CFG80211=m
563CONFIG_NL80211=y
548CONFIG_WIRELESS_EXT=y 564CONFIG_WIRELESS_EXT=y
549CONFIG_MAC80211=m 565CONFIG_MAC80211=m
566CONFIG_MAC80211_RCSIMPLE=y
550CONFIG_MAC80211_LEDS=y 567CONFIG_MAC80211_LEDS=y
551# CONFIG_MAC80211_DEBUG is not set 568# CONFIG_MAC80211_DEBUG is not set
552CONFIG_IEEE80211=m 569CONFIG_IEEE80211=m
@@ -565,6 +582,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
565# 582#
566# Generic Driver Options 583# Generic Driver Options
567# 584#
585CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
568# CONFIG_STANDALONE is not set 586# CONFIG_STANDALONE is not set
569CONFIG_PREVENT_FIRMWARE_BUILD=y 587CONFIG_PREVENT_FIRMWARE_BUILD=y
570CONFIG_FW_LOADER=y 588CONFIG_FW_LOADER=y
@@ -622,6 +640,11 @@ CONFIG_IDE_PROC_FS=y
622# IDE chipset support/bugfixes 640# IDE chipset support/bugfixes
623# 641#
624# CONFIG_IDE_GENERIC is not set 642# CONFIG_IDE_GENERIC is not set
643# CONFIG_BLK_DEV_PLATFORM is not set
644
645#
646# PCI IDE chipsets support
647#
625CONFIG_BLK_DEV_IDEPCI=y 648CONFIG_BLK_DEV_IDEPCI=y
626CONFIG_IDEPCI_SHARE_IRQ=y 649CONFIG_IDEPCI_SHARE_IRQ=y
627CONFIG_IDEPCI_PCIBUS_ORDER=y 650CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -629,8 +652,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
629CONFIG_BLK_DEV_GENERIC=y 652CONFIG_BLK_DEV_GENERIC=y
630# CONFIG_BLK_DEV_OPTI621 is not set 653# CONFIG_BLK_DEV_OPTI621 is not set
631CONFIG_BLK_DEV_IDEDMA_PCI=y 654CONFIG_BLK_DEV_IDEDMA_PCI=y
632# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
633# CONFIG_IDEDMA_ONLYDISK is not set
634# CONFIG_BLK_DEV_AEC62XX is not set 655# CONFIG_BLK_DEV_AEC62XX is not set
635# CONFIG_BLK_DEV_ALI15X3 is not set 656# CONFIG_BLK_DEV_ALI15X3 is not set
636# CONFIG_BLK_DEV_AMD74XX is not set 657# CONFIG_BLK_DEV_AMD74XX is not set
@@ -661,7 +682,7 @@ CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
661CONFIG_BLK_DEV_IDEDMA_PMAC=y 682CONFIG_BLK_DEV_IDEDMA_PMAC=y
662# CONFIG_IDE_ARM is not set 683# CONFIG_IDE_ARM is not set
663CONFIG_BLK_DEV_IDEDMA=y 684CONFIG_BLK_DEV_IDEDMA=y
664# CONFIG_IDEDMA_IVB is not set 685CONFIG_IDE_ARCH_OBSOLETE_INIT=y
665# CONFIG_BLK_DEV_HD is not set 686# CONFIG_BLK_DEV_HD is not set
666 687
667# 688#
@@ -702,6 +723,7 @@ CONFIG_SCSI_FC_ATTRS=y
702# CONFIG_SCSI_ISCSI_ATTRS is not set 723# CONFIG_SCSI_ISCSI_ATTRS is not set
703# CONFIG_SCSI_SAS_ATTRS is not set 724# CONFIG_SCSI_SAS_ATTRS is not set
704# CONFIG_SCSI_SAS_LIBSAS is not set 725# CONFIG_SCSI_SAS_LIBSAS is not set
726# CONFIG_SCSI_SRP_ATTRS is not set
705CONFIG_SCSI_LOWLEVEL=y 727CONFIG_SCSI_LOWLEVEL=y
706# CONFIG_ISCSI_TCP is not set 728# CONFIG_ISCSI_TCP is not set
707# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 729# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -718,6 +740,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m
718# CONFIG_SCSI_AIC79XX is not set 740# CONFIG_SCSI_AIC79XX is not set
719# CONFIG_SCSI_AIC94XX is not set 741# CONFIG_SCSI_AIC94XX is not set
720# CONFIG_SCSI_DPT_I2O is not set 742# CONFIG_SCSI_DPT_I2O is not set
743# CONFIG_SCSI_ADVANSYS is not set
721# CONFIG_SCSI_ARCMSR is not set 744# CONFIG_SCSI_ARCMSR is not set
722# CONFIG_MEGARAID_NEWGEN is not set 745# CONFIG_MEGARAID_NEWGEN is not set
723# CONFIG_MEGARAID_LEGACY is not set 746# CONFIG_MEGARAID_LEGACY is not set
@@ -769,14 +792,8 @@ CONFIG_DM_MIRROR=m
769CONFIG_DM_ZERO=m 792CONFIG_DM_ZERO=m
770# CONFIG_DM_MULTIPATH is not set 793# CONFIG_DM_MULTIPATH is not set
771# CONFIG_DM_DELAY is not set 794# CONFIG_DM_DELAY is not set
772 795# CONFIG_DM_UEVENT is not set
773#
774# Fusion MPT device support
775#
776# CONFIG_FUSION is not set 796# CONFIG_FUSION is not set
777# CONFIG_FUSION_SPI is not set
778# CONFIG_FUSION_FC is not set
779# CONFIG_FUSION_SAS is not set
780 797
781# 798#
782# IEEE 1394 (FireWire) support 799# IEEE 1394 (FireWire) support
@@ -830,6 +847,8 @@ CONFIG_DUMMY=m
830# CONFIG_MACVLAN is not set 847# CONFIG_MACVLAN is not set
831# CONFIG_EQUALIZER is not set 848# CONFIG_EQUALIZER is not set
832CONFIG_TUN=m 849CONFIG_TUN=m
850# CONFIG_VETH is not set
851# CONFIG_IP1000 is not set
833# CONFIG_ARCNET is not set 852# CONFIG_ARCNET is not set
834# CONFIG_PHYLIB is not set 853# CONFIG_PHYLIB is not set
835CONFIG_NET_ETHERNET=y 854CONFIG_NET_ETHERNET=y
@@ -843,6 +862,10 @@ CONFIG_SUNGEM=y
843# CONFIG_NET_VENDOR_3COM is not set 862# CONFIG_NET_VENDOR_3COM is not set
844# CONFIG_NET_TULIP is not set 863# CONFIG_NET_TULIP is not set
845# CONFIG_HP100 is not set 864# CONFIG_HP100 is not set
865# CONFIG_IBM_NEW_EMAC_ZMII is not set
866# CONFIG_IBM_NEW_EMAC_RGMII is not set
867# CONFIG_IBM_NEW_EMAC_TAH is not set
868# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
846CONFIG_NET_PCI=y 869CONFIG_NET_PCI=y
847CONFIG_PCNET32=y 870CONFIG_PCNET32=y
848# CONFIG_PCNET32_NAPI is not set 871# CONFIG_PCNET32_NAPI is not set
@@ -850,7 +873,6 @@ CONFIG_PCNET32=y
850# CONFIG_ADAPTEC_STARFIRE is not set 873# CONFIG_ADAPTEC_STARFIRE is not set
851# CONFIG_B44 is not set 874# CONFIG_B44 is not set
852# CONFIG_FORCEDETH is not set 875# CONFIG_FORCEDETH is not set
853# CONFIG_DGRS is not set
854# CONFIG_EEPRO100 is not set 876# CONFIG_EEPRO100 is not set
855# CONFIG_E100 is not set 877# CONFIG_E100 is not set
856# CONFIG_FEALNX is not set 878# CONFIG_FEALNX is not set
@@ -868,6 +890,7 @@ CONFIG_NETDEV_1000=y
868# CONFIG_ACENIC is not set 890# CONFIG_ACENIC is not set
869# CONFIG_DL2K is not set 891# CONFIG_DL2K is not set
870# CONFIG_E1000 is not set 892# CONFIG_E1000 is not set
893# CONFIG_E1000E is not set
871# CONFIG_NS83820 is not set 894# CONFIG_NS83820 is not set
872# CONFIG_HAMACHI is not set 895# CONFIG_HAMACHI is not set
873# CONFIG_YELLOWFIN is not set 896# CONFIG_YELLOWFIN is not set
@@ -875,6 +898,7 @@ CONFIG_NETDEV_1000=y
875# CONFIG_SIS190 is not set 898# CONFIG_SIS190 is not set
876# CONFIG_SKGE is not set 899# CONFIG_SKGE is not set
877# CONFIG_SKY2 is not set 900# CONFIG_SKY2 is not set
901# CONFIG_SK98LIN is not set
878# CONFIG_VIA_VELOCITY is not set 902# CONFIG_VIA_VELOCITY is not set
879# CONFIG_TIGON3 is not set 903# CONFIG_TIGON3 is not set
880# CONFIG_BNX2 is not set 904# CONFIG_BNX2 is not set
@@ -884,11 +908,14 @@ CONFIG_NETDEV_1000=y
884CONFIG_NETDEV_10000=y 908CONFIG_NETDEV_10000=y
885# CONFIG_CHELSIO_T1 is not set 909# CONFIG_CHELSIO_T1 is not set
886# CONFIG_CHELSIO_T3 is not set 910# CONFIG_CHELSIO_T3 is not set
911# CONFIG_IXGBE is not set
887# CONFIG_IXGB is not set 912# CONFIG_IXGB is not set
888# CONFIG_S2IO is not set 913# CONFIG_S2IO is not set
889# CONFIG_MYRI10GE is not set 914# CONFIG_MYRI10GE is not set
890# CONFIG_NETXEN_NIC is not set 915# CONFIG_NETXEN_NIC is not set
916# CONFIG_NIU is not set
891# CONFIG_MLX4_CORE is not set 917# CONFIG_MLX4_CORE is not set
918# CONFIG_TEHUTI is not set
892# CONFIG_TR is not set 919# CONFIG_TR is not set
893 920
894# 921#
@@ -907,15 +934,41 @@ CONFIG_APPLE_AIRPORT=m
907# CONFIG_TMD_HERMES is not set 934# CONFIG_TMD_HERMES is not set
908# CONFIG_NORTEL_HERMES is not set 935# CONFIG_NORTEL_HERMES is not set
909CONFIG_PCI_HERMES=m 936CONFIG_PCI_HERMES=m
910# CONFIG_ATMEL is not set
911CONFIG_PCMCIA_HERMES=m 937CONFIG_PCMCIA_HERMES=m
912# CONFIG_PCMCIA_SPECTRUM is not set 938# CONFIG_PCMCIA_SPECTRUM is not set
939# CONFIG_ATMEL is not set
913# CONFIG_AIRO_CS is not set 940# CONFIG_AIRO_CS is not set
914# CONFIG_PCMCIA_WL3501 is not set 941# CONFIG_PCMCIA_WL3501 is not set
915CONFIG_PRISM54=m 942CONFIG_PRISM54=m
916# CONFIG_USB_ZD1201 is not set 943# CONFIG_USB_ZD1201 is not set
917# CONFIG_RTL8187 is not set 944# CONFIG_RTL8187 is not set
945# CONFIG_ADM8211 is not set
946CONFIG_P54_COMMON=m
947# CONFIG_P54_USB is not set
948# CONFIG_P54_PCI is not set
949# CONFIG_IWLWIFI is not set
918# CONFIG_HOSTAP is not set 950# CONFIG_HOSTAP is not set
951CONFIG_B43=m
952CONFIG_B43_PCI_AUTOSELECT=y
953CONFIG_B43_PCICORE_AUTOSELECT=y
954# CONFIG_B43_PCMCIA is not set
955CONFIG_B43_LEDS=y
956# CONFIG_B43_DEBUG is not set
957CONFIG_B43_DMA=y
958CONFIG_B43_PIO=y
959CONFIG_B43_DMA_AND_PIO_MODE=y
960# CONFIG_B43_DMA_MODE is not set
961# CONFIG_B43_PIO_MODE is not set
962CONFIG_B43LEGACY=m
963CONFIG_B43LEGACY_PCI_AUTOSELECT=y
964CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
965CONFIG_B43LEGACY_DEBUG=y
966CONFIG_B43LEGACY_DMA=y
967CONFIG_B43LEGACY_PIO=y
968CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
969# CONFIG_B43LEGACY_DMA_MODE is not set
970# CONFIG_B43LEGACY_PIO_MODE is not set
971# CONFIG_RT2X00 is not set
919 972
920# 973#
921# USB Network Adapters 974# USB Network Adapters
@@ -924,7 +977,6 @@ CONFIG_PRISM54=m
924# CONFIG_USB_KAWETH is not set 977# CONFIG_USB_KAWETH is not set
925# CONFIG_USB_PEGASUS is not set 978# CONFIG_USB_PEGASUS is not set
926# CONFIG_USB_RTL8150 is not set 979# CONFIG_USB_RTL8150 is not set
927CONFIG_USB_USBNET_MII=m
928CONFIG_USB_USBNET=m 980CONFIG_USB_USBNET=m
929CONFIG_USB_NET_AX8817X=m 981CONFIG_USB_NET_AX8817X=m
930CONFIG_USB_NET_CDCETHER=m 982CONFIG_USB_NET_CDCETHER=m
@@ -975,7 +1027,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
975CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 1027CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
976CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 1028CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
977# CONFIG_INPUT_JOYDEV is not set 1029# CONFIG_INPUT_JOYDEV is not set
978# CONFIG_INPUT_TSDEV is not set
979CONFIG_INPUT_EVDEV=y 1030CONFIG_INPUT_EVDEV=y
980# CONFIG_INPUT_EVBUG is not set 1031# CONFIG_INPUT_EVBUG is not set
981 1032
@@ -1034,29 +1085,19 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
1034# CONFIG_SERIAL_UARTLITE is not set 1085# CONFIG_SERIAL_UARTLITE is not set
1035CONFIG_SERIAL_CORE=m 1086CONFIG_SERIAL_CORE=m
1036CONFIG_SERIAL_PMACZILOG=m 1087CONFIG_SERIAL_PMACZILOG=m
1088CONFIG_SERIAL_PMACZILOG_TTYS=y
1037# CONFIG_SERIAL_JSM is not set 1089# CONFIG_SERIAL_JSM is not set
1038# CONFIG_SERIAL_OF_PLATFORM is not set 1090# CONFIG_SERIAL_OF_PLATFORM is not set
1039CONFIG_UNIX98_PTYS=y 1091CONFIG_UNIX98_PTYS=y
1040CONFIG_LEGACY_PTYS=y 1092CONFIG_LEGACY_PTYS=y
1041CONFIG_LEGACY_PTY_COUNT=256 1093CONFIG_LEGACY_PTY_COUNT=256
1042# CONFIG_IPMI_HANDLER is not set 1094# CONFIG_IPMI_HANDLER is not set
1043# CONFIG_WATCHDOG is not set 1095CONFIG_HW_RANDOM=m
1044# CONFIG_HW_RANDOM is not set
1045CONFIG_NVRAM=y 1096CONFIG_NVRAM=y
1046CONFIG_GEN_RTC=y 1097CONFIG_GEN_RTC=y
1047# CONFIG_GEN_RTC_X is not set 1098# CONFIG_GEN_RTC_X is not set
1048# CONFIG_R3964 is not set 1099# CONFIG_R3964 is not set
1049# CONFIG_APPLICOM is not set 1100# CONFIG_APPLICOM is not set
1050CONFIG_AGP=m
1051CONFIG_AGP_UNINORTH=m
1052CONFIG_DRM=m
1053# CONFIG_DRM_TDFX is not set
1054CONFIG_DRM_R128=m
1055CONFIG_DRM_RADEON=m
1056# CONFIG_DRM_MGA is not set
1057# CONFIG_DRM_SIS is not set
1058# CONFIG_DRM_VIA is not set
1059# CONFIG_DRM_SAVAGE is not set
1060 1101
1061# 1102#
1062# PCMCIA character devices 1103# PCMCIA character devices
@@ -1138,6 +1179,20 @@ CONFIG_APM_POWER=y
1138# CONFIG_BATTERY_DS2760 is not set 1179# CONFIG_BATTERY_DS2760 is not set
1139CONFIG_BATTERY_PMU=y 1180CONFIG_BATTERY_PMU=y
1140# CONFIG_HWMON is not set 1181# CONFIG_HWMON is not set
1182# CONFIG_WATCHDOG is not set
1183
1184#
1185# Sonics Silicon Backplane
1186#
1187CONFIG_SSB_POSSIBLE=y
1188CONFIG_SSB=m
1189CONFIG_SSB_PCIHOST_POSSIBLE=y
1190CONFIG_SSB_PCIHOST=y
1191CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
1192# CONFIG_SSB_PCMCIAHOST is not set
1193# CONFIG_SSB_DEBUG is not set
1194CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
1195CONFIG_SSB_DRIVER_PCICORE=y
1141 1196
1142# 1197#
1143# Multifunction device drivers 1198# Multifunction device drivers
@@ -1154,18 +1209,16 @@ CONFIG_BATTERY_PMU=y
1154# 1209#
1155# Graphics support 1210# Graphics support
1156# 1211#
1157CONFIG_BACKLIGHT_LCD_SUPPORT=y 1212CONFIG_AGP=m
1158CONFIG_LCD_CLASS_DEVICE=m 1213CONFIG_AGP_UNINORTH=m
1159CONFIG_BACKLIGHT_CLASS_DEVICE=y 1214CONFIG_DRM=m
1160 1215# CONFIG_DRM_TDFX is not set
1161# 1216CONFIG_DRM_R128=m
1162# Display device support 1217CONFIG_DRM_RADEON=m
1163# 1218# CONFIG_DRM_MGA is not set
1164CONFIG_DISPLAY_SUPPORT=y 1219# CONFIG_DRM_SIS is not set
1165 1220# CONFIG_DRM_VIA is not set
1166# 1221# CONFIG_DRM_SAVAGE is not set
1167# Display hardware drivers
1168#
1169CONFIG_VGASTATE=y 1222CONFIG_VGASTATE=y
1170# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1223# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1171CONFIG_FB=y 1224CONFIG_FB=y
@@ -1174,6 +1227,7 @@ CONFIG_FB_DDC=y
1174CONFIG_FB_CFB_FILLRECT=y 1227CONFIG_FB_CFB_FILLRECT=y
1175CONFIG_FB_CFB_COPYAREA=y 1228CONFIG_FB_CFB_COPYAREA=y
1176CONFIG_FB_CFB_IMAGEBLIT=y 1229CONFIG_FB_CFB_IMAGEBLIT=y
1230# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1177# CONFIG_FB_SYS_FILLRECT is not set 1231# CONFIG_FB_SYS_FILLRECT is not set
1178# CONFIG_FB_SYS_COPYAREA is not set 1232# CONFIG_FB_SYS_COPYAREA is not set
1179# CONFIG_FB_SYS_IMAGEBLIT is not set 1233# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -1199,6 +1253,7 @@ CONFIG_FB_CT65550=y
1199# CONFIG_FB_ASILIANT is not set 1253# CONFIG_FB_ASILIANT is not set
1200CONFIG_FB_IMSTT=y 1254CONFIG_FB_IMSTT=y
1201# CONFIG_FB_VGA16 is not set 1255# CONFIG_FB_VGA16 is not set
1256# CONFIG_FB_UVESA is not set
1202# CONFIG_FB_S1D13XXX is not set 1257# CONFIG_FB_S1D13XXX is not set
1203CONFIG_FB_NVIDIA=y 1258CONFIG_FB_NVIDIA=y
1204CONFIG_FB_NVIDIA_I2C=y 1259CONFIG_FB_NVIDIA_I2C=y
@@ -1236,6 +1291,19 @@ CONFIG_FB_3DFX=y
1236# CONFIG_FB_PM3 is not set 1291# CONFIG_FB_PM3 is not set
1237# CONFIG_FB_IBM_GXT4500 is not set 1292# CONFIG_FB_IBM_GXT4500 is not set
1238# CONFIG_FB_VIRTUAL is not set 1293# CONFIG_FB_VIRTUAL is not set
1294CONFIG_BACKLIGHT_LCD_SUPPORT=y
1295CONFIG_LCD_CLASS_DEVICE=m
1296CONFIG_BACKLIGHT_CLASS_DEVICE=y
1297# CONFIG_BACKLIGHT_CORGI is not set
1298
1299#
1300# Display device support
1301#
1302CONFIG_DISPLAY_SUPPORT=y
1303
1304#
1305# Display hardware drivers
1306#
1239 1307
1240# 1308#
1241# Console display driver support 1309# Console display driver support
@@ -1399,6 +1467,7 @@ CONFIG_SND_USB_AUDIO=m
1399CONFIG_HID_SUPPORT=y 1467CONFIG_HID_SUPPORT=y
1400CONFIG_HID=y 1468CONFIG_HID=y
1401# CONFIG_HID_DEBUG is not set 1469# CONFIG_HID_DEBUG is not set
1470# CONFIG_HIDRAW is not set
1402 1471
1403# 1472#
1404# USB Input Devices 1473# USB Input Devices
@@ -1488,6 +1557,7 @@ CONFIG_USB_SERIAL=m
1488# CONFIG_USB_SERIAL_AIRPRIME is not set 1557# CONFIG_USB_SERIAL_AIRPRIME is not set
1489# CONFIG_USB_SERIAL_ARK3116 is not set 1558# CONFIG_USB_SERIAL_ARK3116 is not set
1490# CONFIG_USB_SERIAL_BELKIN is not set 1559# CONFIG_USB_SERIAL_BELKIN is not set
1560# CONFIG_USB_SERIAL_CH341 is not set
1491# CONFIG_USB_SERIAL_WHITEHEAT is not set 1561# CONFIG_USB_SERIAL_WHITEHEAT is not set
1492# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1562# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1493# CONFIG_USB_SERIAL_CP2101 is not set 1563# CONFIG_USB_SERIAL_CP2101 is not set
@@ -1587,19 +1657,6 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
1587# CONFIG_RTC_CLASS is not set 1657# CONFIG_RTC_CLASS is not set
1588 1658
1589# 1659#
1590# DMA Engine support
1591#
1592# CONFIG_DMA_ENGINE is not set
1593
1594#
1595# DMA Clients
1596#
1597
1598#
1599# DMA Devices
1600#
1601
1602#
1603# Userspace I/O 1660# Userspace I/O
1604# 1661#
1605# CONFIG_UIO is not set 1662# CONFIG_UIO is not set
@@ -1616,7 +1673,6 @@ CONFIG_EXT3_FS_POSIX_ACL=y
1616# CONFIG_EXT3_FS_SECURITY is not set 1673# CONFIG_EXT3_FS_SECURITY is not set
1617# CONFIG_EXT4DEV_FS is not set 1674# CONFIG_EXT4DEV_FS is not set
1618CONFIG_JBD=y 1675CONFIG_JBD=y
1619# CONFIG_JBD_DEBUG is not set
1620CONFIG_FS_MBCACHE=y 1676CONFIG_FS_MBCACHE=y
1621# CONFIG_REISERFS_FS is not set 1677# CONFIG_REISERFS_FS is not set
1622# CONFIG_JFS_FS is not set 1678# CONFIG_JFS_FS is not set
@@ -1663,7 +1719,6 @@ CONFIG_SYSFS=y
1663CONFIG_TMPFS=y 1719CONFIG_TMPFS=y
1664# CONFIG_TMPFS_POSIX_ACL is not set 1720# CONFIG_TMPFS_POSIX_ACL is not set
1665# CONFIG_HUGETLB_PAGE is not set 1721# CONFIG_HUGETLB_PAGE is not set
1666CONFIG_RAMFS=y
1667# CONFIG_CONFIGFS_FS is not set 1722# CONFIG_CONFIGFS_FS is not set
1668 1723
1669# 1724#
@@ -1682,10 +1737,7 @@ CONFIG_HFSPLUS_FS=m
1682# CONFIG_QNX4FS_FS is not set 1737# CONFIG_QNX4FS_FS is not set
1683# CONFIG_SYSV_FS is not set 1738# CONFIG_SYSV_FS is not set
1684# CONFIG_UFS_FS is not set 1739# CONFIG_UFS_FS is not set
1685 1740CONFIG_NETWORK_FILESYSTEMS=y
1686#
1687# Network File Systems
1688#
1689CONFIG_NFS_FS=y 1741CONFIG_NFS_FS=y
1690CONFIG_NFS_V3=y 1742CONFIG_NFS_V3=y
1691CONFIG_NFS_V3_ACL=y 1743CONFIG_NFS_V3_ACL=y
@@ -1735,10 +1787,6 @@ CONFIG_MSDOS_PARTITION=y
1735# CONFIG_KARMA_PARTITION is not set 1787# CONFIG_KARMA_PARTITION is not set
1736# CONFIG_EFI_PARTITION is not set 1788# CONFIG_EFI_PARTITION is not set
1737# CONFIG_SYSV68_PARTITION is not set 1789# CONFIG_SYSV68_PARTITION is not set
1738
1739#
1740# Native Language Support
1741#
1742CONFIG_NLS=y 1790CONFIG_NLS=y
1743CONFIG_NLS_DEFAULT="iso8859-1" 1791CONFIG_NLS_DEFAULT="iso8859-1"
1744CONFIG_NLS_CODEPAGE_437=m 1792CONFIG_NLS_CODEPAGE_437=m
@@ -1779,10 +1827,6 @@ CONFIG_NLS_ISO8859_1=m
1779# CONFIG_NLS_KOI8_R is not set 1827# CONFIG_NLS_KOI8_R is not set
1780# CONFIG_NLS_KOI8_U is not set 1828# CONFIG_NLS_KOI8_U is not set
1781CONFIG_NLS_UTF8=m 1829CONFIG_NLS_UTF8=m
1782
1783#
1784# Distributed Lock Manager
1785#
1786# CONFIG_DLM is not set 1830# CONFIG_DLM is not set
1787# CONFIG_UCC_SLOW is not set 1831# CONFIG_UCC_SLOW is not set
1788 1832
@@ -1806,18 +1850,17 @@ CONFIG_PLIST=y
1806CONFIG_HAS_IOMEM=y 1850CONFIG_HAS_IOMEM=y
1807CONFIG_HAS_IOPORT=y 1851CONFIG_HAS_IOPORT=y
1808CONFIG_HAS_DMA=y 1852CONFIG_HAS_DMA=y
1809 1853CONFIG_INSTRUMENTATION=y
1810#
1811# Instrumentation Support
1812#
1813CONFIG_PROFILING=y 1854CONFIG_PROFILING=y
1814CONFIG_OPROFILE=y 1855CONFIG_OPROFILE=y
1815# CONFIG_KPROBES is not set 1856# CONFIG_KPROBES is not set
1857# CONFIG_MARKERS is not set
1816 1858
1817# 1859#
1818# Kernel hacking 1860# Kernel hacking
1819# 1861#
1820# CONFIG_PRINTK_TIME is not set 1862# CONFIG_PRINTK_TIME is not set
1863CONFIG_ENABLE_WARN_DEPRECATED=y
1821CONFIG_ENABLE_MUST_CHECK=y 1864CONFIG_ENABLE_MUST_CHECK=y
1822CONFIG_MAGIC_SYSRQ=y 1865CONFIG_MAGIC_SYSRQ=y
1823# CONFIG_UNUSED_SYMBOLS is not set 1866# CONFIG_UNUSED_SYMBOLS is not set
@@ -1841,9 +1884,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1841# CONFIG_DEBUG_INFO is not set 1884# CONFIG_DEBUG_INFO is not set
1842# CONFIG_DEBUG_VM is not set 1885# CONFIG_DEBUG_VM is not set
1843# CONFIG_DEBUG_LIST is not set 1886# CONFIG_DEBUG_LIST is not set
1887# CONFIG_DEBUG_SG is not set
1844# CONFIG_FORCED_INLINING is not set 1888# CONFIG_FORCED_INLINING is not set
1889# CONFIG_BOOT_PRINTK_DELAY is not set
1845# CONFIG_RCU_TORTURE_TEST is not set 1890# CONFIG_RCU_TORTURE_TEST is not set
1846# CONFIG_FAULT_INJECTION is not set 1891# CONFIG_FAULT_INJECTION is not set
1892# CONFIG_SAMPLES is not set
1847# CONFIG_DEBUG_STACKOVERFLOW is not set 1893# CONFIG_DEBUG_STACKOVERFLOW is not set
1848# CONFIG_DEBUG_STACK_USAGE is not set 1894# CONFIG_DEBUG_STACK_USAGE is not set
1849CONFIG_DEBUGGER=y 1895CONFIG_DEBUGGER=y
@@ -1859,6 +1905,7 @@ CONFIG_BOOTX_TEXT=y
1859# 1905#
1860# CONFIG_KEYS is not set 1906# CONFIG_KEYS is not set
1861# CONFIG_SECURITY is not set 1907# CONFIG_SECURITY is not set
1908# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1862CONFIG_CRYPTO=y 1909CONFIG_CRYPTO=y
1863CONFIG_CRYPTO_ALGAPI=y 1910CONFIG_CRYPTO_ALGAPI=y
1864CONFIG_CRYPTO_BLKCIPHER=y 1911CONFIG_CRYPTO_BLKCIPHER=y
@@ -1879,6 +1926,7 @@ CONFIG_CRYPTO_ECB=m
1879CONFIG_CRYPTO_CBC=y 1926CONFIG_CRYPTO_CBC=y
1880CONFIG_CRYPTO_PCBC=m 1927CONFIG_CRYPTO_PCBC=m
1881# CONFIG_CRYPTO_LRW is not set 1928# CONFIG_CRYPTO_LRW is not set
1929# CONFIG_CRYPTO_XTS is not set
1882# CONFIG_CRYPTO_CRYPTD is not set 1930# CONFIG_CRYPTO_CRYPTD is not set
1883CONFIG_CRYPTO_DES=y 1931CONFIG_CRYPTO_DES=y
1884# CONFIG_CRYPTO_FCRYPT is not set 1932# CONFIG_CRYPTO_FCRYPT is not set
@@ -1893,9 +1941,12 @@ CONFIG_CRYPTO_TEA=m
1893CONFIG_CRYPTO_ARC4=m 1941CONFIG_CRYPTO_ARC4=m
1894CONFIG_CRYPTO_KHAZAD=m 1942CONFIG_CRYPTO_KHAZAD=m
1895CONFIG_CRYPTO_ANUBIS=m 1943CONFIG_CRYPTO_ANUBIS=m
1944# CONFIG_CRYPTO_SEED is not set
1896CONFIG_CRYPTO_DEFLATE=m 1945CONFIG_CRYPTO_DEFLATE=m
1897CONFIG_CRYPTO_MICHAEL_MIC=m 1946CONFIG_CRYPTO_MICHAEL_MIC=m
1898CONFIG_CRYPTO_CRC32C=m 1947CONFIG_CRYPTO_CRC32C=m
1899# CONFIG_CRYPTO_CAMELLIA is not set 1948# CONFIG_CRYPTO_CAMELLIA is not set
1900# CONFIG_CRYPTO_TEST is not set 1949# CONFIG_CRYPTO_TEST is not set
1950# CONFIG_CRYPTO_AUTHENC is not set
1901CONFIG_CRYPTO_HW=y 1951CONFIG_CRYPTO_HW=y
1952# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 3e90c835fe12..5760b9f033ea 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.24-rc2 3# Linux kernel version: 2.6.24-rc4
4# Tue Nov 6 23:43:56 2007 4# Thu Dec 6 16:49:07 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -73,6 +73,7 @@ CONFIG_TASKSTATS=y
73CONFIG_TASK_DELAY_ACCT=y 73CONFIG_TASK_DELAY_ACCT=y
74# CONFIG_TASK_XACCT is not set 74# CONFIG_TASK_XACCT is not set
75# CONFIG_USER_NS is not set 75# CONFIG_USER_NS is not set
76# CONFIG_PID_NS is not set
76# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
77CONFIG_IKCONFIG=y 78CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 79CONFIG_IKCONFIG_PROC=y
@@ -80,11 +81,11 @@ CONFIG_LOG_BUF_SHIFT=17
80CONFIG_CGROUPS=y 81CONFIG_CGROUPS=y
81# CONFIG_CGROUP_DEBUG is not set 82# CONFIG_CGROUP_DEBUG is not set
82# CONFIG_CGROUP_NS is not set 83# CONFIG_CGROUP_NS is not set
83# CONFIG_CGROUP_CPUACCT is not set
84CONFIG_CPUSETS=y 84CONFIG_CPUSETS=y
85CONFIG_FAIR_GROUP_SCHED=y 85CONFIG_FAIR_GROUP_SCHED=y
86CONFIG_FAIR_USER_SCHED=y 86CONFIG_FAIR_USER_SCHED=y
87# CONFIG_FAIR_CGROUP_SCHED is not set 87# CONFIG_FAIR_CGROUP_SCHED is not set
88# CONFIG_CGROUP_CPUACCT is not set
88CONFIG_SYSFS_DEPRECATED=y 89CONFIG_SYSFS_DEPRECATED=y
89CONFIG_PROC_PID_CPUSET=y 90CONFIG_PROC_PID_CPUSET=y
90CONFIG_RELAY=y 91CONFIG_RELAY=y
@@ -258,6 +259,7 @@ CONFIG_PREEMPT_NONE=y
258CONFIG_BINFMT_ELF=y 259CONFIG_BINFMT_ELF=y
259CONFIG_BINFMT_MISC=m 260CONFIG_BINFMT_MISC=m
260CONFIG_FORCE_MAX_ZONEORDER=13 261CONFIG_FORCE_MAX_ZONEORDER=13
262CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
261CONFIG_IOMMU_VMERGE=y 263CONFIG_IOMMU_VMERGE=y
262CONFIG_HOTPLUG_CPU=y 264CONFIG_HOTPLUG_CPU=y
263CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 265CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -955,7 +957,6 @@ CONFIG_IBMOL=y
955# CONFIG_USB_KAWETH is not set 957# CONFIG_USB_KAWETH is not set
956# CONFIG_USB_PEGASUS is not set 958# CONFIG_USB_PEGASUS is not set
957# CONFIG_USB_RTL8150 is not set 959# CONFIG_USB_RTL8150 is not set
958# CONFIG_USB_USBNET_MII is not set
959# CONFIG_USB_USBNET is not set 960# CONFIG_USB_USBNET is not set
960# CONFIG_NET_PCMCIA is not set 961# CONFIG_NET_PCMCIA is not set
961# CONFIG_WAN is not set 962# CONFIG_WAN is not set
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index 9191f557b044..142d206d6870 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 11:58:17 2007 4# Thu Dec 6 16:49:09 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -20,8 +20,13 @@ CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 20# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set 21# CONFIG_SMP is not set
22CONFIG_PPC32=y 22CONFIG_PPC32=y
23CONFIG_WORD_SIZE=32
23CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
24CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
25CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
26CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
27CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,6 +68,8 @@ CONFIG_SYSVIPC_SYSCTL=y
63CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
64CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
65CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_CGROUPS is not set
72# CONFIG_FAIR_GROUP_SCHED is not set
66# CONFIG_SYSFS_DEPRECATED is not set 73# CONFIG_SYSFS_DEPRECATED is not set
67# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
68CONFIG_BLK_DEV_INITRD=y 75CONFIG_BLK_DEV_INITRD=y
@@ -82,7 +89,6 @@ CONFIG_FUTEX=y
82CONFIG_ANON_INODES=y 89CONFIG_ANON_INODES=y
83CONFIG_EPOLL=y 90CONFIG_EPOLL=y
84CONFIG_SIGNALFD=y 91CONFIG_SIGNALFD=y
85CONFIG_TIMERFD=y
86CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 93CONFIG_SHMEM=y
88CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
@@ -116,7 +122,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
116# Platform support 122# Platform support
117# 123#
118# CONFIG_PPC_MULTIPLATFORM is not set 124# CONFIG_PPC_MULTIPLATFORM is not set
119# CONFIG_EMBEDDED6xx is not set
120CONFIG_PPC_82xx=y 125CONFIG_PPC_82xx=y
121# CONFIG_PPC_83xx is not set 126# CONFIG_PPC_83xx is not set
122# CONFIG_PPC_86xx is not set 127# CONFIG_PPC_86xx is not set
@@ -126,7 +131,6 @@ CONFIG_PPC_82xx=y
126# CONFIG_PPC_CELL_NATIVE is not set 131# CONFIG_PPC_CELL_NATIVE is not set
127# CONFIG_MPC8272_ADS is not set 132# CONFIG_MPC8272_ADS is not set
128CONFIG_PQ2FADS=y 133CONFIG_PQ2FADS=y
129# CONFIG_EP8248E is not set
130CONFIG_PQ2ADS=y 134CONFIG_PQ2ADS=y
131CONFIG_8260=y 135CONFIG_8260=y
132CONFIG_PQ2_ADS_PCI_PIC=y 136CONFIG_PQ2_ADS_PCI_PIC=y
@@ -149,6 +153,10 @@ CONFIG_CPM=y
149# Kernel options 153# Kernel options
150# 154#
151# CONFIG_HIGHMEM is not set 155# CONFIG_HIGHMEM is not set
156CONFIG_TICK_ONESHOT=y
157CONFIG_NO_HZ=y
158CONFIG_HIGH_RES_TIMERS=y
159CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
152# CONFIG_HZ_100 is not set 160# CONFIG_HZ_100 is not set
153CONFIG_HZ_250=y 161CONFIG_HZ_250=y
154# CONFIG_HZ_300 is not set 162# CONFIG_HZ_300 is not set
@@ -165,6 +173,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
165CONFIG_FLATMEM=y 173CONFIG_FLATMEM=y
166CONFIG_FLAT_NODE_MEM_MAP=y 174CONFIG_FLAT_NODE_MEM_MAP=y
167# CONFIG_SPARSEMEM_STATIC is not set 175# CONFIG_SPARSEMEM_STATIC is not set
176# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
168CONFIG_SPLIT_PTLOCK_CPUS=4 177CONFIG_SPLIT_PTLOCK_CPUS=4
169# CONFIG_RESOURCES_64BIT is not set 178# CONFIG_RESOURCES_64BIT is not set
170CONFIG_ZONE_DMA_FLAG=1 179CONFIG_ZONE_DMA_FLAG=1
@@ -173,6 +182,8 @@ CONFIG_VIRT_TO_BUS=y
173CONFIG_PROC_DEVICETREE=y 182CONFIG_PROC_DEVICETREE=y
174# CONFIG_CMDLINE_BOOL is not set 183# CONFIG_CMDLINE_BOOL is not set
175# CONFIG_PM is not set 184# CONFIG_PM is not set
185CONFIG_SUSPEND_UP_POSSIBLE=y
186CONFIG_HIBERNATION_UP_POSSIBLE=y
176CONFIG_SECCOMP=y 187CONFIG_SECCOMP=y
177CONFIG_WANT_DEVICE_TREE=y 188CONFIG_WANT_DEVICE_TREE=y
178CONFIG_DEVICE_TREE="pq2fads.dts" 189CONFIG_DEVICE_TREE="pq2fads.dts"
@@ -192,11 +203,8 @@ CONFIG_PCI_8260=y
192# CONFIG_PCIEPORTBUS is not set 203# CONFIG_PCIEPORTBUS is not set
193CONFIG_ARCH_SUPPORTS_MSI=y 204CONFIG_ARCH_SUPPORTS_MSI=y
194# CONFIG_PCI_MSI is not set 205# CONFIG_PCI_MSI is not set
206CONFIG_PCI_LEGACY=y
195# CONFIG_PCI_DEBUG is not set 207# CONFIG_PCI_DEBUG is not set
196
197#
198# PCCARD (PCMCIA/CardBus) support
199#
200# CONFIG_PCCARD is not set 208# CONFIG_PCCARD is not set
201 209
202# 210#
@@ -210,7 +218,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
210CONFIG_HIGHMEM_START=0xfe000000 218CONFIG_HIGHMEM_START=0xfe000000
211CONFIG_LOWMEM_SIZE=0x30000000 219CONFIG_LOWMEM_SIZE=0x30000000
212CONFIG_KERNEL_START=0xc0000000 220CONFIG_KERNEL_START=0xc0000000
213CONFIG_TASK_SIZE=0x80000000 221CONFIG_TASK_SIZE=0xc0000000
214CONFIG_BOOT_LOAD=0x00400000 222CONFIG_BOOT_LOAD=0x00400000
215 223
216# 224#
@@ -247,6 +255,7 @@ CONFIG_INET_TUNNEL=y
247CONFIG_INET_XFRM_MODE_TRANSPORT=y 255CONFIG_INET_XFRM_MODE_TRANSPORT=y
248CONFIG_INET_XFRM_MODE_TUNNEL=y 256CONFIG_INET_XFRM_MODE_TUNNEL=y
249CONFIG_INET_XFRM_MODE_BEET=y 257CONFIG_INET_XFRM_MODE_BEET=y
258# CONFIG_INET_LRO is not set
250CONFIG_INET_DIAG=y 259CONFIG_INET_DIAG=y
251CONFIG_INET_TCP_DIAG=y 260CONFIG_INET_TCP_DIAG=y
252# CONFIG_TCP_CONG_ADVANCED is not set 261# CONFIG_TCP_CONG_ADVANCED is not set
@@ -290,10 +299,6 @@ CONFIG_NETFILTER=y
290# CONFIG_LLC2 is not set 299# CONFIG_LLC2 is not set
291# CONFIG_IPX is not set 300# CONFIG_IPX is not set
292# CONFIG_ATALK is not set 301# CONFIG_ATALK is not set
293
294#
295# QoS and/or fair queueing
296#
297# CONFIG_NET_SCHED is not set 302# CONFIG_NET_SCHED is not set
298 303
299# 304#
@@ -319,6 +324,7 @@ CONFIG_NETFILTER=y
319# 324#
320# Generic Driver Options 325# Generic Driver Options
321# 326#
327CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
322CONFIG_STANDALONE=y 328CONFIG_STANDALONE=y
323CONFIG_PREVENT_FIRMWARE_BUILD=y 329CONFIG_PREVENT_FIRMWARE_BUILD=y
324# CONFIG_FW_LOADER is not set 330# CONFIG_FW_LOADER is not set
@@ -342,6 +348,7 @@ CONFIG_MTD_BLOCK=y
342# CONFIG_INFTL is not set 348# CONFIG_INFTL is not set
343# CONFIG_RFD_FTL is not set 349# CONFIG_RFD_FTL is not set
344# CONFIG_SSFDC is not set 350# CONFIG_SSFDC is not set
351# CONFIG_MTD_OOPS is not set
345 352
346# 353#
347# RAM/ROM/Flash chip drivers 354# RAM/ROM/Flash chip drivers
@@ -380,6 +387,7 @@ CONFIG_MTD_CFI_UTIL=y
380# CONFIG_MTD_PHYSMAP is not set 387# CONFIG_MTD_PHYSMAP is not set
381CONFIG_MTD_PHYSMAP_OF=y 388CONFIG_MTD_PHYSMAP_OF=y
382# CONFIG_MTD_SBC8240 is not set 389# CONFIG_MTD_SBC8240 is not set
390# CONFIG_MTD_INTEL_VR_NOR is not set
383# CONFIG_MTD_PLATRAM is not set 391# CONFIG_MTD_PLATRAM is not set
384 392
385# 393#
@@ -442,10 +450,40 @@ CONFIG_IDE_PROC_FS=y
442# IDE chipset support/bugfixes 450# IDE chipset support/bugfixes
443# 451#
444# CONFIG_IDE_GENERIC is not set 452# CONFIG_IDE_GENERIC is not set
445# CONFIG_BLK_DEV_IDEPCI is not set 453# CONFIG_BLK_DEV_PLATFORM is not set
454
455#
456# PCI IDE chipsets support
457#
446# CONFIG_IDEPCI_PCIBUS_ORDER is not set 458# CONFIG_IDEPCI_PCIBUS_ORDER is not set
459# CONFIG_BLK_DEV_GENERIC is not set
460# CONFIG_BLK_DEV_AEC62XX is not set
461# CONFIG_BLK_DEV_ALI15X3 is not set
462# CONFIG_BLK_DEV_AMD74XX is not set
463# CONFIG_BLK_DEV_CMD64X is not set
464# CONFIG_BLK_DEV_TRIFLEX is not set
465# CONFIG_BLK_DEV_CY82C693 is not set
466# CONFIG_BLK_DEV_CS5530 is not set
467# CONFIG_BLK_DEV_HPT34X is not set
468# CONFIG_BLK_DEV_HPT366 is not set
469# CONFIG_BLK_DEV_JMICRON is not set
470# CONFIG_BLK_DEV_SC1200 is not set
471# CONFIG_BLK_DEV_PIIX is not set
472# CONFIG_BLK_DEV_IT8213 is not set
473# CONFIG_BLK_DEV_IT821X is not set
474# CONFIG_BLK_DEV_NS87415 is not set
475# CONFIG_BLK_DEV_PDC202XX_OLD is not set
476# CONFIG_BLK_DEV_PDC202XX_NEW is not set
477# CONFIG_BLK_DEV_SVWKS is not set
478# CONFIG_BLK_DEV_SIIMAGE is not set
479# CONFIG_BLK_DEV_SL82C105 is not set
480# CONFIG_BLK_DEV_SLC90E66 is not set
481# CONFIG_BLK_DEV_TRM290 is not set
482# CONFIG_BLK_DEV_VIA82CXXX is not set
483# CONFIG_BLK_DEV_TC86C001 is not set
447# CONFIG_IDE_ARM is not set 484# CONFIG_IDE_ARM is not set
448# CONFIG_BLK_DEV_IDEDMA is not set 485# CONFIG_BLK_DEV_IDEDMA is not set
486CONFIG_IDE_ARCH_OBSOLETE_INIT=y
449# CONFIG_BLK_DEV_HD is not set 487# CONFIG_BLK_DEV_HD is not set
450 488
451# 489#
@@ -457,10 +495,6 @@ CONFIG_IDE_PROC_FS=y
457# CONFIG_SCSI_NETLINK is not set 495# CONFIG_SCSI_NETLINK is not set
458# CONFIG_ATA is not set 496# CONFIG_ATA is not set
459# CONFIG_MD is not set 497# CONFIG_MD is not set
460
461#
462# Fusion MPT device support
463#
464# CONFIG_FUSION is not set 498# CONFIG_FUSION is not set
465 499
466# 500#
@@ -479,6 +513,7 @@ CONFIG_NETDEVICES=y
479# CONFIG_BONDING is not set 513# CONFIG_BONDING is not set
480# CONFIG_EQUALIZER is not set 514# CONFIG_EQUALIZER is not set
481CONFIG_TUN=y 515CONFIG_TUN=y
516# CONFIG_VETH is not set
482# CONFIG_ARCNET is not set 517# CONFIG_ARCNET is not set
483CONFIG_PHYLIB=y 518CONFIG_PHYLIB=y
484 519
@@ -504,20 +539,28 @@ CONFIG_MII=y
504# CONFIG_NET_VENDOR_3COM is not set 539# CONFIG_NET_VENDOR_3COM is not set
505# CONFIG_NET_TULIP is not set 540# CONFIG_NET_TULIP is not set
506# CONFIG_HP100 is not set 541# CONFIG_HP100 is not set
542# CONFIG_IBM_NEW_EMAC_ZMII is not set
543# CONFIG_IBM_NEW_EMAC_RGMII is not set
544# CONFIG_IBM_NEW_EMAC_TAH is not set
545# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
507# CONFIG_NET_PCI is not set 546# CONFIG_NET_PCI is not set
547# CONFIG_B44 is not set
508CONFIG_FS_ENET=y 548CONFIG_FS_ENET=y
509# CONFIG_FS_ENET_HAS_SCC is not set 549# CONFIG_FS_ENET_HAS_SCC is not set
510CONFIG_FS_ENET_HAS_FCC=y 550CONFIG_FS_ENET_HAS_FCC=y
551# CONFIG_FS_ENET_MDIO_FCC is not set
511CONFIG_NETDEV_1000=y 552CONFIG_NETDEV_1000=y
512# CONFIG_ACENIC is not set 553# CONFIG_ACENIC is not set
513# CONFIG_DL2K is not set 554# CONFIG_DL2K is not set
514# CONFIG_E1000 is not set 555# CONFIG_E1000 is not set
556# CONFIG_E1000E is not set
515# CONFIG_NS83820 is not set 557# CONFIG_NS83820 is not set
516# CONFIG_HAMACHI is not set 558# CONFIG_HAMACHI is not set
517# CONFIG_R8169 is not set 559# CONFIG_R8169 is not set
518# CONFIG_SIS190 is not set 560# CONFIG_SIS190 is not set
519# CONFIG_SKGE is not set 561# CONFIG_SKGE is not set
520# CONFIG_SKY2 is not set 562# CONFIG_SKY2 is not set
563# CONFIG_SK98LIN is not set
521# CONFIG_VIA_VELOCITY is not set 564# CONFIG_VIA_VELOCITY is not set
522# CONFIG_TIGON3 is not set 565# CONFIG_TIGON3 is not set
523# CONFIG_BNX2 is not set 566# CONFIG_BNX2 is not set
@@ -525,11 +568,14 @@ CONFIG_NETDEV_1000=y
525CONFIG_NETDEV_10000=y 568CONFIG_NETDEV_10000=y
526# CONFIG_CHELSIO_T1 is not set 569# CONFIG_CHELSIO_T1 is not set
527# CONFIG_CHELSIO_T3 is not set 570# CONFIG_CHELSIO_T3 is not set
571# CONFIG_IXGBE is not set
528# CONFIG_IXGB is not set 572# CONFIG_IXGB is not set
529# CONFIG_S2IO is not set 573# CONFIG_S2IO is not set
530# CONFIG_MYRI10GE is not set 574# CONFIG_MYRI10GE is not set
531# CONFIG_NETXEN_NIC is not set 575# CONFIG_NETXEN_NIC is not set
576# CONFIG_NIU is not set
532# CONFIG_MLX4_CORE is not set 577# CONFIG_MLX4_CORE is not set
578# CONFIG_TEHUTI is not set
533# CONFIG_TR is not set 579# CONFIG_TR is not set
534 580
535# 581#
@@ -567,7 +613,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
567CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 613CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
568CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 614CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
569# CONFIG_INPUT_JOYDEV is not set 615# CONFIG_INPUT_JOYDEV is not set
570# CONFIG_INPUT_TSDEV is not set
571CONFIG_INPUT_EVDEV=y 616CONFIG_INPUT_EVDEV=y
572# CONFIG_INPUT_EVBUG is not set 617# CONFIG_INPUT_EVBUG is not set
573 618
@@ -638,14 +683,11 @@ CONFIG_UNIX98_PTYS=y
638CONFIG_LEGACY_PTYS=y 683CONFIG_LEGACY_PTYS=y
639CONFIG_LEGACY_PTY_COUNT=256 684CONFIG_LEGACY_PTY_COUNT=256
640# CONFIG_IPMI_HANDLER is not set 685# CONFIG_IPMI_HANDLER is not set
641# CONFIG_WATCHDOG is not set
642CONFIG_HW_RANDOM=y 686CONFIG_HW_RANDOM=y
643# CONFIG_NVRAM is not set 687# CONFIG_NVRAM is not set
644# CONFIG_GEN_RTC is not set 688# CONFIG_GEN_RTC is not set
645# CONFIG_R3964 is not set 689# CONFIG_R3964 is not set
646# CONFIG_APPLICOM is not set 690# CONFIG_APPLICOM is not set
647# CONFIG_AGP is not set
648# CONFIG_DRM is not set
649# CONFIG_RAW_DRIVER is not set 691# CONFIG_RAW_DRIVER is not set
650CONFIG_DEVPORT=y 692CONFIG_DEVPORT=y
651# CONFIG_I2C is not set 693# CONFIG_I2C is not set
@@ -658,6 +700,13 @@ CONFIG_DEVPORT=y
658# CONFIG_W1 is not set 700# CONFIG_W1 is not set
659# CONFIG_POWER_SUPPLY is not set 701# CONFIG_POWER_SUPPLY is not set
660# CONFIG_HWMON is not set 702# CONFIG_HWMON is not set
703# CONFIG_WATCHDOG is not set
704
705#
706# Sonics Silicon Backplane
707#
708CONFIG_SSB_POSSIBLE=y
709# CONFIG_SSB is not set
661 710
662# 711#
663# Multifunction device drivers 712# Multifunction device drivers
@@ -674,16 +723,17 @@ CONFIG_DAB=y
674# 723#
675# Graphics support 724# Graphics support
676# 725#
726# CONFIG_AGP is not set
727# CONFIG_DRM is not set
728# CONFIG_VGASTATE is not set
729CONFIG_VIDEO_OUTPUT_CONTROL=y
730# CONFIG_FB is not set
677# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 731# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
678 732
679# 733#
680# Display device support 734# Display device support
681# 735#
682# CONFIG_DISPLAY_SUPPORT is not set 736# CONFIG_DISPLAY_SUPPORT is not set
683# CONFIG_VGASTATE is not set
684CONFIG_VIDEO_OUTPUT_CONTROL=y
685# CONFIG_FB is not set
686# CONFIG_FB_IBM_GXT4500 is not set
687 737
688# 738#
689# Sound 739# Sound
@@ -707,6 +757,7 @@ CONFIG_USB_GADGET=y
707# CONFIG_USB_GADGET_DEBUG_FILES is not set 757# CONFIG_USB_GADGET_DEBUG_FILES is not set
708CONFIG_USB_GADGET_SELECTED=y 758CONFIG_USB_GADGET_SELECTED=y
709# CONFIG_USB_GADGET_AMD5536UDC is not set 759# CONFIG_USB_GADGET_AMD5536UDC is not set
760# CONFIG_USB_GADGET_ATMEL_USBA is not set
710# CONFIG_USB_GADGET_FSL_USB2 is not set 761# CONFIG_USB_GADGET_FSL_USB2 is not set
711# CONFIG_USB_GADGET_NET2280 is not set 762# CONFIG_USB_GADGET_NET2280 is not set
712# CONFIG_USB_GADGET_PXA2XX is not set 763# CONFIG_USB_GADGET_PXA2XX is not set
@@ -731,19 +782,6 @@ CONFIG_USB_ETH=y
731# CONFIG_RTC_CLASS is not set 782# CONFIG_RTC_CLASS is not set
732 783
733# 784#
734# DMA Engine support
735#
736# CONFIG_DMA_ENGINE is not set
737
738#
739# DMA Clients
740#
741
742#
743# DMA Devices
744#
745
746#
747# Userspace I/O 785# Userspace I/O
748# 786#
749# CONFIG_UIO is not set 787# CONFIG_UIO is not set
@@ -759,7 +797,6 @@ CONFIG_EXT3_FS_XATTR=y
759# CONFIG_EXT3_FS_POSIX_ACL is not set 797# CONFIG_EXT3_FS_POSIX_ACL is not set
760# CONFIG_EXT3_FS_SECURITY is not set 798# CONFIG_EXT3_FS_SECURITY is not set
761CONFIG_JBD=y 799CONFIG_JBD=y
762# CONFIG_JBD_DEBUG is not set
763CONFIG_FS_MBCACHE=y 800CONFIG_FS_MBCACHE=y
764# CONFIG_REISERFS_FS is not set 801# CONFIG_REISERFS_FS is not set
765# CONFIG_JFS_FS is not set 802# CONFIG_JFS_FS is not set
@@ -799,7 +836,6 @@ CONFIG_SYSFS=y
799CONFIG_TMPFS=y 836CONFIG_TMPFS=y
800# CONFIG_TMPFS_POSIX_ACL is not set 837# CONFIG_TMPFS_POSIX_ACL is not set
801# CONFIG_HUGETLB_PAGE is not set 838# CONFIG_HUGETLB_PAGE is not set
802CONFIG_RAMFS=y
803 839
804# 840#
805# Miscellaneous filesystems 841# Miscellaneous filesystems
@@ -812,10 +848,7 @@ CONFIG_CRAMFS=y
812# CONFIG_QNX4FS_FS is not set 848# CONFIG_QNX4FS_FS is not set
813# CONFIG_SYSV_FS is not set 849# CONFIG_SYSV_FS is not set
814# CONFIG_UFS_FS is not set 850# CONFIG_UFS_FS is not set
815 851CONFIG_NETWORK_FILESYSTEMS=y
816#
817# Network File Systems
818#
819CONFIG_NFS_FS=y 852CONFIG_NFS_FS=y
820CONFIG_NFS_V3=y 853CONFIG_NFS_V3=y
821CONFIG_NFS_V3_ACL=y 854CONFIG_NFS_V3_ACL=y
@@ -853,10 +886,6 @@ CONFIG_MSDOS_PARTITION=y
853# CONFIG_KARMA_PARTITION is not set 886# CONFIG_KARMA_PARTITION is not set
854# CONFIG_EFI_PARTITION is not set 887# CONFIG_EFI_PARTITION is not set
855# CONFIG_SYSV68_PARTITION is not set 888# CONFIG_SYSV68_PARTITION is not set
856
857#
858# Native Language Support
859#
860CONFIG_NLS=y 889CONFIG_NLS=y
861CONFIG_NLS_DEFAULT="iso8859-1" 890CONFIG_NLS_DEFAULT="iso8859-1"
862CONFIG_NLS_CODEPAGE_437=y 891CONFIG_NLS_CODEPAGE_437=y
@@ -915,11 +944,13 @@ CONFIG_PLIST=y
915CONFIG_HAS_IOMEM=y 944CONFIG_HAS_IOMEM=y
916CONFIG_HAS_IOPORT=y 945CONFIG_HAS_IOPORT=y
917CONFIG_HAS_DMA=y 946CONFIG_HAS_DMA=y
947# CONFIG_INSTRUMENTATION is not set
918 948
919# 949#
920# Kernel hacking 950# Kernel hacking
921# 951#
922# CONFIG_PRINTK_TIME is not set 952# CONFIG_PRINTK_TIME is not set
953CONFIG_ENABLE_WARN_DEPRECATED=y
923CONFIG_ENABLE_MUST_CHECK=y 954CONFIG_ENABLE_MUST_CHECK=y
924CONFIG_MAGIC_SYSRQ=y 955CONFIG_MAGIC_SYSRQ=y
925# CONFIG_UNUSED_SYMBOLS is not set 956# CONFIG_UNUSED_SYMBOLS is not set
@@ -943,8 +974,11 @@ CONFIG_DEBUG_BUGVERBOSE=y
943CONFIG_DEBUG_INFO=y 974CONFIG_DEBUG_INFO=y
944# CONFIG_DEBUG_VM is not set 975# CONFIG_DEBUG_VM is not set
945# CONFIG_DEBUG_LIST is not set 976# CONFIG_DEBUG_LIST is not set
977# CONFIG_DEBUG_SG is not set
946CONFIG_FORCED_INLINING=y 978CONFIG_FORCED_INLINING=y
979# CONFIG_BOOT_PRINTK_DELAY is not set
947# CONFIG_FAULT_INJECTION is not set 980# CONFIG_FAULT_INJECTION is not set
981# CONFIG_SAMPLES is not set
948# CONFIG_DEBUG_STACKOVERFLOW is not set 982# CONFIG_DEBUG_STACKOVERFLOW is not set
949# CONFIG_DEBUG_STACK_USAGE is not set 983# CONFIG_DEBUG_STACK_USAGE is not set
950# CONFIG_DEBUG_PAGEALLOC is not set 984# CONFIG_DEBUG_PAGEALLOC is not set
@@ -952,16 +986,6 @@ CONFIG_FORCED_INLINING=y
952# CONFIG_KGDB_CONSOLE is not set 986# CONFIG_KGDB_CONSOLE is not set
953CONFIG_BDI_SWITCH=y 987CONFIG_BDI_SWITCH=y
954# CONFIG_PPC_EARLY_DEBUG is not set 988# CONFIG_PPC_EARLY_DEBUG is not set
955# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
956# CONFIG_PPC_EARLY_DEBUG_G5 is not set
957# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
958# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
959# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
960# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
961# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
962# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
963# CONFIG_PPC_EARLY_DEBUG_44x is not set
964# CONFIG_PPC_EARLY_DEBUG_CPM is not set
965 989
966# 990#
967# Security options 991# Security options
@@ -997,8 +1021,12 @@ CONFIG_CRYPTO_DES=y
997# CONFIG_CRYPTO_ARC4 is not set 1021# CONFIG_CRYPTO_ARC4 is not set
998# CONFIG_CRYPTO_KHAZAD is not set 1022# CONFIG_CRYPTO_KHAZAD is not set
999# CONFIG_CRYPTO_ANUBIS is not set 1023# CONFIG_CRYPTO_ANUBIS is not set
1024# CONFIG_CRYPTO_SEED is not set
1000# CONFIG_CRYPTO_DEFLATE is not set 1025# CONFIG_CRYPTO_DEFLATE is not set
1001# CONFIG_CRYPTO_MICHAEL_MIC is not set 1026# CONFIG_CRYPTO_MICHAEL_MIC is not set
1002# CONFIG_CRYPTO_CRC32C is not set 1027# CONFIG_CRYPTO_CRC32C is not set
1003# CONFIG_CRYPTO_CAMELLIA is not set 1028# CONFIG_CRYPTO_CAMELLIA is not set
1029# CONFIG_CRYPTO_AUTHENC is not set
1004CONFIG_CRYPTO_HW=y 1030CONFIG_CRYPTO_HW=y
1031# CONFIG_PPC_CLOCK is not set
1032CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 3e87faf9b5c2..46b2579d38b1 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 28 21:24:45 2007 4# Thu Dec 6 16:49:11 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_6xx=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y 17CONFIG_PPC_FPU=y
18CONFIG_ALTIVEC=y
18CONFIG_PPC_STD_MMU=y 19CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y 20CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
@@ -22,8 +23,13 @@ CONFIG_PPC_STD_MMU_32=y
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_CHECK_CACHE_COHERENCY=y 24CONFIG_CHECK_CACHE_COHERENCY=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
26CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 27CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 28CONFIG_MMU=y
29CONFIG_GENERIC_CMOS_UPDATE=y
30CONFIG_GENERIC_TIME=y
31CONFIG_GENERIC_TIME_VSYSCALL=y
32CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 33CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 34CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 35CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,9 +69,12 @@ CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
68CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set
77# CONFIG_FAIR_GROUP_SCHED is not set
69# CONFIG_SYSFS_DEPRECATED is not set 78# CONFIG_SYSFS_DEPRECATED is not set
70# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
71CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
@@ -85,7 +94,6 @@ CONFIG_FUTEX=y
85CONFIG_ANON_INODES=y 94CONFIG_ANON_INODES=y
86CONFIG_EPOLL=y 95CONFIG_EPOLL=y
87CONFIG_SIGNALFD=y 96CONFIG_SIGNALFD=y
88CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 98CONFIG_SHMEM=y
91CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
@@ -119,16 +127,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
119# 127#
120# Platform support 128# Platform support
121# 129#
122# CONFIG_PPC_MULTIPLATFORM is not set 130CONFIG_PPC_MULTIPLATFORM=y
123CONFIG_EMBEDDED6xx=y
124# CONFIG_PPC_82xx is not set 131# CONFIG_PPC_82xx is not set
125# CONFIG_PPC_83xx is not set 132# CONFIG_PPC_83xx is not set
126# CONFIG_PPC_86xx is not set 133# CONFIG_PPC_86xx is not set
134CONFIG_CLASSIC32=y
135# CONFIG_PPC_CHRP is not set
127# CONFIG_PPC_MPC52xx is not set 136# CONFIG_PPC_MPC52xx is not set
128# CONFIG_PPC_MPC5200 is not set 137# CONFIG_PPC_MPC5200 is not set
138# CONFIG_PPC_EFIKA is not set
139# CONFIG_PPC_LITE5200 is not set
140# CONFIG_PPC_PMAC is not set
129# CONFIG_PPC_CELL is not set 141# CONFIG_PPC_CELL is not set
130# CONFIG_PPC_CELL_NATIVE is not set 142# CONFIG_PPC_CELL_NATIVE is not set
131# CONFIG_PQ2ADS is not set 143# CONFIG_PQ2ADS is not set
144CONFIG_EMBEDDED6xx=y
132# CONFIG_LINKSTATION is not set 145# CONFIG_LINKSTATION is not set
133# CONFIG_MPC7448HPC2 is not set 146# CONFIG_MPC7448HPC2 is not set
134# CONFIG_PPC_HOLLY is not set 147# CONFIG_PPC_HOLLY is not set
@@ -144,6 +157,7 @@ CONFIG_MV64X60=y
144# CONFIG_PPC_INDIRECT_IO is not set 157# CONFIG_PPC_INDIRECT_IO is not set
145# CONFIG_GENERIC_IOMAP is not set 158# CONFIG_GENERIC_IOMAP is not set
146# CONFIG_CPU_FREQ is not set 159# CONFIG_CPU_FREQ is not set
160# CONFIG_TAU is not set
147# CONFIG_CPM2 is not set 161# CONFIG_CPM2 is not set
148# CONFIG_FSL_ULI1575 is not set 162# CONFIG_FSL_ULI1575 is not set
149 163
@@ -151,6 +165,10 @@ CONFIG_MV64X60=y
151# Kernel options 165# Kernel options
152# 166#
153CONFIG_HIGHMEM=y 167CONFIG_HIGHMEM=y
168CONFIG_TICK_ONESHOT=y
169CONFIG_NO_HZ=y
170CONFIG_HIGH_RES_TIMERS=y
171CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
154# CONFIG_HZ_100 is not set 172# CONFIG_HZ_100 is not set
155CONFIG_HZ_250=y 173CONFIG_HZ_250=y
156# CONFIG_HZ_300 is not set 174# CONFIG_HZ_300 is not set
@@ -172,6 +190,7 @@ CONFIG_FLATMEM_MANUAL=y
172CONFIG_FLATMEM=y 190CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 191CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
193# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
175CONFIG_SPLIT_PTLOCK_CPUS=4 194CONFIG_SPLIT_PTLOCK_CPUS=4
176# CONFIG_RESOURCES_64BIT is not set 195# CONFIG_RESOURCES_64BIT is not set
177CONFIG_ZONE_DMA_FLAG=1 196CONFIG_ZONE_DMA_FLAG=1
@@ -180,6 +199,8 @@ CONFIG_VIRT_TO_BUS=y
180CONFIG_PROC_DEVICETREE=y 199CONFIG_PROC_DEVICETREE=y
181# CONFIG_CMDLINE_BOOL is not set 200# CONFIG_CMDLINE_BOOL is not set
182# CONFIG_PM is not set 201# CONFIG_PM is not set
202CONFIG_SUSPEND_UP_POSSIBLE=y
203CONFIG_HIBERNATION_UP_POSSIBLE=y
183# CONFIG_SECCOMP is not set 204# CONFIG_SECCOMP is not set
184CONFIG_WANT_DEVICE_TREE=y 205CONFIG_WANT_DEVICE_TREE=y
185CONFIG_DEVICE_TREE="prpmc2800.dts" 206CONFIG_DEVICE_TREE="prpmc2800.dts"
@@ -197,10 +218,7 @@ CONFIG_PCI_SYSCALL=y
197# CONFIG_PCIEPORTBUS is not set 218# CONFIG_PCIEPORTBUS is not set
198CONFIG_ARCH_SUPPORTS_MSI=y 219CONFIG_ARCH_SUPPORTS_MSI=y
199# CONFIG_PCI_MSI is not set 220# CONFIG_PCI_MSI is not set
200 221CONFIG_PCI_LEGACY=y
201#
202# PCCARD (PCMCIA/CardBus) support
203#
204# CONFIG_PCCARD is not set 222# CONFIG_PCCARD is not set
205# CONFIG_HOTPLUG_PCI is not set 223# CONFIG_HOTPLUG_PCI is not set
206 224
@@ -215,7 +233,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
215CONFIG_HIGHMEM_START=0xfe000000 233CONFIG_HIGHMEM_START=0xfe000000
216CONFIG_LOWMEM_SIZE=0x30000000 234CONFIG_LOWMEM_SIZE=0x30000000
217CONFIG_KERNEL_START=0xc0000000 235CONFIG_KERNEL_START=0xc0000000
218CONFIG_TASK_SIZE=0x80000000 236CONFIG_TASK_SIZE=0xc0000000
219CONFIG_CONSISTENT_START=0xff100000 237CONFIG_CONSISTENT_START=0xff100000
220CONFIG_CONSISTENT_SIZE=0x00200000 238CONFIG_CONSISTENT_SIZE=0x00200000
221CONFIG_BOOT_LOAD=0x00800000 239CONFIG_BOOT_LOAD=0x00800000
@@ -257,6 +275,7 @@ CONFIG_SYN_COOKIES=y
257CONFIG_INET_XFRM_MODE_TRANSPORT=y 275CONFIG_INET_XFRM_MODE_TRANSPORT=y
258CONFIG_INET_XFRM_MODE_TUNNEL=y 276CONFIG_INET_XFRM_MODE_TUNNEL=y
259CONFIG_INET_XFRM_MODE_BEET=y 277CONFIG_INET_XFRM_MODE_BEET=y
278# CONFIG_INET_LRO is not set
260CONFIG_INET_DIAG=y 279CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 280CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set 281# CONFIG_TCP_CONG_ADVANCED is not set
@@ -282,10 +301,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
282# CONFIG_LAPB is not set 301# CONFIG_LAPB is not set
283# CONFIG_ECONET is not set 302# CONFIG_ECONET is not set
284# CONFIG_WAN_ROUTER is not set 303# CONFIG_WAN_ROUTER is not set
285
286#
287# QoS and/or fair queueing
288#
289# CONFIG_NET_SCHED is not set 304# CONFIG_NET_SCHED is not set
290 305
291# 306#
@@ -314,6 +329,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
314# 329#
315# Generic Driver Options 330# Generic Driver Options
316# 331#
332CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
317CONFIG_STANDALONE=y 333CONFIG_STANDALONE=y
318CONFIG_PREVENT_FIRMWARE_BUILD=y 334CONFIG_PREVENT_FIRMWARE_BUILD=y
319# CONFIG_FW_LOADER is not set 335# CONFIG_FW_LOADER is not set
@@ -337,6 +353,7 @@ CONFIG_MTD_BLOCK=y
337# CONFIG_INFTL is not set 353# CONFIG_INFTL is not set
338# CONFIG_RFD_FTL is not set 354# CONFIG_RFD_FTL is not set
339# CONFIG_SSFDC is not set 355# CONFIG_SSFDC is not set
356# CONFIG_MTD_OOPS is not set
340 357
341# 358#
342# RAM/ROM/Flash chip drivers 359# RAM/ROM/Flash chip drivers
@@ -369,6 +386,7 @@ CONFIG_MTD_CFI_UTIL=y
369# CONFIG_MTD_COMPLEX_MAPPINGS is not set 386# CONFIG_MTD_COMPLEX_MAPPINGS is not set
370# CONFIG_MTD_PHYSMAP is not set 387# CONFIG_MTD_PHYSMAP is not set
371CONFIG_MTD_PHYSMAP_OF=y 388CONFIG_MTD_PHYSMAP_OF=y
389# CONFIG_MTD_INTEL_VR_NOR is not set
372# CONFIG_MTD_PLATRAM is not set 390# CONFIG_MTD_PLATRAM is not set
373 391
374# 392#
@@ -438,6 +456,11 @@ CONFIG_IDE_PROC_FS=y
438# IDE chipset support/bugfixes 456# IDE chipset support/bugfixes
439# 457#
440CONFIG_IDE_GENERIC=y 458CONFIG_IDE_GENERIC=y
459# CONFIG_BLK_DEV_PLATFORM is not set
460
461#
462# PCI IDE chipsets support
463#
441CONFIG_BLK_DEV_IDEPCI=y 464CONFIG_BLK_DEV_IDEPCI=y
442# CONFIG_IDEPCI_SHARE_IRQ is not set 465# CONFIG_IDEPCI_SHARE_IRQ is not set
443CONFIG_IDEPCI_PCIBUS_ORDER=y 466CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -445,8 +468,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
445CONFIG_BLK_DEV_GENERIC=y 468CONFIG_BLK_DEV_GENERIC=y
446# CONFIG_BLK_DEV_OPTI621 is not set 469# CONFIG_BLK_DEV_OPTI621 is not set
447CONFIG_BLK_DEV_IDEDMA_PCI=y 470CONFIG_BLK_DEV_IDEDMA_PCI=y
448# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
449# CONFIG_IDEDMA_ONLYDISK is not set
450# CONFIG_BLK_DEV_AEC62XX is not set 471# CONFIG_BLK_DEV_AEC62XX is not set
451# CONFIG_BLK_DEV_ALI15X3 is not set 472# CONFIG_BLK_DEV_ALI15X3 is not set
452# CONFIG_BLK_DEV_AMD74XX is not set 473# CONFIG_BLK_DEV_AMD74XX is not set
@@ -474,7 +495,7 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y
474# CONFIG_BLK_DEV_TC86C001 is not set 495# CONFIG_BLK_DEV_TC86C001 is not set
475# CONFIG_IDE_ARM is not set 496# CONFIG_IDE_ARM is not set
476CONFIG_BLK_DEV_IDEDMA=y 497CONFIG_BLK_DEV_IDEDMA=y
477# CONFIG_IDEDMA_IVB is not set 498CONFIG_IDE_ARCH_OBSOLETE_INIT=y
478# CONFIG_BLK_DEV_HD is not set 499# CONFIG_BLK_DEV_HD is not set
479 500
480# 501#
@@ -512,6 +533,7 @@ CONFIG_BLK_DEV_SD=y
512# CONFIG_SCSI_FC_ATTRS is not set 533# CONFIG_SCSI_FC_ATTRS is not set
513# CONFIG_SCSI_ISCSI_ATTRS is not set 534# CONFIG_SCSI_ISCSI_ATTRS is not set
514# CONFIG_SCSI_SAS_LIBSAS is not set 535# CONFIG_SCSI_SAS_LIBSAS is not set
536# CONFIG_SCSI_SRP_ATTRS is not set
515CONFIG_SCSI_LOWLEVEL=y 537CONFIG_SCSI_LOWLEVEL=y
516# CONFIG_ISCSI_TCP is not set 538# CONFIG_ISCSI_TCP is not set
517# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 539# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -523,6 +545,7 @@ CONFIG_SCSI_LOWLEVEL=y
523# CONFIG_SCSI_AIC79XX is not set 545# CONFIG_SCSI_AIC79XX is not set
524# CONFIG_SCSI_AIC94XX is not set 546# CONFIG_SCSI_AIC94XX is not set
525# CONFIG_SCSI_DPT_I2O is not set 547# CONFIG_SCSI_DPT_I2O is not set
548# CONFIG_SCSI_ADVANSYS is not set
526# CONFIG_SCSI_ARCMSR is not set 549# CONFIG_SCSI_ARCMSR is not set
527# CONFIG_MEGARAID_NEWGEN is not set 550# CONFIG_MEGARAID_NEWGEN is not set
528# CONFIG_MEGARAID_LEGACY is not set 551# CONFIG_MEGARAID_LEGACY is not set
@@ -590,6 +613,7 @@ CONFIG_SATA_MV=y
590# CONFIG_PATA_OLDPIIX is not set 613# CONFIG_PATA_OLDPIIX is not set
591# CONFIG_PATA_NETCELL is not set 614# CONFIG_PATA_NETCELL is not set
592# CONFIG_PATA_NS87410 is not set 615# CONFIG_PATA_NS87410 is not set
616# CONFIG_PATA_NS87415 is not set
593# CONFIG_PATA_OPTI is not set 617# CONFIG_PATA_OPTI is not set
594# CONFIG_PATA_OPTIDMA is not set 618# CONFIG_PATA_OPTIDMA is not set
595# CONFIG_PATA_PDC_OLD is not set 619# CONFIG_PATA_PDC_OLD is not set
@@ -603,14 +627,7 @@ CONFIG_SATA_MV=y
603# CONFIG_PATA_VIA is not set 627# CONFIG_PATA_VIA is not set
604# CONFIG_PATA_WINBOND is not set 628# CONFIG_PATA_WINBOND is not set
605# CONFIG_MD is not set 629# CONFIG_MD is not set
606
607#
608# Fusion MPT device support
609#
610# CONFIG_FUSION is not set 630# CONFIG_FUSION is not set
611# CONFIG_FUSION_SPI is not set
612# CONFIG_FUSION_FC is not set
613# CONFIG_FUSION_SAS is not set
614 631
615# 632#
616# IEEE 1394 (FireWire) support 633# IEEE 1394 (FireWire) support
@@ -628,6 +645,8 @@ CONFIG_NETDEVICES=y
628# CONFIG_MACVLAN is not set 645# CONFIG_MACVLAN is not set
629# CONFIG_EQUALIZER is not set 646# CONFIG_EQUALIZER is not set
630# CONFIG_TUN is not set 647# CONFIG_TUN is not set
648# CONFIG_VETH is not set
649# CONFIG_IP1000 is not set
631# CONFIG_ARCNET is not set 650# CONFIG_ARCNET is not set
632CONFIG_PHYLIB=y 651CONFIG_PHYLIB=y
633 652
@@ -644,6 +663,7 @@ CONFIG_PHYLIB=y
644# CONFIG_BROADCOM_PHY is not set 663# CONFIG_BROADCOM_PHY is not set
645# CONFIG_ICPLUS_PHY is not set 664# CONFIG_ICPLUS_PHY is not set
646# CONFIG_FIXED_PHY is not set 665# CONFIG_FIXED_PHY is not set
666# CONFIG_MDIO_BITBANG is not set
647CONFIG_NET_ETHERNET=y 667CONFIG_NET_ETHERNET=y
648CONFIG_MII=y 668CONFIG_MII=y
649# CONFIG_HAPPYMEAL is not set 669# CONFIG_HAPPYMEAL is not set
@@ -652,13 +672,16 @@ CONFIG_MII=y
652# CONFIG_NET_VENDOR_3COM is not set 672# CONFIG_NET_VENDOR_3COM is not set
653# CONFIG_NET_TULIP is not set 673# CONFIG_NET_TULIP is not set
654# CONFIG_HP100 is not set 674# CONFIG_HP100 is not set
675# CONFIG_IBM_NEW_EMAC_ZMII is not set
676# CONFIG_IBM_NEW_EMAC_RGMII is not set
677# CONFIG_IBM_NEW_EMAC_TAH is not set
678# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
655CONFIG_NET_PCI=y 679CONFIG_NET_PCI=y
656# CONFIG_PCNET32 is not set 680# CONFIG_PCNET32 is not set
657# CONFIG_AMD8111_ETH is not set 681# CONFIG_AMD8111_ETH is not set
658# CONFIG_ADAPTEC_STARFIRE is not set 682# CONFIG_ADAPTEC_STARFIRE is not set
659# CONFIG_B44 is not set 683# CONFIG_B44 is not set
660# CONFIG_FORCEDETH is not set 684# CONFIG_FORCEDETH is not set
661# CONFIG_DGRS is not set
662# CONFIG_EEPRO100 is not set 685# CONFIG_EEPRO100 is not set
663CONFIG_E100=y 686CONFIG_E100=y
664# CONFIG_FEALNX is not set 687# CONFIG_FEALNX is not set
@@ -682,6 +705,7 @@ CONFIG_NETDEV_1000=y
682CONFIG_E1000=y 705CONFIG_E1000=y
683# CONFIG_E1000_NAPI is not set 706# CONFIG_E1000_NAPI is not set
684# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 707# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
708# CONFIG_E1000E is not set
685# CONFIG_NS83820 is not set 709# CONFIG_NS83820 is not set
686# CONFIG_HAMACHI is not set 710# CONFIG_HAMACHI is not set
687# CONFIG_YELLOWFIN is not set 711# CONFIG_YELLOWFIN is not set
@@ -689,6 +713,7 @@ CONFIG_E1000=y
689# CONFIG_SIS190 is not set 713# CONFIG_SIS190 is not set
690# CONFIG_SKGE is not set 714# CONFIG_SKGE is not set
691# CONFIG_SKY2 is not set 715# CONFIG_SKY2 is not set
716# CONFIG_SK98LIN is not set
692# CONFIG_VIA_VELOCITY is not set 717# CONFIG_VIA_VELOCITY is not set
693# CONFIG_TIGON3 is not set 718# CONFIG_TIGON3 is not set
694# CONFIG_BNX2 is not set 719# CONFIG_BNX2 is not set
@@ -698,11 +723,14 @@ CONFIG_MV643XX_ETH=y
698CONFIG_NETDEV_10000=y 723CONFIG_NETDEV_10000=y
699# CONFIG_CHELSIO_T1 is not set 724# CONFIG_CHELSIO_T1 is not set
700# CONFIG_CHELSIO_T3 is not set 725# CONFIG_CHELSIO_T3 is not set
726# CONFIG_IXGBE is not set
701# CONFIG_IXGB is not set 727# CONFIG_IXGB is not set
702# CONFIG_S2IO is not set 728# CONFIG_S2IO is not set
703# CONFIG_MYRI10GE is not set 729# CONFIG_MYRI10GE is not set
704# CONFIG_NETXEN_NIC is not set 730# CONFIG_NETXEN_NIC is not set
731# CONFIG_NIU is not set
705# CONFIG_MLX4_CORE is not set 732# CONFIG_MLX4_CORE is not set
733# CONFIG_TEHUTI is not set
706# CONFIG_TR is not set 734# CONFIG_TR is not set
707 735
708# 736#
@@ -718,7 +746,6 @@ CONFIG_NETDEV_10000=y
718# CONFIG_USB_KAWETH is not set 746# CONFIG_USB_KAWETH is not set
719# CONFIG_USB_PEGASUS is not set 747# CONFIG_USB_PEGASUS is not set
720# CONFIG_USB_RTL8150 is not set 748# CONFIG_USB_RTL8150 is not set
721# CONFIG_USB_USBNET_MII is not set
722# CONFIG_USB_USBNET is not set 749# CONFIG_USB_USBNET is not set
723# CONFIG_WAN is not set 750# CONFIG_WAN is not set
724# CONFIG_FDDI is not set 751# CONFIG_FDDI is not set
@@ -748,7 +775,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
748CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 775CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
749CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 776CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
750# CONFIG_INPUT_JOYDEV is not set 777# CONFIG_INPUT_JOYDEV is not set
751# CONFIG_INPUT_TSDEV is not set
752# CONFIG_INPUT_EVDEV is not set 778# CONFIG_INPUT_EVDEV is not set
753# CONFIG_INPUT_EVBUG is not set 779# CONFIG_INPUT_EVBUG is not set
754 780
@@ -795,15 +821,12 @@ CONFIG_UNIX98_PTYS=y
795CONFIG_LEGACY_PTYS=y 821CONFIG_LEGACY_PTYS=y
796CONFIG_LEGACY_PTY_COUNT=256 822CONFIG_LEGACY_PTY_COUNT=256
797# CONFIG_IPMI_HANDLER is not set 823# CONFIG_IPMI_HANDLER is not set
798# CONFIG_WATCHDOG is not set
799# CONFIG_HW_RANDOM is not set 824# CONFIG_HW_RANDOM is not set
800# CONFIG_NVRAM is not set 825# CONFIG_NVRAM is not set
801CONFIG_GEN_RTC=y 826CONFIG_GEN_RTC=y
802# CONFIG_GEN_RTC_X is not set 827# CONFIG_GEN_RTC_X is not set
803# CONFIG_R3964 is not set 828# CONFIG_R3964 is not set
804# CONFIG_APPLICOM is not set 829# CONFIG_APPLICOM is not set
805# CONFIG_AGP is not set
806# CONFIG_DRM is not set
807# CONFIG_RAW_DRIVER is not set 830# CONFIG_RAW_DRIVER is not set
808# CONFIG_TCG_TPM is not set 831# CONFIG_TCG_TPM is not set
809CONFIG_DEVPORT=y 832CONFIG_DEVPORT=y
@@ -873,8 +896,6 @@ CONFIG_I2C_MV64XXX=y
873# CONFIG_POWER_SUPPLY is not set 896# CONFIG_POWER_SUPPLY is not set
874CONFIG_HWMON=y 897CONFIG_HWMON=y
875# CONFIG_HWMON_VID is not set 898# CONFIG_HWMON_VID is not set
876# CONFIG_SENSORS_ABITUGURU is not set
877# CONFIG_SENSORS_ABITUGURU3 is not set
878# CONFIG_SENSORS_AD7418 is not set 899# CONFIG_SENSORS_AD7418 is not set
879# CONFIG_SENSORS_ADM1021 is not set 900# CONFIG_SENSORS_ADM1021 is not set
880# CONFIG_SENSORS_ADM1025 is not set 901# CONFIG_SENSORS_ADM1025 is not set
@@ -882,12 +903,13 @@ CONFIG_HWMON=y
882# CONFIG_SENSORS_ADM1029 is not set 903# CONFIG_SENSORS_ADM1029 is not set
883# CONFIG_SENSORS_ADM1031 is not set 904# CONFIG_SENSORS_ADM1031 is not set
884# CONFIG_SENSORS_ADM9240 is not set 905# CONFIG_SENSORS_ADM9240 is not set
885# CONFIG_SENSORS_ASB100 is not set 906# CONFIG_SENSORS_ADT7470 is not set
886# CONFIG_SENSORS_ATXP1 is not set 907# CONFIG_SENSORS_ATXP1 is not set
887# CONFIG_SENSORS_DS1621 is not set 908# CONFIG_SENSORS_DS1621 is not set
909# CONFIG_SENSORS_I5K_AMB is not set
888# CONFIG_SENSORS_F71805F is not set 910# CONFIG_SENSORS_F71805F is not set
889# CONFIG_SENSORS_FSCHER is not set 911# CONFIG_SENSORS_F71882FG is not set
890# CONFIG_SENSORS_FSCPOS is not set 912# CONFIG_SENSORS_F75375S is not set
891# CONFIG_SENSORS_GL518SM is not set 913# CONFIG_SENSORS_GL518SM is not set
892# CONFIG_SENSORS_GL520SM is not set 914# CONFIG_SENSORS_GL520SM is not set
893# CONFIG_SENSORS_IT87 is not set 915# CONFIG_SENSORS_IT87 is not set
@@ -923,6 +945,13 @@ CONFIG_HWMON=y
923# CONFIG_SENSORS_W83627HF is not set 945# CONFIG_SENSORS_W83627HF is not set
924# CONFIG_SENSORS_W83627EHF is not set 946# CONFIG_SENSORS_W83627EHF is not set
925# CONFIG_HWMON_DEBUG_CHIP is not set 947# CONFIG_HWMON_DEBUG_CHIP is not set
948# CONFIG_WATCHDOG is not set
949
950#
951# Sonics Silicon Backplane
952#
953CONFIG_SSB_POSSIBLE=y
954# CONFIG_SSB is not set
926 955
927# 956#
928# Multifunction device drivers 957# Multifunction device drivers
@@ -939,16 +968,17 @@ CONFIG_HWMON=y
939# 968#
940# Graphics support 969# Graphics support
941# 970#
971# CONFIG_AGP is not set
972# CONFIG_DRM is not set
973# CONFIG_VGASTATE is not set
974CONFIG_VIDEO_OUTPUT_CONTROL=y
975# CONFIG_FB is not set
942# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 976# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
943 977
944# 978#
945# Display device support 979# Display device support
946# 980#
947# CONFIG_DISPLAY_SUPPORT is not set 981# CONFIG_DISPLAY_SUPPORT is not set
948# CONFIG_VGASTATE is not set
949CONFIG_VIDEO_OUTPUT_CONTROL=y
950# CONFIG_FB is not set
951# CONFIG_FB_IBM_GXT4500 is not set
952 982
953# 983#
954# Console display driver support 984# Console display driver support
@@ -964,6 +994,7 @@ CONFIG_DUMMY_CONSOLE=y
964CONFIG_HID_SUPPORT=y 994CONFIG_HID_SUPPORT=y
965CONFIG_HID=y 995CONFIG_HID=y
966# CONFIG_HID_DEBUG is not set 996# CONFIG_HID_DEBUG is not set
997# CONFIG_HIDRAW is not set
967 998
968# 999#
969# USB Input Devices 1000# USB Input Devices
@@ -1091,6 +1122,7 @@ CONFIG_RTC_INTF_DEV=y
1091# I2C RTC drivers 1122# I2C RTC drivers
1092# 1123#
1093# CONFIG_RTC_DRV_DS1307 is not set 1124# CONFIG_RTC_DRV_DS1307 is not set
1125# CONFIG_RTC_DRV_DS1374 is not set
1094# CONFIG_RTC_DRV_DS1672 is not set 1126# CONFIG_RTC_DRV_DS1672 is not set
1095CONFIG_RTC_DRV_MAX6900=y 1127CONFIG_RTC_DRV_MAX6900=y
1096# CONFIG_RTC_DRV_RS5C372 is not set 1128# CONFIG_RTC_DRV_RS5C372 is not set
@@ -1120,19 +1152,6 @@ CONFIG_RTC_DRV_MAX6900=y
1120# 1152#
1121 1153
1122# 1154#
1123# DMA Engine support
1124#
1125# CONFIG_DMA_ENGINE is not set
1126
1127#
1128# DMA Clients
1129#
1130
1131#
1132# DMA Devices
1133#
1134
1135#
1136# Userspace I/O 1155# Userspace I/O
1137# 1156#
1138# CONFIG_UIO is not set 1157# CONFIG_UIO is not set
@@ -1149,7 +1168,6 @@ CONFIG_EXT3_FS_XATTR=y
1149# CONFIG_EXT3_FS_SECURITY is not set 1168# CONFIG_EXT3_FS_SECURITY is not set
1150# CONFIG_EXT4DEV_FS is not set 1169# CONFIG_EXT4DEV_FS is not set
1151CONFIG_JBD=y 1170CONFIG_JBD=y
1152# CONFIG_JBD_DEBUG is not set
1153CONFIG_FS_MBCACHE=y 1171CONFIG_FS_MBCACHE=y
1154# CONFIG_REISERFS_FS is not set 1172# CONFIG_REISERFS_FS is not set
1155# CONFIG_JFS_FS is not set 1173# CONFIG_JFS_FS is not set
@@ -1190,7 +1208,6 @@ CONFIG_SYSFS=y
1190CONFIG_TMPFS=y 1208CONFIG_TMPFS=y
1191# CONFIG_TMPFS_POSIX_ACL is not set 1209# CONFIG_TMPFS_POSIX_ACL is not set
1192# CONFIG_HUGETLB_PAGE is not set 1210# CONFIG_HUGETLB_PAGE is not set
1193CONFIG_RAMFS=y
1194# CONFIG_CONFIGFS_FS is not set 1211# CONFIG_CONFIGFS_FS is not set
1195 1212
1196# 1213#
@@ -1210,10 +1227,7 @@ CONFIG_RAMFS=y
1210# CONFIG_QNX4FS_FS is not set 1227# CONFIG_QNX4FS_FS is not set
1211# CONFIG_SYSV_FS is not set 1228# CONFIG_SYSV_FS is not set
1212# CONFIG_UFS_FS is not set 1229# CONFIG_UFS_FS is not set
1213 1230CONFIG_NETWORK_FILESYSTEMS=y
1214#
1215# Network File Systems
1216#
1217CONFIG_NFS_FS=y 1231CONFIG_NFS_FS=y
1218# CONFIG_NFS_V3 is not set 1232# CONFIG_NFS_V3 is not set
1219# CONFIG_NFS_V4 is not set 1233# CONFIG_NFS_V4 is not set
@@ -1253,15 +1267,7 @@ CONFIG_MSDOS_PARTITION=y
1253# CONFIG_KARMA_PARTITION is not set 1267# CONFIG_KARMA_PARTITION is not set
1254# CONFIG_EFI_PARTITION is not set 1268# CONFIG_EFI_PARTITION is not set
1255# CONFIG_SYSV68_PARTITION is not set 1269# CONFIG_SYSV68_PARTITION is not set
1256
1257#
1258# Native Language Support
1259#
1260# CONFIG_NLS is not set 1270# CONFIG_NLS is not set
1261
1262#
1263# Distributed Lock Manager
1264#
1265# CONFIG_DLM is not set 1271# CONFIG_DLM is not set
1266# CONFIG_UCC_SLOW is not set 1272# CONFIG_UCC_SLOW is not set
1267 1273
@@ -1279,23 +1285,23 @@ CONFIG_PLIST=y
1279CONFIG_HAS_IOMEM=y 1285CONFIG_HAS_IOMEM=y
1280CONFIG_HAS_IOPORT=y 1286CONFIG_HAS_IOPORT=y
1281CONFIG_HAS_DMA=y 1287CONFIG_HAS_DMA=y
1282 1288# CONFIG_INSTRUMENTATION is not set
1283#
1284# Instrumentation Support
1285#
1286# CONFIG_PROFILING is not set
1287 1289
1288# 1290#
1289# Kernel hacking 1291# Kernel hacking
1290# 1292#
1291# CONFIG_PRINTK_TIME is not set 1293# CONFIG_PRINTK_TIME is not set
1294CONFIG_ENABLE_WARN_DEPRECATED=y
1292CONFIG_ENABLE_MUST_CHECK=y 1295CONFIG_ENABLE_MUST_CHECK=y
1293# CONFIG_MAGIC_SYSRQ is not set 1296# CONFIG_MAGIC_SYSRQ is not set
1294# CONFIG_UNUSED_SYMBOLS is not set 1297# CONFIG_UNUSED_SYMBOLS is not set
1295# CONFIG_DEBUG_FS is not set 1298# CONFIG_DEBUG_FS is not set
1296# CONFIG_HEADERS_CHECK is not set 1299# CONFIG_HEADERS_CHECK is not set
1297# CONFIG_DEBUG_KERNEL is not set 1300# CONFIG_DEBUG_KERNEL is not set
1301# CONFIG_SLUB_DEBUG_ON is not set
1298CONFIG_DEBUG_BUGVERBOSE=y 1302CONFIG_DEBUG_BUGVERBOSE=y
1303# CONFIG_SAMPLES is not set
1304# CONFIG_BOOTX_TEXT is not set
1299# CONFIG_PPC_EARLY_DEBUG is not set 1305# CONFIG_PPC_EARLY_DEBUG is not set
1300 1306
1301# 1307#
@@ -1303,4 +1309,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
1303# 1309#
1304# CONFIG_KEYS is not set 1310# CONFIG_KEYS is not set
1305# CONFIG_SECURITY is not set 1311# CONFIG_SECURITY is not set
1312# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1306# CONFIG_CRYPTO is not set 1313# CONFIG_CRYPTO is not set
1314# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 3566c448bdc0..5bd547ecd60a 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.23-rc2 3# Linux kernel version: 2.6.24-rc4
4# Tue Aug 7 19:17:26 2007 4# Tue Dec 4 22:49:57 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -11,6 +11,7 @@ CONFIG_PPC64=y
11# CONFIG_POWER4_ONLY is not set 11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y 12CONFIG_POWER3=y
13CONFIG_POWER4=y 13CONFIG_POWER4=y
14CONFIG_TUNE_CELL=y
14CONFIG_PPC_FPU=y 15CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y 16CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y 17CONFIG_PPC_STD_MMU=y
@@ -19,8 +20,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y 20CONFIG_SMP=y
20CONFIG_NR_CPUS=2 21CONFIG_NR_CPUS=2
21CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64
22CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
23CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
24CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
25CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
26CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -59,14 +65,18 @@ CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 65CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 66CONFIG_SYSVIPC=y
61CONFIG_SYSVIPC_SYSCTL=y 67CONFIG_SYSVIPC_SYSCTL=y
62# CONFIG_POSIX_MQUEUE is not set 68CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
65# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
66# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
68CONFIG_LOG_BUF_SHIFT=17 75CONFIG_LOG_BUF_SHIFT=17
69# CONFIG_CPUSETS is not set 76# CONFIG_CGROUPS is not set
77CONFIG_FAIR_GROUP_SCHED=y
78CONFIG_FAIR_USER_SCHED=y
79# CONFIG_FAIR_CGROUP_SCHED is not set
70CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 81# CONFIG_RELAY is not set
72CONFIG_BLK_DEV_INITRD=y 82CONFIG_BLK_DEV_INITRD=y
@@ -87,13 +97,11 @@ CONFIG_FUTEX=y
87CONFIG_ANON_INODES=y 97CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 98CONFIG_EPOLL=y
89CONFIG_SIGNALFD=y 99CONFIG_SIGNALFD=y
90CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 100CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 101CONFIG_SHMEM=y
93CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_SLUB_DEBUG=y 103CONFIG_SLAB=y
95# CONFIG_SLAB is not set 104# CONFIG_SLUB is not set
96CONFIG_SLUB=y
97# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
98CONFIG_RT_MUTEXES=y 106CONFIG_RT_MUTEXES=y
99# CONFIG_TINY_SHMEM is not set 107# CONFIG_TINY_SHMEM is not set
@@ -108,6 +116,7 @@ CONFIG_STOP_MACHINE=y
108CONFIG_BLOCK=y 116CONFIG_BLOCK=y
109# CONFIG_BLK_DEV_IO_TRACE is not set 117# CONFIG_BLK_DEV_IO_TRACE is not set
110CONFIG_BLK_DEV_BSG=y 118CONFIG_BLK_DEV_BSG=y
119CONFIG_BLOCK_COMPAT=y
111 120
112# 121#
113# IO Schedulers 122# IO Schedulers
@@ -126,7 +135,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
126# Platform support 135# Platform support
127# 136#
128CONFIG_PPC_MULTIPLATFORM=y 137CONFIG_PPC_MULTIPLATFORM=y
129# CONFIG_EMBEDDED6xx is not set
130# CONFIG_PPC_82xx is not set 138# CONFIG_PPC_82xx is not set
131# CONFIG_PPC_83xx is not set 139# CONFIG_PPC_83xx is not set
132# CONFIG_PPC_86xx is not set 140# CONFIG_PPC_86xx is not set
@@ -176,10 +184,15 @@ CONFIG_SPU_BASE=y
176# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
177# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
178# CONFIG_CPM2 is not set 186# CONFIG_CPM2 is not set
187# CONFIG_FSL_ULI1575 is not set
179 188
180# 189#
181# Kernel options 190# Kernel options
182# 191#
192# CONFIG_TICK_ONESHOT is not set
193# CONFIG_NO_HZ is not set
194# CONFIG_HIGH_RES_TIMERS is not set
195CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
183# CONFIG_HZ_100 is not set 196# CONFIG_HZ_100 is not set
184CONFIG_HZ_250=y 197CONFIG_HZ_250=y
185# CONFIG_HZ_300 is not set 198# CONFIG_HZ_300 is not set
@@ -211,6 +224,8 @@ CONFIG_SPARSEMEM=y
211CONFIG_HAVE_MEMORY_PRESENT=y 224CONFIG_HAVE_MEMORY_PRESENT=y
212# CONFIG_SPARSEMEM_STATIC is not set 225# CONFIG_SPARSEMEM_STATIC is not set
213CONFIG_SPARSEMEM_EXTREME=y 226CONFIG_SPARSEMEM_EXTREME=y
227CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
228CONFIG_SPARSEMEM_VMEMMAP=y
214CONFIG_MEMORY_HOTPLUG=y 229CONFIG_MEMORY_HOTPLUG=y
215CONFIG_MEMORY_HOTPLUG_SPARSE=y 230CONFIG_MEMORY_HOTPLUG_SPARSE=y
216CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
@@ -237,10 +252,6 @@ CONFIG_GENERIC_ISA_DMA=y
237# CONFIG_PCI_DOMAINS is not set 252# CONFIG_PCI_DOMAINS is not set
238# CONFIG_PCI_SYSCALL is not set 253# CONFIG_PCI_SYSCALL is not set
239# CONFIG_ARCH_SUPPORTS_MSI is not set 254# CONFIG_ARCH_SUPPORTS_MSI is not set
240
241#
242# PCCARD (PCMCIA/CardBus) support
243#
244# CONFIG_PCCARD is not set 255# CONFIG_PCCARD is not set
245CONFIG_KERNEL_START=0xc000000000000000 256CONFIG_KERNEL_START=0xc000000000000000
246 257
@@ -280,6 +291,7 @@ CONFIG_INET_TUNNEL=y
280# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 291# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
281# CONFIG_INET_XFRM_MODE_TUNNEL is not set 292# CONFIG_INET_XFRM_MODE_TUNNEL is not set
282# CONFIG_INET_XFRM_MODE_BEET is not set 293# CONFIG_INET_XFRM_MODE_BEET is not set
294# CONFIG_INET_LRO is not set
283# CONFIG_INET_DIAG is not set 295# CONFIG_INET_DIAG is not set
284# CONFIG_TCP_CONG_ADVANCED is not set 296# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_CUBIC=y 297CONFIG_TCP_CONG_CUBIC=y
@@ -318,10 +330,6 @@ CONFIG_IPV6_SIT=y
318# CONFIG_LAPB is not set 330# CONFIG_LAPB is not set
319# CONFIG_ECONET is not set 331# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 332# CONFIG_WAN_ROUTER is not set
321
322#
323# QoS and/or fair queueing
324#
325# CONFIG_NET_SCHED is not set 333# CONFIG_NET_SCHED is not set
326 334
327# 335#
@@ -330,26 +338,7 @@ CONFIG_IPV6_SIT=y
330# CONFIG_NET_PKTGEN is not set 338# CONFIG_NET_PKTGEN is not set
331# CONFIG_HAMRADIO is not set 339# CONFIG_HAMRADIO is not set
332# CONFIG_IRDA is not set 340# CONFIG_IRDA is not set
333CONFIG_BT=m 341# CONFIG_BT is not set
334CONFIG_BT_L2CAP=m
335CONFIG_BT_SCO=m
336CONFIG_BT_RFCOMM=m
337CONFIG_BT_RFCOMM_TTY=y
338# CONFIG_BT_BNEP is not set
339CONFIG_BT_HIDP=m
340
341#
342# Bluetooth device drivers
343#
344CONFIG_BT_HCIUSB=m
345CONFIG_BT_HCIUSB_SCO=y
346CONFIG_BT_HCIUART=m
347CONFIG_BT_HCIUART_H4=y
348CONFIG_BT_HCIUART_BCSP=y
349# CONFIG_BT_HCIBCM203X is not set
350# CONFIG_BT_HCIBPA10X is not set
351# CONFIG_BT_HCIBFUSB is not set
352# CONFIG_BT_HCIVHCI is not set
353# CONFIG_AF_RXRPC is not set 342# CONFIG_AF_RXRPC is not set
354 343
355# 344#
@@ -358,7 +347,13 @@ CONFIG_BT_HCIUART_BCSP=y
358# CONFIG_CFG80211 is not set 347# CONFIG_CFG80211 is not set
359CONFIG_WIRELESS_EXT=y 348CONFIG_WIRELESS_EXT=y
360# CONFIG_MAC80211 is not set 349# CONFIG_MAC80211 is not set
361# CONFIG_IEEE80211 is not set 350CONFIG_IEEE80211=m
351# CONFIG_IEEE80211_DEBUG is not set
352CONFIG_IEEE80211_CRYPT_WEP=m
353CONFIG_IEEE80211_CRYPT_CCMP=m
354CONFIG_IEEE80211_CRYPT_TKIP=m
355CONFIG_IEEE80211_SOFTMAC=m
356# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
362# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
363# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
364 359
@@ -369,9 +364,10 @@ CONFIG_WIRELESS_EXT=y
369# 364#
370# Generic Driver Options 365# Generic Driver Options
371# 366#
367CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
372CONFIG_STANDALONE=y 368CONFIG_STANDALONE=y
373CONFIG_PREVENT_FIRMWARE_BUILD=y 369CONFIG_PREVENT_FIRMWARE_BUILD=y
374# CONFIG_FW_LOADER is not set 370CONFIG_FW_LOADER=m
375# CONFIG_DEBUG_DRIVER is not set 371# CONFIG_DEBUG_DRIVER is not set
376# CONFIG_DEBUG_DEVRES is not set 372# CONFIG_DEBUG_DEVRES is not set
377# CONFIG_SYS_HYPERVISOR is not set 373# CONFIG_SYS_HYPERVISOR is not set
@@ -434,6 +430,7 @@ CONFIG_SCSI_WAIT_SCAN=m
434# CONFIG_SCSI_ISCSI_ATTRS is not set 430# CONFIG_SCSI_ISCSI_ATTRS is not set
435# CONFIG_SCSI_SAS_ATTRS is not set 431# CONFIG_SCSI_SAS_ATTRS is not set
436# CONFIG_SCSI_SAS_LIBSAS is not set 432# CONFIG_SCSI_SAS_LIBSAS is not set
433# CONFIG_SCSI_SRP_ATTRS is not set
437# CONFIG_SCSI_LOWLEVEL is not set 434# CONFIG_SCSI_LOWLEVEL is not set
438# CONFIG_ATA is not set 435# CONFIG_ATA is not set
439# CONFIG_MD is not set 436# CONFIG_MD is not set
@@ -445,8 +442,15 @@ CONFIG_NETDEVICES=y
445# CONFIG_MACVLAN is not set 442# CONFIG_MACVLAN is not set
446# CONFIG_EQUALIZER is not set 443# CONFIG_EQUALIZER is not set
447# CONFIG_TUN is not set 444# CONFIG_TUN is not set
448# CONFIG_NET_ETHERNET is not set 445# CONFIG_VETH is not set
446# CONFIG_PHYLIB is not set
447CONFIG_NET_ETHERNET=y
449CONFIG_MII=m 448CONFIG_MII=m
449# CONFIG_IBM_NEW_EMAC_ZMII is not set
450# CONFIG_IBM_NEW_EMAC_RGMII is not set
451# CONFIG_IBM_NEW_EMAC_TAH is not set
452# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
453# CONFIG_B44 is not set
450CONFIG_NETDEV_1000=y 454CONFIG_NETDEV_1000=y
451CONFIG_GELIC_NET=y 455CONFIG_GELIC_NET=y
452# CONFIG_NETDEV_10000 is not set 456# CONFIG_NETDEV_10000 is not set
@@ -455,7 +459,12 @@ CONFIG_GELIC_NET=y
455# Wireless LAN 459# Wireless LAN
456# 460#
457# CONFIG_WLAN_PRE80211 is not set 461# CONFIG_WLAN_PRE80211 is not set
458# CONFIG_WLAN_80211 is not set 462CONFIG_WLAN_80211=y
463# CONFIG_LIBERTAS is not set
464# CONFIG_USB_ZD1201 is not set
465# CONFIG_HOSTAP is not set
466CONFIG_ZD1211RW=m
467# CONFIG_ZD1211RW_DEBUG is not set
459 468
460# 469#
461# USB Network Adapters 470# USB Network Adapters
@@ -464,8 +473,8 @@ CONFIG_GELIC_NET=y
464# CONFIG_USB_KAWETH is not set 473# CONFIG_USB_KAWETH is not set
465CONFIG_USB_PEGASUS=m 474CONFIG_USB_PEGASUS=m
466# CONFIG_USB_RTL8150 is not set 475# CONFIG_USB_RTL8150 is not set
467CONFIG_USB_USBNET_MII=m
468CONFIG_USB_USBNET=m 476CONFIG_USB_USBNET=m
477CONFIG_USB_NET_AX8817X=m
469# CONFIG_USB_NET_CDCETHER is not set 478# CONFIG_USB_NET_CDCETHER is not set
470# CONFIG_USB_NET_DM9601 is not set 479# CONFIG_USB_NET_DM9601 is not set
471# CONFIG_USB_NET_GL620A is not set 480# CONFIG_USB_NET_GL620A is not set
@@ -499,9 +508,8 @@ CONFIG_INPUT_MOUSEDEV=y
499# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 508# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
500CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 509CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
501CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 510CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
502# CONFIG_INPUT_JOYDEV is not set 511CONFIG_INPUT_JOYDEV=m
503# CONFIG_INPUT_TSDEV is not set 512CONFIG_INPUT_EVDEV=m
504# CONFIG_INPUT_EVDEV is not set
505# CONFIG_INPUT_EVBUG is not set 513# CONFIG_INPUT_EVBUG is not set
506 514
507# 515#
@@ -561,7 +569,6 @@ CONFIG_UNIX98_PTYS=y
561CONFIG_LEGACY_PTYS=y 569CONFIG_LEGACY_PTYS=y
562CONFIG_LEGACY_PTY_COUNT=16 570CONFIG_LEGACY_PTY_COUNT=16
563# CONFIG_IPMI_HANDLER is not set 571# CONFIG_IPMI_HANDLER is not set
564# CONFIG_WATCHDOG is not set
565# CONFIG_HW_RANDOM is not set 572# CONFIG_HW_RANDOM is not set
566CONFIG_GEN_RTC=y 573CONFIG_GEN_RTC=y
567# CONFIG_GEN_RTC_X is not set 574# CONFIG_GEN_RTC_X is not set
@@ -579,6 +586,13 @@ CONFIG_GEN_RTC=y
579# CONFIG_W1 is not set 586# CONFIG_W1 is not set
580# CONFIG_POWER_SUPPLY is not set 587# CONFIG_POWER_SUPPLY is not set
581# CONFIG_HWMON is not set 588# CONFIG_HWMON is not set
589# CONFIG_WATCHDOG is not set
590
591#
592# Sonics Silicon Backplane
593#
594CONFIG_SSB_POSSIBLE=y
595# CONFIG_SSB is not set
582 596
583# 597#
584# Multifunction device drivers 598# Multifunction device drivers
@@ -595,12 +609,6 @@ CONFIG_GEN_RTC=y
595# 609#
596# Graphics support 610# Graphics support
597# 611#
598# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
599
600#
601# Display device support
602#
603# CONFIG_DISPLAY_SUPPORT is not set
604# CONFIG_VGASTATE is not set 612# CONFIG_VGASTATE is not set
605CONFIG_VIDEO_OUTPUT_CONTROL=m 613CONFIG_VIDEO_OUTPUT_CONTROL=m
606CONFIG_FB=y 614CONFIG_FB=y
@@ -609,6 +617,7 @@ CONFIG_FB=y
609# CONFIG_FB_CFB_FILLRECT is not set 617# CONFIG_FB_CFB_FILLRECT is not set
610# CONFIG_FB_CFB_COPYAREA is not set 618# CONFIG_FB_CFB_COPYAREA is not set
611# CONFIG_FB_CFB_IMAGEBLIT is not set 619# CONFIG_FB_CFB_IMAGEBLIT is not set
620# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
612CONFIG_FB_SYS_FILLRECT=y 621CONFIG_FB_SYS_FILLRECT=y
613CONFIG_FB_SYS_COPYAREA=y 622CONFIG_FB_SYS_COPYAREA=y
614CONFIG_FB_SYS_IMAGEBLIT=y 623CONFIG_FB_SYS_IMAGEBLIT=y
@@ -628,8 +637,14 @@ CONFIG_FB_DEFERRED_IO=y
628# CONFIG_FB_S1D13XXX is not set 637# CONFIG_FB_S1D13XXX is not set
629# CONFIG_FB_IBM_GXT4500 is not set 638# CONFIG_FB_IBM_GXT4500 is not set
630CONFIG_FB_PS3=y 639CONFIG_FB_PS3=y
631CONFIG_FB_PS3_DEFAULT_SIZE_M=18 640CONFIG_FB_PS3_DEFAULT_SIZE_M=9
632# CONFIG_FB_VIRTUAL is not set 641# CONFIG_FB_VIRTUAL is not set
642# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
643
644#
645# Display device support
646#
647# CONFIG_DISPLAY_SUPPORT is not set
633 648
634# 649#
635# Console display driver support 650# Console display driver support
@@ -713,6 +728,7 @@ CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
713CONFIG_HID_SUPPORT=y 728CONFIG_HID_SUPPORT=y
714CONFIG_HID=y 729CONFIG_HID=y
715# CONFIG_HID_DEBUG is not set 730# CONFIG_HID_DEBUG is not set
731# CONFIG_HIDRAW is not set
716 732
717# 733#
718# USB Input Devices 734# USB Input Devices
@@ -776,12 +792,14 @@ CONFIG_USB_STORAGE=m
776# CONFIG_USB_STORAGE_DEBUG is not set 792# CONFIG_USB_STORAGE_DEBUG is not set
777# CONFIG_USB_STORAGE_DATAFAB is not set 793# CONFIG_USB_STORAGE_DATAFAB is not set
778# CONFIG_USB_STORAGE_FREECOM is not set 794# CONFIG_USB_STORAGE_FREECOM is not set
795# CONFIG_USB_STORAGE_ISD200 is not set
779# CONFIG_USB_STORAGE_DPCM is not set 796# CONFIG_USB_STORAGE_DPCM is not set
780# CONFIG_USB_STORAGE_USBAT is not set 797# CONFIG_USB_STORAGE_USBAT is not set
781# CONFIG_USB_STORAGE_SDDR09 is not set 798# CONFIG_USB_STORAGE_SDDR09 is not set
782# CONFIG_USB_STORAGE_SDDR55 is not set 799# CONFIG_USB_STORAGE_SDDR55 is not set
783# CONFIG_USB_STORAGE_JUMPSHOT is not set 800# CONFIG_USB_STORAGE_JUMPSHOT is not set
784# CONFIG_USB_STORAGE_ALAUDA is not set 801# CONFIG_USB_STORAGE_ALAUDA is not set
802# CONFIG_USB_STORAGE_ONETOUCH is not set
785# CONFIG_USB_STORAGE_KARMA is not set 803# CONFIG_USB_STORAGE_KARMA is not set
786# CONFIG_USB_LIBUSUAL is not set 804# CONFIG_USB_LIBUSUAL is not set
787 805
@@ -839,19 +857,6 @@ CONFIG_USB_MON=y
839# CONFIG_RTC_CLASS is not set 857# CONFIG_RTC_CLASS is not set
840 858
841# 859#
842# DMA Engine support
843#
844# CONFIG_DMA_ENGINE is not set
845
846#
847# DMA Clients
848#
849
850#
851# DMA Devices
852#
853
854#
855# Userspace I/O 860# Userspace I/O
856# 861#
857# CONFIG_UIO is not set 862# CONFIG_UIO is not set
@@ -868,7 +873,6 @@ CONFIG_EXT3_FS_XATTR=y
868# CONFIG_EXT3_FS_SECURITY is not set 873# CONFIG_EXT3_FS_SECURITY is not set
869# CONFIG_EXT4DEV_FS is not set 874# CONFIG_EXT4DEV_FS is not set
870CONFIG_JBD=y 875CONFIG_JBD=y
871# CONFIG_JBD_DEBUG is not set
872CONFIG_FS_MBCACHE=y 876CONFIG_FS_MBCACHE=y
873# CONFIG_REISERFS_FS is not set 877# CONFIG_REISERFS_FS is not set
874# CONFIG_JFS_FS is not set 878# CONFIG_JFS_FS is not set
@@ -881,6 +885,8 @@ CONFIG_FS_MBCACHE=y
881CONFIG_INOTIFY=y 885CONFIG_INOTIFY=y
882CONFIG_INOTIFY_USER=y 886CONFIG_INOTIFY_USER=y
883CONFIG_QUOTA=y 887CONFIG_QUOTA=y
888# CONFIG_QUOTA_NETLINK_INTERFACE is not set
889CONFIG_PRINT_QUOTA_WARNING=y
884# CONFIG_QFMT_V1 is not set 890# CONFIG_QFMT_V1 is not set
885CONFIG_QFMT_V2=y 891CONFIG_QFMT_V2=y
886CONFIG_QUOTACTL=y 892CONFIG_QUOTACTL=y
@@ -919,7 +925,6 @@ CONFIG_TMPFS=y
919# CONFIG_TMPFS_POSIX_ACL is not set 925# CONFIG_TMPFS_POSIX_ACL is not set
920# CONFIG_HUGETLBFS is not set 926# CONFIG_HUGETLBFS is not set
921# CONFIG_HUGETLB_PAGE is not set 927# CONFIG_HUGETLB_PAGE is not set
922CONFIG_RAMFS=y
923# CONFIG_CONFIGFS_FS is not set 928# CONFIG_CONFIGFS_FS is not set
924 929
925# 930#
@@ -938,10 +943,7 @@ CONFIG_RAMFS=y
938# CONFIG_QNX4FS_FS is not set 943# CONFIG_QNX4FS_FS is not set
939# CONFIG_SYSV_FS is not set 944# CONFIG_SYSV_FS is not set
940# CONFIG_UFS_FS is not set 945# CONFIG_UFS_FS is not set
941 946CONFIG_NETWORK_FILESYSTEMS=y
942#
943# Network File Systems
944#
945CONFIG_NFS_FS=y 947CONFIG_NFS_FS=y
946CONFIG_NFS_V3=y 948CONFIG_NFS_V3=y
947# CONFIG_NFS_V3_ACL is not set 949# CONFIG_NFS_V3_ACL is not set
@@ -973,10 +975,6 @@ CONFIG_CIFS=m
973# 975#
974# CONFIG_PARTITION_ADVANCED is not set 976# CONFIG_PARTITION_ADVANCED is not set
975CONFIG_MSDOS_PARTITION=y 977CONFIG_MSDOS_PARTITION=y
976
977#
978# Native Language Support
979#
980CONFIG_NLS=y 978CONFIG_NLS=y
981CONFIG_NLS_DEFAULT="iso8859-1" 979CONFIG_NLS_DEFAULT="iso8859-1"
982CONFIG_NLS_CODEPAGE_437=y 980CONFIG_NLS_CODEPAGE_437=y
@@ -1017,10 +1015,6 @@ CONFIG_NLS_ISO8859_1=y
1017# CONFIG_NLS_KOI8_R is not set 1015# CONFIG_NLS_KOI8_R is not set
1018# CONFIG_NLS_KOI8_U is not set 1016# CONFIG_NLS_KOI8_U is not set
1019# CONFIG_NLS_UTF8 is not set 1017# CONFIG_NLS_UTF8 is not set
1020
1021#
1022# Distributed Lock Manager
1023#
1024# CONFIG_DLM is not set 1018# CONFIG_DLM is not set
1025# CONFIG_UCC_SLOW is not set 1019# CONFIG_UCC_SLOW is not set
1026 1020
@@ -1038,17 +1032,16 @@ CONFIG_PLIST=y
1038CONFIG_HAS_IOMEM=y 1032CONFIG_HAS_IOMEM=y
1039CONFIG_HAS_IOPORT=y 1033CONFIG_HAS_IOPORT=y
1040CONFIG_HAS_DMA=y 1034CONFIG_HAS_DMA=y
1041 1035CONFIG_INSTRUMENTATION=y
1042#
1043# Instrumentation Support
1044#
1045# CONFIG_PROFILING is not set 1036# CONFIG_PROFILING is not set
1046# CONFIG_KPROBES is not set 1037# CONFIG_KPROBES is not set
1038# CONFIG_MARKERS is not set
1047 1039
1048# 1040#
1049# Kernel hacking 1041# Kernel hacking
1050# 1042#
1051# CONFIG_PRINTK_TIME is not set 1043# CONFIG_PRINTK_TIME is not set
1044CONFIG_ENABLE_WARN_DEPRECATED=y
1052CONFIG_ENABLE_MUST_CHECK=y 1045CONFIG_ENABLE_MUST_CHECK=y
1053CONFIG_MAGIC_SYSRQ=y 1046CONFIG_MAGIC_SYSRQ=y
1054# CONFIG_UNUSED_SYMBOLS is not set 1047# CONFIG_UNUSED_SYMBOLS is not set
@@ -1060,7 +1053,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
1060CONFIG_SCHED_DEBUG=y 1053CONFIG_SCHED_DEBUG=y
1061# CONFIG_SCHEDSTATS is not set 1054# CONFIG_SCHEDSTATS is not set
1062# CONFIG_TIMER_STATS is not set 1055# CONFIG_TIMER_STATS is not set
1063# CONFIG_SLUB_DEBUG_ON is not set 1056# CONFIG_DEBUG_SLAB is not set
1064# CONFIG_DEBUG_RT_MUTEXES is not set 1057# CONFIG_DEBUG_RT_MUTEXES is not set
1065# CONFIG_RT_MUTEX_TESTER is not set 1058# CONFIG_RT_MUTEX_TESTER is not set
1066CONFIG_DEBUG_SPINLOCK=y 1059CONFIG_DEBUG_SPINLOCK=y
@@ -1072,9 +1065,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
1072CONFIG_DEBUG_INFO=y 1065CONFIG_DEBUG_INFO=y
1073# CONFIG_DEBUG_VM is not set 1066# CONFIG_DEBUG_VM is not set
1074CONFIG_DEBUG_LIST=y 1067CONFIG_DEBUG_LIST=y
1068# CONFIG_DEBUG_SG is not set
1075CONFIG_FORCED_INLINING=y 1069CONFIG_FORCED_INLINING=y
1070# CONFIG_BOOT_PRINTK_DELAY is not set
1076# CONFIG_RCU_TORTURE_TEST is not set 1071# CONFIG_RCU_TORTURE_TEST is not set
1077# CONFIG_FAULT_INJECTION is not set 1072# CONFIG_FAULT_INJECTION is not set
1073# CONFIG_SAMPLES is not set
1078CONFIG_DEBUG_STACKOVERFLOW=y 1074CONFIG_DEBUG_STACKOVERFLOW=y
1079# CONFIG_DEBUG_STACK_USAGE is not set 1075# CONFIG_DEBUG_STACK_USAGE is not set
1080# CONFIG_DEBUG_PAGEALLOC is not set 1076# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1088,6 +1084,7 @@ CONFIG_IRQSTACKS=y
1088# 1084#
1089# CONFIG_KEYS is not set 1085# CONFIG_KEYS is not set
1090# CONFIG_SECURITY is not set 1086# CONFIG_SECURITY is not set
1087# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1091CONFIG_CRYPTO=y 1088CONFIG_CRYPTO=y
1092CONFIG_CRYPTO_ALGAPI=y 1089CONFIG_CRYPTO_ALGAPI=y
1093CONFIG_CRYPTO_BLKCIPHER=y 1090CONFIG_CRYPTO_BLKCIPHER=y
@@ -1107,22 +1104,26 @@ CONFIG_CRYPTO_ECB=m
1107CONFIG_CRYPTO_CBC=y 1104CONFIG_CRYPTO_CBC=y
1108CONFIG_CRYPTO_PCBC=m 1105CONFIG_CRYPTO_PCBC=m
1109# CONFIG_CRYPTO_LRW is not set 1106# CONFIG_CRYPTO_LRW is not set
1107# CONFIG_CRYPTO_XTS is not set
1110# CONFIG_CRYPTO_CRYPTD is not set 1108# CONFIG_CRYPTO_CRYPTD is not set
1111CONFIG_CRYPTO_DES=y 1109CONFIG_CRYPTO_DES=y
1112# CONFIG_CRYPTO_FCRYPT is not set 1110# CONFIG_CRYPTO_FCRYPT is not set
1113# CONFIG_CRYPTO_BLOWFISH is not set 1111# CONFIG_CRYPTO_BLOWFISH is not set
1114# CONFIG_CRYPTO_TWOFISH is not set 1112# CONFIG_CRYPTO_TWOFISH is not set
1115# CONFIG_CRYPTO_SERPENT is not set 1113# CONFIG_CRYPTO_SERPENT is not set
1116# CONFIG_CRYPTO_AES is not set 1114CONFIG_CRYPTO_AES=m
1117# CONFIG_CRYPTO_CAST5 is not set 1115# CONFIG_CRYPTO_CAST5 is not set
1118# CONFIG_CRYPTO_CAST6 is not set 1116# CONFIG_CRYPTO_CAST6 is not set
1119# CONFIG_CRYPTO_TEA is not set 1117# CONFIG_CRYPTO_TEA is not set
1120# CONFIG_CRYPTO_ARC4 is not set 1118CONFIG_CRYPTO_ARC4=m
1121# CONFIG_CRYPTO_KHAZAD is not set 1119# CONFIG_CRYPTO_KHAZAD is not set
1122# CONFIG_CRYPTO_ANUBIS is not set 1120# CONFIG_CRYPTO_ANUBIS is not set
1121# CONFIG_CRYPTO_SEED is not set
1123# CONFIG_CRYPTO_DEFLATE is not set 1122# CONFIG_CRYPTO_DEFLATE is not set
1124# CONFIG_CRYPTO_MICHAEL_MIC is not set 1123CONFIG_CRYPTO_MICHAEL_MIC=m
1125# CONFIG_CRYPTO_CRC32C is not set 1124# CONFIG_CRYPTO_CRC32C is not set
1126# CONFIG_CRYPTO_CAMELLIA is not set 1125# CONFIG_CRYPTO_CAMELLIA is not set
1127# CONFIG_CRYPTO_TEST is not set 1126# CONFIG_CRYPTO_TEST is not set
1127# CONFIG_CRYPTO_AUTHENC is not set
1128CONFIG_CRYPTO_HW=y 1128CONFIG_CRYPTO_HW=y
1129# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 62a38406b62f..92bbf51ad4f0 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.23-rc4 3# Linux kernel version: 2.6.24-rc4
4# Thu Aug 30 16:50:02 2007 4# Thu Dec 6 16:49:15 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -11,6 +11,7 @@ CONFIG_PPC64=y
11# CONFIG_POWER4_ONLY is not set 11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y 12CONFIG_POWER3=y
13CONFIG_POWER4=y 13CONFIG_POWER4=y
14# CONFIG_TUNE_CELL is not set
14CONFIG_PPC_FPU=y 15CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y 16CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y 17CONFIG_PPC_STD_MMU=y
@@ -19,8 +20,13 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y 20CONFIG_SMP=y
20CONFIG_NR_CPUS=128 21CONFIG_NR_CPUS=128
21CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64
22CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
23CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y
28CONFIG_GENERIC_TIME_VSYSCALL=y
29CONFIG_GENERIC_CLOCKEVENTS=y
24CONFIG_GENERIC_HARDIRQS=y 30CONFIG_GENERIC_HARDIRQS=y
25CONFIG_IRQ_PER_CPU=y 31CONFIG_IRQ_PER_CPU=y
26CONFIG_RWSEM_XCHGADD_ALGORITHM=y 32CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -66,14 +72,23 @@ CONFIG_TASK_DELAY_ACCT=y
66CONFIG_TASK_XACCT=y 72CONFIG_TASK_XACCT=y
67CONFIG_TASK_IO_ACCOUNTING=y 73CONFIG_TASK_IO_ACCOUNTING=y
68# CONFIG_USER_NS is not set 74# CONFIG_USER_NS is not set
75# CONFIG_PID_NS is not set
69CONFIG_AUDIT=y 76CONFIG_AUDIT=y
70CONFIG_AUDITSYSCALL=y 77CONFIG_AUDITSYSCALL=y
78CONFIG_AUDIT_TREE=y
71CONFIG_IKCONFIG=y 79CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 80CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=17 81CONFIG_LOG_BUF_SHIFT=17
74CONFIG_CGROUPS=y 82CONFIG_CGROUPS=y
83# CONFIG_CGROUP_DEBUG is not set
84CONFIG_CGROUP_NS=y
75CONFIG_CPUSETS=y 85CONFIG_CPUSETS=y
86CONFIG_FAIR_GROUP_SCHED=y
87# CONFIG_FAIR_USER_SCHED is not set
88CONFIG_FAIR_CGROUP_SCHED=y
89CONFIG_CGROUP_CPUACCT=y
76CONFIG_SYSFS_DEPRECATED=y 90CONFIG_SYSFS_DEPRECATED=y
91CONFIG_PROC_PID_CPUSET=y
77# CONFIG_RELAY is not set 92# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y 93CONFIG_BLK_DEV_INITRD=y
79CONFIG_INITRAMFS_SOURCE="" 94CONFIG_INITRAMFS_SOURCE=""
@@ -93,7 +108,6 @@ CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 108CONFIG_ANON_INODES=y
94CONFIG_EPOLL=y 109CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y 110CONFIG_SIGNALFD=y
96CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
98CONFIG_SHMEM=y 112CONFIG_SHMEM=y
99CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
@@ -114,6 +128,7 @@ CONFIG_STOP_MACHINE=y
114CONFIG_BLOCK=y 128CONFIG_BLOCK=y
115# CONFIG_BLK_DEV_IO_TRACE is not set 129# CONFIG_BLK_DEV_IO_TRACE is not set
116CONFIG_BLK_DEV_BSG=y 130CONFIG_BLK_DEV_BSG=y
131CONFIG_BLOCK_COMPAT=y
117 132
118# 133#
119# IO Schedulers 134# IO Schedulers
@@ -132,7 +147,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
132# Platform support 147# Platform support
133# 148#
134CONFIG_PPC_MULTIPLATFORM=y 149CONFIG_PPC_MULTIPLATFORM=y
135# CONFIG_EMBEDDED6xx is not set
136# CONFIG_PPC_82xx is not set 150# CONFIG_PPC_82xx is not set
137# CONFIG_PPC_83xx is not set 151# CONFIG_PPC_83xx is not set
138# CONFIG_PPC_86xx is not set 152# CONFIG_PPC_86xx is not set
@@ -194,6 +208,7 @@ CONFIG_PREEMPT_NONE=y
194CONFIG_BINFMT_ELF=y 208CONFIG_BINFMT_ELF=y
195CONFIG_BINFMT_MISC=m 209CONFIG_BINFMT_MISC=m
196CONFIG_FORCE_MAX_ZONEORDER=13 210CONFIG_FORCE_MAX_ZONEORDER=13
211CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
197CONFIG_IOMMU_VMERGE=y 212CONFIG_IOMMU_VMERGE=y
198CONFIG_HOTPLUG_CPU=y 213CONFIG_HOTPLUG_CPU=y
199CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -215,6 +230,8 @@ CONFIG_NEED_MULTIPLE_NODES=y
215CONFIG_HAVE_MEMORY_PRESENT=y 230CONFIG_HAVE_MEMORY_PRESENT=y
216# CONFIG_SPARSEMEM_STATIC is not set 231# CONFIG_SPARSEMEM_STATIC is not set
217CONFIG_SPARSEMEM_EXTREME=y 232CONFIG_SPARSEMEM_EXTREME=y
233CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
234CONFIG_SPARSEMEM_VMEMMAP=y
218# CONFIG_MEMORY_HOTPLUG is not set 235# CONFIG_MEMORY_HOTPLUG is not set
219CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
220CONFIG_MIGRATION=y 237CONFIG_MIGRATION=y
@@ -245,11 +262,8 @@ CONFIG_PCI_SYSCALL=y
245# CONFIG_PCIEPORTBUS is not set 262# CONFIG_PCIEPORTBUS is not set
246CONFIG_ARCH_SUPPORTS_MSI=y 263CONFIG_ARCH_SUPPORTS_MSI=y
247CONFIG_PCI_MSI=y 264CONFIG_PCI_MSI=y
265CONFIG_PCI_LEGACY=y
248# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
249
250#
251# PCCARD (PCMCIA/CardBus) support
252#
253# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
254CONFIG_HOTPLUG_PCI=m 268CONFIG_HOTPLUG_PCI=m
255# CONFIG_HOTPLUG_PCI_FAKE is not set 269# CONFIG_HOTPLUG_PCI_FAKE is not set
@@ -294,6 +308,7 @@ CONFIG_INET_TUNNEL=y
294CONFIG_INET_XFRM_MODE_TRANSPORT=y 308CONFIG_INET_XFRM_MODE_TRANSPORT=y
295CONFIG_INET_XFRM_MODE_TUNNEL=y 309CONFIG_INET_XFRM_MODE_TUNNEL=y
296CONFIG_INET_XFRM_MODE_BEET=y 310CONFIG_INET_XFRM_MODE_BEET=y
311CONFIG_INET_LRO=y
297CONFIG_INET_DIAG=y 312CONFIG_INET_DIAG=y
298CONFIG_INET_TCP_DIAG=y 313CONFIG_INET_TCP_DIAG=y
299# CONFIG_TCP_CONG_ADVANCED is not set 314# CONFIG_TCP_CONG_ADVANCED is not set
@@ -360,6 +375,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
360CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 375CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
361CONFIG_NETFILTER_XT_MATCH_STRING=m 376CONFIG_NETFILTER_XT_MATCH_STRING=m
362CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 377CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
378CONFIG_NETFILTER_XT_MATCH_TIME=m
363CONFIG_NETFILTER_XT_MATCH_U32=m 379CONFIG_NETFILTER_XT_MATCH_U32=m
364CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 380CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
365 381
@@ -414,10 +430,6 @@ CONFIG_LLC=y
414# CONFIG_LAPB is not set 430# CONFIG_LAPB is not set
415# CONFIG_ECONET is not set 431# CONFIG_ECONET is not set
416# CONFIG_WAN_ROUTER is not set 432# CONFIG_WAN_ROUTER is not set
417
418#
419# QoS and/or fair queueing
420#
421# CONFIG_NET_SCHED is not set 433# CONFIG_NET_SCHED is not set
422CONFIG_NET_CLS_ROUTE=y 434CONFIG_NET_CLS_ROUTE=y
423 435
@@ -448,6 +460,7 @@ CONFIG_NET_CLS_ROUTE=y
448# 460#
449# Generic Driver Options 461# Generic Driver Options
450# 462#
463CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
451CONFIG_STANDALONE=y 464CONFIG_STANDALONE=y
452CONFIG_PREVENT_FIRMWARE_BUILD=y 465CONFIG_PREVENT_FIRMWARE_BUILD=y
453CONFIG_FW_LOADER=y 466CONFIG_FW_LOADER=y
@@ -508,6 +521,11 @@ CONFIG_IDE_PROC_FS=y
508# IDE chipset support/bugfixes 521# IDE chipset support/bugfixes
509# 522#
510CONFIG_IDE_GENERIC=y 523CONFIG_IDE_GENERIC=y
524# CONFIG_BLK_DEV_PLATFORM is not set
525
526#
527# PCI IDE chipsets support
528#
511CONFIG_BLK_DEV_IDEPCI=y 529CONFIG_BLK_DEV_IDEPCI=y
512CONFIG_IDEPCI_SHARE_IRQ=y 530CONFIG_IDEPCI_SHARE_IRQ=y
513CONFIG_IDEPCI_PCIBUS_ORDER=y 531CONFIG_IDEPCI_PCIBUS_ORDER=y
@@ -515,8 +533,6 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
515CONFIG_BLK_DEV_GENERIC=y 533CONFIG_BLK_DEV_GENERIC=y
516# CONFIG_BLK_DEV_OPTI621 is not set 534# CONFIG_BLK_DEV_OPTI621 is not set
517CONFIG_BLK_DEV_IDEDMA_PCI=y 535CONFIG_BLK_DEV_IDEDMA_PCI=y
518# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
519# CONFIG_IDEDMA_ONLYDISK is not set
520# CONFIG_BLK_DEV_AEC62XX is not set 536# CONFIG_BLK_DEV_AEC62XX is not set
521# CONFIG_BLK_DEV_ALI15X3 is not set 537# CONFIG_BLK_DEV_ALI15X3 is not set
522CONFIG_BLK_DEV_AMD74XX=y 538CONFIG_BLK_DEV_AMD74XX=y
@@ -544,7 +560,7 @@ CONFIG_BLK_DEV_AMD74XX=y
544# CONFIG_BLK_DEV_TC86C001 is not set 560# CONFIG_BLK_DEV_TC86C001 is not set
545# CONFIG_IDE_ARM is not set 561# CONFIG_IDE_ARM is not set
546CONFIG_BLK_DEV_IDEDMA=y 562CONFIG_BLK_DEV_IDEDMA=y
547# CONFIG_IDEDMA_IVB is not set 563CONFIG_IDE_ARCH_OBSOLETE_INIT=y
548# CONFIG_BLK_DEV_HD is not set 564# CONFIG_BLK_DEV_HD is not set
549 565
550# 566#
@@ -585,6 +601,7 @@ CONFIG_SCSI_FC_ATTRS=y
585CONFIG_SCSI_ISCSI_ATTRS=m 601CONFIG_SCSI_ISCSI_ATTRS=m
586CONFIG_SCSI_SAS_ATTRS=m 602CONFIG_SCSI_SAS_ATTRS=m
587# CONFIG_SCSI_SAS_LIBSAS is not set 603# CONFIG_SCSI_SAS_LIBSAS is not set
604CONFIG_SCSI_SRP_ATTRS=y
588CONFIG_SCSI_LOWLEVEL=y 605CONFIG_SCSI_LOWLEVEL=y
589# CONFIG_ISCSI_TCP is not set 606# CONFIG_ISCSI_TCP is not set
590# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 607# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -669,6 +686,7 @@ CONFIG_ATA=y
669# CONFIG_PATA_OLDPIIX is not set 686# CONFIG_PATA_OLDPIIX is not set
670# CONFIG_PATA_NETCELL is not set 687# CONFIG_PATA_NETCELL is not set
671# CONFIG_PATA_NS87410 is not set 688# CONFIG_PATA_NS87410 is not set
689# CONFIG_PATA_NS87415 is not set
672# CONFIG_PATA_OPTI is not set 690# CONFIG_PATA_OPTI is not set
673# CONFIG_PATA_OPTIDMA is not set 691# CONFIG_PATA_OPTIDMA is not set
674# CONFIG_PATA_PDC_OLD is not set 692# CONFIG_PATA_PDC_OLD is not set
@@ -699,15 +717,10 @@ CONFIG_DM_ZERO=m
699CONFIG_DM_MULTIPATH=m 717CONFIG_DM_MULTIPATH=m
700CONFIG_DM_MULTIPATH_EMC=m 718CONFIG_DM_MULTIPATH_EMC=m
701# CONFIG_DM_MULTIPATH_RDAC is not set 719# CONFIG_DM_MULTIPATH_RDAC is not set
720# CONFIG_DM_MULTIPATH_HP is not set
702# CONFIG_DM_DELAY is not set 721# CONFIG_DM_DELAY is not set
703 722# CONFIG_DM_UEVENT is not set
704#
705# Fusion MPT device support
706#
707# CONFIG_FUSION is not set 723# CONFIG_FUSION is not set
708# CONFIG_FUSION_SPI is not set
709# CONFIG_FUSION_FC is not set
710# CONFIG_FUSION_SAS is not set
711 724
712# 725#
713# IEEE 1394 (FireWire) support 726# IEEE 1394 (FireWire) support
@@ -723,6 +736,8 @@ CONFIG_BONDING=m
723# CONFIG_MACVLAN is not set 736# CONFIG_MACVLAN is not set
724# CONFIG_EQUALIZER is not set 737# CONFIG_EQUALIZER is not set
725CONFIG_TUN=m 738CONFIG_TUN=m
739# CONFIG_VETH is not set
740# CONFIG_IP1000 is not set
726# CONFIG_ARCNET is not set 741# CONFIG_ARCNET is not set
727# CONFIG_PHYLIB is not set 742# CONFIG_PHYLIB is not set
728CONFIG_NET_ETHERNET=y 743CONFIG_NET_ETHERNET=y
@@ -736,6 +751,10 @@ CONFIG_VORTEX=y
736# CONFIG_NET_TULIP is not set 751# CONFIG_NET_TULIP is not set
737# CONFIG_HP100 is not set 752# CONFIG_HP100 is not set
738CONFIG_IBMVETH=y 753CONFIG_IBMVETH=y
754# CONFIG_IBM_NEW_EMAC_ZMII is not set
755# CONFIG_IBM_NEW_EMAC_RGMII is not set
756# CONFIG_IBM_NEW_EMAC_TAH is not set
757# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
739CONFIG_NET_PCI=y 758CONFIG_NET_PCI=y
740CONFIG_PCNET32=y 759CONFIG_PCNET32=y
741# CONFIG_PCNET32_NAPI is not set 760# CONFIG_PCNET32_NAPI is not set
@@ -743,7 +762,6 @@ CONFIG_PCNET32=y
743# CONFIG_ADAPTEC_STARFIRE is not set 762# CONFIG_ADAPTEC_STARFIRE is not set
744# CONFIG_B44 is not set 763# CONFIG_B44 is not set
745# CONFIG_FORCEDETH is not set 764# CONFIG_FORCEDETH is not set
746# CONFIG_DGRS is not set
747# CONFIG_EEPRO100 is not set 765# CONFIG_EEPRO100 is not set
748CONFIG_E100=y 766CONFIG_E100=y
749# CONFIG_FEALNX is not set 767# CONFIG_FEALNX is not set
@@ -764,6 +782,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
764CONFIG_E1000=y 782CONFIG_E1000=y
765# CONFIG_E1000_NAPI is not set 783# CONFIG_E1000_NAPI is not set
766# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 784# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
785# CONFIG_E1000E is not set
767# CONFIG_NS83820 is not set 786# CONFIG_NS83820 is not set
768# CONFIG_HAMACHI is not set 787# CONFIG_HAMACHI is not set
769# CONFIG_YELLOWFIN is not set 788# CONFIG_YELLOWFIN is not set
@@ -771,6 +790,7 @@ CONFIG_E1000=y
771# CONFIG_SIS190 is not set 790# CONFIG_SIS190 is not set
772# CONFIG_SKGE is not set 791# CONFIG_SKGE is not set
773# CONFIG_SKY2 is not set 792# CONFIG_SKY2 is not set
793# CONFIG_SK98LIN is not set
774# CONFIG_VIA_VELOCITY is not set 794# CONFIG_VIA_VELOCITY is not set
775CONFIG_TIGON3=y 795CONFIG_TIGON3=y
776# CONFIG_BNX2 is not set 796# CONFIG_BNX2 is not set
@@ -780,14 +800,17 @@ CONFIG_NETDEV_10000=y
780# CONFIG_CHELSIO_T1 is not set 800# CONFIG_CHELSIO_T1 is not set
781# CONFIG_CHELSIO_T3 is not set 801# CONFIG_CHELSIO_T3 is not set
782CONFIG_EHEA=m 802CONFIG_EHEA=m
803# CONFIG_IXGBE is not set
783CONFIG_IXGB=m 804CONFIG_IXGB=m
784# CONFIG_IXGB_NAPI is not set 805# CONFIG_IXGB_NAPI is not set
785CONFIG_S2IO=m 806CONFIG_S2IO=m
786# CONFIG_S2IO_NAPI is not set 807# CONFIG_S2IO_NAPI is not set
787# CONFIG_MYRI10GE is not set 808# CONFIG_MYRI10GE is not set
788# CONFIG_NETXEN_NIC is not set 809# CONFIG_NETXEN_NIC is not set
810# CONFIG_NIU is not set
789# CONFIG_PASEMI_MAC is not set 811# CONFIG_PASEMI_MAC is not set
790# CONFIG_MLX4_CORE is not set 812# CONFIG_MLX4_CORE is not set
813# CONFIG_TEHUTI is not set
791CONFIG_TR=y 814CONFIG_TR=y
792CONFIG_IBMOL=y 815CONFIG_IBMOL=y
793# CONFIG_3C359 is not set 816# CONFIG_3C359 is not set
@@ -806,7 +829,6 @@ CONFIG_IBMOL=y
806# CONFIG_USB_KAWETH is not set 829# CONFIG_USB_KAWETH is not set
807# CONFIG_USB_PEGASUS is not set 830# CONFIG_USB_PEGASUS is not set
808# CONFIG_USB_RTL8150 is not set 831# CONFIG_USB_RTL8150 is not set
809# CONFIG_USB_USBNET_MII is not set
810# CONFIG_USB_USBNET is not set 832# CONFIG_USB_USBNET is not set
811# CONFIG_WAN is not set 833# CONFIG_WAN is not set
812# CONFIG_FDDI is not set 834# CONFIG_FDDI is not set
@@ -827,6 +849,7 @@ CONFIG_SLHC=m
827# CONFIG_NET_FC is not set 849# CONFIG_NET_FC is not set
828# CONFIG_SHAPER is not set 850# CONFIG_SHAPER is not set
829CONFIG_NETCONSOLE=y 851CONFIG_NETCONSOLE=y
852# CONFIG_NETCONSOLE_DYNAMIC is not set
830CONFIG_NETPOLL=y 853CONFIG_NETPOLL=y
831CONFIG_NETPOLL_TRAP=y 854CONFIG_NETPOLL_TRAP=y
832CONFIG_NET_POLL_CONTROLLER=y 855CONFIG_NET_POLL_CONTROLLER=y
@@ -848,7 +871,6 @@ CONFIG_INPUT_MOUSEDEV=y
848CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 871CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
849CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 872CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
850# CONFIG_INPUT_JOYDEV is not set 873# CONFIG_INPUT_JOYDEV is not set
851# CONFIG_INPUT_TSDEV is not set
852# CONFIG_INPUT_EVDEV is not set 874# CONFIG_INPUT_EVDEV is not set
853# CONFIG_INPUT_EVBUG is not set 875# CONFIG_INPUT_EVBUG is not set
854 876
@@ -935,14 +957,11 @@ CONFIG_HVC_CONSOLE=y
935CONFIG_HVC_RTAS=y 957CONFIG_HVC_RTAS=y
936CONFIG_HVCS=m 958CONFIG_HVCS=m
937# CONFIG_IPMI_HANDLER is not set 959# CONFIG_IPMI_HANDLER is not set
938# CONFIG_WATCHDOG is not set
939# CONFIG_HW_RANDOM is not set 960# CONFIG_HW_RANDOM is not set
940CONFIG_GEN_RTC=y 961CONFIG_GEN_RTC=y
941# CONFIG_GEN_RTC_X is not set 962# CONFIG_GEN_RTC_X is not set
942# CONFIG_R3964 is not set 963# CONFIG_R3964 is not set
943# CONFIG_APPLICOM is not set 964# CONFIG_APPLICOM is not set
944# CONFIG_AGP is not set
945# CONFIG_DRM is not set
946CONFIG_RAW_DRIVER=y 965CONFIG_RAW_DRIVER=y
947CONFIG_MAX_RAW_DEVS=1024 966CONFIG_MAX_RAW_DEVS=1024
948# CONFIG_HANGCHECK_TIMER is not set 967# CONFIG_HANGCHECK_TIMER is not set
@@ -1012,6 +1031,13 @@ CONFIG_I2C_ALGOBIT=y
1012# CONFIG_W1 is not set 1031# CONFIG_W1 is not set
1013# CONFIG_POWER_SUPPLY is not set 1032# CONFIG_POWER_SUPPLY is not set
1014# CONFIG_HWMON is not set 1033# CONFIG_HWMON is not set
1034# CONFIG_WATCHDOG is not set
1035
1036#
1037# Sonics Silicon Backplane
1038#
1039CONFIG_SSB_POSSIBLE=y
1040# CONFIG_SSB is not set
1015 1041
1016# 1042#
1017# Multifunction device drivers 1043# Multifunction device drivers
@@ -1028,18 +1054,8 @@ CONFIG_I2C_ALGOBIT=y
1028# 1054#
1029# Graphics support 1055# Graphics support
1030# 1056#
1031CONFIG_BACKLIGHT_LCD_SUPPORT=y 1057# CONFIG_AGP is not set
1032CONFIG_LCD_CLASS_DEVICE=m 1058# CONFIG_DRM is not set
1033CONFIG_BACKLIGHT_CLASS_DEVICE=y
1034
1035#
1036# Display device support
1037#
1038CONFIG_DISPLAY_SUPPORT=y
1039
1040#
1041# Display hardware drivers
1042#
1043# CONFIG_VGASTATE is not set 1059# CONFIG_VGASTATE is not set
1044# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1060# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1045CONFIG_FB=y 1061CONFIG_FB=y
@@ -1048,6 +1064,7 @@ CONFIG_FB_DDC=y
1048CONFIG_FB_CFB_FILLRECT=y 1064CONFIG_FB_CFB_FILLRECT=y
1049CONFIG_FB_CFB_COPYAREA=y 1065CONFIG_FB_CFB_COPYAREA=y
1050CONFIG_FB_CFB_IMAGEBLIT=y 1066CONFIG_FB_CFB_IMAGEBLIT=y
1067# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1051# CONFIG_FB_SYS_FILLRECT is not set 1068# CONFIG_FB_SYS_FILLRECT is not set
1052# CONFIG_FB_SYS_COPYAREA is not set 1069# CONFIG_FB_SYS_COPYAREA is not set
1053# CONFIG_FB_SYS_IMAGEBLIT is not set 1070# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -1097,6 +1114,19 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1097# CONFIG_FB_PM3 is not set 1114# CONFIG_FB_PM3 is not set
1098CONFIG_FB_IBM_GXT4500=y 1115CONFIG_FB_IBM_GXT4500=y
1099# CONFIG_FB_VIRTUAL is not set 1116# CONFIG_FB_VIRTUAL is not set
1117CONFIG_BACKLIGHT_LCD_SUPPORT=y
1118CONFIG_LCD_CLASS_DEVICE=m
1119CONFIG_BACKLIGHT_CLASS_DEVICE=y
1120# CONFIG_BACKLIGHT_CORGI is not set
1121
1122#
1123# Display device support
1124#
1125CONFIG_DISPLAY_SUPPORT=y
1126
1127#
1128# Display hardware drivers
1129#
1100 1130
1101# 1131#
1102# Console display driver support 1132# Console display driver support
@@ -1121,6 +1151,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
1121CONFIG_HID_SUPPORT=y 1151CONFIG_HID_SUPPORT=y
1122CONFIG_HID=y 1152CONFIG_HID=y
1123# CONFIG_HID_DEBUG is not set 1153# CONFIG_HID_DEBUG is not set
1154# CONFIG_HIDRAW is not set
1124 1155
1125# 1156#
1126# USB Input Devices 1157# USB Input Devices
@@ -1258,19 +1289,6 @@ CONFIG_INFINIBAND_SRP=m
1258# CONFIG_INFINIBAND_ISER is not set 1289# CONFIG_INFINIBAND_ISER is not set
1259# CONFIG_EDAC is not set 1290# CONFIG_EDAC is not set
1260# CONFIG_RTC_CLASS is not set 1291# CONFIG_RTC_CLASS is not set
1261
1262#
1263# DMA Engine support
1264#
1265# CONFIG_DMA_ENGINE is not set
1266
1267#
1268# DMA Clients
1269#
1270
1271#
1272# DMA Devices
1273#
1274# CONFIG_AUXDISPLAY is not set 1292# CONFIG_AUXDISPLAY is not set
1275 1293
1276# 1294#
@@ -1315,6 +1333,7 @@ CONFIG_XFS_POSIX_ACL=y
1315# CONFIG_GFS2_FS is not set 1333# CONFIG_GFS2_FS is not set
1316CONFIG_OCFS2_FS=m 1334CONFIG_OCFS2_FS=m
1317CONFIG_OCFS2_DEBUG_MASKLOG=y 1335CONFIG_OCFS2_DEBUG_MASKLOG=y
1336# CONFIG_OCFS2_DEBUG_FS is not set
1318# CONFIG_MINIX_FS is not set 1337# CONFIG_MINIX_FS is not set
1319# CONFIG_ROMFS_FS is not set 1338# CONFIG_ROMFS_FS is not set
1320CONFIG_INOTIFY=y 1339CONFIG_INOTIFY=y
@@ -1355,7 +1374,6 @@ CONFIG_TMPFS=y
1355# CONFIG_TMPFS_POSIX_ACL is not set 1374# CONFIG_TMPFS_POSIX_ACL is not set
1356CONFIG_HUGETLBFS=y 1375CONFIG_HUGETLBFS=y
1357CONFIG_HUGETLB_PAGE=y 1376CONFIG_HUGETLB_PAGE=y
1358CONFIG_RAMFS=y
1359CONFIG_CONFIGFS_FS=m 1377CONFIG_CONFIGFS_FS=m
1360 1378
1361# 1379#
@@ -1374,10 +1392,7 @@ CONFIG_CRAMFS=y
1374# CONFIG_QNX4FS_FS is not set 1392# CONFIG_QNX4FS_FS is not set
1375# CONFIG_SYSV_FS is not set 1393# CONFIG_SYSV_FS is not set
1376# CONFIG_UFS_FS is not set 1394# CONFIG_UFS_FS is not set
1377 1395CONFIG_NETWORK_FILESYSTEMS=y
1378#
1379# Network File Systems
1380#
1381CONFIG_NFS_FS=y 1396CONFIG_NFS_FS=y
1382CONFIG_NFS_V3=y 1397CONFIG_NFS_V3=y
1383CONFIG_NFS_V3_ACL=y 1398CONFIG_NFS_V3_ACL=y
@@ -1396,6 +1411,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1396CONFIG_NFS_COMMON=y 1411CONFIG_NFS_COMMON=y
1397CONFIG_SUNRPC=y 1412CONFIG_SUNRPC=y
1398CONFIG_SUNRPC_GSS=y 1413CONFIG_SUNRPC_GSS=y
1414CONFIG_SUNRPC_XPRT_RDMA=m
1399# CONFIG_SUNRPC_BIND34 is not set 1415# CONFIG_SUNRPC_BIND34 is not set
1400CONFIG_RPCSEC_GSS_KRB5=y 1416CONFIG_RPCSEC_GSS_KRB5=y
1401CONFIG_RPCSEC_GSS_SPKM3=m 1417CONFIG_RPCSEC_GSS_SPKM3=m
@@ -1416,10 +1432,6 @@ CONFIG_CIFS_POSIX=y
1416# 1432#
1417# CONFIG_PARTITION_ADVANCED is not set 1433# CONFIG_PARTITION_ADVANCED is not set
1418CONFIG_MSDOS_PARTITION=y 1434CONFIG_MSDOS_PARTITION=y
1419
1420#
1421# Native Language Support
1422#
1423CONFIG_NLS=y 1435CONFIG_NLS=y
1424CONFIG_NLS_DEFAULT="iso8859-1" 1436CONFIG_NLS_DEFAULT="iso8859-1"
1425CONFIG_NLS_CODEPAGE_437=y 1437CONFIG_NLS_CODEPAGE_437=y
@@ -1460,10 +1472,6 @@ CONFIG_NLS_ISO8859_1=y
1460# CONFIG_NLS_KOI8_R is not set 1472# CONFIG_NLS_KOI8_R is not set
1461# CONFIG_NLS_KOI8_U is not set 1473# CONFIG_NLS_KOI8_U is not set
1462# CONFIG_NLS_UTF8 is not set 1474# CONFIG_NLS_UTF8 is not set
1463
1464#
1465# Distributed Lock Manager
1466#
1467# CONFIG_DLM is not set 1475# CONFIG_DLM is not set
1468# CONFIG_UCC_SLOW is not set 1476# CONFIG_UCC_SLOW is not set
1469 1477
@@ -1487,18 +1495,17 @@ CONFIG_PLIST=y
1487CONFIG_HAS_IOMEM=y 1495CONFIG_HAS_IOMEM=y
1488CONFIG_HAS_IOPORT=y 1496CONFIG_HAS_IOPORT=y
1489CONFIG_HAS_DMA=y 1497CONFIG_HAS_DMA=y
1490 1498CONFIG_INSTRUMENTATION=y
1491#
1492# Instrumentation Support
1493#
1494CONFIG_PROFILING=y 1499CONFIG_PROFILING=y
1495CONFIG_OPROFILE=y 1500CONFIG_OPROFILE=y
1496CONFIG_KPROBES=y 1501CONFIG_KPROBES=y
1502CONFIG_MARKERS=y
1497 1503
1498# 1504#
1499# Kernel hacking 1505# Kernel hacking
1500# 1506#
1501# CONFIG_PRINTK_TIME is not set 1507# CONFIG_PRINTK_TIME is not set
1508CONFIG_ENABLE_WARN_DEPRECATED=y
1502CONFIG_ENABLE_MUST_CHECK=y 1509CONFIG_ENABLE_MUST_CHECK=y
1503CONFIG_MAGIC_SYSRQ=y 1510CONFIG_MAGIC_SYSRQ=y
1504# CONFIG_UNUSED_SYMBOLS is not set 1511# CONFIG_UNUSED_SYMBOLS is not set
@@ -1522,10 +1529,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
1522# CONFIG_DEBUG_INFO is not set 1529# CONFIG_DEBUG_INFO is not set
1523# CONFIG_DEBUG_VM is not set 1530# CONFIG_DEBUG_VM is not set
1524# CONFIG_DEBUG_LIST is not set 1531# CONFIG_DEBUG_LIST is not set
1532# CONFIG_DEBUG_SG is not set
1525CONFIG_FORCED_INLINING=y 1533CONFIG_FORCED_INLINING=y
1534# CONFIG_BOOT_PRINTK_DELAY is not set
1526# CONFIG_RCU_TORTURE_TEST is not set 1535# CONFIG_RCU_TORTURE_TEST is not set
1527# CONFIG_LKDTM is not set 1536# CONFIG_LKDTM is not set
1528# CONFIG_FAULT_INJECTION is not set 1537# CONFIG_FAULT_INJECTION is not set
1538# CONFIG_SAMPLES is not set
1529CONFIG_DEBUG_STACKOVERFLOW=y 1539CONFIG_DEBUG_STACKOVERFLOW=y
1530# CONFIG_DEBUG_STACK_USAGE is not set 1540# CONFIG_DEBUG_STACK_USAGE is not set
1531# CONFIG_DEBUG_PAGEALLOC is not set 1541# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1535,6 +1545,7 @@ CONFIG_XMON=y
1535CONFIG_XMON_DEFAULT=y 1545CONFIG_XMON_DEFAULT=y
1536CONFIG_XMON_DISASSEMBLY=y 1546CONFIG_XMON_DISASSEMBLY=y
1537CONFIG_IRQSTACKS=y 1547CONFIG_IRQSTACKS=y
1548CONFIG_VIRQ_DEBUG=y
1538# CONFIG_BOOTX_TEXT is not set 1549# CONFIG_BOOTX_TEXT is not set
1539# CONFIG_PPC_EARLY_DEBUG is not set 1550# CONFIG_PPC_EARLY_DEBUG is not set
1540 1551
@@ -1543,6 +1554,7 @@ CONFIG_IRQSTACKS=y
1543# 1554#
1544# CONFIG_KEYS is not set 1555# CONFIG_KEYS is not set
1545# CONFIG_SECURITY is not set 1556# CONFIG_SECURITY is not set
1557# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1546CONFIG_CRYPTO=y 1558CONFIG_CRYPTO=y
1547CONFIG_CRYPTO_ALGAPI=y 1559CONFIG_CRYPTO_ALGAPI=y
1548CONFIG_CRYPTO_BLKCIPHER=y 1560CONFIG_CRYPTO_BLKCIPHER=y
@@ -1563,6 +1575,7 @@ CONFIG_CRYPTO_ECB=m
1563CONFIG_CRYPTO_CBC=y 1575CONFIG_CRYPTO_CBC=y
1564CONFIG_CRYPTO_PCBC=m 1576CONFIG_CRYPTO_PCBC=m
1565# CONFIG_CRYPTO_LRW is not set 1577# CONFIG_CRYPTO_LRW is not set
1578# CONFIG_CRYPTO_XTS is not set
1566# CONFIG_CRYPTO_CRYPTD is not set 1579# CONFIG_CRYPTO_CRYPTD is not set
1567CONFIG_CRYPTO_DES=y 1580CONFIG_CRYPTO_DES=y
1568# CONFIG_CRYPTO_FCRYPT is not set 1581# CONFIG_CRYPTO_FCRYPT is not set
@@ -1577,9 +1590,12 @@ CONFIG_CRYPTO_TEA=m
1577CONFIG_CRYPTO_ARC4=m 1590CONFIG_CRYPTO_ARC4=m
1578CONFIG_CRYPTO_KHAZAD=m 1591CONFIG_CRYPTO_KHAZAD=m
1579CONFIG_CRYPTO_ANUBIS=m 1592CONFIG_CRYPTO_ANUBIS=m
1593# CONFIG_CRYPTO_SEED is not set
1580CONFIG_CRYPTO_DEFLATE=m 1594CONFIG_CRYPTO_DEFLATE=m
1581CONFIG_CRYPTO_MICHAEL_MIC=m 1595CONFIG_CRYPTO_MICHAEL_MIC=m
1582CONFIG_CRYPTO_CRC32C=m 1596CONFIG_CRYPTO_CRC32C=m
1583# CONFIG_CRYPTO_CAMELLIA is not set 1597# CONFIG_CRYPTO_CAMELLIA is not set
1584CONFIG_CRYPTO_TEST=m 1598CONFIG_CRYPTO_TEST=m
1599# CONFIG_CRYPTO_AUTHENC is not set
1585# CONFIG_CRYPTO_HW is not set 1600# CONFIG_CRYPTO_HW is not set
1601# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig
index 45a4ca0e0d7d..bc3c086ddfc0 100644
--- a/arch/powerpc/configs/sequoia_defconfig
+++ b/arch/powerpc/configs/sequoia_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.23-rc6 3# Linux kernel version: 2.6.24-rc4
4# Fri Sep 14 13:20:06 2007 4# Thu Dec 6 16:49:17 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_PHYS_64BIT=y
22# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -64,9 +69,12 @@ CONFIG_POSIX_MQUEUE=y
64# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
66# CONFIG_USER_NS is not set 71# CONFIG_USER_NS is not set
72# CONFIG_PID_NS is not set
67# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
68# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_CGROUPS is not set
77# CONFIG_FAIR_GROUP_SCHED is not set
70CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
72CONFIG_BLK_DEV_INITRD=y 80CONFIG_BLK_DEV_INITRD=y
@@ -87,7 +95,6 @@ CONFIG_FUTEX=y
87CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 96CONFIG_EPOLL=y
89CONFIG_SIGNALFD=y 97CONFIG_SIGNALFD=y
90CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 98CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 99CONFIG_SHMEM=y
93CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
@@ -153,6 +160,10 @@ CONFIG_440A=y
153# Kernel options 160# Kernel options
154# 161#
155# CONFIG_HIGHMEM is not set 162# CONFIG_HIGHMEM is not set
163CONFIG_TICK_ONESHOT=y
164CONFIG_NO_HZ=y
165CONFIG_HIGH_RES_TIMERS=y
166CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
156# CONFIG_HZ_100 is not set 167# CONFIG_HZ_100 is not set
157CONFIG_HZ_250=y 168CONFIG_HZ_250=y
158# CONFIG_HZ_300 is not set 169# CONFIG_HZ_300 is not set
@@ -174,6 +185,7 @@ CONFIG_FLATMEM_MANUAL=y
174CONFIG_FLATMEM=y 185CONFIG_FLATMEM=y
175CONFIG_FLAT_NODE_MEM_MAP=y 186CONFIG_FLAT_NODE_MEM_MAP=y
176# CONFIG_SPARSEMEM_STATIC is not set 187# CONFIG_SPARSEMEM_STATIC is not set
188# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
177CONFIG_SPLIT_PTLOCK_CPUS=4 189CONFIG_SPLIT_PTLOCK_CPUS=4
178CONFIG_RESOURCES_64BIT=y 190CONFIG_RESOURCES_64BIT=y
179CONFIG_ZONE_DMA_FLAG=1 191CONFIG_ZONE_DMA_FLAG=1
@@ -198,11 +210,8 @@ CONFIG_PCI_SYSCALL=y
198# CONFIG_PCIEPORTBUS is not set 210# CONFIG_PCIEPORTBUS is not set
199CONFIG_ARCH_SUPPORTS_MSI=y 211CONFIG_ARCH_SUPPORTS_MSI=y
200# CONFIG_PCI_MSI is not set 212# CONFIG_PCI_MSI is not set
213CONFIG_PCI_LEGACY=y
201# CONFIG_PCI_DEBUG is not set 214# CONFIG_PCI_DEBUG is not set
202
203#
204# PCCARD (PCMCIA/CardBus) support
205#
206# CONFIG_PCCARD is not set 215# CONFIG_PCCARD is not set
207# CONFIG_HOTPLUG_PCI is not set 216# CONFIG_HOTPLUG_PCI is not set
208 217
@@ -217,7 +226,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
217CONFIG_HIGHMEM_START=0xfe000000 226CONFIG_HIGHMEM_START=0xfe000000
218CONFIG_LOWMEM_SIZE=0x30000000 227CONFIG_LOWMEM_SIZE=0x30000000
219CONFIG_KERNEL_START=0xc0000000 228CONFIG_KERNEL_START=0xc0000000
220CONFIG_TASK_SIZE=0x80000000 229CONFIG_TASK_SIZE=0xc0000000
221CONFIG_CONSISTENT_START=0xff100000 230CONFIG_CONSISTENT_START=0xff100000
222CONFIG_CONSISTENT_SIZE=0x00200000 231CONFIG_CONSISTENT_SIZE=0x00200000
223CONFIG_BOOT_LOAD=0x01000000 232CONFIG_BOOT_LOAD=0x01000000
@@ -254,6 +263,7 @@ CONFIG_IP_PNP_BOOTP=y
254# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 263# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
255# CONFIG_INET_XFRM_MODE_TUNNEL is not set 264# CONFIG_INET_XFRM_MODE_TUNNEL is not set
256# CONFIG_INET_XFRM_MODE_BEET is not set 265# CONFIG_INET_XFRM_MODE_BEET is not set
266# CONFIG_INET_LRO is not set
257CONFIG_INET_DIAG=y 267CONFIG_INET_DIAG=y
258CONFIG_INET_TCP_DIAG=y 268CONFIG_INET_TCP_DIAG=y
259# CONFIG_TCP_CONG_ADVANCED is not set 269# CONFIG_TCP_CONG_ADVANCED is not set
@@ -279,10 +289,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_LAPB is not set 289# CONFIG_LAPB is not set
280# CONFIG_ECONET is not set 290# CONFIG_ECONET is not set
281# CONFIG_WAN_ROUTER is not set 291# CONFIG_WAN_ROUTER is not set
282
283#
284# QoS and/or fair queueing
285#
286# CONFIG_NET_SCHED is not set 292# CONFIG_NET_SCHED is not set
287 293
288# 294#
@@ -311,6 +317,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
311# 317#
312# Generic Driver Options 318# Generic Driver Options
313# 319#
320CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
314CONFIG_STANDALONE=y 321CONFIG_STANDALONE=y
315CONFIG_PREVENT_FIRMWARE_BUILD=y 322CONFIG_PREVENT_FIRMWARE_BUILD=y
316CONFIG_FW_LOADER=y 323CONFIG_FW_LOADER=y
@@ -338,6 +345,7 @@ CONFIG_MTD_CHAR=y
338# CONFIG_INFTL is not set 345# CONFIG_INFTL is not set
339# CONFIG_RFD_FTL is not set 346# CONFIG_RFD_FTL is not set
340# CONFIG_SSFDC is not set 347# CONFIG_SSFDC is not set
348# CONFIG_MTD_OOPS is not set
341 349
342# 350#
343# RAM/ROM/Flash chip drivers 351# RAM/ROM/Flash chip drivers
@@ -370,6 +378,7 @@ CONFIG_MTD_CFI_UTIL=y
370# CONFIG_MTD_COMPLEX_MAPPINGS is not set 378# CONFIG_MTD_COMPLEX_MAPPINGS is not set
371# CONFIG_MTD_PHYSMAP is not set 379# CONFIG_MTD_PHYSMAP is not set
372CONFIG_MTD_PHYSMAP_OF=y 380CONFIG_MTD_PHYSMAP_OF=y
381# CONFIG_MTD_INTEL_VR_NOR is not set
373# CONFIG_MTD_PLATRAM is not set 382# CONFIG_MTD_PLATRAM is not set
374 383
375# 384#
@@ -429,10 +438,6 @@ CONFIG_MISC_DEVICES=y
429# CONFIG_SCSI_NETLINK is not set 438# CONFIG_SCSI_NETLINK is not set
430# CONFIG_ATA is not set 439# CONFIG_ATA is not set
431# CONFIG_MD is not set 440# CONFIG_MD is not set
432
433#
434# Fusion MPT device support
435#
436# CONFIG_FUSION is not set 441# CONFIG_FUSION is not set
437 442
438# 443#
@@ -451,12 +456,18 @@ CONFIG_NETDEVICES=y
451# CONFIG_MACVLAN is not set 456# CONFIG_MACVLAN is not set
452# CONFIG_EQUALIZER is not set 457# CONFIG_EQUALIZER is not set
453# CONFIG_TUN is not set 458# CONFIG_TUN is not set
459# CONFIG_VETH is not set
460# CONFIG_IP1000 is not set
454# CONFIG_ARCNET is not set 461# CONFIG_ARCNET is not set
455# CONFIG_NET_ETHERNET is not set 462# CONFIG_NET_ETHERNET is not set
463CONFIG_IBM_NEW_EMAC_ZMII=y
464CONFIG_IBM_NEW_EMAC_RGMII=y
465CONFIG_IBM_NEW_EMAC_EMAC4=y
456CONFIG_NETDEV_1000=y 466CONFIG_NETDEV_1000=y
457# CONFIG_ACENIC is not set 467# CONFIG_ACENIC is not set
458# CONFIG_DL2K is not set 468# CONFIG_DL2K is not set
459# CONFIG_E1000 is not set 469# CONFIG_E1000 is not set
470# CONFIG_E1000E is not set
460# CONFIG_NS83820 is not set 471# CONFIG_NS83820 is not set
461# CONFIG_HAMACHI is not set 472# CONFIG_HAMACHI is not set
462# CONFIG_YELLOWFIN is not set 473# CONFIG_YELLOWFIN is not set
@@ -464,6 +475,7 @@ CONFIG_NETDEV_1000=y
464# CONFIG_SIS190 is not set 475# CONFIG_SIS190 is not set
465# CONFIG_SKGE is not set 476# CONFIG_SKGE is not set
466# CONFIG_SKY2 is not set 477# CONFIG_SKY2 is not set
478# CONFIG_SK98LIN is not set
467# CONFIG_VIA_VELOCITY is not set 479# CONFIG_VIA_VELOCITY is not set
468# CONFIG_TIGON3 is not set 480# CONFIG_TIGON3 is not set
469# CONFIG_BNX2 is not set 481# CONFIG_BNX2 is not set
@@ -472,11 +484,14 @@ CONFIG_NETDEV_1000=y
472CONFIG_NETDEV_10000=y 484CONFIG_NETDEV_10000=y
473# CONFIG_CHELSIO_T1 is not set 485# CONFIG_CHELSIO_T1 is not set
474# CONFIG_CHELSIO_T3 is not set 486# CONFIG_CHELSIO_T3 is not set
487# CONFIG_IXGBE is not set
475# CONFIG_IXGB is not set 488# CONFIG_IXGB is not set
476# CONFIG_S2IO is not set 489# CONFIG_S2IO is not set
477# CONFIG_MYRI10GE is not set 490# CONFIG_MYRI10GE is not set
478# CONFIG_NETXEN_NIC is not set 491# CONFIG_NETXEN_NIC is not set
492# CONFIG_NIU is not set
479# CONFIG_MLX4_CORE is not set 493# CONFIG_MLX4_CORE is not set
494# CONFIG_TEHUTI is not set
480# CONFIG_TR is not set 495# CONFIG_TR is not set
481 496
482# 497#
@@ -539,14 +554,11 @@ CONFIG_UNIX98_PTYS=y
539CONFIG_LEGACY_PTYS=y 554CONFIG_LEGACY_PTYS=y
540CONFIG_LEGACY_PTY_COUNT=256 555CONFIG_LEGACY_PTY_COUNT=256
541# CONFIG_IPMI_HANDLER is not set 556# CONFIG_IPMI_HANDLER is not set
542# CONFIG_WATCHDOG is not set
543# CONFIG_HW_RANDOM is not set 557# CONFIG_HW_RANDOM is not set
544# CONFIG_NVRAM is not set 558# CONFIG_NVRAM is not set
545# CONFIG_GEN_RTC is not set 559# CONFIG_GEN_RTC is not set
546# CONFIG_R3964 is not set 560# CONFIG_R3964 is not set
547# CONFIG_APPLICOM is not set 561# CONFIG_APPLICOM is not set
548# CONFIG_AGP is not set
549# CONFIG_DRM is not set
550# CONFIG_RAW_DRIVER is not set 562# CONFIG_RAW_DRIVER is not set
551# CONFIG_TCG_TPM is not set 563# CONFIG_TCG_TPM is not set
552CONFIG_DEVPORT=y 564CONFIG_DEVPORT=y
@@ -560,6 +572,13 @@ CONFIG_DEVPORT=y
560# CONFIG_W1 is not set 572# CONFIG_W1 is not set
561# CONFIG_POWER_SUPPLY is not set 573# CONFIG_POWER_SUPPLY is not set
562# CONFIG_HWMON is not set 574# CONFIG_HWMON is not set
575# CONFIG_WATCHDOG is not set
576
577#
578# Sonics Silicon Backplane
579#
580CONFIG_SSB_POSSIBLE=y
581# CONFIG_SSB is not set
563 582
564# 583#
565# Multifunction device drivers 584# Multifunction device drivers
@@ -576,16 +595,17 @@ CONFIG_DAB=y
576# 595#
577# Graphics support 596# Graphics support
578# 597#
598# CONFIG_AGP is not set
599# CONFIG_DRM is not set
600# CONFIG_VGASTATE is not set
601CONFIG_VIDEO_OUTPUT_CONTROL=m
602# CONFIG_FB is not set
579# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 603# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
580 604
581# 605#
582# Display device support 606# Display device support
583# 607#
584# CONFIG_DISPLAY_SUPPORT is not set 608# CONFIG_DISPLAY_SUPPORT is not set
585# CONFIG_VGASTATE is not set
586CONFIG_VIDEO_OUTPUT_CONTROL=m
587# CONFIG_FB is not set
588# CONFIG_FB_IBM_GXT4500 is not set
589 609
590# 610#
591# Sound 611# Sound
@@ -612,19 +632,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
612# CONFIG_RTC_CLASS is not set 632# CONFIG_RTC_CLASS is not set
613 633
614# 634#
615# DMA Engine support
616#
617# CONFIG_DMA_ENGINE is not set
618
619#
620# DMA Clients
621#
622
623#
624# DMA Devices
625#
626
627#
628# Userspace I/O 635# Userspace I/O
629# 636#
630# CONFIG_UIO is not set 637# CONFIG_UIO is not set
@@ -676,7 +683,6 @@ CONFIG_SYSFS=y
676CONFIG_TMPFS=y 683CONFIG_TMPFS=y
677# CONFIG_TMPFS_POSIX_ACL is not set 684# CONFIG_TMPFS_POSIX_ACL is not set
678# CONFIG_HUGETLB_PAGE is not set 685# CONFIG_HUGETLB_PAGE is not set
679CONFIG_RAMFS=y
680# CONFIG_CONFIGFS_FS is not set 686# CONFIG_CONFIGFS_FS is not set
681 687
682# 688#
@@ -692,10 +698,12 @@ CONFIG_RAMFS=y
692CONFIG_JFFS2_FS=y 698CONFIG_JFFS2_FS=y
693CONFIG_JFFS2_FS_DEBUG=0 699CONFIG_JFFS2_FS_DEBUG=0
694CONFIG_JFFS2_FS_WRITEBUFFER=y 700CONFIG_JFFS2_FS_WRITEBUFFER=y
701# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
695# CONFIG_JFFS2_SUMMARY is not set 702# CONFIG_JFFS2_SUMMARY is not set
696# CONFIG_JFFS2_FS_XATTR is not set 703# CONFIG_JFFS2_FS_XATTR is not set
697# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 704# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
698CONFIG_JFFS2_ZLIB=y 705CONFIG_JFFS2_ZLIB=y
706# CONFIG_JFFS2_LZO is not set
699CONFIG_JFFS2_RTIME=y 707CONFIG_JFFS2_RTIME=y
700# CONFIG_JFFS2_RUBIN is not set 708# CONFIG_JFFS2_RUBIN is not set
701CONFIG_CRAMFS=y 709CONFIG_CRAMFS=y
@@ -704,10 +712,7 @@ CONFIG_CRAMFS=y
704# CONFIG_QNX4FS_FS is not set 712# CONFIG_QNX4FS_FS is not set
705# CONFIG_SYSV_FS is not set 713# CONFIG_SYSV_FS is not set
706# CONFIG_UFS_FS is not set 714# CONFIG_UFS_FS is not set
707 715CONFIG_NETWORK_FILESYSTEMS=y
708#
709# Network File Systems
710#
711CONFIG_NFS_FS=y 716CONFIG_NFS_FS=y
712CONFIG_NFS_V3=y 717CONFIG_NFS_V3=y
713# CONFIG_NFS_V3_ACL is not set 718# CONFIG_NFS_V3_ACL is not set
@@ -733,15 +738,7 @@ CONFIG_SUNRPC=y
733# 738#
734# CONFIG_PARTITION_ADVANCED is not set 739# CONFIG_PARTITION_ADVANCED is not set
735CONFIG_MSDOS_PARTITION=y 740CONFIG_MSDOS_PARTITION=y
736
737#
738# Native Language Support
739#
740# CONFIG_NLS is not set 741# CONFIG_NLS is not set
741
742#
743# Distributed Lock Manager
744#
745# CONFIG_DLM is not set 742# CONFIG_DLM is not set
746# CONFIG_UCC_SLOW is not set 743# CONFIG_UCC_SLOW is not set
747 744
@@ -761,16 +758,13 @@ CONFIG_PLIST=y
761CONFIG_HAS_IOMEM=y 758CONFIG_HAS_IOMEM=y
762CONFIG_HAS_IOPORT=y 759CONFIG_HAS_IOPORT=y
763CONFIG_HAS_DMA=y 760CONFIG_HAS_DMA=y
764 761# CONFIG_INSTRUMENTATION is not set
765#
766# Instrumentation Support
767#
768# CONFIG_PROFILING is not set
769 762
770# 763#
771# Kernel hacking 764# Kernel hacking
772# 765#
773# CONFIG_PRINTK_TIME is not set 766# CONFIG_PRINTK_TIME is not set
767CONFIG_ENABLE_WARN_DEPRECATED=y
774CONFIG_ENABLE_MUST_CHECK=y 768CONFIG_ENABLE_MUST_CHECK=y
775CONFIG_MAGIC_SYSRQ=y 769CONFIG_MAGIC_SYSRQ=y
776# CONFIG_UNUSED_SYMBOLS is not set 770# CONFIG_UNUSED_SYMBOLS is not set
@@ -794,9 +788,12 @@ CONFIG_SCHED_DEBUG=y
794# CONFIG_DEBUG_INFO is not set 788# CONFIG_DEBUG_INFO is not set
795# CONFIG_DEBUG_VM is not set 789# CONFIG_DEBUG_VM is not set
796# CONFIG_DEBUG_LIST is not set 790# CONFIG_DEBUG_LIST is not set
791# CONFIG_DEBUG_SG is not set
797CONFIG_FORCED_INLINING=y 792CONFIG_FORCED_INLINING=y
793# CONFIG_BOOT_PRINTK_DELAY is not set
798# CONFIG_RCU_TORTURE_TEST is not set 794# CONFIG_RCU_TORTURE_TEST is not set
799# CONFIG_FAULT_INJECTION is not set 795# CONFIG_FAULT_INJECTION is not set
796# CONFIG_SAMPLES is not set
800# CONFIG_DEBUG_STACKOVERFLOW is not set 797# CONFIG_DEBUG_STACKOVERFLOW is not set
801# CONFIG_DEBUG_STACK_USAGE is not set 798# CONFIG_DEBUG_STACK_USAGE is not set
802# CONFIG_DEBUG_PAGEALLOC is not set 799# CONFIG_DEBUG_PAGEALLOC is not set
@@ -814,6 +811,7 @@ CONFIG_PPC_EARLY_DEBUG=y
814# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 811# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
815# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 812# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
816CONFIG_PPC_EARLY_DEBUG_44x=y 813CONFIG_PPC_EARLY_DEBUG_44x=y
814# CONFIG_PPC_EARLY_DEBUG_CPM is not set
817CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 815CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
818CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1 816CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
819 817
@@ -822,6 +820,7 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
822# 820#
823# CONFIG_KEYS is not set 821# CONFIG_KEYS is not set
824# CONFIG_SECURITY is not set 822# CONFIG_SECURITY is not set
823# CONFIG_SECURITY_FILE_CAPABILITIES is not set
825CONFIG_CRYPTO=y 824CONFIG_CRYPTO=y
826CONFIG_CRYPTO_ALGAPI=y 825CONFIG_CRYPTO_ALGAPI=y
827CONFIG_CRYPTO_BLKCIPHER=y 826CONFIG_CRYPTO_BLKCIPHER=y
@@ -841,6 +840,7 @@ CONFIG_CRYPTO_ECB=y
841CONFIG_CRYPTO_CBC=y 840CONFIG_CRYPTO_CBC=y
842CONFIG_CRYPTO_PCBC=y 841CONFIG_CRYPTO_PCBC=y
843# CONFIG_CRYPTO_LRW is not set 842# CONFIG_CRYPTO_LRW is not set
843# CONFIG_CRYPTO_XTS is not set
844# CONFIG_CRYPTO_CRYPTD is not set 844# CONFIG_CRYPTO_CRYPTD is not set
845CONFIG_CRYPTO_DES=y 845CONFIG_CRYPTO_DES=y
846# CONFIG_CRYPTO_FCRYPT is not set 846# CONFIG_CRYPTO_FCRYPT is not set
@@ -854,9 +854,12 @@ CONFIG_CRYPTO_DES=y
854# CONFIG_CRYPTO_ARC4 is not set 854# CONFIG_CRYPTO_ARC4 is not set
855# CONFIG_CRYPTO_KHAZAD is not set 855# CONFIG_CRYPTO_KHAZAD is not set
856# CONFIG_CRYPTO_ANUBIS is not set 856# CONFIG_CRYPTO_ANUBIS is not set
857# CONFIG_CRYPTO_SEED is not set
857# CONFIG_CRYPTO_DEFLATE is not set 858# CONFIG_CRYPTO_DEFLATE is not set
858# CONFIG_CRYPTO_MICHAEL_MIC is not set 859# CONFIG_CRYPTO_MICHAEL_MIC is not set
859# CONFIG_CRYPTO_CRC32C is not set 860# CONFIG_CRYPTO_CRC32C is not set
860# CONFIG_CRYPTO_CAMELLIA is not set 861# CONFIG_CRYPTO_CAMELLIA is not set
861# CONFIG_CRYPTO_TEST is not set 862# CONFIG_CRYPTO_TEST is not set
863# CONFIG_CRYPTO_AUTHENC is not set
862CONFIG_CRYPTO_HW=y 864CONFIG_CRYPTO_HW=y
865# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig
index 02896ecba490..79344639b7c9 100644
--- a/arch/powerpc/configs/walnut_defconfig
+++ b/arch/powerpc/configs/walnut_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.23 3# Linux kernel version: 2.6.24-rc4
4# Thu Oct 18 12:54:18 2007 4# Thu Dec 6 16:49:33 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -65,11 +65,14 @@ CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
67# CONFIG_USER_NS is not set 67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
68# CONFIG_AUDIT is not set 69# CONFIG_AUDIT is not set
69# CONFIG_IKCONFIG is not set 70# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_CGROUPS is not set
71CONFIG_FAIR_GROUP_SCHED=y 73CONFIG_FAIR_GROUP_SCHED=y
72CONFIG_FAIR_USER_SCHED=y 74CONFIG_FAIR_USER_SCHED=y
75# CONFIG_FAIR_CGROUP_SCHED is not set
73CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -281,10 +284,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_LAPB is not set 284# CONFIG_LAPB is not set
282# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
284
285#
286# QoS and/or fair queueing
287#
288# CONFIG_NET_SCHED is not set 287# CONFIG_NET_SCHED is not set
289 288
290# 289#
@@ -507,7 +506,6 @@ CONFIG_UNIX98_PTYS=y
507CONFIG_LEGACY_PTYS=y 506CONFIG_LEGACY_PTYS=y
508CONFIG_LEGACY_PTY_COUNT=256 507CONFIG_LEGACY_PTY_COUNT=256
509# CONFIG_IPMI_HANDLER is not set 508# CONFIG_IPMI_HANDLER is not set
510# CONFIG_WATCHDOG is not set
511# CONFIG_HW_RANDOM is not set 509# CONFIG_HW_RANDOM is not set
512# CONFIG_NVRAM is not set 510# CONFIG_NVRAM is not set
513# CONFIG_GEN_RTC is not set 511# CONFIG_GEN_RTC is not set
@@ -524,6 +522,7 @@ CONFIG_LEGACY_PTY_COUNT=256
524# CONFIG_W1 is not set 522# CONFIG_W1 is not set
525# CONFIG_POWER_SUPPLY is not set 523# CONFIG_POWER_SUPPLY is not set
526# CONFIG_HWMON is not set 524# CONFIG_HWMON is not set
525# CONFIG_WATCHDOG is not set
527 526
528# 527#
529# Sonics Silicon Backplane 528# Sonics Silicon Backplane
@@ -694,16 +693,13 @@ CONFIG_PLIST=y
694CONFIG_HAS_IOMEM=y 693CONFIG_HAS_IOMEM=y
695CONFIG_HAS_IOPORT=y 694CONFIG_HAS_IOPORT=y
696CONFIG_HAS_DMA=y 695CONFIG_HAS_DMA=y
697 696# CONFIG_INSTRUMENTATION is not set
698#
699# Instrumentation Support
700#
701# CONFIG_PROFILING is not set
702 697
703# 698#
704# Kernel hacking 699# Kernel hacking
705# 700#
706# CONFIG_PRINTK_TIME is not set 701# CONFIG_PRINTK_TIME is not set
702CONFIG_ENABLE_WARN_DEPRECATED=y
707CONFIG_ENABLE_MUST_CHECK=y 703CONFIG_ENABLE_MUST_CHECK=y
708CONFIG_MAGIC_SYSRQ=y 704CONFIG_MAGIC_SYSRQ=y
709# CONFIG_UNUSED_SYMBOLS is not set 705# CONFIG_UNUSED_SYMBOLS is not set
@@ -727,10 +723,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
727# CONFIG_DEBUG_INFO is not set 723# CONFIG_DEBUG_INFO is not set
728# CONFIG_DEBUG_VM is not set 724# CONFIG_DEBUG_VM is not set
729# CONFIG_DEBUG_LIST is not set 725# CONFIG_DEBUG_LIST is not set
726# CONFIG_DEBUG_SG is not set
730CONFIG_FORCED_INLINING=y 727CONFIG_FORCED_INLINING=y
731# CONFIG_BOOT_PRINTK_DELAY is not set 728# CONFIG_BOOT_PRINTK_DELAY is not set
732# CONFIG_RCU_TORTURE_TEST is not set 729# CONFIG_RCU_TORTURE_TEST is not set
733# CONFIG_FAULT_INJECTION is not set 730# CONFIG_FAULT_INJECTION is not set
731# CONFIG_SAMPLES is not set
734# CONFIG_DEBUG_STACKOVERFLOW is not set 732# CONFIG_DEBUG_STACKOVERFLOW is not set
735# CONFIG_DEBUG_STACK_USAGE is not set 733# CONFIG_DEBUG_STACK_USAGE is not set
736# CONFIG_DEBUG_PAGEALLOC is not set 734# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 41e13f4cc6e3..b9d88374f14f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -350,7 +350,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
350 local_irq_save(flags); 350 local_irq_save(flags);
351 351
352 account_system_vtime(current); 352 account_system_vtime(current);
353 account_process_tick(current, 0); 353 account_process_vtime(current);
354 calculate_steal_time(); 354 calculate_steal_time();
355 355
356 last = _switch(old_thread, new_thread); 356 last = _switch(old_thread, new_thread);