aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-21 10:18:14 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-21 10:18:14 -0400
commit91fa47964165a42401fbc1f41caa63ab78564305 (patch)
tree8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /arch
parent56965536b8056f57830219efbba4b85218d96d6c (diff)
parente478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff)
Merge branch 'master' into gfs2
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/pnx4008_defconfig715
-rw-r--r--arch/arm/mach-s3c2410/Kconfig8
-rw-r--r--arch/arm/mach-s3c2410/irq.h5
-rw-r--r--arch/arm/mach-s3c2410/s3c2412.c29
-rw-r--r--arch/arm/mm/proc-xscale.S2
-rw-r--r--arch/i386/kernel/entry.S4
-rw-r--r--arch/i386/kernel/setup.c32
-rw-r--r--arch/i386/oprofile/nmi_int.c2
-rw-r--r--arch/i386/pci/common.c5
-rw-r--r--arch/i386/pci/mmconfig.c34
-rw-r--r--arch/i386/pci/pci.h3
-rw-r--r--arch/powerpc/configs/cell_defconfig58
-rw-r--r--arch/powerpc/configs/chrp32_defconfig31
-rw-r--r--arch/powerpc/configs/g5_defconfig9
-rw-r--r--arch/powerpc/configs/iseries_defconfig7
-rw-r--r--arch/powerpc/configs/maple_defconfig129
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig64
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig20
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig104
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig84
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig75
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig62
-rw-r--r--arch/powerpc/configs/pmac32_defconfig18
-rw-r--r--arch/powerpc/configs/ppc64_defconfig198
-rw-r--r--arch/powerpc/configs/pseries_defconfig8
-rw-r--r--arch/powerpc/kernel/crash.c2
-rw-r--r--arch/powerpc/kernel/misc.S49
-rw-r--r--arch/powerpc/platforms/86xx/mpc86xx_hpcn.c2
-rw-r--r--arch/powerpc/sysdev/dart_iommu.c7
-rw-r--r--arch/ppc/configs/prep_defconfig585
-rw-r--r--arch/sparc/kernel/sys_sparc.c10
-rw-r--r--arch/sparc64/kernel/sys_sparc.c10
-rw-r--r--arch/x86_64/kernel/e820.c29
-rw-r--r--arch/x86_64/pci/mmconfig.c34
34 files changed, 1311 insertions, 1123 deletions
diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig
index 8a078d479d57..a4989f44baaa 100644
--- a/arch/arm/configs/pnx4008_defconfig
+++ b/arch/arm/configs/pnx4008_defconfig
@@ -1,14 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc1 3# Linux kernel version: 2.6.18-rc6
4# Thu Apr 6 17:05:58 2006 4# Mon Sep 11 13:59:24 2006
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_GENERIC_HARDIRQS=y
9CONFIG_HARDIRQS_SW_RESEND=y
10CONFIG_GENERIC_IRQ_PROBE=y
8CONFIG_RWSEM_GENERIC_SPINLOCK=y 11CONFIG_RWSEM_GENERIC_SPINLOCK=y
9CONFIG_GENERIC_HWEIGHT=y 12CONFIG_GENERIC_HWEIGHT=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 13CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_VECTORS_BASE=0xffff0000 14CONFIG_VECTORS_BASE=0xffff0000
15CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
12 16
13# 17#
14# Code maturity level options 18# Code maturity level options
@@ -28,6 +32,7 @@ CONFIG_SYSVIPC=y
28CONFIG_POSIX_MQUEUE=y 32CONFIG_POSIX_MQUEUE=y
29CONFIG_BSD_PROCESS_ACCT=y 33CONFIG_BSD_PROCESS_ACCT=y
30# CONFIG_BSD_PROCESS_ACCT_V3 is not set 34# CONFIG_BSD_PROCESS_ACCT_V3 is not set
35# CONFIG_TASKSTATS is not set
31CONFIG_SYSCTL=y 36CONFIG_SYSCTL=y
32CONFIG_AUDIT=y 37CONFIG_AUDIT=y
33# CONFIG_IKCONFIG is not set 38# CONFIG_IKCONFIG is not set
@@ -44,14 +49,15 @@ CONFIG_PRINTK=y
44CONFIG_BUG=y 49CONFIG_BUG=y
45CONFIG_ELF_CORE=y 50CONFIG_ELF_CORE=y
46CONFIG_BASE_FULL=y 51CONFIG_BASE_FULL=y
52CONFIG_RT_MUTEXES=y
47CONFIG_FUTEX=y 53CONFIG_FUTEX=y
48CONFIG_EPOLL=y 54CONFIG_EPOLL=y
49CONFIG_SHMEM=y 55CONFIG_SHMEM=y
50CONFIG_SLAB=y 56CONFIG_SLAB=y
57CONFIG_VM_EVENT_COUNTERS=y
51# CONFIG_TINY_SHMEM is not set 58# CONFIG_TINY_SHMEM is not set
52CONFIG_BASE_SMALL=0 59CONFIG_BASE_SMALL=0
53# CONFIG_SLOB is not set 60# CONFIG_SLOB is not set
54CONFIG_OBSOLETE_INTERMODULE=m
55 61
56# 62#
57# Loadable module support 63# Loadable module support
@@ -84,18 +90,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
84# 90#
85# System Type 91# System Type
86# 92#
93# CONFIG_ARCH_AAEC2000 is not set
94# CONFIG_ARCH_INTEGRATOR is not set
95# CONFIG_ARCH_REALVIEW is not set
96# CONFIG_ARCH_VERSATILE is not set
97# CONFIG_ARCH_AT91 is not set
87# CONFIG_ARCH_CLPS7500 is not set 98# CONFIG_ARCH_CLPS7500 is not set
88# CONFIG_ARCH_CLPS711X is not set 99# CONFIG_ARCH_CLPS711X is not set
89# CONFIG_ARCH_CO285 is not set 100# CONFIG_ARCH_CO285 is not set
90# CONFIG_ARCH_EBSA110 is not set 101# CONFIG_ARCH_EBSA110 is not set
91# CONFIG_ARCH_EP93XX is not set 102# CONFIG_ARCH_EP93XX is not set
92# CONFIG_ARCH_FOOTBRIDGE is not set 103# CONFIG_ARCH_FOOTBRIDGE is not set
93# CONFIG_ARCH_INTEGRATOR is not set 104# CONFIG_ARCH_NETX is not set
105# CONFIG_ARCH_H720X is not set
106# CONFIG_ARCH_IMX is not set
94# CONFIG_ARCH_IOP3XX is not set 107# CONFIG_ARCH_IOP3XX is not set
95# CONFIG_ARCH_IXP4XX is not set 108# CONFIG_ARCH_IXP4XX is not set
96# CONFIG_ARCH_IXP2000 is not set 109# CONFIG_ARCH_IXP2000 is not set
97# CONFIG_ARCH_IXP23XX is not set 110# CONFIG_ARCH_IXP23XX is not set
98# CONFIG_ARCH_L7200 is not set 111# CONFIG_ARCH_L7200 is not set
112CONFIG_ARCH_PNX4008=y
99# CONFIG_ARCH_PXA is not set 113# CONFIG_ARCH_PXA is not set
100# CONFIG_ARCH_RPC is not set 114# CONFIG_ARCH_RPC is not set
101# CONFIG_ARCH_SA1100 is not set 115# CONFIG_ARCH_SA1100 is not set
@@ -103,13 +117,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
103# CONFIG_ARCH_SHARK is not set 117# CONFIG_ARCH_SHARK is not set
104# CONFIG_ARCH_LH7A40X is not set 118# CONFIG_ARCH_LH7A40X is not set
105# CONFIG_ARCH_OMAP is not set 119# CONFIG_ARCH_OMAP is not set
106# CONFIG_ARCH_VERSATILE is not set
107# CONFIG_ARCH_REALVIEW is not set
108# CONFIG_ARCH_IMX is not set
109# CONFIG_ARCH_H720X is not set
110# CONFIG_ARCH_AAEC2000 is not set
111# CONFIG_ARCH_AT91RM9200 is not set
112CONFIG_ARCH_PNX4008=y
113 120
114# 121#
115# Processor Type 122# Processor Type
@@ -138,15 +145,7 @@ CONFIG_ARM_THUMB=y
138# 145#
139# PCCARD (PCMCIA/CardBus) support 146# PCCARD (PCMCIA/CardBus) support
140# 147#
141CONFIG_PCCARD=m 148# CONFIG_PCCARD is not set
142# CONFIG_PCMCIA_DEBUG is not set
143CONFIG_PCMCIA=m
144CONFIG_PCMCIA_LOAD_CIS=y
145CONFIG_PCMCIA_IOCTL=y
146
147#
148# PC-card bridges
149#
150 149
151# 150#
152# Kernel Features 151# Kernel Features
@@ -164,13 +163,14 @@ CONFIG_FLATMEM=y
164CONFIG_FLAT_NODE_MEM_MAP=y 163CONFIG_FLAT_NODE_MEM_MAP=y
165# CONFIG_SPARSEMEM_STATIC is not set 164# CONFIG_SPARSEMEM_STATIC is not set
166CONFIG_SPLIT_PTLOCK_CPUS=4096 165CONFIG_SPLIT_PTLOCK_CPUS=4096
166# CONFIG_RESOURCES_64BIT is not set
167CONFIG_ALIGNMENT_TRAP=y 167CONFIG_ALIGNMENT_TRAP=y
168 168
169# 169#
170# Boot options 170# Boot options
171# 171#
172CONFIG_ZBOOT_ROM_TEXT=0 172CONFIG_ZBOOT_ROM_TEXT=0x0
173CONFIG_ZBOOT_ROM_BSS=0 173CONFIG_ZBOOT_ROM_BSS=0x0
174CONFIG_CMDLINE="mem=64M console=ttyS0,115200" 174CONFIG_CMDLINE="mem=64M console=ttyS0,115200"
175# CONFIG_XIP_KERNEL is not set 175# CONFIG_XIP_KERNEL is not set
176 176
@@ -181,7 +181,8 @@ CONFIG_CMDLINE="mem=64M console=ttyS0,115200"
181# 181#
182# At least one emulation must be selected 182# At least one emulation must be selected
183# 183#
184# CONFIG_FPE_NWFPE is not set 184CONFIG_FPE_NWFPE=y
185# CONFIG_FPE_NWFPE_XP is not set
185# CONFIG_FPE_FASTFPE is not set 186# CONFIG_FPE_FASTFPE is not set
186# CONFIG_VFP is not set 187# CONFIG_VFP is not set
187 188
@@ -199,7 +200,7 @@ CONFIG_BINFMT_MISC=m
199CONFIG_PM=y 200CONFIG_PM=y
200CONFIG_PM_LEGACY=y 201CONFIG_PM_LEGACY=y
201# CONFIG_PM_DEBUG is not set 202# CONFIG_PM_DEBUG is not set
202CONFIG_APM=m 203# CONFIG_APM is not set
203 204
204# 205#
205# Networking 206# Networking
@@ -210,12 +211,12 @@ CONFIG_NET=y
210# Networking options 211# Networking options
211# 212#
212# CONFIG_NETDEBUG is not set 213# CONFIG_NETDEBUG is not set
213CONFIG_PACKET=m 214CONFIG_PACKET=y
214CONFIG_PACKET_MMAP=y 215CONFIG_PACKET_MMAP=y
215CONFIG_UNIX=m 216CONFIG_UNIX=y
216CONFIG_XFRM=y 217CONFIG_XFRM=y
217CONFIG_XFRM_USER=m 218# CONFIG_XFRM_USER is not set
218CONFIG_NET_KEY=m 219# CONFIG_NET_KEY is not set
219CONFIG_INET=y 220CONFIG_INET=y
220CONFIG_IP_MULTICAST=y 221CONFIG_IP_MULTICAST=y
221CONFIG_IP_ADVANCED_ROUTER=y 222CONFIG_IP_ADVANCED_ROUTER=y
@@ -227,10 +228,12 @@ CONFIG_IP_ROUTE_FWMARK=y
227CONFIG_IP_ROUTE_MULTIPATH=y 228CONFIG_IP_ROUTE_MULTIPATH=y
228# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 229# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
229CONFIG_IP_ROUTE_VERBOSE=y 230CONFIG_IP_ROUTE_VERBOSE=y
230# CONFIG_IP_PNP is not set 231CONFIG_IP_PNP=y
231CONFIG_NET_IPIP=m 232CONFIG_IP_PNP_DHCP=y
232CONFIG_NET_IPGRE=m 233CONFIG_IP_PNP_BOOTP=y
233CONFIG_NET_IPGRE_BROADCAST=y 234# CONFIG_IP_PNP_RARP is not set
235# CONFIG_NET_IPIP is not set
236# CONFIG_NET_IPGRE is not set
234CONFIG_IP_MROUTE=y 237CONFIG_IP_MROUTE=y
235CONFIG_IP_PIMSM_V1=y 238CONFIG_IP_PIMSM_V1=y
236CONFIG_IP_PIMSM_V2=y 239CONFIG_IP_PIMSM_V2=y
@@ -241,6 +244,8 @@ CONFIG_INET_ESP=m
241CONFIG_INET_IPCOMP=m 244CONFIG_INET_IPCOMP=m
242CONFIG_INET_XFRM_TUNNEL=m 245CONFIG_INET_XFRM_TUNNEL=m
243CONFIG_INET_TUNNEL=m 246CONFIG_INET_TUNNEL=m
247CONFIG_INET_XFRM_MODE_TRANSPORT=y
248CONFIG_INET_XFRM_MODE_TUNNEL=y
244CONFIG_INET_DIAG=y 249CONFIG_INET_DIAG=y
245CONFIG_INET_TCP_DIAG=y 250CONFIG_INET_TCP_DIAG=y
246# CONFIG_TCP_CONG_ADVANCED is not set 251# CONFIG_TCP_CONG_ADVANCED is not set
@@ -287,7 +292,10 @@ CONFIG_INET6_ESP=m
287CONFIG_INET6_IPCOMP=m 292CONFIG_INET6_IPCOMP=m
288CONFIG_INET6_XFRM_TUNNEL=m 293CONFIG_INET6_XFRM_TUNNEL=m
289CONFIG_INET6_TUNNEL=m 294CONFIG_INET6_TUNNEL=m
295CONFIG_INET6_XFRM_MODE_TRANSPORT=m
296CONFIG_INET6_XFRM_MODE_TUNNEL=m
290CONFIG_IPV6_TUNNEL=m 297CONFIG_IPV6_TUNNEL=m
298# CONFIG_NETWORK_SECMARK is not set
291CONFIG_NETFILTER=y 299CONFIG_NETFILTER=y
292# CONFIG_NETFILTER_DEBUG is not set 300# CONFIG_NETFILTER_DEBUG is not set
293CONFIG_BRIDGE_NETFILTER=y 301CONFIG_BRIDGE_NETFILTER=y
@@ -313,6 +321,7 @@ CONFIG_IP_NF_TFTP=m
313CONFIG_IP_NF_AMANDA=m 321CONFIG_IP_NF_AMANDA=m
314# CONFIG_IP_NF_PPTP is not set 322# CONFIG_IP_NF_PPTP is not set
315# CONFIG_IP_NF_H323 is not set 323# CONFIG_IP_NF_H323 is not set
324# CONFIG_IP_NF_SIP is not set
316CONFIG_IP_NF_QUEUE=m 325CONFIG_IP_NF_QUEUE=m
317 326
318# 327#
@@ -384,7 +393,7 @@ CONFIG_LLC2=m
384CONFIG_IPX=m 393CONFIG_IPX=m
385# CONFIG_IPX_INTERN is not set 394# CONFIG_IPX_INTERN is not set
386CONFIG_ATALK=m 395CONFIG_ATALK=m
387CONFIG_DEV_APPLETALK=y 396CONFIG_DEV_APPLETALK=m
388CONFIG_IPDDP=m 397CONFIG_IPDDP=m
389CONFIG_IPDDP_ENCAP=y 398CONFIG_IPDDP_ENCAP=y
390CONFIG_IPDDP_DECAP=y 399CONFIG_IPDDP_DECAP=y
@@ -445,110 +454,9 @@ CONFIG_NET_ESTIMATOR=y
445# Network testing 454# Network testing
446# 455#
447CONFIG_NET_PKTGEN=m 456CONFIG_NET_PKTGEN=m
448CONFIG_HAMRADIO=y 457# CONFIG_HAMRADIO is not set
449 458# CONFIG_IRDA is not set
450# 459# CONFIG_BT is not set
451# Packet Radio protocols
452#
453CONFIG_AX25=m
454# CONFIG_AX25_DAMA_SLAVE is not set
455CONFIG_NETROM=m
456CONFIG_ROSE=m
457
458#
459# AX.25 network device drivers
460#
461CONFIG_MKISS=m
462CONFIG_6PACK=m
463CONFIG_BPQETHER=m
464CONFIG_BAYCOM_SER_FDX=m
465CONFIG_BAYCOM_SER_HDX=m
466CONFIG_BAYCOM_PAR=m
467CONFIG_BAYCOM_EPP=m
468CONFIG_YAM=m
469CONFIG_IRDA=m
470
471#
472# IrDA protocols
473#
474CONFIG_IRLAN=m
475CONFIG_IRNET=m
476CONFIG_IRCOMM=m
477# CONFIG_IRDA_ULTRA is not set
478
479#
480# IrDA options
481#
482CONFIG_IRDA_CACHE_LAST_LSAP=y
483CONFIG_IRDA_FAST_RR=y
484CONFIG_IRDA_DEBUG=y
485
486#
487# Infrared-port device drivers
488#
489
490#
491# SIR device drivers
492#
493CONFIG_IRTTY_SIR=m
494
495#
496# Dongle support
497#
498CONFIG_DONGLE=y
499CONFIG_ESI_DONGLE=m
500CONFIG_ACTISYS_DONGLE=m
501CONFIG_TEKRAM_DONGLE=m
502# CONFIG_TOIM3232_DONGLE is not set
503CONFIG_LITELINK_DONGLE=m
504CONFIG_MA600_DONGLE=m
505CONFIG_GIRBIL_DONGLE=m
506CONFIG_MCP2120_DONGLE=m
507CONFIG_OLD_BELKIN_DONGLE=m
508CONFIG_ACT200L_DONGLE=m
509
510#
511# Old SIR device drivers
512#
513CONFIG_IRPORT_SIR=m
514
515#
516# Old Serial dongle support
517#
518# CONFIG_DONGLE_OLD is not set
519
520#
521# FIR device drivers
522#
523CONFIG_USB_IRDA=m
524CONFIG_SIGMATEL_FIR=m
525CONFIG_BT=m
526CONFIG_BT_L2CAP=m
527CONFIG_BT_SCO=m
528CONFIG_BT_RFCOMM=m
529CONFIG_BT_RFCOMM_TTY=y
530CONFIG_BT_BNEP=m
531CONFIG_BT_BNEP_MC_FILTER=y
532CONFIG_BT_BNEP_PROTO_FILTER=y
533CONFIG_BT_CMTP=m
534CONFIG_BT_HIDP=m
535
536#
537# Bluetooth device drivers
538#
539CONFIG_BT_HCIUSB=m
540CONFIG_BT_HCIUSB_SCO=y
541CONFIG_BT_HCIUART=m
542CONFIG_BT_HCIUART_H4=y
543CONFIG_BT_HCIUART_BCSP=y
544CONFIG_BT_HCIBCM203X=m
545# CONFIG_BT_HCIBPA10X is not set
546CONFIG_BT_HCIBFUSB=m
547CONFIG_BT_HCIDTL1=m
548CONFIG_BT_HCIBT3C=m
549CONFIG_BT_HCIBLUECARD=m
550CONFIG_BT_HCIBTUART=m
551CONFIG_BT_HCIVHCI=m
552CONFIG_IEEE80211=m 460CONFIG_IEEE80211=m
553# CONFIG_IEEE80211_DEBUG is not set 461# CONFIG_IEEE80211_DEBUG is not set
554# CONFIG_IEEE80211_CRYPT_WEP is not set 462# CONFIG_IEEE80211_CRYPT_WEP is not set
@@ -566,8 +474,9 @@ CONFIG_WIRELESS_EXT=y
566# 474#
567CONFIG_STANDALONE=y 475CONFIG_STANDALONE=y
568CONFIG_PREVENT_FIRMWARE_BUILD=y 476CONFIG_PREVENT_FIRMWARE_BUILD=y
569CONFIG_FW_LOADER=m 477CONFIG_FW_LOADER=y
570# CONFIG_DEBUG_DRIVER is not set 478# CONFIG_DEBUG_DRIVER is not set
479# CONFIG_SYS_HYPERVISOR is not set
571 480
572# 481#
573# Connector - unified userspace <-> kernelspace linker 482# Connector - unified userspace <-> kernelspace linker
@@ -577,11 +486,11 @@ CONFIG_FW_LOADER=m
577# 486#
578# Memory Technology Devices (MTD) 487# Memory Technology Devices (MTD)
579# 488#
580CONFIG_MTD=m 489CONFIG_MTD=y
581# CONFIG_MTD_DEBUG is not set 490# CONFIG_MTD_DEBUG is not set
582CONFIG_MTD_CONCAT=m 491CONFIG_MTD_CONCAT=y
583CONFIG_MTD_PARTITIONS=y 492CONFIG_MTD_PARTITIONS=y
584CONFIG_MTD_REDBOOT_PARTS=m 493CONFIG_MTD_REDBOOT_PARTS=y
585CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 494CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
586# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 495# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
587# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set 496# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
@@ -591,22 +500,18 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
591# 500#
592# User Modules And Translation Layers 501# User Modules And Translation Layers
593# 502#
594CONFIG_MTD_CHAR=m 503CONFIG_MTD_CHAR=y
595CONFIG_MTD_BLOCK=m 504CONFIG_MTD_BLOCK=y
596CONFIG_MTD_BLOCK_RO=m 505# CONFIG_FTL is not set
597CONFIG_FTL=m 506# CONFIG_NFTL is not set
598CONFIG_NFTL=m 507# CONFIG_INFTL is not set
599CONFIG_NFTL_RW=y
600CONFIG_INFTL=m
601# CONFIG_RFD_FTL is not set 508# CONFIG_RFD_FTL is not set
602 509
603# 510#
604# RAM/ROM/Flash chip drivers 511# RAM/ROM/Flash chip drivers
605# 512#
606CONFIG_MTD_CFI=m 513# CONFIG_MTD_CFI is not set
607CONFIG_MTD_JEDECPROBE=m 514# CONFIG_MTD_JEDECPROBE is not set
608CONFIG_MTD_GEN_PROBE=m
609# CONFIG_MTD_CFI_ADV_OPTIONS is not set
610CONFIG_MTD_MAP_BANK_WIDTH_1=y 515CONFIG_MTD_MAP_BANK_WIDTH_1=y
611CONFIG_MTD_MAP_BANK_WIDTH_2=y 516CONFIG_MTD_MAP_BANK_WIDTH_2=y
612CONFIG_MTD_MAP_BANK_WIDTH_4=y 517CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -617,36 +522,27 @@ CONFIG_MTD_CFI_I1=y
617CONFIG_MTD_CFI_I2=y 522CONFIG_MTD_CFI_I2=y
618# CONFIG_MTD_CFI_I4 is not set 523# CONFIG_MTD_CFI_I4 is not set
619# CONFIG_MTD_CFI_I8 is not set 524# CONFIG_MTD_CFI_I8 is not set
620CONFIG_MTD_CFI_INTELEXT=m 525# CONFIG_MTD_RAM is not set
621CONFIG_MTD_CFI_AMDSTD=m 526# CONFIG_MTD_ROM is not set
622CONFIG_MTD_CFI_STAA=m 527# CONFIG_MTD_ABSENT is not set
623CONFIG_MTD_CFI_UTIL=m
624CONFIG_MTD_RAM=m
625CONFIG_MTD_ROM=m
626CONFIG_MTD_ABSENT=m
627# CONFIG_MTD_OBSOLETE_CHIPS is not set 528# CONFIG_MTD_OBSOLETE_CHIPS is not set
628 529
629# 530#
630# Mapping drivers for chip access 531# Mapping drivers for chip access
631# 532#
632CONFIG_MTD_COMPLEX_MAPPINGS=y 533# CONFIG_MTD_COMPLEX_MAPPINGS is not set
633CONFIG_MTD_PHYSMAP=m
634CONFIG_MTD_PHYSMAP_START=0x8000000
635CONFIG_MTD_PHYSMAP_LEN=0x4000000
636CONFIG_MTD_PHYSMAP_BANKWIDTH=2
637# CONFIG_MTD_ARM_INTEGRATOR is not set
638# CONFIG_MTD_IMPA7 is not set
639# CONFIG_MTD_PLATRAM is not set 534# CONFIG_MTD_PLATRAM is not set
640 535
641# 536#
642# Self-contained MTD device drivers 537# Self-contained MTD device drivers
643# 538#
539# CONFIG_MTD_DATAFLASH is not set
540# CONFIG_MTD_M25P80 is not set
644CONFIG_MTD_SLRAM=m 541CONFIG_MTD_SLRAM=m
645CONFIG_MTD_PHRAM=m 542CONFIG_MTD_PHRAM=m
646CONFIG_MTD_MTDRAM=m 543CONFIG_MTD_MTDRAM=m
647CONFIG_MTDRAM_TOTAL_SIZE=4096 544CONFIG_MTDRAM_TOTAL_SIZE=4096
648CONFIG_MTDRAM_ERASE_SIZE=128 545CONFIG_MTDRAM_ERASE_SIZE=128
649CONFIG_MTD_BLKMTD=m
650# CONFIG_MTD_BLOCK2MTD is not set 546# CONFIG_MTD_BLOCK2MTD is not set
651 547
652# 548#
@@ -663,14 +559,12 @@ CONFIG_MTD_DOCPROBE_ADDRESS=0
663# 559#
664# NAND Flash Device Drivers 560# NAND Flash Device Drivers
665# 561#
666CONFIG_MTD_NAND=m 562CONFIG_MTD_NAND=y
667# CONFIG_MTD_NAND_VERIFY_WRITE is not set 563# CONFIG_MTD_NAND_VERIFY_WRITE is not set
668CONFIG_MTD_NAND_IDS=m 564# CONFIG_MTD_NAND_ECC_SMC is not set
669CONFIG_MTD_NAND_DISKONCHIP=m 565CONFIG_MTD_NAND_IDS=y
670# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set 566# CONFIG_MTD_NAND_DISKONCHIP is not set
671CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 567CONFIG_MTD_NAND_NANDSIM=m
672# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
673# CONFIG_MTD_NAND_NANDSIM is not set
674 568
675# 569#
676# OneNAND Flash Device Drivers 570# OneNAND Flash Device Drivers
@@ -680,15 +574,7 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
680# 574#
681# Parallel port support 575# Parallel port support
682# 576#
683CONFIG_PARPORT=m 577# CONFIG_PARPORT is not set
684CONFIG_PARPORT_PC=m
685CONFIG_PARPORT_PC_FIFO=y
686# CONFIG_PARPORT_PC_SUPERIO is not set
687CONFIG_PARPORT_PC_PCMCIA=m
688CONFIG_PARPORT_NOT_PC=y
689# CONFIG_PARPORT_ARC is not set
690# CONFIG_PARPORT_GSC is not set
691CONFIG_PARPORT_1284=y
692 578
693# 579#
694# Plug and Play support 580# Plug and Play support
@@ -697,45 +583,15 @@ CONFIG_PARPORT_1284=y
697# 583#
698# Block devices 584# Block devices
699# 585#
700CONFIG_PARIDE=m
701CONFIG_PARIDE_PARPORT=m
702
703#
704# Parallel IDE high-level drivers
705#
706CONFIG_PARIDE_PD=m
707CONFIG_PARIDE_PCD=m
708CONFIG_PARIDE_PF=m
709CONFIG_PARIDE_PT=m
710CONFIG_PARIDE_PG=m
711
712#
713# Parallel IDE protocol modules
714#
715CONFIG_PARIDE_ATEN=m
716CONFIG_PARIDE_BPCK=m
717CONFIG_PARIDE_BPCK6=m
718CONFIG_PARIDE_COMM=m
719CONFIG_PARIDE_DSTR=m
720CONFIG_PARIDE_FIT2=m
721CONFIG_PARIDE_FIT3=m
722CONFIG_PARIDE_EPAT=m
723# CONFIG_PARIDE_EPATC8 is not set
724CONFIG_PARIDE_EPIA=m
725CONFIG_PARIDE_FRIQ=m
726CONFIG_PARIDE_FRPW=m
727CONFIG_PARIDE_KBIC=m
728CONFIG_PARIDE_KTTI=m
729CONFIG_PARIDE_ON20=m
730CONFIG_PARIDE_ON26=m
731# CONFIG_BLK_DEV_COW_COMMON is not set 586# CONFIG_BLK_DEV_COW_COMMON is not set
732CONFIG_BLK_DEV_LOOP=m 587CONFIG_BLK_DEV_LOOP=y
733CONFIG_BLK_DEV_CRYPTOLOOP=m 588CONFIG_BLK_DEV_CRYPTOLOOP=y
734CONFIG_BLK_DEV_NBD=m 589CONFIG_BLK_DEV_NBD=y
735# CONFIG_BLK_DEV_UB is not set 590# CONFIG_BLK_DEV_UB is not set
736CONFIG_BLK_DEV_RAM=y 591CONFIG_BLK_DEV_RAM=y
737CONFIG_BLK_DEV_RAM_COUNT=16 592CONFIG_BLK_DEV_RAM_COUNT=16
738CONFIG_BLK_DEV_RAM_SIZE=8192 593CONFIG_BLK_DEV_RAM_SIZE=8192
594CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
739CONFIG_BLK_DEV_INITRD=y 595CONFIG_BLK_DEV_INITRD=y
740CONFIG_CDROM_PKTCDVD=m 596CONFIG_CDROM_PKTCDVD=m
741CONFIG_CDROM_PKTCDVD_BUFFERS=8 597CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -743,34 +599,6 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
743# CONFIG_ATA_OVER_ETH is not set 599# CONFIG_ATA_OVER_ETH is not set
744 600
745# 601#
746# ATA/ATAPI/MFM/RLL support
747#
748CONFIG_IDE=m
749CONFIG_BLK_DEV_IDE=m
750
751#
752# Please see Documentation/ide.txt for help/info on IDE drives
753#
754# CONFIG_BLK_DEV_IDE_SATA is not set
755CONFIG_BLK_DEV_IDEDISK=m
756# CONFIG_IDEDISK_MULTI_MODE is not set
757CONFIG_BLK_DEV_IDECS=m
758CONFIG_BLK_DEV_IDECD=m
759CONFIG_BLK_DEV_IDETAPE=m
760CONFIG_BLK_DEV_IDEFLOPPY=m
761CONFIG_BLK_DEV_IDESCSI=m
762# CONFIG_IDE_TASK_IOCTL is not set
763
764#
765# IDE chipset support/bugfixes
766#
767CONFIG_IDE_GENERIC=m
768# CONFIG_IDE_ARM is not set
769# CONFIG_BLK_DEV_IDEDMA is not set
770# CONFIG_IDEDMA_AUTO is not set
771# CONFIG_BLK_DEV_HD is not set
772
773#
774# SCSI device support 602# SCSI device support
775# 603#
776# CONFIG_RAID_ATTRS is not set 604# CONFIG_RAID_ATTRS is not set
@@ -808,41 +636,12 @@ CONFIG_SCSI_FC_ATTRS=m
808# 636#
809# CONFIG_ISCSI_TCP is not set 637# CONFIG_ISCSI_TCP is not set
810CONFIG_SCSI_SATA=m 638CONFIG_SCSI_SATA=m
811CONFIG_SCSI_PPA=m
812CONFIG_SCSI_IMM=m
813# CONFIG_SCSI_IZIP_EPP16 is not set
814# CONFIG_SCSI_IZIP_SLOW_CTR is not set
815CONFIG_SCSI_DEBUG=m 639CONFIG_SCSI_DEBUG=m
816 640
817# 641#
818# PCMCIA SCSI adapter support
819#
820CONFIG_PCMCIA_AHA152X=m
821CONFIG_PCMCIA_FDOMAIN=m
822CONFIG_PCMCIA_NINJA_SCSI=m
823CONFIG_PCMCIA_QLOGIC=m
824CONFIG_PCMCIA_SYM53C500=m
825
826#
827# Multi-device support (RAID and LVM) 642# Multi-device support (RAID and LVM)
828# 643#
829CONFIG_MD=y 644# CONFIG_MD is not set
830CONFIG_BLK_DEV_MD=m
831CONFIG_MD_LINEAR=m
832CONFIG_MD_RAID0=m
833CONFIG_MD_RAID1=m
834CONFIG_MD_RAID10=m
835CONFIG_MD_RAID5=m
836# CONFIG_MD_RAID5_RESHAPE is not set
837CONFIG_MD_RAID6=m
838CONFIG_MD_MULTIPATH=m
839CONFIG_MD_FAULTY=m
840CONFIG_BLK_DEV_DM=m
841CONFIG_DM_CRYPT=m
842CONFIG_DM_SNAPSHOT=m
843CONFIG_DM_MIRROR=m
844CONFIG_DM_ZERO=m
845# CONFIG_DM_MULTIPATH is not set
846 645
847# 646#
848# Fusion MPT device support 647# Fusion MPT device support
@@ -878,9 +677,6 @@ CONFIG_NET_ETHERNET=y
878CONFIG_MII=m 677CONFIG_MII=m
879# CONFIG_SMC91X is not set 678# CONFIG_SMC91X is not set
880# CONFIG_DM9000 is not set 679# CONFIG_DM9000 is not set
881CONFIG_NET_POCKET=y
882CONFIG_DE600=m
883CONFIG_DE620=m
884 680
885# 681#
886# Ethernet (1000 Mbit) 682# Ethernet (1000 Mbit)
@@ -904,49 +700,13 @@ CONFIG_NET_RADIO=y
904# Obsolete Wireless cards support (pre-802.11) 700# Obsolete Wireless cards support (pre-802.11)
905# 701#
906CONFIG_STRIP=m 702CONFIG_STRIP=m
907CONFIG_PCMCIA_WAVELAN=m 703# CONFIG_USB_ZD1201 is not set
908CONFIG_PCMCIA_NETWAVE=m
909
910#
911# Wireless 802.11 Frequency Hopping cards support
912#
913CONFIG_PCMCIA_RAYCS=m
914
915#
916# Wireless 802.11b ISA/PCI cards support
917#
918CONFIG_HERMES=m
919CONFIG_ATMEL=m
920
921#
922# Wireless 802.11b Pcmcia/Cardbus cards support
923#
924CONFIG_PCMCIA_HERMES=m
925# CONFIG_PCMCIA_SPECTRUM is not set
926CONFIG_AIRO_CS=m
927CONFIG_PCMCIA_ATMEL=m
928CONFIG_PCMCIA_WL3501=m
929# CONFIG_HOSTAP is not set 704# CONFIG_HOSTAP is not set
930CONFIG_NET_WIRELESS=y
931
932#
933# PCMCIA network device support
934#
935CONFIG_NET_PCMCIA=y
936CONFIG_PCMCIA_3C589=m
937CONFIG_PCMCIA_3C574=m
938CONFIG_PCMCIA_FMVJ18X=m
939CONFIG_PCMCIA_PCNET=m
940CONFIG_PCMCIA_NMCLAN=m
941CONFIG_PCMCIA_SMC91C92=m
942CONFIG_PCMCIA_XIRC2PS=m
943CONFIG_PCMCIA_AXNET=m
944 705
945# 706#
946# Wan interfaces 707# Wan interfaces
947# 708#
948CONFIG_WAN=y 709CONFIG_WAN=y
949CONFIG_SYNCLINK_SYNCPPP=m
950CONFIG_HDLC=m 710CONFIG_HDLC=m
951CONFIG_HDLC_RAW=y 711CONFIG_HDLC_RAW=y
952CONFIG_HDLC_RAW_ETH=y 712CONFIG_HDLC_RAW_ETH=y
@@ -966,7 +726,6 @@ CONFIG_X25_ASY=m
966# 726#
967# CONFIG_ATM_DUMMY is not set 727# CONFIG_ATM_DUMMY is not set
968CONFIG_ATM_TCP=m 728CONFIG_ATM_TCP=m
969CONFIG_PLIP=m
970CONFIG_PPP=m 729CONFIG_PPP=m
971CONFIG_PPP_MULTILINK=y 730CONFIG_PPP_MULTILINK=y
972CONFIG_PPP_FILTER=y 731CONFIG_PPP_FILTER=y
@@ -991,114 +750,7 @@ CONFIG_NET_POLL_CONTROLLER=y
991# 750#
992# ISDN subsystem 751# ISDN subsystem
993# 752#
994CONFIG_ISDN=m 753# CONFIG_ISDN is not set
995
996#
997# Old ISDN4Linux
998#
999CONFIG_ISDN_I4L=m
1000CONFIG_ISDN_PPP=y
1001CONFIG_ISDN_PPP_VJ=y
1002CONFIG_ISDN_MPP=y
1003CONFIG_IPPP_FILTER=y
1004CONFIG_ISDN_PPP_BSDCOMP=m
1005CONFIG_ISDN_AUDIO=y
1006CONFIG_ISDN_TTY_FAX=y
1007CONFIG_ISDN_X25=y
1008
1009#
1010# ISDN feature submodules
1011#
1012CONFIG_ISDN_DRV_LOOP=m
1013CONFIG_ISDN_DIVERSION=m
1014
1015#
1016# ISDN4Linux hardware drivers
1017#
1018
1019#
1020# Passive cards
1021#
1022CONFIG_ISDN_DRV_HISAX=m
1023
1024#
1025# D-channel protocol features
1026#
1027CONFIG_HISAX_EURO=y
1028CONFIG_DE_AOC=y
1029# CONFIG_HISAX_NO_SENDCOMPLETE is not set
1030# CONFIG_HISAX_NO_LLC is not set
1031# CONFIG_HISAX_NO_KEYPAD is not set
1032CONFIG_HISAX_1TR6=y
1033CONFIG_HISAX_NI1=y
1034CONFIG_HISAX_MAX_CARDS=8
1035
1036#
1037# HiSax supported cards
1038#
1039CONFIG_HISAX_16_3=y
1040CONFIG_HISAX_S0BOX=y
1041CONFIG_HISAX_FRITZPCI=y
1042CONFIG_HISAX_AVM_A1_PCMCIA=y
1043CONFIG_HISAX_ELSA=y
1044CONFIG_HISAX_DIEHLDIVA=y
1045CONFIG_HISAX_SEDLBAUER=y
1046CONFIG_HISAX_NICCY=y
1047CONFIG_HISAX_GAZEL=y
1048CONFIG_HISAX_HFC_SX=y
1049# CONFIG_HISAX_DEBUG is not set
1050
1051#
1052# HiSax PCMCIA card service modules
1053#
1054CONFIG_HISAX_SEDLBAUER_CS=m
1055CONFIG_HISAX_ELSA_CS=m
1056CONFIG_HISAX_AVM_A1_CS=m
1057CONFIG_HISAX_TELES_CS=m
1058
1059#
1060# HiSax sub driver modules
1061#
1062CONFIG_HISAX_ST5481=m
1063CONFIG_HISAX_HFCUSB=m
1064# CONFIG_HISAX_HFC4S8S is not set
1065CONFIG_HISAX_HDLC=y
1066
1067#
1068# Active cards
1069#
1070
1071#
1072# Siemens Gigaset
1073#
1074# CONFIG_ISDN_DRV_GIGASET is not set
1075
1076#
1077# CAPI subsystem
1078#
1079CONFIG_ISDN_CAPI=m
1080CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
1081CONFIG_ISDN_CAPI_MIDDLEWARE=y
1082CONFIG_ISDN_CAPI_CAPI20=m
1083CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
1084CONFIG_ISDN_CAPI_CAPIFS=m
1085CONFIG_ISDN_CAPI_CAPIDRV=m
1086
1087#
1088# CAPI hardware drivers
1089#
1090
1091#
1092# Active AVM cards
1093#
1094CONFIG_CAPI_AVM=y
1095CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
1096CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
1097
1098#
1099# Active Eicon DIVA Server cards
1100#
1101CONFIG_CAPI_EICON=y
1102 754
1103# 755#
1104# Input device support 756# Input device support
@@ -1108,10 +760,7 @@ CONFIG_INPUT=y
1108# 760#
1109# Userland interfaces 761# Userland interfaces
1110# 762#
1111CONFIG_INPUT_MOUSEDEV=m 763# CONFIG_INPUT_MOUSEDEV is not set
1112CONFIG_INPUT_MOUSEDEV_PSAUX=y
1113CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
1114CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
1115CONFIG_INPUT_JOYDEV=m 764CONFIG_INPUT_JOYDEV=m
1116CONFIG_INPUT_TSDEV=m 765CONFIG_INPUT_TSDEV=m
1117CONFIG_INPUT_TSDEV_SCREEN_X=240 766CONFIG_INPUT_TSDEV_SCREEN_X=240
@@ -1153,11 +802,9 @@ CONFIG_JOYSTICK_SPACEORB=m
1153CONFIG_JOYSTICK_SPACEBALL=m 802CONFIG_JOYSTICK_SPACEBALL=m
1154CONFIG_JOYSTICK_STINGER=m 803CONFIG_JOYSTICK_STINGER=m
1155# CONFIG_JOYSTICK_TWIDJOY is not set 804# CONFIG_JOYSTICK_TWIDJOY is not set
1156CONFIG_JOYSTICK_DB9=m
1157CONFIG_JOYSTICK_GAMECON=m
1158CONFIG_JOYSTICK_TURBOGRAFX=m
1159CONFIG_JOYSTICK_JOYDUMP=m 805CONFIG_JOYSTICK_JOYDUMP=m
1160CONFIG_INPUT_TOUCHSCREEN=y 806CONFIG_INPUT_TOUCHSCREEN=y
807# CONFIG_TOUCHSCREEN_ADS7846 is not set
1161CONFIG_TOUCHSCREEN_GUNZE=m 808CONFIG_TOUCHSCREEN_GUNZE=m
1162# CONFIG_TOUCHSCREEN_ELO is not set 809# CONFIG_TOUCHSCREEN_ELO is not set
1163# CONFIG_TOUCHSCREEN_MTOUCH is not set 810# CONFIG_TOUCHSCREEN_MTOUCH is not set
@@ -1170,7 +817,6 @@ CONFIG_INPUT_UINPUT=m
1170# 817#
1171CONFIG_SERIO=y 818CONFIG_SERIO=y
1172CONFIG_SERIO_SERPORT=m 819CONFIG_SERIO_SERPORT=m
1173CONFIG_SERIO_PARKBD=m
1174CONFIG_SERIO_LIBPS2=y 820CONFIG_SERIO_LIBPS2=y
1175CONFIG_SERIO_RAW=m 821CONFIG_SERIO_RAW=m
1176CONFIG_GAMEPORT=m 822CONFIG_GAMEPORT=m
@@ -1183,32 +829,14 @@ CONFIG_GAMEPORT_L4=m
1183CONFIG_VT=y 829CONFIG_VT=y
1184CONFIG_VT_CONSOLE=y 830CONFIG_VT_CONSOLE=y
1185CONFIG_HW_CONSOLE=y 831CONFIG_HW_CONSOLE=y
1186CONFIG_SERIAL_NONSTANDARD=y 832# CONFIG_VT_HW_CONSOLE_BINDING is not set
1187CONFIG_COMPUTONE=m 833# CONFIG_SERIAL_NONSTANDARD is not set
1188CONFIG_ROCKETPORT=m
1189CONFIG_CYCLADES=m
1190# CONFIG_CYZ_INTR is not set
1191CONFIG_DIGIEPCA=m
1192CONFIG_MOXA_INTELLIO=m
1193CONFIG_MOXA_SMARTIO=m
1194# CONFIG_ISI is not set
1195CONFIG_SYNCLINKMP=m
1196CONFIG_N_HDLC=m
1197# CONFIG_RISCOM8 is not set
1198# CONFIG_SPECIALIX is not set
1199CONFIG_SX=m
1200CONFIG_RIO=m
1201CONFIG_RIO_OLDPCI=y
1202CONFIG_STALDRV=y
1203CONFIG_STALLION=m
1204CONFIG_ISTALLION=m
1205 834
1206# 835#
1207# Serial drivers 836# Serial drivers
1208# 837#
1209CONFIG_SERIAL_8250=y 838CONFIG_SERIAL_8250=y
1210CONFIG_SERIAL_8250_CONSOLE=y 839CONFIG_SERIAL_8250_CONSOLE=y
1211CONFIG_SERIAL_8250_CS=m
1212CONFIG_SERIAL_8250_NR_UARTS=4 840CONFIG_SERIAL_8250_NR_UARTS=4
1213CONFIG_SERIAL_8250_RUNTIME_UARTS=4 841CONFIG_SERIAL_8250_RUNTIME_UARTS=4
1214CONFIG_SERIAL_8250_EXTENDED=y 842CONFIG_SERIAL_8250_EXTENDED=y
@@ -1225,20 +853,11 @@ CONFIG_SERIAL_CORE_CONSOLE=y
1225CONFIG_UNIX98_PTYS=y 853CONFIG_UNIX98_PTYS=y
1226CONFIG_LEGACY_PTYS=y 854CONFIG_LEGACY_PTYS=y
1227CONFIG_LEGACY_PTY_COUNT=256 855CONFIG_LEGACY_PTY_COUNT=256
1228CONFIG_PRINTER=m
1229# CONFIG_LP_CONSOLE is not set
1230CONFIG_PPDEV=m
1231CONFIG_TIPAR=m
1232 856
1233# 857#
1234# IPMI 858# IPMI
1235# 859#
1236CONFIG_IPMI_HANDLER=m 860# CONFIG_IPMI_HANDLER is not set
1237# CONFIG_IPMI_PANIC_EVENT is not set
1238CONFIG_IPMI_DEVICE_INTERFACE=m
1239CONFIG_IPMI_SI=m
1240CONFIG_IPMI_WATCHDOG=m
1241CONFIG_IPMI_POWEROFF=m
1242 861
1243# 862#
1244# Watchdog Cards 863# Watchdog Cards
@@ -1255,22 +874,15 @@ CONFIG_SOFT_WATCHDOG=m
1255# USB-based Watchdog Cards 874# USB-based Watchdog Cards
1256# 875#
1257CONFIG_USBPCWATCHDOG=m 876CONFIG_USBPCWATCHDOG=m
1258CONFIG_NVRAM=m 877CONFIG_HW_RANDOM=y
1259CONFIG_DTLK=m 878# CONFIG_NVRAM is not set
1260CONFIG_R3964=m 879# CONFIG_DTLK is not set
880# CONFIG_R3964 is not set
1261 881
1262# 882#
1263# Ftape, the floppy tape device driver 883# Ftape, the floppy tape device driver
1264# 884#
1265 885# CONFIG_RAW_DRIVER is not set
1266#
1267# PCMCIA character devices
1268#
1269CONFIG_SYNCLINK_CS=m
1270# CONFIG_CARDMAN_4000 is not set
1271# CONFIG_CARDMAN_4040 is not set
1272CONFIG_RAW_DRIVER=m
1273CONFIG_MAX_RAW_DEVS=256
1274 886
1275# 887#
1276# TPM devices 888# TPM devices
@@ -1281,8 +893,8 @@ CONFIG_MAX_RAW_DEVS=256
1281# 893#
1282# I2C support 894# I2C support
1283# 895#
1284CONFIG_I2C=m 896CONFIG_I2C=y
1285CONFIG_I2C_CHARDEV=m 897CONFIG_I2C_CHARDEV=y
1286 898
1287# 899#
1288# I2C Algorithms 900# I2C Algorithms
@@ -1294,11 +906,10 @@ CONFIG_I2C_ALGOPCA=m
1294# 906#
1295# I2C Hardware Bus support 907# I2C Hardware Bus support
1296# 908#
1297CONFIG_I2C_ISA=m 909# CONFIG_I2C_OCORES is not set
1298CONFIG_I2C_PARPORT=m 910# CONFIG_I2C_PARPORT_LIGHT is not set
1299CONFIG_I2C_PARPORT_LIGHT=m 911# CONFIG_I2C_STUB is not set
1300CONFIG_I2C_STUB=m 912# CONFIG_I2C_PCA_ISA is not set
1301CONFIG_I2C_PCA_ISA=m
1302 913
1303# 914#
1304# Miscellaneous I2C Chip support 915# Miscellaneous I2C Chip support
@@ -1318,66 +929,28 @@ CONFIG_SENSORS_PCF8591=m
1318# 929#
1319# SPI support 930# SPI support
1320# 931#
1321# CONFIG_SPI is not set 932CONFIG_SPI=y
1322# CONFIG_SPI_MASTER is not set 933# CONFIG_SPI_DEBUG is not set
934CONFIG_SPI_MASTER=y
1323 935
1324# 936#
1325# Dallas's 1-wire bus 937# SPI Master Controller Drivers
1326# 938#
1327CONFIG_W1=m 939CONFIG_SPI_BITBANG=y
1328 940
1329# 941#
1330# 1-wire Bus Masters 942# SPI Protocol Masters
1331# 943#
1332# CONFIG_W1_MASTER_DS9490 is not set
1333# CONFIG_W1_MASTER_DS2482 is not set
1334 944
1335# 945#
1336# 1-wire Slaves 946# Dallas's 1-wire bus
1337# 947#
1338# CONFIG_W1_SLAVE_THERM is not set
1339# CONFIG_W1_SLAVE_SMEM is not set
1340# CONFIG_W1_SLAVE_DS2433 is not set
1341 948
1342# 949#
1343# Hardware Monitoring support 950# Hardware Monitoring support
1344# 951#
1345CONFIG_HWMON=y 952# CONFIG_HWMON is not set
1346CONFIG_HWMON_VID=m 953# CONFIG_HWMON_VID is not set
1347CONFIG_SENSORS_ADM1021=m
1348CONFIG_SENSORS_ADM1025=m
1349CONFIG_SENSORS_ADM1026=m
1350CONFIG_SENSORS_ADM1031=m
1351# CONFIG_SENSORS_ADM9240 is not set
1352CONFIG_SENSORS_ASB100=m
1353# CONFIG_SENSORS_ATXP1 is not set
1354CONFIG_SENSORS_DS1621=m
1355# CONFIG_SENSORS_F71805F is not set
1356CONFIG_SENSORS_FSCHER=m
1357# CONFIG_SENSORS_FSCPOS is not set
1358CONFIG_SENSORS_GL518SM=m
1359# CONFIG_SENSORS_GL520SM is not set
1360CONFIG_SENSORS_IT87=m
1361CONFIG_SENSORS_LM63=m
1362CONFIG_SENSORS_LM75=m
1363CONFIG_SENSORS_LM77=m
1364CONFIG_SENSORS_LM78=m
1365CONFIG_SENSORS_LM80=m
1366CONFIG_SENSORS_LM83=m
1367CONFIG_SENSORS_LM85=m
1368CONFIG_SENSORS_LM87=m
1369CONFIG_SENSORS_LM90=m
1370# CONFIG_SENSORS_LM92 is not set
1371CONFIG_SENSORS_MAX1619=m
1372CONFIG_SENSORS_PC87360=m
1373CONFIG_SENSORS_SMSC47M1=m
1374# CONFIG_SENSORS_SMSC47B397 is not set
1375CONFIG_SENSORS_W83781D=m
1376# CONFIG_SENSORS_W83792D is not set
1377CONFIG_SENSORS_W83L785TS=m
1378CONFIG_SENSORS_W83627HF=m
1379# CONFIG_SENSORS_W83627EHF is not set
1380# CONFIG_HWMON_DEBUG_CHIP is not set
1381 954
1382# 955#
1383# Misc devices 956# Misc devices
@@ -1389,9 +962,18 @@ CONFIG_SENSORS_W83627HF=m
1389# CONFIG_NEW_LEDS is not set 962# CONFIG_NEW_LEDS is not set
1390 963
1391# 964#
965# LED drivers
966#
967
968#
969# LED Triggers
970#
971
972#
1392# Multimedia devices 973# Multimedia devices
1393# 974#
1394# CONFIG_VIDEO_DEV is not set 975# CONFIG_VIDEO_DEV is not set
976CONFIG_VIDEO_V4L2=y
1395 977
1396# 978#
1397# Digital Video Broadcasting Devices 979# Digital Video Broadcasting Devices
@@ -1460,18 +1042,25 @@ CONFIG_DVB_TDA10021=m
1460CONFIG_DVB_STV0297=m 1042CONFIG_DVB_STV0297=m
1461 1043
1462# 1044#
1463# ATSC (North American/Korean Terresterial DTV) frontends 1045# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
1464# 1046#
1465# CONFIG_DVB_NXT200X is not set 1047# CONFIG_DVB_NXT200X is not set
1466# CONFIG_DVB_OR51211 is not set 1048# CONFIG_DVB_OR51211 is not set
1467# CONFIG_DVB_OR51132 is not set 1049# CONFIG_DVB_OR51132 is not set
1468# CONFIG_DVB_BCM3510 is not set 1050# CONFIG_DVB_BCM3510 is not set
1469# CONFIG_DVB_LGDT330X is not set 1051# CONFIG_DVB_LGDT330X is not set
1052
1053#
1054# Miscellaneous devices
1055#
1056CONFIG_DVB_LNBP21=m
1057# CONFIG_DVB_ISL6421 is not set
1470# CONFIG_USB_DABUSB is not set 1058# CONFIG_USB_DABUSB is not set
1471 1059
1472# 1060#
1473# Graphics support 1061# Graphics support
1474# 1062#
1063CONFIG_FIRMWARE_EDID=y
1475# CONFIG_FB is not set 1064# CONFIG_FB is not set
1476 1065
1477# 1066#
@@ -1479,6 +1068,7 @@ CONFIG_DVB_STV0297=m
1479# 1068#
1480# CONFIG_VGA_CONSOLE is not set 1069# CONFIG_VGA_CONSOLE is not set
1481CONFIG_DUMMY_CONSOLE=y 1070CONFIG_DUMMY_CONSOLE=y
1071# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1482 1072
1483# 1073#
1484# Sound 1074# Sound
@@ -1526,17 +1116,12 @@ CONFIG_SND_MPU401=m
1526CONFIG_SND_USB_AUDIO=m 1116CONFIG_SND_USB_AUDIO=m
1527 1117
1528# 1118#
1529# PCMCIA devices
1530#
1531
1532#
1533# Open Sound System 1119# Open Sound System
1534# 1120#
1535CONFIG_SOUND_PRIME=m 1121CONFIG_SOUND_PRIME=m
1536# CONFIG_OBSOLETE_OSS_DRIVER is not set 1122# CONFIG_OSS_OBSOLETE_DRIVER is not set
1537# CONFIG_SOUND_MSNDCLAS is not set 1123# CONFIG_SOUND_MSNDCLAS is not set
1538# CONFIG_SOUND_MSNDPIN is not set 1124# CONFIG_SOUND_MSNDPIN is not set
1539CONFIG_SOUND_TVMIXER=m
1540 1125
1541# 1126#
1542# USB support 1127# USB support
@@ -1544,7 +1129,7 @@ CONFIG_SOUND_TVMIXER=m
1544CONFIG_USB_ARCH_HAS_HCD=y 1129CONFIG_USB_ARCH_HAS_HCD=y
1545# CONFIG_USB_ARCH_HAS_OHCI is not set 1130# CONFIG_USB_ARCH_HAS_OHCI is not set
1546# CONFIG_USB_ARCH_HAS_EHCI is not set 1131# CONFIG_USB_ARCH_HAS_EHCI is not set
1547CONFIG_USB=m 1132CONFIG_USB=y
1548# CONFIG_USB_DEBUG is not set 1133# CONFIG_USB_DEBUG is not set
1549 1134
1550# 1135#
@@ -1561,7 +1146,6 @@ CONFIG_USB_BANDWIDTH=y
1561# 1146#
1562# CONFIG_USB_ISP116X_HCD is not set 1147# CONFIG_USB_ISP116X_HCD is not set
1563CONFIG_USB_SL811_HCD=m 1148CONFIG_USB_SL811_HCD=m
1564# CONFIG_USB_SL811_CS is not set
1565 1149
1566# 1150#
1567# USB Device Class drivers 1151# USB Device Class drivers
@@ -1580,7 +1164,6 @@ CONFIG_USB_STORAGE=m
1580# CONFIG_USB_STORAGE_DEBUG is not set 1164# CONFIG_USB_STORAGE_DEBUG is not set
1581CONFIG_USB_STORAGE_DATAFAB=y 1165CONFIG_USB_STORAGE_DATAFAB=y
1582CONFIG_USB_STORAGE_FREECOM=y 1166CONFIG_USB_STORAGE_FREECOM=y
1583CONFIG_USB_STORAGE_ISD200=y
1584CONFIG_USB_STORAGE_DPCM=y 1167CONFIG_USB_STORAGE_DPCM=y
1585CONFIG_USB_STORAGE_USBAT=y 1168CONFIG_USB_STORAGE_USBAT=y
1586CONFIG_USB_STORAGE_SDDR09=y 1169CONFIG_USB_STORAGE_SDDR09=y
@@ -1608,9 +1191,7 @@ CONFIG_USB_WACOM=m
1608# CONFIG_USB_ACECAD is not set 1191# CONFIG_USB_ACECAD is not set
1609CONFIG_USB_KBTAB=m 1192CONFIG_USB_KBTAB=m
1610CONFIG_USB_POWERMATE=m 1193CONFIG_USB_POWERMATE=m
1611CONFIG_USB_MTOUCH=m 1194# CONFIG_USB_TOUCHSCREEN is not set
1612# CONFIG_USB_ITMTOUCH is not set
1613CONFIG_USB_EGALAX=m
1614# CONFIG_USB_YEALINK is not set 1195# CONFIG_USB_YEALINK is not set
1615CONFIG_USB_XPAD=m 1196CONFIG_USB_XPAD=m
1616CONFIG_USB_ATI_REMOTE=m 1197CONFIG_USB_ATI_REMOTE=m
@@ -1640,13 +1221,11 @@ CONFIG_USB_NET_NET1080=m
1640# CONFIG_USB_NET_RNDIS_HOST is not set 1221# CONFIG_USB_NET_RNDIS_HOST is not set
1641# CONFIG_USB_NET_CDC_SUBSET is not set 1222# CONFIG_USB_NET_CDC_SUBSET is not set
1642CONFIG_USB_NET_ZAURUS=m 1223CONFIG_USB_NET_ZAURUS=m
1643# CONFIG_USB_ZD1201 is not set
1644CONFIG_USB_MON=y 1224CONFIG_USB_MON=y
1645 1225
1646# 1226#
1647# USB port drivers 1227# USB port drivers
1648# 1228#
1649CONFIG_USB_USS720=m
1650 1229
1651# 1230#
1652# USB Serial Converter support 1231# USB Serial Converter support
@@ -1654,7 +1233,7 @@ CONFIG_USB_USS720=m
1654CONFIG_USB_SERIAL=m 1233CONFIG_USB_SERIAL=m
1655CONFIG_USB_SERIAL_GENERIC=y 1234CONFIG_USB_SERIAL_GENERIC=y
1656# CONFIG_USB_SERIAL_AIRPRIME is not set 1235# CONFIG_USB_SERIAL_AIRPRIME is not set
1657# CONFIG_USB_SERIAL_ANYDATA is not set 1236# CONFIG_USB_SERIAL_ARK3116 is not set
1658CONFIG_USB_SERIAL_BELKIN=m 1237CONFIG_USB_SERIAL_BELKIN=m
1659CONFIG_USB_SERIAL_WHITEHEAT=m 1238CONFIG_USB_SERIAL_WHITEHEAT=m
1660CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 1239CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -1662,6 +1241,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1662CONFIG_USB_SERIAL_CYPRESS_M8=m 1241CONFIG_USB_SERIAL_CYPRESS_M8=m
1663CONFIG_USB_SERIAL_EMPEG=m 1242CONFIG_USB_SERIAL_EMPEG=m
1664CONFIG_USB_SERIAL_FTDI_SIO=m 1243CONFIG_USB_SERIAL_FTDI_SIO=m
1244# CONFIG_USB_SERIAL_FUNSOFT is not set
1665CONFIG_USB_SERIAL_VISOR=m 1245CONFIG_USB_SERIAL_VISOR=m
1666CONFIG_USB_SERIAL_IPAQ=m 1246CONFIG_USB_SERIAL_IPAQ=m
1667CONFIG_USB_SERIAL_IR=m 1247CONFIG_USB_SERIAL_IR=m
@@ -1691,9 +1271,11 @@ CONFIG_USB_SERIAL_PL2303=m
1691# CONFIG_USB_SERIAL_HP4X is not set 1271# CONFIG_USB_SERIAL_HP4X is not set
1692CONFIG_USB_SERIAL_SAFE=m 1272CONFIG_USB_SERIAL_SAFE=m
1693# CONFIG_USB_SERIAL_SAFE_PADDED is not set 1273# CONFIG_USB_SERIAL_SAFE_PADDED is not set
1274# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1694# CONFIG_USB_SERIAL_TI is not set 1275# CONFIG_USB_SERIAL_TI is not set
1695CONFIG_USB_SERIAL_CYBERJACK=m 1276CONFIG_USB_SERIAL_CYBERJACK=m
1696CONFIG_USB_SERIAL_XIRCOM=m 1277CONFIG_USB_SERIAL_XIRCOM=m
1278# CONFIG_USB_SERIAL_OPTION is not set
1697CONFIG_USB_SERIAL_OMNINET=m 1279CONFIG_USB_SERIAL_OMNINET=m
1698CONFIG_USB_EZUSB=y 1280CONFIG_USB_EZUSB=y
1699 1281
@@ -1707,10 +1289,12 @@ CONFIG_USB_RIO500=m
1707CONFIG_USB_LEGOTOWER=m 1289CONFIG_USB_LEGOTOWER=m
1708CONFIG_USB_LCD=m 1290CONFIG_USB_LCD=m
1709CONFIG_USB_LED=m 1291CONFIG_USB_LED=m
1292# CONFIG_USB_CYPRESS_CY7C63 is not set
1710CONFIG_USB_CYTHERM=m 1293CONFIG_USB_CYTHERM=m
1711CONFIG_USB_PHIDGETKIT=m 1294CONFIG_USB_PHIDGETKIT=m
1712CONFIG_USB_PHIDGETSERVO=m 1295CONFIG_USB_PHIDGETSERVO=m
1713# CONFIG_USB_IDMOUSE is not set 1296# CONFIG_USB_IDMOUSE is not set
1297# CONFIG_USB_APPLEDISPLAY is not set
1714# CONFIG_USB_LD is not set 1298# CONFIG_USB_LD is not set
1715CONFIG_USB_TEST=m 1299CONFIG_USB_TEST=m
1716 1300
@@ -1787,7 +1371,6 @@ CONFIG_JFS_POSIX_ACL=y
1787CONFIG_JFS_STATISTICS=y 1371CONFIG_JFS_STATISTICS=y
1788CONFIG_FS_POSIX_ACL=y 1372CONFIG_FS_POSIX_ACL=y
1789CONFIG_XFS_FS=m 1373CONFIG_XFS_FS=m
1790CONFIG_XFS_EXPORT=y
1791CONFIG_XFS_QUOTA=y 1374CONFIG_XFS_QUOTA=y
1792CONFIG_XFS_SECURITY=y 1375CONFIG_XFS_SECURITY=y
1793CONFIG_XFS_POSIX_ACL=y 1376CONFIG_XFS_POSIX_ACL=y
@@ -1796,6 +1379,7 @@ CONFIG_XFS_RT=y
1796CONFIG_MINIX_FS=m 1379CONFIG_MINIX_FS=m
1797CONFIG_ROMFS_FS=m 1380CONFIG_ROMFS_FS=m
1798CONFIG_INOTIFY=y 1381CONFIG_INOTIFY=y
1382CONFIG_INOTIFY_USER=y
1799CONFIG_QUOTA=y 1383CONFIG_QUOTA=y
1800CONFIG_QFMT_V1=m 1384CONFIG_QFMT_V1=m
1801CONFIG_QFMT_V2=m 1385CONFIG_QFMT_V2=m
@@ -1856,6 +1440,7 @@ CONFIG_JFFS2_FS=m
1856CONFIG_JFFS2_FS_DEBUG=0 1440CONFIG_JFFS2_FS_DEBUG=0
1857CONFIG_JFFS2_FS_WRITEBUFFER=y 1441CONFIG_JFFS2_FS_WRITEBUFFER=y
1858# CONFIG_JFFS2_SUMMARY is not set 1442# CONFIG_JFFS2_SUMMARY is not set
1443# CONFIG_JFFS2_FS_XATTR is not set
1859# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 1444# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1860CONFIG_JFFS2_ZLIB=y 1445CONFIG_JFFS2_ZLIB=y
1861CONFIG_JFFS2_RTIME=y 1446CONFIG_JFFS2_RTIME=y
@@ -1866,11 +1451,13 @@ CONFIG_HPFS_FS=m
1866CONFIG_QNX4FS_FS=m 1451CONFIG_QNX4FS_FS=m
1867CONFIG_SYSV_FS=m 1452CONFIG_SYSV_FS=m
1868CONFIG_UFS_FS=m 1453CONFIG_UFS_FS=m
1454# CONFIG_UFS_FS_WRITE is not set
1455# CONFIG_UFS_DEBUG is not set
1869 1456
1870# 1457#
1871# Network File Systems 1458# Network File Systems
1872# 1459#
1873CONFIG_NFS_FS=m 1460CONFIG_NFS_FS=y
1874CONFIG_NFS_V3=y 1461CONFIG_NFS_V3=y
1875# CONFIG_NFS_V3_ACL is not set 1462# CONFIG_NFS_V3_ACL is not set
1876CONFIG_NFS_V4=y 1463CONFIG_NFS_V4=y
@@ -1880,19 +1467,22 @@ CONFIG_NFSD_V3=y
1880# CONFIG_NFSD_V3_ACL is not set 1467# CONFIG_NFSD_V3_ACL is not set
1881CONFIG_NFSD_V4=y 1468CONFIG_NFSD_V4=y
1882CONFIG_NFSD_TCP=y 1469CONFIG_NFSD_TCP=y
1883CONFIG_LOCKD=m 1470CONFIG_ROOT_NFS=y
1471CONFIG_LOCKD=y
1884CONFIG_LOCKD_V4=y 1472CONFIG_LOCKD_V4=y
1885CONFIG_EXPORTFS=m 1473CONFIG_EXPORTFS=m
1886CONFIG_NFS_COMMON=y 1474CONFIG_NFS_COMMON=y
1887CONFIG_SUNRPC=m 1475CONFIG_SUNRPC=y
1888CONFIG_SUNRPC_GSS=m 1476CONFIG_SUNRPC_GSS=y
1889CONFIG_RPCSEC_GSS_KRB5=m 1477CONFIG_RPCSEC_GSS_KRB5=y
1890CONFIG_RPCSEC_GSS_SPKM3=m 1478CONFIG_RPCSEC_GSS_SPKM3=m
1891CONFIG_SMB_FS=m 1479CONFIG_SMB_FS=m
1892# CONFIG_SMB_NLS_DEFAULT is not set 1480# CONFIG_SMB_NLS_DEFAULT is not set
1893CONFIG_CIFS=m 1481CONFIG_CIFS=m
1894# CONFIG_CIFS_STATS is not set 1482# CONFIG_CIFS_STATS is not set
1483# CONFIG_CIFS_WEAK_PW_HASH is not set
1895# CONFIG_CIFS_XATTR is not set 1484# CONFIG_CIFS_XATTR is not set
1485# CONFIG_CIFS_DEBUG2 is not set
1896# CONFIG_CIFS_EXPERIMENTAL is not set 1486# CONFIG_CIFS_EXPERIMENTAL is not set
1897CONFIG_NCP_FS=m 1487CONFIG_NCP_FS=m
1898CONFIG_NCPFS_PACKET_SIGNING=y 1488CONFIG_NCPFS_PACKET_SIGNING=y
@@ -1940,7 +1530,7 @@ CONFIG_SUN_PARTITION=y
1940# 1530#
1941# Native Language Support 1531# Native Language Support
1942# 1532#
1943CONFIG_NLS=y 1533CONFIG_NLS=m
1944CONFIG_NLS_DEFAULT="cp437" 1534CONFIG_NLS_DEFAULT="cp437"
1945CONFIG_NLS_CODEPAGE_437=m 1535CONFIG_NLS_CODEPAGE_437=m
1946CONFIG_NLS_CODEPAGE_737=m 1536CONFIG_NLS_CODEPAGE_737=m
@@ -1984,26 +1574,29 @@ CONFIG_NLS_UTF8=m
1984# 1574#
1985# Profiling support 1575# Profiling support
1986# 1576#
1987CONFIG_PROFILING=y 1577# CONFIG_PROFILING is not set
1988CONFIG_OPROFILE=m
1989 1578
1990# 1579#
1991# Kernel hacking 1580# Kernel hacking
1992# 1581#
1993# CONFIG_PRINTK_TIME is not set 1582# CONFIG_PRINTK_TIME is not set
1994CONFIG_MAGIC_SYSRQ=y 1583CONFIG_MAGIC_SYSRQ=y
1584# CONFIG_UNUSED_SYMBOLS is not set
1995CONFIG_DEBUG_KERNEL=y 1585CONFIG_DEBUG_KERNEL=y
1996CONFIG_LOG_BUF_SHIFT=14 1586CONFIG_LOG_BUF_SHIFT=14
1997CONFIG_DETECT_SOFTLOCKUP=y 1587CONFIG_DETECT_SOFTLOCKUP=y
1998# CONFIG_SCHEDSTATS is not set 1588# CONFIG_SCHEDSTATS is not set
1999# CONFIG_DEBUG_SLAB is not set 1589# CONFIG_DEBUG_SLAB is not set
2000CONFIG_DEBUG_PREEMPT=y 1590# CONFIG_DEBUG_RT_MUTEXES is not set
2001CONFIG_DEBUG_MUTEXES=y 1591# CONFIG_RT_MUTEX_TESTER is not set
2002# CONFIG_DEBUG_SPINLOCK is not set 1592# CONFIG_DEBUG_SPINLOCK is not set
1593CONFIG_DEBUG_MUTEXES=y
1594# CONFIG_DEBUG_RWSEMS is not set
2003# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1595# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1596# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
2004# CONFIG_DEBUG_KOBJECT is not set 1597# CONFIG_DEBUG_KOBJECT is not set
2005# CONFIG_DEBUG_BUGVERBOSE is not set 1598# CONFIG_DEBUG_BUGVERBOSE is not set
2006CONFIG_DEBUG_INFO=y 1599# CONFIG_DEBUG_INFO is not set
2007# CONFIG_DEBUG_FS is not set 1600# CONFIG_DEBUG_FS is not set
2008# CONFIG_DEBUG_VM is not set 1601# CONFIG_DEBUG_VM is not set
2009CONFIG_FRAME_POINTER=y 1602CONFIG_FRAME_POINTER=y
@@ -2013,8 +1606,7 @@ CONFIG_FORCED_INLINING=y
2013# CONFIG_DEBUG_USER is not set 1606# CONFIG_DEBUG_USER is not set
2014# CONFIG_DEBUG_WAITQ is not set 1607# CONFIG_DEBUG_WAITQ is not set
2015# CONFIG_DEBUG_ERRORS is not set 1608# CONFIG_DEBUG_ERRORS is not set
2016CONFIG_DEBUG_LL=y 1609# CONFIG_DEBUG_LL is not set
2017# CONFIG_DEBUG_ICEDCC is not set
2018 1610
2019# 1611#
2020# Security options 1612# Security options
@@ -2039,7 +1631,7 @@ CONFIG_CRYPTO_SHA256=m
2039CONFIG_CRYPTO_SHA512=m 1631CONFIG_CRYPTO_SHA512=m
2040CONFIG_CRYPTO_WP512=m 1632CONFIG_CRYPTO_WP512=m
2041# CONFIG_CRYPTO_TGR192 is not set 1633# CONFIG_CRYPTO_TGR192 is not set
2042CONFIG_CRYPTO_DES=m 1634CONFIG_CRYPTO_DES=y
2043CONFIG_CRYPTO_BLOWFISH=m 1635CONFIG_CRYPTO_BLOWFISH=m
2044CONFIG_CRYPTO_TWOFISH=m 1636CONFIG_CRYPTO_TWOFISH=m
2045CONFIG_CRYPTO_SERPENT=m 1637CONFIG_CRYPTO_SERPENT=m
@@ -2068,5 +1660,6 @@ CONFIG_CRC32=y
2068CONFIG_LIBCRC32C=m 1660CONFIG_LIBCRC32C=m
2069CONFIG_ZLIB_INFLATE=y 1661CONFIG_ZLIB_INFLATE=y
2070CONFIG_ZLIB_DEFLATE=m 1662CONFIG_ZLIB_DEFLATE=m
2071CONFIG_REED_SOLOMON=m 1663CONFIG_TEXTSEARCH=y
2072CONFIG_REED_SOLOMON_DEC16=y 1664CONFIG_TEXTSEARCH_KMP=m
1665CONFIG_PLIST=y
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index b4171dd43df0..bbd138be6a70 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -81,9 +81,17 @@ config SMDK2440_CPU2442
81 depends on ARCH_S3C2440 81 depends on ARCH_S3C2440
82 select CPU_S3C2442 82 select CPU_S3C2442
83 83
84config MACH_S3C2413
85 bool
86 help
87 Internal node for S3C2413 verison of SMDK2413, so that
88 machine_is_s3c2413() will work when MACH_SMDK2413 is
89 selected
90
84config MACH_SMDK2413 91config MACH_SMDK2413
85 bool "SMDK2413" 92 bool "SMDK2413"
86 select CPU_S3C2412 93 select CPU_S3C2412
94 select MACH_S3C2413
87 select MACH_SMDK 95 select MACH_SMDK
88 help 96 help
89 Say Y here if you are using an SMDK2413 97 Say Y here if you are using an SMDK2413
diff --git a/arch/arm/mach-s3c2410/irq.h b/arch/arm/mach-s3c2410/irq.h
index f7cc4c983de5..842a9f42c97b 100644
--- a/arch/arm/mach-s3c2410/irq.h
+++ b/arch/arm/mach-s3c2410/irq.h
@@ -100,5 +100,10 @@ s3c_irqsub_ack(unsigned int irqno, unsigned int parentmask, unsigned int group)
100 100
101/* exported for use in arch/arm/mach-s3c2410 */ 101/* exported for use in arch/arm/mach-s3c2410 */
102 102
103#ifdef CONFIG_PM
103extern int s3c_irq_wake(unsigned int irqno, unsigned int state); 104extern int s3c_irq_wake(unsigned int irqno, unsigned int state);
105#else
106#define s3c_irq_wake NULL
107#endif
108
104extern int s3c_irqext_type(unsigned int irq, unsigned int type); 109extern int s3c_irqext_type(unsigned int irq, unsigned int type);
diff --git a/arch/arm/mach-s3c2410/s3c2412.c b/arch/arm/mach-s3c2410/s3c2412.c
index e24ffd5e478b..2d163f7600be 100644
--- a/arch/arm/mach-s3c2410/s3c2412.c
+++ b/arch/arm/mach-s3c2410/s3c2412.c
@@ -35,11 +35,15 @@
35#include <asm/mach/irq.h> 35#include <asm/mach/irq.h>
36 36
37#include <asm/hardware.h> 37#include <asm/hardware.h>
38#include <asm/proc-fns.h>
38#include <asm/io.h> 39#include <asm/io.h>
39#include <asm/irq.h> 40#include <asm/irq.h>
40 41
42#include <asm/arch/idle.h>
43
41#include <asm/arch/regs-clock.h> 44#include <asm/arch/regs-clock.h>
42#include <asm/arch/regs-serial.h> 45#include <asm/arch/regs-serial.h>
46#include <asm/arch/regs-power.h>
43#include <asm/arch/regs-gpio.h> 47#include <asm/arch/regs-gpio.h>
44#include <asm/arch/regs-gpioj.h> 48#include <asm/arch/regs-gpioj.h>
45#include <asm/arch/regs-dsc.h> 49#include <asm/arch/regs-dsc.h>
@@ -75,6 +79,27 @@ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no)
75 s3c_device_nand.name = "s3c2412-nand"; 79 s3c_device_nand.name = "s3c2412-nand";
76} 80}
77 81
82/* s3c2412_idle
83 *
84 * use the standard idle call by ensuring the idle mode
85 * in power config, then issuing the idle co-processor
86 * instruction
87*/
88
89static void s3c2412_idle(void)
90{
91 unsigned long tmp;
92
93 /* ensure our idle mode is to go to idle */
94
95 tmp = __raw_readl(S3C2412_PWRCFG);
96 tmp &= ~S3C2412_PWRCFG_STANDBYWFI_MASK;
97 tmp |= S3C2412_PWRCFG_STANDBYWFI_IDLE;
98 __raw_writel(tmp, S3C2412_PWRCFG);
99
100 cpu_do_idle();
101}
102
78/* s3c2412_map_io 103/* s3c2412_map_io
79 * 104 *
80 * register the standard cpu IO areas, and any passed in from the 105 * register the standard cpu IO areas, and any passed in from the
@@ -87,6 +112,10 @@ void __init s3c2412_map_io(struct map_desc *mach_desc, int mach_size)
87 112
88 s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10; 113 s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
89 114
115 /* set our idle function */
116
117 s3c24xx_idle = s3c2412_idle;
118
90 /* register our io-tables */ 119 /* register our io-tables */
91 120
92 iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc)); 121 iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc));
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 561bff73a036..3ca0c92e98a2 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -644,7 +644,7 @@ __80219_proc_info:
644 .type __8032x_proc_info,#object 644 .type __8032x_proc_info,#object
645__8032x_proc_info: 645__8032x_proc_info:
646 .long 0x69052420 646 .long 0x69052420
647 .long 0xffffffe0 647 .long 0xfffff7e0
648 .long PMD_TYPE_SECT | \ 648 .long PMD_TYPE_SECT | \
649 PMD_SECT_BUFFERABLE | \ 649 PMD_SECT_BUFFERABLE | \
650 PMD_SECT_CACHEABLE | \ 650 PMD_SECT_CACHEABLE | \
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 37a7d2eaf4a0..87f9f60b803b 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -209,6 +209,10 @@ ENTRY(ret_from_fork)
209 GET_THREAD_INFO(%ebp) 209 GET_THREAD_INFO(%ebp)
210 popl %eax 210 popl %eax
211 CFI_ADJUST_CFA_OFFSET -4 211 CFI_ADJUST_CFA_OFFSET -4
212 pushl $0x0202 # Reset kernel eflags
213 CFI_ADJUST_CFA_OFFSET 4
214 popfl
215 CFI_ADJUST_CFA_OFFSET -4
212 jmp syscall_exit 216 jmp syscall_exit
213 CFI_ENDPROC 217 CFI_ENDPROC
214 218
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 345ffb7d904d..f1682206d304 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -956,6 +956,38 @@ efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg)
956 return 0; 956 return 0;
957} 957}
958 958
959 /*
960 * This function checks if the entire range <start,end> is mapped with type.
961 *
962 * Note: this function only works correct if the e820 table is sorted and
963 * not-overlapping, which is the case
964 */
965int __init
966e820_all_mapped(unsigned long s, unsigned long e, unsigned type)
967{
968 u64 start = s;
969 u64 end = e;
970 int i;
971 for (i = 0; i < e820.nr_map; i++) {
972 struct e820entry *ei = &e820.map[i];
973 if (type && ei->type != type)
974 continue;
975 /* is the region (part) in overlap with the current region ?*/
976 if (ei->addr >= end || ei->addr + ei->size <= start)
977 continue;
978 /* if the region is at the beginning of <start,end> we move
979 * start to the end of the region since it's ok until there
980 */
981 if (ei->addr <= start)
982 start = ei->addr + ei->size;
983 /* if start is now at or beyond end, we're done, full
984 * coverage */
985 if (start >= end)
986 return 1; /* we're done */
987 }
988 return 0;
989}
990
959/* 991/*
960 * Find the highest page frame number we have available 992 * Find the highest page frame number we have available
961 */ 993 */
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index c8c1df8ff2b4..5f8dc8a21bd7 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -337,6 +337,8 @@ static int __init ppro_init(char ** cpu_type)
337 337
338 if (cpu_model == 14) 338 if (cpu_model == 14)
339 *cpu_type = "i386/core"; 339 *cpu_type = "i386/core";
340 else if (cpu_model == 15)
341 *cpu_type = "i386/core_2";
340 else if (cpu_model > 0xd) 342 else if (cpu_model > 0xd)
341 return 0; 343 return 0;
342 else if (cpu_model == 9) { 344 else if (cpu_model == 9) {
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c
index 1220dd828ce3..0a362e3aeac5 100644
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
@@ -237,11 +237,6 @@ char * __devinit pcibios_setup(char *str)
237 pci_probe &= ~PCI_PROBE_MMCONF; 237 pci_probe &= ~PCI_PROBE_MMCONF;
238 return NULL; 238 return NULL;
239 } 239 }
240 /* override DMI blacklist */
241 else if (!strcmp(str, "mmconf")) {
242 pci_probe |= PCI_PROBE_MMCONF_FORCE;
243 return NULL;
244 }
245#endif 240#endif
246 else if (!strcmp(str, "noacpi")) { 241 else if (!strcmp(str, "noacpi")) {
247 acpi_noirq_set(); 242 acpi_noirq_set();
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index ef5a2faa7d82..972180f738d9 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -12,7 +12,6 @@
12#include <linux/pci.h> 12#include <linux/pci.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/acpi.h> 14#include <linux/acpi.h>
15#include <linux/dmi.h>
16#include <asm/e820.h> 15#include <asm/e820.h>
17#include "pci.h" 16#include "pci.h"
18 17
@@ -188,31 +187,9 @@ static __init void unreachable_devices(void)
188 } 187 }
189} 188}
190 189
191static int disable_mcfg(struct dmi_system_id *d)
192{
193 printk("PCI: %s detected. Disabling MCFG.\n", d->ident);
194 pci_probe &= ~PCI_PROBE_MMCONF;
195 return 0;
196}
197
198static struct dmi_system_id __initdata dmi_bad_mcfg[] = {
199 /* Has broken MCFG table that makes the system hang when used */
200 {
201 .callback = disable_mcfg,
202 .ident = "Intel D3C5105 SDV",
203 .matches = {
204 DMI_MATCH(DMI_BIOS_VENDOR, "Intel"),
205 DMI_MATCH(DMI_BOARD_NAME, "D26928"),
206 },
207 },
208 {}
209};
210
211void __init pci_mmcfg_init(void) 190void __init pci_mmcfg_init(void)
212{ 191{
213 dmi_check_system(dmi_bad_mcfg); 192 if ((pci_probe & PCI_PROBE_MMCONF) == 0)
214
215 if ((pci_probe & (PCI_PROBE_MMCONF_FORCE|PCI_PROBE_MMCONF)) == 0)
216 return; 193 return;
217 194
218 acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg); 195 acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg);
@@ -221,6 +198,15 @@ void __init pci_mmcfg_init(void)
221 (pci_mmcfg_config[0].base_address == 0)) 198 (pci_mmcfg_config[0].base_address == 0))
222 return; 199 return;
223 200
201 if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
202 pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
203 E820_RESERVED)) {
204 printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
205 pci_mmcfg_config[0].base_address);
206 printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
207 return;
208 }
209
224 printk(KERN_INFO "PCI: Using MMCONFIG\n"); 210 printk(KERN_INFO "PCI: Using MMCONFIG\n");
225 raw_pci_ops = &pci_mmcfg; 211 raw_pci_ops = &pci_mmcfg;
226 pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; 212 pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h
index 49a849b3a241..bf4e79335388 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/i386/pci/pci.h
@@ -16,8 +16,7 @@
16#define PCI_PROBE_CONF1 0x0002 16#define PCI_PROBE_CONF1 0x0002
17#define PCI_PROBE_CONF2 0x0004 17#define PCI_PROBE_CONF2 0x0004
18#define PCI_PROBE_MMCONF 0x0008 18#define PCI_PROBE_MMCONF 0x0008
19#define PCI_PROBE_MMCONF_FORCE 0x0010 19#define PCI_PROBE_MASK 0x000f
20#define PCI_PROBE_MASK 0x00ff
21 20
22#define PCI_NO_SORT 0x0100 21#define PCI_NO_SORT 0x0100
23#define PCI_BIOS_SORT 0x0200 22#define PCI_BIOS_SORT 0x0200
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index e028a2ecb8a3..6fd9e7acec29 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc6 3# Linux kernel version: 2.6.18-rc6
4# Thu Jun 22 15:28:36 2006 4# Sun Sep 10 10:20:32 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -35,6 +36,7 @@ CONFIG_PPC_STD_MMU=y
35CONFIG_VIRT_CPU_ACCOUNTING=y 36CONFIG_VIRT_CPU_ACCOUNTING=y
36CONFIG_SMP=y 37CONFIG_SMP=y
37CONFIG_NR_CPUS=4 38CONFIG_NR_CPUS=4
39CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
38 40
39# 41#
40# Code maturity level options 42# Code maturity level options
@@ -52,6 +54,7 @@ CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
53# CONFIG_POSIX_MQUEUE is not set 55# CONFIG_POSIX_MQUEUE is not set
54# CONFIG_BSD_PROCESS_ACCT is not set 56# CONFIG_BSD_PROCESS_ACCT is not set
57# CONFIG_TASKSTATS is not set
55CONFIG_SYSCTL=y 58CONFIG_SYSCTL=y
56# CONFIG_AUDIT is not set 59# CONFIG_AUDIT is not set
57CONFIG_IKCONFIG=y 60CONFIG_IKCONFIG=y
@@ -69,10 +72,12 @@ CONFIG_PRINTK=y
69CONFIG_BUG=y 72CONFIG_BUG=y
70CONFIG_ELF_CORE=y 73CONFIG_ELF_CORE=y
71CONFIG_BASE_FULL=y 74CONFIG_BASE_FULL=y
75CONFIG_RT_MUTEXES=y
72CONFIG_FUTEX=y 76CONFIG_FUTEX=y
73CONFIG_EPOLL=y 77CONFIG_EPOLL=y
74CONFIG_SHMEM=y 78CONFIG_SHMEM=y
75CONFIG_SLAB=y 79CONFIG_SLAB=y
80CONFIG_VM_EVENT_COUNTERS=y
76# CONFIG_TINY_SHMEM is not set 81# CONFIG_TINY_SHMEM is not set
77CONFIG_BASE_SMALL=0 82CONFIG_BASE_SMALL=0
78# CONFIG_SLOB is not set 83# CONFIG_SLOB is not set
@@ -119,7 +124,7 @@ CONFIG_PPC_MULTIPLATFORM=y
119CONFIG_PPC_CELL=y 124CONFIG_PPC_CELL=y
120CONFIG_PPC_CELL_NATIVE=y 125CONFIG_PPC_CELL_NATIVE=y
121CONFIG_PPC_IBM_CELL_BLADE=y 126CONFIG_PPC_IBM_CELL_BLADE=y
122CONFIG_PPC_SYSTEMSIM=y 127CONFIG_UDBG_RTAS_CONSOLE=y
123# CONFIG_U3_DART is not set 128# CONFIG_U3_DART is not set
124CONFIG_PPC_RTAS=y 129CONFIG_PPC_RTAS=y
125# CONFIG_RTAS_ERROR_LOGGING is not set 130# CONFIG_RTAS_ERROR_LOGGING is not set
@@ -130,6 +135,7 @@ CONFIG_MMIO_NVRAM=y
130# CONFIG_PPC_970_NAP is not set 135# CONFIG_PPC_970_NAP is not set
131# CONFIG_CPU_FREQ is not set 136# CONFIG_CPU_FREQ is not set
132# CONFIG_WANT_EARLY_SERIAL is not set 137# CONFIG_WANT_EARLY_SERIAL is not set
138# CONFIG_MPIC is not set
133 139
134# 140#
135# Cell Broadband Engine options 141# Cell Broadband Engine options
@@ -154,6 +160,7 @@ CONFIG_BINFMT_ELF=y
154CONFIG_BINFMT_MISC=m 160CONFIG_BINFMT_MISC=m
155CONFIG_FORCE_MAX_ZONEORDER=13 161CONFIG_FORCE_MAX_ZONEORDER=13
156# CONFIG_IOMMU_VMERGE is not set 162# CONFIG_IOMMU_VMERGE is not set
163CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
157CONFIG_KEXEC=y 164CONFIG_KEXEC=y
158# CONFIG_CRASH_DUMP is not set 165# CONFIG_CRASH_DUMP is not set
159CONFIG_IRQ_ALL_CPUS=y 166CONFIG_IRQ_ALL_CPUS=y
@@ -173,6 +180,7 @@ CONFIG_SPARSEMEM_EXTREME=y
173CONFIG_MEMORY_HOTPLUG=y 180CONFIG_MEMORY_HOTPLUG=y
174CONFIG_SPLIT_PTLOCK_CPUS=4 181CONFIG_SPLIT_PTLOCK_CPUS=4
175CONFIG_MIGRATION=y 182CONFIG_MIGRATION=y
183CONFIG_RESOURCES_64BIT=y
176CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 184CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
177CONFIG_ARCH_MEMORY_PROBE=y 185CONFIG_ARCH_MEMORY_PROBE=y
178# CONFIG_PPC_64K_PAGES is not set 186# CONFIG_PPC_64K_PAGES is not set
@@ -187,6 +195,7 @@ CONFIG_ISA_DMA_API=y
187# Bus options 195# Bus options
188# 196#
189CONFIG_GENERIC_ISA_DMA=y 197CONFIG_GENERIC_ISA_DMA=y
198# CONFIG_MPIC_WEIRD is not set
190# CONFIG_PPC_I8259 is not set 199# CONFIG_PPC_I8259 is not set
191# CONFIG_PPC_INDIRECT_PCI is not set 200# CONFIG_PPC_INDIRECT_PCI is not set
192CONFIG_PCI=y 201CONFIG_PCI=y
@@ -235,6 +244,8 @@ CONFIG_SYN_COOKIES=y
235# CONFIG_INET_IPCOMP is not set 244# CONFIG_INET_IPCOMP is not set
236# CONFIG_INET_XFRM_TUNNEL is not set 245# CONFIG_INET_XFRM_TUNNEL is not set
237CONFIG_INET_TUNNEL=y 246CONFIG_INET_TUNNEL=y
247CONFIG_INET_XFRM_MODE_TRANSPORT=y
248CONFIG_INET_XFRM_MODE_TUNNEL=y
238CONFIG_INET_DIAG=y 249CONFIG_INET_DIAG=y
239CONFIG_INET_TCP_DIAG=y 250CONFIG_INET_TCP_DIAG=y
240# CONFIG_TCP_CONG_ADVANCED is not set 251# CONFIG_TCP_CONG_ADVANCED is not set
@@ -252,7 +263,10 @@ CONFIG_INET6_ESP=m
252CONFIG_INET6_IPCOMP=m 263CONFIG_INET6_IPCOMP=m
253CONFIG_INET6_XFRM_TUNNEL=m 264CONFIG_INET6_XFRM_TUNNEL=m
254CONFIG_INET6_TUNNEL=m 265CONFIG_INET6_TUNNEL=m
266CONFIG_INET6_XFRM_MODE_TRANSPORT=y
267CONFIG_INET6_XFRM_MODE_TUNNEL=y
255CONFIG_IPV6_TUNNEL=m 268CONFIG_IPV6_TUNNEL=m
269# CONFIG_NETWORK_SECMARK is not set
256CONFIG_NETFILTER=y 270CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 271# CONFIG_NETFILTER_DEBUG is not set
258 272
@@ -277,6 +291,7 @@ CONFIG_IP_NF_TFTP=m
277CONFIG_IP_NF_AMANDA=m 291CONFIG_IP_NF_AMANDA=m
278# CONFIG_IP_NF_PPTP is not set 292# CONFIG_IP_NF_PPTP is not set
279# CONFIG_IP_NF_H323 is not set 293# CONFIG_IP_NF_H323 is not set
294# CONFIG_IP_NF_SIP is not set
280CONFIG_IP_NF_QUEUE=m 295CONFIG_IP_NF_QUEUE=m
281 296
282# 297#
@@ -336,6 +351,7 @@ CONFIG_STANDALONE=y
336CONFIG_PREVENT_FIRMWARE_BUILD=y 351CONFIG_PREVENT_FIRMWARE_BUILD=y
337CONFIG_FW_LOADER=y 352CONFIG_FW_LOADER=y
338# CONFIG_DEBUG_DRIVER is not set 353# CONFIG_DEBUG_DRIVER is not set
354# CONFIG_SYS_HYPERVISOR is not set
339 355
340# 356#
341# Connector - unified userspace <-> kernelspace linker 357# Connector - unified userspace <-> kernelspace linker
@@ -372,6 +388,7 @@ CONFIG_BLK_DEV_LOOP=y
372CONFIG_BLK_DEV_RAM=y 388CONFIG_BLK_DEV_RAM=y
373CONFIG_BLK_DEV_RAM_COUNT=16 389CONFIG_BLK_DEV_RAM_COUNT=16
374CONFIG_BLK_DEV_RAM_SIZE=131072 390CONFIG_BLK_DEV_RAM_SIZE=131072
391CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
375CONFIG_BLK_DEV_INITRD=y 392CONFIG_BLK_DEV_INITRD=y
376# CONFIG_CDROM_PKTCDVD is not set 393# CONFIG_CDROM_PKTCDVD is not set
377# CONFIG_ATA_OVER_ETH is not set 394# CONFIG_ATA_OVER_ETH is not set
@@ -449,8 +466,7 @@ CONFIG_MD_LINEAR=m
449CONFIG_MD_RAID0=m 466CONFIG_MD_RAID0=m
450CONFIG_MD_RAID1=m 467CONFIG_MD_RAID1=m
451# CONFIG_MD_RAID10 is not set 468# CONFIG_MD_RAID10 is not set
452# CONFIG_MD_RAID5 is not set 469# CONFIG_MD_RAID456 is not set
453# CONFIG_MD_RAID6 is not set
454# CONFIG_MD_MULTIPATH is not set 470# CONFIG_MD_MULTIPATH is not set
455# CONFIG_MD_FAULTY is not set 471# CONFIG_MD_FAULTY is not set
456CONFIG_BLK_DEV_DM=m 472CONFIG_BLK_DEV_DM=m
@@ -544,6 +560,7 @@ CONFIG_SPIDER_NET=m
544# CONFIG_CHELSIO_T1 is not set 560# CONFIG_CHELSIO_T1 is not set
545# CONFIG_IXGB is not set 561# CONFIG_IXGB is not set
546# CONFIG_S2IO is not set 562# CONFIG_S2IO is not set
563# CONFIG_MYRI10GE is not set
547 564
548# 565#
549# Token Ring devices 566# Token Ring devices
@@ -620,6 +637,7 @@ CONFIG_SERIO_SERPORT=y
620CONFIG_VT=y 637CONFIG_VT=y
621CONFIG_VT_CONSOLE=y 638CONFIG_VT_CONSOLE=y
622CONFIG_HW_CONSOLE=y 639CONFIG_HW_CONSOLE=y
640# CONFIG_VT_HW_CONSOLE_BINDING is not set
623CONFIG_SERIAL_NONSTANDARD=y 641CONFIG_SERIAL_NONSTANDARD=y
624# CONFIG_COMPUTONE is not set 642# CONFIG_COMPUTONE is not set
625# CONFIG_ROCKETPORT is not set 643# CONFIG_ROCKETPORT is not set
@@ -680,6 +698,7 @@ CONFIG_WATCHDOG_RTAS=y
680# 698#
681# CONFIG_PCIPCWATCHDOG is not set 699# CONFIG_PCIPCWATCHDOG is not set
682# CONFIG_WDTPCI is not set 700# CONFIG_WDTPCI is not set
701# CONFIG_HW_RANDOM is not set
683CONFIG_GEN_RTC=y 702CONFIG_GEN_RTC=y
684# CONFIG_GEN_RTC_X is not set 703# CONFIG_GEN_RTC_X is not set
685# CONFIG_DTLK is not set 704# CONFIG_DTLK is not set
@@ -725,6 +744,7 @@ CONFIG_I2C_ALGOBIT=y
725# CONFIG_I2C_I810 is not set 744# CONFIG_I2C_I810 is not set
726# CONFIG_I2C_PIIX4 is not set 745# CONFIG_I2C_PIIX4 is not set
727# CONFIG_I2C_NFORCE2 is not set 746# CONFIG_I2C_NFORCE2 is not set
747# CONFIG_I2C_OCORES is not set
728# CONFIG_I2C_PARPORT_LIGHT is not set 748# CONFIG_I2C_PARPORT_LIGHT is not set
729# CONFIG_I2C_PROSAVAGE is not set 749# CONFIG_I2C_PROSAVAGE is not set
730# CONFIG_I2C_SAVAGE4 is not set 750# CONFIG_I2C_SAVAGE4 is not set
@@ -761,7 +781,6 @@ CONFIG_I2C_ALGOBIT=y
761# 781#
762# Dallas's 1-wire bus 782# Dallas's 1-wire bus
763# 783#
764# CONFIG_W1 is not set
765 784
766# 785#
767# Hardware Monitoring support 786# Hardware Monitoring support
@@ -787,6 +806,7 @@ CONFIG_VIDEO_V4L2=y
787# 806#
788# Graphics support 807# Graphics support
789# 808#
809CONFIG_FIRMWARE_EDID=y
790# CONFIG_FB is not set 810# CONFIG_FB is not set
791 811
792# 812#
@@ -794,6 +814,7 @@ CONFIG_VIDEO_V4L2=y
794# 814#
795# CONFIG_VGA_CONSOLE is not set 815# CONFIG_VGA_CONSOLE is not set
796CONFIG_DUMMY_CONSOLE=y 816CONFIG_DUMMY_CONSOLE=y
817# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
797 818
798# 819#
799# Sound 820# Sound
@@ -841,6 +862,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
841CONFIG_INFINIBAND=y 862CONFIG_INFINIBAND=y
842CONFIG_INFINIBAND_USER_MAD=m 863CONFIG_INFINIBAND_USER_MAD=m
843CONFIG_INFINIBAND_USER_ACCESS=m 864CONFIG_INFINIBAND_USER_ACCESS=m
865CONFIG_INFINIBAND_ADDR_TRANS=y
844CONFIG_INFINIBAND_MTHCA=m 866CONFIG_INFINIBAND_MTHCA=m
845CONFIG_INFINIBAND_MTHCA_DEBUG=y 867CONFIG_INFINIBAND_MTHCA_DEBUG=y
846CONFIG_INFINIBAND_IPOIB=m 868CONFIG_INFINIBAND_IPOIB=m
@@ -857,6 +879,19 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
857# CONFIG_RTC_CLASS is not set 879# CONFIG_RTC_CLASS is not set
858 880
859# 881#
882# DMA Engine support
883#
884# CONFIG_DMA_ENGINE is not set
885
886#
887# DMA Clients
888#
889
890#
891# DMA Devices
892#
893
894#
860# File systems 895# File systems
861# 896#
862CONFIG_EXT2_FS=y 897CONFIG_EXT2_FS=y
@@ -877,6 +912,7 @@ CONFIG_FS_POSIX_ACL=y
877# CONFIG_MINIX_FS is not set 912# CONFIG_MINIX_FS is not set
878# CONFIG_ROMFS_FS is not set 913# CONFIG_ROMFS_FS is not set
879CONFIG_INOTIFY=y 914CONFIG_INOTIFY=y
915CONFIG_INOTIFY_USER=y
880# CONFIG_QUOTA is not set 916# CONFIG_QUOTA is not set
881CONFIG_DNOTIFY=y 917CONFIG_DNOTIFY=y
882# CONFIG_AUTOFS_FS is not set 918# CONFIG_AUTOFS_FS is not set
@@ -1034,6 +1070,9 @@ CONFIG_CRC32=y
1034# CONFIG_LIBCRC32C is not set 1070# CONFIG_LIBCRC32C is not set
1035CONFIG_ZLIB_INFLATE=m 1071CONFIG_ZLIB_INFLATE=m
1036CONFIG_ZLIB_DEFLATE=m 1072CONFIG_ZLIB_DEFLATE=m
1073CONFIG_TEXTSEARCH=y
1074CONFIG_TEXTSEARCH_KMP=m
1075CONFIG_PLIST=y
1037 1076
1038# 1077#
1039# Instrumentation Support 1078# Instrumentation Support
@@ -1046,14 +1085,19 @@ CONFIG_ZLIB_DEFLATE=m
1046# 1085#
1047# CONFIG_PRINTK_TIME is not set 1086# CONFIG_PRINTK_TIME is not set
1048CONFIG_MAGIC_SYSRQ=y 1087CONFIG_MAGIC_SYSRQ=y
1088# CONFIG_UNUSED_SYMBOLS is not set
1049CONFIG_DEBUG_KERNEL=y 1089CONFIG_DEBUG_KERNEL=y
1050CONFIG_LOG_BUF_SHIFT=15 1090CONFIG_LOG_BUF_SHIFT=15
1051CONFIG_DETECT_SOFTLOCKUP=y 1091CONFIG_DETECT_SOFTLOCKUP=y
1052# CONFIG_SCHEDSTATS is not set 1092# CONFIG_SCHEDSTATS is not set
1053# CONFIG_DEBUG_SLAB is not set 1093# CONFIG_DEBUG_SLAB is not set
1054CONFIG_DEBUG_MUTEXES=y 1094# CONFIG_DEBUG_RT_MUTEXES is not set
1095# CONFIG_RT_MUTEX_TESTER is not set
1055# CONFIG_DEBUG_SPINLOCK is not set 1096# CONFIG_DEBUG_SPINLOCK is not set
1097CONFIG_DEBUG_MUTEXES=y
1098# CONFIG_DEBUG_RWSEMS is not set
1056CONFIG_DEBUG_SPINLOCK_SLEEP=y 1099CONFIG_DEBUG_SPINLOCK_SLEEP=y
1100# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1057# CONFIG_DEBUG_KOBJECT is not set 1101# CONFIG_DEBUG_KOBJECT is not set
1058# CONFIG_DEBUG_INFO is not set 1102# CONFIG_DEBUG_INFO is not set
1059CONFIG_DEBUG_FS=y 1103CONFIG_DEBUG_FS=y
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 0fa010a63a8e..bbf2b5f8a8cb 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17 3# Linux kernel version: 2.6.18-rc6
4# Mon Jul 3 12:08:41 2006 4# Sun Sep 10 10:22:54 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -42,6 +43,7 @@ CONFIG_PPC_STD_MMU=y
42CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
43CONFIG_SMP=y 44CONFIG_SMP=y
44CONFIG_NR_CPUS=4 45CONFIG_NR_CPUS=4
46CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
45 47
46# 48#
47# Code maturity level options 49# Code maturity level options
@@ -59,6 +61,7 @@ CONFIG_SWAP=y
59CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
60CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
61# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set
62CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
63# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
64CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
@@ -76,10 +79,12 @@ CONFIG_PRINTK=y
76CONFIG_BUG=y 79CONFIG_BUG=y
77CONFIG_ELF_CORE=y 80CONFIG_ELF_CORE=y
78CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
82CONFIG_RT_MUTEXES=y
79CONFIG_FUTEX=y 83CONFIG_FUTEX=y
80CONFIG_EPOLL=y 84CONFIG_EPOLL=y
81CONFIG_SHMEM=y 85CONFIG_SHMEM=y
82CONFIG_SLAB=y 86CONFIG_SLAB=y
87CONFIG_VM_EVENT_COUNTERS=y
83# CONFIG_TINY_SHMEM is not set 88# CONFIG_TINY_SHMEM is not set
84CONFIG_BASE_SMALL=0 89CONFIG_BASE_SMALL=0
85# CONFIG_SLOB is not set 90# CONFIG_SLOB is not set
@@ -126,7 +131,7 @@ CONFIG_PPC_CHRP=y
126# CONFIG_PPC_PMAC is not set 131# CONFIG_PPC_PMAC is not set
127# CONFIG_PPC_CELL is not set 132# CONFIG_PPC_CELL is not set
128# CONFIG_PPC_CELL_NATIVE is not set 133# CONFIG_PPC_CELL_NATIVE is not set
129CONFIG_MPIC=y 134# CONFIG_UDBG_RTAS_CONSOLE is not set
130CONFIG_PPC_RTAS=y 135CONFIG_PPC_RTAS=y
131# CONFIG_RTAS_ERROR_LOGGING is not set 136# CONFIG_RTAS_ERROR_LOGGING is not set
132CONFIG_RTAS_PROC=y 137CONFIG_RTAS_PROC=y
@@ -136,6 +141,7 @@ CONFIG_PPC_MPC106=y
136# CONFIG_CPU_FREQ is not set 141# CONFIG_CPU_FREQ is not set
137# CONFIG_TAU is not set 142# CONFIG_TAU is not set
138# CONFIG_WANT_EARLY_SERIAL is not set 143# CONFIG_WANT_EARLY_SERIAL is not set
144CONFIG_MPIC=y
139 145
140# 146#
141# Kernel options 147# Kernel options
@@ -151,6 +157,7 @@ CONFIG_PREEMPT_NONE=y
151CONFIG_PREEMPT_BKL=y 157CONFIG_PREEMPT_BKL=y
152CONFIG_BINFMT_ELF=y 158CONFIG_BINFMT_ELF=y
153CONFIG_BINFMT_MISC=y 159CONFIG_BINFMT_MISC=y
160CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
154# CONFIG_KEXEC is not set 161# CONFIG_KEXEC is not set
155CONFIG_IRQ_ALL_CPUS=y 162CONFIG_IRQ_ALL_CPUS=y
156CONFIG_ARCH_FLATMEM_ENABLE=y 163CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -162,6 +169,7 @@ CONFIG_FLATMEM=y
162CONFIG_FLAT_NODE_MEM_MAP=y 169CONFIG_FLAT_NODE_MEM_MAP=y
163# CONFIG_SPARSEMEM_STATIC is not set 170# CONFIG_SPARSEMEM_STATIC is not set
164CONFIG_SPLIT_PTLOCK_CPUS=4 171CONFIG_SPLIT_PTLOCK_CPUS=4
172# CONFIG_RESOURCES_64BIT is not set
165CONFIG_PROC_DEVICETREE=y 173CONFIG_PROC_DEVICETREE=y
166# CONFIG_CMDLINE_BOOL is not set 174# CONFIG_CMDLINE_BOOL is not set
167# CONFIG_PM is not set 175# CONFIG_PM is not set
@@ -173,6 +181,7 @@ CONFIG_ISA_DMA_API=y
173# 181#
174CONFIG_ISA=y 182CONFIG_ISA=y
175CONFIG_GENERIC_ISA_DMA=y 183CONFIG_GENERIC_ISA_DMA=y
184# CONFIG_MPIC_WEIRD is not set
176CONFIG_PPC_I8259=y 185CONFIG_PPC_I8259=y
177CONFIG_PPC_INDIRECT_PCI=y 186CONFIG_PPC_INDIRECT_PCI=y
178CONFIG_PCI=y 187CONFIG_PCI=y
@@ -366,6 +375,7 @@ CONFIG_BLK_DEV_LOOP=y
366CONFIG_BLK_DEV_RAM=y 375CONFIG_BLK_DEV_RAM=y
367CONFIG_BLK_DEV_RAM_COUNT=16 376CONFIG_BLK_DEV_RAM_COUNT=16
368CONFIG_BLK_DEV_RAM_SIZE=4096 377CONFIG_BLK_DEV_RAM_SIZE=4096
378CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
369CONFIG_BLK_DEV_INITRD=y 379CONFIG_BLK_DEV_INITRD=y
370# CONFIG_CDROM_PKTCDVD is not set 380# CONFIG_CDROM_PKTCDVD is not set
371# CONFIG_ATA_OVER_ETH is not set 381# CONFIG_ATA_OVER_ETH is not set
@@ -622,6 +632,7 @@ CONFIG_8139TOO=y
622# CONFIG_TLAN is not set 632# CONFIG_TLAN is not set
623CONFIG_VIA_RHINE=y 633CONFIG_VIA_RHINE=y
624# CONFIG_VIA_RHINE_MMIO is not set 634# CONFIG_VIA_RHINE_MMIO is not set
635# CONFIG_VIA_RHINE_NAPI is not set
625 636
626# 637#
627# Ethernet (1000 Mbit) 638# Ethernet (1000 Mbit)
@@ -751,6 +762,7 @@ CONFIG_SERIO_LIBPS2=y
751CONFIG_VT=y 762CONFIG_VT=y
752CONFIG_VT_CONSOLE=y 763CONFIG_VT_CONSOLE=y
753CONFIG_HW_CONSOLE=y 764CONFIG_HW_CONSOLE=y
765# CONFIG_VT_HW_CONSOLE_BINDING is not set
754# CONFIG_SERIAL_NONSTANDARD is not set 766# CONFIG_SERIAL_NONSTANDARD is not set
755 767
756# 768#
@@ -783,6 +795,7 @@ CONFIG_LEGACY_PTY_COUNT=256
783# Watchdog Cards 795# Watchdog Cards
784# 796#
785# CONFIG_WATCHDOG is not set 797# CONFIG_WATCHDOG is not set
798# CONFIG_HW_RANDOM is not set
786CONFIG_NVRAM=y 799CONFIG_NVRAM=y
787CONFIG_GEN_RTC=y 800CONFIG_GEN_RTC=y
788# CONFIG_GEN_RTC_X is not set 801# CONFIG_GEN_RTC_X is not set
@@ -894,12 +907,12 @@ CONFIG_VIDEO_V4L2=y
894# 907#
895# Graphics support 908# Graphics support
896# 909#
910CONFIG_FIRMWARE_EDID=y
897CONFIG_FB=y 911CONFIG_FB=y
898CONFIG_FB_CFB_FILLRECT=y 912CONFIG_FB_CFB_FILLRECT=y
899CONFIG_FB_CFB_COPYAREA=y 913CONFIG_FB_CFB_COPYAREA=y
900CONFIG_FB_CFB_IMAGEBLIT=y 914CONFIG_FB_CFB_IMAGEBLIT=y
901CONFIG_FB_MACMODES=y 915CONFIG_FB_MACMODES=y
902CONFIG_FB_FIRMWARE_EDID=y
903# CONFIG_FB_BACKLIGHT is not set 916# CONFIG_FB_BACKLIGHT is not set
904CONFIG_FB_MODE_HELPERS=y 917CONFIG_FB_MODE_HELPERS=y
905CONFIG_FB_TILEBLITTING=y 918CONFIG_FB_TILEBLITTING=y
@@ -1079,7 +1092,7 @@ CONFIG_USB_MON=y
1079# CONFIG_USB_LEGOTOWER is not set 1092# CONFIG_USB_LEGOTOWER is not set
1080# CONFIG_USB_LCD is not set 1093# CONFIG_USB_LCD is not set
1081# CONFIG_USB_LED is not set 1094# CONFIG_USB_LED is not set
1082# CONFIG_USB_CY7C63 is not set 1095# CONFIG_USB_CYPRESS_CY7C63 is not set
1083# CONFIG_USB_CYTHERM is not set 1096# CONFIG_USB_CYTHERM is not set
1084# CONFIG_USB_PHIDGETKIT is not set 1097# CONFIG_USB_PHIDGETKIT is not set
1085# CONFIG_USB_PHIDGETSERVO is not set 1098# CONFIG_USB_PHIDGETSERVO is not set
@@ -1305,6 +1318,7 @@ CONFIG_ZLIB_INFLATE=m
1305CONFIG_ZLIB_DEFLATE=m 1318CONFIG_ZLIB_DEFLATE=m
1306CONFIG_TEXTSEARCH=y 1319CONFIG_TEXTSEARCH=y
1307CONFIG_TEXTSEARCH_KMP=m 1320CONFIG_TEXTSEARCH_KMP=m
1321CONFIG_PLIST=y
1308 1322
1309# 1323#
1310# Instrumentation Support 1324# Instrumentation Support
@@ -1316,14 +1330,19 @@ CONFIG_TEXTSEARCH_KMP=m
1316# 1330#
1317# CONFIG_PRINTK_TIME is not set 1331# CONFIG_PRINTK_TIME is not set
1318CONFIG_MAGIC_SYSRQ=y 1332CONFIG_MAGIC_SYSRQ=y
1333# CONFIG_UNUSED_SYMBOLS is not set
1319CONFIG_DEBUG_KERNEL=y 1334CONFIG_DEBUG_KERNEL=y
1320CONFIG_LOG_BUF_SHIFT=15 1335CONFIG_LOG_BUF_SHIFT=15
1321CONFIG_DETECT_SOFTLOCKUP=y 1336CONFIG_DETECT_SOFTLOCKUP=y
1322# CONFIG_SCHEDSTATS is not set 1337# CONFIG_SCHEDSTATS is not set
1323# CONFIG_DEBUG_SLAB is not set 1338# CONFIG_DEBUG_SLAB is not set
1324CONFIG_DEBUG_MUTEXES=y 1339# CONFIG_DEBUG_RT_MUTEXES is not set
1340# CONFIG_RT_MUTEX_TESTER is not set
1325# CONFIG_DEBUG_SPINLOCK is not set 1341# CONFIG_DEBUG_SPINLOCK is not set
1342CONFIG_DEBUG_MUTEXES=y
1343# CONFIG_DEBUG_RWSEMS is not set
1326CONFIG_DEBUG_SPINLOCK_SLEEP=y 1344CONFIG_DEBUG_SPINLOCK_SLEEP=y
1345# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1327# CONFIG_DEBUG_KOBJECT is not set 1346# CONFIG_DEBUG_KOBJECT is not set
1328# CONFIG_DEBUG_HIGHMEM is not set 1347# CONFIG_DEBUG_HIGHMEM is not set
1329# CONFIG_DEBUG_INFO is not set 1348# CONFIG_DEBUG_INFO is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 8c6bd17c6929..4b9c2ed925f5 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc3 3# Linux kernel version: 2.6.18-rc6
4# Tue Aug 8 09:12:29 2006 4# Sun Sep 10 10:22:55 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -126,7 +126,6 @@ CONFIG_PPC_PMAC64=y
126# CONFIG_PPC_IBM_CELL_BLADE is not set 126# CONFIG_PPC_IBM_CELL_BLADE is not set
127# CONFIG_UDBG_RTAS_CONSOLE is not set 127# CONFIG_UDBG_RTAS_CONSOLE is not set
128CONFIG_U3_DART=y 128CONFIG_U3_DART=y
129CONFIG_MPIC=y
130# CONFIG_PPC_RTAS is not set 129# CONFIG_PPC_RTAS is not set
131# CONFIG_MMIO_NVRAM is not set 130# CONFIG_MMIO_NVRAM is not set
132CONFIG_MPIC_BROKEN_U3=y 131CONFIG_MPIC_BROKEN_U3=y
@@ -146,6 +145,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
146# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 145# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
147CONFIG_CPU_FREQ_PMAC64=y 146CONFIG_CPU_FREQ_PMAC64=y
148# CONFIG_WANT_EARLY_SERIAL is not set 147# CONFIG_WANT_EARLY_SERIAL is not set
148CONFIG_MPIC=y
149 149
150# 150#
151# Kernel options 151# Kernel options
@@ -192,6 +192,7 @@ CONFIG_ISA_DMA_API=y
192# Bus options 192# Bus options
193# 193#
194CONFIG_GENERIC_ISA_DMA=y 194CONFIG_GENERIC_ISA_DMA=y
195# CONFIG_MPIC_WEIRD is not set
195# CONFIG_PPC_I8259 is not set 196# CONFIG_PPC_I8259 is not set
196# CONFIG_PPC_INDIRECT_PCI is not set 197# CONFIG_PPC_INDIRECT_PCI is not set
197CONFIG_PCI=y 198CONFIG_PCI=y
@@ -772,7 +773,6 @@ CONFIG_HW_CONSOLE=y
772CONFIG_UNIX98_PTYS=y 773CONFIG_UNIX98_PTYS=y
773CONFIG_LEGACY_PTYS=y 774CONFIG_LEGACY_PTYS=y
774CONFIG_LEGACY_PTY_COUNT=256 775CONFIG_LEGACY_PTY_COUNT=256
775# CONFIG_BRIQ_PANEL is not set
776 776
777# 777#
778# IPMI 778# IPMI
@@ -1195,7 +1195,6 @@ CONFIG_USB_MON=y
1195CONFIG_USB_SERIAL=m 1195CONFIG_USB_SERIAL=m
1196CONFIG_USB_SERIAL_GENERIC=y 1196CONFIG_USB_SERIAL_GENERIC=y
1197# CONFIG_USB_SERIAL_AIRPRIME is not set 1197# CONFIG_USB_SERIAL_AIRPRIME is not set
1198# CONFIG_USB_SERIAL_ANYDATA is not set
1199# CONFIG_USB_SERIAL_ARK3116 is not set 1198# CONFIG_USB_SERIAL_ARK3116 is not set
1200CONFIG_USB_SERIAL_BELKIN=m 1199CONFIG_USB_SERIAL_BELKIN=m
1201# CONFIG_USB_SERIAL_WHITEHEAT is not set 1200# CONFIG_USB_SERIAL_WHITEHEAT is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 72ed95b3ead6..eb0885ea0731 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc3 3# Linux kernel version: 2.6.18-rc6
4# Tue Aug 8 09:15:46 2006 4# Sun Sep 10 10:22:57 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -129,6 +129,7 @@ CONFIG_IBMVIO=y
129# CONFIG_PPC_970_NAP is not set 129# CONFIG_PPC_970_NAP is not set
130# CONFIG_CPU_FREQ is not set 130# CONFIG_CPU_FREQ is not set
131# CONFIG_WANT_EARLY_SERIAL is not set 131# CONFIG_WANT_EARLY_SERIAL is not set
132# CONFIG_MPIC is not set
132 133
133# 134#
134# Kernel options 135# Kernel options
@@ -172,6 +173,7 @@ CONFIG_ISA_DMA_API=y
172# Bus options 173# Bus options
173# 174#
174CONFIG_GENERIC_ISA_DMA=y 175CONFIG_GENERIC_ISA_DMA=y
176# CONFIG_MPIC_WEIRD is not set
175# CONFIG_PPC_I8259 is not set 177# CONFIG_PPC_I8259 is not set
176# CONFIG_PPC_INDIRECT_PCI is not set 178# CONFIG_PPC_INDIRECT_PCI is not set
177CONFIG_PCI=y 179CONFIG_PCI=y
@@ -716,7 +718,6 @@ CONFIG_SERIAL_ICOM=m
716CONFIG_UNIX98_PTYS=y 718CONFIG_UNIX98_PTYS=y
717CONFIG_LEGACY_PTYS=y 719CONFIG_LEGACY_PTYS=y
718CONFIG_LEGACY_PTY_COUNT=256 720CONFIG_LEGACY_PTY_COUNT=256
719# CONFIG_BRIQ_PANEL is not set
720 721
721# 722#
722# IPMI 723# IPMI
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 80a0db43aeb7..2860be106f4f 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,15 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc6 3# Linux kernel version: 2.6.18-rc6
4# Wed Mar 15 16:19:54 2006 4# Sun Sep 10 10:24:55 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_PPC=y 16CONFIG_PPC=y
14CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
15CONFIG_COMPAT=y 18CONFIG_COMPAT=y
@@ -29,8 +32,10 @@ CONFIG_POWER4=y
29CONFIG_PPC_FPU=y 32CONFIG_PPC_FPU=y
30# CONFIG_ALTIVEC is not set 33# CONFIG_ALTIVEC is not set
31CONFIG_PPC_STD_MMU=y 34CONFIG_PPC_STD_MMU=y
35CONFIG_VIRT_CPU_ACCOUNTING=y
32CONFIG_SMP=y 36CONFIG_SMP=y
33CONFIG_NR_CPUS=2 37CONFIG_NR_CPUS=2
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34 39
35# 40#
36# Code maturity level options 41# Code maturity level options
@@ -48,11 +53,13 @@ CONFIG_SWAP=y
48CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
49CONFIG_POSIX_MQUEUE=y 54CONFIG_POSIX_MQUEUE=y
50# CONFIG_BSD_PROCESS_ACCT is not set 55# CONFIG_BSD_PROCESS_ACCT is not set
56# CONFIG_TASKSTATS is not set
51CONFIG_SYSCTL=y 57CONFIG_SYSCTL=y
52# CONFIG_AUDIT is not set 58# CONFIG_AUDIT is not set
53CONFIG_IKCONFIG=y 59CONFIG_IKCONFIG=y
54CONFIG_IKCONFIG_PROC=y 60CONFIG_IKCONFIG_PROC=y
55# CONFIG_CPUSETS is not set 61# CONFIG_CPUSETS is not set
62# CONFIG_RELAY is not set
56CONFIG_INITRAMFS_SOURCE="" 63CONFIG_INITRAMFS_SOURCE=""
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y 64CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58# CONFIG_EMBEDDED is not set 65# CONFIG_EMBEDDED is not set
@@ -64,14 +71,12 @@ CONFIG_PRINTK=y
64CONFIG_BUG=y 71CONFIG_BUG=y
65CONFIG_ELF_CORE=y 72CONFIG_ELF_CORE=y
66CONFIG_BASE_FULL=y 73CONFIG_BASE_FULL=y
74CONFIG_RT_MUTEXES=y
67CONFIG_FUTEX=y 75CONFIG_FUTEX=y
68CONFIG_EPOLL=y 76CONFIG_EPOLL=y
69CONFIG_SHMEM=y 77CONFIG_SHMEM=y
70CONFIG_CC_ALIGN_FUNCTIONS=0
71CONFIG_CC_ALIGN_LABELS=0
72CONFIG_CC_ALIGN_LOOPS=0
73CONFIG_CC_ALIGN_JUMPS=0
74CONFIG_SLAB=y 78CONFIG_SLAB=y
79CONFIG_VM_EVENT_COUNTERS=y
75# CONFIG_TINY_SHMEM is not set 80# CONFIG_TINY_SHMEM is not set
76CONFIG_BASE_SMALL=0 81CONFIG_BASE_SMALL=0
77# CONFIG_SLOB is not set 82# CONFIG_SLOB is not set
@@ -82,7 +87,6 @@ CONFIG_BASE_SMALL=0
82CONFIG_MODULES=y 87CONFIG_MODULES=y
83CONFIG_MODULE_UNLOAD=y 88CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 89# CONFIG_MODULE_FORCE_UNLOAD is not set
85CONFIG_OBSOLETE_MODPARM=y
86CONFIG_MODVERSIONS=y 90CONFIG_MODVERSIONS=y
87CONFIG_MODULE_SRCVERSION_ALL=y 91CONFIG_MODULE_SRCVERSION_ALL=y
88CONFIG_KMOD=y 92CONFIG_KMOD=y
@@ -91,6 +95,7 @@ CONFIG_STOP_MACHINE=y
91# 95#
92# Block layer 96# Block layer
93# 97#
98# CONFIG_BLK_DEV_IO_TRACE is not set
94 99
95# 100#
96# IO Schedulers 101# IO Schedulers
@@ -116,14 +121,18 @@ CONFIG_PPC_MULTIPLATFORM=y
116# CONFIG_PPC_PMAC is not set 121# CONFIG_PPC_PMAC is not set
117CONFIG_PPC_MAPLE=y 122CONFIG_PPC_MAPLE=y
118# CONFIG_PPC_CELL is not set 123# CONFIG_PPC_CELL is not set
124# CONFIG_PPC_CELL_NATIVE is not set
125# CONFIG_PPC_IBM_CELL_BLADE is not set
126# CONFIG_UDBG_RTAS_CONSOLE is not set
119CONFIG_U3_DART=y 127CONFIG_U3_DART=y
120CONFIG_MPIC=y
121# CONFIG_PPC_RTAS is not set 128# CONFIG_PPC_RTAS is not set
122# CONFIG_MMIO_NVRAM is not set 129# CONFIG_MMIO_NVRAM is not set
123CONFIG_MPIC_BROKEN_U3=y 130CONFIG_MPIC_BROKEN_U3=y
124# CONFIG_PPC_MPC106 is not set 131# CONFIG_PPC_MPC106 is not set
132CONFIG_PPC_970_NAP=y
125# CONFIG_CPU_FREQ is not set 133# CONFIG_CPU_FREQ is not set
126# CONFIG_WANT_EARLY_SERIAL is not set 134# CONFIG_WANT_EARLY_SERIAL is not set
135CONFIG_MPIC=y
127 136
128# 137#
129# Kernel options 138# Kernel options
@@ -140,6 +149,7 @@ CONFIG_BINFMT_ELF=y
140# CONFIG_BINFMT_MISC is not set 149# CONFIG_BINFMT_MISC is not set
141CONFIG_FORCE_MAX_ZONEORDER=13 150CONFIG_FORCE_MAX_ZONEORDER=13
142CONFIG_IOMMU_VMERGE=y 151CONFIG_IOMMU_VMERGE=y
152CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
143CONFIG_KEXEC=y 153CONFIG_KEXEC=y
144# CONFIG_CRASH_DUMP is not set 154# CONFIG_CRASH_DUMP is not set
145CONFIG_IRQ_ALL_CPUS=y 155CONFIG_IRQ_ALL_CPUS=y
@@ -155,6 +165,7 @@ CONFIG_FLATMEM=y
155CONFIG_FLAT_NODE_MEM_MAP=y 165CONFIG_FLAT_NODE_MEM_MAP=y
156# CONFIG_SPARSEMEM_STATIC is not set 166# CONFIG_SPARSEMEM_STATIC is not set
157CONFIG_SPLIT_PTLOCK_CPUS=4 167CONFIG_SPLIT_PTLOCK_CPUS=4
168CONFIG_RESOURCES_64BIT=y
158# CONFIG_PPC_64K_PAGES is not set 169# CONFIG_PPC_64K_PAGES is not set
159# CONFIG_SCHED_SMT is not set 170# CONFIG_SCHED_SMT is not set
160CONFIG_PROC_DEVICETREE=y 171CONFIG_PROC_DEVICETREE=y
@@ -167,11 +178,12 @@ CONFIG_ISA_DMA_API=y
167# Bus options 178# Bus options
168# 179#
169CONFIG_GENERIC_ISA_DMA=y 180CONFIG_GENERIC_ISA_DMA=y
181# CONFIG_MPIC_WEIRD is not set
170# CONFIG_PPC_I8259 is not set 182# CONFIG_PPC_I8259 is not set
171# CONFIG_PPC_INDIRECT_PCI is not set 183# CONFIG_PPC_INDIRECT_PCI is not set
172CONFIG_PCI=y 184CONFIG_PCI=y
173CONFIG_PCI_DOMAINS=y 185CONFIG_PCI_DOMAINS=y
174CONFIG_PCI_LEGACY_PROC=y 186# CONFIG_PCIEPORTBUS is not set
175# CONFIG_PCI_DEBUG is not set 187# CONFIG_PCI_DEBUG is not set
176 188
177# 189#
@@ -197,6 +209,8 @@ CONFIG_NET=y
197CONFIG_PACKET=y 209CONFIG_PACKET=y
198CONFIG_PACKET_MMAP=y 210CONFIG_PACKET_MMAP=y
199CONFIG_UNIX=y 211CONFIG_UNIX=y
212CONFIG_XFRM=y
213CONFIG_XFRM_USER=m
200# CONFIG_NET_KEY is not set 214# CONFIG_NET_KEY is not set
201CONFIG_INET=y 215CONFIG_INET=y
202CONFIG_IP_MULTICAST=y 216CONFIG_IP_MULTICAST=y
@@ -214,12 +228,18 @@ CONFIG_IP_PNP_DHCP=y
214# CONFIG_INET_AH is not set 228# CONFIG_INET_AH is not set
215# CONFIG_INET_ESP is not set 229# CONFIG_INET_ESP is not set
216# CONFIG_INET_IPCOMP is not set 230# CONFIG_INET_IPCOMP is not set
231# CONFIG_INET_XFRM_TUNNEL is not set
217# CONFIG_INET_TUNNEL is not set 232# CONFIG_INET_TUNNEL is not set
233CONFIG_INET_XFRM_MODE_TRANSPORT=y
234CONFIG_INET_XFRM_MODE_TUNNEL=y
218CONFIG_INET_DIAG=y 235CONFIG_INET_DIAG=y
219CONFIG_INET_TCP_DIAG=y 236CONFIG_INET_TCP_DIAG=y
220# CONFIG_TCP_CONG_ADVANCED is not set 237# CONFIG_TCP_CONG_ADVANCED is not set
221CONFIG_TCP_CONG_BIC=y 238CONFIG_TCP_CONG_BIC=y
222# CONFIG_IPV6 is not set 239# CONFIG_IPV6 is not set
240# CONFIG_INET6_XFRM_TUNNEL is not set
241# CONFIG_INET6_TUNNEL is not set
242# CONFIG_NETWORK_SECMARK is not set
223# CONFIG_NETFILTER is not set 243# CONFIG_NETFILTER is not set
224 244
225# 245#
@@ -274,6 +294,7 @@ CONFIG_STANDALONE=y
274CONFIG_PREVENT_FIRMWARE_BUILD=y 294CONFIG_PREVENT_FIRMWARE_BUILD=y
275# CONFIG_FW_LOADER is not set 295# CONFIG_FW_LOADER is not set
276# CONFIG_DEBUG_DRIVER is not set 296# CONFIG_DEBUG_DRIVER is not set
297# CONFIG_SYS_HYPERVISOR is not set
277 298
278# 299#
279# Connector - unified userspace <-> kernelspace linker 300# Connector - unified userspace <-> kernelspace linker
@@ -310,6 +331,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
310CONFIG_BLK_DEV_RAM=y 331CONFIG_BLK_DEV_RAM=y
311CONFIG_BLK_DEV_RAM_COUNT=16 332CONFIG_BLK_DEV_RAM_COUNT=16
312CONFIG_BLK_DEV_RAM_SIZE=8192 333CONFIG_BLK_DEV_RAM_SIZE=8192
334CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
313# CONFIG_BLK_DEV_INITRD is not set 335# CONFIG_BLK_DEV_INITRD is not set
314# CONFIG_CDROM_PKTCDVD is not set 336# CONFIG_CDROM_PKTCDVD is not set
315# CONFIG_ATA_OVER_ETH is not set 337# CONFIG_ATA_OVER_ETH is not set
@@ -484,6 +506,7 @@ CONFIG_E1000=y
484# CONFIG_CHELSIO_T1 is not set 506# CONFIG_CHELSIO_T1 is not set
485# CONFIG_IXGB is not set 507# CONFIG_IXGB is not set
486# CONFIG_S2IO is not set 508# CONFIG_S2IO is not set
509# CONFIG_MYRI10GE is not set
487 510
488# 511#
489# Token Ring devices 512# Token Ring devices
@@ -556,6 +579,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
556CONFIG_VT=y 579CONFIG_VT=y
557CONFIG_VT_CONSOLE=y 580CONFIG_VT_CONSOLE=y
558CONFIG_HW_CONSOLE=y 581CONFIG_HW_CONSOLE=y
582# CONFIG_VT_HW_CONSOLE_BINDING is not set
559# CONFIG_SERIAL_NONSTANDARD is not set 583# CONFIG_SERIAL_NONSTANDARD is not set
560 584
561# 585#
@@ -563,6 +587,7 @@ CONFIG_HW_CONSOLE=y
563# 587#
564CONFIG_SERIAL_8250=y 588CONFIG_SERIAL_8250=y
565CONFIG_SERIAL_8250_CONSOLE=y 589CONFIG_SERIAL_8250_CONSOLE=y
590CONFIG_SERIAL_8250_PCI=y
566CONFIG_SERIAL_8250_NR_UARTS=4 591CONFIG_SERIAL_8250_NR_UARTS=4
567CONFIG_SERIAL_8250_RUNTIME_UARTS=4 592CONFIG_SERIAL_8250_RUNTIME_UARTS=4
568# CONFIG_SERIAL_8250_EXTENDED is not set 593# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -586,7 +611,7 @@ CONFIG_LEGACY_PTY_COUNT=256
586# Watchdog Cards 611# Watchdog Cards
587# 612#
588# CONFIG_WATCHDOG is not set 613# CONFIG_WATCHDOG is not set
589# CONFIG_RTC is not set 614# CONFIG_HW_RANDOM is not set
590CONFIG_GEN_RTC=y 615CONFIG_GEN_RTC=y
591# CONFIG_GEN_RTC_X is not set 616# CONFIG_GEN_RTC_X is not set
592# CONFIG_DTLK is not set 617# CONFIG_DTLK is not set
@@ -632,10 +657,10 @@ CONFIG_I2C_AMD8111=y
632# CONFIG_I2C_I810 is not set 657# CONFIG_I2C_I810 is not set
633# CONFIG_I2C_PIIX4 is not set 658# CONFIG_I2C_PIIX4 is not set
634# CONFIG_I2C_NFORCE2 is not set 659# CONFIG_I2C_NFORCE2 is not set
660# CONFIG_I2C_OCORES is not set
635# CONFIG_I2C_PARPORT_LIGHT is not set 661# CONFIG_I2C_PARPORT_LIGHT is not set
636# CONFIG_I2C_PROSAVAGE is not set 662# CONFIG_I2C_PROSAVAGE is not set
637# CONFIG_I2C_SAVAGE4 is not set 663# CONFIG_I2C_SAVAGE4 is not set
638# CONFIG_SCx200_ACB is not set
639# CONFIG_I2C_SIS5595 is not set 664# CONFIG_I2C_SIS5595 is not set
640# CONFIG_I2C_SIS630 is not set 665# CONFIG_I2C_SIS630 is not set
641# CONFIG_I2C_SIS96X is not set 666# CONFIG_I2C_SIS96X is not set
@@ -654,9 +679,7 @@ CONFIG_I2C_AMD8111=y
654# CONFIG_SENSORS_PCF8574 is not set 679# CONFIG_SENSORS_PCF8574 is not set
655# CONFIG_SENSORS_PCA9539 is not set 680# CONFIG_SENSORS_PCA9539 is not set
656# CONFIG_SENSORS_PCF8591 is not set 681# CONFIG_SENSORS_PCF8591 is not set
657# CONFIG_SENSORS_RTC8564 is not set
658# CONFIG_SENSORS_MAX6875 is not set 682# CONFIG_SENSORS_MAX6875 is not set
659# CONFIG_RTC_X1205_I2C is not set
660# CONFIG_I2C_DEBUG_CORE is not set 683# CONFIG_I2C_DEBUG_CORE is not set
661# CONFIG_I2C_DEBUG_ALGO is not set 684# CONFIG_I2C_DEBUG_ALGO is not set
662# CONFIG_I2C_DEBUG_BUS is not set 685# CONFIG_I2C_DEBUG_BUS is not set
@@ -671,7 +694,6 @@ CONFIG_I2C_AMD8111=y
671# 694#
672# Dallas's 1-wire bus 695# Dallas's 1-wire bus
673# 696#
674# CONFIG_W1 is not set
675 697
676# 698#
677# Hardware Monitoring support 699# Hardware Monitoring support
@@ -684,22 +706,21 @@ CONFIG_I2C_AMD8111=y
684# 706#
685 707
686# 708#
687# Multimedia Capabilities Port drivers
688#
689
690#
691# Multimedia devices 709# Multimedia devices
692# 710#
693# CONFIG_VIDEO_DEV is not set 711# CONFIG_VIDEO_DEV is not set
712CONFIG_VIDEO_V4L2=y
694 713
695# 714#
696# Digital Video Broadcasting Devices 715# Digital Video Broadcasting Devices
697# 716#
698# CONFIG_DVB is not set 717# CONFIG_DVB is not set
718# CONFIG_USB_DABUSB is not set
699 719
700# 720#
701# Graphics support 721# Graphics support
702# 722#
723CONFIG_FIRMWARE_EDID=y
703# CONFIG_FB is not set 724# CONFIG_FB is not set
704 725
705# 726#
@@ -707,6 +728,7 @@ CONFIG_I2C_AMD8111=y
707# 728#
708# CONFIG_VGA_CONSOLE is not set 729# CONFIG_VGA_CONSOLE is not set
709CONFIG_DUMMY_CONSOLE=y 730CONFIG_DUMMY_CONSOLE=y
731# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710 732
711# 733#
712# Sound 734# Sound
@@ -718,6 +740,7 @@ CONFIG_DUMMY_CONSOLE=y
718# 740#
719CONFIG_USB_ARCH_HAS_HCD=y 741CONFIG_USB_ARCH_HAS_HCD=y
720CONFIG_USB_ARCH_HAS_OHCI=y 742CONFIG_USB_ARCH_HAS_OHCI=y
743CONFIG_USB_ARCH_HAS_EHCI=y
721CONFIG_USB=y 744CONFIG_USB=y
722# CONFIG_USB_DEBUG is not set 745# CONFIG_USB_DEBUG is not set
723 746
@@ -735,6 +758,7 @@ CONFIG_USB_DEVICEFS=y
735CONFIG_USB_EHCI_HCD=y 758CONFIG_USB_EHCI_HCD=y
736CONFIG_USB_EHCI_SPLIT_ISO=y 759CONFIG_USB_EHCI_SPLIT_ISO=y
737CONFIG_USB_EHCI_ROOT_HUB_TT=y 760CONFIG_USB_EHCI_ROOT_HUB_TT=y
761# CONFIG_USB_EHCI_TT_NEWSCHED is not set
738# CONFIG_USB_ISP116X_HCD is not set 762# CONFIG_USB_ISP116X_HCD is not set
739CONFIG_USB_OHCI_HCD=y 763CONFIG_USB_OHCI_HCD=y
740# CONFIG_USB_OHCI_BIG_ENDIAN is not set 764# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -771,9 +795,7 @@ CONFIG_USB_HIDINPUT=y
771# CONFIG_USB_ACECAD is not set 795# CONFIG_USB_ACECAD is not set
772# CONFIG_USB_KBTAB is not set 796# CONFIG_USB_KBTAB is not set
773# CONFIG_USB_POWERMATE is not set 797# CONFIG_USB_POWERMATE is not set
774# CONFIG_USB_MTOUCH is not set 798# CONFIG_USB_TOUCHSCREEN is not set
775# CONFIG_USB_ITMTOUCH is not set
776# CONFIG_USB_EGALAX is not set
777# CONFIG_USB_YEALINK is not set 799# CONFIG_USB_YEALINK is not set
778# CONFIG_USB_XPAD is not set 800# CONFIG_USB_XPAD is not set
779# CONFIG_USB_ATI_REMOTE is not set 801# CONFIG_USB_ATI_REMOTE is not set
@@ -787,15 +809,6 @@ CONFIG_USB_HIDINPUT=y
787# CONFIG_USB_MDC800 is not set 809# CONFIG_USB_MDC800 is not set
788 810
789# 811#
790# USB Multimedia devices
791#
792# CONFIG_USB_DABUSB is not set
793
794#
795# Video4Linux support is needed for USB Multimedia device support
796#
797
798#
799# USB Network Adapters 812# USB Network Adapters
800# 813#
801# CONFIG_USB_CATC is not set 814# CONFIG_USB_CATC is not set
@@ -816,7 +829,7 @@ CONFIG_USB_SERIAL=y
816# CONFIG_USB_SERIAL_CONSOLE is not set 829# CONFIG_USB_SERIAL_CONSOLE is not set
817CONFIG_USB_SERIAL_GENERIC=y 830CONFIG_USB_SERIAL_GENERIC=y
818# CONFIG_USB_SERIAL_AIRPRIME is not set 831# CONFIG_USB_SERIAL_AIRPRIME is not set
819# CONFIG_USB_SERIAL_ANYDATA is not set 832# CONFIG_USB_SERIAL_ARK3116 is not set
820# CONFIG_USB_SERIAL_BELKIN is not set 833# CONFIG_USB_SERIAL_BELKIN is not set
821# CONFIG_USB_SERIAL_WHITEHEAT is not set 834# CONFIG_USB_SERIAL_WHITEHEAT is not set
822# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 835# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
@@ -824,6 +837,7 @@ CONFIG_USB_SERIAL_GENERIC=y
824CONFIG_USB_SERIAL_CYPRESS_M8=m 837CONFIG_USB_SERIAL_CYPRESS_M8=m
825# CONFIG_USB_SERIAL_EMPEG is not set 838# CONFIG_USB_SERIAL_EMPEG is not set
826# CONFIG_USB_SERIAL_FTDI_SIO is not set 839# CONFIG_USB_SERIAL_FTDI_SIO is not set
840# CONFIG_USB_SERIAL_FUNSOFT is not set
827# CONFIG_USB_SERIAL_VISOR is not set 841# CONFIG_USB_SERIAL_VISOR is not set
828# CONFIG_USB_SERIAL_IPAQ is not set 842# CONFIG_USB_SERIAL_IPAQ is not set
829# CONFIG_USB_SERIAL_IR is not set 843# CONFIG_USB_SERIAL_IR is not set
@@ -848,12 +862,15 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
848# CONFIG_USB_SERIAL_KLSI is not set 862# CONFIG_USB_SERIAL_KLSI is not set
849# CONFIG_USB_SERIAL_KOBIL_SCT is not set 863# CONFIG_USB_SERIAL_KOBIL_SCT is not set
850# CONFIG_USB_SERIAL_MCT_U232 is not set 864# CONFIG_USB_SERIAL_MCT_U232 is not set
865# CONFIG_USB_SERIAL_NAVMAN is not set
851# CONFIG_USB_SERIAL_PL2303 is not set 866# CONFIG_USB_SERIAL_PL2303 is not set
852# CONFIG_USB_SERIAL_HP4X is not set 867# CONFIG_USB_SERIAL_HP4X is not set
853# CONFIG_USB_SERIAL_SAFE is not set 868# CONFIG_USB_SERIAL_SAFE is not set
869# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
854CONFIG_USB_SERIAL_TI=m 870CONFIG_USB_SERIAL_TI=m
855# CONFIG_USB_SERIAL_CYBERJACK is not set 871# CONFIG_USB_SERIAL_CYBERJACK is not set
856# CONFIG_USB_SERIAL_XIRCOM is not set 872# CONFIG_USB_SERIAL_XIRCOM is not set
873# CONFIG_USB_SERIAL_OPTION is not set
857# CONFIG_USB_SERIAL_OMNINET is not set 874# CONFIG_USB_SERIAL_OMNINET is not set
858CONFIG_USB_EZUSB=y 875CONFIG_USB_EZUSB=y
859 876
@@ -867,10 +884,12 @@ CONFIG_USB_EZUSB=y
867# CONFIG_USB_LEGOTOWER is not set 884# CONFIG_USB_LEGOTOWER is not set
868# CONFIG_USB_LCD is not set 885# CONFIG_USB_LCD is not set
869# CONFIG_USB_LED is not set 886# CONFIG_USB_LED is not set
887# CONFIG_USB_CYPRESS_CY7C63 is not set
870# CONFIG_USB_CYTHERM is not set 888# CONFIG_USB_CYTHERM is not set
871# CONFIG_USB_PHIDGETKIT is not set 889# CONFIG_USB_PHIDGETKIT is not set
872# CONFIG_USB_PHIDGETSERVO is not set 890# CONFIG_USB_PHIDGETSERVO is not set
873# CONFIG_USB_IDMOUSE is not set 891# CONFIG_USB_IDMOUSE is not set
892# CONFIG_USB_APPLEDISPLAY is not set
874# CONFIG_USB_SISUSBVGA is not set 893# CONFIG_USB_SISUSBVGA is not set
875# CONFIG_USB_LD is not set 894# CONFIG_USB_LD is not set
876# CONFIG_USB_TEST is not set 895# CONFIG_USB_TEST is not set
@@ -890,6 +909,19 @@ CONFIG_USB_EZUSB=y
890# CONFIG_MMC is not set 909# CONFIG_MMC is not set
891 910
892# 911#
912# LED devices
913#
914# CONFIG_NEW_LEDS is not set
915
916#
917# LED drivers
918#
919
920#
921# LED Triggers
922#
923
924#
893# InfiniBand support 925# InfiniBand support
894# 926#
895# CONFIG_INFINIBAND is not set 927# CONFIG_INFINIBAND is not set
@@ -899,6 +931,24 @@ CONFIG_USB_EZUSB=y
899# 931#
900 932
901# 933#
934# Real Time Clock
935#
936# CONFIG_RTC_CLASS is not set
937
938#
939# DMA Engine support
940#
941# CONFIG_DMA_ENGINE is not set
942
943#
944# DMA Clients
945#
946
947#
948# DMA Devices
949#
950
951#
902# File systems 952# File systems
903# 953#
904CONFIG_EXT2_FS=y 954CONFIG_EXT2_FS=y
@@ -917,6 +967,7 @@ CONFIG_FS_POSIX_ACL=y
917# CONFIG_MINIX_FS is not set 967# CONFIG_MINIX_FS is not set
918# CONFIG_ROMFS_FS is not set 968# CONFIG_ROMFS_FS is not set
919CONFIG_INOTIFY=y 969CONFIG_INOTIFY=y
970CONFIG_INOTIFY_USER=y
920# CONFIG_QUOTA is not set 971# CONFIG_QUOTA is not set
921CONFIG_DNOTIFY=y 972CONFIG_DNOTIFY=y
922# CONFIG_AUTOFS_FS is not set 973# CONFIG_AUTOFS_FS is not set
@@ -949,7 +1000,6 @@ CONFIG_TMPFS=y
949CONFIG_HUGETLBFS=y 1000CONFIG_HUGETLBFS=y
950CONFIG_HUGETLB_PAGE=y 1001CONFIG_HUGETLB_PAGE=y
951CONFIG_RAMFS=y 1002CONFIG_RAMFS=y
952# CONFIG_RELAYFS_FS is not set
953# CONFIG_CONFIGFS_FS is not set 1003# CONFIG_CONFIGFS_FS is not set
954 1004
955# 1005#
@@ -1067,6 +1117,7 @@ CONFIG_CRC_CCITT=y
1067CONFIG_CRC32=y 1117CONFIG_CRC32=y
1068# CONFIG_LIBCRC32C is not set 1118# CONFIG_LIBCRC32C is not set
1069CONFIG_ZLIB_INFLATE=y 1119CONFIG_ZLIB_INFLATE=y
1120CONFIG_PLIST=y
1070 1121
1071# 1122#
1072# Instrumentation Support 1123# Instrumentation Support
@@ -1079,14 +1130,20 @@ CONFIG_ZLIB_INFLATE=y
1079# 1130#
1080# CONFIG_PRINTK_TIME is not set 1131# CONFIG_PRINTK_TIME is not set
1081CONFIG_MAGIC_SYSRQ=y 1132CONFIG_MAGIC_SYSRQ=y
1133# CONFIG_UNUSED_SYMBOLS is not set
1082CONFIG_DEBUG_KERNEL=y 1134CONFIG_DEBUG_KERNEL=y
1083CONFIG_LOG_BUF_SHIFT=17 1135CONFIG_LOG_BUF_SHIFT=17
1084CONFIG_DETECT_SOFTLOCKUP=y 1136CONFIG_DETECT_SOFTLOCKUP=y
1085# CONFIG_SCHEDSTATS is not set 1137# CONFIG_SCHEDSTATS is not set
1086CONFIG_DEBUG_SLAB=y 1138CONFIG_DEBUG_SLAB=y
1087# CONFIG_DEBUG_MUTEXES is not set 1139# CONFIG_DEBUG_SLAB_LEAK is not set
1140# CONFIG_DEBUG_RT_MUTEXES is not set
1141# CONFIG_RT_MUTEX_TESTER is not set
1088# CONFIG_DEBUG_SPINLOCK is not set 1142# CONFIG_DEBUG_SPINLOCK is not set
1143# CONFIG_DEBUG_MUTEXES is not set
1144# CONFIG_DEBUG_RWSEMS is not set
1089CONFIG_DEBUG_SPINLOCK_SLEEP=y 1145CONFIG_DEBUG_SPINLOCK_SLEEP=y
1146# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1090# CONFIG_DEBUG_KOBJECT is not set 1147# CONFIG_DEBUG_KOBJECT is not set
1091# CONFIG_DEBUG_INFO is not set 1148# CONFIG_DEBUG_INFO is not set
1092CONFIG_DEBUG_FS=y 1149CONFIG_DEBUG_FS=y
@@ -1100,11 +1157,7 @@ CONFIG_XMON=y
1100CONFIG_XMON_DEFAULT=y 1157CONFIG_XMON_DEFAULT=y
1101# CONFIG_IRQSTACKS is not set 1158# CONFIG_IRQSTACKS is not set
1102CONFIG_BOOTX_TEXT=y 1159CONFIG_BOOTX_TEXT=y
1103# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1160# CONFIG_PPC_EARLY_DEBUG is not set
1104# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1105# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1106# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1107# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1108 1161
1109# 1162#
1110# Security options 1163# Security options
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 15a50f4ceb1f..719fba4eb421 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc4 3# Linux kernel version: 2.6.18-rc6
4# Sat May 27 18:45:55 2006 4# Sun Sep 10 10:26:55 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_CLASSIC32=y
29# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
30# CONFIG_PPC_83xx is not set 32# CONFIG_PPC_83xx is not set
31# CONFIG_PPC_85xx is not set 33# CONFIG_PPC_85xx is not set
34# CONFIG_PPC_86xx is not set
32# CONFIG_40x is not set 35# CONFIG_40x is not set
33# CONFIG_44x is not set 36# CONFIG_44x is not set
34# CONFIG_8xx is not set 37# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_PPC_FPU=y
39CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
40CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
41# CONFIG_SMP is not set 44# CONFIG_SMP is not set
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42 46
43# 47#
44# Code maturity level options 48# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
58# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
59CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
60# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
61# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -70,10 +75,12 @@ CONFIG_PRINTK=y
70CONFIG_BUG=y 75CONFIG_BUG=y
71CONFIG_ELF_CORE=y 76CONFIG_ELF_CORE=y
72CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
78CONFIG_RT_MUTEXES=y
73CONFIG_FUTEX=y 79CONFIG_FUTEX=y
74CONFIG_EPOLL=y 80CONFIG_EPOLL=y
75CONFIG_SHMEM=y 81CONFIG_SHMEM=y
76CONFIG_SLAB=y 82CONFIG_SLAB=y
83CONFIG_VM_EVENT_COUNTERS=y
77# CONFIG_TINY_SHMEM is not set 84# CONFIG_TINY_SHMEM is not set
78CONFIG_BASE_SMALL=0 85CONFIG_BASE_SMALL=0
79# CONFIG_SLOB is not set 86# CONFIG_SLOB is not set
@@ -110,13 +117,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
110# CONFIG_PPC_ISERIES is not set 117# CONFIG_PPC_ISERIES is not set
111CONFIG_EMBEDDED6xx=y 118CONFIG_EMBEDDED6xx=y
112# CONFIG_APUS is not set 119# CONFIG_APUS is not set
113CONFIG_MPIC=y 120# CONFIG_PPC_CELL is not set
121# CONFIG_PPC_CELL_NATIVE is not set
122# CONFIG_UDBG_RTAS_CONSOLE is not set
114# CONFIG_PPC_RTAS is not set 123# CONFIG_PPC_RTAS is not set
115# CONFIG_MMIO_NVRAM is not set 124# CONFIG_MMIO_NVRAM is not set
116# CONFIG_PPC_MPC106 is not set 125# CONFIG_PPC_MPC106 is not set
117# CONFIG_PPC_970_NAP is not set 126# CONFIG_PPC_970_NAP is not set
118# CONFIG_CPU_FREQ is not set 127# CONFIG_CPU_FREQ is not set
119# CONFIG_TAU is not set 128# CONFIG_TAU is not set
129# CONFIG_PPC_TODC is not set
120# CONFIG_KATANA is not set 130# CONFIG_KATANA is not set
121# CONFIG_WILLOW is not set 131# CONFIG_WILLOW is not set
122# CONFIG_CPCI690 is not set 132# CONFIG_CPCI690 is not set
@@ -146,6 +156,7 @@ CONFIG_MPC7448HPC2=y
146# CONFIG_EV64360 is not set 156# CONFIG_EV64360 is not set
147CONFIG_TSI108_BRIDGE=y 157CONFIG_TSI108_BRIDGE=y
148# CONFIG_WANT_EARLY_SERIAL is not set 158# CONFIG_WANT_EARLY_SERIAL is not set
159CONFIG_MPIC=y
149 160
150# 161#
151# Kernel options 162# Kernel options
@@ -160,6 +171,7 @@ CONFIG_PREEMPT_NONE=y
160# CONFIG_PREEMPT is not set 171# CONFIG_PREEMPT is not set
161CONFIG_BINFMT_ELF=y 172CONFIG_BINFMT_ELF=y
162CONFIG_BINFMT_MISC=y 173CONFIG_BINFMT_MISC=y
174CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
163CONFIG_ARCH_FLATMEM_ENABLE=y 175CONFIG_ARCH_FLATMEM_ENABLE=y
164CONFIG_SELECT_MEMORY_MODEL=y 176CONFIG_SELECT_MEMORY_MODEL=y
165CONFIG_FLATMEM_MANUAL=y 177CONFIG_FLATMEM_MANUAL=y
@@ -169,10 +181,10 @@ CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 181CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 182# CONFIG_SPARSEMEM_STATIC is not set
171CONFIG_SPLIT_PTLOCK_CPUS=4 183CONFIG_SPLIT_PTLOCK_CPUS=4
184# CONFIG_RESOURCES_64BIT is not set
172CONFIG_PROC_DEVICETREE=y 185CONFIG_PROC_DEVICETREE=y
173# CONFIG_CMDLINE_BOOL is not set 186# CONFIG_CMDLINE_BOOL is not set
174# CONFIG_PM is not set 187# CONFIG_PM is not set
175# CONFIG_SOFTWARE_SUSPEND is not set
176# CONFIG_SECCOMP is not set 188# CONFIG_SECCOMP is not set
177CONFIG_ISA_DMA_API=y 189CONFIG_ISA_DMA_API=y
178 190
@@ -180,10 +192,12 @@ CONFIG_ISA_DMA_API=y
180# Bus options 192# Bus options
181# 193#
182CONFIG_GENERIC_ISA_DMA=y 194CONFIG_GENERIC_ISA_DMA=y
195CONFIG_MPIC_WEIRD=y
183# CONFIG_PPC_I8259 is not set 196# CONFIG_PPC_I8259 is not set
184# CONFIG_PPC_INDIRECT_PCI is not set 197# CONFIG_PPC_INDIRECT_PCI is not set
185CONFIG_PCI=y 198CONFIG_PCI=y
186CONFIG_PCI_DOMAINS=y 199CONFIG_PCI_DOMAINS=y
200# CONFIG_PCIEPORTBUS is not set
187 201
188# 202#
189# PCCARD (PCMCIA/CardBus) support 203# PCCARD (PCMCIA/CardBus) support
@@ -221,6 +235,8 @@ CONFIG_NET=y
221CONFIG_PACKET=y 235CONFIG_PACKET=y
222# CONFIG_PACKET_MMAP is not set 236# CONFIG_PACKET_MMAP is not set
223CONFIG_UNIX=y 237CONFIG_UNIX=y
238CONFIG_XFRM=y
239CONFIG_XFRM_USER=y
224# CONFIG_NET_KEY is not set 240# CONFIG_NET_KEY is not set
225CONFIG_INET=y 241CONFIG_INET=y
226CONFIG_IP_MULTICAST=y 242CONFIG_IP_MULTICAST=y
@@ -240,6 +256,8 @@ CONFIG_SYN_COOKIES=y
240# CONFIG_INET_IPCOMP is not set 256# CONFIG_INET_IPCOMP is not set
241# CONFIG_INET_XFRM_TUNNEL is not set 257# CONFIG_INET_XFRM_TUNNEL is not set
242# CONFIG_INET_TUNNEL is not set 258# CONFIG_INET_TUNNEL is not set
259CONFIG_INET_XFRM_MODE_TRANSPORT=y
260CONFIG_INET_XFRM_MODE_TUNNEL=y
243CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
244CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
245# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
@@ -247,6 +265,7 @@ CONFIG_TCP_CONG_BIC=y
247# CONFIG_IPV6 is not set 265# CONFIG_IPV6 is not set
248# CONFIG_INET6_XFRM_TUNNEL is not set 266# CONFIG_INET6_XFRM_TUNNEL is not set
249# CONFIG_INET6_TUNNEL is not set 267# CONFIG_INET6_TUNNEL is not set
268# CONFIG_NETWORK_SECMARK is not set
250# CONFIG_NETFILTER is not set 269# CONFIG_NETFILTER is not set
251 270
252# 271#
@@ -300,6 +319,7 @@ CONFIG_TCP_CONG_BIC=y
300CONFIG_STANDALONE=y 319CONFIG_STANDALONE=y
301CONFIG_PREVENT_FIRMWARE_BUILD=y 320CONFIG_PREVENT_FIRMWARE_BUILD=y
302# CONFIG_FW_LOADER is not set 321# CONFIG_FW_LOADER is not set
322# CONFIG_SYS_HYPERVISOR is not set
303 323
304# 324#
305# Connector - unified userspace <-> kernelspace linker 325# Connector - unified userspace <-> kernelspace linker
@@ -336,6 +356,7 @@ CONFIG_BLK_DEV_LOOP=y
336CONFIG_BLK_DEV_RAM=y 356CONFIG_BLK_DEV_RAM=y
337CONFIG_BLK_DEV_RAM_COUNT=16 357CONFIG_BLK_DEV_RAM_COUNT=16
338CONFIG_BLK_DEV_RAM_SIZE=131072 358CONFIG_BLK_DEV_RAM_SIZE=131072
359CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
339CONFIG_BLK_DEV_INITRD=y 360CONFIG_BLK_DEV_INITRD=y
340# CONFIG_CDROM_PKTCDVD is not set 361# CONFIG_CDROM_PKTCDVD is not set
341# CONFIG_ATA_OVER_ETH is not set 362# CONFIG_ATA_OVER_ETH is not set
@@ -399,6 +420,7 @@ CONFIG_SCSI_SATA=y
399CONFIG_SCSI_SATA_MV=y 420CONFIG_SCSI_SATA_MV=y
400# CONFIG_SCSI_SATA_NV is not set 421# CONFIG_SCSI_SATA_NV is not set
401# CONFIG_SCSI_PDC_ADMA is not set 422# CONFIG_SCSI_PDC_ADMA is not set
423# CONFIG_SCSI_HPTIOP is not set
402# CONFIG_SCSI_SATA_QSTOR is not set 424# CONFIG_SCSI_SATA_QSTOR is not set
403# CONFIG_SCSI_SATA_PROMISE is not set 425# CONFIG_SCSI_SATA_PROMISE is not set
404# CONFIG_SCSI_SATA_SX4 is not set 426# CONFIG_SCSI_SATA_SX4 is not set
@@ -481,6 +503,9 @@ CONFIG_PHYLIB=y
481# CONFIG_QSEMI_PHY is not set 503# CONFIG_QSEMI_PHY is not set
482# CONFIG_LXT_PHY is not set 504# CONFIG_LXT_PHY is not set
483# CONFIG_CICADA_PHY is not set 505# CONFIG_CICADA_PHY is not set
506# CONFIG_VITESSE_PHY is not set
507# CONFIG_SMSC_PHY is not set
508# CONFIG_FIXED_PHY is not set
484 509
485# 510#
486# Ethernet (10 or 100Mbit) 511# Ethernet (10 or 100Mbit)
@@ -538,7 +563,6 @@ CONFIG_8139TOO=y
538# CONFIG_VIA_VELOCITY is not set 563# CONFIG_VIA_VELOCITY is not set
539# CONFIG_TIGON3 is not set 564# CONFIG_TIGON3 is not set
540# CONFIG_BNX2 is not set 565# CONFIG_BNX2 is not set
541CONFIG_TSI108_ETH=y
542 566
543# 567#
544# Ethernet (10000 Mbit) 568# Ethernet (10000 Mbit)
@@ -546,6 +570,7 @@ CONFIG_TSI108_ETH=y
546# CONFIG_CHELSIO_T1 is not set 570# CONFIG_CHELSIO_T1 is not set
547# CONFIG_IXGB is not set 571# CONFIG_IXGB is not set
548# CONFIG_S2IO is not set 572# CONFIG_S2IO is not set
573# CONFIG_MYRI10GE is not set
549 574
550# 575#
551# Token Ring devices 576# Token Ring devices
@@ -645,6 +670,7 @@ CONFIG_LEGACY_PTY_COUNT=256
645# Watchdog Cards 670# Watchdog Cards
646# 671#
647# CONFIG_WATCHDOG is not set 672# CONFIG_WATCHDOG is not set
673# CONFIG_HW_RANDOM is not set
648# CONFIG_NVRAM is not set 674# CONFIG_NVRAM is not set
649CONFIG_GEN_RTC=y 675CONFIG_GEN_RTC=y
650# CONFIG_GEN_RTC_X is not set 676# CONFIG_GEN_RTC_X is not set
@@ -679,13 +705,13 @@ CONFIG_GEN_RTC=y
679# 705#
680# Dallas's 1-wire bus 706# Dallas's 1-wire bus
681# 707#
682# CONFIG_W1 is not set
683 708
684# 709#
685# Hardware Monitoring support 710# Hardware Monitoring support
686# 711#
687CONFIG_HWMON=y 712CONFIG_HWMON=y
688# CONFIG_HWMON_VID is not set 713# CONFIG_HWMON_VID is not set
714# CONFIG_SENSORS_ABITUGURU is not set
689# CONFIG_SENSORS_F71805F is not set 715# CONFIG_SENSORS_F71805F is not set
690# CONFIG_HWMON_DEBUG_CHIP is not set 716# CONFIG_HWMON_DEBUG_CHIP is not set
691 717
@@ -697,6 +723,7 @@ CONFIG_HWMON=y
697# Multimedia devices 723# Multimedia devices
698# 724#
699# CONFIG_VIDEO_DEV is not set 725# CONFIG_VIDEO_DEV is not set
726CONFIG_VIDEO_V4L2=y
700 727
701# 728#
702# Digital Video Broadcasting Devices 729# Digital Video Broadcasting Devices
@@ -706,7 +733,9 @@ CONFIG_HWMON=y
706# 733#
707# Graphics support 734# Graphics support
708# 735#
736CONFIG_FIRMWARE_EDID=y
709# CONFIG_FB is not set 737# CONFIG_FB is not set
738# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710 739
711# 740#
712# Sound 741# Sound
@@ -763,6 +792,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
763# CONFIG_RTC_CLASS is not set 792# CONFIG_RTC_CLASS is not set
764 793
765# 794#
795# DMA Engine support
796#
797# CONFIG_DMA_ENGINE is not set
798
799#
800# DMA Clients
801#
802
803#
804# DMA Devices
805#
806
807#
766# File systems 808# File systems
767# 809#
768CONFIG_EXT2_FS=y 810CONFIG_EXT2_FS=y
@@ -783,6 +825,7 @@ CONFIG_FS_MBCACHE=y
783# CONFIG_MINIX_FS is not set 825# CONFIG_MINIX_FS is not set
784# CONFIG_ROMFS_FS is not set 826# CONFIG_ROMFS_FS is not set
785CONFIG_INOTIFY=y 827CONFIG_INOTIFY=y
828CONFIG_INOTIFY_USER=y
786# CONFIG_QUOTA is not set 829# CONFIG_QUOTA is not set
787CONFIG_DNOTIFY=y 830CONFIG_DNOTIFY=y
788# CONFIG_AUTOFS_FS is not set 831# CONFIG_AUTOFS_FS is not set
@@ -884,6 +927,7 @@ CONFIG_MSDOS_PARTITION=y
884# CONFIG_CRC16 is not set 927# CONFIG_CRC16 is not set
885CONFIG_CRC32=y 928CONFIG_CRC32=y
886# CONFIG_LIBCRC32C is not set 929# CONFIG_LIBCRC32C is not set
930CONFIG_PLIST=y
887 931
888# 932#
889# Instrumentation Support 933# Instrumentation Support
@@ -895,17 +939,13 @@ CONFIG_CRC32=y
895# 939#
896# CONFIG_PRINTK_TIME is not set 940# CONFIG_PRINTK_TIME is not set
897# CONFIG_MAGIC_SYSRQ is not set 941# CONFIG_MAGIC_SYSRQ is not set
942# CONFIG_UNUSED_SYMBOLS is not set
898# CONFIG_DEBUG_KERNEL is not set 943# CONFIG_DEBUG_KERNEL is not set
899CONFIG_LOG_BUF_SHIFT=14 944CONFIG_LOG_BUF_SHIFT=14
900# CONFIG_DEBUG_FS is not set 945# CONFIG_DEBUG_FS is not set
901# CONFIG_UNWIND_INFO is not set 946# CONFIG_UNWIND_INFO is not set
902# CONFIG_BOOTX_TEXT is not set 947# CONFIG_BOOTX_TEXT is not set
903# CONFIG_SERIAL_TEXT_DEBUG is not set 948# CONFIG_PPC_EARLY_DEBUG is not set
904# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
905# CONFIG_PPC_EARLY_DEBUG_G5 is not set
906# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
907# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
908# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
909 949
910# 950#
911# Security options 951# Security options
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index fc2d9789adc8..8da6a47f0339 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17 3# Linux kernel version: 2.6.18-rc6
4# Fri Jun 30 17:53:25 2006 4# Sun Sep 10 10:28:05 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -60,6 +60,7 @@ CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
61# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
62# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
63CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
64# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
65# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -78,6 +79,7 @@ CONFIG_FUTEX=y
78# CONFIG_EPOLL is not set 79# CONFIG_EPOLL is not set
79CONFIG_SHMEM=y 80CONFIG_SHMEM=y
80CONFIG_SLAB=y 81CONFIG_SLAB=y
82CONFIG_VM_EVENT_COUNTERS=y
81# CONFIG_TINY_SHMEM is not set 83# CONFIG_TINY_SHMEM is not set
82CONFIG_BASE_SMALL=0 84CONFIG_BASE_SMALL=0
83# CONFIG_SLOB is not set 85# CONFIG_SLOB is not set
@@ -120,6 +122,7 @@ CONFIG_PPC_GEN550=y
120# CONFIG_MPC834x_SYS is not set 122# CONFIG_MPC834x_SYS is not set
121CONFIG_MPC834x_ITX=y 123CONFIG_MPC834x_ITX=y
122CONFIG_MPC834x=y 124CONFIG_MPC834x=y
125# CONFIG_MPIC is not set
123 126
124# 127#
125# Kernel options 128# Kernel options
@@ -148,7 +151,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
148CONFIG_PROC_DEVICETREE=y 151CONFIG_PROC_DEVICETREE=y
149# CONFIG_CMDLINE_BOOL is not set 152# CONFIG_CMDLINE_BOOL is not set
150# CONFIG_PM is not set 153# CONFIG_PM is not set
151# CONFIG_SOFTWARE_SUSPEND is not set
152CONFIG_SECCOMP=y 154CONFIG_SECCOMP=y
153CONFIG_ISA_DMA_API=y 155CONFIG_ISA_DMA_API=y
154 156
@@ -156,6 +158,7 @@ CONFIG_ISA_DMA_API=y
156# Bus options 158# Bus options
157# 159#
158CONFIG_GENERIC_ISA_DMA=y 160CONFIG_GENERIC_ISA_DMA=y
161# CONFIG_MPIC_WEIRD is not set
159# CONFIG_PPC_I8259 is not set 162# CONFIG_PPC_I8259 is not set
160CONFIG_PPC_INDIRECT_PCI=y 163CONFIG_PPC_INDIRECT_PCI=y
161CONFIG_FSL_SOC=y 164CONFIG_FSL_SOC=y
@@ -401,6 +404,7 @@ CONFIG_BLK_DEV_LOOP=y
401CONFIG_BLK_DEV_RAM=y 404CONFIG_BLK_DEV_RAM=y
402CONFIG_BLK_DEV_RAM_COUNT=16 405CONFIG_BLK_DEV_RAM_COUNT=16
403CONFIG_BLK_DEV_RAM_SIZE=32768 406CONFIG_BLK_DEV_RAM_SIZE=32768
407CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
404CONFIG_BLK_DEV_INITRD=y 408CONFIG_BLK_DEV_INITRD=y
405# CONFIG_CDROM_PKTCDVD is not set 409# CONFIG_CDROM_PKTCDVD is not set
406# CONFIG_ATA_OVER_ETH is not set 410# CONFIG_ATA_OVER_ETH is not set
@@ -561,6 +565,7 @@ CONFIG_PHYLIB=y
561CONFIG_CICADA_PHY=y 565CONFIG_CICADA_PHY=y
562# CONFIG_VITESSE_PHY is not set 566# CONFIG_VITESSE_PHY is not set
563# CONFIG_SMSC_PHY is not set 567# CONFIG_SMSC_PHY is not set
568# CONFIG_FIXED_PHY is not set
564 569
565# 570#
566# Ethernet (10 or 100Mbit) 571# Ethernet (10 or 100Mbit)
@@ -905,6 +910,7 @@ CONFIG_VIDEO_V4L2=y
905# 910#
906CONFIG_FIRMWARE_EDID=y 911CONFIG_FIRMWARE_EDID=y
907# CONFIG_FB is not set 912# CONFIG_FB is not set
913# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
908 914
909# 915#
910# Sound 916# Sound
@@ -1025,7 +1031,7 @@ CONFIG_USB_MON=y
1025# CONFIG_USB_LEGOTOWER is not set 1031# CONFIG_USB_LEGOTOWER is not set
1026# CONFIG_USB_LCD is not set 1032# CONFIG_USB_LCD is not set
1027# CONFIG_USB_LED is not set 1033# CONFIG_USB_LED is not set
1028# CONFIG_USB_CY7C63 is not set 1034# CONFIG_USB_CYPRESS_CY7C63 is not set
1029# CONFIG_USB_CYTHERM is not set 1035# CONFIG_USB_CYTHERM is not set
1030# CONFIG_USB_PHIDGETKIT is not set 1036# CONFIG_USB_PHIDGETKIT is not set
1031# CONFIG_USB_PHIDGETSERVO is not set 1037# CONFIG_USB_PHIDGETSERVO is not set
@@ -1110,6 +1116,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
1110# CONFIG_RTC_DRV_X1205 is not set 1116# CONFIG_RTC_DRV_X1205 is not set
1111CONFIG_RTC_DRV_DS1307=y 1117CONFIG_RTC_DRV_DS1307=y
1112# CONFIG_RTC_DRV_DS1553 is not set 1118# CONFIG_RTC_DRV_DS1553 is not set
1119# CONFIG_RTC_DRV_ISL1208 is not set
1113# CONFIG_RTC_DRV_DS1672 is not set 1120# CONFIG_RTC_DRV_DS1672 is not set
1114# CONFIG_RTC_DRV_DS1742 is not set 1121# CONFIG_RTC_DRV_DS1742 is not set
1115# CONFIG_RTC_DRV_PCF8563 is not set 1122# CONFIG_RTC_DRV_PCF8563 is not set
@@ -1226,7 +1233,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1226# CONFIG_RPCSEC_GSS_SPKM3 is not set 1233# CONFIG_RPCSEC_GSS_SPKM3 is not set
1227# CONFIG_SMB_FS is not set 1234# CONFIG_SMB_FS is not set
1228# CONFIG_CIFS is not set 1235# CONFIG_CIFS is not set
1229# CONFIG_CIFS_DEBUG2 is not set
1230# CONFIG_NCP_FS is not set 1236# CONFIG_NCP_FS is not set
1231# CONFIG_CODA_FS is not set 1237# CONFIG_CODA_FS is not set
1232# CONFIG_AFS_FS is not set 1238# CONFIG_AFS_FS is not set
@@ -1279,11 +1285,13 @@ CONFIG_LOG_BUF_SHIFT=17
1279CONFIG_DETECT_SOFTLOCKUP=y 1285CONFIG_DETECT_SOFTLOCKUP=y
1280# CONFIG_SCHEDSTATS is not set 1286# CONFIG_SCHEDSTATS is not set
1281# CONFIG_DEBUG_SLAB is not set 1287# CONFIG_DEBUG_SLAB is not set
1282# CONFIG_DEBUG_MUTEXES is not set
1283# CONFIG_DEBUG_RT_MUTEXES is not set 1288# CONFIG_DEBUG_RT_MUTEXES is not set
1284# CONFIG_RT_MUTEX_TESTER is not set 1289# CONFIG_RT_MUTEX_TESTER is not set
1285# CONFIG_DEBUG_SPINLOCK is not set 1290# CONFIG_DEBUG_SPINLOCK is not set
1291# CONFIG_DEBUG_MUTEXES is not set
1292# CONFIG_DEBUG_RWSEMS is not set
1286# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1293# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1294# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1287# CONFIG_DEBUG_KOBJECT is not set 1295# CONFIG_DEBUG_KOBJECT is not set
1288CONFIG_DEBUG_INFO=y 1296CONFIG_DEBUG_INFO=y
1289# CONFIG_DEBUG_FS is not set 1297# CONFIG_DEBUG_FS is not set
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 5078b0441d61..9eefab967898 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_defconfig
@@ -1,15 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc6 3# Linux kernel version: 2.6.18-rc6
4# Wed Mar 15 16:19:56 2006 4# Sun Sep 10 10:28:54 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_PPC=y 16CONFIG_PPC=y
14CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
15CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -27,17 +30,19 @@ CONFIG_DEFAULT_UIMAGE=y
27# CONFIG_PPC_52xx is not set 30# CONFIG_PPC_52xx is not set
28# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
29CONFIG_PPC_83xx=y 32CONFIG_PPC_83xx=y
33# CONFIG_PPC_85xx is not set
34# CONFIG_PPC_86xx is not set
30# CONFIG_40x is not set 35# CONFIG_40x is not set
31# CONFIG_44x is not set 36# CONFIG_44x is not set
32# CONFIG_8xx is not set 37# CONFIG_8xx is not set
33# CONFIG_E200 is not set 38# CONFIG_E200 is not set
34# CONFIG_E500 is not set
35CONFIG_6xx=y 39CONFIG_6xx=y
36CONFIG_83xx=y 40CONFIG_83xx=y
37CONFIG_PPC_FPU=y 41CONFIG_PPC_FPU=y
38CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
39CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
40# CONFIG_SMP is not set 44# CONFIG_SMP is not set
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
41 46
42# 47#
43# Code maturity level options 48# Code maturity level options
@@ -55,9 +60,11 @@ CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
56# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
57# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
58CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
59# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
60# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
67# CONFIG_RELAY is not set
61CONFIG_INITRAMFS_SOURCE="" 68CONFIG_INITRAMFS_SOURCE=""
62# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 69# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
63CONFIG_EMBEDDED=y 70CONFIG_EMBEDDED=y
@@ -67,14 +74,12 @@ CONFIG_PRINTK=y
67CONFIG_BUG=y 74CONFIG_BUG=y
68CONFIG_ELF_CORE=y 75CONFIG_ELF_CORE=y
69CONFIG_BASE_FULL=y 76CONFIG_BASE_FULL=y
77CONFIG_RT_MUTEXES=y
70CONFIG_FUTEX=y 78CONFIG_FUTEX=y
71# CONFIG_EPOLL is not set 79# CONFIG_EPOLL is not set
72CONFIG_SHMEM=y 80CONFIG_SHMEM=y
73CONFIG_CC_ALIGN_FUNCTIONS=0
74CONFIG_CC_ALIGN_LABELS=0
75CONFIG_CC_ALIGN_LOOPS=0
76CONFIG_CC_ALIGN_JUMPS=0
77CONFIG_SLAB=y 81CONFIG_SLAB=y
82CONFIG_VM_EVENT_COUNTERS=y
78# CONFIG_TINY_SHMEM is not set 83# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 84CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set 85# CONFIG_SLOB is not set
@@ -85,7 +90,6 @@ CONFIG_BASE_SMALL=0
85CONFIG_MODULES=y 90CONFIG_MODULES=y
86CONFIG_MODULE_UNLOAD=y 91CONFIG_MODULE_UNLOAD=y
87# CONFIG_MODULE_FORCE_UNLOAD is not set 92# CONFIG_MODULE_FORCE_UNLOAD is not set
88CONFIG_OBSOLETE_MODPARM=y
89# CONFIG_MODVERSIONS is not set 93# CONFIG_MODVERSIONS is not set
90# CONFIG_MODULE_SRCVERSION_ALL is not set 94# CONFIG_MODULE_SRCVERSION_ALL is not set
91# CONFIG_KMOD is not set 95# CONFIG_KMOD is not set
@@ -94,6 +98,8 @@ CONFIG_OBSOLETE_MODPARM=y
94# Block layer 98# Block layer
95# 99#
96# CONFIG_LBD is not set 100# CONFIG_LBD is not set
101# CONFIG_BLK_DEV_IO_TRACE is not set
102# CONFIG_LSF is not set
97 103
98# 104#
99# IO Schedulers 105# IO Schedulers
@@ -114,7 +120,9 @@ CONFIG_PPC_GEN550=y
114# Platform support 120# Platform support
115# 121#
116CONFIG_MPC834x_SYS=y 122CONFIG_MPC834x_SYS=y
123# CONFIG_MPC834x_ITX is not set
117CONFIG_MPC834x=y 124CONFIG_MPC834x=y
125# CONFIG_MPIC is not set
118 126
119# 127#
120# Kernel options 128# Kernel options
@@ -129,6 +137,7 @@ CONFIG_PREEMPT_NONE=y
129# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
130CONFIG_BINFMT_ELF=y 138CONFIG_BINFMT_ELF=y
131# CONFIG_BINFMT_MISC is not set 139# CONFIG_BINFMT_MISC is not set
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
132CONFIG_ARCH_FLATMEM_ENABLE=y 141CONFIG_ARCH_FLATMEM_ENABLE=y
133CONFIG_SELECT_MEMORY_MODEL=y 142CONFIG_SELECT_MEMORY_MODEL=y
134CONFIG_FLATMEM_MANUAL=y 143CONFIG_FLATMEM_MANUAL=y
@@ -138,10 +147,10 @@ CONFIG_FLATMEM=y
138CONFIG_FLAT_NODE_MEM_MAP=y 147CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 149CONFIG_SPLIT_PTLOCK_CPUS=4
150# CONFIG_RESOURCES_64BIT is not set
141CONFIG_PROC_DEVICETREE=y 151CONFIG_PROC_DEVICETREE=y
142# CONFIG_CMDLINE_BOOL is not set 152# CONFIG_CMDLINE_BOOL is not set
143# CONFIG_PM is not set 153# CONFIG_PM is not set
144# CONFIG_SOFTWARE_SUSPEND is not set
145CONFIG_SECCOMP=y 154CONFIG_SECCOMP=y
146CONFIG_ISA_DMA_API=y 155CONFIG_ISA_DMA_API=y
147 156
@@ -149,12 +158,13 @@ CONFIG_ISA_DMA_API=y
149# Bus options 158# Bus options
150# 159#
151CONFIG_GENERIC_ISA_DMA=y 160CONFIG_GENERIC_ISA_DMA=y
161# CONFIG_MPIC_WEIRD is not set
152# CONFIG_PPC_I8259 is not set 162# CONFIG_PPC_I8259 is not set
153CONFIG_PPC_INDIRECT_PCI=y 163CONFIG_PPC_INDIRECT_PCI=y
154CONFIG_FSL_SOC=y 164CONFIG_FSL_SOC=y
155CONFIG_PCI=y 165CONFIG_PCI=y
156CONFIG_PCI_DOMAINS=y 166CONFIG_PCI_DOMAINS=y
157# CONFIG_PCI_LEGACY_PROC is not set 167# CONFIG_PCIEPORTBUS is not set
158 168
159# 169#
160# PCCARD (PCMCIA/CardBus) support 170# PCCARD (PCMCIA/CardBus) support
@@ -192,6 +202,8 @@ CONFIG_NET=y
192CONFIG_PACKET=y 202CONFIG_PACKET=y
193# CONFIG_PACKET_MMAP is not set 203# CONFIG_PACKET_MMAP is not set
194CONFIG_UNIX=y 204CONFIG_UNIX=y
205CONFIG_XFRM=y
206CONFIG_XFRM_USER=m
195# CONFIG_NET_KEY is not set 207# CONFIG_NET_KEY is not set
196CONFIG_INET=y 208CONFIG_INET=y
197CONFIG_IP_MULTICAST=y 209CONFIG_IP_MULTICAST=y
@@ -209,12 +221,18 @@ CONFIG_SYN_COOKIES=y
209# CONFIG_INET_AH is not set 221# CONFIG_INET_AH is not set
210# CONFIG_INET_ESP is not set 222# CONFIG_INET_ESP is not set
211# CONFIG_INET_IPCOMP is not set 223# CONFIG_INET_IPCOMP is not set
224# CONFIG_INET_XFRM_TUNNEL is not set
212# CONFIG_INET_TUNNEL is not set 225# CONFIG_INET_TUNNEL is not set
226CONFIG_INET_XFRM_MODE_TRANSPORT=y
227CONFIG_INET_XFRM_MODE_TUNNEL=y
213CONFIG_INET_DIAG=y 228CONFIG_INET_DIAG=y
214CONFIG_INET_TCP_DIAG=y 229CONFIG_INET_TCP_DIAG=y
215# CONFIG_TCP_CONG_ADVANCED is not set 230# CONFIG_TCP_CONG_ADVANCED is not set
216CONFIG_TCP_CONG_BIC=y 231CONFIG_TCP_CONG_BIC=y
217# CONFIG_IPV6 is not set 232# CONFIG_IPV6 is not set
233# CONFIG_INET6_XFRM_TUNNEL is not set
234# CONFIG_INET6_TUNNEL is not set
235# CONFIG_NETWORK_SECMARK is not set
218# CONFIG_NETFILTER is not set 236# CONFIG_NETFILTER is not set
219 237
220# 238#
@@ -268,6 +286,7 @@ CONFIG_TCP_CONG_BIC=y
268CONFIG_STANDALONE=y 286CONFIG_STANDALONE=y
269CONFIG_PREVENT_FIRMWARE_BUILD=y 287CONFIG_PREVENT_FIRMWARE_BUILD=y
270# CONFIG_FW_LOADER is not set 288# CONFIG_FW_LOADER is not set
289# CONFIG_SYS_HYPERVISOR is not set
271 290
272# 291#
273# Connector - unified userspace <-> kernelspace linker 292# Connector - unified userspace <-> kernelspace linker
@@ -304,6 +323,7 @@ CONFIG_BLK_DEV_LOOP=y
304CONFIG_BLK_DEV_RAM=y 323CONFIG_BLK_DEV_RAM=y
305CONFIG_BLK_DEV_RAM_COUNT=16 324CONFIG_BLK_DEV_RAM_COUNT=16
306CONFIG_BLK_DEV_RAM_SIZE=32768 325CONFIG_BLK_DEV_RAM_SIZE=32768
326CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
307CONFIG_BLK_DEV_INITRD=y 327CONFIG_BLK_DEV_INITRD=y
308# CONFIG_CDROM_PKTCDVD is not set 328# CONFIG_CDROM_PKTCDVD is not set
309# CONFIG_ATA_OVER_ETH is not set 329# CONFIG_ATA_OVER_ETH is not set
@@ -371,6 +391,9 @@ CONFIG_MARVELL_PHY=y
371# CONFIG_QSEMI_PHY is not set 391# CONFIG_QSEMI_PHY is not set
372# CONFIG_LXT_PHY is not set 392# CONFIG_LXT_PHY is not set
373# CONFIG_CICADA_PHY is not set 393# CONFIG_CICADA_PHY is not set
394# CONFIG_VITESSE_PHY is not set
395# CONFIG_SMSC_PHY is not set
396# CONFIG_FIXED_PHY is not set
374 397
375# 398#
376# Ethernet (10 or 100Mbit) 399# Ethernet (10 or 100Mbit)
@@ -433,6 +456,7 @@ CONFIG_GIANFAR=y
433# CONFIG_CHELSIO_T1 is not set 456# CONFIG_CHELSIO_T1 is not set
434# CONFIG_IXGB is not set 457# CONFIG_IXGB is not set
435# CONFIG_S2IO is not set 458# CONFIG_S2IO is not set
459# CONFIG_MYRI10GE is not set
436 460
437# 461#
438# Token Ring devices 462# Token Ring devices
@@ -507,6 +531,7 @@ CONFIG_INPUT=y
507# 531#
508CONFIG_SERIAL_8250=y 532CONFIG_SERIAL_8250=y
509CONFIG_SERIAL_8250_CONSOLE=y 533CONFIG_SERIAL_8250_CONSOLE=y
534CONFIG_SERIAL_8250_PCI=y
510CONFIG_SERIAL_8250_NR_UARTS=4 535CONFIG_SERIAL_8250_NR_UARTS=4
511CONFIG_SERIAL_8250_RUNTIME_UARTS=4 536CONFIG_SERIAL_8250_RUNTIME_UARTS=4
512# CONFIG_SERIAL_8250_EXTENDED is not set 537# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -543,6 +568,7 @@ CONFIG_83xx_WDT=y
543# 568#
544# CONFIG_PCIPCWATCHDOG is not set 569# CONFIG_PCIPCWATCHDOG is not set
545# CONFIG_WDTPCI is not set 570# CONFIG_WDTPCI is not set
571# CONFIG_HW_RANDOM is not set
546# CONFIG_NVRAM is not set 572# CONFIG_NVRAM is not set
547CONFIG_GEN_RTC=y 573CONFIG_GEN_RTC=y
548# CONFIG_GEN_RTC_X is not set 574# CONFIG_GEN_RTC_X is not set
@@ -589,10 +615,10 @@ CONFIG_I2C_CHARDEV=y
589# CONFIG_I2C_PIIX4 is not set 615# CONFIG_I2C_PIIX4 is not set
590CONFIG_I2C_MPC=y 616CONFIG_I2C_MPC=y
591# CONFIG_I2C_NFORCE2 is not set 617# CONFIG_I2C_NFORCE2 is not set
618# CONFIG_I2C_OCORES is not set
592# CONFIG_I2C_PARPORT_LIGHT is not set 619# CONFIG_I2C_PARPORT_LIGHT is not set
593# CONFIG_I2C_PROSAVAGE is not set 620# CONFIG_I2C_PROSAVAGE is not set
594# CONFIG_I2C_SAVAGE4 is not set 621# CONFIG_I2C_SAVAGE4 is not set
595# CONFIG_SCx200_ACB is not set
596# CONFIG_I2C_SIS5595 is not set 622# CONFIG_I2C_SIS5595 is not set
597# CONFIG_I2C_SIS630 is not set 623# CONFIG_I2C_SIS630 is not set
598# CONFIG_I2C_SIS96X is not set 624# CONFIG_I2C_SIS96X is not set
@@ -611,10 +637,8 @@ CONFIG_I2C_MPC=y
611# CONFIG_SENSORS_PCF8574 is not set 637# CONFIG_SENSORS_PCF8574 is not set
612# CONFIG_SENSORS_PCA9539 is not set 638# CONFIG_SENSORS_PCA9539 is not set
613# CONFIG_SENSORS_PCF8591 is not set 639# CONFIG_SENSORS_PCF8591 is not set
614# CONFIG_SENSORS_RTC8564 is not set
615# CONFIG_SENSORS_M41T00 is not set 640# CONFIG_SENSORS_M41T00 is not set
616# CONFIG_SENSORS_MAX6875 is not set 641# CONFIG_SENSORS_MAX6875 is not set
617# CONFIG_RTC_X1205_I2C is not set
618# CONFIG_I2C_DEBUG_CORE is not set 642# CONFIG_I2C_DEBUG_CORE is not set
619# CONFIG_I2C_DEBUG_ALGO is not set 643# CONFIG_I2C_DEBUG_ALGO is not set
620# CONFIG_I2C_DEBUG_BUS is not set 644# CONFIG_I2C_DEBUG_BUS is not set
@@ -629,13 +653,13 @@ CONFIG_I2C_MPC=y
629# 653#
630# Dallas's 1-wire bus 654# Dallas's 1-wire bus
631# 655#
632# CONFIG_W1 is not set
633 656
634# 657#
635# Hardware Monitoring support 658# Hardware Monitoring support
636# 659#
637CONFIG_HWMON=y 660CONFIG_HWMON=y
638# CONFIG_HWMON_VID is not set 661# CONFIG_HWMON_VID is not set
662# CONFIG_SENSORS_ABITUGURU is not set
639# CONFIG_SENSORS_ADM1021 is not set 663# CONFIG_SENSORS_ADM1021 is not set
640# CONFIG_SENSORS_ADM1025 is not set 664# CONFIG_SENSORS_ADM1025 is not set
641# CONFIG_SENSORS_ADM1026 is not set 665# CONFIG_SENSORS_ADM1026 is not set
@@ -664,10 +688,12 @@ CONFIG_HWMON=y
664# CONFIG_SENSORS_PC87360 is not set 688# CONFIG_SENSORS_PC87360 is not set
665# CONFIG_SENSORS_SIS5595 is not set 689# CONFIG_SENSORS_SIS5595 is not set
666# CONFIG_SENSORS_SMSC47M1 is not set 690# CONFIG_SENSORS_SMSC47M1 is not set
691# CONFIG_SENSORS_SMSC47M192 is not set
667# CONFIG_SENSORS_SMSC47B397 is not set 692# CONFIG_SENSORS_SMSC47B397 is not set
668# CONFIG_SENSORS_VIA686A is not set 693# CONFIG_SENSORS_VIA686A is not set
669# CONFIG_SENSORS_VT8231 is not set 694# CONFIG_SENSORS_VT8231 is not set
670# CONFIG_SENSORS_W83781D is not set 695# CONFIG_SENSORS_W83781D is not set
696# CONFIG_SENSORS_W83791D is not set
671# CONFIG_SENSORS_W83792D is not set 697# CONFIG_SENSORS_W83792D is not set
672# CONFIG_SENSORS_W83L785TS is not set 698# CONFIG_SENSORS_W83L785TS is not set
673# CONFIG_SENSORS_W83627HF is not set 699# CONFIG_SENSORS_W83627HF is not set
@@ -679,13 +705,10 @@ CONFIG_HWMON=y
679# 705#
680 706
681# 707#
682# Multimedia Capabilities Port drivers
683#
684
685#
686# Multimedia devices 708# Multimedia devices
687# 709#
688# CONFIG_VIDEO_DEV is not set 710# CONFIG_VIDEO_DEV is not set
711CONFIG_VIDEO_V4L2=y
689 712
690# 713#
691# Digital Video Broadcasting Devices 714# Digital Video Broadcasting Devices
@@ -695,7 +718,9 @@ CONFIG_HWMON=y
695# 718#
696# Graphics support 719# Graphics support
697# 720#
721CONFIG_FIRMWARE_EDID=y
698# CONFIG_FB is not set 722# CONFIG_FB is not set
723# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
699 724
700# 725#
701# Sound 726# Sound
@@ -707,6 +732,7 @@ CONFIG_HWMON=y
707# 732#
708CONFIG_USB_ARCH_HAS_HCD=y 733CONFIG_USB_ARCH_HAS_HCD=y
709CONFIG_USB_ARCH_HAS_OHCI=y 734CONFIG_USB_ARCH_HAS_OHCI=y
735CONFIG_USB_ARCH_HAS_EHCI=y
710# CONFIG_USB is not set 736# CONFIG_USB is not set
711 737
712# 738#
@@ -724,6 +750,19 @@ CONFIG_USB_ARCH_HAS_OHCI=y
724# CONFIG_MMC is not set 750# CONFIG_MMC is not set
725 751
726# 752#
753# LED devices
754#
755# CONFIG_NEW_LEDS is not set
756
757#
758# LED drivers
759#
760
761#
762# LED Triggers
763#
764
765#
727# InfiniBand support 766# InfiniBand support
728# 767#
729# CONFIG_INFINIBAND is not set 768# CONFIG_INFINIBAND is not set
@@ -733,6 +772,24 @@ CONFIG_USB_ARCH_HAS_OHCI=y
733# 772#
734 773
735# 774#
775# Real Time Clock
776#
777# CONFIG_RTC_CLASS is not set
778
779#
780# DMA Engine support
781#
782# CONFIG_DMA_ENGINE is not set
783
784#
785# DMA Clients
786#
787
788#
789# DMA Devices
790#
791
792#
736# File systems 793# File systems
737# 794#
738CONFIG_EXT2_FS=y 795CONFIG_EXT2_FS=y
@@ -753,6 +810,7 @@ CONFIG_FS_MBCACHE=y
753# CONFIG_MINIX_FS is not set 810# CONFIG_MINIX_FS is not set
754# CONFIG_ROMFS_FS is not set 811# CONFIG_ROMFS_FS is not set
755CONFIG_INOTIFY=y 812CONFIG_INOTIFY=y
813CONFIG_INOTIFY_USER=y
756# CONFIG_QUOTA is not set 814# CONFIG_QUOTA is not set
757CONFIG_DNOTIFY=y 815CONFIG_DNOTIFY=y
758# CONFIG_AUTOFS_FS is not set 816# CONFIG_AUTOFS_FS is not set
@@ -781,7 +839,6 @@ CONFIG_SYSFS=y
781CONFIG_TMPFS=y 839CONFIG_TMPFS=y
782# CONFIG_HUGETLB_PAGE is not set 840# CONFIG_HUGETLB_PAGE is not set
783CONFIG_RAMFS=y 841CONFIG_RAMFS=y
784# CONFIG_RELAYFS_FS is not set
785# CONFIG_CONFIGFS_FS is not set 842# CONFIG_CONFIGFS_FS is not set
786 843
787# 844#
@@ -854,6 +911,7 @@ CONFIG_PARTITION_ADVANCED=y
854# CONFIG_CRC16 is not set 911# CONFIG_CRC16 is not set
855CONFIG_CRC32=y 912CONFIG_CRC32=y
856# CONFIG_LIBCRC32C is not set 913# CONFIG_LIBCRC32C is not set
914CONFIG_PLIST=y
857 915
858# 916#
859# Instrumentation Support 917# Instrumentation Support
@@ -865,15 +923,13 @@ CONFIG_CRC32=y
865# 923#
866# CONFIG_PRINTK_TIME is not set 924# CONFIG_PRINTK_TIME is not set
867# CONFIG_MAGIC_SYSRQ is not set 925# CONFIG_MAGIC_SYSRQ is not set
926# CONFIG_UNUSED_SYMBOLS is not set
868# CONFIG_DEBUG_KERNEL is not set 927# CONFIG_DEBUG_KERNEL is not set
869CONFIG_LOG_BUF_SHIFT=14 928CONFIG_LOG_BUF_SHIFT=14
929# CONFIG_DEBUG_FS is not set
870# CONFIG_BOOTX_TEXT is not set 930# CONFIG_BOOTX_TEXT is not set
871# CONFIG_SERIAL_TEXT_DEBUG is not set 931# CONFIG_SERIAL_TEXT_DEBUG is not set
872# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 932# CONFIG_PPC_EARLY_DEBUG is not set
873# CONFIG_PPC_EARLY_DEBUG_G5 is not set
874# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
875# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
876# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
877 933
878# 934#
879# Security options 935# Security options
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index 7f0780f1aa39..67e7d0b5793d 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16 3# Linux kernel version: 2.6.18-rc6
4# Mon Mar 27 23:37:36 2006 4# Sun Sep 10 10:29:23 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_DEFAULT_UIMAGE=y
29# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
30# CONFIG_PPC_83xx is not set 32# CONFIG_PPC_83xx is not set
31CONFIG_PPC_85xx=y 33CONFIG_PPC_85xx=y
34# CONFIG_PPC_86xx is not set
32# CONFIG_40x is not set 35# CONFIG_40x is not set
33# CONFIG_44x is not set 36# CONFIG_44x is not set
34# CONFIG_8xx is not set 37# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_BOOKE=y
39CONFIG_FSL_BOOKE=y 42CONFIG_FSL_BOOKE=y
40# CONFIG_PHYS_64BIT is not set 43# CONFIG_PHYS_64BIT is not set
41CONFIG_SPE=y 44CONFIG_SPE=y
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42 46
43# 47#
44# Code maturity level options 48# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
58# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
59CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
60# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
61# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -71,10 +76,12 @@ CONFIG_PRINTK=y
71CONFIG_BUG=y 76CONFIG_BUG=y
72CONFIG_ELF_CORE=y 77CONFIG_ELF_CORE=y
73CONFIG_BASE_FULL=y 78CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
74CONFIG_FUTEX=y 80CONFIG_FUTEX=y
75CONFIG_EPOLL=y 81CONFIG_EPOLL=y
76CONFIG_SHMEM=y 82CONFIG_SHMEM=y
77CONFIG_SLAB=y 83CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y
78# CONFIG_TINY_SHMEM is not set 85# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 86CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set 87# CONFIG_SLOB is not set
@@ -103,15 +110,16 @@ CONFIG_DEFAULT_AS=y
103# CONFIG_DEFAULT_CFQ is not set 110# CONFIG_DEFAULT_CFQ is not set
104# CONFIG_DEFAULT_NOOP is not set 111# CONFIG_DEFAULT_NOOP is not set
105CONFIG_DEFAULT_IOSCHED="anticipatory" 112CONFIG_DEFAULT_IOSCHED="anticipatory"
106CONFIG_MPIC=y
107# CONFIG_WANT_EARLY_SERIAL is not set 113# CONFIG_WANT_EARLY_SERIAL is not set
108 114
109# 115#
110# Platform support 116# Platform support
111# 117#
112CONFIG_MPC8540_ADS=y 118CONFIG_MPC8540_ADS=y
119# CONFIG_MPC85xx_CDS is not set
113CONFIG_MPC8540=y 120CONFIG_MPC8540=y
114CONFIG_PPC_INDIRECT_PCI_BE=y 121CONFIG_PPC_INDIRECT_PCI_BE=y
122CONFIG_MPIC=y
115 123
116# 124#
117# Kernel options 125# Kernel options
@@ -127,6 +135,7 @@ CONFIG_PREEMPT_NONE=y
127CONFIG_BINFMT_ELF=y 135CONFIG_BINFMT_ELF=y
128CONFIG_BINFMT_MISC=y 136CONFIG_BINFMT_MISC=y
129CONFIG_MATH_EMULATION=y 137CONFIG_MATH_EMULATION=y
138CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
130CONFIG_ARCH_FLATMEM_ENABLE=y 139CONFIG_ARCH_FLATMEM_ENABLE=y
131CONFIG_SELECT_MEMORY_MODEL=y 140CONFIG_SELECT_MEMORY_MODEL=y
132CONFIG_FLATMEM_MANUAL=y 141CONFIG_FLATMEM_MANUAL=y
@@ -136,16 +145,17 @@ CONFIG_FLATMEM=y
136CONFIG_FLAT_NODE_MEM_MAP=y 145CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set
139CONFIG_PROC_DEVICETREE=y 149CONFIG_PROC_DEVICETREE=y
140# CONFIG_CMDLINE_BOOL is not set 150# CONFIG_CMDLINE_BOOL is not set
141# CONFIG_PM is not set 151# CONFIG_PM is not set
142# CONFIG_SOFTWARE_SUSPEND is not set
143# CONFIG_SECCOMP is not set 152# CONFIG_SECCOMP is not set
144CONFIG_ISA_DMA_API=y 153CONFIG_ISA_DMA_API=y
145 154
146# 155#
147# Bus options 156# Bus options
148# 157#
158# CONFIG_MPIC_WEIRD is not set
149# CONFIG_PPC_I8259 is not set 159# CONFIG_PPC_I8259 is not set
150CONFIG_PPC_INDIRECT_PCI=y 160CONFIG_PPC_INDIRECT_PCI=y
151CONFIG_FSL_SOC=y 161CONFIG_FSL_SOC=y
@@ -187,6 +197,8 @@ CONFIG_NET=y
187CONFIG_PACKET=y 197CONFIG_PACKET=y
188# CONFIG_PACKET_MMAP is not set 198# CONFIG_PACKET_MMAP is not set
189CONFIG_UNIX=y 199CONFIG_UNIX=y
200CONFIG_XFRM=y
201CONFIG_XFRM_USER=y
190# CONFIG_NET_KEY is not set 202# CONFIG_NET_KEY is not set
191CONFIG_INET=y 203CONFIG_INET=y
192CONFIG_IP_MULTICAST=y 204CONFIG_IP_MULTICAST=y
@@ -204,12 +216,18 @@ CONFIG_SYN_COOKIES=y
204# CONFIG_INET_AH is not set 216# CONFIG_INET_AH is not set
205# CONFIG_INET_ESP is not set 217# CONFIG_INET_ESP is not set
206# CONFIG_INET_IPCOMP is not set 218# CONFIG_INET_IPCOMP is not set
219# CONFIG_INET_XFRM_TUNNEL is not set
207# CONFIG_INET_TUNNEL is not set 220# CONFIG_INET_TUNNEL is not set
221CONFIG_INET_XFRM_MODE_TRANSPORT=y
222CONFIG_INET_XFRM_MODE_TUNNEL=y
208CONFIG_INET_DIAG=y 223CONFIG_INET_DIAG=y
209CONFIG_INET_TCP_DIAG=y 224CONFIG_INET_TCP_DIAG=y
210# CONFIG_TCP_CONG_ADVANCED is not set 225# CONFIG_TCP_CONG_ADVANCED is not set
211CONFIG_TCP_CONG_BIC=y 226CONFIG_TCP_CONG_BIC=y
212# CONFIG_IPV6 is not set 227# CONFIG_IPV6 is not set
228# CONFIG_INET6_XFRM_TUNNEL is not set
229# CONFIG_INET6_TUNNEL is not set
230# CONFIG_NETWORK_SECMARK is not set
213# CONFIG_NETFILTER is not set 231# CONFIG_NETFILTER is not set
214 232
215# 233#
@@ -264,6 +282,7 @@ CONFIG_STANDALONE=y
264CONFIG_PREVENT_FIRMWARE_BUILD=y 282CONFIG_PREVENT_FIRMWARE_BUILD=y
265# CONFIG_FW_LOADER is not set 283# CONFIG_FW_LOADER is not set
266# CONFIG_DEBUG_DRIVER is not set 284# CONFIG_DEBUG_DRIVER is not set
285# CONFIG_SYS_HYPERVISOR is not set
267 286
268# 287#
269# Connector - unified userspace <-> kernelspace linker 288# Connector - unified userspace <-> kernelspace linker
@@ -295,6 +314,7 @@ CONFIG_BLK_DEV_LOOP=y
295CONFIG_BLK_DEV_RAM=y 314CONFIG_BLK_DEV_RAM=y
296CONFIG_BLK_DEV_RAM_COUNT=16 315CONFIG_BLK_DEV_RAM_COUNT=16
297CONFIG_BLK_DEV_RAM_SIZE=32768 316CONFIG_BLK_DEV_RAM_SIZE=32768
317CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
298CONFIG_BLK_DEV_INITRD=y 318CONFIG_BLK_DEV_INITRD=y
299# CONFIG_CDROM_PKTCDVD is not set 319# CONFIG_CDROM_PKTCDVD is not set
300# CONFIG_ATA_OVER_ETH is not set 320# CONFIG_ATA_OVER_ETH is not set
@@ -355,6 +375,9 @@ CONFIG_PHYLIB=y
355# CONFIG_QSEMI_PHY is not set 375# CONFIG_QSEMI_PHY is not set
356# CONFIG_LXT_PHY is not set 376# CONFIG_LXT_PHY is not set
357# CONFIG_CICADA_PHY is not set 377# CONFIG_CICADA_PHY is not set
378# CONFIG_VITESSE_PHY is not set
379# CONFIG_SMSC_PHY is not set
380# CONFIG_FIXED_PHY is not set
358 381
359# 382#
360# Ethernet (10 or 100Mbit) 383# Ethernet (10 or 100Mbit)
@@ -464,6 +487,7 @@ CONFIG_LEGACY_PTY_COUNT=256
464# Watchdog Cards 487# Watchdog Cards
465# 488#
466# CONFIG_WATCHDOG is not set 489# CONFIG_WATCHDOG is not set
490# CONFIG_HW_RANDOM is not set
467# CONFIG_NVRAM is not set 491# CONFIG_NVRAM is not set
468CONFIG_GEN_RTC=y 492CONFIG_GEN_RTC=y
469# CONFIG_GEN_RTC_X is not set 493# CONFIG_GEN_RTC_X is not set
@@ -473,7 +497,6 @@ CONFIG_GEN_RTC=y
473# 497#
474# Ftape, the floppy tape device driver 498# Ftape, the floppy tape device driver
475# 499#
476# CONFIG_AGP is not set
477# CONFIG_RAW_DRIVER is not set 500# CONFIG_RAW_DRIVER is not set
478 501
479# 502#
@@ -496,13 +519,13 @@ CONFIG_GEN_RTC=y
496# 519#
497# Dallas's 1-wire bus 520# Dallas's 1-wire bus
498# 521#
499# CONFIG_W1 is not set
500 522
501# 523#
502# Hardware Monitoring support 524# Hardware Monitoring support
503# 525#
504CONFIG_HWMON=y 526CONFIG_HWMON=y
505# CONFIG_HWMON_VID is not set 527# CONFIG_HWMON_VID is not set
528# CONFIG_SENSORS_ABITUGURU is not set
506# CONFIG_SENSORS_F71805F is not set 529# CONFIG_SENSORS_F71805F is not set
507# CONFIG_HWMON_DEBUG_CHIP is not set 530# CONFIG_HWMON_DEBUG_CHIP is not set
508 531
@@ -514,6 +537,7 @@ CONFIG_HWMON=y
514# Multimedia devices 537# Multimedia devices
515# 538#
516# CONFIG_VIDEO_DEV is not set 539# CONFIG_VIDEO_DEV is not set
540CONFIG_VIDEO_V4L2=y
517 541
518# 542#
519# Digital Video Broadcasting Devices 543# Digital Video Broadcasting Devices
@@ -523,7 +547,9 @@ CONFIG_HWMON=y
523# 547#
524# Graphics support 548# Graphics support
525# 549#
550CONFIG_FIRMWARE_EDID=y
526# CONFIG_FB is not set 551# CONFIG_FB is not set
552# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
527 553
528# 554#
529# Sound 555# Sound
@@ -552,6 +578,19 @@ CONFIG_HWMON=y
552# CONFIG_MMC is not set 578# CONFIG_MMC is not set
553 579
554# 580#
581# LED devices
582#
583# CONFIG_NEW_LEDS is not set
584
585#
586# LED drivers
587#
588
589#
590# LED Triggers
591#
592
593#
555# InfiniBand support 594# InfiniBand support
556# 595#
557 596
@@ -560,6 +599,24 @@ CONFIG_HWMON=y
560# 599#
561 600
562# 601#
602# Real Time Clock
603#
604# CONFIG_RTC_CLASS is not set
605
606#
607# DMA Engine support
608#
609# CONFIG_DMA_ENGINE is not set
610
611#
612# DMA Clients
613#
614
615#
616# DMA Devices
617#
618
619#
563# File systems 620# File systems
564# 621#
565CONFIG_EXT2_FS=y 622CONFIG_EXT2_FS=y
@@ -580,6 +637,7 @@ CONFIG_FS_MBCACHE=y
580# CONFIG_MINIX_FS is not set 637# CONFIG_MINIX_FS is not set
581# CONFIG_ROMFS_FS is not set 638# CONFIG_ROMFS_FS is not set
582CONFIG_INOTIFY=y 639CONFIG_INOTIFY=y
640CONFIG_INOTIFY_USER=y
583# CONFIG_QUOTA is not set 641# CONFIG_QUOTA is not set
584CONFIG_DNOTIFY=y 642CONFIG_DNOTIFY=y
585# CONFIG_AUTOFS_FS is not set 643# CONFIG_AUTOFS_FS is not set
@@ -677,6 +735,7 @@ CONFIG_PARTITION_ADVANCED=y
677# CONFIG_CRC16 is not set 735# CONFIG_CRC16 is not set
678CONFIG_CRC32=y 736CONFIG_CRC32=y
679# CONFIG_LIBCRC32C is not set 737# CONFIG_LIBCRC32C is not set
738CONFIG_PLIST=y
680 739
681# 740#
682# Instrumentation Support 741# Instrumentation Support
@@ -688,14 +747,19 @@ CONFIG_CRC32=y
688# 747#
689# CONFIG_PRINTK_TIME is not set 748# CONFIG_PRINTK_TIME is not set
690# CONFIG_MAGIC_SYSRQ is not set 749# CONFIG_MAGIC_SYSRQ is not set
750# CONFIG_UNUSED_SYMBOLS is not set
691CONFIG_DEBUG_KERNEL=y 751CONFIG_DEBUG_KERNEL=y
692CONFIG_LOG_BUF_SHIFT=14 752CONFIG_LOG_BUF_SHIFT=14
693CONFIG_DETECT_SOFTLOCKUP=y 753CONFIG_DETECT_SOFTLOCKUP=y
694# CONFIG_SCHEDSTATS is not set 754# CONFIG_SCHEDSTATS is not set
695# CONFIG_DEBUG_SLAB is not set 755# CONFIG_DEBUG_SLAB is not set
696CONFIG_DEBUG_MUTEXES=y 756# CONFIG_DEBUG_RT_MUTEXES is not set
757# CONFIG_RT_MUTEX_TESTER is not set
697# CONFIG_DEBUG_SPINLOCK is not set 758# CONFIG_DEBUG_SPINLOCK is not set
759CONFIG_DEBUG_MUTEXES=y
760# CONFIG_DEBUG_RWSEMS is not set
698# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 761# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
762# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
699# CONFIG_DEBUG_KOBJECT is not set 763# CONFIG_DEBUG_KOBJECT is not set
700# CONFIG_DEBUG_INFO is not set 764# CONFIG_DEBUG_INFO is not set
701# CONFIG_DEBUG_FS is not set 765# CONFIG_DEBUG_FS is not set
@@ -706,11 +770,7 @@ CONFIG_FORCED_INLINING=y
706# CONFIG_DEBUGGER is not set 770# CONFIG_DEBUGGER is not set
707# CONFIG_BDI_SWITCH is not set 771# CONFIG_BDI_SWITCH is not set
708# CONFIG_BOOTX_TEXT is not set 772# CONFIG_BOOTX_TEXT is not set
709# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 773# CONFIG_PPC_EARLY_DEBUG is not set
710# CONFIG_PPC_EARLY_DEBUG_G5 is not set
711# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
712# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
713# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
714 774
715# 775#
716# Security options 776# Security options
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index 9bb022a523fe..72edf9f66829 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16 3# Linux kernel version: 2.6.18-rc6
4# Sun Apr 2 11:23:42 2006 4# Sun Sep 10 10:29:49 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -19,7 +21,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
19CONFIG_PPC_OF=y 21CONFIG_PPC_OF=y
20CONFIG_PPC_UDBG_16550=y 22CONFIG_PPC_UDBG_16550=y
21# CONFIG_GENERIC_TBSYNC is not set 23# CONFIG_GENERIC_TBSYNC is not set
22# CONFIG_DEFAULT_UIMAGE is not set 24CONFIG_DEFAULT_UIMAGE=y
23 25
24# 26#
25# Processor support 27# Processor support
@@ -29,6 +31,7 @@ CONFIG_PPC_UDBG_16550=y
29# CONFIG_PPC_82xx is not set 31# CONFIG_PPC_82xx is not set
30# CONFIG_PPC_83xx is not set 32# CONFIG_PPC_83xx is not set
31CONFIG_PPC_85xx=y 33CONFIG_PPC_85xx=y
34# CONFIG_PPC_86xx is not set
32# CONFIG_40x is not set 35# CONFIG_40x is not set
33# CONFIG_44x is not set 36# CONFIG_44x is not set
34# CONFIG_8xx is not set 37# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_BOOKE=y
39CONFIG_FSL_BOOKE=y 42CONFIG_FSL_BOOKE=y
40# CONFIG_PHYS_64BIT is not set 43# CONFIG_PHYS_64BIT is not set
41CONFIG_SPE=y 44CONFIG_SPE=y
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42 46
43# 47#
44# Code maturity level options 48# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
58# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
59CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
60# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
61# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
@@ -71,10 +76,12 @@ CONFIG_PRINTK=y
71CONFIG_BUG=y 76CONFIG_BUG=y
72CONFIG_ELF_CORE=y 77CONFIG_ELF_CORE=y
73CONFIG_BASE_FULL=y 78CONFIG_BASE_FULL=y
79CONFIG_RT_MUTEXES=y
74CONFIG_FUTEX=y 80CONFIG_FUTEX=y
75CONFIG_EPOLL=y 81CONFIG_EPOLL=y
76CONFIG_SHMEM=y 82CONFIG_SHMEM=y
77CONFIG_SLAB=y 83CONFIG_SLAB=y
84CONFIG_VM_EVENT_COUNTERS=y
78# CONFIG_TINY_SHMEM is not set 85# CONFIG_TINY_SHMEM is not set
79CONFIG_BASE_SMALL=0 86CONFIG_BASE_SMALL=0
80# CONFIG_SLOB is not set 87# CONFIG_SLOB is not set
@@ -103,7 +110,6 @@ CONFIG_DEFAULT_AS=y
103# CONFIG_DEFAULT_CFQ is not set 110# CONFIG_DEFAULT_CFQ is not set
104# CONFIG_DEFAULT_NOOP is not set 111# CONFIG_DEFAULT_NOOP is not set
105CONFIG_DEFAULT_IOSCHED="anticipatory" 112CONFIG_DEFAULT_IOSCHED="anticipatory"
106CONFIG_MPIC=y
107# CONFIG_WANT_EARLY_SERIAL is not set 113# CONFIG_WANT_EARLY_SERIAL is not set
108 114
109# 115#
@@ -113,6 +119,7 @@ CONFIG_MPIC=y
113CONFIG_MPC85xx_CDS=y 119CONFIG_MPC85xx_CDS=y
114CONFIG_MPC8540=y 120CONFIG_MPC8540=y
115CONFIG_PPC_INDIRECT_PCI_BE=y 121CONFIG_PPC_INDIRECT_PCI_BE=y
122CONFIG_MPIC=y
116 123
117# 124#
118# Kernel options 125# Kernel options
@@ -128,6 +135,7 @@ CONFIG_PREEMPT_NONE=y
128CONFIG_BINFMT_ELF=y 135CONFIG_BINFMT_ELF=y
129CONFIG_BINFMT_MISC=y 136CONFIG_BINFMT_MISC=y
130CONFIG_MATH_EMULATION=y 137CONFIG_MATH_EMULATION=y
138CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
131CONFIG_ARCH_FLATMEM_ENABLE=y 139CONFIG_ARCH_FLATMEM_ENABLE=y
132CONFIG_SELECT_MEMORY_MODEL=y 140CONFIG_SELECT_MEMORY_MODEL=y
133CONFIG_FLATMEM_MANUAL=y 141CONFIG_FLATMEM_MANUAL=y
@@ -137,21 +145,23 @@ CONFIG_FLATMEM=y
137CONFIG_FLAT_NODE_MEM_MAP=y 145CONFIG_FLAT_NODE_MEM_MAP=y
138# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
139CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set
140CONFIG_PROC_DEVICETREE=y 149CONFIG_PROC_DEVICETREE=y
141# CONFIG_CMDLINE_BOOL is not set 150# CONFIG_CMDLINE_BOOL is not set
142# CONFIG_PM is not set 151# CONFIG_PM is not set
143# CONFIG_SOFTWARE_SUSPEND is not set
144# CONFIG_SECCOMP is not set 152# CONFIG_SECCOMP is not set
145CONFIG_ISA_DMA_API=y 153CONFIG_ISA_DMA_API=y
146 154
147# 155#
148# Bus options 156# Bus options
149# 157#
150CONFIG_PPC_I8259=y 158# CONFIG_MPIC_WEIRD is not set
159# CONFIG_PPC_I8259 is not set
151CONFIG_PPC_INDIRECT_PCI=y 160CONFIG_PPC_INDIRECT_PCI=y
152CONFIG_FSL_SOC=y 161CONFIG_FSL_SOC=y
153CONFIG_PCI=y 162CONFIG_PCI=y
154CONFIG_PCI_DOMAINS=y 163CONFIG_PCI_DOMAINS=y
164# CONFIG_PCIEPORTBUS is not set
155# CONFIG_PCI_DEBUG is not set 165# CONFIG_PCI_DEBUG is not set
156 166
157# 167#
@@ -190,6 +200,8 @@ CONFIG_NET=y
190CONFIG_PACKET=y 200CONFIG_PACKET=y
191# CONFIG_PACKET_MMAP is not set 201# CONFIG_PACKET_MMAP is not set
192CONFIG_UNIX=y 202CONFIG_UNIX=y
203CONFIG_XFRM=y
204CONFIG_XFRM_USER=y
193# CONFIG_NET_KEY is not set 205# CONFIG_NET_KEY is not set
194CONFIG_INET=y 206CONFIG_INET=y
195CONFIG_IP_MULTICAST=y 207CONFIG_IP_MULTICAST=y
@@ -209,6 +221,8 @@ CONFIG_SYN_COOKIES=y
209# CONFIG_INET_IPCOMP is not set 221# CONFIG_INET_IPCOMP is not set
210# CONFIG_INET_XFRM_TUNNEL is not set 222# CONFIG_INET_XFRM_TUNNEL is not set
211# CONFIG_INET_TUNNEL is not set 223# CONFIG_INET_TUNNEL is not set
224CONFIG_INET_XFRM_MODE_TRANSPORT=y
225CONFIG_INET_XFRM_MODE_TUNNEL=y
212CONFIG_INET_DIAG=y 226CONFIG_INET_DIAG=y
213CONFIG_INET_TCP_DIAG=y 227CONFIG_INET_TCP_DIAG=y
214# CONFIG_TCP_CONG_ADVANCED is not set 228# CONFIG_TCP_CONG_ADVANCED is not set
@@ -216,6 +230,7 @@ CONFIG_TCP_CONG_BIC=y
216# CONFIG_IPV6 is not set 230# CONFIG_IPV6 is not set
217# CONFIG_INET6_XFRM_TUNNEL is not set 231# CONFIG_INET6_XFRM_TUNNEL is not set
218# CONFIG_INET6_TUNNEL is not set 232# CONFIG_INET6_TUNNEL is not set
233# CONFIG_NETWORK_SECMARK is not set
219# CONFIG_NETFILTER is not set 234# CONFIG_NETFILTER is not set
220 235
221# 236#
@@ -270,6 +285,7 @@ CONFIG_STANDALONE=y
270CONFIG_PREVENT_FIRMWARE_BUILD=y 285CONFIG_PREVENT_FIRMWARE_BUILD=y
271# CONFIG_FW_LOADER is not set 286# CONFIG_FW_LOADER is not set
272# CONFIG_DEBUG_DRIVER is not set 287# CONFIG_DEBUG_DRIVER is not set
288# CONFIG_SYS_HYPERVISOR is not set
273 289
274# 290#
275# Connector - unified userspace <-> kernelspace linker 291# Connector - unified userspace <-> kernelspace linker
@@ -306,6 +322,7 @@ CONFIG_BLK_DEV_LOOP=y
306CONFIG_BLK_DEV_RAM=y 322CONFIG_BLK_DEV_RAM=y
307CONFIG_BLK_DEV_RAM_COUNT=16 323CONFIG_BLK_DEV_RAM_COUNT=16
308CONFIG_BLK_DEV_RAM_SIZE=32768 324CONFIG_BLK_DEV_RAM_SIZE=32768
325CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
309CONFIG_BLK_DEV_INITRD=y 326CONFIG_BLK_DEV_INITRD=y
310# CONFIG_CDROM_PKTCDVD is not set 327# CONFIG_CDROM_PKTCDVD is not set
311# CONFIG_ATA_OVER_ETH is not set 328# CONFIG_ATA_OVER_ETH is not set
@@ -425,6 +442,9 @@ CONFIG_PHYLIB=y
425# CONFIG_QSEMI_PHY is not set 442# CONFIG_QSEMI_PHY is not set
426# CONFIG_LXT_PHY is not set 443# CONFIG_LXT_PHY is not set
427# CONFIG_CICADA_PHY is not set 444# CONFIG_CICADA_PHY is not set
445# CONFIG_VITESSE_PHY is not set
446# CONFIG_SMSC_PHY is not set
447# CONFIG_FIXED_PHY is not set
428 448
429# 449#
430# Ethernet (10 or 100Mbit) 450# Ethernet (10 or 100Mbit)
@@ -470,6 +490,7 @@ CONFIG_GFAR_NAPI=y
470# CONFIG_CHELSIO_T1 is not set 490# CONFIG_CHELSIO_T1 is not set
471# CONFIG_IXGB is not set 491# CONFIG_IXGB is not set
472# CONFIG_S2IO is not set 492# CONFIG_S2IO is not set
493# CONFIG_MYRI10GE is not set
473 494
474# 495#
475# Token Ring devices 496# Token Ring devices
@@ -568,6 +589,7 @@ CONFIG_LEGACY_PTY_COUNT=256
568# Watchdog Cards 589# Watchdog Cards
569# 590#
570# CONFIG_WATCHDOG is not set 591# CONFIG_WATCHDOG is not set
592# CONFIG_HW_RANDOM is not set
571# CONFIG_NVRAM is not set 593# CONFIG_NVRAM is not set
572CONFIG_GEN_RTC=y 594CONFIG_GEN_RTC=y
573# CONFIG_GEN_RTC_X is not set 595# CONFIG_GEN_RTC_X is not set
@@ -602,13 +624,13 @@ CONFIG_GEN_RTC=y
602# 624#
603# Dallas's 1-wire bus 625# Dallas's 1-wire bus
604# 626#
605# CONFIG_W1 is not set
606 627
607# 628#
608# Hardware Monitoring support 629# Hardware Monitoring support
609# 630#
610CONFIG_HWMON=y 631CONFIG_HWMON=y
611# CONFIG_HWMON_VID is not set 632# CONFIG_HWMON_VID is not set
633# CONFIG_SENSORS_ABITUGURU is not set
612# CONFIG_SENSORS_F71805F is not set 634# CONFIG_SENSORS_F71805F is not set
613# CONFIG_HWMON_DEBUG_CHIP is not set 635# CONFIG_HWMON_DEBUG_CHIP is not set
614 636
@@ -620,6 +642,7 @@ CONFIG_HWMON=y
620# Multimedia devices 642# Multimedia devices
621# 643#
622# CONFIG_VIDEO_DEV is not set 644# CONFIG_VIDEO_DEV is not set
645CONFIG_VIDEO_V4L2=y
623 646
624# 647#
625# Digital Video Broadcasting Devices 648# Digital Video Broadcasting Devices
@@ -629,7 +652,9 @@ CONFIG_HWMON=y
629# 652#
630# Graphics support 653# Graphics support
631# 654#
655CONFIG_FIRMWARE_EDID=y
632# CONFIG_FB is not set 656# CONFIG_FB is not set
657# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
633 658
634# 659#
635# Sound 660# Sound
@@ -664,6 +689,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
664# CONFIG_NEW_LEDS is not set 689# CONFIG_NEW_LEDS is not set
665 690
666# 691#
692# LED drivers
693#
694
695#
696# LED Triggers
697#
698
699#
667# InfiniBand support 700# InfiniBand support
668# 701#
669# CONFIG_INFINIBAND is not set 702# CONFIG_INFINIBAND is not set
@@ -678,6 +711,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
678# CONFIG_RTC_CLASS is not set 711# CONFIG_RTC_CLASS is not set
679 712
680# 713#
714# DMA Engine support
715#
716# CONFIG_DMA_ENGINE is not set
717
718#
719# DMA Clients
720#
721
722#
723# DMA Devices
724#
725
726#
681# File systems 727# File systems
682# 728#
683CONFIG_EXT2_FS=y 729CONFIG_EXT2_FS=y
@@ -698,6 +744,7 @@ CONFIG_FS_MBCACHE=y
698# CONFIG_MINIX_FS is not set 744# CONFIG_MINIX_FS is not set
699# CONFIG_ROMFS_FS is not set 745# CONFIG_ROMFS_FS is not set
700CONFIG_INOTIFY=y 746CONFIG_INOTIFY=y
747CONFIG_INOTIFY_USER=y
701# CONFIG_QUOTA is not set 748# CONFIG_QUOTA is not set
702CONFIG_DNOTIFY=y 749CONFIG_DNOTIFY=y
703# CONFIG_AUTOFS_FS is not set 750# CONFIG_AUTOFS_FS is not set
@@ -795,6 +842,7 @@ CONFIG_PARTITION_ADVANCED=y
795# CONFIG_CRC16 is not set 842# CONFIG_CRC16 is not set
796CONFIG_CRC32=y 843CONFIG_CRC32=y
797# CONFIG_LIBCRC32C is not set 844# CONFIG_LIBCRC32C is not set
845CONFIG_PLIST=y
798 846
799# 847#
800# Instrumentation Support 848# Instrumentation Support
@@ -806,14 +854,19 @@ CONFIG_CRC32=y
806# 854#
807# CONFIG_PRINTK_TIME is not set 855# CONFIG_PRINTK_TIME is not set
808# CONFIG_MAGIC_SYSRQ is not set 856# CONFIG_MAGIC_SYSRQ is not set
857# CONFIG_UNUSED_SYMBOLS is not set
809CONFIG_DEBUG_KERNEL=y 858CONFIG_DEBUG_KERNEL=y
810CONFIG_LOG_BUF_SHIFT=14 859CONFIG_LOG_BUF_SHIFT=14
811CONFIG_DETECT_SOFTLOCKUP=y 860CONFIG_DETECT_SOFTLOCKUP=y
812# CONFIG_SCHEDSTATS is not set 861# CONFIG_SCHEDSTATS is not set
813# CONFIG_DEBUG_SLAB is not set 862# CONFIG_DEBUG_SLAB is not set
814CONFIG_DEBUG_MUTEXES=y 863# CONFIG_DEBUG_RT_MUTEXES is not set
864# CONFIG_RT_MUTEX_TESTER is not set
815# CONFIG_DEBUG_SPINLOCK is not set 865# CONFIG_DEBUG_SPINLOCK is not set
866CONFIG_DEBUG_MUTEXES=y
867# CONFIG_DEBUG_RWSEMS is not set
816# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 868# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
869# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
817# CONFIG_DEBUG_KOBJECT is not set 870# CONFIG_DEBUG_KOBJECT is not set
818# CONFIG_DEBUG_INFO is not set 871# CONFIG_DEBUG_INFO is not set
819# CONFIG_DEBUG_FS is not set 872# CONFIG_DEBUG_FS is not set
@@ -824,11 +877,7 @@ CONFIG_FORCED_INLINING=y
824# CONFIG_DEBUGGER is not set 877# CONFIG_DEBUGGER is not set
825# CONFIG_BDI_SWITCH is not set 878# CONFIG_BDI_SWITCH is not set
826# CONFIG_BOOTX_TEXT is not set 879# CONFIG_BOOTX_TEXT is not set
827# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 880# CONFIG_PPC_EARLY_DEBUG is not set
828# CONFIG_PPC_EARLY_DEBUG_G5 is not set
829# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
830# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
831# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
832 881
833# 882#
834# Security options 883# Security options
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index d7a30f9bc535..92a527fccf83 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig
@@ -1,16 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-rc3 3# Linux kernel version: 2.6.18-rc6
4# Fri Jun 16 10:47:09 2006 4# Sun Sep 10 10:30:15 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_PPC=y 16CONFIG_PPC=y
15CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
16CONFIG_GENERIC_NVRAM=y 18CONFIG_GENERIC_NVRAM=y
@@ -41,6 +43,7 @@ CONFIG_PPC_STD_MMU=y
41CONFIG_PPC_STD_MMU_32=y 43CONFIG_PPC_STD_MMU_32=y
42CONFIG_SMP=y 44CONFIG_SMP=y
43CONFIG_NR_CPUS=2 45CONFIG_NR_CPUS=2
46CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
44 47
45# 48#
46# Code maturity level options 49# Code maturity level options
@@ -58,6 +61,7 @@ CONFIG_LOCALVERSION=""
58# CONFIG_SYSVIPC is not set 61# CONFIG_SYSVIPC is not set
59# CONFIG_POSIX_MQUEUE is not set 62# CONFIG_POSIX_MQUEUE is not set
60# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set
61CONFIG_SYSCTL=y 65CONFIG_SYSCTL=y
62# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
63CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
@@ -75,10 +79,12 @@ CONFIG_PRINTK=y
75CONFIG_BUG=y 79CONFIG_BUG=y
76# CONFIG_ELF_CORE is not set 80# CONFIG_ELF_CORE is not set
77CONFIG_BASE_FULL=y 81CONFIG_BASE_FULL=y
82CONFIG_RT_MUTEXES=y
78CONFIG_FUTEX=y 83CONFIG_FUTEX=y
79CONFIG_EPOLL=y 84CONFIG_EPOLL=y
80CONFIG_SHMEM=y 85CONFIG_SHMEM=y
81# CONFIG_SLAB is not set 86# CONFIG_SLAB is not set
87CONFIG_VM_EVENT_COUNTERS=y
82# CONFIG_TINY_SHMEM is not set 88# CONFIG_TINY_SHMEM is not set
83CONFIG_BASE_SMALL=0 89CONFIG_BASE_SMALL=0
84CONFIG_SLOB=y 90CONFIG_SLOB=y
@@ -107,9 +113,9 @@ CONFIG_DEFAULT_DEADLINE=y
107# CONFIG_DEFAULT_CFQ is not set 113# CONFIG_DEFAULT_CFQ is not set
108# CONFIG_DEFAULT_NOOP is not set 114# CONFIG_DEFAULT_NOOP is not set
109CONFIG_DEFAULT_IOSCHED="deadline" 115CONFIG_DEFAULT_IOSCHED="deadline"
110CONFIG_MPIC=y
111# CONFIG_WANT_EARLY_SERIAL is not set 116# CONFIG_WANT_EARLY_SERIAL is not set
112CONFIG_PPC_INDIRECT_PCI_BE=y 117CONFIG_PPC_INDIRECT_PCI_BE=y
118CONFIG_MPIC=y
113 119
114# 120#
115# Platform Support 121# Platform Support
@@ -131,6 +137,7 @@ CONFIG_PREEMPT_NONE=y
131CONFIG_PREEMPT_BKL=y 137CONFIG_PREEMPT_BKL=y
132CONFIG_BINFMT_ELF=y 138CONFIG_BINFMT_ELF=y
133# CONFIG_BINFMT_MISC is not set 139# CONFIG_BINFMT_MISC is not set
140CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
134# CONFIG_IRQ_ALL_CPUS is not set 141# CONFIG_IRQ_ALL_CPUS is not set
135CONFIG_ARCH_FLATMEM_ENABLE=y 142CONFIG_ARCH_FLATMEM_ENABLE=y
136CONFIG_SELECT_MEMORY_MODEL=y 143CONFIG_SELECT_MEMORY_MODEL=y
@@ -141,6 +148,7 @@ CONFIG_FLATMEM=y
141CONFIG_FLAT_NODE_MEM_MAP=y 148CONFIG_FLAT_NODE_MEM_MAP=y
142# CONFIG_SPARSEMEM_STATIC is not set 149# CONFIG_SPARSEMEM_STATIC is not set
143CONFIG_SPLIT_PTLOCK_CPUS=4 150CONFIG_SPLIT_PTLOCK_CPUS=4
151# CONFIG_RESOURCES_64BIT is not set
144CONFIG_PROC_DEVICETREE=y 152CONFIG_PROC_DEVICETREE=y
145# CONFIG_CMDLINE_BOOL is not set 153# CONFIG_CMDLINE_BOOL is not set
146# CONFIG_PM is not set 154# CONFIG_PM is not set
@@ -151,11 +159,13 @@ CONFIG_ISA_DMA_API=y
151# Bus options 159# Bus options
152# 160#
153CONFIG_GENERIC_ISA_DMA=y 161CONFIG_GENERIC_ISA_DMA=y
162# CONFIG_MPIC_WEIRD is not set
154CONFIG_PPC_I8259=y 163CONFIG_PPC_I8259=y
155CONFIG_PPC_INDIRECT_PCI=y 164CONFIG_PPC_INDIRECT_PCI=y
156CONFIG_FSL_SOC=y 165CONFIG_FSL_SOC=y
157CONFIG_PCI=y 166CONFIG_PCI=y
158CONFIG_PCI_DOMAINS=y 167CONFIG_PCI_DOMAINS=y
168# CONFIG_PCIEPORTBUS is not set
159# CONFIG_PCI_DEBUG is not set 169# CONFIG_PCI_DEBUG is not set
160 170
161# 171#
@@ -194,6 +204,8 @@ CONFIG_NET=y
194CONFIG_PACKET=y 204CONFIG_PACKET=y
195# CONFIG_PACKET_MMAP is not set 205# CONFIG_PACKET_MMAP is not set
196CONFIG_UNIX=y 206CONFIG_UNIX=y
207CONFIG_XFRM=y
208CONFIG_XFRM_USER=y
197# CONFIG_NET_KEY is not set 209# CONFIG_NET_KEY is not set
198CONFIG_INET=y 210CONFIG_INET=y
199# CONFIG_IP_MULTICAST is not set 211# CONFIG_IP_MULTICAST is not set
@@ -212,6 +224,8 @@ CONFIG_IP_PNP_RARP=y
212# CONFIG_INET_IPCOMP is not set 224# CONFIG_INET_IPCOMP is not set
213# CONFIG_INET_XFRM_TUNNEL is not set 225# CONFIG_INET_XFRM_TUNNEL is not set
214# CONFIG_INET_TUNNEL is not set 226# CONFIG_INET_TUNNEL is not set
227CONFIG_INET_XFRM_MODE_TRANSPORT=y
228CONFIG_INET_XFRM_MODE_TUNNEL=y
215CONFIG_INET_DIAG=y 229CONFIG_INET_DIAG=y
216CONFIG_INET_TCP_DIAG=y 230CONFIG_INET_TCP_DIAG=y
217# CONFIG_TCP_CONG_ADVANCED is not set 231# CONFIG_TCP_CONG_ADVANCED is not set
@@ -224,7 +238,10 @@ CONFIG_IPV6=y
224# CONFIG_INET6_IPCOMP is not set 238# CONFIG_INET6_IPCOMP is not set
225# CONFIG_INET6_XFRM_TUNNEL is not set 239# CONFIG_INET6_XFRM_TUNNEL is not set
226# CONFIG_INET6_TUNNEL is not set 240# CONFIG_INET6_TUNNEL is not set
241CONFIG_INET6_XFRM_MODE_TRANSPORT=y
242CONFIG_INET6_XFRM_MODE_TUNNEL=y
227# CONFIG_IPV6_TUNNEL is not set 243# CONFIG_IPV6_TUNNEL is not set
244# CONFIG_NETWORK_SECMARK is not set
228# CONFIG_NETFILTER is not set 245# CONFIG_NETFILTER is not set
229 246
230# 247#
@@ -279,6 +296,7 @@ CONFIG_STANDALONE=y
279CONFIG_PREVENT_FIRMWARE_BUILD=y 296CONFIG_PREVENT_FIRMWARE_BUILD=y
280CONFIG_FW_LOADER=y 297CONFIG_FW_LOADER=y
281# CONFIG_DEBUG_DRIVER is not set 298# CONFIG_DEBUG_DRIVER is not set
299# CONFIG_SYS_HYPERVISOR is not set
282 300
283# 301#
284# Connector - unified userspace <-> kernelspace linker 302# Connector - unified userspace <-> kernelspace linker
@@ -315,6 +333,7 @@ CONFIG_BLK_DEV_LOOP=y
315CONFIG_BLK_DEV_RAM=y 333CONFIG_BLK_DEV_RAM=y
316CONFIG_BLK_DEV_RAM_COUNT=16 334CONFIG_BLK_DEV_RAM_COUNT=16
317CONFIG_BLK_DEV_RAM_SIZE=131072 335CONFIG_BLK_DEV_RAM_SIZE=131072
336CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
318CONFIG_BLK_DEV_INITRD=y 337CONFIG_BLK_DEV_INITRD=y
319# CONFIG_CDROM_PKTCDVD is not set 338# CONFIG_CDROM_PKTCDVD is not set
320# CONFIG_ATA_OVER_ETH is not set 339# CONFIG_ATA_OVER_ETH is not set
@@ -383,6 +402,8 @@ CONFIG_PHYLIB=y
383# CONFIG_LXT_PHY is not set 402# CONFIG_LXT_PHY is not set
384# CONFIG_CICADA_PHY is not set 403# CONFIG_CICADA_PHY is not set
385CONFIG_VITESSE_PHY=y 404CONFIG_VITESSE_PHY=y
405# CONFIG_SMSC_PHY is not set
406# CONFIG_FIXED_PHY is not set
386 407
387# 408#
388# Ethernet (10 or 100Mbit) 409# Ethernet (10 or 100Mbit)
@@ -426,6 +447,7 @@ CONFIG_GIANFAR=y
426# CONFIG_CHELSIO_T1 is not set 447# CONFIG_CHELSIO_T1 is not set
427# CONFIG_IXGB is not set 448# CONFIG_IXGB is not set
428# CONFIG_S2IO is not set 449# CONFIG_S2IO is not set
450# CONFIG_MYRI10GE is not set
429 451
430# 452#
431# Token Ring devices 453# Token Ring devices
@@ -500,6 +522,7 @@ CONFIG_SERIO_LIBPS2=y
500CONFIG_VT=y 522CONFIG_VT=y
501CONFIG_VT_CONSOLE=y 523CONFIG_VT_CONSOLE=y
502CONFIG_HW_CONSOLE=y 524CONFIG_HW_CONSOLE=y
525# CONFIG_VT_HW_CONSOLE_BINDING is not set
503# CONFIG_SERIAL_NONSTANDARD is not set 526# CONFIG_SERIAL_NONSTANDARD is not set
504 527
505# 528#
@@ -534,6 +557,7 @@ CONFIG_UNIX98_PTYS=y
534# Watchdog Cards 557# Watchdog Cards
535# 558#
536# CONFIG_WATCHDOG is not set 559# CONFIG_WATCHDOG is not set
560# CONFIG_HW_RANDOM is not set
537# CONFIG_NVRAM is not set 561# CONFIG_NVRAM is not set
538# CONFIG_GEN_RTC is not set 562# CONFIG_GEN_RTC is not set
539# CONFIG_DTLK is not set 563# CONFIG_DTLK is not set
@@ -579,6 +603,7 @@ CONFIG_I2C=y
579# CONFIG_I2C_PIIX4 is not set 603# CONFIG_I2C_PIIX4 is not set
580CONFIG_I2C_MPC=y 604CONFIG_I2C_MPC=y
581# CONFIG_I2C_NFORCE2 is not set 605# CONFIG_I2C_NFORCE2 is not set
606# CONFIG_I2C_OCORES is not set
582# CONFIG_I2C_PARPORT_LIGHT is not set 607# CONFIG_I2C_PARPORT_LIGHT is not set
583# CONFIG_I2C_PROSAVAGE is not set 608# CONFIG_I2C_PROSAVAGE is not set
584# CONFIG_I2C_SAVAGE4 is not set 609# CONFIG_I2C_SAVAGE4 is not set
@@ -615,7 +640,6 @@ CONFIG_SENSORS_EEPROM=y
615# 640#
616# Dallas's 1-wire bus 641# Dallas's 1-wire bus
617# 642#
618# CONFIG_W1 is not set
619 643
620# 644#
621# Hardware Monitoring support 645# Hardware Monitoring support
@@ -631,6 +655,7 @@ CONFIG_SENSORS_EEPROM=y
631# Multimedia devices 655# Multimedia devices
632# 656#
633# CONFIG_VIDEO_DEV is not set 657# CONFIG_VIDEO_DEV is not set
658CONFIG_VIDEO_V4L2=y
634 659
635# 660#
636# Digital Video Broadcasting Devices 661# Digital Video Broadcasting Devices
@@ -640,6 +665,7 @@ CONFIG_SENSORS_EEPROM=y
640# 665#
641# Graphics support 666# Graphics support
642# 667#
668CONFIG_FIRMWARE_EDID=y
643# CONFIG_FB is not set 669# CONFIG_FB is not set
644 670
645# 671#
@@ -648,6 +674,7 @@ CONFIG_SENSORS_EEPROM=y
648CONFIG_VGA_CONSOLE=y 674CONFIG_VGA_CONSOLE=y
649# CONFIG_VGACON_SOFT_SCROLLBACK is not set 675# CONFIG_VGACON_SOFT_SCROLLBACK is not set
650CONFIG_DUMMY_CONSOLE=y 676CONFIG_DUMMY_CONSOLE=y
677# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
651 678
652# 679#
653# Sound 680# Sound
@@ -704,6 +731,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
704# CONFIG_RTC_CLASS is not set 731# CONFIG_RTC_CLASS is not set
705 732
706# 733#
734# DMA Engine support
735#
736# CONFIG_DMA_ENGINE is not set
737
738#
739# DMA Clients
740#
741
742#
743# DMA Devices
744#
745
746#
707# File systems 747# File systems
708# 748#
709CONFIG_EXT2_FS=y 749CONFIG_EXT2_FS=y
@@ -870,6 +910,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
870# CONFIG_CRC16 is not set 910# CONFIG_CRC16 is not set
871CONFIG_CRC32=y 911CONFIG_CRC32=y
872# CONFIG_LIBCRC32C is not set 912# CONFIG_LIBCRC32C is not set
913CONFIG_PLIST=y
873 914
874# 915#
875# Instrumentation Support 916# Instrumentation Support
@@ -881,13 +922,18 @@ CONFIG_CRC32=y
881# 922#
882# CONFIG_PRINTK_TIME is not set 923# CONFIG_PRINTK_TIME is not set
883# CONFIG_MAGIC_SYSRQ is not set 924# CONFIG_MAGIC_SYSRQ is not set
925# CONFIG_UNUSED_SYMBOLS is not set
884CONFIG_DEBUG_KERNEL=y 926CONFIG_DEBUG_KERNEL=y
885CONFIG_LOG_BUF_SHIFT=14 927CONFIG_LOG_BUF_SHIFT=14
886CONFIG_DETECT_SOFTLOCKUP=y 928CONFIG_DETECT_SOFTLOCKUP=y
887# CONFIG_SCHEDSTATS is not set 929# CONFIG_SCHEDSTATS is not set
888# CONFIG_DEBUG_MUTEXES is not set 930# CONFIG_DEBUG_RT_MUTEXES is not set
931# CONFIG_RT_MUTEX_TESTER is not set
889# CONFIG_DEBUG_SPINLOCK is not set 932# CONFIG_DEBUG_SPINLOCK is not set
933# CONFIG_DEBUG_MUTEXES is not set
934# CONFIG_DEBUG_RWSEMS is not set
890# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 935# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
936# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
891# CONFIG_DEBUG_KOBJECT is not set 937# CONFIG_DEBUG_KOBJECT is not set
892# CONFIG_DEBUG_HIGHMEM is not set 938# CONFIG_DEBUG_HIGHMEM is not set
893# CONFIG_DEBUG_INFO is not set 939# CONFIG_DEBUG_INFO is not set
@@ -899,11 +945,7 @@ CONFIG_FORCED_INLINING=y
899# CONFIG_DEBUGGER is not set 945# CONFIG_DEBUGGER is not set
900# CONFIG_BDI_SWITCH is not set 946# CONFIG_BDI_SWITCH is not set
901# CONFIG_BOOTX_TEXT is not set 947# CONFIG_BOOTX_TEXT is not set
902# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 948# CONFIG_PPC_EARLY_DEBUG is not set
903# CONFIG_PPC_EARLY_DEBUG_G5 is not set
904# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
905# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
906# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
907 949
908# 950#
909# Security options 951# Security options
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 3545af9896af..6861dde7d77b 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17 3# Linux kernel version: 2.6.18-rc6
4# Mon Jul 3 14:20:49 2006 4# Sun Sep 10 10:30:23 2006
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -60,6 +60,7 @@ CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
61CONFIG_POSIX_MQUEUE=y 61CONFIG_POSIX_MQUEUE=y
62# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
63# CONFIG_TASKSTATS is not set
63CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
64# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
65CONFIG_IKCONFIG=y 66CONFIG_IKCONFIG=y
@@ -128,7 +129,6 @@ CONFIG_PPC_PMAC=y
128# CONFIG_PPC_CELL is not set 129# CONFIG_PPC_CELL is not set
129# CONFIG_PPC_CELL_NATIVE is not set 130# CONFIG_PPC_CELL_NATIVE is not set
130# CONFIG_UDBG_RTAS_CONSOLE is not set 131# CONFIG_UDBG_RTAS_CONSOLE is not set
131CONFIG_MPIC=y
132# CONFIG_PPC_RTAS is not set 132# CONFIG_PPC_RTAS is not set
133# CONFIG_MMIO_NVRAM is not set 133# CONFIG_MMIO_NVRAM is not set
134CONFIG_PPC_MPC106=y 134CONFIG_PPC_MPC106=y
@@ -149,6 +149,7 @@ CONFIG_CPU_FREQ_PMAC=y
149CONFIG_PPC601_SYNC_FIX=y 149CONFIG_PPC601_SYNC_FIX=y
150# CONFIG_TAU is not set 150# CONFIG_TAU is not set
151# CONFIG_WANT_EARLY_SERIAL is not set 151# CONFIG_WANT_EARLY_SERIAL is not set
152CONFIG_MPIC=y
152 153
153# 154#
154# Kernel options 155# Kernel options
@@ -189,6 +190,7 @@ CONFIG_ISA_DMA_API=y
189# Bus options 190# Bus options
190# 191#
191CONFIG_GENERIC_ISA_DMA=y 192CONFIG_GENERIC_ISA_DMA=y
193# CONFIG_MPIC_WEIRD is not set
192# CONFIG_PPC_I8259 is not set 194# CONFIG_PPC_I8259 is not set
193CONFIG_PPC_INDIRECT_PCI=y 195CONFIG_PPC_INDIRECT_PCI=y
194CONFIG_PCI=y 196CONFIG_PCI=y
@@ -559,6 +561,7 @@ CONFIG_BLK_DEV_UB=m
559CONFIG_BLK_DEV_RAM=y 561CONFIG_BLK_DEV_RAM=y
560CONFIG_BLK_DEV_RAM_COUNT=16 562CONFIG_BLK_DEV_RAM_COUNT=16
561CONFIG_BLK_DEV_RAM_SIZE=4096 563CONFIG_BLK_DEV_RAM_SIZE=4096
564CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
562CONFIG_BLK_DEV_INITRD=y 565CONFIG_BLK_DEV_INITRD=y
563# CONFIG_CDROM_PKTCDVD is not set 566# CONFIG_CDROM_PKTCDVD is not set
564# CONFIG_ATA_OVER_ETH is not set 567# CONFIG_ATA_OVER_ETH is not set
@@ -1502,7 +1505,6 @@ CONFIG_USB_MON=y
1502CONFIG_USB_SERIAL=m 1505CONFIG_USB_SERIAL=m
1503# CONFIG_USB_SERIAL_GENERIC is not set 1506# CONFIG_USB_SERIAL_GENERIC is not set
1504# CONFIG_USB_SERIAL_AIRPRIME is not set 1507# CONFIG_USB_SERIAL_AIRPRIME is not set
1505# CONFIG_USB_SERIAL_ANYDATA is not set
1506# CONFIG_USB_SERIAL_ARK3116 is not set 1508# CONFIG_USB_SERIAL_ARK3116 is not set
1507# CONFIG_USB_SERIAL_BELKIN is not set 1509# CONFIG_USB_SERIAL_BELKIN is not set
1508# CONFIG_USB_SERIAL_WHITEHEAT is not set 1510# CONFIG_USB_SERIAL_WHITEHEAT is not set
@@ -1540,6 +1542,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1540# CONFIG_USB_SERIAL_PL2303 is not set 1542# CONFIG_USB_SERIAL_PL2303 is not set
1541# CONFIG_USB_SERIAL_HP4X is not set 1543# CONFIG_USB_SERIAL_HP4X is not set
1542# CONFIG_USB_SERIAL_SAFE is not set 1544# CONFIG_USB_SERIAL_SAFE is not set
1545# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1543# CONFIG_USB_SERIAL_TI is not set 1546# CONFIG_USB_SERIAL_TI is not set
1544# CONFIG_USB_SERIAL_CYBERJACK is not set 1547# CONFIG_USB_SERIAL_CYBERJACK is not set
1545# CONFIG_USB_SERIAL_XIRCOM is not set 1548# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -1557,7 +1560,7 @@ CONFIG_USB_EZUSB=y
1557# CONFIG_USB_LEGOTOWER is not set 1560# CONFIG_USB_LEGOTOWER is not set
1558# CONFIG_USB_LCD is not set 1561# CONFIG_USB_LCD is not set
1559# CONFIG_USB_LED is not set 1562# CONFIG_USB_LED is not set
1560# CONFIG_USB_CY7C63 is not set 1563# CONFIG_USB_CYPRESS_CY7C63 is not set
1561# CONFIG_USB_CYTHERM is not set 1564# CONFIG_USB_CYTHERM is not set
1562# CONFIG_USB_PHIDGETKIT is not set 1565# CONFIG_USB_PHIDGETKIT is not set
1563# CONFIG_USB_PHIDGETSERVO is not set 1566# CONFIG_USB_PHIDGETSERVO is not set
@@ -1728,7 +1731,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1728CONFIG_SMB_FS=m 1731CONFIG_SMB_FS=m
1729# CONFIG_SMB_NLS_DEFAULT is not set 1732# CONFIG_SMB_NLS_DEFAULT is not set
1730# CONFIG_CIFS is not set 1733# CONFIG_CIFS is not set
1731# CONFIG_CIFS_DEBUG2 is not set
1732# CONFIG_NCP_FS is not set 1734# CONFIG_NCP_FS is not set
1733# CONFIG_CODA_FS is not set 1735# CONFIG_CODA_FS is not set
1734# CONFIG_AFS_FS is not set 1736# CONFIG_AFS_FS is not set
@@ -1831,11 +1833,13 @@ CONFIG_LOG_BUF_SHIFT=14
1831CONFIG_DETECT_SOFTLOCKUP=y 1833CONFIG_DETECT_SOFTLOCKUP=y
1832# CONFIG_SCHEDSTATS is not set 1834# CONFIG_SCHEDSTATS is not set
1833# CONFIG_DEBUG_SLAB is not set 1835# CONFIG_DEBUG_SLAB is not set
1834# CONFIG_DEBUG_MUTEXES is not set
1835# CONFIG_DEBUG_RT_MUTEXES is not set 1836# CONFIG_DEBUG_RT_MUTEXES is not set
1836# CONFIG_RT_MUTEX_TESTER is not set 1837# CONFIG_RT_MUTEX_TESTER is not set
1837# CONFIG_DEBUG_SPINLOCK is not set 1838# CONFIG_DEBUG_SPINLOCK is not set
1839# CONFIG_DEBUG_MUTEXES is not set
1840# CONFIG_DEBUG_RWSEMS is not set
1838# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1841# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1842# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1839# CONFIG_DEBUG_KOBJECT is not set 1843# CONFIG_DEBUG_KOBJECT is not set
1840# CONFIG_DEBUG_INFO is not set 1844# CONFIG_DEBUG_INFO is not set
1841# CONFIG_DEBUG_FS is not set 1845# CONFIG_DEBUG_FS is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 395e49847788..7517d0c5303f 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,15 +1,18 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc2 3# Linux kernel version: 2.6.18-rc6
4# Fri Feb 10 17:32:14 2006 4# Sun Sep 10 10:45:11 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 8CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
11CONFIG_IRQ_PER_CPU=y
11CONFIG_RWSEM_XCHGADD_ALGORITHM=y 12CONFIG_RWSEM_XCHGADD_ALGORITHM=y
13CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_CALIBRATE_DELAY=y 14CONFIG_GENERIC_CALIBRATE_DELAY=y
15CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_PPC=y 16CONFIG_PPC=y
14CONFIG_EARLY_PRINTK=y 17CONFIG_EARLY_PRINTK=y
15CONFIG_COMPAT=y 18CONFIG_COMPAT=y
@@ -30,8 +33,10 @@ CONFIG_POWER4=y
30CONFIG_PPC_FPU=y 33CONFIG_PPC_FPU=y
31CONFIG_ALTIVEC=y 34CONFIG_ALTIVEC=y
32CONFIG_PPC_STD_MMU=y 35CONFIG_PPC_STD_MMU=y
36CONFIG_VIRT_CPU_ACCOUNTING=y
33CONFIG_SMP=y 37CONFIG_SMP=y
34CONFIG_NR_CPUS=32 38CONFIG_NR_CPUS=32
39CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35 40
36# 41#
37# Code maturity level options 42# Code maturity level options
@@ -49,11 +54,14 @@ CONFIG_SWAP=y
49CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
50CONFIG_POSIX_MQUEUE=y 55CONFIG_POSIX_MQUEUE=y
51# CONFIG_BSD_PROCESS_ACCT is not set 56# CONFIG_BSD_PROCESS_ACCT is not set
57CONFIG_TASKSTATS=y
58CONFIG_TASK_DELAY_ACCT=y
52CONFIG_SYSCTL=y 59CONFIG_SYSCTL=y
53# CONFIG_AUDIT is not set 60# CONFIG_AUDIT is not set
54CONFIG_IKCONFIG=y 61CONFIG_IKCONFIG=y
55CONFIG_IKCONFIG_PROC=y 62CONFIG_IKCONFIG_PROC=y
56CONFIG_CPUSETS=y 63CONFIG_CPUSETS=y
64CONFIG_RELAY=y
57CONFIG_INITRAMFS_SOURCE="" 65CONFIG_INITRAMFS_SOURCE=""
58CONFIG_CC_OPTIMIZE_FOR_SIZE=y 66CONFIG_CC_OPTIMIZE_FOR_SIZE=y
59# CONFIG_EMBEDDED is not set 67# CONFIG_EMBEDDED is not set
@@ -65,14 +73,12 @@ CONFIG_PRINTK=y
65CONFIG_BUG=y 73CONFIG_BUG=y
66CONFIG_ELF_CORE=y 74CONFIG_ELF_CORE=y
67CONFIG_BASE_FULL=y 75CONFIG_BASE_FULL=y
76CONFIG_RT_MUTEXES=y
68CONFIG_FUTEX=y 77CONFIG_FUTEX=y
69CONFIG_EPOLL=y 78CONFIG_EPOLL=y
70CONFIG_SHMEM=y 79CONFIG_SHMEM=y
71CONFIG_CC_ALIGN_FUNCTIONS=0
72CONFIG_CC_ALIGN_LABELS=0
73CONFIG_CC_ALIGN_LOOPS=0
74CONFIG_CC_ALIGN_JUMPS=0
75CONFIG_SLAB=y 80CONFIG_SLAB=y
81CONFIG_VM_EVENT_COUNTERS=y
76# CONFIG_TINY_SHMEM is not set 82# CONFIG_TINY_SHMEM is not set
77CONFIG_BASE_SMALL=0 83CONFIG_BASE_SMALL=0
78# CONFIG_SLOB is not set 84# CONFIG_SLOB is not set
@@ -83,7 +89,6 @@ CONFIG_BASE_SMALL=0
83CONFIG_MODULES=y 89CONFIG_MODULES=y
84CONFIG_MODULE_UNLOAD=y 90CONFIG_MODULE_UNLOAD=y
85# CONFIG_MODULE_FORCE_UNLOAD is not set 91# CONFIG_MODULE_FORCE_UNLOAD is not set
86CONFIG_OBSOLETE_MODPARM=y
87CONFIG_MODVERSIONS=y 92CONFIG_MODVERSIONS=y
88CONFIG_MODULE_SRCVERSION_ALL=y 93CONFIG_MODULE_SRCVERSION_ALL=y
89CONFIG_KMOD=y 94CONFIG_KMOD=y
@@ -92,6 +97,7 @@ CONFIG_STOP_MACHINE=y
92# 97#
93# Block layer 98# Block layer
94# 99#
100CONFIG_BLK_DEV_IO_TRACE=y
95 101
96# 102#
97# IO Schedulers 103# IO Schedulers
@@ -117,19 +123,22 @@ CONFIG_PPC_PSERIES=y
117CONFIG_PPC_PMAC=y 123CONFIG_PPC_PMAC=y
118CONFIG_PPC_PMAC64=y 124CONFIG_PPC_PMAC64=y
119CONFIG_PPC_MAPLE=y 125CONFIG_PPC_MAPLE=y
120# CONFIG_PPC_CELL is not set 126CONFIG_PPC_CELL=y
127CONFIG_PPC_CELL_NATIVE=y
128CONFIG_PPC_IBM_CELL_BLADE=y
129CONFIG_UDBG_RTAS_CONSOLE=y
121CONFIG_XICS=y 130CONFIG_XICS=y
122CONFIG_U3_DART=y 131CONFIG_U3_DART=y
123CONFIG_MPIC=y
124CONFIG_PPC_RTAS=y 132CONFIG_PPC_RTAS=y
125CONFIG_RTAS_ERROR_LOGGING=y 133CONFIG_RTAS_ERROR_LOGGING=y
126CONFIG_RTAS_PROC=y 134CONFIG_RTAS_PROC=y
127CONFIG_RTAS_FLASH=m 135CONFIG_RTAS_FLASH=m
128# CONFIG_MMIO_NVRAM is not set 136CONFIG_MMIO_NVRAM=y
129CONFIG_MPIC_BROKEN_U3=y 137CONFIG_MPIC_BROKEN_U3=y
130CONFIG_IBMVIO=y 138CONFIG_IBMVIO=y
131# CONFIG_IBMEBUS is not set 139# CONFIG_IBMEBUS is not set
132# CONFIG_PPC_MPC106 is not set 140# CONFIG_PPC_MPC106 is not set
141CONFIG_PPC_970_NAP=y
133CONFIG_CPU_FREQ=y 142CONFIG_CPU_FREQ=y
134CONFIG_CPU_FREQ_TABLE=y 143CONFIG_CPU_FREQ_TABLE=y
135# CONFIG_CPU_FREQ_DEBUG is not set 144# CONFIG_CPU_FREQ_DEBUG is not set
@@ -144,6 +153,15 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
144# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 153# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
145CONFIG_CPU_FREQ_PMAC64=y 154CONFIG_CPU_FREQ_PMAC64=y
146# CONFIG_WANT_EARLY_SERIAL is not set 155# CONFIG_WANT_EARLY_SERIAL is not set
156CONFIG_MPIC=y
157
158#
159# Cell Broadband Engine options
160#
161CONFIG_SPU_FS=m
162CONFIG_SPU_BASE=y
163CONFIG_SPUFS_MMAP=y
164CONFIG_CBE_RAS=y
147 165
148# 166#
149# Kernel options 167# Kernel options
@@ -161,6 +179,7 @@ CONFIG_BINFMT_MISC=m
161CONFIG_FORCE_MAX_ZONEORDER=13 179CONFIG_FORCE_MAX_ZONEORDER=13
162CONFIG_IOMMU_VMERGE=y 180CONFIG_IOMMU_VMERGE=y
163CONFIG_HOTPLUG_CPU=y 181CONFIG_HOTPLUG_CPU=y
182CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
164CONFIG_KEXEC=y 183CONFIG_KEXEC=y
165# CONFIG_CRASH_DUMP is not set 184# CONFIG_CRASH_DUMP is not set
166CONFIG_IRQ_ALL_CPUS=y 185CONFIG_IRQ_ALL_CPUS=y
@@ -181,9 +200,10 @@ CONFIG_SPARSEMEM=y
181CONFIG_HAVE_MEMORY_PRESENT=y 200CONFIG_HAVE_MEMORY_PRESENT=y
182# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
183CONFIG_SPARSEMEM_EXTREME=y 202CONFIG_SPARSEMEM_EXTREME=y
184# CONFIG_MEMORY_HOTPLUG is not set 203CONFIG_MEMORY_HOTPLUG=y
185CONFIG_SPLIT_PTLOCK_CPUS=4 204CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_MIGRATION=y 205CONFIG_RESOURCES_64BIT=y
206CONFIG_ARCH_MEMORY_PROBE=y
187# CONFIG_PPC_64K_PAGES is not set 207# CONFIG_PPC_64K_PAGES is not set
188# CONFIG_SCHED_SMT is not set 208# CONFIG_SCHED_SMT is not set
189CONFIG_PROC_DEVICETREE=y 209CONFIG_PROC_DEVICETREE=y
@@ -196,11 +216,12 @@ CONFIG_ISA_DMA_API=y
196# Bus options 216# Bus options
197# 217#
198CONFIG_GENERIC_ISA_DMA=y 218CONFIG_GENERIC_ISA_DMA=y
219# CONFIG_MPIC_WEIRD is not set
199CONFIG_PPC_I8259=y 220CONFIG_PPC_I8259=y
200# CONFIG_PPC_INDIRECT_PCI is not set 221# CONFIG_PPC_INDIRECT_PCI is not set
201CONFIG_PCI=y 222CONFIG_PCI=y
202CONFIG_PCI_DOMAINS=y 223CONFIG_PCI_DOMAINS=y
203# CONFIG_PCI_LEGACY_PROC is not set 224# CONFIG_PCIEPORTBUS is not set
204# CONFIG_PCI_DEBUG is not set 225# CONFIG_PCI_DEBUG is not set
205 226
206# 227#
@@ -247,7 +268,10 @@ CONFIG_SYN_COOKIES=y
247CONFIG_INET_AH=m 268CONFIG_INET_AH=m
248CONFIG_INET_ESP=m 269CONFIG_INET_ESP=m
249CONFIG_INET_IPCOMP=m 270CONFIG_INET_IPCOMP=m
271CONFIG_INET_XFRM_TUNNEL=m
250CONFIG_INET_TUNNEL=y 272CONFIG_INET_TUNNEL=y
273CONFIG_INET_XFRM_MODE_TRANSPORT=y
274CONFIG_INET_XFRM_MODE_TUNNEL=y
251CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
252CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
253# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
@@ -258,6 +282,9 @@ CONFIG_TCP_CONG_BIC=y
258# 282#
259# CONFIG_IP_VS is not set 283# CONFIG_IP_VS is not set
260# CONFIG_IPV6 is not set 284# CONFIG_IPV6 is not set
285# CONFIG_INET6_XFRM_TUNNEL is not set
286# CONFIG_INET6_TUNNEL is not set
287# CONFIG_NETWORK_SECMARK is not set
261CONFIG_NETFILTER=y 288CONFIG_NETFILTER=y
262# CONFIG_NETFILTER_DEBUG is not set 289# CONFIG_NETFILTER_DEBUG is not set
263 290
@@ -284,6 +311,8 @@ CONFIG_IP_NF_IRC=m
284CONFIG_IP_NF_TFTP=m 311CONFIG_IP_NF_TFTP=m
285CONFIG_IP_NF_AMANDA=m 312CONFIG_IP_NF_AMANDA=m
286# CONFIG_IP_NF_PPTP is not set 313# CONFIG_IP_NF_PPTP is not set
314# CONFIG_IP_NF_H323 is not set
315CONFIG_IP_NF_SIP=m
287CONFIG_IP_NF_QUEUE=m 316CONFIG_IP_NF_QUEUE=m
288 317
289# 318#
@@ -339,6 +368,7 @@ CONFIG_STANDALONE=y
339CONFIG_PREVENT_FIRMWARE_BUILD=y 368CONFIG_PREVENT_FIRMWARE_BUILD=y
340CONFIG_FW_LOADER=y 369CONFIG_FW_LOADER=y
341# CONFIG_DEBUG_DRIVER is not set 370# CONFIG_DEBUG_DRIVER is not set
371# CONFIG_SYS_HYPERVISOR is not set
342 372
343# 373#
344# Connector - unified userspace <-> kernelspace linker 374# Connector - unified userspace <-> kernelspace linker
@@ -376,6 +406,7 @@ CONFIG_BLK_DEV_NBD=m
376CONFIG_BLK_DEV_RAM=y 406CONFIG_BLK_DEV_RAM=y
377CONFIG_BLK_DEV_RAM_COUNT=16 407CONFIG_BLK_DEV_RAM_COUNT=16
378CONFIG_BLK_DEV_RAM_SIZE=65536 408CONFIG_BLK_DEV_RAM_SIZE=65536
409CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
379CONFIG_BLK_DEV_INITRD=y 410CONFIG_BLK_DEV_INITRD=y
380# CONFIG_CDROM_PKTCDVD is not set 411# CONFIG_CDROM_PKTCDVD is not set
381# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
@@ -436,7 +467,6 @@ CONFIG_BLK_DEV_AMD74XX=y
436CONFIG_BLK_DEV_IDE_PMAC=y 467CONFIG_BLK_DEV_IDE_PMAC=y
437CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 468CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
438CONFIG_BLK_DEV_IDEDMA_PMAC=y 469CONFIG_BLK_DEV_IDEDMA_PMAC=y
439# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set
440# CONFIG_IDE_ARM is not set 470# CONFIG_IDE_ARM is not set
441CONFIG_BLK_DEV_IDEDMA=y 471CONFIG_BLK_DEV_IDEDMA=y
442# CONFIG_IDEDMA_IVB is not set 472# CONFIG_IDEDMA_IVB is not set
@@ -497,6 +527,7 @@ CONFIG_SCSI_SATA_SVW=y
497# CONFIG_SCSI_SATA_MV is not set 527# CONFIG_SCSI_SATA_MV is not set
498# CONFIG_SCSI_SATA_NV is not set 528# CONFIG_SCSI_SATA_NV is not set
499# CONFIG_SCSI_PDC_ADMA is not set 529# CONFIG_SCSI_PDC_ADMA is not set
530# CONFIG_SCSI_HPTIOP is not set
500# CONFIG_SCSI_SATA_QSTOR is not set 531# CONFIG_SCSI_SATA_QSTOR is not set
501# CONFIG_SCSI_SATA_PROMISE is not set 532# CONFIG_SCSI_SATA_PROMISE is not set
502# CONFIG_SCSI_SATA_SX4 is not set 533# CONFIG_SCSI_SATA_SX4 is not set
@@ -519,11 +550,10 @@ CONFIG_SCSI_SYM53C8XX_2=y
519CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 550CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
520CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 551CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
521CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 552CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
522# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 553CONFIG_SCSI_SYM53C8XX_MMIO=y
523CONFIG_SCSI_IPR=y 554CONFIG_SCSI_IPR=y
524CONFIG_SCSI_IPR_TRACE=y 555CONFIG_SCSI_IPR_TRACE=y
525CONFIG_SCSI_IPR_DUMP=y 556CONFIG_SCSI_IPR_DUMP=y
526# CONFIG_SCSI_QLOGIC_FC is not set
527# CONFIG_SCSI_QLOGIC_1280 is not set 557# CONFIG_SCSI_QLOGIC_1280 is not set
528# CONFIG_SCSI_QLA_FC is not set 558# CONFIG_SCSI_QLA_FC is not set
529CONFIG_SCSI_LPFC=m 559CONFIG_SCSI_LPFC=m
@@ -540,8 +570,8 @@ CONFIG_MD_LINEAR=y
540CONFIG_MD_RAID0=y 570CONFIG_MD_RAID0=y
541CONFIG_MD_RAID1=y 571CONFIG_MD_RAID1=y
542CONFIG_MD_RAID10=y 572CONFIG_MD_RAID10=y
543CONFIG_MD_RAID5=y 573CONFIG_MD_RAID456=y
544CONFIG_MD_RAID6=m 574CONFIG_MD_RAID5_RESHAPE=y
545CONFIG_MD_MULTIPATH=m 575CONFIG_MD_MULTIPATH=m
546CONFIG_MD_FAULTY=m 576CONFIG_MD_FAULTY=m
547CONFIG_BLK_DEV_DM=y 577CONFIG_BLK_DEV_DM=y
@@ -585,7 +615,6 @@ CONFIG_IEEE1394_OHCI1394=y
585# 615#
586CONFIG_IEEE1394_VIDEO1394=m 616CONFIG_IEEE1394_VIDEO1394=m
587CONFIG_IEEE1394_SBP2=m 617CONFIG_IEEE1394_SBP2=m
588# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
589CONFIG_IEEE1394_ETH1394=m 618CONFIG_IEEE1394_ETH1394=m
590CONFIG_IEEE1394_DV1394=m 619CONFIG_IEEE1394_DV1394=m
591CONFIG_IEEE1394_RAWIO=y 620CONFIG_IEEE1394_RAWIO=y
@@ -599,6 +628,7 @@ CONFIG_IEEE1394_RAWIO=y
599# Macintosh device drivers 628# Macintosh device drivers
600# 629#
601CONFIG_ADB_PMU=y 630CONFIG_ADB_PMU=y
631# CONFIG_ADB_PMU_LED is not set
602CONFIG_PMAC_SMU=y 632CONFIG_PMAC_SMU=y
603CONFIG_THERM_PM72=y 633CONFIG_THERM_PM72=y
604CONFIG_WINDFARM=y 634CONFIG_WINDFARM=y
@@ -682,6 +712,7 @@ CONFIG_E1000=y
682# CONFIG_VIA_VELOCITY is not set 712# CONFIG_VIA_VELOCITY is not set
683CONFIG_TIGON3=y 713CONFIG_TIGON3=y
684# CONFIG_BNX2 is not set 714# CONFIG_BNX2 is not set
715CONFIG_SPIDER_NET=m
685# CONFIG_MV643XX_ETH is not set 716# CONFIG_MV643XX_ETH is not set
686 717
687# 718#
@@ -691,6 +722,7 @@ CONFIG_TIGON3=y
691CONFIG_IXGB=m 722CONFIG_IXGB=m
692# CONFIG_IXGB_NAPI is not set 723# CONFIG_IXGB_NAPI is not set
693# CONFIG_S2IO is not set 724# CONFIG_S2IO is not set
725# CONFIG_MYRI10GE is not set
694 726
695# 727#
696# Token Ring devices 728# Token Ring devices
@@ -792,6 +824,7 @@ CONFIG_SERIO_LIBPS2=y
792CONFIG_VT=y 824CONFIG_VT=y
793CONFIG_VT_CONSOLE=y 825CONFIG_VT_CONSOLE=y
794CONFIG_HW_CONSOLE=y 826CONFIG_HW_CONSOLE=y
827# CONFIG_VT_HW_CONSOLE_BINDING is not set
795# CONFIG_SERIAL_NONSTANDARD is not set 828# CONFIG_SERIAL_NONSTANDARD is not set
796 829
797# 830#
@@ -799,6 +832,7 @@ CONFIG_HW_CONSOLE=y
799# 832#
800CONFIG_SERIAL_8250=y 833CONFIG_SERIAL_8250=y
801CONFIG_SERIAL_8250_CONSOLE=y 834CONFIG_SERIAL_8250_CONSOLE=y
835CONFIG_SERIAL_8250_PCI=y
802CONFIG_SERIAL_8250_NR_UARTS=4 836CONFIG_SERIAL_8250_NR_UARTS=4
803CONFIG_SERIAL_8250_RUNTIME_UARTS=4 837CONFIG_SERIAL_8250_RUNTIME_UARTS=4
804# CONFIG_SERIAL_8250_EXTENDED is not set 838# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -814,7 +848,9 @@ CONFIG_SERIAL_ICOM=m
814CONFIG_UNIX98_PTYS=y 848CONFIG_UNIX98_PTYS=y
815CONFIG_LEGACY_PTYS=y 849CONFIG_LEGACY_PTYS=y
816CONFIG_LEGACY_PTY_COUNT=256 850CONFIG_LEGACY_PTY_COUNT=256
851CONFIG_HVC_DRIVER=y
817CONFIG_HVC_CONSOLE=y 852CONFIG_HVC_CONSOLE=y
853CONFIG_HVC_RTAS=y
818CONFIG_HVCS=m 854CONFIG_HVCS=m
819 855
820# 856#
@@ -826,7 +862,7 @@ CONFIG_HVCS=m
826# Watchdog Cards 862# Watchdog Cards
827# 863#
828# CONFIG_WATCHDOG is not set 864# CONFIG_WATCHDOG is not set
829# CONFIG_RTC is not set 865# CONFIG_HW_RANDOM is not set
830CONFIG_GEN_RTC=y 866CONFIG_GEN_RTC=y
831# CONFIG_GEN_RTC_X is not set 867# CONFIG_GEN_RTC_X is not set
832# CONFIG_DTLK is not set 868# CONFIG_DTLK is not set
@@ -874,10 +910,10 @@ CONFIG_I2C_AMD8111=y
874# CONFIG_I2C_PIIX4 is not set 910# CONFIG_I2C_PIIX4 is not set
875CONFIG_I2C_POWERMAC=y 911CONFIG_I2C_POWERMAC=y
876# CONFIG_I2C_NFORCE2 is not set 912# CONFIG_I2C_NFORCE2 is not set
913# CONFIG_I2C_OCORES is not set
877# CONFIG_I2C_PARPORT_LIGHT is not set 914# CONFIG_I2C_PARPORT_LIGHT is not set
878# CONFIG_I2C_PROSAVAGE is not set 915# CONFIG_I2C_PROSAVAGE is not set
879# CONFIG_I2C_SAVAGE4 is not set 916# CONFIG_I2C_SAVAGE4 is not set
880# CONFIG_SCx200_ACB is not set
881# CONFIG_I2C_SIS5595 is not set 917# CONFIG_I2C_SIS5595 is not set
882# CONFIG_I2C_SIS630 is not set 918# CONFIG_I2C_SIS630 is not set
883# CONFIG_I2C_SIS96X is not set 919# CONFIG_I2C_SIS96X is not set
@@ -896,9 +932,7 @@ CONFIG_I2C_POWERMAC=y
896# CONFIG_SENSORS_PCF8574 is not set 932# CONFIG_SENSORS_PCF8574 is not set
897# CONFIG_SENSORS_PCA9539 is not set 933# CONFIG_SENSORS_PCA9539 is not set
898# CONFIG_SENSORS_PCF8591 is not set 934# CONFIG_SENSORS_PCF8591 is not set
899# CONFIG_SENSORS_RTC8564 is not set
900# CONFIG_SENSORS_MAX6875 is not set 935# CONFIG_SENSORS_MAX6875 is not set
901# CONFIG_RTC_X1205_I2C is not set
902# CONFIG_I2C_DEBUG_CORE is not set 936# CONFIG_I2C_DEBUG_CORE is not set
903# CONFIG_I2C_DEBUG_ALGO is not set 937# CONFIG_I2C_DEBUG_ALGO is not set
904# CONFIG_I2C_DEBUG_BUS is not set 938# CONFIG_I2C_DEBUG_BUS is not set
@@ -913,7 +947,6 @@ CONFIG_I2C_POWERMAC=y
913# 947#
914# Dallas's 1-wire bus 948# Dallas's 1-wire bus
915# 949#
916# CONFIG_W1 is not set
917 950
918# 951#
919# Hardware Monitoring support 952# Hardware Monitoring support
@@ -926,37 +959,33 @@ CONFIG_I2C_POWERMAC=y
926# 959#
927 960
928# 961#
929# Multimedia Capabilities Port drivers
930#
931
932#
933# Multimedia devices 962# Multimedia devices
934# 963#
935# CONFIG_VIDEO_DEV is not set 964# CONFIG_VIDEO_DEV is not set
965CONFIG_VIDEO_V4L2=y
936 966
937# 967#
938# Digital Video Broadcasting Devices 968# Digital Video Broadcasting Devices
939# 969#
940# CONFIG_DVB is not set 970# CONFIG_DVB is not set
971# CONFIG_USB_DABUSB is not set
941 972
942# 973#
943# Graphics support 974# Graphics support
944# 975#
976CONFIG_FIRMWARE_EDID=y
945CONFIG_FB=y 977CONFIG_FB=y
946CONFIG_FB_CFB_FILLRECT=y 978CONFIG_FB_CFB_FILLRECT=y
947CONFIG_FB_CFB_COPYAREA=y 979CONFIG_FB_CFB_COPYAREA=y
948CONFIG_FB_CFB_IMAGEBLIT=y 980CONFIG_FB_CFB_IMAGEBLIT=y
949CONFIG_FB_MACMODES=y 981CONFIG_FB_MACMODES=y
982# CONFIG_FB_BACKLIGHT is not set
950CONFIG_FB_MODE_HELPERS=y 983CONFIG_FB_MODE_HELPERS=y
951CONFIG_FB_TILEBLITTING=y 984CONFIG_FB_TILEBLITTING=y
952# CONFIG_FB_CIRRUS is not set 985# CONFIG_FB_CIRRUS is not set
953# CONFIG_FB_PM2 is not set 986# CONFIG_FB_PM2 is not set
954# CONFIG_FB_CYBER2000 is not set 987# CONFIG_FB_CYBER2000 is not set
955CONFIG_FB_OF=y 988CONFIG_FB_OF=y
956# CONFIG_FB_CONTROL is not set
957# CONFIG_FB_PLATINUM is not set
958# CONFIG_FB_VALKYRIE is not set
959# CONFIG_FB_CT65550 is not set
960# CONFIG_FB_ASILIANT is not set 989# CONFIG_FB_ASILIANT is not set
961# CONFIG_FB_IMSTT is not set 990# CONFIG_FB_IMSTT is not set
962# CONFIG_FB_VGA16 is not set 991# CONFIG_FB_VGA16 is not set
@@ -970,7 +999,6 @@ CONFIG_FB_MATROX_G=y
970CONFIG_FB_MATROX_I2C=m 999CONFIG_FB_MATROX_I2C=m
971CONFIG_FB_MATROX_MAVEN=m 1000CONFIG_FB_MATROX_MAVEN=m
972CONFIG_FB_MATROX_MULTIHEAD=y 1001CONFIG_FB_MATROX_MULTIHEAD=y
973# CONFIG_FB_RADEON_OLD is not set
974CONFIG_FB_RADEON=y 1002CONFIG_FB_RADEON=y
975CONFIG_FB_RADEON_I2C=y 1003CONFIG_FB_RADEON_I2C=y
976# CONFIG_FB_RADEON_DEBUG is not set 1004# CONFIG_FB_RADEON_DEBUG is not set
@@ -1025,9 +1053,11 @@ CONFIG_SND_SEQ_DUMMY=m
1025CONFIG_SND_OSSEMUL=y 1053CONFIG_SND_OSSEMUL=y
1026CONFIG_SND_MIXER_OSS=m 1054CONFIG_SND_MIXER_OSS=m
1027CONFIG_SND_PCM_OSS=m 1055CONFIG_SND_PCM_OSS=m
1056CONFIG_SND_PCM_OSS_PLUGINS=y
1028CONFIG_SND_SEQUENCER_OSS=y 1057CONFIG_SND_SEQUENCER_OSS=y
1029# CONFIG_SND_DYNAMIC_MINORS is not set 1058# CONFIG_SND_DYNAMIC_MINORS is not set
1030CONFIG_SND_SUPPORT_OLD_API=y 1059CONFIG_SND_SUPPORT_OLD_API=y
1060CONFIG_SND_VERBOSE_PROCFS=y
1031# CONFIG_SND_VERBOSE_PRINTK is not set 1061# CONFIG_SND_VERBOSE_PRINTK is not set
1032# CONFIG_SND_DEBUG is not set 1062# CONFIG_SND_DEBUG is not set
1033 1063
@@ -1044,6 +1074,7 @@ CONFIG_SND_SUPPORT_OLD_API=y
1044# PCI devices 1074# PCI devices
1045# 1075#
1046# CONFIG_SND_AD1889 is not set 1076# CONFIG_SND_AD1889 is not set
1077# CONFIG_SND_ALS300 is not set
1047# CONFIG_SND_ALS4000 is not set 1078# CONFIG_SND_ALS4000 is not set
1048# CONFIG_SND_ALI5451 is not set 1079# CONFIG_SND_ALI5451 is not set
1049# CONFIG_SND_ATIIXP is not set 1080# CONFIG_SND_ATIIXP is not set
@@ -1057,6 +1088,18 @@ CONFIG_SND_SUPPORT_OLD_API=y
1057# CONFIG_SND_CMIPCI is not set 1088# CONFIG_SND_CMIPCI is not set
1058# CONFIG_SND_CS4281 is not set 1089# CONFIG_SND_CS4281 is not set
1059# CONFIG_SND_CS46XX is not set 1090# CONFIG_SND_CS46XX is not set
1091# CONFIG_SND_DARLA20 is not set
1092# CONFIG_SND_GINA20 is not set
1093# CONFIG_SND_LAYLA20 is not set
1094# CONFIG_SND_DARLA24 is not set
1095# CONFIG_SND_GINA24 is not set
1096# CONFIG_SND_LAYLA24 is not set
1097# CONFIG_SND_MONA is not set
1098# CONFIG_SND_MIA is not set
1099# CONFIG_SND_ECHO3G is not set
1100# CONFIG_SND_INDIGO is not set
1101# CONFIG_SND_INDIGOIO is not set
1102# CONFIG_SND_INDIGODJ is not set
1060# CONFIG_SND_EMU10K1 is not set 1103# CONFIG_SND_EMU10K1 is not set
1061# CONFIG_SND_EMU10K1X is not set 1104# CONFIG_SND_EMU10K1X is not set
1062# CONFIG_SND_ENS1370 is not set 1105# CONFIG_SND_ENS1370 is not set
@@ -1076,6 +1119,7 @@ CONFIG_SND_SUPPORT_OLD_API=y
1076# CONFIG_SND_MIXART is not set 1119# CONFIG_SND_MIXART is not set
1077# CONFIG_SND_NM256 is not set 1120# CONFIG_SND_NM256 is not set
1078# CONFIG_SND_PCXHR is not set 1121# CONFIG_SND_PCXHR is not set
1122# CONFIG_SND_RIPTIDE is not set
1079# CONFIG_SND_RME32 is not set 1123# CONFIG_SND_RME32 is not set
1080# CONFIG_SND_RME96 is not set 1124# CONFIG_SND_RME96 is not set
1081# CONFIG_SND_RME9652 is not set 1125# CONFIG_SND_RME9652 is not set
@@ -1093,6 +1137,17 @@ CONFIG_SND_POWERMAC=m
1093CONFIG_SND_POWERMAC_AUTO_DRC=y 1137CONFIG_SND_POWERMAC_AUTO_DRC=y
1094 1138
1095# 1139#
1140# Apple Onboard Audio driver
1141#
1142CONFIG_SND_AOA=m
1143CONFIG_SND_AOA_FABRIC_LAYOUT=m
1144CONFIG_SND_AOA_ONYX=m
1145CONFIG_SND_AOA_TAS=m
1146CONFIG_SND_AOA_TOONIE=m
1147CONFIG_SND_AOA_SOUNDBUS=m
1148CONFIG_SND_AOA_SOUNDBUS_I2S=m
1149
1150#
1096# USB devices 1151# USB devices
1097# 1152#
1098# CONFIG_SND_USB_AUDIO is not set 1153# CONFIG_SND_USB_AUDIO is not set
@@ -1108,6 +1163,7 @@ CONFIG_SND_POWERMAC_AUTO_DRC=y
1108# 1163#
1109CONFIG_USB_ARCH_HAS_HCD=y 1164CONFIG_USB_ARCH_HAS_HCD=y
1110CONFIG_USB_ARCH_HAS_OHCI=y 1165CONFIG_USB_ARCH_HAS_OHCI=y
1166CONFIG_USB_ARCH_HAS_EHCI=y
1111CONFIG_USB=y 1167CONFIG_USB=y
1112# CONFIG_USB_DEBUG is not set 1168# CONFIG_USB_DEBUG is not set
1113 1169
@@ -1125,6 +1181,7 @@ CONFIG_USB_DEVICEFS=y
1125CONFIG_USB_EHCI_HCD=y 1181CONFIG_USB_EHCI_HCD=y
1126# CONFIG_USB_EHCI_SPLIT_ISO is not set 1182# CONFIG_USB_EHCI_SPLIT_ISO is not set
1127# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1183# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1184CONFIG_USB_EHCI_TT_NEWSCHED=y
1128# CONFIG_USB_ISP116X_HCD is not set 1185# CONFIG_USB_ISP116X_HCD is not set
1129CONFIG_USB_OHCI_HCD=y 1186CONFIG_USB_OHCI_HCD=y
1130# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1187# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1135,7 +1192,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1135# 1192#
1136# USB Device Class drivers 1193# USB Device Class drivers
1137# 1194#
1138# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1139# CONFIG_USB_ACM is not set 1195# CONFIG_USB_ACM is not set
1140# CONFIG_USB_PRINTER is not set 1196# CONFIG_USB_PRINTER is not set
1141 1197
@@ -1173,9 +1229,7 @@ CONFIG_USB_HIDDEV=y
1173# CONFIG_USB_ACECAD is not set 1229# CONFIG_USB_ACECAD is not set
1174# CONFIG_USB_KBTAB is not set 1230# CONFIG_USB_KBTAB is not set
1175# CONFIG_USB_POWERMATE is not set 1231# CONFIG_USB_POWERMATE is not set
1176# CONFIG_USB_MTOUCH is not set 1232# CONFIG_USB_TOUCHSCREEN is not set
1177# CONFIG_USB_ITMTOUCH is not set
1178# CONFIG_USB_EGALAX is not set
1179# CONFIG_USB_YEALINK is not set 1233# CONFIG_USB_YEALINK is not set
1180# CONFIG_USB_XPAD is not set 1234# CONFIG_USB_XPAD is not set
1181# CONFIG_USB_ATI_REMOTE is not set 1235# CONFIG_USB_ATI_REMOTE is not set
@@ -1190,15 +1244,6 @@ CONFIG_USB_HIDDEV=y
1190# CONFIG_USB_MICROTEK is not set 1244# CONFIG_USB_MICROTEK is not set
1191 1245
1192# 1246#
1193# USB Multimedia devices
1194#
1195# CONFIG_USB_DABUSB is not set
1196
1197#
1198# Video4Linux support is needed for USB Multimedia device support
1199#
1200
1201#
1202# USB Network Adapters 1247# USB Network Adapters
1203# 1248#
1204# CONFIG_USB_CATC is not set 1249# CONFIG_USB_CATC is not set
@@ -1227,10 +1272,12 @@ CONFIG_USB_HIDDEV=y
1227# CONFIG_USB_LEGOTOWER is not set 1272# CONFIG_USB_LEGOTOWER is not set
1228# CONFIG_USB_LCD is not set 1273# CONFIG_USB_LCD is not set
1229# CONFIG_USB_LED is not set 1274# CONFIG_USB_LED is not set
1275# CONFIG_USB_CYPRESS_CY7C63 is not set
1230# CONFIG_USB_CYTHERM is not set 1276# CONFIG_USB_CYTHERM is not set
1231# CONFIG_USB_PHIDGETKIT is not set 1277# CONFIG_USB_PHIDGETKIT is not set
1232# CONFIG_USB_PHIDGETSERVO is not set 1278# CONFIG_USB_PHIDGETSERVO is not set
1233# CONFIG_USB_IDMOUSE is not set 1279# CONFIG_USB_IDMOUSE is not set
1280CONFIG_USB_APPLEDISPLAY=m
1234# CONFIG_USB_SISUSBVGA is not set 1281# CONFIG_USB_SISUSBVGA is not set
1235# CONFIG_USB_LD is not set 1282# CONFIG_USB_LD is not set
1236# CONFIG_USB_TEST is not set 1283# CONFIG_USB_TEST is not set
@@ -1250,23 +1297,53 @@ CONFIG_USB_HIDDEV=y
1250# CONFIG_MMC is not set 1297# CONFIG_MMC is not set
1251 1298
1252# 1299#
1300# LED devices
1301#
1302# CONFIG_NEW_LEDS is not set
1303
1304#
1305# LED drivers
1306#
1307
1308#
1309# LED Triggers
1310#
1311
1312#
1253# InfiniBand support 1313# InfiniBand support
1254# 1314#
1255CONFIG_INFINIBAND=m 1315CONFIG_INFINIBAND=m
1256# CONFIG_INFINIBAND_USER_MAD is not set 1316# CONFIG_INFINIBAND_USER_MAD is not set
1257# CONFIG_INFINIBAND_USER_ACCESS is not set 1317# CONFIG_INFINIBAND_USER_ACCESS is not set
1318CONFIG_INFINIBAND_ADDR_TRANS=y
1258CONFIG_INFINIBAND_MTHCA=m 1319CONFIG_INFINIBAND_MTHCA=m
1259# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1320CONFIG_INFINIBAND_MTHCA_DEBUG=y
1260CONFIG_INFINIBAND_IPOIB=m 1321CONFIG_INFINIBAND_IPOIB=m
1261# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1322CONFIG_INFINIBAND_IPOIB_DEBUG=y
1323# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1262# CONFIG_INFINIBAND_SRP is not set 1324# CONFIG_INFINIBAND_SRP is not set
1325CONFIG_INFINIBAND_ISER=m
1263 1326
1264# 1327#
1265# SN Devices 1328# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1266# 1329#
1267 1330
1268# 1331#
1269# EDAC - error detection and reporting (RAS) 1332# Real Time Clock
1333#
1334# CONFIG_RTC_CLASS is not set
1335
1336#
1337# DMA Engine support
1338#
1339# CONFIG_DMA_ENGINE is not set
1340
1341#
1342# DMA Clients
1343#
1344
1345#
1346# DMA Devices
1270# 1347#
1271 1348
1272# 1349#
@@ -1298,7 +1375,6 @@ CONFIG_JFS_SECURITY=y
1298# CONFIG_JFS_STATISTICS is not set 1375# CONFIG_JFS_STATISTICS is not set
1299CONFIG_FS_POSIX_ACL=y 1376CONFIG_FS_POSIX_ACL=y
1300CONFIG_XFS_FS=m 1377CONFIG_XFS_FS=m
1301CONFIG_XFS_EXPORT=y
1302# CONFIG_XFS_QUOTA is not set 1378# CONFIG_XFS_QUOTA is not set
1303CONFIG_XFS_SECURITY=y 1379CONFIG_XFS_SECURITY=y
1304CONFIG_XFS_POSIX_ACL=y 1380CONFIG_XFS_POSIX_ACL=y
@@ -1307,6 +1383,7 @@ CONFIG_XFS_POSIX_ACL=y
1307# CONFIG_MINIX_FS is not set 1383# CONFIG_MINIX_FS is not set
1308# CONFIG_ROMFS_FS is not set 1384# CONFIG_ROMFS_FS is not set
1309CONFIG_INOTIFY=y 1385CONFIG_INOTIFY=y
1386CONFIG_INOTIFY_USER=y
1310# CONFIG_QUOTA is not set 1387# CONFIG_QUOTA is not set
1311CONFIG_DNOTIFY=y 1388CONFIG_DNOTIFY=y
1312CONFIG_AUTOFS_FS=y 1389CONFIG_AUTOFS_FS=y
@@ -1342,7 +1419,6 @@ CONFIG_TMPFS=y
1342CONFIG_HUGETLBFS=y 1419CONFIG_HUGETLBFS=y
1343CONFIG_HUGETLB_PAGE=y 1420CONFIG_HUGETLB_PAGE=y
1344CONFIG_RAMFS=y 1421CONFIG_RAMFS=y
1345# CONFIG_RELAYFS_FS is not set
1346# CONFIG_CONFIGFS_FS is not set 1422# CONFIG_CONFIGFS_FS is not set
1347 1423
1348# 1424#
@@ -1388,8 +1464,10 @@ CONFIG_RPCSEC_GSS_SPKM3=m
1388# CONFIG_SMB_FS is not set 1464# CONFIG_SMB_FS is not set
1389CONFIG_CIFS=m 1465CONFIG_CIFS=m
1390# CONFIG_CIFS_STATS is not set 1466# CONFIG_CIFS_STATS is not set
1467# CONFIG_CIFS_WEAK_PW_HASH is not set
1391CONFIG_CIFS_XATTR=y 1468CONFIG_CIFS_XATTR=y
1392CONFIG_CIFS_POSIX=y 1469CONFIG_CIFS_POSIX=y
1470# CONFIG_CIFS_DEBUG2 is not set
1393# CONFIG_CIFS_EXPERIMENTAL is not set 1471# CONFIG_CIFS_EXPERIMENTAL is not set
1394# CONFIG_NCP_FS is not set 1472# CONFIG_NCP_FS is not set
1395# CONFIG_CODA_FS is not set 1473# CONFIG_CODA_FS is not set
@@ -1470,6 +1548,9 @@ CONFIG_CRC32=y
1470CONFIG_LIBCRC32C=m 1548CONFIG_LIBCRC32C=m
1471CONFIG_ZLIB_INFLATE=y 1549CONFIG_ZLIB_INFLATE=y
1472CONFIG_ZLIB_DEFLATE=m 1550CONFIG_ZLIB_DEFLATE=m
1551CONFIG_TEXTSEARCH=y
1552CONFIG_TEXTSEARCH_KMP=m
1553CONFIG_PLIST=y
1473 1554
1474# 1555#
1475# Instrumentation Support 1556# Instrumentation Support
@@ -1483,14 +1564,19 @@ CONFIG_OPROFILE=y
1483# 1564#
1484# CONFIG_PRINTK_TIME is not set 1565# CONFIG_PRINTK_TIME is not set
1485CONFIG_MAGIC_SYSRQ=y 1566CONFIG_MAGIC_SYSRQ=y
1567# CONFIG_UNUSED_SYMBOLS is not set
1486CONFIG_DEBUG_KERNEL=y 1568CONFIG_DEBUG_KERNEL=y
1487CONFIG_LOG_BUF_SHIFT=17 1569CONFIG_LOG_BUF_SHIFT=17
1488CONFIG_DETECT_SOFTLOCKUP=y 1570CONFIG_DETECT_SOFTLOCKUP=y
1489# CONFIG_SCHEDSTATS is not set 1571# CONFIG_SCHEDSTATS is not set
1490# CONFIG_DEBUG_SLAB is not set 1572# CONFIG_DEBUG_SLAB is not set
1491CONFIG_DEBUG_MUTEXES=y 1573# CONFIG_DEBUG_RT_MUTEXES is not set
1574# CONFIG_RT_MUTEX_TESTER is not set
1492# CONFIG_DEBUG_SPINLOCK is not set 1575# CONFIG_DEBUG_SPINLOCK is not set
1576CONFIG_DEBUG_MUTEXES=y
1577# CONFIG_DEBUG_RWSEMS is not set
1493# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1578# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1579# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1494# CONFIG_DEBUG_KOBJECT is not set 1580# CONFIG_DEBUG_KOBJECT is not set
1495# CONFIG_DEBUG_INFO is not set 1581# CONFIG_DEBUG_INFO is not set
1496CONFIG_DEBUG_FS=y 1582CONFIG_DEBUG_FS=y
@@ -1504,11 +1590,7 @@ CONFIG_XMON=y
1504# CONFIG_XMON_DEFAULT is not set 1590# CONFIG_XMON_DEFAULT is not set
1505CONFIG_IRQSTACKS=y 1591CONFIG_IRQSTACKS=y
1506CONFIG_BOOTX_TEXT=y 1592CONFIG_BOOTX_TEXT=y
1507# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 1593# CONFIG_PPC_EARLY_DEBUG is not set
1508# CONFIG_PPC_EARLY_DEBUG_G5 is not set
1509# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
1510# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
1511# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1512 1594
1513# 1595#
1514# Security options 1596# Security options
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index c18e8600d78f..a8cdf312e1b0 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc3 3# Linux kernel version: 2.6.18-rc6
4# Tue Aug 8 09:14:48 2006 4# Sun Sep 10 10:45:12 2006
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -128,7 +128,6 @@ CONFIG_PPC_PSERIES=y
128# CONFIG_UDBG_RTAS_CONSOLE is not set 128# CONFIG_UDBG_RTAS_CONSOLE is not set
129CONFIG_XICS=y 129CONFIG_XICS=y
130# CONFIG_U3_DART is not set 130# CONFIG_U3_DART is not set
131CONFIG_MPIC=y
132CONFIG_PPC_RTAS=y 131CONFIG_PPC_RTAS=y
133CONFIG_RTAS_ERROR_LOGGING=y 132CONFIG_RTAS_ERROR_LOGGING=y
134CONFIG_RTAS_PROC=y 133CONFIG_RTAS_PROC=y
@@ -140,6 +139,7 @@ CONFIG_IBMEBUS=y
140# CONFIG_PPC_970_NAP is not set 139# CONFIG_PPC_970_NAP is not set
141# CONFIG_CPU_FREQ is not set 140# CONFIG_CPU_FREQ is not set
142# CONFIG_WANT_EARLY_SERIAL is not set 141# CONFIG_WANT_EARLY_SERIAL is not set
142CONFIG_MPIC=y
143 143
144# 144#
145# Kernel options 145# Kernel options
@@ -196,6 +196,7 @@ CONFIG_ISA_DMA_API=y
196# Bus options 196# Bus options
197# 197#
198CONFIG_GENERIC_ISA_DMA=y 198CONFIG_GENERIC_ISA_DMA=y
199# CONFIG_MPIC_WEIRD is not set
199CONFIG_PPC_I8259=y 200CONFIG_PPC_I8259=y
200# CONFIG_PPC_INDIRECT_PCI is not set 201# CONFIG_PPC_INDIRECT_PCI is not set
201CONFIG_PCI=y 202CONFIG_PCI=y
@@ -790,7 +791,6 @@ CONFIG_SERIAL_JSM=m
790CONFIG_UNIX98_PTYS=y 791CONFIG_UNIX98_PTYS=y
791CONFIG_LEGACY_PTYS=y 792CONFIG_LEGACY_PTYS=y
792CONFIG_LEGACY_PTY_COUNT=256 793CONFIG_LEGACY_PTY_COUNT=256
793# CONFIG_BRIQ_PANEL is not set
794# CONFIG_PRINTER is not set 794# CONFIG_PRINTER is not set
795# CONFIG_PPDEV is not set 795# CONFIG_PPDEV is not set
796# CONFIG_TIPAR is not set 796# CONFIG_TIPAR is not set
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index f04c18e08b8b..1af41f7616dc 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -295,7 +295,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
295 struct irq_desc *desc = irq_desc + irq; 295 struct irq_desc *desc = irq_desc + irq;
296 296
297 if (desc->status & IRQ_INPROGRESS) 297 if (desc->status & IRQ_INPROGRESS)
298 desc->chip->end(irq); 298 desc->chip->eoi(irq);
299 299
300 if (!(desc->status & IRQ_DISABLED)) 300 if (!(desc->status & IRQ_DISABLED))
301 desc->chip->disable(irq); 301 desc->chip->disable(irq);
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index fc23040d5a26..f770805f1215 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -17,15 +17,6 @@
17 17
18 .text 18 .text
19 19
20#ifdef CONFIG_PPC64
21#define IN_SYNC twi 0,r5,0; isync
22#define EIEIO_32
23#define SYNC_64 sync
24#else /* CONFIG_PPC32 */
25#define IN_SYNC
26#define EIEIO_32 eieio
27#define SYNC_64
28#endif
29/* 20/*
30 * Returns (address we are running at) - (address we were linked at) 21 * Returns (address we are running at) - (address we were linked at)
31 * for use before the text and data are mapped to KERNELBASE. 22 * for use before the text and data are mapped to KERNELBASE.
@@ -70,6 +61,7 @@ _GLOBAL(add_reloc_offset)
70 * The *_ns versions don't do byte-swapping. 61 * The *_ns versions don't do byte-swapping.
71 */ 62 */
72_GLOBAL(_insb) 63_GLOBAL(_insb)
64 sync
73 cmpwi 0,r5,0 65 cmpwi 0,r5,0
74 mtctr r5 66 mtctr r5
75 subi r4,r4,1 67 subi r4,r4,1
@@ -78,7 +70,8 @@ _GLOBAL(_insb)
78 eieio 70 eieio
79 stbu r5,1(r4) 71 stbu r5,1(r4)
80 bdnz 00b 72 bdnz 00b
81 IN_SYNC 73 twi 0,r5,0
74 isync
82 blr 75 blr
83 76
84_GLOBAL(_outsb) 77_GLOBAL(_outsb)
@@ -86,14 +79,15 @@ _GLOBAL(_outsb)
86 mtctr r5 79 mtctr r5
87 subi r4,r4,1 80 subi r4,r4,1
88 blelr- 81 blelr-
82 sync
8900: lbzu r5,1(r4) 8300: lbzu r5,1(r4)
90 stb r5,0(r3) 84 stb r5,0(r3)
91 EIEIO_32
92 bdnz 00b 85 bdnz 00b
93 SYNC_64 86 sync
94 blr 87 blr
95 88
96_GLOBAL(_insw) 89_GLOBAL(_insw)
90 sync
97 cmpwi 0,r5,0 91 cmpwi 0,r5,0
98 mtctr r5 92 mtctr r5
99 subi r4,r4,2 93 subi r4,r4,2
@@ -102,7 +96,8 @@ _GLOBAL(_insw)
102 eieio 96 eieio
103 sthu r5,2(r4) 97 sthu r5,2(r4)
104 bdnz 00b 98 bdnz 00b
105 IN_SYNC 99 twi 0,r5,0
100 isync
106 blr 101 blr
107 102
108_GLOBAL(_outsw) 103_GLOBAL(_outsw)
@@ -110,14 +105,15 @@ _GLOBAL(_outsw)
110 mtctr r5 105 mtctr r5
111 subi r4,r4,2 106 subi r4,r4,2
112 blelr- 107 blelr-
108 sync
11300: lhzu r5,2(r4) 10900: lhzu r5,2(r4)
114 EIEIO_32
115 sthbrx r5,0,r3 110 sthbrx r5,0,r3
116 bdnz 00b 111 bdnz 00b
117 SYNC_64 112 sync
118 blr 113 blr
119 114
120_GLOBAL(_insl) 115_GLOBAL(_insl)
116 sync
121 cmpwi 0,r5,0 117 cmpwi 0,r5,0
122 mtctr r5 118 mtctr r5
123 subi r4,r4,4 119 subi r4,r4,4
@@ -126,7 +122,8 @@ _GLOBAL(_insl)
126 eieio 122 eieio
127 stwu r5,4(r4) 123 stwu r5,4(r4)
128 bdnz 00b 124 bdnz 00b
129 IN_SYNC 125 twi 0,r5,0
126 isync
130 blr 127 blr
131 128
132_GLOBAL(_outsl) 129_GLOBAL(_outsl)
@@ -134,17 +131,18 @@ _GLOBAL(_outsl)
134 mtctr r5 131 mtctr r5
135 subi r4,r4,4 132 subi r4,r4,4
136 blelr- 133 blelr-
134 sync
13700: lwzu r5,4(r4) 13500: lwzu r5,4(r4)
138 stwbrx r5,0,r3 136 stwbrx r5,0,r3
139 EIEIO_32
140 bdnz 00b 137 bdnz 00b
141 SYNC_64 138 sync
142 blr 139 blr
143 140
144#ifdef CONFIG_PPC32 141#ifdef CONFIG_PPC32
145_GLOBAL(__ide_mm_insw) 142_GLOBAL(__ide_mm_insw)
146#endif 143#endif
147_GLOBAL(_insw_ns) 144_GLOBAL(_insw_ns)
145 sync
148 cmpwi 0,r5,0 146 cmpwi 0,r5,0
149 mtctr r5 147 mtctr r5
150 subi r4,r4,2 148 subi r4,r4,2
@@ -153,7 +151,8 @@ _GLOBAL(_insw_ns)
153 eieio 151 eieio
154 sthu r5,2(r4) 152 sthu r5,2(r4)
155 bdnz 00b 153 bdnz 00b
156 IN_SYNC 154 twi 0,r5,0
155 isync
157 blr 156 blr
158 157
159#ifdef CONFIG_PPC32 158#ifdef CONFIG_PPC32
@@ -164,17 +163,18 @@ _GLOBAL(_outsw_ns)
164 mtctr r5 163 mtctr r5
165 subi r4,r4,2 164 subi r4,r4,2
166 blelr- 165 blelr-
166 sync
16700: lhzu r5,2(r4) 16700: lhzu r5,2(r4)
168 sth r5,0(r3) 168 sth r5,0(r3)
169 EIEIO_32
170 bdnz 00b 169 bdnz 00b
171 SYNC_64 170 sync
172 blr 171 blr
173 172
174#ifdef CONFIG_PPC32 173#ifdef CONFIG_PPC32
175_GLOBAL(__ide_mm_insl) 174_GLOBAL(__ide_mm_insl)
176#endif 175#endif
177_GLOBAL(_insl_ns) 176_GLOBAL(_insl_ns)
177 sync
178 cmpwi 0,r5,0 178 cmpwi 0,r5,0
179 mtctr r5 179 mtctr r5
180 subi r4,r4,4 180 subi r4,r4,4
@@ -183,7 +183,8 @@ _GLOBAL(_insl_ns)
183 eieio 183 eieio
184 stwu r5,4(r4) 184 stwu r5,4(r4)
185 bdnz 00b 185 bdnz 00b
186 IN_SYNC 186 twi 0,r5,0
187 isync
187 blr 188 blr
188 189
189#ifdef CONFIG_PPC32 190#ifdef CONFIG_PPC32
@@ -194,10 +195,10 @@ _GLOBAL(_outsl_ns)
194 mtctr r5 195 mtctr r5
195 subi r4,r4,4 196 subi r4,r4,4
196 blelr- 197 blelr-
198 sync
19700: lwzu r5,4(r4) 19900: lwzu r5,4(r4)
198 stw r5,0(r3) 200 stw r5,0(r3)
199 EIEIO_32
200 bdnz 00b 201 bdnz 00b
201 SYNC_64 202 sync
202 blr 203 blr
203 204
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 0b1b52168bb7..5e583cf38786 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -158,7 +158,7 @@ get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin)
158 158
159 laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8); 159 laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8);
160 laddr[1] = laddr[2] = 0; 160 laddr[1] = laddr[2] = 0;
161 of_irq_map_raw(hosenode, &pin, laddr, &oirq); 161 of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq);
162 DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n", 162 DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n",
163 laddr[0], slot, pin, oirq.specifier[0]); 163 laddr[0], slot, pin, oirq.specifier[0]);
164 return oirq.specifier[0]; 164 return oirq.specifier[0];
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index e32fadde1f77..03b4477dd7f0 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -139,6 +139,7 @@ wait_more:
139 139
140static void dart_flush(struct iommu_table *tbl) 140static void dart_flush(struct iommu_table *tbl)
141{ 141{
142 mb();
142 if (dart_dirty) { 143 if (dart_dirty) {
143 dart_tlb_invalidate_all(); 144 dart_tlb_invalidate_all();
144 dart_dirty = 0; 145 dart_dirty = 0;
@@ -172,9 +173,13 @@ static void dart_build(struct iommu_table *tbl, long index,
172 uaddr += DART_PAGE_SIZE; 173 uaddr += DART_PAGE_SIZE;
173 } 174 }
174 175
176 /* make sure all updates have reached memory */
177 mb();
178 in_be32((unsigned __iomem *)dp);
179 mb();
180
175 if (dart_is_u4) { 181 if (dart_is_u4) {
176 rpn = index; 182 rpn = index;
177 mb(); /* make sure all updates have reached memory */
178 while (npages--) 183 while (npages--)
179 dart_tlb_invalidate_one(rpn++); 184 dart_tlb_invalidate_one(rpn++);
180 } else { 185 } else {
diff --git a/arch/ppc/configs/prep_defconfig b/arch/ppc/configs/prep_defconfig
index 4d33bee23a89..0aa333178b2a 100644
--- a/arch/ppc/configs/prep_defconfig
+++ b/arch/ppc/configs/prep_defconfig
@@ -1,56 +1,63 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.13-rc3 3# Linux kernel version: 2.6.18-rc6
4# Wed Jul 13 13:34:24 2005 4# Wed Sep 6 15:09:32 2006
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y 7CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_HWEIGHT=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y 11CONFIG_PPC=y
12CONFIG_PPC32=y 12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y 13CONFIG_GENERIC_NVRAM=y
14CONFIG_GENERIC_FIND_NEXT_BIT=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 15CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
16CONFIG_ARCH_MAY_HAVE_PC_FDC=y
17CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15 18
16# 19#
17# Code maturity level options 20# Code maturity level options
18# 21#
19CONFIG_EXPERIMENTAL=y 22CONFIG_EXPERIMENTAL=y
20CONFIG_CLEAN_COMPILE=y
21CONFIG_BROKEN_ON_SMP=y 23CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32 24CONFIG_INIT_ENV_ARG_LIMIT=32
23 25
24# 26#
25# General setup 27# General setup
26# 28#
27CONFIG_LOCALVERSION="" 29CONFIG_LOCALVERSION="-prep"
30CONFIG_LOCALVERSION_AUTO=y
28CONFIG_SWAP=y 31CONFIG_SWAP=y
29CONFIG_SYSVIPC=y 32CONFIG_SYSVIPC=y
30CONFIG_POSIX_MQUEUE=y 33CONFIG_POSIX_MQUEUE=y
31# CONFIG_BSD_PROCESS_ACCT is not set 34# CONFIG_BSD_PROCESS_ACCT is not set
35# CONFIG_TASKSTATS is not set
32CONFIG_SYSCTL=y 36CONFIG_SYSCTL=y
33# CONFIG_AUDIT is not set 37# CONFIG_AUDIT is not set
34CONFIG_HOTPLUG=y
35CONFIG_KOBJECT_UEVENT=y
36CONFIG_IKCONFIG=y 38CONFIG_IKCONFIG=y
37CONFIG_IKCONFIG_PROC=y 39CONFIG_IKCONFIG_PROC=y
40# CONFIG_RELAY is not set
41CONFIG_INITRAMFS_SOURCE=""
42CONFIG_CC_OPTIMIZE_FOR_SIZE=y
38# CONFIG_EMBEDDED is not set 43# CONFIG_EMBEDDED is not set
39CONFIG_KALLSYMS=y 44CONFIG_KALLSYMS=y
40# CONFIG_KALLSYMS_ALL is not set 45# CONFIG_KALLSYMS_ALL is not set
41# CONFIG_KALLSYMS_EXTRA_PASS is not set 46# CONFIG_KALLSYMS_EXTRA_PASS is not set
47CONFIG_HOTPLUG=y
42CONFIG_PRINTK=y 48CONFIG_PRINTK=y
43CONFIG_BUG=y 49CONFIG_BUG=y
50CONFIG_ELF_CORE=y
44CONFIG_BASE_FULL=y 51CONFIG_BASE_FULL=y
52CONFIG_RT_MUTEXES=y
45CONFIG_FUTEX=y 53CONFIG_FUTEX=y
46CONFIG_EPOLL=y 54CONFIG_EPOLL=y
47CONFIG_SHMEM=y 55CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 56CONFIG_SLAB=y
49CONFIG_CC_ALIGN_LABELS=0 57CONFIG_VM_EVENT_COUNTERS=y
50CONFIG_CC_ALIGN_LOOPS=0
51CONFIG_CC_ALIGN_JUMPS=0
52# CONFIG_TINY_SHMEM is not set 58# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 59CONFIG_BASE_SMALL=0
60# CONFIG_SLOB is not set
54 61
55# 62#
56# Loadable module support 63# Loadable module support
@@ -58,69 +65,68 @@ CONFIG_BASE_SMALL=0
58CONFIG_MODULES=y 65CONFIG_MODULES=y
59CONFIG_MODULE_UNLOAD=y 66CONFIG_MODULE_UNLOAD=y
60# CONFIG_MODULE_FORCE_UNLOAD is not set 67# CONFIG_MODULE_FORCE_UNLOAD is not set
61CONFIG_OBSOLETE_MODPARM=y
62CONFIG_MODVERSIONS=y 68CONFIG_MODVERSIONS=y
63# CONFIG_MODULE_SRCVERSION_ALL is not set 69# CONFIG_MODULE_SRCVERSION_ALL is not set
64CONFIG_KMOD=y 70CONFIG_KMOD=y
65 71
66# 72#
73# Block layer
74#
75CONFIG_LBD=y
76# CONFIG_BLK_DEV_IO_TRACE is not set
77# CONFIG_LSF is not set
78
79#
80# IO Schedulers
81#
82CONFIG_IOSCHED_NOOP=y
83CONFIG_IOSCHED_AS=y
84CONFIG_IOSCHED_DEADLINE=y
85CONFIG_IOSCHED_CFQ=y
86# CONFIG_DEFAULT_AS is not set
87# CONFIG_DEFAULT_DEADLINE is not set
88CONFIG_DEFAULT_CFQ=y
89# CONFIG_DEFAULT_NOOP is not set
90CONFIG_DEFAULT_IOSCHED="cfq"
91
92#
67# Processor 93# Processor
68# 94#
69CONFIG_6xx=y 95CONFIG_6xx=y
70# CONFIG_40x is not set 96# CONFIG_40x is not set
71# CONFIG_44x is not set 97# CONFIG_44x is not set
72# CONFIG_POWER3 is not set
73# CONFIG_POWER4 is not set
74# CONFIG_8xx is not set 98# CONFIG_8xx is not set
75# CONFIG_E200 is not set 99# CONFIG_E200 is not set
76# CONFIG_E500 is not set 100# CONFIG_E500 is not set
77CONFIG_PPC_FPU=y 101CONFIG_PPC_FPU=y
78CONFIG_ALTIVEC=y 102# CONFIG_ALTIVEC is not set
79CONFIG_TAU=y 103# CONFIG_TAU is not set
80# CONFIG_TAU_INT is not set
81# CONFIG_TAU_AVERAGE is not set
82# CONFIG_KEXEC is not set 104# CONFIG_KEXEC is not set
83CONFIG_CPU_FREQ=y 105# CONFIG_CPU_FREQ is not set
84CONFIG_CPU_FREQ_TABLE=y
85# CONFIG_CPU_FREQ_DEBUG is not set
86CONFIG_CPU_FREQ_STAT=m
87CONFIG_CPU_FREQ_STAT_DETAILS=y
88CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
89# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
90CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
91CONFIG_CPU_FREQ_GOV_POWERSAVE=m
92CONFIG_CPU_FREQ_GOV_USERSPACE=m
93CONFIG_CPU_FREQ_GOV_ONDEMAND=m
94CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
95CONFIG_CPU_FREQ_PMAC=y
96CONFIG_PPC601_SYNC_FIX=y 106CONFIG_PPC601_SYNC_FIX=y
97CONFIG_PM=y 107# CONFIG_WANT_EARLY_SERIAL is not set
98CONFIG_PPC_STD_MMU=y 108CONFIG_PPC_STD_MMU=y
99 109
100# 110#
101# Platform options 111# Platform options
102# 112#
103CONFIG_PPC_MULTIPLATFORM=y 113CONFIG_PPC_PREP=y
104# CONFIG_APUS is not set 114# CONFIG_APUS is not set
105# CONFIG_KATANA is not set 115# CONFIG_KATANA is not set
106# CONFIG_WILLOW is not set 116# CONFIG_WILLOW is not set
107# CONFIG_CPCI690 is not set 117# CONFIG_CPCI690 is not set
108# CONFIG_PCORE is not set
109# CONFIG_POWERPMC250 is not set 118# CONFIG_POWERPMC250 is not set
110# CONFIG_CHESTNUT is not set 119# CONFIG_CHESTNUT is not set
111# CONFIG_SPRUCE is not set 120# CONFIG_SPRUCE is not set
112# CONFIG_HDPU is not set 121# CONFIG_HDPU is not set
113# CONFIG_EV64260 is not set 122# CONFIG_EV64260 is not set
114# CONFIG_LOPEC is not set 123# CONFIG_LOPEC is not set
115# CONFIG_MCPN765 is not set
116# CONFIG_MVME5100 is not set 124# CONFIG_MVME5100 is not set
117# CONFIG_PPLUS is not set 125# CONFIG_PPLUS is not set
118# CONFIG_PRPMC750 is not set 126# CONFIG_PRPMC750 is not set
119# CONFIG_PRPMC800 is not set 127# CONFIG_PRPMC800 is not set
120# CONFIG_SANDPOINT is not set 128# CONFIG_SANDPOINT is not set
121# CONFIG_RADSTONE_PPC7D is not set 129# CONFIG_RADSTONE_PPC7D is not set
122# CONFIG_ADIR is not set
123# CONFIG_K2 is not set
124# CONFIG_PAL4 is not set 130# CONFIG_PAL4 is not set
125# CONFIG_GEMINI is not set 131# CONFIG_GEMINI is not set
126# CONFIG_EST8260 is not set 132# CONFIG_EST8260 is not set
@@ -132,10 +138,7 @@ CONFIG_PPC_MULTIPLATFORM=y
132# CONFIG_PQ2FADS is not set 138# CONFIG_PQ2FADS is not set
133# CONFIG_LITE5200 is not set 139# CONFIG_LITE5200 is not set
134# CONFIG_MPC834x_SYS is not set 140# CONFIG_MPC834x_SYS is not set
135CONFIG_PPC_CHRP=y 141# CONFIG_EV64360 is not set
136CONFIG_PPC_PMAC=y
137CONFIG_PPC_PREP=y
138CONFIG_PPC_OF=y
139CONFIG_PPCBUG_NVRAM=y 142CONFIG_PPCBUG_NVRAM=y
140# CONFIG_SMP is not set 143# CONFIG_SMP is not set
141# CONFIG_HIGHMEM is not set 144# CONFIG_HIGHMEM is not set
@@ -152,12 +155,16 @@ CONFIG_FLATMEM_MANUAL=y
152# CONFIG_SPARSEMEM_MANUAL is not set 155# CONFIG_SPARSEMEM_MANUAL is not set
153CONFIG_FLATMEM=y 156CONFIG_FLATMEM=y
154CONFIG_FLAT_NODE_MEM_MAP=y 157CONFIG_FLAT_NODE_MEM_MAP=y
158# CONFIG_SPARSEMEM_STATIC is not set
159CONFIG_SPLIT_PTLOCK_CPUS=4
160# CONFIG_RESOURCES_64BIT is not set
155CONFIG_BINFMT_ELF=y 161CONFIG_BINFMT_ELF=y
156CONFIG_BINFMT_MISC=m 162CONFIG_BINFMT_MISC=m
157CONFIG_PROC_DEVICETREE=y
158CONFIG_PREP_RESIDUAL=y 163CONFIG_PREP_RESIDUAL=y
159CONFIG_PROC_PREPRESIDUAL=y 164CONFIG_PROC_PREPRESIDUAL=y
160# CONFIG_CMDLINE_BOOL is not set 165# CONFIG_CMDLINE_BOOL is not set
166CONFIG_PM=y
167# CONFIG_PM_LEGACY is not set
161# CONFIG_PM_DEBUG is not set 168# CONFIG_PM_DEBUG is not set
162CONFIG_SOFTWARE_SUSPEND=y 169CONFIG_SOFTWARE_SUSPEND=y
163CONFIG_PM_STD_PARTITION="" 170CONFIG_PM_STD_PARTITION=""
@@ -169,10 +176,10 @@ CONFIG_ISA_DMA_API=y
169# 176#
170CONFIG_ISA=y 177CONFIG_ISA=y
171CONFIG_GENERIC_ISA_DMA=y 178CONFIG_GENERIC_ISA_DMA=y
179CONFIG_PPC_I8259=y
180CONFIG_PPC_INDIRECT_PCI=y
172CONFIG_PCI=y 181CONFIG_PCI=y
173CONFIG_PCI_DOMAINS=y 182CONFIG_PCI_DOMAINS=y
174# CONFIG_PCI_LEGACY_PROC is not set
175# CONFIG_PCI_NAMES is not set
176# CONFIG_PCI_DEBUG is not set 183# CONFIG_PCI_DEBUG is not set
177 184
178# 185#
@@ -187,6 +194,11 @@ CONFIG_CARDBUS=y
187# PC-card bridges 194# PC-card bridges
188# 195#
189CONFIG_YENTA=m 196CONFIG_YENTA=m
197CONFIG_YENTA_O2=y
198CONFIG_YENTA_RICOH=y
199CONFIG_YENTA_TI=y
200CONFIG_YENTA_ENE_TUNE=y
201CONFIG_YENTA_TOSHIBA=y
190CONFIG_PCMCIA_PROBE=y 202CONFIG_PCMCIA_PROBE=y
191CONFIG_PCCARD_NONSTATIC=m 203CONFIG_PCCARD_NONSTATIC=m
192 204
@@ -212,6 +224,7 @@ CONFIG_NET=y
212# 224#
213# Networking options 225# Networking options
214# 226#
227# CONFIG_NETDEBUG is not set
215CONFIG_PACKET=y 228CONFIG_PACKET=y
216# CONFIG_PACKET_MMAP is not set 229# CONFIG_PACKET_MMAP is not set
217CONFIG_UNIX=y 230CONFIG_UNIX=y
@@ -229,9 +242,11 @@ CONFIG_SYN_COOKIES=y
229# CONFIG_INET_AH is not set 242# CONFIG_INET_AH is not set
230# CONFIG_INET_ESP is not set 243# CONFIG_INET_ESP is not set
231# CONFIG_INET_IPCOMP is not set 244# CONFIG_INET_IPCOMP is not set
245# CONFIG_INET_XFRM_TUNNEL is not set
232# CONFIG_INET_TUNNEL is not set 246# CONFIG_INET_TUNNEL is not set
233CONFIG_IP_TCPDIAG=y 247# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
234# CONFIG_IP_TCPDIAG_IPV6 is not set 248# CONFIG_INET_XFRM_MODE_TUNNEL is not set
249# CONFIG_INET_DIAG is not set
235# CONFIG_TCP_CONG_ADVANCED is not set 250# CONFIG_TCP_CONG_ADVANCED is not set
236CONFIG_TCP_CONG_BIC=y 251CONFIG_TCP_CONG_BIC=y
237 252
@@ -240,80 +255,77 @@ CONFIG_TCP_CONG_BIC=y
240# 255#
241# CONFIG_IP_VS is not set 256# CONFIG_IP_VS is not set
242# CONFIG_IPV6 is not set 257# CONFIG_IPV6 is not set
258# CONFIG_INET6_XFRM_TUNNEL is not set
259# CONFIG_INET6_TUNNEL is not set
260# CONFIG_NETWORK_SECMARK is not set
243CONFIG_NETFILTER=y 261CONFIG_NETFILTER=y
244# CONFIG_NETFILTER_DEBUG is not set 262# CONFIG_NETFILTER_DEBUG is not set
245 263
246# 264#
265# Core Netfilter Configuration
266#
267CONFIG_NETFILTER_NETLINK=m
268CONFIG_NETFILTER_NETLINK_QUEUE=m
269CONFIG_NETFILTER_NETLINK_LOG=m
270CONFIG_NETFILTER_XTABLES=m
271CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
272CONFIG_NETFILTER_XT_TARGET_MARK=m
273CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
274CONFIG_NETFILTER_XT_MATCH_COMMENT=m
275CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
276CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
277CONFIG_NETFILTER_XT_MATCH_DCCP=m
278CONFIG_NETFILTER_XT_MATCH_ESP=m
279CONFIG_NETFILTER_XT_MATCH_HELPER=m
280CONFIG_NETFILTER_XT_MATCH_LENGTH=m
281CONFIG_NETFILTER_XT_MATCH_LIMIT=m
282CONFIG_NETFILTER_XT_MATCH_MAC=m
283CONFIG_NETFILTER_XT_MATCH_MARK=m
284CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
285CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
286CONFIG_NETFILTER_XT_MATCH_QUOTA=m
287CONFIG_NETFILTER_XT_MATCH_REALM=m
288CONFIG_NETFILTER_XT_MATCH_SCTP=m
289CONFIG_NETFILTER_XT_MATCH_STATE=m
290CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
291CONFIG_NETFILTER_XT_MATCH_STRING=m
292CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
293
294#
247# IP: Netfilter Configuration 295# IP: Netfilter Configuration
248# 296#
249CONFIG_IP_NF_CONNTRACK=m 297CONFIG_IP_NF_CONNTRACK=m
250# CONFIG_IP_NF_CT_ACCT is not set 298# CONFIG_IP_NF_CT_ACCT is not set
251CONFIG_IP_NF_CONNTRACK_MARK=y 299CONFIG_IP_NF_CONNTRACK_MARK=y
300# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
301# CONFIG_IP_NF_CONNTRACK_NETLINK is not set
252# CONFIG_IP_NF_CT_PROTO_SCTP is not set 302# CONFIG_IP_NF_CT_PROTO_SCTP is not set
253CONFIG_IP_NF_FTP=m 303CONFIG_IP_NF_FTP=m
254CONFIG_IP_NF_IRC=m 304CONFIG_IP_NF_IRC=m
305# CONFIG_IP_NF_NETBIOS_NS is not set
255CONFIG_IP_NF_TFTP=m 306CONFIG_IP_NF_TFTP=m
256CONFIG_IP_NF_AMANDA=m 307CONFIG_IP_NF_AMANDA=m
308# CONFIG_IP_NF_PPTP is not set
309# CONFIG_IP_NF_H323 is not set
310# CONFIG_IP_NF_SIP is not set
257CONFIG_IP_NF_QUEUE=m 311CONFIG_IP_NF_QUEUE=m
258CONFIG_IP_NF_IPTABLES=m 312# CONFIG_IP_NF_IPTABLES is not set
259CONFIG_IP_NF_MATCH_LIMIT=m 313# CONFIG_IP_NF_ARPTABLES is not set
260CONFIG_IP_NF_MATCH_IPRANGE=m 314
261CONFIG_IP_NF_MATCH_MAC=m 315#
262CONFIG_IP_NF_MATCH_PKTTYPE=m 316# DCCP Configuration (EXPERIMENTAL)
263CONFIG_IP_NF_MATCH_MARK=m 317#
264CONFIG_IP_NF_MATCH_MULTIPORT=m 318# CONFIG_IP_DCCP is not set
265CONFIG_IP_NF_MATCH_TOS=m
266CONFIG_IP_NF_MATCH_RECENT=m
267CONFIG_IP_NF_MATCH_ECN=m
268CONFIG_IP_NF_MATCH_DSCP=m
269CONFIG_IP_NF_MATCH_AH_ESP=m
270CONFIG_IP_NF_MATCH_LENGTH=m
271CONFIG_IP_NF_MATCH_TTL=m
272CONFIG_IP_NF_MATCH_TCPMSS=m
273CONFIG_IP_NF_MATCH_HELPER=m
274CONFIG_IP_NF_MATCH_STATE=m
275CONFIG_IP_NF_MATCH_CONNTRACK=m
276CONFIG_IP_NF_MATCH_OWNER=m
277CONFIG_IP_NF_MATCH_ADDRTYPE=m
278CONFIG_IP_NF_MATCH_REALM=m
279CONFIG_IP_NF_MATCH_SCTP=m
280CONFIG_IP_NF_MATCH_COMMENT=m
281CONFIG_IP_NF_MATCH_CONNMARK=m
282CONFIG_IP_NF_MATCH_HASHLIMIT=m
283CONFIG_IP_NF_FILTER=m
284CONFIG_IP_NF_TARGET_REJECT=m
285CONFIG_IP_NF_TARGET_LOG=m
286CONFIG_IP_NF_TARGET_ULOG=m
287CONFIG_IP_NF_TARGET_TCPMSS=m
288CONFIG_IP_NF_NAT=m
289CONFIG_IP_NF_NAT_NEEDED=y
290CONFIG_IP_NF_TARGET_MASQUERADE=m
291CONFIG_IP_NF_TARGET_REDIRECT=m
292CONFIG_IP_NF_TARGET_NETMAP=m
293CONFIG_IP_NF_TARGET_SAME=m
294CONFIG_IP_NF_NAT_SNMP_BASIC=m
295CONFIG_IP_NF_NAT_IRC=m
296CONFIG_IP_NF_NAT_FTP=m
297CONFIG_IP_NF_NAT_TFTP=m
298CONFIG_IP_NF_NAT_AMANDA=m
299CONFIG_IP_NF_MANGLE=m
300CONFIG_IP_NF_TARGET_TOS=m
301CONFIG_IP_NF_TARGET_ECN=m
302CONFIG_IP_NF_TARGET_DSCP=m
303CONFIG_IP_NF_TARGET_MARK=m
304CONFIG_IP_NF_TARGET_CLASSIFY=m
305CONFIG_IP_NF_TARGET_CONNMARK=m
306CONFIG_IP_NF_TARGET_CLUSTERIP=m
307CONFIG_IP_NF_RAW=m
308CONFIG_IP_NF_TARGET_NOTRACK=m
309CONFIG_IP_NF_ARPTABLES=m
310# CONFIG_IP_NF_ARPFILTER is not set
311# CONFIG_IP_NF_ARP_MANGLE is not set
312 319
313# 320#
314# SCTP Configuration (EXPERIMENTAL) 321# SCTP Configuration (EXPERIMENTAL)
315# 322#
316# CONFIG_IP_SCTP is not set 323# CONFIG_IP_SCTP is not set
324
325#
326# TIPC Configuration (EXPERIMENTAL)
327#
328# CONFIG_TIPC is not set
317# CONFIG_ATM is not set 329# CONFIG_ATM is not set
318# CONFIG_BRIDGE is not set 330# CONFIG_BRIDGE is not set
319# CONFIG_VLAN_8021Q is not set 331# CONFIG_VLAN_8021Q is not set
@@ -326,6 +338,10 @@ CONFIG_IP_NF_ARPTABLES=m
326# CONFIG_NET_DIVERT is not set 338# CONFIG_NET_DIVERT is not set
327# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
341
342#
343# QoS and/or fair queueing
344#
329# CONFIG_NET_SCHED is not set 345# CONFIG_NET_SCHED is not set
330CONFIG_NET_CLS_ROUTE=y 346CONFIG_NET_CLS_ROUTE=y
331 347
@@ -333,13 +349,11 @@ CONFIG_NET_CLS_ROUTE=y
333# Network testing 349# Network testing
334# 350#
335# CONFIG_NET_PKTGEN is not set 351# CONFIG_NET_PKTGEN is not set
336CONFIG_NETPOLL=y
337# CONFIG_NETPOLL_RX is not set
338# CONFIG_NETPOLL_TRAP is not set
339CONFIG_NET_POLL_CONTROLLER=y
340# CONFIG_HAMRADIO is not set 352# CONFIG_HAMRADIO is not set
341# CONFIG_IRDA is not set 353# CONFIG_IRDA is not set
342# CONFIG_BT is not set 354# CONFIG_BT is not set
355# CONFIG_IEEE80211 is not set
356CONFIG_WIRELESS_EXT=y
343 357
344# 358#
345# Device Drivers 359# Device Drivers
@@ -352,6 +366,12 @@ CONFIG_NET_POLL_CONTROLLER=y
352CONFIG_PREVENT_FIRMWARE_BUILD=y 366CONFIG_PREVENT_FIRMWARE_BUILD=y
353CONFIG_FW_LOADER=m 367CONFIG_FW_LOADER=m
354# CONFIG_DEBUG_DRIVER is not set 368# CONFIG_DEBUG_DRIVER is not set
369# CONFIG_SYS_HYPERVISOR is not set
370
371#
372# Connector - unified userspace <-> kernelspace linker
373#
374# CONFIG_CONNECTOR is not set
355 375
356# 376#
357# Memory Technology Devices (MTD) 377# Memory Technology Devices (MTD)
@@ -367,6 +387,7 @@ CONFIG_PARPORT_SERIAL=m
367CONFIG_PARPORT_PC_FIFO=y 387CONFIG_PARPORT_PC_FIFO=y
368CONFIG_PARPORT_PC_SUPERIO=y 388CONFIG_PARPORT_PC_SUPERIO=y
369# CONFIG_PARPORT_GSC is not set 389# CONFIG_PARPORT_GSC is not set
390# CONFIG_PARPORT_AX88796 is not set
370CONFIG_PARPORT_1284=y 391CONFIG_PARPORT_1284=y
371 392
372# 393#
@@ -378,7 +399,6 @@ CONFIG_PARPORT_1284=y
378# Block devices 399# Block devices
379# 400#
380CONFIG_BLK_DEV_FD=m 401CONFIG_BLK_DEV_FD=m
381CONFIG_MAC_FLOPPY=m
382# CONFIG_BLK_DEV_XD is not set 402# CONFIG_BLK_DEV_XD is not set
383# CONFIG_PARIDE is not set 403# CONFIG_PARIDE is not set
384# CONFIG_BLK_CPQ_DA is not set 404# CONFIG_BLK_CPQ_DA is not set
@@ -394,18 +414,9 @@ CONFIG_BLK_DEV_LOOP=y
394CONFIG_BLK_DEV_RAM=y 414CONFIG_BLK_DEV_RAM=y
395CONFIG_BLK_DEV_RAM_COUNT=16 415CONFIG_BLK_DEV_RAM_COUNT=16
396CONFIG_BLK_DEV_RAM_SIZE=4096 416CONFIG_BLK_DEV_RAM_SIZE=4096
417CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
397CONFIG_BLK_DEV_INITRD=y 418CONFIG_BLK_DEV_INITRD=y
398CONFIG_INITRAMFS_SOURCE=""
399CONFIG_LBD=y
400# CONFIG_CDROM_PKTCDVD is not set 419# CONFIG_CDROM_PKTCDVD is not set
401
402#
403# IO Schedulers
404#
405CONFIG_IOSCHED_NOOP=y
406CONFIG_IOSCHED_AS=y
407CONFIG_IOSCHED_DEADLINE=y
408CONFIG_IOSCHED_CFQ=y
409# CONFIG_ATA_OVER_ETH is not set 420# CONFIG_ATA_OVER_ETH is not set
410 421
411# 422#
@@ -422,7 +433,7 @@ CONFIG_BLK_DEV_IDEDISK=y
422# CONFIG_IDEDISK_MULTI_MODE is not set 433# CONFIG_IDEDISK_MULTI_MODE is not set
423CONFIG_BLK_DEV_IDECD=y 434CONFIG_BLK_DEV_IDECD=y
424# CONFIG_BLK_DEV_IDETAPE is not set 435# CONFIG_BLK_DEV_IDETAPE is not set
425CONFIG_BLK_DEV_IDEFLOPPY=y 436# CONFIG_BLK_DEV_IDEFLOPPY is not set
426CONFIG_BLK_DEV_IDESCSI=y 437CONFIG_BLK_DEV_IDESCSI=y
427# CONFIG_IDE_TASK_IOCTL is not set 438# CONFIG_IDE_TASK_IOCTL is not set
428 439
@@ -435,7 +446,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
435# CONFIG_BLK_DEV_OFFBOARD is not set 446# CONFIG_BLK_DEV_OFFBOARD is not set
436CONFIG_BLK_DEV_GENERIC=y 447CONFIG_BLK_DEV_GENERIC=y
437# CONFIG_BLK_DEV_OPTI621 is not set 448# CONFIG_BLK_DEV_OPTI621 is not set
438# CONFIG_BLK_DEV_SL82C105 is not set 449CONFIG_BLK_DEV_SL82C105=y
439CONFIG_BLK_DEV_IDEDMA_PCI=y 450CONFIG_BLK_DEV_IDEDMA_PCI=y
440# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 451# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
441CONFIG_IDEDMA_PCI_AUTO=y 452CONFIG_IDEDMA_PCI_AUTO=y
@@ -443,7 +454,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
443# CONFIG_BLK_DEV_AEC62XX is not set 454# CONFIG_BLK_DEV_AEC62XX is not set
444# CONFIG_BLK_DEV_ALI15X3 is not set 455# CONFIG_BLK_DEV_ALI15X3 is not set
445# CONFIG_BLK_DEV_AMD74XX is not set 456# CONFIG_BLK_DEV_AMD74XX is not set
446CONFIG_BLK_DEV_CMD64X=y 457# CONFIG_BLK_DEV_CMD64X is not set
447# CONFIG_BLK_DEV_TRIFLEX is not set 458# CONFIG_BLK_DEV_TRIFLEX is not set
448# CONFIG_BLK_DEV_CY82C693 is not set 459# CONFIG_BLK_DEV_CY82C693 is not set
449# CONFIG_BLK_DEV_CS5520 is not set 460# CONFIG_BLK_DEV_CS5520 is not set
@@ -455,17 +466,12 @@ CONFIG_BLK_DEV_CMD64X=y
455# CONFIG_BLK_DEV_IT821X is not set 466# CONFIG_BLK_DEV_IT821X is not set
456# CONFIG_BLK_DEV_NS87415 is not set 467# CONFIG_BLK_DEV_NS87415 is not set
457# CONFIG_BLK_DEV_PDC202XX_OLD is not set 468# CONFIG_BLK_DEV_PDC202XX_OLD is not set
458CONFIG_BLK_DEV_PDC202XX_NEW=y 469# CONFIG_BLK_DEV_PDC202XX_NEW is not set
459# CONFIG_PDC202XX_FORCE is not set
460# CONFIG_BLK_DEV_SVWKS is not set 470# CONFIG_BLK_DEV_SVWKS is not set
461# CONFIG_BLK_DEV_SIIMAGE is not set 471# CONFIG_BLK_DEV_SIIMAGE is not set
462# CONFIG_BLK_DEV_SLC90E66 is not set 472# CONFIG_BLK_DEV_SLC90E66 is not set
463# CONFIG_BLK_DEV_TRM290 is not set 473# CONFIG_BLK_DEV_TRM290 is not set
464# CONFIG_BLK_DEV_VIA82CXXX is not set 474# CONFIG_BLK_DEV_VIA82CXXX is not set
465CONFIG_BLK_DEV_IDE_PMAC=y
466CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
467CONFIG_BLK_DEV_IDEDMA_PMAC=y
468CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
469# CONFIG_IDE_ARM is not set 475# CONFIG_IDE_ARM is not set
470# CONFIG_IDE_CHIPSETS is not set 476# CONFIG_IDE_CHIPSETS is not set
471CONFIG_BLK_DEV_IDEDMA=y 477CONFIG_BLK_DEV_IDEDMA=y
@@ -476,6 +482,7 @@ CONFIG_IDEDMA_AUTO=y
476# 482#
477# SCSI device support 483# SCSI device support
478# 484#
485# CONFIG_RAID_ATTRS is not set
479CONFIG_SCSI=y 486CONFIG_SCSI=y
480CONFIG_SCSI_PROC_FS=y 487CONFIG_SCSI_PROC_FS=y
481 488
@@ -503,10 +510,12 @@ CONFIG_SCSI_LOGGING=y
503CONFIG_SCSI_SPI_ATTRS=y 510CONFIG_SCSI_SPI_ATTRS=y
504# CONFIG_SCSI_FC_ATTRS is not set 511# CONFIG_SCSI_FC_ATTRS is not set
505# CONFIG_SCSI_ISCSI_ATTRS is not set 512# CONFIG_SCSI_ISCSI_ATTRS is not set
513# CONFIG_SCSI_SAS_ATTRS is not set
506 514
507# 515#
508# SCSI low-level drivers 516# SCSI low-level drivers
509# 517#
518# CONFIG_ISCSI_TCP is not set
510# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 519# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
511# CONFIG_SCSI_3W_9XXX is not set 520# CONFIG_SCSI_3W_9XXX is not set
512# CONFIG_SCSI_7000FASST is not set 521# CONFIG_SCSI_7000FASST is not set
@@ -514,19 +523,16 @@ CONFIG_SCSI_SPI_ATTRS=y
514# CONFIG_SCSI_AHA152X is not set 523# CONFIG_SCSI_AHA152X is not set
515# CONFIG_SCSI_AHA1542 is not set 524# CONFIG_SCSI_AHA1542 is not set
516# CONFIG_SCSI_AACRAID is not set 525# CONFIG_SCSI_AACRAID is not set
517CONFIG_SCSI_AIC7XXX=m 526# CONFIG_SCSI_AIC7XXX is not set
518CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 527# CONFIG_SCSI_AIC7XXX_OLD is not set
519CONFIG_AIC7XXX_RESET_DELAY_MS=15000
520CONFIG_AIC7XXX_DEBUG_ENABLE=y
521CONFIG_AIC7XXX_DEBUG_MASK=0
522CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
523CONFIG_SCSI_AIC7XXX_OLD=m
524# CONFIG_SCSI_AIC79XX is not set 528# CONFIG_SCSI_AIC79XX is not set
525# CONFIG_SCSI_DPT_I2O is not set 529# CONFIG_SCSI_DPT_I2O is not set
526# CONFIG_SCSI_IN2000 is not set 530# CONFIG_SCSI_IN2000 is not set
527# CONFIG_MEGARAID_NEWGEN is not set 531# CONFIG_MEGARAID_NEWGEN is not set
528# CONFIG_MEGARAID_LEGACY is not set 532# CONFIG_MEGARAID_LEGACY is not set
533# CONFIG_MEGARAID_SAS is not set
529# CONFIG_SCSI_SATA is not set 534# CONFIG_SCSI_SATA is not set
535# CONFIG_SCSI_HPTIOP is not set
530# CONFIG_SCSI_BUSLOGIC is not set 536# CONFIG_SCSI_BUSLOGIC is not set
531# CONFIG_SCSI_DMX3191D is not set 537# CONFIG_SCSI_DMX3191D is not set
532# CONFIG_SCSI_DTC3280 is not set 538# CONFIG_SCSI_DTC3280 is not set
@@ -545,19 +551,13 @@ CONFIG_SCSI_SYM53C8XX_2=y
545CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 551CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
546CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 552CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
547CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 553CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
548# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 554CONFIG_SCSI_SYM53C8XX_MMIO=y
549# CONFIG_SCSI_IPR is not set 555# CONFIG_SCSI_IPR is not set
550# CONFIG_SCSI_PAS16 is not set 556# CONFIG_SCSI_PAS16 is not set
551# CONFIG_SCSI_PSI240I is not set 557# CONFIG_SCSI_PSI240I is not set
552# CONFIG_SCSI_QLOGIC_FAS is not set 558# CONFIG_SCSI_QLOGIC_FAS is not set
553# CONFIG_SCSI_QLOGIC_FC is not set
554# CONFIG_SCSI_QLOGIC_1280 is not set 559# CONFIG_SCSI_QLOGIC_1280 is not set
555CONFIG_SCSI_QLA2XXX=y 560# CONFIG_SCSI_QLA_FC is not set
556# CONFIG_SCSI_QLA21XX is not set
557# CONFIG_SCSI_QLA22XX is not set
558# CONFIG_SCSI_QLA2300 is not set
559# CONFIG_SCSI_QLA2322 is not set
560# CONFIG_SCSI_QLA6312 is not set
561# CONFIG_SCSI_LPFC is not set 561# CONFIG_SCSI_LPFC is not set
562# CONFIG_SCSI_SYM53C416 is not set 562# CONFIG_SCSI_SYM53C416 is not set
563# CONFIG_SCSI_DC395x is not set 563# CONFIG_SCSI_DC395x is not set
@@ -566,10 +566,6 @@ CONFIG_SCSI_QLA2XXX=y
566# CONFIG_SCSI_U14_34F is not set 566# CONFIG_SCSI_U14_34F is not set
567# CONFIG_SCSI_NSP32 is not set 567# CONFIG_SCSI_NSP32 is not set
568# CONFIG_SCSI_DEBUG is not set 568# CONFIG_SCSI_DEBUG is not set
569CONFIG_SCSI_MESH=y
570CONFIG_SCSI_MESH_SYNC_RATE=5
571CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
572CONFIG_SCSI_MAC53C94=y
573 569
574# 570#
575# Old CD-ROM drivers (not SCSI, not IDE) 571# Old CD-ROM drivers (not SCSI, not IDE)
@@ -587,6 +583,7 @@ CONFIG_SCSI_MAC53C94=y
587# CONFIG_FUSION is not set 583# CONFIG_FUSION is not set
588# CONFIG_FUSION_SPI is not set 584# CONFIG_FUSION_SPI is not set
589# CONFIG_FUSION_FC is not set 585# CONFIG_FUSION_FC is not set
586# CONFIG_FUSION_SAS is not set
590 587
591# 588#
592# IEEE 1394 (FireWire) support 589# IEEE 1394 (FireWire) support
@@ -613,12 +610,9 @@ CONFIG_IEEE1394_OHCI1394=m
613# 610#
614CONFIG_IEEE1394_VIDEO1394=m 611CONFIG_IEEE1394_VIDEO1394=m
615CONFIG_IEEE1394_SBP2=m 612CONFIG_IEEE1394_SBP2=m
616# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
617CONFIG_IEEE1394_ETH1394=m 613CONFIG_IEEE1394_ETH1394=m
618CONFIG_IEEE1394_DV1394=m 614CONFIG_IEEE1394_DV1394=m
619CONFIG_IEEE1394_RAWIO=m 615CONFIG_IEEE1394_RAWIO=m
620CONFIG_IEEE1394_CMP=m
621CONFIG_IEEE1394_AMDTP=m
622 616
623# 617#
624# I2O device support 618# I2O device support
@@ -628,18 +622,7 @@ CONFIG_IEEE1394_AMDTP=m
628# 622#
629# Macintosh device drivers 623# Macintosh device drivers
630# 624#
631CONFIG_ADB=y 625# CONFIG_WINDFARM is not set
632CONFIG_ADB_CUDA=y
633CONFIG_ADB_PMU=y
634CONFIG_PMAC_APM_EMU=y
635CONFIG_PMAC_MEDIABAY=y
636CONFIG_PMAC_BACKLIGHT=y
637CONFIG_ADB_MACIO=y
638CONFIG_INPUT_ADBHID=y
639CONFIG_MAC_EMUMOUSEBTN=y
640CONFIG_THERM_WINDTUNNEL=m
641CONFIG_THERM_ADT746X=m
642# CONFIG_ANSLCD is not set
643 626
644# 627#
645# Network device support 628# Network device support
@@ -656,15 +639,18 @@ CONFIG_TUN=m
656# CONFIG_ARCNET is not set 639# CONFIG_ARCNET is not set
657 640
658# 641#
642# PHY device support
643#
644# CONFIG_PHYLIB is not set
645
646#
659# Ethernet (10 or 100Mbit) 647# Ethernet (10 or 100Mbit)
660# 648#
661CONFIG_NET_ETHERNET=y 649CONFIG_NET_ETHERNET=y
662CONFIG_MII=y 650CONFIG_MII=y
663CONFIG_MACE=y
664# CONFIG_MACE_AAUI_PORT is not set
665CONFIG_BMAC=y
666# CONFIG_HAPPYMEAL is not set 651# CONFIG_HAPPYMEAL is not set
667CONFIG_SUNGEM=y 652# CONFIG_SUNGEM is not set
653# CONFIG_CASSINI is not set
668# CONFIG_NET_VENDOR_3COM is not set 654# CONFIG_NET_VENDOR_3COM is not set
669# CONFIG_LANCE is not set 655# CONFIG_LANCE is not set
670# CONFIG_NET_VENDOR_SMC is not set 656# CONFIG_NET_VENDOR_SMC is not set
@@ -682,6 +668,7 @@ CONFIG_TULIP_MMIO=y
682CONFIG_DE4X5=m 668CONFIG_DE4X5=m
683# CONFIG_WINBOND_840 is not set 669# CONFIG_WINBOND_840 is not set
684# CONFIG_DM9102 is not set 670# CONFIG_DM9102 is not set
671# CONFIG_ULI526X is not set
685# CONFIG_PCMCIA_XIRCOM is not set 672# CONFIG_PCMCIA_XIRCOM is not set
686# CONFIG_PCMCIA_XIRTULIP is not set 673# CONFIG_PCMCIA_XIRTULIP is not set
687# CONFIG_AT1700 is not set 674# CONFIG_AT1700 is not set
@@ -722,18 +709,21 @@ CONFIG_PCNET32=y
722# CONFIG_HAMACHI is not set 709# CONFIG_HAMACHI is not set
723# CONFIG_YELLOWFIN is not set 710# CONFIG_YELLOWFIN is not set
724# CONFIG_R8169 is not set 711# CONFIG_R8169 is not set
712# CONFIG_SIS190 is not set
725# CONFIG_SKGE is not set 713# CONFIG_SKGE is not set
714# CONFIG_SKY2 is not set
726# CONFIG_SK98LIN is not set 715# CONFIG_SK98LIN is not set
727# CONFIG_VIA_VELOCITY is not set 716# CONFIG_VIA_VELOCITY is not set
728# CONFIG_TIGON3 is not set 717# CONFIG_TIGON3 is not set
729# CONFIG_BNX2 is not set 718# CONFIG_BNX2 is not set
730# CONFIG_MV643XX_ETH is not set
731 719
732# 720#
733# Ethernet (10000 Mbit) 721# Ethernet (10000 Mbit)
734# 722#
723# CONFIG_CHELSIO_T1 is not set
735# CONFIG_IXGB is not set 724# CONFIG_IXGB is not set
736# CONFIG_S2IO is not set 725# CONFIG_S2IO is not set
726# CONFIG_MYRI10GE is not set
737 727
738# 728#
739# Token Ring devices 729# Token Ring devices
@@ -744,6 +734,7 @@ CONFIG_PCNET32=y
744# Wireless LAN (non-hamradio) 734# Wireless LAN (non-hamradio)
745# 735#
746CONFIG_NET_RADIO=y 736CONFIG_NET_RADIO=y
737# CONFIG_NET_WIRELESS_RTNETLINK is not set
747 738
748# 739#
749# Obsolete Wireless cards support (pre-802.11) 740# Obsolete Wireless cards support (pre-802.11)
@@ -755,11 +746,13 @@ CONFIG_NET_RADIO=y
755# 746#
756# Wireless 802.11b ISA/PCI cards support 747# Wireless 802.11b ISA/PCI cards support
757# 748#
749# CONFIG_IPW2100 is not set
750# CONFIG_IPW2200 is not set
758# CONFIG_AIRO is not set 751# CONFIG_AIRO is not set
759CONFIG_HERMES=m 752CONFIG_HERMES=m
760CONFIG_APPLE_AIRPORT=m
761# CONFIG_PLX_HERMES is not set 753# CONFIG_PLX_HERMES is not set
762# CONFIG_TMD_HERMES is not set 754# CONFIG_TMD_HERMES is not set
755# CONFIG_NORTEL_HERMES is not set
763# CONFIG_PCI_HERMES is not set 756# CONFIG_PCI_HERMES is not set
764# CONFIG_ATMEL is not set 757# CONFIG_ATMEL is not set
765 758
@@ -767,6 +760,8 @@ CONFIG_APPLE_AIRPORT=m
767# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support 760# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
768# 761#
769# CONFIG_PRISM54 is not set 762# CONFIG_PRISM54 is not set
763# CONFIG_USB_ZD1201 is not set
764# CONFIG_HOSTAP is not set
770CONFIG_NET_WIRELESS=y 765CONFIG_NET_WIRELESS=y
771 766
772# 767#
@@ -783,11 +778,16 @@ CONFIG_PPP_ASYNC=y
783# CONFIG_PPP_SYNC_TTY is not set 778# CONFIG_PPP_SYNC_TTY is not set
784CONFIG_PPP_DEFLATE=y 779CONFIG_PPP_DEFLATE=y
785CONFIG_PPP_BSDCOMP=m 780CONFIG_PPP_BSDCOMP=m
781# CONFIG_PPP_MPPE is not set
786CONFIG_PPPOE=m 782CONFIG_PPPOE=m
787# CONFIG_SLIP is not set 783# CONFIG_SLIP is not set
788# CONFIG_NET_FC is not set 784# CONFIG_NET_FC is not set
789# CONFIG_SHAPER is not set 785# CONFIG_SHAPER is not set
790CONFIG_NETCONSOLE=m 786CONFIG_NETCONSOLE=m
787CONFIG_NETPOLL=y
788# CONFIG_NETPOLL_RX is not set
789# CONFIG_NETPOLL_TRAP is not set
790CONFIG_NET_POLL_CONTROLLER=y
791 791
792# 792#
793# ISDN subsystem 793# ISDN subsystem
@@ -835,7 +835,7 @@ CONFIG_MOUSE_PS2=y
835# CONFIG_INPUT_JOYSTICK is not set 835# CONFIG_INPUT_JOYSTICK is not set
836# CONFIG_INPUT_TOUCHSCREEN is not set 836# CONFIG_INPUT_TOUCHSCREEN is not set
837CONFIG_INPUT_MISC=y 837CONFIG_INPUT_MISC=y
838# CONFIG_INPUT_PCSPKR is not set 838CONFIG_INPUT_PCSPKR=m
839CONFIG_INPUT_UINPUT=m 839CONFIG_INPUT_UINPUT=m
840 840
841# 841#
@@ -856,6 +856,7 @@ CONFIG_SERIO_LIBPS2=y
856CONFIG_VT=y 856CONFIG_VT=y
857CONFIG_VT_CONSOLE=y 857CONFIG_VT_CONSOLE=y
858CONFIG_HW_CONSOLE=y 858CONFIG_HW_CONSOLE=y
859# CONFIG_VT_HW_CONSOLE_BINDING is not set
859# CONFIG_SERIAL_NONSTANDARD is not set 860# CONFIG_SERIAL_NONSTANDARD is not set
860 861
861# 862#
@@ -863,7 +864,9 @@ CONFIG_HW_CONSOLE=y
863# 864#
864CONFIG_SERIAL_8250=y 865CONFIG_SERIAL_8250=y
865CONFIG_SERIAL_8250_CONSOLE=y 866CONFIG_SERIAL_8250_CONSOLE=y
867CONFIG_SERIAL_8250_PCI=y
866CONFIG_SERIAL_8250_NR_UARTS=4 868CONFIG_SERIAL_8250_NR_UARTS=4
869CONFIG_SERIAL_8250_RUNTIME_UARTS=4
867# CONFIG_SERIAL_8250_EXTENDED is not set 870# CONFIG_SERIAL_8250_EXTENDED is not set
868 871
869# 872#
@@ -871,8 +874,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
871# 874#
872CONFIG_SERIAL_CORE=y 875CONFIG_SERIAL_CORE=y
873CONFIG_SERIAL_CORE_CONSOLE=y 876CONFIG_SERIAL_CORE_CONSOLE=y
874CONFIG_SERIAL_PMACZILOG=y
875CONFIG_SERIAL_PMACZILOG_CONSOLE=y
876# CONFIG_SERIAL_JSM is not set 877# CONFIG_SERIAL_JSM is not set
877CONFIG_UNIX98_PTYS=y 878CONFIG_UNIX98_PTYS=y
878CONFIG_LEGACY_PTYS=y 879CONFIG_LEGACY_PTYS=y
@@ -890,6 +891,7 @@ CONFIG_LEGACY_PTY_COUNT=256
890# Watchdog Cards 891# Watchdog Cards
891# 892#
892# CONFIG_WATCHDOG is not set 893# CONFIG_WATCHDOG is not set
894# CONFIG_HW_RANDOM is not set
893CONFIG_NVRAM=y 895CONFIG_NVRAM=y
894CONFIG_GEN_RTC=y 896CONFIG_GEN_RTC=y
895# CONFIG_GEN_RTC_X is not set 897# CONFIG_GEN_RTC_X is not set
@@ -900,21 +902,15 @@ CONFIG_GEN_RTC=y
900# 902#
901# Ftape, the floppy tape device driver 903# Ftape, the floppy tape device driver
902# 904#
903CONFIG_AGP=m 905# CONFIG_AGP is not set
904CONFIG_AGP_UNINORTH=m 906# CONFIG_DRM is not set
905CONFIG_DRM=m
906# CONFIG_DRM_TDFX is not set
907CONFIG_DRM_R128=m
908CONFIG_DRM_RADEON=m
909# CONFIG_DRM_MGA is not set
910# CONFIG_DRM_SIS is not set
911# CONFIG_DRM_VIA is not set
912# CONFIG_RAW_DRIVER is not set 907# CONFIG_RAW_DRIVER is not set
913 908
914# 909#
915# TPM devices 910# TPM devices
916# 911#
917# CONFIG_TCG_TPM is not set 912# CONFIG_TCG_TPM is not set
913# CONFIG_TELCLOCK is not set
918 914
919# 915#
920# I2C support 916# I2C support
@@ -938,19 +934,16 @@ CONFIG_I2C_ALGOBIT=y
938# CONFIG_I2C_AMD756 is not set 934# CONFIG_I2C_AMD756 is not set
939# CONFIG_I2C_AMD8111 is not set 935# CONFIG_I2C_AMD8111 is not set
940# CONFIG_I2C_ELEKTOR is not set 936# CONFIG_I2C_ELEKTOR is not set
941CONFIG_I2C_HYDRA=y
942# CONFIG_I2C_I801 is not set 937# CONFIG_I2C_I801 is not set
943# CONFIG_I2C_I810 is not set 938# CONFIG_I2C_I810 is not set
944# CONFIG_I2C_PIIX4 is not set 939# CONFIG_I2C_PIIX4 is not set
945# CONFIG_I2C_ISA is not set
946CONFIG_I2C_KEYWEST=m
947# CONFIG_I2C_MPC is not set 940# CONFIG_I2C_MPC is not set
948# CONFIG_I2C_NFORCE2 is not set 941# CONFIG_I2C_NFORCE2 is not set
942# CONFIG_I2C_OCORES is not set
949# CONFIG_I2C_PARPORT is not set 943# CONFIG_I2C_PARPORT is not set
950# CONFIG_I2C_PARPORT_LIGHT is not set 944# CONFIG_I2C_PARPORT_LIGHT is not set
951# CONFIG_I2C_PROSAVAGE is not set 945# CONFIG_I2C_PROSAVAGE is not set
952# CONFIG_I2C_SAVAGE4 is not set 946# CONFIG_I2C_SAVAGE4 is not set
953# CONFIG_SCx200_ACB is not set
954# CONFIG_I2C_SIS5595 is not set 947# CONFIG_I2C_SIS5595 is not set
955# CONFIG_I2C_SIS630 is not set 948# CONFIG_I2C_SIS630 is not set
956# CONFIG_I2C_SIS96X is not set 949# CONFIG_I2C_SIS96X is not set
@@ -959,7 +952,6 @@ CONFIG_I2C_KEYWEST=m
959# CONFIG_I2C_VIAPRO is not set 952# CONFIG_I2C_VIAPRO is not set
960# CONFIG_I2C_VOODOO3 is not set 953# CONFIG_I2C_VOODOO3 is not set
961# CONFIG_I2C_PCA_ISA is not set 954# CONFIG_I2C_PCA_ISA is not set
962# CONFIG_I2C_SENSOR is not set
963 955
964# 956#
965# Miscellaneous I2C Chip support 957# Miscellaneous I2C Chip support
@@ -970,7 +962,6 @@ CONFIG_I2C_KEYWEST=m
970# CONFIG_SENSORS_PCF8574 is not set 962# CONFIG_SENSORS_PCF8574 is not set
971# CONFIG_SENSORS_PCA9539 is not set 963# CONFIG_SENSORS_PCA9539 is not set
972# CONFIG_SENSORS_PCF8591 is not set 964# CONFIG_SENSORS_PCF8591 is not set
973# CONFIG_SENSORS_RTC8564 is not set
974# CONFIG_SENSORS_M41T00 is not set 965# CONFIG_SENSORS_M41T00 is not set
975# CONFIG_SENSORS_MAX6875 is not set 966# CONFIG_SENSORS_MAX6875 is not set
976# CONFIG_I2C_DEBUG_CORE is not set 967# CONFIG_I2C_DEBUG_CORE is not set
@@ -979,14 +970,20 @@ CONFIG_I2C_KEYWEST=m
979# CONFIG_I2C_DEBUG_CHIP is not set 970# CONFIG_I2C_DEBUG_CHIP is not set
980 971
981# 972#
973# SPI support
974#
975# CONFIG_SPI is not set
976# CONFIG_SPI_MASTER is not set
977
978#
982# Dallas's 1-wire bus 979# Dallas's 1-wire bus
983# 980#
984# CONFIG_W1 is not set
985 981
986# 982#
987# Hardware Monitoring support 983# Hardware Monitoring support
988# 984#
989# CONFIG_HWMON is not set 985# CONFIG_HWMON is not set
986# CONFIG_HWMON_VID is not set
990 987
991# 988#
992# Misc devices 989# Misc devices
@@ -996,38 +993,36 @@ CONFIG_I2C_KEYWEST=m
996# Multimedia devices 993# Multimedia devices
997# 994#
998# CONFIG_VIDEO_DEV is not set 995# CONFIG_VIDEO_DEV is not set
996CONFIG_VIDEO_V4L2=y
999 997
1000# 998#
1001# Digital Video Broadcasting Devices 999# Digital Video Broadcasting Devices
1002# 1000#
1003# CONFIG_DVB is not set 1001# CONFIG_DVB is not set
1002# CONFIG_USB_DABUSB is not set
1004 1003
1005# 1004#
1006# Graphics support 1005# Graphics support
1007# 1006#
1007# CONFIG_FIRMWARE_EDID is not set
1008CONFIG_FB=y 1008CONFIG_FB=y
1009CONFIG_FB_CFB_FILLRECT=y 1009CONFIG_FB_CFB_FILLRECT=y
1010CONFIG_FB_CFB_COPYAREA=y 1010CONFIG_FB_CFB_COPYAREA=y
1011CONFIG_FB_CFB_IMAGEBLIT=y 1011CONFIG_FB_CFB_IMAGEBLIT=y
1012CONFIG_FB_SOFT_CURSOR=y 1012# CONFIG_FB_MACMODES is not set
1013CONFIG_FB_MACMODES=y 1013# CONFIG_FB_BACKLIGHT is not set
1014CONFIG_FB_MODE_HELPERS=y 1014CONFIG_FB_MODE_HELPERS=y
1015CONFIG_FB_TILEBLITTING=y 1015CONFIG_FB_TILEBLITTING=y
1016# CONFIG_FB_CIRRUS is not set 1016# CONFIG_FB_CIRRUS is not set
1017# CONFIG_FB_PM2 is not set 1017# CONFIG_FB_PM2 is not set
1018# CONFIG_FB_CYBER2000 is not set 1018# CONFIG_FB_CYBER2000 is not set
1019CONFIG_FB_OF=y 1019# CONFIG_FB_CT65550 is not set
1020CONFIG_FB_CONTROL=y
1021CONFIG_FB_PLATINUM=y
1022CONFIG_FB_VALKYRIE=y
1023CONFIG_FB_CT65550=y
1024# CONFIG_FB_ASILIANT is not set 1020# CONFIG_FB_ASILIANT is not set
1025CONFIG_FB_IMSTT=y 1021# CONFIG_FB_IMSTT is not set
1026# CONFIG_FB_VGA16 is not set 1022# CONFIG_FB_VGA16 is not set
1023# CONFIG_FB_S1D13XXX is not set
1027# CONFIG_FB_NVIDIA is not set 1024# CONFIG_FB_NVIDIA is not set
1028CONFIG_FB_RIVA=y 1025# CONFIG_FB_RIVA is not set
1029CONFIG_FB_RIVA_I2C=y
1030# CONFIG_FB_RIVA_DEBUG is not set
1031CONFIG_FB_MATROX=y 1026CONFIG_FB_MATROX=y
1032CONFIG_FB_MATROX_MILLENIUM=y 1027CONFIG_FB_MATROX_MILLENIUM=y
1033CONFIG_FB_MATROX_MYSTIQUE=y 1028CONFIG_FB_MATROX_MYSTIQUE=y
@@ -1035,34 +1030,27 @@ CONFIG_FB_MATROX_G=y
1035CONFIG_FB_MATROX_I2C=y 1030CONFIG_FB_MATROX_I2C=y
1036CONFIG_FB_MATROX_MAVEN=m 1031CONFIG_FB_MATROX_MAVEN=m
1037# CONFIG_FB_MATROX_MULTIHEAD is not set 1032# CONFIG_FB_MATROX_MULTIHEAD is not set
1038# CONFIG_FB_RADEON_OLD is not set 1033# CONFIG_FB_RADEON is not set
1039CONFIG_FB_RADEON=y 1034# CONFIG_FB_ATY128 is not set
1040CONFIG_FB_RADEON_I2C=y 1035# CONFIG_FB_ATY is not set
1041# CONFIG_FB_RADEON_DEBUG is not set
1042CONFIG_FB_ATY128=y
1043CONFIG_FB_ATY=y
1044CONFIG_FB_ATY_CT=y
1045CONFIG_FB_ATY_GENERIC_LCD=y
1046CONFIG_FB_ATY_XL_INIT=y
1047CONFIG_FB_ATY_GX=y
1048# CONFIG_FB_SAVAGE is not set 1036# CONFIG_FB_SAVAGE is not set
1049# CONFIG_FB_SIS is not set 1037# CONFIG_FB_SIS is not set
1050# CONFIG_FB_NEOMAGIC is not set 1038# CONFIG_FB_NEOMAGIC is not set
1051# CONFIG_FB_KYRO is not set 1039# CONFIG_FB_KYRO is not set
1052CONFIG_FB_3DFX=y 1040# CONFIG_FB_3DFX is not set
1053# CONFIG_FB_3DFX_ACCEL is not set
1054# CONFIG_FB_VOODOO1 is not set 1041# CONFIG_FB_VOODOO1 is not set
1055# CONFIG_FB_TRIDENT is not set 1042# CONFIG_FB_TRIDENT is not set
1056# CONFIG_FB_S1D13XXX is not set
1057# CONFIG_FB_VIRTUAL is not set 1043# CONFIG_FB_VIRTUAL is not set
1058 1044
1059# 1045#
1060# Console display driver support 1046# Console display driver support
1061# 1047#
1062CONFIG_VGA_CONSOLE=y 1048CONFIG_VGA_CONSOLE=y
1049# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1063# CONFIG_MDA_CONSOLE is not set 1050# CONFIG_MDA_CONSOLE is not set
1064CONFIG_DUMMY_CONSOLE=y 1051CONFIG_DUMMY_CONSOLE=y
1065CONFIG_FRAMEBUFFER_CONSOLE=y 1052CONFIG_FRAMEBUFFER_CONSOLE=y
1053# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1066# CONFIG_FONTS is not set 1054# CONFIG_FONTS is not set
1067CONFIG_FONT_8x8=y 1055CONFIG_FONT_8x8=y
1068CONFIG_FONT_8x16=y 1056CONFIG_FONT_8x16=y
@@ -1080,8 +1068,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
1080# Sound 1068# Sound
1081# 1069#
1082CONFIG_SOUND=m 1070CONFIG_SOUND=m
1083CONFIG_DMASOUND_PMAC=m
1084CONFIG_DMASOUND=m
1085 1071
1086# 1072#
1087# Advanced Linux Sound Architecture 1073# Advanced Linux Sound Architecture
@@ -1096,10 +1082,13 @@ CONFIG_SND_SEQUENCER=m
1096CONFIG_SND_OSSEMUL=y 1082CONFIG_SND_OSSEMUL=y
1097CONFIG_SND_MIXER_OSS=m 1083CONFIG_SND_MIXER_OSS=m
1098CONFIG_SND_PCM_OSS=m 1084CONFIG_SND_PCM_OSS=m
1085CONFIG_SND_PCM_OSS_PLUGINS=y
1099CONFIG_SND_SEQUENCER_OSS=y 1086CONFIG_SND_SEQUENCER_OSS=y
1087# CONFIG_SND_DYNAMIC_MINORS is not set
1088CONFIG_SND_SUPPORT_OLD_API=y
1089CONFIG_SND_VERBOSE_PROCFS=y
1100# CONFIG_SND_VERBOSE_PRINTK is not set 1090# CONFIG_SND_VERBOSE_PRINTK is not set
1101# CONFIG_SND_DEBUG is not set 1091# CONFIG_SND_DEBUG is not set
1102CONFIG_SND_GENERIC_PM=y
1103 1092
1104# 1093#
1105# Generic devices 1094# Generic devices
@@ -1116,7 +1105,9 @@ CONFIG_SND_OPL3_LIB=m
1116# ISA devices 1105# ISA devices
1117# 1106#
1118CONFIG_SND_CS4231_LIB=m 1107CONFIG_SND_CS4231_LIB=m
1108# CONFIG_SND_ADLIB is not set
1119# CONFIG_SND_AD1848 is not set 1109# CONFIG_SND_AD1848 is not set
1110# CONFIG_SND_CMI8330 is not set
1120# CONFIG_SND_CS4231 is not set 1111# CONFIG_SND_CS4231 is not set
1121CONFIG_SND_CS4232=m 1112CONFIG_SND_CS4232=m
1122# CONFIG_SND_CS4236 is not set 1113# CONFIG_SND_CS4236 is not set
@@ -1125,23 +1116,24 @@ CONFIG_SND_CS4232=m
1125# CONFIG_SND_GUSCLASSIC is not set 1116# CONFIG_SND_GUSCLASSIC is not set
1126# CONFIG_SND_GUSEXTREME is not set 1117# CONFIG_SND_GUSEXTREME is not set
1127# CONFIG_SND_GUSMAX is not set 1118# CONFIG_SND_GUSMAX is not set
1128# CONFIG_SND_INTERWAVE is not set 1119# CONFIG_SND_OPL3SA2 is not set
1129# CONFIG_SND_INTERWAVE_STB is not set
1130# CONFIG_SND_OPTI92X_AD1848 is not set 1120# CONFIG_SND_OPTI92X_AD1848 is not set
1131# CONFIG_SND_OPTI92X_CS4231 is not set 1121# CONFIG_SND_OPTI92X_CS4231 is not set
1132# CONFIG_SND_OPTI93X is not set 1122# CONFIG_SND_OPTI93X is not set
1123# CONFIG_SND_MIRO is not set
1133# CONFIG_SND_SB8 is not set 1124# CONFIG_SND_SB8 is not set
1134# CONFIG_SND_SB16 is not set 1125# CONFIG_SND_SB16 is not set
1135# CONFIG_SND_SBAWE is not set 1126# CONFIG_SND_SBAWE is not set
1136# CONFIG_SND_WAVEFRONT is not set
1137# CONFIG_SND_CMI8330 is not set
1138# CONFIG_SND_OPL3SA2 is not set
1139# CONFIG_SND_SGALAXY is not set 1127# CONFIG_SND_SGALAXY is not set
1140# CONFIG_SND_SSCAPE is not set 1128# CONFIG_SND_SSCAPE is not set
1129# CONFIG_SND_WAVEFRONT is not set
1141 1130
1142# 1131#
1143# PCI devices 1132# PCI devices
1144# 1133#
1134# CONFIG_SND_AD1889 is not set
1135# CONFIG_SND_ALS300 is not set
1136# CONFIG_SND_ALS4000 is not set
1145# CONFIG_SND_ALI5451 is not set 1137# CONFIG_SND_ALI5451 is not set
1146# CONFIG_SND_ATIIXP is not set 1138# CONFIG_SND_ATIIXP is not set
1147# CONFIG_SND_ATIIXP_MODEM is not set 1139# CONFIG_SND_ATIIXP_MODEM is not set
@@ -1150,43 +1142,61 @@ CONFIG_SND_CS4232=m
1150# CONFIG_SND_AU8830 is not set 1142# CONFIG_SND_AU8830 is not set
1151# CONFIG_SND_AZT3328 is not set 1143# CONFIG_SND_AZT3328 is not set
1152# CONFIG_SND_BT87X is not set 1144# CONFIG_SND_BT87X is not set
1153# CONFIG_SND_CS46XX is not set 1145# CONFIG_SND_CA0106 is not set
1146# CONFIG_SND_CMIPCI is not set
1154# CONFIG_SND_CS4281 is not set 1147# CONFIG_SND_CS4281 is not set
1148# CONFIG_SND_CS46XX is not set
1149# CONFIG_SND_DARLA20 is not set
1150# CONFIG_SND_GINA20 is not set
1151# CONFIG_SND_LAYLA20 is not set
1152# CONFIG_SND_DARLA24 is not set
1153# CONFIG_SND_GINA24 is not set
1154# CONFIG_SND_LAYLA24 is not set
1155# CONFIG_SND_MONA is not set
1156# CONFIG_SND_MIA is not set
1157# CONFIG_SND_ECHO3G is not set
1158# CONFIG_SND_INDIGO is not set
1159# CONFIG_SND_INDIGOIO is not set
1160# CONFIG_SND_INDIGODJ is not set
1155# CONFIG_SND_EMU10K1 is not set 1161# CONFIG_SND_EMU10K1 is not set
1156# CONFIG_SND_EMU10K1X is not set 1162# CONFIG_SND_EMU10K1X is not set
1157# CONFIG_SND_CA0106 is not set
1158# CONFIG_SND_KORG1212 is not set
1159# CONFIG_SND_MIXART is not set
1160# CONFIG_SND_NM256 is not set
1161# CONFIG_SND_RME32 is not set
1162# CONFIG_SND_RME96 is not set
1163# CONFIG_SND_RME9652 is not set
1164# CONFIG_SND_HDSP is not set
1165# CONFIG_SND_HDSPM is not set
1166# CONFIG_SND_TRIDENT is not set
1167# CONFIG_SND_YMFPCI is not set
1168# CONFIG_SND_ALS4000 is not set
1169# CONFIG_SND_CMIPCI is not set
1170# CONFIG_SND_ENS1370 is not set 1163# CONFIG_SND_ENS1370 is not set
1171# CONFIG_SND_ENS1371 is not set 1164# CONFIG_SND_ENS1371 is not set
1172# CONFIG_SND_ES1938 is not set 1165# CONFIG_SND_ES1938 is not set
1173# CONFIG_SND_ES1968 is not set 1166# CONFIG_SND_ES1968 is not set
1174# CONFIG_SND_MAESTRO3 is not set
1175# CONFIG_SND_FM801 is not set 1167# CONFIG_SND_FM801 is not set
1168# CONFIG_SND_HDA_INTEL is not set
1169# CONFIG_SND_HDSP is not set
1170# CONFIG_SND_HDSPM is not set
1176# CONFIG_SND_ICE1712 is not set 1171# CONFIG_SND_ICE1712 is not set
1177# CONFIG_SND_ICE1724 is not set 1172# CONFIG_SND_ICE1724 is not set
1178# CONFIG_SND_INTEL8X0 is not set 1173# CONFIG_SND_INTEL8X0 is not set
1179# CONFIG_SND_INTEL8X0M is not set 1174# CONFIG_SND_INTEL8X0M is not set
1175# CONFIG_SND_KORG1212 is not set
1176# CONFIG_SND_MAESTRO3 is not set
1177# CONFIG_SND_MIXART is not set
1178# CONFIG_SND_NM256 is not set
1179# CONFIG_SND_PCXHR is not set
1180# CONFIG_SND_RIPTIDE is not set
1181# CONFIG_SND_RME32 is not set
1182# CONFIG_SND_RME96 is not set
1183# CONFIG_SND_RME9652 is not set
1180# CONFIG_SND_SONICVIBES is not set 1184# CONFIG_SND_SONICVIBES is not set
1185# CONFIG_SND_TRIDENT is not set
1181# CONFIG_SND_VIA82XX is not set 1186# CONFIG_SND_VIA82XX is not set
1182# CONFIG_SND_VIA82XX_MODEM is not set 1187# CONFIG_SND_VIA82XX_MODEM is not set
1183# CONFIG_SND_VX222 is not set 1188# CONFIG_SND_VX222 is not set
1184# CONFIG_SND_HDA_INTEL is not set 1189# CONFIG_SND_YMFPCI is not set
1185 1190
1186# 1191#
1187# ALSA PowerMac devices 1192# ALSA PowerMac devices
1188# 1193#
1189CONFIG_SND_POWERMAC=m 1194
1195#
1196# Apple Onboard Audio driver
1197#
1198# CONFIG_SND_AOA is not set
1199# CONFIG_SND_AOA_SOUNDBUS is not set
1190 1200
1191# 1201#
1192# USB devices 1202# USB devices
@@ -1204,6 +1214,7 @@ CONFIG_SND_USB_AUDIO=m
1204# 1214#
1205CONFIG_USB_ARCH_HAS_HCD=y 1215CONFIG_USB_ARCH_HAS_HCD=y
1206CONFIG_USB_ARCH_HAS_OHCI=y 1216CONFIG_USB_ARCH_HAS_OHCI=y
1217CONFIG_USB_ARCH_HAS_EHCI=y
1207CONFIG_USB=y 1218CONFIG_USB=y
1208# CONFIG_USB_DEBUG is not set 1219# CONFIG_USB_DEBUG is not set
1209 1220
@@ -1222,6 +1233,7 @@ CONFIG_USB_DEVICEFS=y
1222CONFIG_USB_EHCI_HCD=m 1233CONFIG_USB_EHCI_HCD=m
1223CONFIG_USB_EHCI_SPLIT_ISO=y 1234CONFIG_USB_EHCI_SPLIT_ISO=y
1224CONFIG_USB_EHCI_ROOT_HUB_TT=y 1235CONFIG_USB_EHCI_ROOT_HUB_TT=y
1236# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1225# CONFIG_USB_ISP116X_HCD is not set 1237# CONFIG_USB_ISP116X_HCD is not set
1226CONFIG_USB_OHCI_HCD=y 1238CONFIG_USB_OHCI_HCD=y
1227# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1239# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1232,14 +1244,15 @@ CONFIG_USB_UHCI_HCD=m
1232# 1244#
1233# USB Device Class drivers 1245# USB Device Class drivers
1234# 1246#
1235# CONFIG_USB_AUDIO is not set
1236# CONFIG_USB_BLUETOOTH_TTY is not set
1237# CONFIG_USB_MIDI is not set
1238CONFIG_USB_ACM=m 1247CONFIG_USB_ACM=m
1239CONFIG_USB_PRINTER=m 1248CONFIG_USB_PRINTER=m
1240 1249
1241# 1250#
1242# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 1251# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1252#
1253
1254#
1255# may also be needed; see USB_STORAGE Help for more information
1243# 1256#
1244CONFIG_USB_STORAGE=m 1257CONFIG_USB_STORAGE=m
1245# CONFIG_USB_STORAGE_DEBUG is not set 1258# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1251,12 +1264,15 @@ CONFIG_USB_STORAGE_USBAT=y
1251CONFIG_USB_STORAGE_SDDR09=y 1264CONFIG_USB_STORAGE_SDDR09=y
1252CONFIG_USB_STORAGE_SDDR55=y 1265CONFIG_USB_STORAGE_SDDR55=y
1253CONFIG_USB_STORAGE_JUMPSHOT=y 1266CONFIG_USB_STORAGE_JUMPSHOT=y
1267# CONFIG_USB_STORAGE_ALAUDA is not set
1268# CONFIG_USB_LIBUSUAL is not set
1254 1269
1255# 1270#
1256# USB Input Devices 1271# USB Input Devices
1257# 1272#
1258CONFIG_USB_HID=y 1273CONFIG_USB_HID=y
1259CONFIG_USB_HIDINPUT=y 1274CONFIG_USB_HIDINPUT=y
1275# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1260# CONFIG_HID_FF is not set 1276# CONFIG_HID_FF is not set
1261CONFIG_USB_HIDDEV=y 1277CONFIG_USB_HIDDEV=y
1262# CONFIG_USB_AIPTEK is not set 1278# CONFIG_USB_AIPTEK is not set
@@ -1264,12 +1280,13 @@ CONFIG_USB_HIDDEV=y
1264# CONFIG_USB_ACECAD is not set 1280# CONFIG_USB_ACECAD is not set
1265# CONFIG_USB_KBTAB is not set 1281# CONFIG_USB_KBTAB is not set
1266# CONFIG_USB_POWERMATE is not set 1282# CONFIG_USB_POWERMATE is not set
1267# CONFIG_USB_MTOUCH is not set 1283# CONFIG_USB_TOUCHSCREEN is not set
1268# CONFIG_USB_ITMTOUCH is not set 1284# CONFIG_USB_YEALINK is not set
1269# CONFIG_USB_EGALAX is not set
1270# CONFIG_USB_XPAD is not set 1285# CONFIG_USB_XPAD is not set
1271# CONFIG_USB_ATI_REMOTE is not set 1286# CONFIG_USB_ATI_REMOTE is not set
1287# CONFIG_USB_ATI_REMOTE2 is not set
1272# CONFIG_USB_KEYSPAN_REMOTE is not set 1288# CONFIG_USB_KEYSPAN_REMOTE is not set
1289# CONFIG_USB_APPLETOUCH is not set
1273 1290
1274# 1291#
1275# USB Imaging devices 1292# USB Imaging devices
@@ -1278,15 +1295,6 @@ CONFIG_USB_HIDDEV=y
1278# CONFIG_USB_MICROTEK is not set 1295# CONFIG_USB_MICROTEK is not set
1279 1296
1280# 1297#
1281# USB Multimedia devices
1282#
1283# CONFIG_USB_DABUSB is not set
1284
1285#
1286# Video4Linux support is needed for USB Multimedia device support
1287#
1288
1289#
1290# USB Network Adapters 1298# USB Network Adapters
1291# 1299#
1292# CONFIG_USB_CATC is not set 1300# CONFIG_USB_CATC is not set
@@ -1294,7 +1302,6 @@ CONFIG_USB_HIDDEV=y
1294CONFIG_USB_PEGASUS=m 1302CONFIG_USB_PEGASUS=m
1295# CONFIG_USB_RTL8150 is not set 1303# CONFIG_USB_RTL8150 is not set
1296# CONFIG_USB_USBNET is not set 1304# CONFIG_USB_USBNET is not set
1297# CONFIG_USB_ZD1201 is not set
1298# CONFIG_USB_MON is not set 1305# CONFIG_USB_MON is not set
1299 1306
1300# 1307#
@@ -1308,6 +1315,7 @@ CONFIG_USB_PEGASUS=m
1308CONFIG_USB_SERIAL=m 1315CONFIG_USB_SERIAL=m
1309# CONFIG_USB_SERIAL_GENERIC is not set 1316# CONFIG_USB_SERIAL_GENERIC is not set
1310# CONFIG_USB_SERIAL_AIRPRIME is not set 1317# CONFIG_USB_SERIAL_AIRPRIME is not set
1318# CONFIG_USB_SERIAL_ARK3116 is not set
1311# CONFIG_USB_SERIAL_BELKIN is not set 1319# CONFIG_USB_SERIAL_BELKIN is not set
1312# CONFIG_USB_SERIAL_WHITEHEAT is not set 1320# CONFIG_USB_SERIAL_WHITEHEAT is not set
1313# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1321# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
@@ -1315,6 +1323,7 @@ CONFIG_USB_SERIAL=m
1315# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 1323# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
1316# CONFIG_USB_SERIAL_EMPEG is not set 1324# CONFIG_USB_SERIAL_EMPEG is not set
1317# CONFIG_USB_SERIAL_FTDI_SIO is not set 1325# CONFIG_USB_SERIAL_FTDI_SIO is not set
1326# CONFIG_USB_SERIAL_FUNSOFT is not set
1318CONFIG_USB_SERIAL_VISOR=m 1327CONFIG_USB_SERIAL_VISOR=m
1319# CONFIG_USB_SERIAL_IPAQ is not set 1328# CONFIG_USB_SERIAL_IPAQ is not set
1320# CONFIG_USB_SERIAL_IR is not set 1329# CONFIG_USB_SERIAL_IR is not set
@@ -1339,9 +1348,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1339# CONFIG_USB_SERIAL_KLSI is not set 1348# CONFIG_USB_SERIAL_KLSI is not set
1340# CONFIG_USB_SERIAL_KOBIL_SCT is not set 1349# CONFIG_USB_SERIAL_KOBIL_SCT is not set
1341# CONFIG_USB_SERIAL_MCT_U232 is not set 1350# CONFIG_USB_SERIAL_MCT_U232 is not set
1351# CONFIG_USB_SERIAL_NAVMAN is not set
1342# CONFIG_USB_SERIAL_PL2303 is not set 1352# CONFIG_USB_SERIAL_PL2303 is not set
1343# CONFIG_USB_SERIAL_HP4X is not set 1353# CONFIG_USB_SERIAL_HP4X is not set
1344# CONFIG_USB_SERIAL_SAFE is not set 1354# CONFIG_USB_SERIAL_SAFE is not set
1355# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1345# CONFIG_USB_SERIAL_TI is not set 1356# CONFIG_USB_SERIAL_TI is not set
1346# CONFIG_USB_SERIAL_CYBERJACK is not set 1357# CONFIG_USB_SERIAL_CYBERJACK is not set
1347# CONFIG_USB_SERIAL_XIRCOM is not set 1358# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -1359,10 +1370,12 @@ CONFIG_USB_EZUSB=y
1359# CONFIG_USB_LEGOTOWER is not set 1370# CONFIG_USB_LEGOTOWER is not set
1360# CONFIG_USB_LCD is not set 1371# CONFIG_USB_LCD is not set
1361# CONFIG_USB_LED is not set 1372# CONFIG_USB_LED is not set
1373# CONFIG_USB_CYPRESS_CY7C63 is not set
1362# CONFIG_USB_CYTHERM is not set 1374# CONFIG_USB_CYTHERM is not set
1363# CONFIG_USB_PHIDGETKIT is not set 1375# CONFIG_USB_PHIDGETKIT is not set
1364# CONFIG_USB_PHIDGETSERVO is not set 1376# CONFIG_USB_PHIDGETSERVO is not set
1365# CONFIG_USB_IDMOUSE is not set 1377# CONFIG_USB_IDMOUSE is not set
1378# CONFIG_USB_APPLEDISPLAY is not set
1366# CONFIG_USB_SISUSBVGA is not set 1379# CONFIG_USB_SISUSBVGA is not set
1367# CONFIG_USB_LD is not set 1380# CONFIG_USB_LD is not set
1368# CONFIG_USB_TEST is not set 1381# CONFIG_USB_TEST is not set
@@ -1382,12 +1395,43 @@ CONFIG_USB_EZUSB=y
1382# CONFIG_MMC is not set 1395# CONFIG_MMC is not set
1383 1396
1384# 1397#
1398# LED devices
1399#
1400# CONFIG_NEW_LEDS is not set
1401
1402#
1403# LED drivers
1404#
1405
1406#
1407# LED Triggers
1408#
1409
1410#
1385# InfiniBand support 1411# InfiniBand support
1386# 1412#
1387# CONFIG_INFINIBAND is not set 1413# CONFIG_INFINIBAND is not set
1388 1414
1389# 1415#
1390# SN Devices 1416# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1417#
1418
1419#
1420# Real Time Clock
1421#
1422# CONFIG_RTC_CLASS is not set
1423
1424#
1425# DMA Engine support
1426#
1427# CONFIG_DMA_ENGINE is not set
1428
1429#
1430# DMA Clients
1431#
1432
1433#
1434# DMA Devices
1391# 1435#
1392 1436
1393# 1437#
@@ -1417,23 +1461,21 @@ CONFIG_JFS_SECURITY=y
1417# CONFIG_JFS_DEBUG is not set 1461# CONFIG_JFS_DEBUG is not set
1418# CONFIG_JFS_STATISTICS is not set 1462# CONFIG_JFS_STATISTICS is not set
1419CONFIG_FS_POSIX_ACL=y 1463CONFIG_FS_POSIX_ACL=y
1420
1421#
1422# XFS support
1423#
1424CONFIG_XFS_FS=m 1464CONFIG_XFS_FS=m
1425CONFIG_XFS_EXPORT=y
1426# CONFIG_XFS_RT is not set
1427# CONFIG_XFS_QUOTA is not set 1465# CONFIG_XFS_QUOTA is not set
1428CONFIG_XFS_SECURITY=y 1466CONFIG_XFS_SECURITY=y
1429CONFIG_XFS_POSIX_ACL=y 1467CONFIG_XFS_POSIX_ACL=y
1468# CONFIG_XFS_RT is not set
1469# CONFIG_OCFS2_FS is not set
1430# CONFIG_MINIX_FS is not set 1470# CONFIG_MINIX_FS is not set
1431# CONFIG_ROMFS_FS is not set 1471# CONFIG_ROMFS_FS is not set
1432CONFIG_INOTIFY=y 1472CONFIG_INOTIFY=y
1473CONFIG_INOTIFY_USER=y
1433# CONFIG_QUOTA is not set 1474# CONFIG_QUOTA is not set
1434CONFIG_DNOTIFY=y 1475CONFIG_DNOTIFY=y
1435# CONFIG_AUTOFS_FS is not set 1476# CONFIG_AUTOFS_FS is not set
1436CONFIG_AUTOFS4_FS=m 1477CONFIG_AUTOFS4_FS=m
1478# CONFIG_FUSE_FS is not set
1437 1479
1438# 1480#
1439# CD-ROM/DVD Filesystems 1481# CD-ROM/DVD Filesystems
@@ -1460,13 +1502,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1460CONFIG_PROC_FS=y 1502CONFIG_PROC_FS=y
1461CONFIG_PROC_KCORE=y 1503CONFIG_PROC_KCORE=y
1462CONFIG_SYSFS=y 1504CONFIG_SYSFS=y
1463CONFIG_DEVPTS_FS_XATTR=y
1464CONFIG_DEVPTS_FS_SECURITY=y
1465CONFIG_TMPFS=y 1505CONFIG_TMPFS=y
1466CONFIG_TMPFS_XATTR=y
1467CONFIG_TMPFS_SECURITY=y
1468# CONFIG_HUGETLB_PAGE is not set 1506# CONFIG_HUGETLB_PAGE is not set
1469CONFIG_RAMFS=y 1507CONFIG_RAMFS=y
1508# CONFIG_CONFIGFS_FS is not set
1470 1509
1471# 1510#
1472# Miscellaneous filesystems 1511# Miscellaneous filesystems
@@ -1485,6 +1524,7 @@ CONFIG_CRAMFS=m
1485# CONFIG_SYSV_FS is not set 1524# CONFIG_SYSV_FS is not set
1486CONFIG_UFS_FS=m 1525CONFIG_UFS_FS=m
1487# CONFIG_UFS_FS_WRITE is not set 1526# CONFIG_UFS_FS_WRITE is not set
1527# CONFIG_UFS_DEBUG is not set
1488 1528
1489# 1529#
1490# Network File Systems 1530# Network File Systems
@@ -1513,6 +1553,7 @@ CONFIG_SUNRPC=y
1513# CONFIG_NCP_FS is not set 1553# CONFIG_NCP_FS is not set
1514# CONFIG_CODA_FS is not set 1554# CONFIG_CODA_FS is not set
1515# CONFIG_AFS_FS is not set 1555# CONFIG_AFS_FS is not set
1556# CONFIG_9P_FS is not set
1516 1557
1517# 1558#
1518# Partition Types 1559# Partition Types
@@ -1532,6 +1573,7 @@ CONFIG_MSDOS_PARTITION=y
1532# CONFIG_SGI_PARTITION is not set 1573# CONFIG_SGI_PARTITION is not set
1533# CONFIG_ULTRIX_PARTITION is not set 1574# CONFIG_ULTRIX_PARTITION is not set
1534# CONFIG_SUN_PARTITION is not set 1575# CONFIG_SUN_PARTITION is not set
1576# CONFIG_KARMA_PARTITION is not set
1535# CONFIG_EFI_PARTITION is not set 1577# CONFIG_EFI_PARTITION is not set
1536 1578
1537# 1579#
@@ -1582,33 +1624,44 @@ CONFIG_NLS_UTF8=m
1582# Library routines 1624# Library routines
1583# 1625#
1584CONFIG_CRC_CCITT=y 1626CONFIG_CRC_CCITT=y
1627# CONFIG_CRC16 is not set
1585CONFIG_CRC32=y 1628CONFIG_CRC32=y
1586# CONFIG_LIBCRC32C is not set 1629# CONFIG_LIBCRC32C is not set
1587CONFIG_ZLIB_INFLATE=y 1630CONFIG_ZLIB_INFLATE=y
1588CONFIG_ZLIB_DEFLATE=y 1631CONFIG_ZLIB_DEFLATE=y
1589 1632CONFIG_TEXTSEARCH=y
1590# 1633CONFIG_TEXTSEARCH_KMP=m
1591# Profiling support 1634CONFIG_TEXTSEARCH_BM=m
1592# 1635CONFIG_TEXTSEARCH_FSM=m
1636CONFIG_PLIST=y
1593# CONFIG_PROFILING is not set 1637# CONFIG_PROFILING is not set
1594 1638
1595# 1639#
1596# Kernel hacking 1640# Kernel hacking
1597# 1641#
1598# CONFIG_PRINTK_TIME is not set 1642# CONFIG_PRINTK_TIME is not set
1599CONFIG_DEBUG_KERNEL=y
1600CONFIG_MAGIC_SYSRQ=y 1643CONFIG_MAGIC_SYSRQ=y
1644# CONFIG_UNUSED_SYMBOLS is not set
1645CONFIG_DEBUG_KERNEL=y
1601CONFIG_LOG_BUF_SHIFT=14 1646CONFIG_LOG_BUF_SHIFT=14
1647CONFIG_DETECT_SOFTLOCKUP=y
1602# CONFIG_SCHEDSTATS is not set 1648# CONFIG_SCHEDSTATS is not set
1603# CONFIG_DEBUG_SLAB is not set 1649# CONFIG_DEBUG_SLAB is not set
1650# CONFIG_DEBUG_RT_MUTEXES is not set
1651# CONFIG_RT_MUTEX_TESTER is not set
1604# CONFIG_DEBUG_SPINLOCK is not set 1652# CONFIG_DEBUG_SPINLOCK is not set
1653# CONFIG_DEBUG_MUTEXES is not set
1654# CONFIG_DEBUG_RWSEMS is not set
1605# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1655# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1656# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1606# CONFIG_DEBUG_KOBJECT is not set 1657# CONFIG_DEBUG_KOBJECT is not set
1607# CONFIG_DEBUG_INFO is not set 1658# CONFIG_DEBUG_INFO is not set
1608# CONFIG_DEBUG_FS is not set 1659# CONFIG_DEBUG_FS is not set
1660# CONFIG_DEBUG_VM is not set
1661CONFIG_FORCED_INLINING=y
1662# CONFIG_RCU_TORTURE_TEST is not set
1609# CONFIG_XMON is not set 1663# CONFIG_XMON is not set
1610# CONFIG_BDI_SWITCH is not set 1664# CONFIG_BDI_SWITCH is not set
1611CONFIG_BOOTX_TEXT=y
1612 1665
1613# 1666#
1614# Security options 1667# Security options
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index 94ff58c9d4a9..896863fb208a 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -470,19 +470,21 @@ asmlinkage int sys_getdomainname(char __user *name, int len)
470{ 470{
471 int nlen, err; 471 int nlen, err;
472 472
473 if (len < 0 || len > __NEW_UTS_LEN) 473 if (len < 0)
474 return -EINVAL; 474 return -EINVAL;
475 475
476 down_read(&uts_sem); 476 down_read(&uts_sem);
477 477
478 nlen = strlen(system_utsname.domainname) + 1; 478 nlen = strlen(system_utsname.domainname) + 1;
479 if (nlen < len) 479 err = -EINVAL;
480 len = nlen; 480 if (nlen > len)
481 goto out;
481 482
482 err = -EFAULT; 483 err = -EFAULT;
483 if (!copy_to_user(name, system_utsname.domainname, len)) 484 if (!copy_to_user(name, system_utsname.domainname, nlen))
484 err = 0; 485 err = 0;
485 486
487out:
486 up_read(&uts_sem); 488 up_read(&uts_sem);
487 return err; 489 return err;
488} 490}
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index bf5f14ee73de..c608c947e6c3 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -707,19 +707,21 @@ asmlinkage long sys_getdomainname(char __user *name, int len)
707{ 707{
708 int nlen, err; 708 int nlen, err;
709 709
710 if (len < 0 || len > __NEW_UTS_LEN) 710 if (len < 0)
711 return -EINVAL; 711 return -EINVAL;
712 712
713 down_read(&uts_sem); 713 down_read(&uts_sem);
714 714
715 nlen = strlen(system_utsname.domainname) + 1; 715 nlen = strlen(system_utsname.domainname) + 1;
716 if (nlen < len) 716 err = -EINVAL;
717 len = nlen; 717 if (nlen > len)
718 goto out;
718 719
719 err = -EFAULT; 720 err = -EFAULT;
720 if (!copy_to_user(name, system_utsname.domainname, len)) 721 if (!copy_to_user(name, system_utsname.domainname, nlen))
721 err = 0; 722 err = 0;
722 723
724out:
723 up_read(&uts_sem); 725 up_read(&uts_sem);
724 return err; 726 return err;
725} 727}
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index 764bf23c7103..d6d7f731f6f0 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -108,6 +108,35 @@ e820_any_mapped(unsigned long start, unsigned long end, unsigned type)
108 return 0; 108 return 0;
109} 109}
110 110
111/*
112 * This function checks if the entire range <start,end> is mapped with type.
113 *
114 * Note: this function only works correct if the e820 table is sorted and
115 * not-overlapping, which is the case
116 */
117int __init e820_all_mapped(unsigned long start, unsigned long end, unsigned type)
118{
119 int i;
120 for (i = 0; i < e820.nr_map; i++) {
121 struct e820entry *ei = &e820.map[i];
122 if (type && ei->type != type)
123 continue;
124 /* is the region (part) in overlap with the current region ?*/
125 if (ei->addr >= end || ei->addr + ei->size <= start)
126 continue;
127
128 /* if the region is at the beginning of <start,end> we move
129 * start to the end of the region since it's ok until there
130 */
131 if (ei->addr <= start)
132 start = ei->addr + ei->size;
133 /* if start is now at or beyond end, we're done, full coverage */
134 if (start >= end)
135 return 1; /* we're done */
136 }
137 return 0;
138}
139
111/* 140/*
112 * Find a free area in a specific range. 141 * Find a free area in a specific range.
113 */ 142 */
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index 2d48a7941d48..3c55c76c6fd5 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -9,7 +9,6 @@
9#include <linux/init.h> 9#include <linux/init.h>
10#include <linux/acpi.h> 10#include <linux/acpi.h>
11#include <linux/bitmap.h> 11#include <linux/bitmap.h>
12#include <linux/dmi.h>
13#include <asm/e820.h> 12#include <asm/e820.h>
14 13
15#include "pci.h" 14#include "pci.h"
@@ -165,33 +164,11 @@ static __init void unreachable_devices(void)
165 } 164 }
166} 165}
167 166
168static int disable_mcfg(struct dmi_system_id *d)
169{
170 printk("PCI: %s detected. Disabling MCFG.\n", d->ident);
171 pci_probe &= ~PCI_PROBE_MMCONF;
172 return 0;
173}
174
175static struct dmi_system_id __initdata dmi_bad_mcfg[] = {
176 /* Has broken MCFG table that makes the system hang when used */
177 {
178 .callback = disable_mcfg,
179 .ident = "Intel D3C5105 SDV",
180 .matches = {
181 DMI_MATCH(DMI_BIOS_VENDOR, "Intel"),
182 DMI_MATCH(DMI_BOARD_NAME, "D26928"),
183 },
184 },
185 {}
186};
187
188void __init pci_mmcfg_init(void) 167void __init pci_mmcfg_init(void)
189{ 168{
190 int i; 169 int i;
191 170
192 dmi_check_system(dmi_bad_mcfg); 171 if ((pci_probe & PCI_PROBE_MMCONF) == 0)
193
194 if ((pci_probe & (PCI_PROBE_MMCONF|PCI_PROBE_MMCONF_FORCE)) == 0)
195 return; 172 return;
196 173
197 acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg); 174 acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg);
@@ -200,6 +177,15 @@ void __init pci_mmcfg_init(void)
200 (pci_mmcfg_config[0].base_address == 0)) 177 (pci_mmcfg_config[0].base_address == 0))
201 return; 178 return;
202 179
180 if (!e820_all_mapped(pci_mmcfg_config[0].base_address,
181 pci_mmcfg_config[0].base_address + MMCONFIG_APER_MIN,
182 E820_RESERVED)) {
183 printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %x is not E820-reserved\n",
184 pci_mmcfg_config[0].base_address);
185 printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
186 return;
187 }
188
203 /* RED-PEN i386 doesn't do _nocache right now */ 189 /* RED-PEN i386 doesn't do _nocache right now */
204 pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL); 190 pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL);
205 if (pci_mmcfg_virt == NULL) { 191 if (pci_mmcfg_virt == NULL) {
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-19 20:34:04 -0500