aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--Documentation/SubmittingPatches2
-rw-r--r--Documentation/cciss.txt1
-rw-r--r--Documentation/i386/boot.txt1
-rw-r--r--Documentation/i386/zero-page.txt4
-rw-r--r--Makefile6
-rw-r--r--arch/i386/oprofile/nmi_int.c2
-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--drivers/block/cciss.c10
-rw-r--r--drivers/char/hvc_console.c1
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c9
-rw-r--r--drivers/ide/pci/alim15x3.c2
-rw-r--r--drivers/infiniband/core/cma.c2
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_multicast.c1
-rw-r--r--drivers/infiniband/ulp/srp/ib_srp.c14
-rw-r--r--drivers/mtd/nand/nand_base.c4
-rw-r--r--drivers/scsi/libata-core.c13
-rw-r--r--drivers/scsi/scsi_error.c2
-rw-r--r--fs/ext2/super.c39
-rw-r--r--fs/ext3/inode.c2
-rw-r--r--fs/ext3/super.c42
-rw-r--r--fs/jffs2/summary.c5
-rw-r--r--include/asm-alpha/Kbuild2
-rw-r--r--include/asm-alpha/compiler.h3
-rw-r--r--include/asm-alpha/page.h6
-rw-r--r--include/asm-generic/Kbuild.asm2
-rw-r--r--include/asm-i386/Kbuild4
-rw-r--r--include/asm-i386/elf.h10
-rw-r--r--include/asm-i386/setup.h2
-rw-r--r--include/asm-i386/signal.h4
-rw-r--r--include/asm-i386/unistd.h4
-rw-r--r--include/asm-ia64/Kbuild2
-rw-r--r--include/asm-ia64/page.h4
-rw-r--r--include/asm-ia64/ptrace.h10
-rw-r--r--include/asm-ia64/ustack.h7
-rw-r--r--include/asm-mips/page.h8
-rw-r--r--include/asm-powerpc/eeh.h3
-rw-r--r--include/asm-powerpc/futex.h28
-rw-r--r--include/asm-powerpc/io.h43
-rw-r--r--include/asm-powerpc/kdump.h2
-rw-r--r--include/asm-powerpc/paca.h1
-rw-r--r--include/asm-powerpc/spinlock.h17
-rw-r--r--include/asm-ppc/io.h20
-rw-r--r--include/asm-s390/debug.h2
-rw-r--r--include/asm-s390/elf.h28
-rw-r--r--include/asm-x86_64/elf.h20
-rw-r--r--include/asm-x86_64/signal.h2
-rw-r--r--include/asm-x86_64/unistd.h16
-rw-r--r--include/asm-x86_64/vsyscall.h3
-rw-r--r--include/linux/nfs_fs.h52
-rw-r--r--include/linux/timex.h3
-rw-r--r--init/Kconfig56
-rw-r--r--kernel/irq/resend.c3
-rw-r--r--kernel/kmod.c5
-rw-r--r--kernel/lockdep_internals.h2
-rw-r--r--kernel/rcupdate.c6
-rw-r--r--scripts/Makefile.headersinst8
-rw-r--r--scripts/Makefile.host2
-rwxr-xr-xscripts/hdrcheck.sh4
77 files changed, 1382 insertions, 689 deletions
diff --git a/.gitignore b/.gitignore
index b1f5b9df2ae1..e1d5c17c12c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@
12*.ko 12*.ko
13*.so 13*.so
14*.mod.c 14*.mod.c
15*.i
16*.lst
17*.symtypes
15 18
16# 19#
17# Top-level generic files 20# Top-level generic files
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 2cd7f02ffd0b..d42ab4c9e893 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -308,6 +308,8 @@ then you just add a line saying
308 308
309 Signed-off-by: Random J Developer <random@developer.example.org> 309 Signed-off-by: Random J Developer <random@developer.example.org>
310 310
311using your real name (sorry, no pseudonyms or anonymous contributions.)
312
311Some people also put extra tags at the end. They'll just be ignored for 313Some people also put extra tags at the end. They'll just be ignored for
312now, but you can do this to mark internal company procedures or just 314now, but you can do this to mark internal company procedures or just
313point out some special detail about the sign-off. 315point out some special detail about the sign-off.
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
index 15378422fc46..9c629ffa0e58 100644
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
@@ -20,6 +20,7 @@ This driver is known to work with the following cards:
20 * SA P400i 20 * SA P400i
21 * SA E200 21 * SA E200
22 * SA E200i 22 * SA E200i
23 * SA E500
23 24
24If nodes are not already created in the /dev/cciss directory, run as root: 25If nodes are not already created in the /dev/cciss directory, run as root:
25 26
diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt
index 10312bebe55d..c51314b1a463 100644
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
@@ -181,6 +181,7 @@ filled out, however:
181 5 ELILO 181 5 ELILO
182 7 GRuB 182 7 GRuB
183 8 U-BOOT 183 8 U-BOOT
184 9 Xen
184 185
185 Please contact <hpa@zytor.com> if you need a bootloader ID 186 Please contact <hpa@zytor.com> if you need a bootloader ID
186 value assigned. 187 value assigned.
diff --git a/Documentation/i386/zero-page.txt b/Documentation/i386/zero-page.txt
index df28c7416781..c04a421f4a7c 100644
--- a/Documentation/i386/zero-page.txt
+++ b/Documentation/i386/zero-page.txt
@@ -63,6 +63,10 @@ Offset Type Description
63 2 for bootsect-loader 63 2 for bootsect-loader
64 3 for SYSLINUX 64 3 for SYSLINUX
65 4 for ETHERBOOT 65 4 for ETHERBOOT
66 5 for ELILO
67 7 for GRuB
68 8 for U-BOOT
69 9 for Xen
66 V = version 70 V = version
670x211 char loadflags: 710x211 char loadflags:
68 bit0 = 1: kernel is loaded high (bzImage) 72 bit0 = 1: kernel is loaded high (bzImage)
diff --git a/Makefile b/Makefile
index eab5a8c2ee49..a086e3212af3 100644
--- a/Makefile
+++ b/Makefile
@@ -889,7 +889,7 @@ depend dep:
889 889
890# --------------------------------------------------------------------------- 890# ---------------------------------------------------------------------------
891# Kernel headers 891# Kernel headers
892INSTALL_HDR_PATH=$(MODLIB)/abi 892INSTALL_HDR_PATH=$(objtree)/usr
893export INSTALL_HDR_PATH 893export INSTALL_HDR_PATH
894 894
895PHONY += headers_install 895PHONY += headers_install
@@ -986,7 +986,7 @@ CLEAN_FILES += vmlinux System.map \
986 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map 986 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
987 987
988# Directories & files removed with 'make mrproper' 988# Directories & files removed with 'make mrproper'
989MRPROPER_DIRS += include/config include2 989MRPROPER_DIRS += include/config include2 usr/include
990MRPROPER_FILES += .config .config.old include/asm .version .old_version \ 990MRPROPER_FILES += .config .config.old include/asm .version .old_version \
991 include/linux/autoconf.h include/linux/version.h \ 991 include/linux/autoconf.h include/linux/version.h \
992 include/linux/utsrelease.h \ 992 include/linux/utsrelease.h \
@@ -1077,7 +1077,7 @@ help:
1077 @echo ' kernelrelease - Output the release version string' 1077 @echo ' kernelrelease - Output the release version string'
1078 @echo ' kernelversion - Output the version stored in Makefile' 1078 @echo ' kernelversion - Output the version stored in Makefile'
1079 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH' 1079 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'
1080 @echo ' (default: /lib/modules/$$VERSION/abi)' 1080 @echo ' (default: $(INSTALL_HDR_PATH))'
1081 @echo '' 1081 @echo ''
1082 @echo 'Static analysers' 1082 @echo 'Static analysers'
1083 @echo ' checkstack - Generate a list of stack hogs' 1083 @echo ' checkstack - Generate a list of stack hogs'
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/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/drivers/block/cciss.c b/drivers/block/cciss.c
index 7b0eca703a67..2cd3391ff878 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -48,14 +48,14 @@
48#include <linux/completion.h> 48#include <linux/completion.h>
49 49
50#define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) 50#define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
51#define DRIVER_NAME "HP CISS Driver (v 2.6.10)" 51#define DRIVER_NAME "HP CISS Driver (v 3.6.10)"
52#define DRIVER_VERSION CCISS_DRIVER_VERSION(2,6,10) 52#define DRIVER_VERSION CCISS_DRIVER_VERSION(3,6,10)
53 53
54/* Embedded module documentation macros - see modules.h */ 54/* Embedded module documentation macros - see modules.h */
55MODULE_AUTHOR("Hewlett-Packard Company"); 55MODULE_AUTHOR("Hewlett-Packard Company");
56MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 2.6.10"); 56MODULE_DESCRIPTION("Driver for HP Controller SA5xxx SA6xxx version 3.6.10");
57MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400" 57MODULE_SUPPORTED_DEVICE("HP SA5i SA5i+ SA532 SA5300 SA5312 SA641 SA642 SA6400"
58 " SA6i P600 P800 P400 P400i E200 E200i"); 58 " SA6i P600 P800 P400 P400i E200 E200i E500");
59MODULE_LICENSE("GPL"); 59MODULE_LICENSE("GPL");
60 60
61#include "cciss_cmd.h" 61#include "cciss_cmd.h"
@@ -82,6 +82,7 @@ static const struct pci_device_id cciss_pci_device_id[] = {
82 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3213}, 82 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3213},
83 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3214}, 83 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3214},
84 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215}, 84 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSD, 0x103C, 0x3215},
85 {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3233},
85 {0,} 86 {0,}
86}; 87};
87 88
@@ -110,6 +111,7 @@ static struct board_type products[] = {
110 {0x3213103C, "Smart Array E200i", &SA5_access}, 111 {0x3213103C, "Smart Array E200i", &SA5_access},
111 {0x3214103C, "Smart Array E200i", &SA5_access}, 112 {0x3214103C, "Smart Array E200i", &SA5_access},
112 {0x3215103C, "Smart Array E200i", &SA5_access}, 113 {0x3215103C, "Smart Array E200i", &SA5_access},
114 {0x3233103C, "Smart Array E500", &SA5_access},
113}; 115};
114 116
115/* How long to wait (in milliseconds) for board to go into simple mode */ 117/* How long to wait (in milliseconds) for board to go into simple mode */
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index ca2f538e549e..613d67f1c7f0 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -668,6 +668,7 @@ int khvcd(void *unused)
668 do { 668 do {
669 poll_mask = 0; 669 poll_mask = 0;
670 hvc_kicked = 0; 670 hvc_kicked = 0;
671 try_to_freeze();
671 wmb(); 672 wmb();
672 if (cpus_empty(cpus_in_xmon)) { 673 if (cpus_empty(cpus_in_xmon)) {
673 spin_lock(&hvc_structs_lock); 674 spin_lock(&hvc_structs_lock);
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index f57eba0bf253..abca98beac14 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -402,10 +402,10 @@ static void handle_flags(struct smi_info *smi_info)
402 smi_info->curr_msg->data, 402 smi_info->curr_msg->data,
403 smi_info->curr_msg->data_size); 403 smi_info->curr_msg->data_size);
404 smi_info->si_state = SI_GETTING_EVENTS; 404 smi_info->si_state = SI_GETTING_EVENTS;
405 } else if (smi_info->msg_flags & OEM_DATA_AVAIL) { 405 } else if (smi_info->msg_flags & OEM_DATA_AVAIL &&
406 if (smi_info->oem_data_avail_handler) 406 smi_info->oem_data_avail_handler) {
407 if (smi_info->oem_data_avail_handler(smi_info)) 407 if (smi_info->oem_data_avail_handler(smi_info))
408 goto retry; 408 goto retry;
409 } else { 409 } else {
410 smi_info->si_state = SI_NORMAL; 410 smi_info->si_state = SI_NORMAL;
411 } 411 }
@@ -2481,6 +2481,7 @@ static __devinit int init_ipmi_si(void)
2481#ifdef CONFIG_PCI 2481#ifdef CONFIG_PCI
2482 pci_unregister_driver(&ipmi_pci_driver); 2482 pci_unregister_driver(&ipmi_pci_driver);
2483#endif 2483#endif
2484 driver_unregister(&ipmi_driver);
2484 printk("ipmi_si: Unable to find any System Interface(s)\n"); 2485 printk("ipmi_si: Unable to find any System Interface(s)\n");
2485 return -ENODEV; 2486 return -ENODEV;
2486 } else { 2487 } else {
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 351dab2fcacf..d419e4bb54f4 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -730,7 +730,7 @@ static unsigned int __devinit ata66_ali15x3 (ide_hwif_t *hwif)
730 730
731 if(m5229_revision <= 0x20) 731 if(m5229_revision <= 0x20)
732 tmpbyte = (tmpbyte & (~0x02)) | 0x01; 732 tmpbyte = (tmpbyte & (~0x02)) | 0x01;
733 else if (m5229_revision == 0xc7) 733 else if (m5229_revision == 0xc7 || m5229_revision == 0xc8)
734 tmpbyte |= 0x03; 734 tmpbyte |= 0x03;
735 else 735 else
736 tmpbyte |= 0x01; 736 tmpbyte |= 0x01;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index d6f99d5720fc..5d625a81193f 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -49,7 +49,7 @@ MODULE_DESCRIPTION("Generic RDMA CM Agent");
49MODULE_LICENSE("Dual BSD/GPL"); 49MODULE_LICENSE("Dual BSD/GPL");
50 50
51#define CMA_CM_RESPONSE_TIMEOUT 20 51#define CMA_CM_RESPONSE_TIMEOUT 20
52#define CMA_MAX_CM_RETRIES 3 52#define CMA_MAX_CM_RETRIES 15
53 53
54static void cma_add_one(struct ib_device *device); 54static void cma_add_one(struct ib_device *device);
55static void cma_remove_one(struct ib_device *device); 55static void cma_remove_one(struct ib_device *device);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index b5e6a7be603d..ec356ce7cdcd 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -326,6 +326,7 @@ ipoib_mcast_sendonly_join_complete(int status,
326 326
327 /* Clear the busy flag so we try again */ 327 /* Clear the busy flag so we try again */
328 clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags); 328 clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);
329 mcast->query = NULL;
329 } 330 }
330 331
331 complete(&mcast->done); 332 complete(&mcast->done);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 8257d5a2c8f8..fd8344cdc0db 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -799,13 +799,6 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
799 spin_unlock_irqrestore(target->scsi_host->host_lock, flags); 799 spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
800} 800}
801 801
802static void srp_reconnect_work(void *target_ptr)
803{
804 struct srp_target_port *target = target_ptr;
805
806 srp_reconnect_target(target);
807}
808
809static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc) 802static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
810{ 803{
811 struct srp_iu *iu; 804 struct srp_iu *iu;
@@ -858,7 +851,6 @@ static void srp_completion(struct ib_cq *cq, void *target_ptr)
858{ 851{
859 struct srp_target_port *target = target_ptr; 852 struct srp_target_port *target = target_ptr;
860 struct ib_wc wc; 853 struct ib_wc wc;
861 unsigned long flags;
862 854
863 ib_req_notify_cq(cq, IB_CQ_NEXT_COMP); 855 ib_req_notify_cq(cq, IB_CQ_NEXT_COMP);
864 while (ib_poll_cq(cq, 1, &wc) > 0) { 856 while (ib_poll_cq(cq, 1, &wc) > 0) {
@@ -866,10 +858,6 @@ static void srp_completion(struct ib_cq *cq, void *target_ptr)
866 printk(KERN_ERR PFX "failed %s status %d\n", 858 printk(KERN_ERR PFX "failed %s status %d\n",
867 wc.wr_id & SRP_OP_RECV ? "receive" : "send", 859 wc.wr_id & SRP_OP_RECV ? "receive" : "send",
868 wc.status); 860 wc.status);
869 spin_lock_irqsave(target->scsi_host->host_lock, flags);
870 if (target->state == SRP_TARGET_LIVE)
871 schedule_work(&target->work);
872 spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
873 break; 861 break;
874 } 862 }
875 863
@@ -1705,8 +1693,6 @@ static ssize_t srp_create_target(struct class_device *class_dev,
1705 target->scsi_host = target_host; 1693 target->scsi_host = target_host;
1706 target->srp_host = host; 1694 target->srp_host = host;
1707 1695
1708 INIT_WORK(&target->work, srp_reconnect_work, target);
1709
1710 INIT_LIST_HEAD(&target->free_reqs); 1696 INIT_LIST_HEAD(&target->free_reqs);
1711 INIT_LIST_HEAD(&target->req_queue); 1697 INIT_LIST_HEAD(&target->req_queue);
1712 for (i = 0; i < SRP_SQ_SIZE; ++i) { 1698 for (i = 0; i < SRP_SQ_SIZE; ++i) {
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c8cbc00243fe..0a54d003ef34 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -1204,7 +1204,7 @@ static int nand_write_oob_syndrome(struct mtd_info *mtd,
1204 pos = steps * (eccsize + chunk); 1204 pos = steps * (eccsize + chunk);
1205 steps = 0; 1205 steps = 0;
1206 } else 1206 } else
1207 pos = eccsize + chunk; 1207 pos = eccsize;
1208 1208
1209 chip->cmdfunc(mtd, NAND_CMD_SEQIN, pos, page); 1209 chip->cmdfunc(mtd, NAND_CMD_SEQIN, pos, page);
1210 for (i = 0; i < steps; i++) { 1210 for (i = 0; i < steps; i++) {
@@ -1567,7 +1567,7 @@ static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,
1567 bytes = min_t(size_t, len, free->length); 1567 bytes = min_t(size_t, len, free->length);
1568 boffs = free->offset; 1568 boffs = free->offset;
1569 } 1569 }
1570 memcpy(chip->oob_poi + woffs, oob, bytes); 1570 memcpy(chip->oob_poi + boffs, oob, bytes);
1571 oob += bytes; 1571 oob += bytes;
1572 } 1572 }
1573 return oob; 1573 return oob;
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 73dd6c8deede..427b73a3886a 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1256,10 +1256,15 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
1256 swap_buf_le16(id, ATA_ID_WORDS); 1256 swap_buf_le16(id, ATA_ID_WORDS);
1257 1257
1258 /* sanity check */ 1258 /* sanity check */
1259 if ((class == ATA_DEV_ATA) != (ata_id_is_ata(id) | ata_id_is_cfa(id))) { 1259 rc = -EINVAL;
1260 rc = -EINVAL; 1260 reason = "device reports illegal type";
1261 reason = "device reports illegal type"; 1261
1262 goto err_out; 1262 if (class == ATA_DEV_ATA) {
1263 if (!ata_id_is_ata(id) && !ata_id_is_cfa(id))
1264 goto err_out;
1265 } else {
1266 if (ata_id_is_ata(id))
1267 goto err_out;
1263 } 1268 }
1264 1269
1265 if (post_reset && class == ATA_DEV_ATA) { 1270 if (post_reset && class == ATA_DEV_ATA) {
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a8ed5a22009d..3d355d054612 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -466,7 +466,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
466 struct scsi_device *sdev = scmd->device; 466 struct scsi_device *sdev = scmd->device;
467 struct Scsi_Host *shost = sdev->host; 467 struct Scsi_Host *shost = sdev->host;
468 int old_result = scmd->result; 468 int old_result = scmd->result;
469 DECLARE_COMPLETION(done); 469 DECLARE_COMPLETION_ONSTACK(done);
470 unsigned long timeleft; 470 unsigned long timeleft;
471 unsigned long flags; 471 unsigned long flags;
472 unsigned char old_cmnd[MAX_COMMAND_SIZE]; 472 unsigned char old_cmnd[MAX_COMMAND_SIZE];
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 681dea8f9532..ca5bfb6914d2 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -251,6 +251,44 @@ static struct super_operations ext2_sops = {
251#endif 251#endif
252}; 252};
253 253
254static struct dentry *ext2_get_dentry(struct super_block *sb, void *vobjp)
255{
256 __u32 *objp = vobjp;
257 unsigned long ino = objp[0];
258 __u32 generation = objp[1];
259 struct inode *inode;
260 struct dentry *result;
261
262 if (ino < EXT2_FIRST_INO(sb) && ino != EXT2_ROOT_INO)
263 return ERR_PTR(-ESTALE);
264 if (ino > le32_to_cpu(EXT2_SB(sb)->s_es->s_inodes_count))
265 return ERR_PTR(-ESTALE);
266
267 /* iget isn't really right if the inode is currently unallocated!!
268 * ext2_read_inode currently does appropriate checks, but
269 * it might be "neater" to call ext2_get_inode first and check
270 * if the inode is valid.....
271 */
272 inode = iget(sb, ino);
273 if (inode == NULL)
274 return ERR_PTR(-ENOMEM);
275 if (is_bad_inode(inode) ||
276 (generation && inode->i_generation != generation)) {
277 /* we didn't find the right inode.. */
278 iput(inode);
279 return ERR_PTR(-ESTALE);
280 }
281 /* now to find a dentry.
282 * If possible, get a well-connected one
283 */
284 result = d_alloc_anon(inode);
285 if (!result) {
286 iput(inode);
287 return ERR_PTR(-ENOMEM);
288 }
289 return result;
290}
291
254/* Yes, most of these are left as NULL!! 292/* Yes, most of these are left as NULL!!
255 * A NULL value implies the default, which works with ext2-like file 293 * A NULL value implies the default, which works with ext2-like file
256 * systems, but can be improved upon. 294 * systems, but can be improved upon.
@@ -258,6 +296,7 @@ static struct super_operations ext2_sops = {
258 */ 296 */
259static struct export_operations ext2_export_ops = { 297static struct export_operations ext2_export_ops = {
260 .get_parent = ext2_get_parent, 298 .get_parent = ext2_get_parent,
299 .get_dentry = ext2_get_dentry,
261}; 300};
262 301
263static unsigned long get_sb_block(void **data) 302static unsigned long get_sb_block(void **data)
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 0f0b1eadb98d..84be02e93652 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -925,7 +925,7 @@ int ext3_get_blocks_handle(handle_t *handle, struct inode *inode,
925 set_buffer_new(bh_result); 925 set_buffer_new(bh_result);
926got_it: 926got_it:
927 map_bh(bh_result, inode->i_sb, le32_to_cpu(chain[depth-1].key)); 927 map_bh(bh_result, inode->i_sb, le32_to_cpu(chain[depth-1].key));
928 if (blocks_to_boundary == 0) 928 if (count > blocks_to_boundary)
929 set_buffer_boundary(bh_result); 929 set_buffer_boundary(bh_result);
930 err = count; 930 err = count;
931 /* Clean up and exit */ 931 /* Clean up and exit */
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 813d589cc6c0..3559086eee5f 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -554,6 +554,47 @@ static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs)
554 return 0; 554 return 0;
555} 555}
556 556
557
558static struct dentry *ext3_get_dentry(struct super_block *sb, void *vobjp)
559{
560 __u32 *objp = vobjp;
561 unsigned long ino = objp[0];
562 __u32 generation = objp[1];
563 struct inode *inode;
564 struct dentry *result;
565
566 if (ino < EXT3_FIRST_INO(sb) && ino != EXT3_ROOT_INO)
567 return ERR_PTR(-ESTALE);
568 if (ino > le32_to_cpu(EXT3_SB(sb)->s_es->s_inodes_count))
569 return ERR_PTR(-ESTALE);
570
571 /* iget isn't really right if the inode is currently unallocated!!
572 *
573 * ext3_read_inode will return a bad_inode if the inode had been
574 * deleted, so we should be safe.
575 *
576 * Currently we don't know the generation for parent directory, so
577 * a generation of 0 means "accept any"
578 */
579 inode = iget(sb, ino);
580 if (inode == NULL)
581 return ERR_PTR(-ENOMEM);
582 if (is_bad_inode(inode) ||
583 (generation && inode->i_generation != generation)) {
584 iput(inode);
585 return ERR_PTR(-ESTALE);
586 }
587 /* now to find a dentry.
588 * If possible, get a well-connected one
589 */
590 result = d_alloc_anon(inode);
591 if (!result) {
592 iput(inode);
593 return ERR_PTR(-ENOMEM);
594 }
595 return result;
596}
597
557#ifdef CONFIG_QUOTA 598#ifdef CONFIG_QUOTA
558#define QTYPE2NAME(t) ((t)==USRQUOTA?"user":"group") 599#define QTYPE2NAME(t) ((t)==USRQUOTA?"user":"group")
559#define QTYPE2MOPT(on, t) ((t)==USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA)) 600#define QTYPE2MOPT(on, t) ((t)==USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA))
@@ -622,6 +663,7 @@ static struct super_operations ext3_sops = {
622 663
623static struct export_operations ext3_export_ops = { 664static struct export_operations ext3_export_ops = {
624 .get_parent = ext3_get_parent, 665 .get_parent = ext3_get_parent,
666 .get_dentry = ext3_get_dentry,
625}; 667};
626 668
627enum { 669enum {
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index c19bd476e8ec..e52cef526d90 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -252,6 +252,11 @@ int jffs2_sum_add_kvec(struct jffs2_sb_info *c, const struct kvec *invecs,
252 union jffs2_node_union *node; 252 union jffs2_node_union *node;
253 struct jffs2_eraseblock *jeb; 253 struct jffs2_eraseblock *jeb;
254 254
255 if (c->summary->sum_size == JFFS2_SUMMARY_NOSUM_SIZE) {
256 dbg_summary("Summary is disabled for this jeb! Skipping summary info!\n");
257 return 0;
258 }
259
255 node = invecs[0].iov_base; 260 node = invecs[0].iov_base;
256 jeb = &c->blocks[ofs / c->sector_size]; 261 jeb = &c->blocks[ofs / c->sector_size];
257 ofs -= jeb->offset; 262 ofs -= jeb->offset;
diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild
index e57fd57538b8..2b06b3bad5ff 100644
--- a/include/asm-alpha/Kbuild
+++ b/include/asm-alpha/Kbuild
@@ -1,5 +1,5 @@
1include include/asm-generic/Kbuild.asm 1include include/asm-generic/Kbuild.asm
2 2
3unifdef-y += console.h fpu.h sysinfo.h 3unifdef-y += console.h fpu.h sysinfo.h compiler.h
4 4
5header-y += gentrap.h regdef.h pal.h reg.h 5header-y += gentrap.h regdef.h pal.h reg.h
diff --git a/include/asm-alpha/compiler.h b/include/asm-alpha/compiler.h
index 00c6f57ad9a7..d2768cc3d7a4 100644
--- a/include/asm-alpha/compiler.h
+++ b/include/asm-alpha/compiler.h
@@ -90,6 +90,7 @@
90 __asm__("stw %1,%0" : "=m"(mem) : "r"(val)) 90 __asm__("stw %1,%0" : "=m"(mem) : "r"(val))
91#endif 91#endif
92 92
93#ifdef __KERNEL__
93/* Some idiots over in <linux/compiler.h> thought inline should imply 94/* Some idiots over in <linux/compiler.h> thought inline should imply
94 always_inline. This breaks stuff. We'll include this file whenever 95 always_inline. This breaks stuff. We'll include this file whenever
95 we run into such problems. */ 96 we run into such problems. */
@@ -101,4 +102,6 @@
101#undef __always_inline 102#undef __always_inline
102#define __always_inline inline __attribute__((always_inline)) 103#define __always_inline inline __attribute__((always_inline))
103 104
105#endif /* __KERNEL__ */
106
104#endif /* __ALPHA_COMPILER_H */ 107#endif /* __ALPHA_COMPILER_H */
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h
index 8c7cd50d4eae..d2bed3cb33ff 100644
--- a/include/asm-alpha/page.h
+++ b/include/asm-alpha/page.h
@@ -1,6 +1,8 @@
1#ifndef _ALPHA_PAGE_H 1#ifndef _ALPHA_PAGE_H
2#define _ALPHA_PAGE_H 2#define _ALPHA_PAGE_H
3 3
4#ifdef __KERNEL__
5
4#include <asm/pal.h> 6#include <asm/pal.h>
5 7
6/* PAGE_SHIFT determines the page size */ 8/* PAGE_SHIFT determines the page size */
@@ -8,8 +10,6 @@
8#define PAGE_SIZE (1UL << PAGE_SHIFT) 10#define PAGE_SIZE (1UL << PAGE_SHIFT)
9#define PAGE_MASK (~(PAGE_SIZE-1)) 11#define PAGE_MASK (~(PAGE_SIZE-1))
10 12
11#ifdef __KERNEL__
12
13#ifndef __ASSEMBLY__ 13#ifndef __ASSEMBLY__
14 14
15#define STRICT_MM_TYPECHECKS 15#define STRICT_MM_TYPECHECKS
@@ -92,9 +92,9 @@ typedef unsigned long pgprot_t;
92 92
93#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ 93#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
94 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 94 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
95#endif /* __KERNEL__ */
96 95
97#include <asm-generic/memory_model.h> 96#include <asm-generic/memory_model.h>
98#include <asm-generic/page.h> 97#include <asm-generic/page.h>
99 98
99#endif /* __KERNEL__ */
100#endif /* _ALPHA_PAGE_H */ 100#endif /* _ALPHA_PAGE_H */
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 6b16dda18115..c00de6028fa8 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -2,7 +2,7 @@ unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h \
2 ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \ 2 ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h \
3 posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \ 3 posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h \
4 sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h \ 4 sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h \
5 statfs.h termbits.h termios.h timex.h types.h unistd.h user.h 5 statfs.h termbits.h termios.h types.h unistd.h user.h
6 6
7# These probably shouldn't be exported 7# These probably shouldn't be exported
8unifdef-y += elf.h page.h 8unifdef-y += elf.h page.h
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
index 335b2fa4e066..2308190321da 100644
--- a/include/asm-i386/Kbuild
+++ b/include/asm-i386/Kbuild
@@ -1,5 +1,5 @@
1include include/asm-generic/Kbuild.asm 1include include/asm-generic/Kbuild.asm
2 2
3header-y += boot.h debugreg.h ldt.h setup.h ucontext.h 3header-y += boot.h debugreg.h ldt.h ucontext.h
4 4
5unifdef-y += mtrr.h vm86.h 5unifdef-y += mtrr.h setup.h vm86.h
diff --git a/include/asm-i386/elf.h b/include/asm-i386/elf.h
index 1eac92cb5b16..db4344d9f73f 100644
--- a/include/asm-i386/elf.h
+++ b/include/asm-i386/elf.h
@@ -7,10 +7,7 @@
7 7
8#include <asm/ptrace.h> 8#include <asm/ptrace.h>
9#include <asm/user.h> 9#include <asm/user.h>
10#include <asm/processor.h>
11#include <asm/system.h> /* for savesegment */
12#include <asm/auxvec.h> 10#include <asm/auxvec.h>
13#include <asm/desc.h>
14 11
15#include <linux/utsname.h> 12#include <linux/utsname.h>
16 13
@@ -48,6 +45,12 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
48#define ELF_DATA ELFDATA2LSB 45#define ELF_DATA ELFDATA2LSB
49#define ELF_ARCH EM_386 46#define ELF_ARCH EM_386
50 47
48#ifdef __KERNEL__
49
50#include <asm/processor.h>
51#include <asm/system.h> /* for savesegment */
52#include <asm/desc.h>
53
51/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx 54/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx
52 contains a pointer to a function which might be registered using `atexit'. 55 contains a pointer to a function which might be registered using `atexit'.
53 This provides a mean for the dynamic linker to call DT_FINI functions for 56 This provides a mean for the dynamic linker to call DT_FINI functions for
@@ -111,7 +114,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
111 114
112#define ELF_PLATFORM (system_utsname.machine) 115#define ELF_PLATFORM (system_utsname.machine)
113 116
114#ifdef __KERNEL__
115#define SET_PERSONALITY(ex, ibcs2) do { } while (0) 117#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
116 118
117/* 119/*
diff --git a/include/asm-i386/setup.h b/include/asm-i386/setup.h
index f737e423029e..2734909eff84 100644
--- a/include/asm-i386/setup.h
+++ b/include/asm-i386/setup.h
@@ -6,6 +6,7 @@
6#ifndef _i386_SETUP_H 6#ifndef _i386_SETUP_H
7#define _i386_SETUP_H 7#define _i386_SETUP_H
8 8
9#ifdef __KERNEL__
9#include <linux/pfn.h> 10#include <linux/pfn.h>
10 11
11/* 12/*
@@ -13,6 +14,7 @@
13 */ 14 */
14#define MAXMEM_PFN PFN_DOWN(MAXMEM) 15#define MAXMEM_PFN PFN_DOWN(MAXMEM)
15#define MAX_NONPAE_PFN (1 << 20) 16#define MAX_NONPAE_PFN (1 << 20)
17#endif
16 18
17#define PARAM_SIZE 4096 19#define PARAM_SIZE 4096
18#define COMMAND_LINE_SIZE 256 20#define COMMAND_LINE_SIZE 256
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h
index 3824a502351f..c3e8adec5918 100644
--- a/include/asm-i386/signal.h
+++ b/include/asm-i386/signal.h
@@ -2,7 +2,6 @@
2#define _ASMi386_SIGNAL_H 2#define _ASMi386_SIGNAL_H
3 3
4#include <linux/types.h> 4#include <linux/types.h>
5#include <linux/linkage.h>
6#include <linux/time.h> 5#include <linux/time.h>
7#include <linux/compiler.h> 6#include <linux/compiler.h>
8 7
@@ -10,6 +9,9 @@
10struct siginfo; 9struct siginfo;
11 10
12#ifdef __KERNEL__ 11#ifdef __KERNEL__
12
13#include <linux/linkage.h>
14
13/* Most things should be clean enough to redefine this at will, if care 15/* Most things should be clean enough to redefine this at will, if care
14 is taken to make libc match. */ 16 is taken to make libc match. */
15 17
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index d983b74e4d9f..fc1c8ddae149 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -324,6 +324,8 @@
324#define __NR_vmsplice 316 324#define __NR_vmsplice 316
325#define __NR_move_pages 317 325#define __NR_move_pages 317
326 326
327#ifdef __KERNEL__
328
327#define NR_syscalls 318 329#define NR_syscalls 318
328 330
329/* 331/*
@@ -423,8 +425,6 @@ __asm__ volatile ("push %%ebp ; push %%ebx ; movl 4(%2),%%ebp ; " \
423__syscall_return(type,__res); \ 425__syscall_return(type,__res); \
424} 426}
425 427
426#ifdef __KERNEL__
427
428#define __ARCH_WANT_IPC_PARSE_VERSION 428#define __ARCH_WANT_IPC_PARSE_VERSION
429#define __ARCH_WANT_OLD_READDIR 429#define __ARCH_WANT_OLD_READDIR
430#define __ARCH_WANT_OLD_STAT 430#define __ARCH_WANT_OLD_STAT
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
index 85d6f8005eb4..f1cb00f39c22 100644
--- a/include/asm-ia64/Kbuild
+++ b/include/asm-ia64/Kbuild
@@ -4,4 +4,4 @@ header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h \
4 intel_intrin.h intrinsics.h perfmon_default_smpl.h \ 4 intel_intrin.h intrinsics.h perfmon_default_smpl.h \
5 ptrace_offsets.h rse.h setup.h ucontext.h 5 ptrace_offsets.h rse.h setup.h ucontext.h
6 6
7unifdef-y += perfmon.h 7unifdef-y += perfmon.h ustack.h
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index f5a949ec6e1e..947cb72b520e 100644
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -7,6 +7,7 @@
7 * David Mosberger-Tang <davidm@hpl.hp.com> 7 * David Mosberger-Tang <davidm@hpl.hp.com>
8 */ 8 */
9 9
10# ifdef __KERNEL__
10 11
11#include <asm/intrinsics.h> 12#include <asm/intrinsics.h>
12#include <asm/types.h> 13#include <asm/types.h>
@@ -64,7 +65,6 @@
64# define __pa(x) ((x) - PAGE_OFFSET) 65# define __pa(x) ((x) - PAGE_OFFSET)
65# define __va(x) ((x) + PAGE_OFFSET) 66# define __va(x) ((x) + PAGE_OFFSET)
66#else /* !__ASSEMBLY */ 67#else /* !__ASSEMBLY */
67# ifdef __KERNEL__
68# define STRICT_MM_TYPECHECKS 68# define STRICT_MM_TYPECHECKS
69 69
70extern void clear_page (void *page); 70extern void clear_page (void *page);
@@ -174,7 +174,6 @@ get_order (unsigned long size)
174 return order; 174 return order;
175} 175}
176 176
177# endif /* __KERNEL__ */
178#endif /* !__ASSEMBLY__ */ 177#endif /* !__ASSEMBLY__ */
179 178
180#ifdef STRICT_MM_TYPECHECKS 179#ifdef STRICT_MM_TYPECHECKS
@@ -228,4 +227,5 @@ get_order (unsigned long size)
228 (((current->personality & READ_IMPLIES_EXEC) != 0) \ 227 (((current->personality & READ_IMPLIES_EXEC) != 0) \
229 ? VM_EXEC : 0)) 228 ? VM_EXEC : 0))
230 229
230# endif /* __KERNEL__ */
231#endif /* _ASM_IA64_PAGE_H */ 231#endif /* _ASM_IA64_PAGE_H */
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h
index 415abb23b210..1414316efd40 100644
--- a/include/asm-ia64/ptrace.h
+++ b/include/asm-ia64/ptrace.h
@@ -56,6 +56,8 @@
56 56
57 57
58#include <asm/fpu.h> 58#include <asm/fpu.h>
59
60#ifdef __KERNEL__
59#ifndef ASM_OFFSETS_C 61#ifndef ASM_OFFSETS_C
60#include <asm/asm-offsets.h> 62#include <asm/asm-offsets.h>
61#endif 63#endif
@@ -79,10 +81,9 @@
79 81
80#define KERNEL_STACK_SIZE IA64_STK_OFFSET 82#define KERNEL_STACK_SIZE IA64_STK_OFFSET
81 83
82#ifndef __ASSEMBLY__ 84#endif /* __KERNEL__ */
83 85
84#include <asm/current.h> 86#ifndef __ASSEMBLY__
85#include <asm/page.h>
86 87
87/* 88/*
88 * This struct defines the way the registers are saved on system 89 * This struct defines the way the registers are saved on system
@@ -229,6 +230,9 @@ struct switch_stack {
229 230
230#ifdef __KERNEL__ 231#ifdef __KERNEL__
231 232
233#include <asm/current.h>
234#include <asm/page.h>
235
232#define __ARCH_SYS_PTRACE 1 236#define __ARCH_SYS_PTRACE 1
233 237
234/* 238/*
diff --git a/include/asm-ia64/ustack.h b/include/asm-ia64/ustack.h
index da55c91246e3..a349467913ea 100644
--- a/include/asm-ia64/ustack.h
+++ b/include/asm-ia64/ustack.h
@@ -5,12 +5,15 @@
5 * Constants for the user stack size 5 * Constants for the user stack size
6 */ 6 */
7 7
8#ifdef __KERNEL__
8#include <asm/page.h> 9#include <asm/page.h>
9 10
10/* The absolute hard limit for stack size is 1/2 of the mappable space in the region */ 11/* The absolute hard limit for stack size is 1/2 of the mappable space in the region */
11#define MAX_USER_STACK_SIZE (RGN_MAP_LIMIT/2) 12#define MAX_USER_STACK_SIZE (RGN_MAP_LIMIT/2)
12/* Make a default stack size of 2GB */
13#define DEFAULT_USER_STACK_SIZE (1UL << 31)
14#define STACK_TOP (0x6000000000000000UL + RGN_MAP_LIMIT) 13#define STACK_TOP (0x6000000000000000UL + RGN_MAP_LIMIT)
14#endif
15
16/* Make a default stack size of 2GiB */
17#define DEFAULT_USER_STACK_SIZE (1UL << 31)
15 18
16#endif /* _ASM_IA64_USTACK_H */ 19#endif /* _ASM_IA64_USTACK_H */
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index 6ed1151a05a3..219d359861f3 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -14,8 +14,6 @@
14 14
15#include <spaces.h> 15#include <spaces.h>
16 16
17#endif
18
19/* 17/*
20 * PAGE_SHIFT determines the page size 18 * PAGE_SHIFT determines the page size
21 */ 19 */
@@ -34,8 +32,6 @@
34#define PAGE_SIZE (1UL << PAGE_SHIFT) 32#define PAGE_SIZE (1UL << PAGE_SHIFT)
35#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) 33#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))
36 34
37
38#ifdef __KERNEL__
39#ifndef __ASSEMBLY__ 35#ifndef __ASSEMBLY__
40 36
41extern void clear_page(void * page); 37extern void clear_page(void * page);
@@ -168,8 +164,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
168#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE) 164#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
169#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET) 165#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
170 166
171#endif /* defined (__KERNEL__) */
172
173#ifdef CONFIG_LIMITED_DMA 167#ifdef CONFIG_LIMITED_DMA
174#define WANT_PAGE_VIRTUAL 168#define WANT_PAGE_VIRTUAL
175#endif 169#endif
@@ -177,4 +171,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
177#include <asm-generic/memory_model.h> 171#include <asm-generic/memory_model.h>
178#include <asm-generic/page.h> 172#include <asm-generic/page.h>
179 173
174#endif /* defined (__KERNEL__) */
175
180#endif /* _ASM_PAGE_H */ 176#endif /* _ASM_PAGE_H */
diff --git a/include/asm-powerpc/eeh.h b/include/asm-powerpc/eeh.h
index 4df3e80118f4..6a784396660b 100644
--- a/include/asm-powerpc/eeh.h
+++ b/include/asm-powerpc/eeh.h
@@ -205,6 +205,7 @@ static inline void eeh_memset_io(volatile void __iomem *addr, int c,
205 lc |= lc << 8; 205 lc |= lc << 8;
206 lc |= lc << 16; 206 lc |= lc << 16;
207 207
208 __asm__ __volatile__ ("sync" : : : "memory");
208 while(n && !EEH_CHECK_ALIGN(p, 4)) { 209 while(n && !EEH_CHECK_ALIGN(p, 4)) {
209 *((volatile u8 *)p) = c; 210 *((volatile u8 *)p) = c;
210 p++; 211 p++;
@@ -229,6 +230,7 @@ static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *sr
229 void *destsave = dest; 230 void *destsave = dest;
230 unsigned long nsave = n; 231 unsigned long nsave = n;
231 232
233 __asm__ __volatile__ ("sync" : : : "memory");
232 while(n && (!EEH_CHECK_ALIGN(vsrc, 4) || !EEH_CHECK_ALIGN(dest, 4))) { 234 while(n && (!EEH_CHECK_ALIGN(vsrc, 4) || !EEH_CHECK_ALIGN(dest, 4))) {
233 *((u8 *)dest) = *((volatile u8 *)vsrc); 235 *((u8 *)dest) = *((volatile u8 *)vsrc);
234 __asm__ __volatile__ ("eieio" : : : "memory"); 236 __asm__ __volatile__ ("eieio" : : : "memory");
@@ -266,6 +268,7 @@ static inline void eeh_memcpy_toio(volatile void __iomem *dest, const void *src,
266{ 268{
267 void *vdest = (void __force *) dest; 269 void *vdest = (void __force *) dest;
268 270
271 __asm__ __volatile__ ("sync" : : : "memory");
269 while(n && (!EEH_CHECK_ALIGN(vdest, 4) || !EEH_CHECK_ALIGN(src, 4))) { 272 while(n && (!EEH_CHECK_ALIGN(vdest, 4) || !EEH_CHECK_ALIGN(src, 4))) {
270 *((volatile u8 *)vdest) = *((u8 *)src); 273 *((volatile u8 *)vdest) = *((u8 *)src);
271 src++; 274 src++;
diff --git a/include/asm-powerpc/futex.h b/include/asm-powerpc/futex.h
index f1b3c00bc1ce..936422e54891 100644
--- a/include/asm-powerpc/futex.h
+++ b/include/asm-powerpc/futex.h
@@ -84,7 +84,33 @@ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
84static inline int 84static inline int
85futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) 85futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
86{ 86{
87 return -ENOSYS; 87 int prev;
88
89 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
90 return -EFAULT;
91
92 __asm__ __volatile__ (
93 LWSYNC_ON_SMP
94"1: lwarx %0,0,%2 # futex_atomic_cmpxchg_inatomic\n\
95 cmpw 0,%0,%3\n\
96 bne- 3f\n"
97 PPC405_ERR77(0,%2)
98"2: stwcx. %4,0,%2\n\
99 bne- 1b\n"
100 ISYNC_ON_SMP
101"3: .section .fixup,\"ax\"\n\
1024: li %0,%5\n\
103 b 3b\n\
104 .previous\n\
105 .section __ex_table,\"a\"\n\
106 .align 3\n\
107 " PPC_LONG "1b,4b,2b,4b\n\
108 .previous" \
109 : "=&r" (prev), "+m" (*uaddr)
110 : "r" (uaddr), "r" (oldval), "r" (newval), "i" (-EFAULT)
111 : "cc", "memory");
112
113 return prev;
88} 114}
89 115
90#endif /* __KERNEL__ */ 116#endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 36c4c34bf565..212428db0d8b 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -19,6 +19,7 @@ extern int check_legacy_ioport(unsigned long base_port);
19#include <linux/compiler.h> 19#include <linux/compiler.h>
20#include <asm/page.h> 20#include <asm/page.h>
21#include <asm/byteorder.h> 21#include <asm/byteorder.h>
22#include <asm/paca.h>
22#ifdef CONFIG_PPC_ISERIES 23#ifdef CONFIG_PPC_ISERIES
23#include <asm/iseries/iseries_io.h> 24#include <asm/iseries/iseries_io.h>
24#endif 25#endif
@@ -162,7 +163,11 @@ extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
162extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); 163extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);
163extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl); 164extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);
164 165
165#define mmiowb() 166static inline void mmiowb(void)
167{
168 __asm__ __volatile__ ("sync" : : : "memory");
169 get_paca()->io_sync = 0;
170}
166 171
167/* 172/*
168 * output pause versions need a delay at least for the 173 * output pause versions need a delay at least for the
@@ -278,22 +283,23 @@ static inline int in_8(const volatile unsigned char __iomem *addr)
278{ 283{
279 int ret; 284 int ret;
280 285
281 __asm__ __volatile__("lbz%U1%X1 %0,%1; twi 0,%0,0; isync" 286 __asm__ __volatile__("sync; lbz%U1%X1 %0,%1; twi 0,%0,0; isync"
282 : "=r" (ret) : "m" (*addr)); 287 : "=r" (ret) : "m" (*addr));
283 return ret; 288 return ret;
284} 289}
285 290
286static inline void out_8(volatile unsigned char __iomem *addr, int val) 291static inline void out_8(volatile unsigned char __iomem *addr, int val)
287{ 292{
288 __asm__ __volatile__("stb%U0%X0 %1,%0; sync" 293 __asm__ __volatile__("sync; stb%U0%X0 %1,%0"
289 : "=m" (*addr) : "r" (val)); 294 : "=m" (*addr) : "r" (val));
295 get_paca()->io_sync = 1;
290} 296}
291 297
292static inline int in_le16(const volatile unsigned short __iomem *addr) 298static inline int in_le16(const volatile unsigned short __iomem *addr)
293{ 299{
294 int ret; 300 int ret;
295 301
296 __asm__ __volatile__("lhbrx %0,0,%1; twi 0,%0,0; isync" 302 __asm__ __volatile__("sync; lhbrx %0,0,%1; twi 0,%0,0; isync"
297 : "=r" (ret) : "r" (addr), "m" (*addr)); 303 : "=r" (ret) : "r" (addr), "m" (*addr));
298 return ret; 304 return ret;
299} 305}
@@ -302,28 +308,30 @@ static inline int in_be16(const volatile unsigned short __iomem *addr)
302{ 308{
303 int ret; 309 int ret;
304 310
305 __asm__ __volatile__("lhz%U1%X1 %0,%1; twi 0,%0,0; isync" 311 __asm__ __volatile__("sync; lhz%U1%X1 %0,%1; twi 0,%0,0; isync"
306 : "=r" (ret) : "m" (*addr)); 312 : "=r" (ret) : "m" (*addr));
307 return ret; 313 return ret;
308} 314}
309 315
310static inline void out_le16(volatile unsigned short __iomem *addr, int val) 316static inline void out_le16(volatile unsigned short __iomem *addr, int val)
311{ 317{
312 __asm__ __volatile__("sthbrx %1,0,%2; sync" 318 __asm__ __volatile__("sync; sthbrx %1,0,%2"
313 : "=m" (*addr) : "r" (val), "r" (addr)); 319 : "=m" (*addr) : "r" (val), "r" (addr));
320 get_paca()->io_sync = 1;
314} 321}
315 322
316static inline void out_be16(volatile unsigned short __iomem *addr, int val) 323static inline void out_be16(volatile unsigned short __iomem *addr, int val)
317{ 324{
318 __asm__ __volatile__("sth%U0%X0 %1,%0; sync" 325 __asm__ __volatile__("sync; sth%U0%X0 %1,%0"
319 : "=m" (*addr) : "r" (val)); 326 : "=m" (*addr) : "r" (val));
327 get_paca()->io_sync = 1;
320} 328}
321 329
322static inline unsigned in_le32(const volatile unsigned __iomem *addr) 330static inline unsigned in_le32(const volatile unsigned __iomem *addr)
323{ 331{
324 unsigned ret; 332 unsigned ret;
325 333
326 __asm__ __volatile__("lwbrx %0,0,%1; twi 0,%0,0; isync" 334 __asm__ __volatile__("sync; lwbrx %0,0,%1; twi 0,%0,0; isync"
327 : "=r" (ret) : "r" (addr), "m" (*addr)); 335 : "=r" (ret) : "r" (addr), "m" (*addr));
328 return ret; 336 return ret;
329} 337}
@@ -332,21 +340,23 @@ static inline unsigned in_be32(const volatile unsigned __iomem *addr)
332{ 340{
333 unsigned ret; 341 unsigned ret;
334 342
335 __asm__ __volatile__("lwz%U1%X1 %0,%1; twi 0,%0,0; isync" 343 __asm__ __volatile__("sync; lwz%U1%X1 %0,%1; twi 0,%0,0; isync"
336 : "=r" (ret) : "m" (*addr)); 344 : "=r" (ret) : "m" (*addr));
337 return ret; 345 return ret;
338} 346}
339 347
340static inline void out_le32(volatile unsigned __iomem *addr, int val) 348static inline void out_le32(volatile unsigned __iomem *addr, int val)
341{ 349{
342 __asm__ __volatile__("stwbrx %1,0,%2; sync" : "=m" (*addr) 350 __asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr)
343 : "r" (val), "r" (addr)); 351 : "r" (val), "r" (addr));
352 get_paca()->io_sync = 1;
344} 353}
345 354
346static inline void out_be32(volatile unsigned __iomem *addr, int val) 355static inline void out_be32(volatile unsigned __iomem *addr, int val)
347{ 356{
348 __asm__ __volatile__("stw%U0%X0 %1,%0; sync" 357 __asm__ __volatile__("sync; stw%U0%X0 %1,%0"
349 : "=m" (*addr) : "r" (val)); 358 : "=m" (*addr) : "r" (val));
359 get_paca()->io_sync = 1;
350} 360}
351 361
352static inline unsigned long in_le64(const volatile unsigned long __iomem *addr) 362static inline unsigned long in_le64(const volatile unsigned long __iomem *addr)
@@ -354,6 +364,7 @@ static inline unsigned long in_le64(const volatile unsigned long __iomem *addr)
354 unsigned long tmp, ret; 364 unsigned long tmp, ret;
355 365
356 __asm__ __volatile__( 366 __asm__ __volatile__(
367 "sync\n"
357 "ld %1,0(%2)\n" 368 "ld %1,0(%2)\n"
358 "twi 0,%1,0\n" 369 "twi 0,%1,0\n"
359 "isync\n" 370 "isync\n"
@@ -372,7 +383,7 @@ static inline unsigned long in_be64(const volatile unsigned long __iomem *addr)
372{ 383{
373 unsigned long ret; 384 unsigned long ret;
374 385
375 __asm__ __volatile__("ld%U1%X1 %0,%1; twi 0,%0,0; isync" 386 __asm__ __volatile__("sync; ld%U1%X1 %0,%1; twi 0,%0,0; isync"
376 : "=r" (ret) : "m" (*addr)); 387 : "=r" (ret) : "m" (*addr));
377 return ret; 388 return ret;
378} 389}
@@ -389,14 +400,16 @@ static inline void out_le64(volatile unsigned long __iomem *addr, unsigned long
389 "rldicl %1,%1,32,0\n" 400 "rldicl %1,%1,32,0\n"
390 "rlwimi %0,%1,8,8,31\n" 401 "rlwimi %0,%1,8,8,31\n"
391 "rlwimi %0,%1,24,16,23\n" 402 "rlwimi %0,%1,24,16,23\n"
392 "std %0,0(%3)\n" 403 "sync\n"
393 "sync" 404 "std %0,0(%3)"
394 : "=&r" (tmp) , "=&r" (val) : "1" (val) , "b" (addr) , "m" (*addr)); 405 : "=&r" (tmp) , "=&r" (val) : "1" (val) , "b" (addr) , "m" (*addr));
406 get_paca()->io_sync = 1;
395} 407}
396 408
397static inline void out_be64(volatile unsigned long __iomem *addr, unsigned long val) 409static inline void out_be64(volatile unsigned long __iomem *addr, unsigned long val)
398{ 410{
399 __asm__ __volatile__("std%U0%X0 %1,%0; sync" : "=m" (*addr) : "r" (val)); 411 __asm__ __volatile__("sync; std%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
412 get_paca()->io_sync = 1;
400} 413}
401 414
402#ifndef CONFIG_PPC_ISERIES 415#ifndef CONFIG_PPC_ISERIES
diff --git a/include/asm-powerpc/kdump.h b/include/asm-powerpc/kdump.h
index dc1574c945f8..10e8eb1e6f4f 100644
--- a/include/asm-powerpc/kdump.h
+++ b/include/asm-powerpc/kdump.h
@@ -7,7 +7,7 @@
7/* How many bytes to reserve at zero for kdump. The reserve limit should 7/* How many bytes to reserve at zero for kdump. The reserve limit should
8 * be greater or equal to the trampoline's end address. 8 * be greater or equal to the trampoline's end address.
9 * Reserve to the end of the FWNMI area, see head_64.S */ 9 * Reserve to the end of the FWNMI area, see head_64.S */
10#define KDUMP_RESERVE_LIMIT 0x8000 10#define KDUMP_RESERVE_LIMIT 0x10000 /* 64K */
11 11
12#ifdef CONFIG_CRASH_DUMP 12#ifdef CONFIG_CRASH_DUMP
13 13
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index 2d4585f06209..3d5d590bc4b0 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -93,6 +93,7 @@ struct paca_struct {
93 u64 saved_r1; /* r1 save for RTAS calls */ 93 u64 saved_r1; /* r1 save for RTAS calls */
94 u64 saved_msr; /* MSR saved here by enter_rtas */ 94 u64 saved_msr; /* MSR saved here by enter_rtas */
95 u8 proc_enabled; /* irq soft-enable flag */ 95 u8 proc_enabled; /* irq soft-enable flag */
96 u8 io_sync; /* writel() needs spin_unlock sync */
96 97
97 /* Stuff for accurate time accounting */ 98 /* Stuff for accurate time accounting */
98 u64 user_time; /* accumulated usermode TB ticks */ 99 u64 user_time; /* accumulated usermode TB ticks */
diff --git a/include/asm-powerpc/spinlock.h b/include/asm-powerpc/spinlock.h
index 895cb6d3a42a..c31e4382a775 100644
--- a/include/asm-powerpc/spinlock.h
+++ b/include/asm-powerpc/spinlock.h
@@ -36,6 +36,19 @@
36#define LOCK_TOKEN 1 36#define LOCK_TOKEN 1
37#endif 37#endif
38 38
39#if defined(CONFIG_PPC64) && defined(CONFIG_SMP)
40#define CLEAR_IO_SYNC (get_paca()->io_sync = 0)
41#define SYNC_IO do { \
42 if (unlikely(get_paca()->io_sync)) { \
43 mb(); \
44 get_paca()->io_sync = 0; \
45 } \
46 } while (0)
47#else
48#define CLEAR_IO_SYNC
49#define SYNC_IO
50#endif
51
39/* 52/*
40 * This returns the old value in the lock, so we succeeded 53 * This returns the old value in the lock, so we succeeded
41 * in getting the lock if the return value is 0. 54 * in getting the lock if the return value is 0.
@@ -61,6 +74,7 @@ static __inline__ unsigned long __spin_trylock(raw_spinlock_t *lock)
61 74
62static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock) 75static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock)
63{ 76{
77 CLEAR_IO_SYNC;
64 return __spin_trylock(lock) == 0; 78 return __spin_trylock(lock) == 0;
65} 79}
66 80
@@ -91,6 +105,7 @@ extern void __rw_yield(raw_rwlock_t *lock);
91 105
92static void __inline__ __raw_spin_lock(raw_spinlock_t *lock) 106static void __inline__ __raw_spin_lock(raw_spinlock_t *lock)
93{ 107{
108 CLEAR_IO_SYNC;
94 while (1) { 109 while (1) {
95 if (likely(__spin_trylock(lock) == 0)) 110 if (likely(__spin_trylock(lock) == 0))
96 break; 111 break;
@@ -107,6 +122,7 @@ static void __inline__ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long
107{ 122{
108 unsigned long flags_dis; 123 unsigned long flags_dis;
109 124
125 CLEAR_IO_SYNC;
110 while (1) { 126 while (1) {
111 if (likely(__spin_trylock(lock) == 0)) 127 if (likely(__spin_trylock(lock) == 0))
112 break; 128 break;
@@ -124,6 +140,7 @@ static void __inline__ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long
124 140
125static __inline__ void __raw_spin_unlock(raw_spinlock_t *lock) 141static __inline__ void __raw_spin_unlock(raw_spinlock_t *lock)
126{ 142{
143 SYNC_IO;
127 __asm__ __volatile__("# __raw_spin_unlock\n\t" 144 __asm__ __volatile__("# __raw_spin_unlock\n\t"
128 LWSYNC_ON_SMP: : :"memory"); 145 LWSYNC_ON_SMP: : :"memory");
129 lock->slock = 0; 146 lock->slock = 0;
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 89c6f1bc3aab..680555be22ec 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -63,7 +63,7 @@ extern inline int in_8(const volatile unsigned char __iomem *addr)
63 int ret; 63 int ret;
64 64
65 __asm__ __volatile__( 65 __asm__ __volatile__(
66 "lbz%U1%X1 %0,%1;\n" 66 "sync; lbz%U1%X1 %0,%1;\n"
67 "twi 0,%0,0;\n" 67 "twi 0,%0,0;\n"
68 "isync" : "=r" (ret) : "m" (*addr)); 68 "isync" : "=r" (ret) : "m" (*addr));
69 return ret; 69 return ret;
@@ -78,7 +78,7 @@ extern inline int in_le16(const volatile unsigned short __iomem *addr)
78{ 78{
79 int ret; 79 int ret;
80 80
81 __asm__ __volatile__("lhbrx %0,0,%1;\n" 81 __asm__ __volatile__("sync; lhbrx %0,0,%1;\n"
82 "twi 0,%0,0;\n" 82 "twi 0,%0,0;\n"
83 "isync" : "=r" (ret) : 83 "isync" : "=r" (ret) :
84 "r" (addr), "m" (*addr)); 84 "r" (addr), "m" (*addr));
@@ -89,7 +89,7 @@ extern inline int in_be16(const volatile unsigned short __iomem *addr)
89{ 89{
90 int ret; 90 int ret;
91 91
92 __asm__ __volatile__("lhz%U1%X1 %0,%1;\n" 92 __asm__ __volatile__("sync; lhz%U1%X1 %0,%1;\n"
93 "twi 0,%0,0;\n" 93 "twi 0,%0,0;\n"
94 "isync" : "=r" (ret) : "m" (*addr)); 94 "isync" : "=r" (ret) : "m" (*addr));
95 return ret; 95 return ret;
@@ -97,20 +97,20 @@ extern inline int in_be16(const volatile unsigned short __iomem *addr)
97 97
98extern inline void out_le16(volatile unsigned short __iomem *addr, int val) 98extern inline void out_le16(volatile unsigned short __iomem *addr, int val)
99{ 99{
100 __asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) : 100 __asm__ __volatile__("sync; sthbrx %1,0,%2" : "=m" (*addr) :
101 "r" (val), "r" (addr)); 101 "r" (val), "r" (addr));
102} 102}
103 103
104extern inline void out_be16(volatile unsigned short __iomem *addr, int val) 104extern inline void out_be16(volatile unsigned short __iomem *addr, int val)
105{ 105{
106 __asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); 106 __asm__ __volatile__("sync; sth%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
107} 107}
108 108
109extern inline unsigned in_le32(const volatile unsigned __iomem *addr) 109extern inline unsigned in_le32(const volatile unsigned __iomem *addr)
110{ 110{
111 unsigned ret; 111 unsigned ret;
112 112
113 __asm__ __volatile__("lwbrx %0,0,%1;\n" 113 __asm__ __volatile__("sync; lwbrx %0,0,%1;\n"
114 "twi 0,%0,0;\n" 114 "twi 0,%0,0;\n"
115 "isync" : "=r" (ret) : 115 "isync" : "=r" (ret) :
116 "r" (addr), "m" (*addr)); 116 "r" (addr), "m" (*addr));
@@ -121,7 +121,7 @@ extern inline unsigned in_be32(const volatile unsigned __iomem *addr)
121{ 121{
122 unsigned ret; 122 unsigned ret;
123 123
124 __asm__ __volatile__("lwz%U1%X1 %0,%1;\n" 124 __asm__ __volatile__("sync; lwz%U1%X1 %0,%1;\n"
125 "twi 0,%0,0;\n" 125 "twi 0,%0,0;\n"
126 "isync" : "=r" (ret) : "m" (*addr)); 126 "isync" : "=r" (ret) : "m" (*addr));
127 return ret; 127 return ret;
@@ -129,13 +129,13 @@ extern inline unsigned in_be32(const volatile unsigned __iomem *addr)
129 129
130extern inline void out_le32(volatile unsigned __iomem *addr, int val) 130extern inline void out_le32(volatile unsigned __iomem *addr, int val)
131{ 131{
132 __asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) : 132 __asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr) :
133 "r" (val), "r" (addr)); 133 "r" (val), "r" (addr));
134} 134}
135 135
136extern inline void out_be32(volatile unsigned __iomem *addr, int val) 136extern inline void out_be32(volatile unsigned __iomem *addr, int val)
137{ 137{
138 __asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val)); 138 __asm__ __volatile__("sync; stw%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
139} 139}
140#if defined (CONFIG_8260_PCI9) 140#if defined (CONFIG_8260_PCI9)
141#define readb(addr) in_8((volatile u8 *)(addr)) 141#define readb(addr) in_8((volatile u8 *)(addr))
@@ -259,6 +259,7 @@ extern __inline__ unsigned int name(unsigned int port) \
259{ \ 259{ \
260 unsigned int x; \ 260 unsigned int x; \
261 __asm__ __volatile__( \ 261 __asm__ __volatile__( \
262 "sync\n" \
262 "0:" op " %0,0,%1\n" \ 263 "0:" op " %0,0,%1\n" \
263 "1: twi 0,%0,0\n" \ 264 "1: twi 0,%0,0\n" \
264 "2: isync\n" \ 265 "2: isync\n" \
@@ -284,6 +285,7 @@ extern __inline__ unsigned int name(unsigned int port) \
284extern __inline__ void name(unsigned int val, unsigned int port) \ 285extern __inline__ void name(unsigned int val, unsigned int port) \
285{ \ 286{ \
286 __asm__ __volatile__( \ 287 __asm__ __volatile__( \
288 "sync\n" \
287 "0:" op " %0,0,%1\n" \ 289 "0:" op " %0,0,%1\n" \
288 "1: sync\n" \ 290 "1: sync\n" \
289 "2:\n" \ 291 "2:\n" \
diff --git a/include/asm-s390/debug.h b/include/asm-s390/debug.h
index 7f1ef99fd1e1..c00dd2b3dc50 100644
--- a/include/asm-s390/debug.h
+++ b/include/asm-s390/debug.h
@@ -10,7 +10,6 @@
10#define DEBUG_H 10#define DEBUG_H
11 11
12#include <linux/fs.h> 12#include <linux/fs.h>
13#include <linux/string.h>
14 13
15/* Note: 14/* Note:
16 * struct __debug_entry must be defined outside of #ifdef __KERNEL__ 15 * struct __debug_entry must be defined outside of #ifdef __KERNEL__
@@ -35,6 +34,7 @@ struct __debug_entry{
35#define __DEBUG_FEATURE_VERSION 2 /* version of debug feature */ 34#define __DEBUG_FEATURE_VERSION 2 /* version of debug feature */
36 35
37#ifdef __KERNEL__ 36#ifdef __KERNEL__
37#include <linux/string.h>
38#include <linux/spinlock.h> 38#include <linux/spinlock.h>
39#include <linux/kernel.h> 39#include <linux/kernel.h>
40#include <linux/time.h> 40#include <linux/time.h>
diff --git a/include/asm-s390/elf.h b/include/asm-s390/elf.h
index 710646e64f7d..c0d629d61d3e 100644
--- a/include/asm-s390/elf.h
+++ b/include/asm-s390/elf.h
@@ -93,19 +93,6 @@
93#define R_390_NUM 61 93#define R_390_NUM 61
94 94
95/* 95/*
96 * ELF register definitions..
97 */
98
99#include <linux/sched.h> /* for task_struct */
100#include <asm/ptrace.h>
101#include <asm/user.h>
102#include <asm/system.h> /* for save_access_regs */
103
104
105typedef s390_fp_regs elf_fpregset_t;
106typedef s390_regs elf_gregset_t;
107
108/*
109 * These are used to set parameters in the core dumps. 96 * These are used to set parameters in the core dumps.
110 */ 97 */
111#ifndef __s390x__ 98#ifndef __s390x__
@@ -117,6 +104,20 @@ typedef s390_regs elf_gregset_t;
117#define ELF_ARCH EM_S390 104#define ELF_ARCH EM_S390
118 105
119/* 106/*
107 * ELF register definitions..
108 */
109
110#include <asm/ptrace.h>
111#include <asm/user.h>
112
113typedef s390_fp_regs elf_fpregset_t;
114typedef s390_regs elf_gregset_t;
115
116#ifdef __KERNEL__
117#include <linux/sched.h> /* for task_struct */
118#include <asm/system.h> /* for save_access_regs */
119
120/*
120 * This is used to ensure we don't load something for the wrong architecture. 121 * This is used to ensure we don't load something for the wrong architecture.
121 */ 122 */
122#define elf_check_arch(x) \ 123#define elf_check_arch(x) \
@@ -198,7 +199,6 @@ static inline int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
198 199
199#define ELF_PLATFORM (NULL) 200#define ELF_PLATFORM (NULL)
200 201
201#ifdef __KERNEL__
202#ifndef __s390x__ 202#ifndef __s390x__
203#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) 203#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
204#else /* __s390x__ */ 204#else /* __s390x__ */
diff --git a/include/asm-x86_64/elf.h b/include/asm-x86_64/elf.h
index b4f8f4a41a6e..a406fcb1e924 100644
--- a/include/asm-x86_64/elf.h
+++ b/include/asm-x86_64/elf.h
@@ -7,8 +7,6 @@
7 7
8#include <asm/ptrace.h> 8#include <asm/ptrace.h>
9#include <asm/user.h> 9#include <asm/user.h>
10#include <asm/processor.h>
11#include <asm/compat.h>
12 10
13/* x86-64 relocation types */ 11/* x86-64 relocation types */
14#define R_X86_64_NONE 0 /* No reloc */ 12#define R_X86_64_NONE 0 /* No reloc */
@@ -39,18 +37,23 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
39typedef struct user_i387_struct elf_fpregset_t; 37typedef struct user_i387_struct elf_fpregset_t;
40 38
41/* 39/*
42 * This is used to ensure we don't load something for the wrong architecture.
43 */
44#define elf_check_arch(x) \
45 ((x)->e_machine == EM_X86_64)
46
47/*
48 * These are used to set parameters in the core dumps. 40 * These are used to set parameters in the core dumps.
49 */ 41 */
50#define ELF_CLASS ELFCLASS64 42#define ELF_CLASS ELFCLASS64
51#define ELF_DATA ELFDATA2LSB 43#define ELF_DATA ELFDATA2LSB
52#define ELF_ARCH EM_X86_64 44#define ELF_ARCH EM_X86_64
53 45
46#ifdef __KERNEL__
47#include <asm/processor.h>
48#include <asm/compat.h>
49
50/*
51 * This is used to ensure we don't load something for the wrong architecture.
52 */
53#define elf_check_arch(x) \
54 ((x)->e_machine == EM_X86_64)
55
56
54/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx 57/* SVR4/i386 ABI (pages 3-31, 3-32) says that when the program starts %edx
55 contains a pointer to a function which might be registered using `atexit'. 58 contains a pointer to a function which might be registered using `atexit'.
56 This provides a mean for the dynamic linker to call DT_FINI functions for 59 This provides a mean for the dynamic linker to call DT_FINI functions for
@@ -141,7 +144,6 @@ typedef struct user_i387_struct elf_fpregset_t;
141/* I'm not sure if we can use '-' here */ 144/* I'm not sure if we can use '-' here */
142#define ELF_PLATFORM ("x86_64") 145#define ELF_PLATFORM ("x86_64")
143 146
144#ifdef __KERNEL__
145extern void set_personality_64bit(void); 147extern void set_personality_64bit(void);
146#define SET_PERSONALITY(ex, ibcs2) set_personality_64bit() 148#define SET_PERSONALITY(ex, ibcs2) set_personality_64bit()
147/* 149/*
diff --git a/include/asm-x86_64/signal.h b/include/asm-x86_64/signal.h
index cef7a7d51b7e..3ede2a61973a 100644
--- a/include/asm-x86_64/signal.h
+++ b/include/asm-x86_64/signal.h
@@ -3,13 +3,13 @@
3 3
4#ifndef __ASSEMBLY__ 4#ifndef __ASSEMBLY__
5#include <linux/types.h> 5#include <linux/types.h>
6#include <linux/linkage.h>
7#include <linux/time.h> 6#include <linux/time.h>
8 7
9/* Avoid too many header ordering problems. */ 8/* Avoid too many header ordering problems. */
10struct siginfo; 9struct siginfo;
11 10
12#ifdef __KERNEL__ 11#ifdef __KERNEL__
12#include <linux/linkage.h>
13/* Most things should be clean enough to redefine this at will, if care 13/* Most things should be clean enough to redefine this at will, if care
14 is taken to make libc match. */ 14 is taken to make libc match. */
15 15
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index 2d89d309a2a8..80fd48e84bbb 100644
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -620,6 +620,8 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice)
620#define __NR_move_pages 279 620#define __NR_move_pages 279
621__SYSCALL(__NR_move_pages, sys_move_pages) 621__SYSCALL(__NR_move_pages, sys_move_pages)
622 622
623#ifdef __KERNEL__
624
623#define __NR_syscall_max __NR_move_pages 625#define __NR_syscall_max __NR_move_pages
624 626
625#ifndef __NO_STUBS 627#ifndef __NO_STUBS
@@ -744,8 +746,6 @@ __syscall_return(type,__res); \
744 746
745#else /* __KERNEL_SYSCALLS__ */ 747#else /* __KERNEL_SYSCALLS__ */
746 748
747#ifdef __KERNEL__
748
749#include <linux/syscalls.h> 749#include <linux/syscalls.h>
750#include <asm/ptrace.h> 750#include <asm/ptrace.h>
751 751
@@ -821,8 +821,6 @@ asmlinkage long sys_fork(struct pt_regs regs);
821asmlinkage long sys_vfork(struct pt_regs regs); 821asmlinkage long sys_vfork(struct pt_regs regs);
822asmlinkage long sys_pipe(int *fildes); 822asmlinkage long sys_pipe(int *fildes);
823 823
824#endif /* __KERNEL_SYSCALLS__ */
825
826#ifndef __ASSEMBLY__ 824#ifndef __ASSEMBLY__
827 825
828#include <linux/linkage.h> 826#include <linux/linkage.h>
@@ -838,9 +836,9 @@ asmlinkage long sys_rt_sigaction(int sig,
838 struct sigaction __user *oact, 836 struct sigaction __user *oact,
839 size_t sigsetsize); 837 size_t sigsetsize);
840 838
841#endif 839#endif /* __ASSEMBLY__ */
842 840
843#endif 841#endif /* __KERNEL_SYSCALLS__ */
844 842
845/* 843/*
846 * "Conditional" syscalls 844 * "Conditional" syscalls
@@ -850,6 +848,8 @@ asmlinkage long sys_rt_sigaction(int sig,
850 */ 848 */
851#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") 849#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
852 850
853#endif 851#endif /* __NO_STUBS */
854 852
855#endif 853#endif /* __KERNEL__ */
854
855#endif /* _ASM_X86_64_UNISTD_H_ */
diff --git a/include/asm-x86_64/vsyscall.h b/include/asm-x86_64/vsyscall.h
index a85e16f56d73..146b24402a5f 100644
--- a/include/asm-x86_64/vsyscall.h
+++ b/include/asm-x86_64/vsyscall.h
@@ -1,8 +1,6 @@
1#ifndef _ASM_X86_64_VSYSCALL_H_ 1#ifndef _ASM_X86_64_VSYSCALL_H_
2#define _ASM_X86_64_VSYSCALL_H_ 2#define _ASM_X86_64_VSYSCALL_H_
3 3
4#include <linux/seqlock.h>
5
6enum vsyscall_num { 4enum vsyscall_num {
7 __NR_vgettimeofday, 5 __NR_vgettimeofday,
8 __NR_vtime, 6 __NR_vtime,
@@ -14,6 +12,7 @@ enum vsyscall_num {
14#define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr)) 12#define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))
15 13
16#ifdef __KERNEL__ 14#ifdef __KERNEL__
15#include <linux/seqlock.h>
17 16
18#define __section_vxtime __attribute__ ((unused, __section__ (".vxtime"), aligned(16))) 17#define __section_vxtime __attribute__ ((unused, __section__ (".vxtime"), aligned(16)))
19#define __section_wall_jiffies __attribute__ ((unused, __section__ (".wall_jiffies"), aligned(16))) 18#define __section_wall_jiffies __attribute__ ((unused, __section__ (".wall_jiffies"), aligned(16)))
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 530b1e6173b1..6c2066caeaab 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -9,27 +9,6 @@
9#ifndef _LINUX_NFS_FS_H 9#ifndef _LINUX_NFS_FS_H
10#define _LINUX_NFS_FS_H 10#define _LINUX_NFS_FS_H
11 11
12#include <linux/in.h>
13#include <linux/mm.h>
14#include <linux/pagemap.h>
15#include <linux/rwsem.h>
16#include <linux/wait.h>
17
18#include <linux/sunrpc/debug.h>
19#include <linux/sunrpc/auth.h>
20#include <linux/sunrpc/clnt.h>
21
22#include <linux/nfs.h>
23#include <linux/nfs2.h>
24#include <linux/nfs3.h>
25#include <linux/nfs4.h>
26#include <linux/nfs_xdr.h>
27
28#include <linux/nfs_fs_sb.h>
29
30#include <linux/rwsem.h>
31#include <linux/mempool.h>
32
33/* 12/*
34 * Enable debugging support for nfs client. 13 * Enable debugging support for nfs client.
35 * Requires RPC_DEBUG. 14 * Requires RPC_DEBUG.
@@ -48,11 +27,6 @@
48#define NFS_SUPER_MAGIC 0x6969 27#define NFS_SUPER_MAGIC 0x6969
49 28
50/* 29/*
51 * These are the default flags for swap requests
52 */
53#define NFS_RPC_SWAPFLAGS (RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)
54
55/*
56 * When flushing a cluster of dirty pages, there can be different 30 * When flushing a cluster of dirty pages, there can be different
57 * strategies: 31 * strategies:
58 */ 32 */
@@ -65,6 +39,32 @@
65 39
66#ifdef __KERNEL__ 40#ifdef __KERNEL__
67 41
42#include <linux/in.h>
43#include <linux/mm.h>
44#include <linux/pagemap.h>
45#include <linux/rwsem.h>
46#include <linux/wait.h>
47
48#include <linux/sunrpc/debug.h>
49#include <linux/sunrpc/auth.h>
50#include <linux/sunrpc/clnt.h>
51
52#include <linux/nfs.h>
53#include <linux/nfs2.h>
54#include <linux/nfs3.h>
55#include <linux/nfs4.h>
56#include <linux/nfs_xdr.h>
57
58#include <linux/nfs_fs_sb.h>
59
60#include <linux/rwsem.h>
61#include <linux/mempool.h>
62
63/*
64 * These are the default flags for swap requests
65 */
66#define NFS_RPC_SWAPFLAGS (RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)
67
68/* 68/*
69 * NFSv3/v4 Access mode cache entry 69 * NFSv3/v4 Access mode cache entry
70 */ 70 */
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 19bb6538b49e..d543d3871e38 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -57,7 +57,6 @@
57#include <linux/time.h> 57#include <linux/time.h>
58 58
59#include <asm/param.h> 59#include <asm/param.h>
60#include <asm/timex.h>
61 60
62/* 61/*
63 * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen 62 * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
@@ -191,6 +190,8 @@ struct timex {
191#define TIME_BAD TIME_ERROR /* bw compat */ 190#define TIME_BAD TIME_ERROR /* bw compat */
192 191
193#ifdef __KERNEL__ 192#ifdef __KERNEL__
193#include <asm/timex.h>
194
194/* 195/*
195 * kernel variables 196 * kernel variables
196 * Note: maximum error = NTP synch distance = dispersion + delay / 2; 197 * Note: maximum error = NTP synch distance = dispersion + delay / 2;
diff --git a/init/Kconfig b/init/Kconfig
index a099fc6526d9..9a7656f0b5ec 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -182,23 +182,6 @@ config TASK_DELAY_ACCT
182 182
183 Say N if unsure. 183 Say N if unsure.
184 184
185config SYSCTL
186 bool "Sysctl support" if EMBEDDED
187 default y
188 ---help---
189 The sysctl interface provides a means of dynamically changing
190 certain kernel parameters and variables on the fly without requiring
191 a recompile of the kernel or reboot of the system. The primary
192 interface consists of a system call, but if you say Y to "/proc
193 file system support", a tree of modifiable sysctl entries will be
194 generated beneath the /proc/sys directory. They are explained in the
195 files in <file:Documentation/sysctl/>. Note that enabling this
196 option will enlarge the kernel by at least 8 KB.
197
198 As it is generally a good thing, you should say Y here unless
199 building a kernel for install/rescue disks or your system is very
200 limited in memory.
201
202config AUDIT 185config AUDIT
203 bool "Auditing support" 186 bool "Auditing support"
204 depends on NET 187 depends on NET
@@ -261,13 +244,6 @@ config RELAY
261 244
262source "usr/Kconfig" 245source "usr/Kconfig"
263 246
264config UID16
265 bool "Enable 16-bit UID system calls" if EMBEDDED
266 depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
267 default y
268 help
269 This enables the legacy 16-bit UID syscall wrappers.
270
271config CC_OPTIMIZE_FOR_SIZE 247config CC_OPTIMIZE_FOR_SIZE
272 bool "Optimize for size (Look out for broken compilers!)" 248 bool "Optimize for size (Look out for broken compilers!)"
273 default y 249 default y
@@ -289,6 +265,30 @@ menuconfig EMBEDDED
289 environments which can tolerate a "non-standard" kernel. 265 environments which can tolerate a "non-standard" kernel.
290 Only use this if you really know what you are doing. 266 Only use this if you really know what you are doing.
291 267
268config UID16
269 bool "Enable 16-bit UID system calls" if EMBEDDED
270 depends on ARM || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && SPARC32_COMPAT) || UML || (X86_64 && IA32_EMULATION)
271 default y
272 help
273 This enables the legacy 16-bit UID syscall wrappers.
274
275config SYSCTL
276 bool "Sysctl support" if EMBEDDED
277 default y
278 ---help---
279 The sysctl interface provides a means of dynamically changing
280 certain kernel parameters and variables on the fly without requiring
281 a recompile of the kernel or reboot of the system. The primary
282 interface consists of a system call, but if you say Y to "/proc
283 file system support", a tree of modifiable sysctl entries will be
284 generated beneath the /proc/sys directory. They are explained in the
285 files in <file:Documentation/sysctl/>. Note that enabling this
286 option will enlarge the kernel by at least 8 KB.
287
288 As it is generally a good thing, you should say Y here unless
289 building a kernel for install/rescue disks or your system is very
290 limited in memory.
291
292config KALLSYMS 292config KALLSYMS
293 bool "Load all symbols for debugging/kksymoops" if EMBEDDED 293 bool "Load all symbols for debugging/kksymoops" if EMBEDDED
294 default y 294 default y
@@ -363,10 +363,6 @@ config BASE_FULL
363 kernel data structures. This saves memory on small machines, 363 kernel data structures. This saves memory on small machines,
364 but may reduce performance. 364 but may reduce performance.
365 365
366config RT_MUTEXES
367 boolean
368 select PLIST
369
370config FUTEX 366config FUTEX
371 bool "Enable futex support" if EMBEDDED 367 bool "Enable futex support" if EMBEDDED
372 default y 368 default y
@@ -414,6 +410,10 @@ config VM_EVENT_COUNTERS
414 410
415endmenu # General setup 411endmenu # General setup
416 412
413config RT_MUTEXES
414 boolean
415 select PLIST
416
417config TINY_SHMEM 417config TINY_SHMEM
418 default !SHMEM 418 default !SHMEM
419 bool 419 bool
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 872f91ba2ce8..35f10f7ff94a 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -63,8 +63,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
63 desc->chip->enable(irq); 63 desc->chip->enable(irq);
64 64
65 if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { 65 if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
66 desc->status &= ~IRQ_PENDING; 66 desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
67 desc->status = status | IRQ_REPLAY;
68 67
69 if (!desc->chip || !desc->chip->retrigger || 68 if (!desc->chip || !desc->chip->retrigger ||
70 !desc->chip->retrigger(irq)) { 69 !desc->chip->retrigger(irq)) {
diff --git a/kernel/kmod.c b/kernel/kmod.c
index 1d32defa38ab..5c470c57fb57 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -197,11 +197,12 @@ static void __call_usermodehelper(void *data)
197{ 197{
198 struct subprocess_info *sub_info = data; 198 struct subprocess_info *sub_info = data;
199 pid_t pid; 199 pid_t pid;
200 int wait = sub_info->wait;
200 201
201 /* CLONE_VFORK: wait until the usermode helper has execve'd 202 /* CLONE_VFORK: wait until the usermode helper has execve'd
202 * successfully We need the data structures to stay around 203 * successfully We need the data structures to stay around
203 * until that is done. */ 204 * until that is done. */
204 if (sub_info->wait) 205 if (wait)
205 pid = kernel_thread(wait_for_helper, sub_info, 206 pid = kernel_thread(wait_for_helper, sub_info,
206 CLONE_FS | CLONE_FILES | SIGCHLD); 207 CLONE_FS | CLONE_FILES | SIGCHLD);
207 else 208 else
@@ -211,7 +212,7 @@ static void __call_usermodehelper(void *data)
211 if (pid < 0) { 212 if (pid < 0) {
212 sub_info->retval = pid; 213 sub_info->retval = pid;
213 complete(sub_info->complete); 214 complete(sub_info->complete);
214 } else if (!sub_info->wait) 215 } else if (!wait)
215 complete(sub_info->complete); 216 complete(sub_info->complete);
216} 217}
217 218
diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
index 0d355f24fe04..eab043c83bb2 100644
--- a/kernel/lockdep_internals.h
+++ b/kernel/lockdep_internals.h
@@ -27,7 +27,7 @@
27 * Stack-trace: tightly packed array of stack backtrace 27 * Stack-trace: tightly packed array of stack backtrace
28 * addresses. Protected by the hash_lock. 28 * addresses. Protected by the hash_lock.
29 */ 29 */
30#define MAX_STACK_TRACE_ENTRIES 131072UL 30#define MAX_STACK_TRACE_ENTRIES 262144UL
31 31
32extern struct list_head all_lock_classes; 32extern struct list_head all_lock_classes;
33 33
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index 436ab35f6fa7..523e46483b99 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -241,12 +241,16 @@ static void rcu_do_batch(struct rcu_data *rdp)
241 next = rdp->donelist = list->next; 241 next = rdp->donelist = list->next;
242 list->func(list); 242 list->func(list);
243 list = next; 243 list = next;
244 rdp->qlen--;
245 if (++count >= rdp->blimit) 244 if (++count >= rdp->blimit)
246 break; 245 break;
247 } 246 }
247
248 local_irq_disable();
249 rdp->qlen -= count;
250 local_irq_enable();
248 if (rdp->blimit == INT_MAX && rdp->qlen <= qlowmark) 251 if (rdp->blimit == INT_MAX && rdp->qlen <= qlowmark)
249 rdp->blimit = blimit; 252 rdp->blimit = blimit;
253
250 if (!rdp->donelist) 254 if (!rdp->donelist)
251 rdp->donetail = &rdp->donelist; 255 rdp->donetail = &rdp->donelist;
252 else 256 else
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index aa9990a3ccd6..12e1daf875c8 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -93,14 +93,14 @@ STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_`; \
93echo "\#ifndef $$STUBDEF" ; \ 93echo "\#ifndef $$STUBDEF" ; \
94echo "\#define $$STUBDEF" ; \ 94echo "\#define $$STUBDEF" ; \
95echo "\# if $(ARCHDEF)" ; \ 95echo "\# if $(ARCHDEF)" ; \
96if [ -r $(srctree)/include/$(archasm)/$@ ]; then \ 96if [ -r $(INSTALL_HDR_PATH)/include/$(archasm)/$@ ]; then \
97 echo "\# include <$(archasm)/$@>" ; \ 97 echo "\# include <$(archasm)/$@>" ; \
98else \ 98else \
99 echo "\# error $(archasm)/$@ does not exist in" \ 99 echo "\# error $(archasm)/$@ does not exist in" \
100 "the $(ARCH) architecture" ; \ 100 "the $(ARCH) architecture" ; \
101fi ; \ 101fi ; \
102echo "\# elif $(ALTARCHDEF)" ; \ 102echo "\# elif $(ALTARCHDEF)" ; \
103if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then \ 103if [ -r $(INSTALL_HDR_PATH)/include/$(altarchasm)/$@ ]; then \
104 echo "\# include <$(altarchasm)/$@>" ; \ 104 echo "\# include <$(altarchasm)/$@>" ; \
105else \ 105else \
106 echo "\# error $(altarchasm)/$@ does not exist in" \ 106 echo "\# error $(altarchasm)/$@ does not exist in" \
@@ -149,7 +149,9 @@ endif
149hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj 149hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
150 150
151.PHONY: altarch-dir 151.PHONY: altarch-dir
152altarch-dir: 152# All the files in the normal arch dir must be created first, since we test
153# for their existence.
154altarch-dir: $(subdir-y) $(header-y) $(unifdef-y) $(objhdr-y)
153 $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH) 155 $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
154 $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm 156 $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm
155 157
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 18ecd4d5df7f..060f4c563a5c 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -30,7 +30,7 @@
30# libkconfig.so as the executable conf. 30# libkconfig.so as the executable conf.
31# Note: Shared libraries consisting of C++ files are not supported 31# Note: Shared libraries consisting of C++ files are not supported
32 32
33__hostprogs := $(sort $(hostprogs-y)$(hostprogs-m)) 33__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
34 34
35# hostprogs-y := tools/build may have been specified. Retreive directory 35# hostprogs-y := tools/build may have been specified. Retreive directory
36host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f)))) 36host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
index b3bb683b56b6..b5ca35aa1741 100755
--- a/scripts/hdrcheck.sh
+++ b/scripts/hdrcheck.sh
@@ -1,8 +1,8 @@
1#!/bin/sh 1#!/bin/sh
2 2
3for FILE in `grep '^#include <' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do 3for FILE in `grep '^[ \t]*#[ \t]*include[ \t]*<' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do
4 if [ ! -r $1/$FILE ]; then 4 if [ ! -r $1/$FILE ]; then
5 echo $2 requires $FILE, which does not exist 5 echo $2 requires $FILE, which does not exist in exported headers
6 exit 1 6 exit 1
7 fi 7 fi
8done 8done
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-20 17:36:17 -0500