Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption [POWERPC] Fix MMIO ops to provide expected barrier behaviour [POWERPC] Fix interrupt clearing in kdump shutdown sequence [POWERPC] update prep_defconfig [POWERPC] kdump: Support kernels having 64k page size. [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic(). [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx. [POWERPC] Update defconfigs

Linus Torvalds committed 20 years ago

Commit 63b98082 parents 1883c5a eeac5c126 files · +1102 −524Browse files

Unified · Split

26 files

arch/powerpc/configs/cell_defconfig +51 −7
arch/powerpc/configs/chrp32_defconfig +25 −6
arch/powerpc/configs/g5_defconfig +4 −5
arch/powerpc/configs/iseries_defconfig +4 −3
arch/powerpc/configs/maple_defconfig +91 −38
arch/powerpc/configs/mpc7448_hpc2_defconfig +52 −12
arch/powerpc/configs/mpc834x_itx_defconfig +14 −6
arch/powerpc/configs/mpc834x_mds_defconfig +80 −24
arch/powerpc/configs/mpc8540_ads_defconfig +72 −12
arch/powerpc/configs/mpc85xx_cds_defconfig +62 −13
arch/powerpc/configs/mpc8641_hpcn_defconfig +52 −10
arch/powerpc/configs/pmac32_defconfig +11 −7
arch/powerpc/configs/ppc64_defconfig +140 −58
arch/powerpc/configs/pseries_defconfig +4 −4
arch/powerpc/kernel/crash.c +1 −1
arch/powerpc/kernel/misc.S +25 −24
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +1 −1
arch/powerpc/sysdev/dart_iommu.c +6 −1
arch/ppc/configs/prep_defconfig +319 −266
include/asm-powerpc/eeh.h +3 −0
include/asm-powerpc/futex.h +27 −1
include/asm-powerpc/io.h +28 −15
include/asm-powerpc/kdump.h +1 −1
include/asm-powerpc/paca.h +1 −0
include/asm-powerpc/spinlock.h +17 −0
include/asm-ppc/io.h +11 −9

arch/powerpc/configs/cell_defconfig+51−7

@@ -1,13 +1,14 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.17-rc6
4		−# Thu Jun 22 15:28:36 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:20:32 2006
5	5	#
6	6	CONFIG_PPC64=y
7	7	CONFIG_64BIT=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12	13	CONFIG_GENERIC_HWEIGHT=y
13	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -35,6 +36,7 @@ CONFIG_PPC_STD_MMU=y · 21 unmodified lines
35	36	CONFIG_VIRT_CPU_ACCOUNTING=y
36	37	CONFIG_SMP=y
37	38	CONFIG_NR_CPUS=4
	39	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
38	40
39	41	#
40	42	# Code maturity level options
@@ -52,6 +54,7 @@ CONFIG_SWAP=y · 11 unmodified lines
52	54	CONFIG_SYSVIPC=y
53	55	# CONFIG_POSIX_MQUEUE is not set
54	56	# CONFIG_BSD_PROCESS_ACCT is not set
	57	+# CONFIG_TASKSTATS is not set
55	58	CONFIG_SYSCTL=y
56	59	# CONFIG_AUDIT is not set
57	60	CONFIG_IKCONFIG=y
@@ -69,10 +72,12 @@ CONFIG_PRINTK=y · 11 unmodified lines
69	72	CONFIG_BUG=y
70	73	CONFIG_ELF_CORE=y
71	74	CONFIG_BASE_FULL=y
	75	+CONFIG_RT_MUTEXES=y
72	76	CONFIG_FUTEX=y
73	77	CONFIG_EPOLL=y
74	78	CONFIG_SHMEM=y
75	79	CONFIG_SLAB=y
	80	+CONFIG_VM_EVENT_COUNTERS=y
76	81	# CONFIG_TINY_SHMEM is not set
77	82	CONFIG_BASE_SMALL=0
78	83	# CONFIG_SLOB is not set
@@ -119,7 +124,7 @@ CONFIG_PPC_MULTIPLATFORM=y · 40 unmodified lines
119	124	CONFIG_PPC_CELL=y
120	125	CONFIG_PPC_CELL_NATIVE=y
121	126	CONFIG_PPC_IBM_CELL_BLADE=y
122		−CONFIG_PPC_SYSTEMSIM=y
	127	+CONFIG_UDBG_RTAS_CONSOLE=y
123	128	# CONFIG_U3_DART is not set
124	129	CONFIG_PPC_RTAS=y
125	130	# CONFIG_RTAS_ERROR_LOGGING is not set
@@ -130,6 +135,7 @@ CONFIG_MMIO_NVRAM=y · 4 unmodified lines
130	135	# CONFIG_PPC_970_NAP is not set
131	136	# CONFIG_CPU_FREQ is not set
132	137	# CONFIG_WANT_EARLY_SERIAL is not set
	138	+# CONFIG_MPIC is not set
133	139
134	140	#
135	141	# Cell Broadband Engine options
@@ -154,6 +160,7 @@ CONFIG_BINFMT_ELF=y · 18 unmodified lines
154	160	CONFIG_BINFMT_MISC=m
155	161	CONFIG_FORCE_MAX_ZONEORDER=13
156	162	# CONFIG_IOMMU_VMERGE is not set
	163	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
157	164	CONFIG_KEXEC=y
158	165	# CONFIG_CRASH_DUMP is not set
159	166	CONFIG_IRQ_ALL_CPUS=y
@@ -173,6 +180,7 @@ CONFIG_SPARSEMEM_EXTREME=y · 13 unmodified lines
173	180	CONFIG_MEMORY_HOTPLUG=y
174	181	CONFIG_SPLIT_PTLOCK_CPUS=4
175	182	CONFIG_MIGRATION=y
	183	+CONFIG_RESOURCES_64BIT=y
176	184	CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
177	185	CONFIG_ARCH_MEMORY_PROBE=y
178	186	# CONFIG_PPC_64K_PAGES is not set
@@ -187,6 +195,7 @@ CONFIG_ISA_DMA_API=y · 8 unmodified lines
187	195	# Bus options
188	196	#
189	197	CONFIG_GENERIC_ISA_DMA=y
	198	+# CONFIG_MPIC_WEIRD is not set
190	199	# CONFIG_PPC_I8259 is not set
191	200	# CONFIG_PPC_INDIRECT_PCI is not set
192	201	CONFIG_PCI=y
@@ -235,6 +244,8 @@ CONFIG_SYN_COOKIES=y · 42 unmodified lines
235	244	# CONFIG_INET_IPCOMP is not set
236	245	# CONFIG_INET_XFRM_TUNNEL is not set
237	246	CONFIG_INET_TUNNEL=y
	247	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	248	+CONFIG_INET_XFRM_MODE_TUNNEL=y
238	249	CONFIG_INET_DIAG=y
239	250	CONFIG_INET_TCP_DIAG=y
240	251	# CONFIG_TCP_CONG_ADVANCED is not set
@@ -252,7 +263,10 @@ CONFIG_INET6_ESP=m · 11 unmodified lines
252	263	CONFIG_INET6_IPCOMP=m
253	264	CONFIG_INET6_XFRM_TUNNEL=m
254	265	CONFIG_INET6_TUNNEL=m
	266	+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
	267	+CONFIG_INET6_XFRM_MODE_TUNNEL=y
255	268	CONFIG_IPV6_TUNNEL=m
	269	+# CONFIG_NETWORK_SECMARK is not set
256	270	CONFIG_NETFILTER=y
257	271	# CONFIG_NETFILTER_DEBUG is not set
258	272
@@ -277,6 +291,7 @@ CONFIG_IP_NF_TFTP=m · 18 unmodified lines
277	291	CONFIG_IP_NF_AMANDA=m
278	292	# CONFIG_IP_NF_PPTP is not set
279	293	# CONFIG_IP_NF_H323 is not set
	294	+# CONFIG_IP_NF_SIP is not set
280	295	CONFIG_IP_NF_QUEUE=m
281	296
282	297	#
@@ -336,6 +351,7 @@ CONFIG_STANDALONE=y · 53 unmodified lines
336	351	CONFIG_PREVENT_FIRMWARE_BUILD=y
337	352	CONFIG_FW_LOADER=y
338	353	# CONFIG_DEBUG_DRIVER is not set
	354	+# CONFIG_SYS_HYPERVISOR is not set
339	355
340	356	#
341	357	# Connector - unified userspace <-> kernelspace linker
@@ -372,6 +388,7 @@ CONFIG_BLK_DEV_LOOP=y · 30 unmodified lines
372	388	CONFIG_BLK_DEV_RAM=y
373	389	CONFIG_BLK_DEV_RAM_COUNT=16
374	390	CONFIG_BLK_DEV_RAM_SIZE=131072
	391	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
375	392	CONFIG_BLK_DEV_INITRD=y
376	393	# CONFIG_CDROM_PKTCDVD is not set
377	394	# CONFIG_ATA_OVER_ETH is not set
@@ -449,8 +466,7 @@ CONFIG_MD_LINEAR=m · 71 unmodified lines
449	466	CONFIG_MD_RAID0=m
450	467	CONFIG_MD_RAID1=m
451	468	# CONFIG_MD_RAID10 is not set
452		−# CONFIG_MD_RAID5 is not set
453		−# CONFIG_MD_RAID6 is not set
	469	+# CONFIG_MD_RAID456 is not set
454	470	# CONFIG_MD_MULTIPATH is not set
455	471	# CONFIG_MD_FAULTY is not set
456	472	CONFIG_BLK_DEV_DM=m
@@ -544,6 +560,7 @@ CONFIG_SPIDER_NET=m · 87 unmodified lines
544	560	# CONFIG_CHELSIO_T1 is not set
545	561	# CONFIG_IXGB is not set
546	562	# CONFIG_S2IO is not set
	563	+# CONFIG_MYRI10GE is not set
547	564
548	565	#
549	566	# Token Ring devices
@@ -620,6 +637,7 @@ CONFIG_SERIO_SERPORT=y · 70 unmodified lines
620	637	CONFIG_VT=y
621	638	CONFIG_VT_CONSOLE=y
622	639	CONFIG_HW_CONSOLE=y
	640	+# CONFIG_VT_HW_CONSOLE_BINDING is not set
623	641	CONFIG_SERIAL_NONSTANDARD=y
624	642	# CONFIG_COMPUTONE is not set
625	643	# CONFIG_ROCKETPORT is not set
@@ -680,6 +698,7 @@ CONFIG_WATCHDOG_RTAS=y · 54 unmodified lines
680	698	#
681	699	# CONFIG_PCIPCWATCHDOG is not set
682	700	# CONFIG_WDTPCI is not set
	701	+# CONFIG_HW_RANDOM is not set
683	702	CONFIG_GEN_RTC=y
684	703	# CONFIG_GEN_RTC_X is not set
685	704	# CONFIG_DTLK is not set
@@ -725,6 +744,7 @@ CONFIG_I2C_ALGOBIT=y · 39 unmodified lines
725	744	# CONFIG_I2C_I810 is not set
726	745	# CONFIG_I2C_PIIX4 is not set
727	746	# CONFIG_I2C_NFORCE2 is not set
	747	+# CONFIG_I2C_OCORES is not set
728	748	# CONFIG_I2C_PARPORT_LIGHT is not set
729	749	# CONFIG_I2C_PROSAVAGE is not set
730	750	# CONFIG_I2C_SAVAGE4 is not set
@@ -761,7 +781,6 @@ CONFIG_I2C_ALGOBIT=y · 30 unmodified lines
761	781	#
762	782	# Dallas's 1-wire bus
763	783	#
764		−# CONFIG_W1 is not set
765	784
766	785	#
767	786	# Hardware Monitoring support
@@ -787,6 +806,7 @@ CONFIG_VIDEO_V4L2=y · 19 unmodified lines
787	806	#
788	807	# Graphics support
789	808	#
	809	+CONFIG_FIRMWARE_EDID=y
790	810	# CONFIG_FB is not set
791	811
792	812	#
@@ -794,6 +814,7 @@ CONFIG_VIDEO_V4L2=y · 1 unmodified line
794	814	#
795	815	# CONFIG_VGA_CONSOLE is not set
796	816	CONFIG_DUMMY_CONSOLE=y
	817	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
797	818
798	819	#
799	820	# Sound
@@ -841,6 +862,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y · 41 unmodified lines
841	862	CONFIG_INFINIBAND=y
842	863	CONFIG_INFINIBAND_USER_MAD=m
843	864	CONFIG_INFINIBAND_USER_ACCESS=m
	865	+CONFIG_INFINIBAND_ADDR_TRANS=y
844	866	CONFIG_INFINIBAND_MTHCA=m
845	867	CONFIG_INFINIBAND_MTHCA_DEBUG=y
846	868	CONFIG_INFINIBAND_IPOIB=m
@@ -856,6 +878,19 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y · 9 unmodified lines
856	878	#
857	879	# CONFIG_RTC_CLASS is not set
858	880
	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	+
859	894	#
860	895	# File systems
861	896	#
@@ -877,6 +912,7 @@ CONFIG_FS_POSIX_ACL=y · 15 unmodified lines
877	912	# CONFIG_MINIX_FS is not set
878	913	# CONFIG_ROMFS_FS is not set
879	914	CONFIG_INOTIFY=y
	915	+CONFIG_INOTIFY_USER=y
880	916	# CONFIG_QUOTA is not set
881	917	CONFIG_DNOTIFY=y
882	918	# CONFIG_AUTOFS_FS is not set
@@ -1034,6 +1070,9 @@ CONFIG_CRC32=y · 151 unmodified lines
1034	1070	# CONFIG_LIBCRC32C is not set
1035	1071	CONFIG_ZLIB_INFLATE=m
1036	1072	CONFIG_ZLIB_DEFLATE=m
	1073	+CONFIG_TEXTSEARCH=y
	1074	+CONFIG_TEXTSEARCH_KMP=m
	1075	+CONFIG_PLIST=y
1037	1076
1038	1077	#
1039	1078	# Instrumentation Support
@@ -1046,14 +1085,19 @@ CONFIG_ZLIB_DEFLATE=m · 6 unmodified lines
1046	1085	#
1047	1086	# CONFIG_PRINTK_TIME is not set
1048	1087	CONFIG_MAGIC_SYSRQ=y
	1088	+# CONFIG_UNUSED_SYMBOLS is not set
1049	1089	CONFIG_DEBUG_KERNEL=y
1050	1090	CONFIG_LOG_BUF_SHIFT=15
1051	1091	CONFIG_DETECT_SOFTLOCKUP=y
1052	1092	# CONFIG_SCHEDSTATS is not set
1053	1093	# CONFIG_DEBUG_SLAB is not set
1054		−CONFIG_DEBUG_MUTEXES=y
	1094	+# CONFIG_DEBUG_RT_MUTEXES is not set
	1095	+# CONFIG_RT_MUTEX_TESTER is not set
1055	1096	# CONFIG_DEBUG_SPINLOCK is not set
	1097	+CONFIG_DEBUG_MUTEXES=y
	1098	+# CONFIG_DEBUG_RWSEMS is not set
1056	1099	CONFIG_DEBUG_SPINLOCK_SLEEP=y
	1100	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1057	1101	# CONFIG_DEBUG_KOBJECT is not set
1058	1102	# CONFIG_DEBUG_INFO is not set
1059	1103	CONFIG_DEBUG_FS=y

arch/powerpc/configs/chrp32_defconfig+25−6

@@ -1,13 +1,14 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.17
4		−# Mon Jul 3 12:08:41 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:22:54 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12	13	CONFIG_GENERIC_HWEIGHT=y
13	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -42,6 +43,7 @@ CONFIG_PPC_STD_MMU=y · 28 unmodified lines
42	43	CONFIG_PPC_STD_MMU_32=y
43	44	CONFIG_SMP=y
44	45	CONFIG_NR_CPUS=4
	46	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
45	47
46	48	#
47	49	# Code maturity level options
@@ -59,6 +61,7 @@ CONFIG_SWAP=y · 11 unmodified lines
59	61	CONFIG_SYSVIPC=y
60	62	CONFIG_POSIX_MQUEUE=y
61	63	# CONFIG_BSD_PROCESS_ACCT is not set
	64	+# CONFIG_TASKSTATS is not set
62	65	CONFIG_SYSCTL=y
63	66	# CONFIG_AUDIT is not set
64	67	CONFIG_IKCONFIG=y
@@ -76,10 +79,12 @@ CONFIG_PRINTK=y · 11 unmodified lines
76	79	CONFIG_BUG=y
77	80	CONFIG_ELF_CORE=y
78	81	CONFIG_BASE_FULL=y
	82	+CONFIG_RT_MUTEXES=y
79	83	CONFIG_FUTEX=y
80	84	CONFIG_EPOLL=y
81	85	CONFIG_SHMEM=y
82	86	CONFIG_SLAB=y
	87	+CONFIG_VM_EVENT_COUNTERS=y
83	88	# CONFIG_TINY_SHMEM is not set
84	89	CONFIG_BASE_SMALL=0
85	90	# CONFIG_SLOB is not set
@@ -126,7 +131,7 @@ CONFIG_PPC_CHRP=y · 40 unmodified lines
126	131	# CONFIG_PPC_PMAC is not set
127	132	# CONFIG_PPC_CELL is not set
128	133	# CONFIG_PPC_CELL_NATIVE is not set
129		−CONFIG_MPIC=y
	134	+# CONFIG_UDBG_RTAS_CONSOLE is not set
130	135	CONFIG_PPC_RTAS=y
131	136	# CONFIG_RTAS_ERROR_LOGGING is not set
132	137	CONFIG_RTAS_PROC=y
@@ -136,6 +141,7 @@ CONFIG_PPC_MPC106=y · 3 unmodified lines
136	141	# CONFIG_CPU_FREQ is not set
137	142	# CONFIG_TAU is not set
138	143	# CONFIG_WANT_EARLY_SERIAL is not set
	144	+CONFIG_MPIC=y
139	145
140	146	#
141	147	# Kernel options
@@ -151,6 +157,7 @@ CONFIG_PREEMPT_NONE=y · 9 unmodified lines
151	157	CONFIG_PREEMPT_BKL=y
152	158	CONFIG_BINFMT_ELF=y
153	159	CONFIG_BINFMT_MISC=y
	160	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
154	161	# CONFIG_KEXEC is not set
155	162	CONFIG_IRQ_ALL_CPUS=y
156	163	CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -162,6 +169,7 @@ CONFIG_FLATMEM=y · 5 unmodified lines
162	169	CONFIG_FLAT_NODE_MEM_MAP=y
163	170	# CONFIG_SPARSEMEM_STATIC is not set
164	171	CONFIG_SPLIT_PTLOCK_CPUS=4
	172	+# CONFIG_RESOURCES_64BIT is not set
165	173	CONFIG_PROC_DEVICETREE=y
166	174	# CONFIG_CMDLINE_BOOL is not set
167	175	# CONFIG_PM is not set
@@ -173,6 +181,7 @@ CONFIG_ISA_DMA_API=y · 5 unmodified lines
173	181	#
174	182	CONFIG_ISA=y
175	183	CONFIG_GENERIC_ISA_DMA=y
	184	+# CONFIG_MPIC_WEIRD is not set
176	185	CONFIG_PPC_I8259=y
177	186	CONFIG_PPC_INDIRECT_PCI=y
178	187	CONFIG_PCI=y
@@ -366,6 +375,7 @@ CONFIG_BLK_DEV_LOOP=y · 187 unmodified lines
366	375	CONFIG_BLK_DEV_RAM=y
367	376	CONFIG_BLK_DEV_RAM_COUNT=16
368	377	CONFIG_BLK_DEV_RAM_SIZE=4096
	378	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
369	379	CONFIG_BLK_DEV_INITRD=y
370	380	# CONFIG_CDROM_PKTCDVD is not set
371	381	# CONFIG_ATA_OVER_ETH is not set
@@ -622,6 +632,7 @@ CONFIG_8139TOO=y · 250 unmodified lines
622	632	# CONFIG_TLAN is not set
623	633	CONFIG_VIA_RHINE=y
624	634	# CONFIG_VIA_RHINE_MMIO is not set
	635	+# CONFIG_VIA_RHINE_NAPI is not set
625	636
626	637	#
627	638	# Ethernet (1000 Mbit)
@@ -751,6 +762,7 @@ CONFIG_SERIO_LIBPS2=y · 123 unmodified lines
751	762	CONFIG_VT=y
752	763	CONFIG_VT_CONSOLE=y
753	764	CONFIG_HW_CONSOLE=y
	765	+# CONFIG_VT_HW_CONSOLE_BINDING is not set
754	766	# CONFIG_SERIAL_NONSTANDARD is not set
755	767
756	768	#
@@ -783,6 +795,7 @@ CONFIG_LEGACY_PTY_COUNT=256 · 26 unmodified lines
783	795	# Watchdog Cards
784	796	#
785	797	# CONFIG_WATCHDOG is not set
	798	+# CONFIG_HW_RANDOM is not set
786	799	CONFIG_NVRAM=y
787	800	CONFIG_GEN_RTC=y
788	801	# CONFIG_GEN_RTC_X is not set
@@ -894,12 +907,12 @@ CONFIG_VIDEO_V4L2=y · 105 unmodified lines
894	907	#
895	908	# Graphics support
896	909	#
	910	+CONFIG_FIRMWARE_EDID=y
897	911	CONFIG_FB=y
898	912	CONFIG_FB_CFB_FILLRECT=y
899	913	CONFIG_FB_CFB_COPYAREA=y
900	914	CONFIG_FB_CFB_IMAGEBLIT=y
901	915	CONFIG_FB_MACMODES=y
902		−CONFIG_FB_FIRMWARE_EDID=y
903	916	# CONFIG_FB_BACKLIGHT is not set
904	917	CONFIG_FB_MODE_HELPERS=y
905	918	CONFIG_FB_TILEBLITTING=y
@@ -1079,7 +1092,7 @@ CONFIG_USB_MON=y · 173 unmodified lines
1079	1092	# CONFIG_USB_LEGOTOWER is not set
1080	1093	# CONFIG_USB_LCD is not set
1081	1094	# CONFIG_USB_LED is not set
1082		−# CONFIG_USB_CY7C63 is not set
	1095	+# CONFIG_USB_CYPRESS_CY7C63 is not set
1083	1096	# CONFIG_USB_CYTHERM is not set
1084	1097	# CONFIG_USB_PHIDGETKIT is not set
1085	1098	# CONFIG_USB_PHIDGETSERVO is not set
@@ -1305,6 +1318,7 @@ CONFIG_ZLIB_INFLATE=m · 219 unmodified lines
1305	1318	CONFIG_ZLIB_DEFLATE=m
1306	1319	CONFIG_TEXTSEARCH=y
1307	1320	CONFIG_TEXTSEARCH_KMP=m
	1321	+CONFIG_PLIST=y
1308	1322
1309	1323	#
1310	1324	# Instrumentation Support
@@ -1316,14 +1330,19 @@ CONFIG_TEXTSEARCH_KMP=m · 5 unmodified lines
1316	1330	#
1317	1331	# CONFIG_PRINTK_TIME is not set
1318	1332	CONFIG_MAGIC_SYSRQ=y
	1333	+# CONFIG_UNUSED_SYMBOLS is not set
1319	1334	CONFIG_DEBUG_KERNEL=y
1320	1335	CONFIG_LOG_BUF_SHIFT=15
1321	1336	CONFIG_DETECT_SOFTLOCKUP=y
1322	1337	# CONFIG_SCHEDSTATS is not set
1323	1338	# CONFIG_DEBUG_SLAB is not set
1324		−CONFIG_DEBUG_MUTEXES=y
	1339	+# CONFIG_DEBUG_RT_MUTEXES is not set
	1340	+# CONFIG_RT_MUTEX_TESTER is not set
1325	1341	# CONFIG_DEBUG_SPINLOCK is not set
	1342	+CONFIG_DEBUG_MUTEXES=y
	1343	+# CONFIG_DEBUG_RWSEMS is not set
1326	1344	CONFIG_DEBUG_SPINLOCK_SLEEP=y
	1345	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1327	1346	# CONFIG_DEBUG_KOBJECT is not set
1328	1347	# CONFIG_DEBUG_HIGHMEM is not set
1329	1348	# CONFIG_DEBUG_INFO is not set

arch/powerpc/configs/g5_defconfig+4−5

@@ -1,7 +1,7 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.18-rc3
4		−# Tue Aug 8 09:12:29 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:22:55 2006
5	5	#
6	6	CONFIG_PPC64=y
7	7	CONFIG_64BIT=y
@@ -126,7 +126,6 @@ CONFIG_PPC_PMAC64=y · 118 unmodified lines
126	126	# CONFIG_PPC_IBM_CELL_BLADE is not set
127	127	# CONFIG_UDBG_RTAS_CONSOLE is not set
128	128	CONFIG_U3_DART=y
129		−CONFIG_MPIC=y
130	129	# CONFIG_PPC_RTAS is not set
131	130	# CONFIG_MMIO_NVRAM is not set
132	131	CONFIG_MPIC_BROKEN_U3=y
@@ -146,6 +145,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y · 13 unmodified lines
146	145	# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
147	146	CONFIG_CPU_FREQ_PMAC64=y
148	147	# CONFIG_WANT_EARLY_SERIAL is not set
	148	+CONFIG_MPIC=y
149	149
150	150	#
151	151	# Kernel options
@@ -192,6 +192,7 @@ CONFIG_ISA_DMA_API=y · 40 unmodified lines
192	192	# Bus options
193	193	#
194	194	CONFIG_GENERIC_ISA_DMA=y
	195	+# CONFIG_MPIC_WEIRD is not set
195	196	# CONFIG_PPC_I8259 is not set
196	197	# CONFIG_PPC_INDIRECT_PCI is not set
197	198	CONFIG_PCI=y
@@ -772,7 +773,6 @@ CONFIG_HW_CONSOLE=y · 574 unmodified lines
772	773	CONFIG_UNIX98_PTYS=y
773	774	CONFIG_LEGACY_PTYS=y
774	775	CONFIG_LEGACY_PTY_COUNT=256
775		−# CONFIG_BRIQ_PANEL is not set
776	776
777	777	#
778	778	# IPMI
@@ -1195,7 +1195,6 @@ CONFIG_USB_MON=y · 416 unmodified lines
1195	1195	CONFIG_USB_SERIAL=m
1196	1196	CONFIG_USB_SERIAL_GENERIC=y
1197	1197	# CONFIG_USB_SERIAL_AIRPRIME is not set
1198		−# CONFIG_USB_SERIAL_ANYDATA is not set
1199	1198	# CONFIG_USB_SERIAL_ARK3116 is not set
1200	1199	CONFIG_USB_SERIAL_BELKIN=m
1201	1200	# CONFIG_USB_SERIAL_WHITEHEAT is not set

arch/powerpc/configs/iseries_defconfig+4−3

@@ -1,7 +1,7 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.18-rc3
4		−# Tue Aug 8 09:15:46 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:22:57 2006
5	5	#
6	6	CONFIG_PPC64=y
7	7	CONFIG_64BIT=y
@@ -129,6 +129,7 @@ CONFIG_IBMVIO=y · 121 unmodified lines
129	129	# CONFIG_PPC_970_NAP is not set
130	130	# CONFIG_CPU_FREQ is not set
131	131	# CONFIG_WANT_EARLY_SERIAL is not set
	132	+# CONFIG_MPIC is not set
132	133
133	134	#
134	135	# Kernel options
@@ -172,6 +173,7 @@ CONFIG_ISA_DMA_API=y · 37 unmodified lines
172	173	# Bus options
173	174	#
174	175	CONFIG_GENERIC_ISA_DMA=y
	176	+# CONFIG_MPIC_WEIRD is not set
175	177	# CONFIG_PPC_I8259 is not set
176	178	# CONFIG_PPC_INDIRECT_PCI is not set
177	179	CONFIG_PCI=y
@@ -716,7 +718,6 @@ CONFIG_SERIAL_ICOM=m · 538 unmodified lines
716	718	CONFIG_UNIX98_PTYS=y
717	719	CONFIG_LEGACY_PTYS=y
718	720	CONFIG_LEGACY_PTY_COUNT=256
719		−# CONFIG_BRIQ_PANEL is not set
720	721
721	722	#
722	723	# IPMI

arch/powerpc/configs/maple_defconfig+91−38

@@ -1,15 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.16-rc6
4		−# Wed Mar 15 16:19:54 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:24:55 2006
5	5	#
6	6	CONFIG_PPC64=y
7	7	CONFIG_64BIT=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
	13	+CONFIG_GENERIC_HWEIGHT=y
12	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
13	16	CONFIG_PPC=y
14	17	CONFIG_EARLY_PRINTK=y
15	18	CONFIG_COMPAT=y
@@ -29,8 +32,10 @@ CONFIG_POWER4=y · 13 unmodified lines
29	32	CONFIG_PPC_FPU=y
30	33	# CONFIG_ALTIVEC is not set
31	34	CONFIG_PPC_STD_MMU=y
	35	+CONFIG_VIRT_CPU_ACCOUNTING=y
32	36	CONFIG_SMP=y
33	37	CONFIG_NR_CPUS=2
	38	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34	39
35	40	#
36	41	# Code maturity level options
@@ -48,11 +53,13 @@ CONFIG_SWAP=y · 11 unmodified lines
48	53	CONFIG_SYSVIPC=y
49	54	CONFIG_POSIX_MQUEUE=y
50	55	# CONFIG_BSD_PROCESS_ACCT is not set
	56	+# CONFIG_TASKSTATS is not set
51	57	CONFIG_SYSCTL=y
52	58	# CONFIG_AUDIT is not set
53	59	CONFIG_IKCONFIG=y
54	60	CONFIG_IKCONFIG_PROC=y
55	61	# CONFIG_CPUSETS is not set
	62	+# CONFIG_RELAY is not set
56	63	CONFIG_INITRAMFS_SOURCE=""
57	64	CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58	65	# CONFIG_EMBEDDED is not set
@@ -64,14 +71,12 @@ CONFIG_PRINTK=y · 5 unmodified lines
64	71	CONFIG_BUG=y
65	72	CONFIG_ELF_CORE=y
66	73	CONFIG_BASE_FULL=y
	74	+CONFIG_RT_MUTEXES=y
67	75	CONFIG_FUTEX=y
68	76	CONFIG_EPOLL=y
69	77	CONFIG_SHMEM=y
70		−CONFIG_CC_ALIGN_FUNCTIONS=0
71		−CONFIG_CC_ALIGN_LABELS=0
72		−CONFIG_CC_ALIGN_LOOPS=0
73		−CONFIG_CC_ALIGN_JUMPS=0
74	78	CONFIG_SLAB=y
	79	+CONFIG_VM_EVENT_COUNTERS=y
75	80	# CONFIG_TINY_SHMEM is not set
76	81	CONFIG_BASE_SMALL=0
77	82	# CONFIG_SLOB is not set
@@ -82,7 +87,6 @@ CONFIG_BASE_SMALL=0 · 4 unmodified lines
82	87	CONFIG_MODULES=y
83	88	CONFIG_MODULE_UNLOAD=y
84	89	# CONFIG_MODULE_FORCE_UNLOAD is not set
85		−CONFIG_OBSOLETE_MODPARM=y
86	90	CONFIG_MODVERSIONS=y
87	91	CONFIG_MODULE_SRCVERSION_ALL=y
88	92	CONFIG_KMOD=y
@@ -91,6 +95,7 @@ CONFIG_STOP_MACHINE=y · 2 unmodified lines
91	95	#
92	96	# Block layer
93	97	#
	98	+# CONFIG_BLK_DEV_IO_TRACE is not set
94	99
95	100	#
96	101	# IO Schedulers
@@ -116,14 +121,18 @@ CONFIG_PPC_MULTIPLATFORM=y · 19 unmodified lines
116	121	# CONFIG_PPC_PMAC is not set
117	122	CONFIG_PPC_MAPLE=y
118	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
119	127	CONFIG_U3_DART=y
120		−CONFIG_MPIC=y
121	128	# CONFIG_PPC_RTAS is not set
122	129	# CONFIG_MMIO_NVRAM is not set
123	130	CONFIG_MPIC_BROKEN_U3=y
124	131	# CONFIG_PPC_MPC106 is not set
	132	+CONFIG_PPC_970_NAP=y
125	133	# CONFIG_CPU_FREQ is not set
126	134	# CONFIG_WANT_EARLY_SERIAL is not set
	135	+CONFIG_MPIC=y
127	136
128	137	#
129	138	# Kernel options
@@ -140,6 +149,7 @@ CONFIG_BINFMT_ELF=y · 10 unmodified lines
140	149	# CONFIG_BINFMT_MISC is not set
141	150	CONFIG_FORCE_MAX_ZONEORDER=13
142	151	CONFIG_IOMMU_VMERGE=y
	152	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
143	153	CONFIG_KEXEC=y
144	154	# CONFIG_CRASH_DUMP is not set
145	155	CONFIG_IRQ_ALL_CPUS=y
@@ -155,6 +165,7 @@ CONFIG_FLATMEM=y · 9 unmodified lines
155	165	CONFIG_FLAT_NODE_MEM_MAP=y
156	166	# CONFIG_SPARSEMEM_STATIC is not set
157	167	CONFIG_SPLIT_PTLOCK_CPUS=4
	168	+CONFIG_RESOURCES_64BIT=y
158	169	# CONFIG_PPC_64K_PAGES is not set
159	170	# CONFIG_SCHED_SMT is not set
160	171	CONFIG_PROC_DEVICETREE=y
@@ -167,11 +178,12 @@ CONFIG_ISA_DMA_API=y · 6 unmodified lines
167	178	# Bus options
168	179	#
169	180	CONFIG_GENERIC_ISA_DMA=y
	181	+# CONFIG_MPIC_WEIRD is not set
170	182	# CONFIG_PPC_I8259 is not set
171	183	# CONFIG_PPC_INDIRECT_PCI is not set
172	184	CONFIG_PCI=y
173	185	CONFIG_PCI_DOMAINS=y
174		−CONFIG_PCI_LEGACY_PROC=y
	186	+# CONFIG_PCIEPORTBUS is not set
175	187	# CONFIG_PCI_DEBUG is not set
176	188
177	189	#
@@ -197,6 +209,8 @@ CONFIG_NET=y · 19 unmodified lines
197	209	CONFIG_PACKET=y
198	210	CONFIG_PACKET_MMAP=y
199	211	CONFIG_UNIX=y
	212	+CONFIG_XFRM=y
	213	+CONFIG_XFRM_USER=m
200	214	# CONFIG_NET_KEY is not set
201	215	CONFIG_INET=y
202	216	CONFIG_IP_MULTICAST=y
@@ -214,12 +228,18 @@ CONFIG_IP_PNP_DHCP=y · 11 unmodified lines
214	228	# CONFIG_INET_AH is not set
215	229	# CONFIG_INET_ESP is not set
216	230	# CONFIG_INET_IPCOMP is not set
	231	+# CONFIG_INET_XFRM_TUNNEL is not set
217	232	# CONFIG_INET_TUNNEL is not set
	233	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	234	+CONFIG_INET_XFRM_MODE_TUNNEL=y
218	235	CONFIG_INET_DIAG=y
219	236	CONFIG_INET_TCP_DIAG=y
220	237	# CONFIG_TCP_CONG_ADVANCED is not set
221	238	CONFIG_TCP_CONG_BIC=y
222	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	243	# CONFIG_NETFILTER is not set
224	244
225	245	#
@@ -274,6 +294,7 @@ CONFIG_STANDALONE=y · 48 unmodified lines
274	294	CONFIG_PREVENT_FIRMWARE_BUILD=y
275	295	# CONFIG_FW_LOADER is not set
276	296	# CONFIG_DEBUG_DRIVER is not set
	297	+# CONFIG_SYS_HYPERVISOR is not set
277	298
278	299	#
279	300	# Connector - unified userspace <-> kernelspace linker
@@ -310,6 +331,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y · 30 unmodified lines
310	331	CONFIG_BLK_DEV_RAM=y
311	332	CONFIG_BLK_DEV_RAM_COUNT=16
312	333	CONFIG_BLK_DEV_RAM_SIZE=8192
	334	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
313	335	# CONFIG_BLK_DEV_INITRD is not set
314	336	# CONFIG_CDROM_PKTCDVD is not set
315	337	# CONFIG_ATA_OVER_ETH is not set
@@ -484,6 +506,7 @@ CONFIG_E1000=y · 168 unmodified lines
484	506	# CONFIG_CHELSIO_T1 is not set
485	507	# CONFIG_IXGB is not set
486	508	# CONFIG_S2IO is not set
	509	+# CONFIG_MYRI10GE is not set
487	510
488	511	#
489	512	# Token Ring devices
@@ -556,6 +579,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200 · 66 unmodified lines
556	579	CONFIG_VT=y
557	580	CONFIG_VT_CONSOLE=y
558	581	CONFIG_HW_CONSOLE=y
	582	+# CONFIG_VT_HW_CONSOLE_BINDING is not set
559	583	# CONFIG_SERIAL_NONSTANDARD is not set
560	584
561	585	#
@@ -563,6 +587,7 @@ CONFIG_HW_CONSOLE=y · 1 unmodified line
563	587	#
564	588	CONFIG_SERIAL_8250=y
565	589	CONFIG_SERIAL_8250_CONSOLE=y
	590	+CONFIG_SERIAL_8250_PCI=y
566	591	CONFIG_SERIAL_8250_NR_UARTS=4
567	592	CONFIG_SERIAL_8250_RUNTIME_UARTS=4
568	593	# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -586,7 +611,7 @@ CONFIG_LEGACY_PTY_COUNT=256 · 17 unmodified lines
586	611	# Watchdog Cards
587	612	#
588	613	# CONFIG_WATCHDOG is not set
589		−# CONFIG_RTC is not set
	614	+# CONFIG_HW_RANDOM is not set
590	615	CONFIG_GEN_RTC=y
591	616	# CONFIG_GEN_RTC_X is not set
592	617	# CONFIG_DTLK is not set
@@ -632,10 +657,10 @@ CONFIG_I2C_AMD8111=y · 39 unmodified lines
632	657	# CONFIG_I2C_I810 is not set
633	658	# CONFIG_I2C_PIIX4 is not set
634	659	# CONFIG_I2C_NFORCE2 is not set
	660	+# CONFIG_I2C_OCORES is not set
635	661	# CONFIG_I2C_PARPORT_LIGHT is not set
636	662	# CONFIG_I2C_PROSAVAGE is not set
637	663	# CONFIG_I2C_SAVAGE4 is not set
638		−# CONFIG_SCx200_ACB is not set
639	664	# CONFIG_I2C_SIS5595 is not set
640	665	# CONFIG_I2C_SIS630 is not set
641	666	# CONFIG_I2C_SIS96X is not set
@@ -654,9 +679,7 @@ CONFIG_I2C_AMD8111=y · 12 unmodified lines
654	679	# CONFIG_SENSORS_PCF8574 is not set
655	680	# CONFIG_SENSORS_PCA9539 is not set
656	681	# CONFIG_SENSORS_PCF8591 is not set
657		−# CONFIG_SENSORS_RTC8564 is not set
658	682	# CONFIG_SENSORS_MAX6875 is not set
659		−# CONFIG_RTC_X1205_I2C is not set
660	683	# CONFIG_I2C_DEBUG_CORE is not set
661	684	# CONFIG_I2C_DEBUG_ALGO is not set
662	685	# CONFIG_I2C_DEBUG_BUS is not set
@@ -671,7 +694,6 @@ CONFIG_I2C_AMD8111=y · 8 unmodified lines
671	694	#
672	695	# Dallas's 1-wire bus
673	696	#
674		−# CONFIG_W1 is not set
675	697
676	698	#
677	699	# Hardware Monitoring support
@@ -683,23 +705,22 @@ CONFIG_I2C_AMD8111=y · 5 unmodified lines
683	705	# Misc devices
684	706	#
685	707
686		−#
687		−# Multimedia Capabilities Port drivers
688		−#
689		−
690	708	#
691	709	# Multimedia devices
692	710	#
693	711	# CONFIG_VIDEO_DEV is not set
	712	+CONFIG_VIDEO_V4L2=y
694	713
695	714	#
696	715	# Digital Video Broadcasting Devices
697	716	#
698	717	# CONFIG_DVB is not set
	718	+# CONFIG_USB_DABUSB is not set
699	719
700	720	#
701	721	# Graphics support
702	722	#
	723	+CONFIG_FIRMWARE_EDID=y
703	724	# CONFIG_FB is not set
704	725
705	726	#
@@ -707,6 +728,7 @@ CONFIG_I2C_AMD8111=y · 1 unmodified line
707	728	#
708	729	# CONFIG_VGA_CONSOLE is not set
709	730	CONFIG_DUMMY_CONSOLE=y
	731	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710	732
711	733	#
712	734	# Sound
@@ -718,6 +740,7 @@ CONFIG_DUMMY_CONSOLE=y · 5 unmodified lines
718	740	#
719	741	CONFIG_USB_ARCH_HAS_HCD=y
720	742	CONFIG_USB_ARCH_HAS_OHCI=y
	743	+CONFIG_USB_ARCH_HAS_EHCI=y
721	744	CONFIG_USB=y
722	745	# CONFIG_USB_DEBUG is not set
723	746
@@ -735,6 +758,7 @@ CONFIG_USB_DEVICEFS=y · 11 unmodified lines
735	758	CONFIG_USB_EHCI_HCD=y
736	759	CONFIG_USB_EHCI_SPLIT_ISO=y
737	760	CONFIG_USB_EHCI_ROOT_HUB_TT=y
	761	+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
738	762	# CONFIG_USB_ISP116X_HCD is not set
739	763	CONFIG_USB_OHCI_HCD=y
740	764	# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -771,9 +795,7 @@ CONFIG_USB_HIDINPUT=y · 30 unmodified lines
771	795	# CONFIG_USB_ACECAD is not set
772	796	# CONFIG_USB_KBTAB is not set
773	797	# CONFIG_USB_POWERMATE is not set
774		−# CONFIG_USB_MTOUCH is not set
775		−# CONFIG_USB_ITMTOUCH is not set
776		−# CONFIG_USB_EGALAX is not set
	798	+# CONFIG_USB_TOUCHSCREEN is not set
777	799	# CONFIG_USB_YEALINK is not set
778	800	# CONFIG_USB_XPAD is not set
779	801	# CONFIG_USB_ATI_REMOTE is not set
@@ -786,15 +808,6 @@ CONFIG_USB_HIDINPUT=y · 6 unmodified lines
786	808	#
787	809	# CONFIG_USB_MDC800 is not set
788	810
789		−#
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	811	#
799	812	# USB Network Adapters
800	813	#
@@ -816,7 +829,7 @@ CONFIG_USB_SERIAL=y · 15 unmodified lines
816	829	# CONFIG_USB_SERIAL_CONSOLE is not set
817	830	CONFIG_USB_SERIAL_GENERIC=y
818	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	833	# CONFIG_USB_SERIAL_BELKIN is not set
821	834	# CONFIG_USB_SERIAL_WHITEHEAT is not set
822	835	# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
@@ -824,6 +837,7 @@ CONFIG_USB_SERIAL_GENERIC=y · 1 unmodified line
824	837	CONFIG_USB_SERIAL_CYPRESS_M8=m
825	838	# CONFIG_USB_SERIAL_EMPEG is not set
826	839	# CONFIG_USB_SERIAL_FTDI_SIO is not set
	840	+# CONFIG_USB_SERIAL_FUNSOFT is not set
827	841	# CONFIG_USB_SERIAL_VISOR is not set
828	842	# CONFIG_USB_SERIAL_IPAQ is not set
829	843	# CONFIG_USB_SERIAL_IR is not set
@@ -848,12 +862,15 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y · 18 unmodified lines
848	862	# CONFIG_USB_SERIAL_KLSI is not set
849	863	# CONFIG_USB_SERIAL_KOBIL_SCT is not set
850	864	# CONFIG_USB_SERIAL_MCT_U232 is not set
	865	+# CONFIG_USB_SERIAL_NAVMAN is not set
851	866	# CONFIG_USB_SERIAL_PL2303 is not set
852	867	# CONFIG_USB_SERIAL_HP4X is not set
853	868	# CONFIG_USB_SERIAL_SAFE is not set
	869	+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
854	870	CONFIG_USB_SERIAL_TI=m
855	871	# CONFIG_USB_SERIAL_CYBERJACK is not set
856	872	# CONFIG_USB_SERIAL_XIRCOM is not set
	873	+# CONFIG_USB_SERIAL_OPTION is not set
857	874	# CONFIG_USB_SERIAL_OMNINET is not set
858	875	CONFIG_USB_EZUSB=y
859	876
@@ -867,10 +884,12 @@ CONFIG_USB_EZUSB=y · 7 unmodified lines
867	884	# CONFIG_USB_LEGOTOWER is not set
868	885	# CONFIG_USB_LCD is not set
869	886	# CONFIG_USB_LED is not set
	887	+# CONFIG_USB_CYPRESS_CY7C63 is not set
870	888	# CONFIG_USB_CYTHERM is not set
871	889	# CONFIG_USB_PHIDGETKIT is not set
872	890	# CONFIG_USB_PHIDGETSERVO is not set
873	891	# CONFIG_USB_IDMOUSE is not set
	892	+# CONFIG_USB_APPLEDISPLAY is not set
874	893	# CONFIG_USB_SISUSBVGA is not set
875	894	# CONFIG_USB_LD is not set
876	895	# CONFIG_USB_TEST is not set
@@ -889,6 +908,19 @@ CONFIG_USB_EZUSB=y · 12 unmodified lines
889	908	#
890	909	# CONFIG_MMC is not set
891	910
	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	+
892	924	#
893	925	# InfiniBand support
894	926	#
@@ -898,6 +930,24 @@ CONFIG_USB_EZUSB=y · 3 unmodified lines
898	930	# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
899	931	#
900	932
	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	+
901	951	#
902	952	# File systems
903	953	#
@@ -917,6 +967,7 @@ CONFIG_FS_POSIX_ACL=y · 13 unmodified lines
917	967	# CONFIG_MINIX_FS is not set
918	968	# CONFIG_ROMFS_FS is not set
919	969	CONFIG_INOTIFY=y
	970	+CONFIG_INOTIFY_USER=y
920	971	# CONFIG_QUOTA is not set
921	972	CONFIG_DNOTIFY=y
922	973	# CONFIG_AUTOFS_FS is not set
@@ -949,7 +1000,6 @@ CONFIG_TMPFS=y · 26 unmodified lines
949	1000	CONFIG_HUGETLBFS=y
950	1001	CONFIG_HUGETLB_PAGE=y
951	1002	CONFIG_RAMFS=y
952		−# CONFIG_RELAYFS_FS is not set
953	1003	# CONFIG_CONFIGFS_FS is not set
954	1004
955	1005	#
@@ -1067,6 +1117,7 @@ CONFIG_CRC_CCITT=y · 111 unmodified lines
1067	1117	CONFIG_CRC32=y
1068	1118	# CONFIG_LIBCRC32C is not set
1069	1119	CONFIG_ZLIB_INFLATE=y
	1120	+CONFIG_PLIST=y
1070	1121
1071	1122	#
1072	1123	# Instrumentation Support
@@ -1079,14 +1130,20 @@ CONFIG_ZLIB_INFLATE=y · 6 unmodified lines
1079	1130	#
1080	1131	# CONFIG_PRINTK_TIME is not set
1081	1132	CONFIG_MAGIC_SYSRQ=y
	1133	+# CONFIG_UNUSED_SYMBOLS is not set
1082	1134	CONFIG_DEBUG_KERNEL=y
1083	1135	CONFIG_LOG_BUF_SHIFT=17
1084	1136	CONFIG_DETECT_SOFTLOCKUP=y
1085	1137	# CONFIG_SCHEDSTATS is not set
1086	1138	CONFIG_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	1142	# CONFIG_DEBUG_SPINLOCK is not set
	1143	+# CONFIG_DEBUG_MUTEXES is not set
	1144	+# CONFIG_DEBUG_RWSEMS is not set
1089	1145	CONFIG_DEBUG_SPINLOCK_SLEEP=y
	1146	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1090	1147	# CONFIG_DEBUG_KOBJECT is not set
1091	1148	# CONFIG_DEBUG_INFO is not set
1092	1149	CONFIG_DEBUG_FS=y
@@ -1100,11 +1157,7 @@ CONFIG_XMON=y · 7 unmodified lines
1100	1157	CONFIG_XMON_DEFAULT=y
1101	1158	# CONFIG_IRQSTACKS is not set
1102	1159	CONFIG_BOOTX_TEXT=y
1103		−# CONFIG_PPC_EARLY_DEBUG_LPAR 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
	1160	+# CONFIG_PPC_EARLY_DEBUG is not set
1108	1161
1109	1162	#
1110	1163	# Security options

arch/powerpc/configs/mpc7448_hpc2_defconfig+52−12

@@ -1,16 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.17-rc4
4		−# Sat May 27 18:45:55 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:26:55 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12	13	CONFIG_GENERIC_HWEIGHT=y
13	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
14	16	CONFIG_PPC=y
15	17	CONFIG_EARLY_PRINTK=y
16	18	CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_CLASSIC32=y · 12 unmodified lines
29	31	# CONFIG_PPC_82xx is not set
30	32	# CONFIG_PPC_83xx is not set
31	33	# CONFIG_PPC_85xx is not set
	34	+# CONFIG_PPC_86xx is not set
32	35	# CONFIG_40x is not set
33	36	# CONFIG_44x is not set
34	37	# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_PPC_FPU=y · 4 unmodified lines
39	42	CONFIG_PPC_STD_MMU=y
40	43	CONFIG_PPC_STD_MMU_32=y
41	44	# CONFIG_SMP is not set
	45	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42	46
43	47	#
44	48	# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y · 11 unmodified lines
56	60	CONFIG_SYSVIPC=y
57	61	# CONFIG_POSIX_MQUEUE is not set
58	62	# CONFIG_BSD_PROCESS_ACCT is not set
	63	+# CONFIG_TASKSTATS is not set
59	64	CONFIG_SYSCTL=y
60	65	# CONFIG_AUDIT is not set
61	66	# CONFIG_IKCONFIG is not set
@@ -70,10 +75,12 @@ CONFIG_PRINTK=y · 8 unmodified lines
70	75	CONFIG_BUG=y
71	76	CONFIG_ELF_CORE=y
72	77	CONFIG_BASE_FULL=y
	78	+CONFIG_RT_MUTEXES=y
73	79	CONFIG_FUTEX=y
74	80	CONFIG_EPOLL=y
75	81	CONFIG_SHMEM=y
76	82	CONFIG_SLAB=y
	83	+CONFIG_VM_EVENT_COUNTERS=y
77	84	# CONFIG_TINY_SHMEM is not set
78	85	CONFIG_BASE_SMALL=0
79	86	# CONFIG_SLOB is not set
@@ -110,13 +117,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" · 30 unmodified lines
110	117	# CONFIG_PPC_ISERIES is not set
111	118	CONFIG_EMBEDDED6xx=y
112	119	# CONFIG_APUS is not set
113		−CONFIG_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	123	# CONFIG_PPC_RTAS is not set
115	124	# CONFIG_MMIO_NVRAM is not set
116	125	# CONFIG_PPC_MPC106 is not set
117	126	# CONFIG_PPC_970_NAP is not set
118	127	# CONFIG_CPU_FREQ is not set
119	128	# CONFIG_TAU is not set
	129	+# CONFIG_PPC_TODC is not set
120	130	# CONFIG_KATANA is not set
121	131	# CONFIG_WILLOW is not set
122	132	# CONFIG_CPCI690 is not set
@@ -146,6 +156,7 @@ CONFIG_MPC7448HPC2=y · 23 unmodified lines
146	156	# CONFIG_EV64360 is not set
147	157	CONFIG_TSI108_BRIDGE=y
148	158	# CONFIG_WANT_EARLY_SERIAL is not set
	159	+CONFIG_MPIC=y
149	160
150	161	#
151	162	# Kernel options
@@ -160,6 +171,7 @@ CONFIG_PREEMPT_NONE=y · 8 unmodified lines
160	171	# CONFIG_PREEMPT is not set
161	172	CONFIG_BINFMT_ELF=y
162	173	CONFIG_BINFMT_MISC=y
	174	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
163	175	CONFIG_ARCH_FLATMEM_ENABLE=y
164	176	CONFIG_SELECT_MEMORY_MODEL=y
165	177	CONFIG_FLATMEM_MANUAL=y
@@ -169,10 +181,10 @@ CONFIG_FLATMEM=y · 3 unmodified lines
169	181	CONFIG_FLAT_NODE_MEM_MAP=y
170	182	# CONFIG_SPARSEMEM_STATIC is not set
171	183	CONFIG_SPLIT_PTLOCK_CPUS=4
	184	+# CONFIG_RESOURCES_64BIT is not set
172	185	CONFIG_PROC_DEVICETREE=y
173	186	# CONFIG_CMDLINE_BOOL is not set
174	187	# CONFIG_PM is not set
175		−# CONFIG_SOFTWARE_SUSPEND is not set
176	188	# CONFIG_SECCOMP is not set
177	189	CONFIG_ISA_DMA_API=y
178	190
@@ -180,10 +192,12 @@ CONFIG_ISA_DMA_API=y · 1 unmodified line
180	192	# Bus options
181	193	#
182	194	CONFIG_GENERIC_ISA_DMA=y
	195	+CONFIG_MPIC_WEIRD=y
183	196	# CONFIG_PPC_I8259 is not set
184	197	# CONFIG_PPC_INDIRECT_PCI is not set
185	198	CONFIG_PCI=y
186	199	CONFIG_PCI_DOMAINS=y
	200	+# CONFIG_PCIEPORTBUS is not set
187	201
188	202	#
189	203	# PCCARD (PCMCIA/CardBus) support
@@ -221,6 +235,8 @@ CONFIG_NET=y · 31 unmodified lines
221	235	CONFIG_PACKET=y
222	236	# CONFIG_PACKET_MMAP is not set
223	237	CONFIG_UNIX=y
	238	+CONFIG_XFRM=y
	239	+CONFIG_XFRM_USER=y
224	240	# CONFIG_NET_KEY is not set
225	241	CONFIG_INET=y
226	242	CONFIG_IP_MULTICAST=y
@@ -240,6 +256,8 @@ CONFIG_SYN_COOKIES=y · 13 unmodified lines
240	256	# CONFIG_INET_IPCOMP is not set
241	257	# CONFIG_INET_XFRM_TUNNEL is not set
242	258	# CONFIG_INET_TUNNEL is not set
	259	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	260	+CONFIG_INET_XFRM_MODE_TUNNEL=y
243	261	CONFIG_INET_DIAG=y
244	262	CONFIG_INET_TCP_DIAG=y
245	263	# CONFIG_TCP_CONG_ADVANCED is not set
@@ -247,6 +265,7 @@ CONFIG_TCP_CONG_BIC=y · 1 unmodified line
247	265	# CONFIG_IPV6 is not set
248	266	# CONFIG_INET6_XFRM_TUNNEL is not set
249	267	# CONFIG_INET6_TUNNEL is not set
	268	+# CONFIG_NETWORK_SECMARK is not set
250	269	# CONFIG_NETFILTER is not set
251	270
252	271	#
@@ -300,6 +319,7 @@ CONFIG_TCP_CONG_BIC=y · 47 unmodified lines
300	319	CONFIG_STANDALONE=y
301	320	CONFIG_PREVENT_FIRMWARE_BUILD=y
302	321	# CONFIG_FW_LOADER is not set
	322	+# CONFIG_SYS_HYPERVISOR is not set
303	323
304	324	#
305	325	# Connector - unified userspace <-> kernelspace linker
@@ -336,6 +356,7 @@ CONFIG_BLK_DEV_LOOP=y · 30 unmodified lines
336	356	CONFIG_BLK_DEV_RAM=y
337	357	CONFIG_BLK_DEV_RAM_COUNT=16
338	358	CONFIG_BLK_DEV_RAM_SIZE=131072
	359	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
339	360	CONFIG_BLK_DEV_INITRD=y
340	361	# CONFIG_CDROM_PKTCDVD is not set
341	362	# CONFIG_ATA_OVER_ETH is not set
@@ -399,6 +420,7 @@ CONFIG_SCSI_SATA=y · 57 unmodified lines
399	420	CONFIG_SCSI_SATA_MV=y
400	421	# CONFIG_SCSI_SATA_NV is not set
401	422	# CONFIG_SCSI_PDC_ADMA is not set
	423	+# CONFIG_SCSI_HPTIOP is not set
402	424	# CONFIG_SCSI_SATA_QSTOR is not set
403	425	# CONFIG_SCSI_SATA_PROMISE is not set
404	426	# CONFIG_SCSI_SATA_SX4 is not set
@@ -481,6 +503,9 @@ CONFIG_PHYLIB=y · 76 unmodified lines
481	503	# CONFIG_QSEMI_PHY is not set
482	504	# CONFIG_LXT_PHY is not set
483	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	511	# Ethernet (10 or 100Mbit)
@@ -538,7 +563,6 @@ CONFIG_8139TOO=y · 51 unmodified lines
538	563	# CONFIG_VIA_VELOCITY is not set
539	564	# CONFIG_TIGON3 is not set
540	565	# CONFIG_BNX2 is not set
541		−CONFIG_TSI108_ETH=y
542	566
543	567	#
544	568	# Ethernet (10000 Mbit)
@@ -546,6 +570,7 @@ CONFIG_TSI108_ETH=y · 1 unmodified line
546	570	# CONFIG_CHELSIO_T1 is not set
547	571	# CONFIG_IXGB is not set
548	572	# CONFIG_S2IO is not set
	573	+# CONFIG_MYRI10GE is not set
549	574
550	575	#
551	576	# Token Ring devices
@@ -645,6 +670,7 @@ CONFIG_LEGACY_PTY_COUNT=256 · 93 unmodified lines
645	670	# Watchdog Cards
646	671	#
647	672	# CONFIG_WATCHDOG is not set
	673	+# CONFIG_HW_RANDOM is not set
648	674	# CONFIG_NVRAM is not set
649	675	CONFIG_GEN_RTC=y
650	676	# CONFIG_GEN_RTC_X is not set
@@ -679,13 +705,13 @@ CONFIG_GEN_RTC=y · 28 unmodified lines
679	705	#
680	706	# Dallas's 1-wire bus
681	707	#
682		−# CONFIG_W1 is not set
683	708
684	709	#
685	710	# Hardware Monitoring support
686	711	#
687	712	CONFIG_HWMON=y
688	713	# CONFIG_HWMON_VID is not set
	714	+# CONFIG_SENSORS_ABITUGURU is not set
689	715	# CONFIG_SENSORS_F71805F is not set
690	716	# CONFIG_HWMON_DEBUG_CHIP is not set
691	717
@@ -697,6 +723,7 @@ CONFIG_HWMON=y · 5 unmodified lines
697	723	# Multimedia devices
698	724	#
699	725	# CONFIG_VIDEO_DEV is not set
	726	+CONFIG_VIDEO_V4L2=y
700	727
701	728	#
702	729	# Digital Video Broadcasting Devices
@@ -706,7 +733,9 @@ CONFIG_HWMON=y · 3 unmodified lines
706	733	#
707	734	# Graphics support
708	735	#
	736	+CONFIG_FIRMWARE_EDID=y
709	737	# CONFIG_FB is not set
	738	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
710	739
711	740	#
712	741	# Sound
@@ -762,6 +791,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y · 49 unmodified lines
762	791	#
763	792	# CONFIG_RTC_CLASS is not set
764	793
	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	+
765	807	#
766	808	# File systems
767	809	#
@@ -783,6 +825,7 @@ CONFIG_FS_MBCACHE=y · 15 unmodified lines
783	825	# CONFIG_MINIX_FS is not set
784	826	# CONFIG_ROMFS_FS is not set
785	827	CONFIG_INOTIFY=y
	828	+CONFIG_INOTIFY_USER=y
786	829	# CONFIG_QUOTA is not set
787	830	CONFIG_DNOTIFY=y
788	831	# CONFIG_AUTOFS_FS is not set
@@ -884,6 +927,7 @@ CONFIG_MSDOS_PARTITION=y · 95 unmodified lines
884	927	# CONFIG_CRC16 is not set
885	928	CONFIG_CRC32=y
886	929	# CONFIG_LIBCRC32C is not set
	930	+CONFIG_PLIST=y
887	931
888	932	#
889	933	# Instrumentation Support
@@ -895,17 +939,13 @@ CONFIG_CRC32=y · 5 unmodified lines
895	939	#
896	940	# CONFIG_PRINTK_TIME is not set
897	941	# CONFIG_MAGIC_SYSRQ is not set
	942	+# CONFIG_UNUSED_SYMBOLS is not set
898	943	# CONFIG_DEBUG_KERNEL is not set
899	944	CONFIG_LOG_BUF_SHIFT=14
900	945	# CONFIG_DEBUG_FS is not set
901	946	# CONFIG_UNWIND_INFO is not set
902	947	# CONFIG_BOOTX_TEXT is not set
903		−# CONFIG_SERIAL_TEXT_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
	948	+# CONFIG_PPC_EARLY_DEBUG is not set
909	949
910	950	#
911	951	# Security options

arch/powerpc/configs/mpc834x_itx_defconfig+14−6

@@ -1,7 +1,7 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.17
4		−# Fri Jun 30 17:53:25 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:28:05 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
@@ -60,6 +60,7 @@ CONFIG_SWAP=y · 52 unmodified lines
60	60	CONFIG_SYSVIPC=y
61	61	# CONFIG_POSIX_MQUEUE is not set
62	62	# CONFIG_BSD_PROCESS_ACCT is not set
	63	+# CONFIG_TASKSTATS is not set
63	64	CONFIG_SYSCTL=y
64	65	# CONFIG_AUDIT is not set
65	66	# CONFIG_IKCONFIG is not set
@@ -78,6 +79,7 @@ CONFIG_FUTEX=y · 12 unmodified lines
78	79	# CONFIG_EPOLL is not set
79	80	CONFIG_SHMEM=y
80	81	CONFIG_SLAB=y
	82	+CONFIG_VM_EVENT_COUNTERS=y
81	83	# CONFIG_TINY_SHMEM is not set
82	84	CONFIG_BASE_SMALL=0
83	85	# CONFIG_SLOB is not set
@@ -120,6 +122,7 @@ CONFIG_PPC_GEN550=y · 36 unmodified lines
120	122	# CONFIG_MPC834x_SYS is not set
121	123	CONFIG_MPC834x_ITX=y
122	124	CONFIG_MPC834x=y
	125	+# CONFIG_MPIC is not set
123	126
124	127	#
125	128	# Kernel options
@@ -148,7 +151,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 · 22 unmodified lines
148	151	CONFIG_PROC_DEVICETREE=y
149	152	# CONFIG_CMDLINE_BOOL is not set
150	153	# CONFIG_PM is not set
151		−# CONFIG_SOFTWARE_SUSPEND is not set
152	154	CONFIG_SECCOMP=y
153	155	CONFIG_ISA_DMA_API=y
154	156
@@ -156,6 +158,7 @@ CONFIG_ISA_DMA_API=y · 1 unmodified line
156	158	# Bus options
157	159	#
158	160	CONFIG_GENERIC_ISA_DMA=y
	161	+# CONFIG_MPIC_WEIRD is not set
159	162	# CONFIG_PPC_I8259 is not set
160	163	CONFIG_PPC_INDIRECT_PCI=y
161	164	CONFIG_FSL_SOC=y
@@ -401,6 +404,7 @@ CONFIG_BLK_DEV_LOOP=y · 239 unmodified lines
401	404	CONFIG_BLK_DEV_RAM=y
402	405	CONFIG_BLK_DEV_RAM_COUNT=16
403	406	CONFIG_BLK_DEV_RAM_SIZE=32768
	407	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
404	408	CONFIG_BLK_DEV_INITRD=y
405	409	# CONFIG_CDROM_PKTCDVD is not set
406	410	# CONFIG_ATA_OVER_ETH is not set
@@ -561,6 +565,7 @@ CONFIG_PHYLIB=y · 154 unmodified lines
561	565	CONFIG_CICADA_PHY=y
562	566	# CONFIG_VITESSE_PHY is not set
563	567	# CONFIG_SMSC_PHY is not set
	568	+# CONFIG_FIXED_PHY is not set
564	569
565	570	#
566	571	# Ethernet (10 or 100Mbit)
@@ -905,6 +910,7 @@ CONFIG_VIDEO_V4L2=y · 338 unmodified lines
905	910	#
906	911	CONFIG_FIRMWARE_EDID=y
907	912	# CONFIG_FB is not set
	913	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
908	914
909	915	#
910	916	# Sound
@@ -1025,7 +1031,7 @@ CONFIG_USB_MON=y · 114 unmodified lines
1025	1031	# CONFIG_USB_LEGOTOWER is not set
1026	1032	# CONFIG_USB_LCD is not set
1027	1033	# CONFIG_USB_LED is not set
1028		−# CONFIG_USB_CY7C63 is not set
	1034	+# CONFIG_USB_CYPRESS_CY7C63 is not set
1029	1035	# CONFIG_USB_CYTHERM is not set
1030	1036	# CONFIG_USB_PHIDGETKIT is not set
1031	1037	# CONFIG_USB_PHIDGETSERVO is not set
@@ -1110,6 +1116,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y · 78 unmodified lines
1110	1116	# CONFIG_RTC_DRV_X1205 is not set
1111	1117	CONFIG_RTC_DRV_DS1307=y
1112	1118	# CONFIG_RTC_DRV_DS1553 is not set
	1119	+# CONFIG_RTC_DRV_ISL1208 is not set
1113	1120	# CONFIG_RTC_DRV_DS1672 is not set
1114	1121	# CONFIG_RTC_DRV_DS1742 is not set
1115	1122	# CONFIG_RTC_DRV_PCF8563 is not set
@@ -1226,7 +1233,6 @@ CONFIG_RPCSEC_GSS_KRB5=y · 110 unmodified lines
1226	1233	# CONFIG_RPCSEC_GSS_SPKM3 is not set
1227	1234	# CONFIG_SMB_FS is not set
1228	1235	# CONFIG_CIFS is not set
1229		−# CONFIG_CIFS_DEBUG2 is not set
1230	1236	# CONFIG_NCP_FS is not set
1231	1237	# CONFIG_CODA_FS is not set
1232	1238	# CONFIG_AFS_FS is not set
@@ -1279,11 +1285,13 @@ CONFIG_LOG_BUF_SHIFT=17 · 46 unmodified lines
1279	1285	CONFIG_DETECT_SOFTLOCKUP=y
1280	1286	# CONFIG_SCHEDSTATS is not set
1281	1287	# CONFIG_DEBUG_SLAB is not set
1282		−# CONFIG_DEBUG_MUTEXES is not set
1283	1288	# CONFIG_DEBUG_RT_MUTEXES is not set
1284	1289	# CONFIG_RT_MUTEX_TESTER is not set
1285	1290	# CONFIG_DEBUG_SPINLOCK is not set
	1291	+# CONFIG_DEBUG_MUTEXES is not set
	1292	+# CONFIG_DEBUG_RWSEMS is not set
1286	1293	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	1294	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1287	1295	# CONFIG_DEBUG_KOBJECT is not set
1288	1296	CONFIG_DEBUG_INFO=y
1289	1297	# CONFIG_DEBUG_FS is not set

arch/powerpc/configs/mpc834x_mds_defconfig+80−24

@@ -1,15 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.16-rc6
4		−# Wed Mar 15 16:19:56 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:28:54 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
	13	+CONFIG_GENERIC_HWEIGHT=y
12	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
13	16	CONFIG_PPC=y
14	17	CONFIG_EARLY_PRINTK=y
15	18	CONFIG_GENERIC_NVRAM=y
@@ -27,17 +30,19 @@ CONFIG_DEFAULT_UIMAGE=y · 11 unmodified lines
27	30	# CONFIG_PPC_52xx is not set
28	31	# CONFIG_PPC_82xx is not set
29	32	CONFIG_PPC_83xx=y
	33	+# CONFIG_PPC_85xx is not set
	34	+# CONFIG_PPC_86xx is not set
30	35	# CONFIG_40x is not set
31	36	# CONFIG_44x is not set
32	37	# CONFIG_8xx is not set
33	38	# CONFIG_E200 is not set
34		−# CONFIG_E500 is not set
35	39	CONFIG_6xx=y
36	40	CONFIG_83xx=y
37	41	CONFIG_PPC_FPU=y
38	42	CONFIG_PPC_STD_MMU=y
39	43	CONFIG_PPC_STD_MMU_32=y
40	44	# CONFIG_SMP is not set
	45	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
41	46
42	47	#
43	48	# Code maturity level options
@@ -55,9 +60,11 @@ CONFIG_SWAP=y · 11 unmodified lines
55	60	CONFIG_SYSVIPC=y
56	61	# CONFIG_POSIX_MQUEUE is not set
57	62	# CONFIG_BSD_PROCESS_ACCT is not set
	63	+# CONFIG_TASKSTATS is not set
58	64	CONFIG_SYSCTL=y
59	65	# CONFIG_AUDIT is not set
60	66	# CONFIG_IKCONFIG is not set
	67	+# CONFIG_RELAY is not set
61	68	CONFIG_INITRAMFS_SOURCE=""
62	69	# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
63	70	CONFIG_EMBEDDED=y
@@ -67,14 +74,12 @@ CONFIG_PRINTK=y · 3 unmodified lines
67	74	CONFIG_BUG=y
68	75	CONFIG_ELF_CORE=y
69	76	CONFIG_BASE_FULL=y
	77	+CONFIG_RT_MUTEXES=y
70	78	CONFIG_FUTEX=y
71	79	# CONFIG_EPOLL is not set
72	80	CONFIG_SHMEM=y
73		−CONFIG_CC_ALIGN_FUNCTIONS=0
74		−CONFIG_CC_ALIGN_LABELS=0
75		−CONFIG_CC_ALIGN_LOOPS=0
76		−CONFIG_CC_ALIGN_JUMPS=0
77	81	CONFIG_SLAB=y
	82	+CONFIG_VM_EVENT_COUNTERS=y
78	83	# CONFIG_TINY_SHMEM is not set
79	84	CONFIG_BASE_SMALL=0
80	85	# CONFIG_SLOB is not set
@@ -85,7 +90,6 @@ CONFIG_BASE_SMALL=0 · 4 unmodified lines
85	90	CONFIG_MODULES=y
86	91	CONFIG_MODULE_UNLOAD=y
87	92	# CONFIG_MODULE_FORCE_UNLOAD is not set
88		−CONFIG_OBSOLETE_MODPARM=y
89	93	# CONFIG_MODVERSIONS is not set
90	94	# CONFIG_MODULE_SRCVERSION_ALL is not set
91	95	# CONFIG_KMOD is not set
@@ -94,6 +98,8 @@ CONFIG_OBSOLETE_MODPARM=y · 2 unmodified lines
94	98	# Block layer
95	99	#
96	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	105	# IO Schedulers
@@ -114,7 +120,9 @@ CONFIG_PPC_GEN550=y · 14 unmodified lines
114	120	# Platform support
115	121	#
116	122	CONFIG_MPC834x_SYS=y
	123	+# CONFIG_MPC834x_ITX is not set
117	124	CONFIG_MPC834x=y
	125	+# CONFIG_MPIC is not set
118	126
119	127	#
120	128	# Kernel options
@@ -129,6 +137,7 @@ CONFIG_PREEMPT_NONE=y · 8 unmodified lines
129	137	# CONFIG_PREEMPT is not set
130	138	CONFIG_BINFMT_ELF=y
131	139	# CONFIG_BINFMT_MISC is not set
	140	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
132	141	CONFIG_ARCH_FLATMEM_ENABLE=y
133	142	CONFIG_SELECT_MEMORY_MODEL=y
134	143	CONFIG_FLATMEM_MANUAL=y
@@ -138,10 +147,10 @@ CONFIG_FLATMEM=y · 3 unmodified lines
138	147	CONFIG_FLAT_NODE_MEM_MAP=y
139	148	# CONFIG_SPARSEMEM_STATIC is not set
140	149	CONFIG_SPLIT_PTLOCK_CPUS=4
	150	+# CONFIG_RESOURCES_64BIT is not set
141	151	CONFIG_PROC_DEVICETREE=y
142	152	# CONFIG_CMDLINE_BOOL is not set
143	153	# CONFIG_PM is not set
144		−# CONFIG_SOFTWARE_SUSPEND is not set
145	154	CONFIG_SECCOMP=y
146	155	CONFIG_ISA_DMA_API=y
147	156
@@ -149,12 +158,13 @@ CONFIG_ISA_DMA_API=y · 1 unmodified line
149	158	# Bus options
150	159	#
151	160	CONFIG_GENERIC_ISA_DMA=y
	161	+# CONFIG_MPIC_WEIRD is not set
152	162	# CONFIG_PPC_I8259 is not set
153	163	CONFIG_PPC_INDIRECT_PCI=y
154	164	CONFIG_FSL_SOC=y
155	165	CONFIG_PCI=y
156	166	CONFIG_PCI_DOMAINS=y
157		−# CONFIG_PCI_LEGACY_PROC is not set
	167	+# CONFIG_PCIEPORTBUS is not set
158	168
159	169	#
160	170	# PCCARD (PCMCIA/CardBus) support
@@ -192,6 +202,8 @@ CONFIG_NET=y · 31 unmodified lines
192	202	CONFIG_PACKET=y
193	203	# CONFIG_PACKET_MMAP is not set
194	204	CONFIG_UNIX=y
	205	+CONFIG_XFRM=y
	206	+CONFIG_XFRM_USER=m
195	207	# CONFIG_NET_KEY is not set
196	208	CONFIG_INET=y
197	209	CONFIG_IP_MULTICAST=y
@@ -209,12 +221,18 @@ CONFIG_SYN_COOKIES=y · 11 unmodified lines
209	221	# CONFIG_INET_AH is not set
210	222	# CONFIG_INET_ESP is not set
211	223	# CONFIG_INET_IPCOMP is not set
	224	+# CONFIG_INET_XFRM_TUNNEL is not set
212	225	# CONFIG_INET_TUNNEL is not set
	226	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	227	+CONFIG_INET_XFRM_MODE_TUNNEL=y
213	228	CONFIG_INET_DIAG=y
214	229	CONFIG_INET_TCP_DIAG=y
215	230	# CONFIG_TCP_CONG_ADVANCED is not set
216	231	CONFIG_TCP_CONG_BIC=y
217	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	236	# CONFIG_NETFILTER is not set
219	237
220	238	#
@@ -268,6 +286,7 @@ CONFIG_TCP_CONG_BIC=y · 47 unmodified lines
268	286	CONFIG_STANDALONE=y
269	287	CONFIG_PREVENT_FIRMWARE_BUILD=y
270	288	# CONFIG_FW_LOADER is not set
	289	+# CONFIG_SYS_HYPERVISOR is not set
271	290
272	291	#
273	292	# Connector - unified userspace <-> kernelspace linker
@@ -304,6 +323,7 @@ CONFIG_BLK_DEV_LOOP=y · 30 unmodified lines
304	323	CONFIG_BLK_DEV_RAM=y
305	324	CONFIG_BLK_DEV_RAM_COUNT=16
306	325	CONFIG_BLK_DEV_RAM_SIZE=32768
	326	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
307	327	CONFIG_BLK_DEV_INITRD=y
308	328	# CONFIG_CDROM_PKTCDVD is not set
309	329	# CONFIG_ATA_OVER_ETH is not set
@@ -371,6 +391,9 @@ CONFIG_MARVELL_PHY=y · 61 unmodified lines
371	391	# CONFIG_QSEMI_PHY is not set
372	392	# CONFIG_LXT_PHY is not set
373	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	399	# Ethernet (10 or 100Mbit)
@@ -433,6 +456,7 @@ CONFIG_GIANFAR=y · 56 unmodified lines
433	456	# CONFIG_CHELSIO_T1 is not set
434	457	# CONFIG_IXGB is not set
435	458	# CONFIG_S2IO is not set
	459	+# CONFIG_MYRI10GE is not set
436	460
437	461	#
438	462	# Token Ring devices
@@ -507,6 +531,7 @@ CONFIG_INPUT=y · 68 unmodified lines
507	531	#
508	532	CONFIG_SERIAL_8250=y
509	533	CONFIG_SERIAL_8250_CONSOLE=y
	534	+CONFIG_SERIAL_8250_PCI=y
510	535	CONFIG_SERIAL_8250_NR_UARTS=4
511	536	CONFIG_SERIAL_8250_RUNTIME_UARTS=4
512	537	# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -543,6 +568,7 @@ CONFIG_83xx_WDT=y · 30 unmodified lines
543	568	#
544	569	# CONFIG_PCIPCWATCHDOG is not set
545	570	# CONFIG_WDTPCI is not set
	571	+# CONFIG_HW_RANDOM is not set
546	572	# CONFIG_NVRAM is not set
547	573	CONFIG_GEN_RTC=y
548	574	# CONFIG_GEN_RTC_X is not set
@@ -589,10 +615,10 @@ CONFIG_I2C_CHARDEV=y · 40 unmodified lines
589	615	# CONFIG_I2C_PIIX4 is not set
590	616	CONFIG_I2C_MPC=y
591	617	# CONFIG_I2C_NFORCE2 is not set
	618	+# CONFIG_I2C_OCORES is not set
592	619	# CONFIG_I2C_PARPORT_LIGHT is not set
593	620	# CONFIG_I2C_PROSAVAGE is not set
594	621	# CONFIG_I2C_SAVAGE4 is not set
595		−# CONFIG_SCx200_ACB is not set
596	622	# CONFIG_I2C_SIS5595 is not set
597	623	# CONFIG_I2C_SIS630 is not set
598	624	# CONFIG_I2C_SIS96X is not set
@@ -611,10 +637,8 @@ CONFIG_I2C_MPC=y · 12 unmodified lines
611	637	# CONFIG_SENSORS_PCF8574 is not set
612	638	# CONFIG_SENSORS_PCA9539 is not set
613	639	# CONFIG_SENSORS_PCF8591 is not set
614		−# CONFIG_SENSORS_RTC8564 is not set
615	640	# CONFIG_SENSORS_M41T00 is not set
616	641	# CONFIG_SENSORS_MAX6875 is not set
617		−# CONFIG_RTC_X1205_I2C is not set
618	642	# CONFIG_I2C_DEBUG_CORE is not set
619	643	# CONFIG_I2C_DEBUG_ALGO is not set
620	644	# CONFIG_I2C_DEBUG_BUS is not set
@@ -629,13 +653,13 @@ CONFIG_I2C_MPC=y · 8 unmodified lines
629	653	#
630	654	# Dallas's 1-wire bus
631	655	#
632		−# CONFIG_W1 is not set
633	656
634	657	#
635	658	# Hardware Monitoring support
636	659	#
637	660	CONFIG_HWMON=y
638	661	# CONFIG_HWMON_VID is not set
	662	+# CONFIG_SENSORS_ABITUGURU is not set
639	663	# CONFIG_SENSORS_ADM1021 is not set
640	664	# CONFIG_SENSORS_ADM1025 is not set
641	665	# CONFIG_SENSORS_ADM1026 is not set
@@ -664,10 +688,12 @@ CONFIG_HWMON=y · 22 unmodified lines
664	688	# CONFIG_SENSORS_PC87360 is not set
665	689	# CONFIG_SENSORS_SIS5595 is not set
666	690	# CONFIG_SENSORS_SMSC47M1 is not set
	691	+# CONFIG_SENSORS_SMSC47M192 is not set
667	692	# CONFIG_SENSORS_SMSC47B397 is not set
668	693	# CONFIG_SENSORS_VIA686A is not set
669	694	# CONFIG_SENSORS_VT8231 is not set
670	695	# CONFIG_SENSORS_W83781D is not set
	696	+# CONFIG_SENSORS_W83791D is not set
671	697	# CONFIG_SENSORS_W83792D is not set
672	698	# CONFIG_SENSORS_W83L785TS is not set
673	699	# CONFIG_SENSORS_W83627HF is not set
@@ -678,14 +704,11 @@ CONFIG_HWMON=y · 4 unmodified lines
678	704	# Misc devices
679	705	#
680	706
681		−#
682		−# Multimedia Capabilities Port drivers
683		−#
684		−
685	707	#
686	708	# Multimedia devices
687	709	#
688	710	# CONFIG_VIDEO_DEV is not set
	711	+CONFIG_VIDEO_V4L2=y
689	712
690	713	#
691	714	# Digital Video Broadcasting Devices
@@ -695,7 +718,9 @@ CONFIG_HWMON=y · 3 unmodified lines
695	718	#
696	719	# Graphics support
697	720	#
	721	+CONFIG_FIRMWARE_EDID=y
698	722	# CONFIG_FB is not set
	723	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
699	724
700	725	#
701	726	# Sound
@@ -707,6 +732,7 @@ CONFIG_HWMON=y · 5 unmodified lines
707	732	#
708	733	CONFIG_USB_ARCH_HAS_HCD=y
709	734	CONFIG_USB_ARCH_HAS_OHCI=y
	735	+CONFIG_USB_ARCH_HAS_EHCI=y
710	736	# CONFIG_USB is not set
711	737
712	738	#
@@ -723,6 +749,19 @@ CONFIG_USB_ARCH_HAS_OHCI=y · 10 unmodified lines
723	749	#
724	750	# CONFIG_MMC is not set
725	751
	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	+
726	765	#
727	766	# InfiniBand support
728	767	#
@@ -732,6 +771,24 @@ CONFIG_USB_ARCH_HAS_OHCI=y · 3 unmodified lines
732	771	# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
733	772	#
734	773
	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	+
735	792	#
736	793	# File systems
737	794	#
@@ -753,6 +810,7 @@ CONFIG_FS_MBCACHE=y · 15 unmodified lines
753	810	# CONFIG_MINIX_FS is not set
754	811	# CONFIG_ROMFS_FS is not set
755	812	CONFIG_INOTIFY=y
	813	+CONFIG_INOTIFY_USER=y
756	814	# CONFIG_QUOTA is not set
757	815	CONFIG_DNOTIFY=y
758	816	# CONFIG_AUTOFS_FS is not set
@@ -781,7 +839,6 @@ CONFIG_SYSFS=y · 22 unmodified lines
781	839	CONFIG_TMPFS=y
782	840	# CONFIG_HUGETLB_PAGE is not set
783	841	CONFIG_RAMFS=y
784		−# CONFIG_RELAYFS_FS is not set
785	842	# CONFIG_CONFIGFS_FS is not set
786	843
787	844	#
@@ -854,6 +911,7 @@ CONFIG_PARTITION_ADVANCED=y · 66 unmodified lines
854	911	# CONFIG_CRC16 is not set
855	912	CONFIG_CRC32=y
856	913	# CONFIG_LIBCRC32C is not set
	914	+CONFIG_PLIST=y
857	915
858	916	#
859	917	# Instrumentation Support
@@ -865,15 +923,13 @@ CONFIG_CRC32=y · 5 unmodified lines
865	923	#
866	924	# CONFIG_PRINTK_TIME is not set
867	925	# CONFIG_MAGIC_SYSRQ is not set
	926	+# CONFIG_UNUSED_SYMBOLS is not set
868	927	# CONFIG_DEBUG_KERNEL is not set
869	928	CONFIG_LOG_BUF_SHIFT=14
	929	+# CONFIG_DEBUG_FS is not set
870	930	# CONFIG_BOOTX_TEXT is not set
871	931	# CONFIG_SERIAL_TEXT_DEBUG is not set
872		−# CONFIG_PPC_EARLY_DEBUG_LPAR 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
	932	+# CONFIG_PPC_EARLY_DEBUG is not set
877	933
878	934	#
879	935	# Security options

arch/powerpc/configs/mpc8540_ads_defconfig+72−12

@@ -1,16 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.16
4		−# Mon Mar 27 23:37:36 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:29:23 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12	13	CONFIG_GENERIC_HWEIGHT=y
13	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
14	16	CONFIG_PPC=y
15	17	CONFIG_EARLY_PRINTK=y
16	18	CONFIG_GENERIC_NVRAM=y
@@ -29,6 +31,7 @@ CONFIG_DEFAULT_UIMAGE=y · 12 unmodified lines
29	31	# CONFIG_PPC_82xx is not set
30	32	# CONFIG_PPC_83xx is not set
31	33	CONFIG_PPC_85xx=y
	34	+# CONFIG_PPC_86xx is not set
32	35	# CONFIG_40x is not set
33	36	# CONFIG_44x is not set
34	37	# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_BOOKE=y · 4 unmodified lines
39	42	CONFIG_FSL_BOOKE=y
40	43	# CONFIG_PHYS_64BIT is not set
41	44	CONFIG_SPE=y
	45	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42	46
43	47	#
44	48	# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y · 11 unmodified lines
56	60	CONFIG_SYSVIPC=y
57	61	# CONFIG_POSIX_MQUEUE is not set
58	62	# CONFIG_BSD_PROCESS_ACCT is not set
	63	+# CONFIG_TASKSTATS is not set
59	64	CONFIG_SYSCTL=y
60	65	# CONFIG_AUDIT is not set
61	66	# CONFIG_IKCONFIG is not set
@@ -71,10 +76,12 @@ CONFIG_PRINTK=y · 9 unmodified lines
71	76	CONFIG_BUG=y
72	77	CONFIG_ELF_CORE=y
73	78	CONFIG_BASE_FULL=y
	79	+CONFIG_RT_MUTEXES=y
74	80	CONFIG_FUTEX=y
75	81	CONFIG_EPOLL=y
76	82	CONFIG_SHMEM=y
77	83	CONFIG_SLAB=y
	84	+CONFIG_VM_EVENT_COUNTERS=y
78	85	# CONFIG_TINY_SHMEM is not set
79	86	CONFIG_BASE_SMALL=0
80	87	# CONFIG_SLOB is not set
@@ -103,15 +110,16 @@ CONFIG_DEFAULT_AS=y · 22 unmodified lines
103	110	# CONFIG_DEFAULT_CFQ is not set
104	111	# CONFIG_DEFAULT_NOOP is not set
105	112	CONFIG_DEFAULT_IOSCHED="anticipatory"
106		−CONFIG_MPIC=y
107	113	# CONFIG_WANT_EARLY_SERIAL is not set
108	114
109	115	#
110	116	# Platform support
111	117	#
112	118	CONFIG_MPC8540_ADS=y
	119	+# CONFIG_MPC85xx_CDS is not set
113	120	CONFIG_MPC8540=y
114	121	CONFIG_PPC_INDIRECT_PCI_BE=y
	122	+CONFIG_MPIC=y
115	123
116	124	#
117	125	# Kernel options
@@ -127,6 +135,7 @@ CONFIG_PREEMPT_NONE=y · 9 unmodified lines
127	135	CONFIG_BINFMT_ELF=y
128	136	CONFIG_BINFMT_MISC=y
129	137	CONFIG_MATH_EMULATION=y
	138	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
130	139	CONFIG_ARCH_FLATMEM_ENABLE=y
131	140	CONFIG_SELECT_MEMORY_MODEL=y
132	141	CONFIG_FLATMEM_MANUAL=y
@@ -136,16 +145,17 @@ CONFIG_FLATMEM=y · 3 unmodified lines
136	145	CONFIG_FLAT_NODE_MEM_MAP=y
137	146	# CONFIG_SPARSEMEM_STATIC is not set
138	147	CONFIG_SPLIT_PTLOCK_CPUS=4
	148	+# CONFIG_RESOURCES_64BIT is not set
139	149	CONFIG_PROC_DEVICETREE=y
140	150	# CONFIG_CMDLINE_BOOL is not set
141	151	# CONFIG_PM is not set
142		−# CONFIG_SOFTWARE_SUSPEND is not set
143	152	# CONFIG_SECCOMP is not set
144	153	CONFIG_ISA_DMA_API=y
145	154
146	155	#
147	156	# Bus options
148	157	#
	158	+# CONFIG_MPIC_WEIRD is not set
149	159	# CONFIG_PPC_I8259 is not set
150	160	CONFIG_PPC_INDIRECT_PCI=y
151	161	CONFIG_FSL_SOC=y
@@ -187,6 +197,8 @@ CONFIG_NET=y · 35 unmodified lines
187	197	CONFIG_PACKET=y
188	198	# CONFIG_PACKET_MMAP is not set
189	199	CONFIG_UNIX=y
	200	+CONFIG_XFRM=y
	201	+CONFIG_XFRM_USER=y
190	202	# CONFIG_NET_KEY is not set
191	203	CONFIG_INET=y
192	204	CONFIG_IP_MULTICAST=y
@@ -204,12 +216,18 @@ CONFIG_SYN_COOKIES=y · 11 unmodified lines
204	216	# CONFIG_INET_AH is not set
205	217	# CONFIG_INET_ESP is not set
206	218	# CONFIG_INET_IPCOMP is not set
	219	+# CONFIG_INET_XFRM_TUNNEL is not set
207	220	# CONFIG_INET_TUNNEL is not set
	221	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	222	+CONFIG_INET_XFRM_MODE_TUNNEL=y
208	223	CONFIG_INET_DIAG=y
209	224	CONFIG_INET_TCP_DIAG=y
210	225	# CONFIG_TCP_CONG_ADVANCED is not set
211	226	CONFIG_TCP_CONG_BIC=y
212	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	231	# CONFIG_NETFILTER is not set
214	232
215	233	#
@@ -264,6 +282,7 @@ CONFIG_STANDALONE=y · 48 unmodified lines
264	282	CONFIG_PREVENT_FIRMWARE_BUILD=y
265	283	# CONFIG_FW_LOADER is not set
266	284	# CONFIG_DEBUG_DRIVER is not set
	285	+# CONFIG_SYS_HYPERVISOR is not set
267	286
268	287	#
269	288	# Connector - unified userspace <-> kernelspace linker
@@ -295,6 +314,7 @@ CONFIG_BLK_DEV_LOOP=y · 25 unmodified lines
295	314	CONFIG_BLK_DEV_RAM=y
296	315	CONFIG_BLK_DEV_RAM_COUNT=16
297	316	CONFIG_BLK_DEV_RAM_SIZE=32768
	317	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
298	318	CONFIG_BLK_DEV_INITRD=y
299	319	# CONFIG_CDROM_PKTCDVD is not set
300	320	# CONFIG_ATA_OVER_ETH is not set
@@ -355,6 +375,9 @@ CONFIG_PHYLIB=y · 54 unmodified lines
355	375	# CONFIG_QSEMI_PHY is not set
356	376	# CONFIG_LXT_PHY is not set
357	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	383	# Ethernet (10 or 100Mbit)
@@ -464,6 +487,7 @@ CONFIG_LEGACY_PTY_COUNT=256 · 103 unmodified lines
464	487	# Watchdog Cards
465	488	#
466	489	# CONFIG_WATCHDOG is not set
	490	+# CONFIG_HW_RANDOM is not set
467	491	# CONFIG_NVRAM is not set
468	492	CONFIG_GEN_RTC=y
469	493	# CONFIG_GEN_RTC_X is not set
@@ -473,7 +497,6 @@ CONFIG_GEN_RTC=y · 3 unmodified lines
473	497	#
474	498	# Ftape, the floppy tape device driver
475	499	#
476		−# CONFIG_AGP is not set
477	500	# CONFIG_RAW_DRIVER is not set
478	501
479	502	#
@@ -496,13 +519,13 @@ CONFIG_GEN_RTC=y · 16 unmodified lines
496	519	#
497	520	# Dallas's 1-wire bus
498	521	#
499		−# CONFIG_W1 is not set
500	522
501	523	#
502	524	# Hardware Monitoring support
503	525	#
504	526	CONFIG_HWMON=y
505	527	# CONFIG_HWMON_VID is not set
	528	+# CONFIG_SENSORS_ABITUGURU is not set
506	529	# CONFIG_SENSORS_F71805F is not set
507	530	# CONFIG_HWMON_DEBUG_CHIP is not set
508	531
@@ -514,6 +537,7 @@ CONFIG_HWMON=y · 5 unmodified lines
514	537	# Multimedia devices
515	538	#
516	539	# CONFIG_VIDEO_DEV is not set
	540	+CONFIG_VIDEO_V4L2=y
517	541
518	542	#
519	543	# Digital Video Broadcasting Devices
@@ -523,7 +547,9 @@ CONFIG_HWMON=y · 3 unmodified lines
523	547	#
524	548	# Graphics support
525	549	#
	550	+CONFIG_FIRMWARE_EDID=y
526	551	# CONFIG_FB is not set
	552	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
527	553
528	554	#
529	555	# Sound
@@ -551,6 +577,19 @@ CONFIG_HWMON=y · 21 unmodified lines
551	577	#
552	578	# CONFIG_MMC is not set
553	579
	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	+
554	593	#
555	594	# InfiniBand support
556	595	#
@@ -559,6 +598,24 @@ CONFIG_HWMON=y · 2 unmodified lines
559	598	# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
560	599	#
561	600
	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	+
562	619	#
563	620	# File systems
564	621	#
@@ -580,6 +637,7 @@ CONFIG_FS_MBCACHE=y · 15 unmodified lines
580	637	# CONFIG_MINIX_FS is not set
581	638	# CONFIG_ROMFS_FS is not set
582	639	CONFIG_INOTIFY=y
	640	+CONFIG_INOTIFY_USER=y
583	641	# CONFIG_QUOTA is not set
584	642	CONFIG_DNOTIFY=y
585	643	# CONFIG_AUTOFS_FS is not set
@@ -677,6 +735,7 @@ CONFIG_PARTITION_ADVANCED=y · 91 unmodified lines
677	735	# CONFIG_CRC16 is not set
678	736	CONFIG_CRC32=y
679	737	# CONFIG_LIBCRC32C is not set
	738	+CONFIG_PLIST=y
680	739
681	740	#
682	741	# Instrumentation Support
@@ -688,14 +747,19 @@ CONFIG_CRC32=y · 5 unmodified lines
688	747	#
689	748	# CONFIG_PRINTK_TIME is not set
690	749	# CONFIG_MAGIC_SYSRQ is not set
	750	+# CONFIG_UNUSED_SYMBOLS is not set
691	751	CONFIG_DEBUG_KERNEL=y
692	752	CONFIG_LOG_BUF_SHIFT=14
693	753	CONFIG_DETECT_SOFTLOCKUP=y
694	754	# CONFIG_SCHEDSTATS is not set
695	755	# CONFIG_DEBUG_SLAB is not set
696		−CONFIG_DEBUG_MUTEXES=y
	756	+# CONFIG_DEBUG_RT_MUTEXES is not set
	757	+# CONFIG_RT_MUTEX_TESTER is not set
697	758	# CONFIG_DEBUG_SPINLOCK is not set
	759	+CONFIG_DEBUG_MUTEXES=y
	760	+# CONFIG_DEBUG_RWSEMS is not set
698	761	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	762	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
699	763	# CONFIG_DEBUG_KOBJECT is not set
700	764	# CONFIG_DEBUG_INFO is not set
701	765	# CONFIG_DEBUG_FS is not set
@@ -706,11 +770,7 @@ CONFIG_FORCED_INLINING=y · 4 unmodified lines
706	770	# CONFIG_DEBUGGER is not set
707	771	# CONFIG_BDI_SWITCH is not set
708	772	# CONFIG_BOOTX_TEXT is not set
709		−# CONFIG_PPC_EARLY_DEBUG_LPAR 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
	773	+# CONFIG_PPC_EARLY_DEBUG is not set
714	774
715	775	#
716	776	# Security options

arch/powerpc/configs/mpc85xx_cds_defconfig+62−13

@@ -1,16 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.16
4		−# Sun Apr 2 11:23:42 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:29:49 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12	13	CONFIG_GENERIC_HWEIGHT=y
13	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
14	16	CONFIG_PPC=y
15	17	CONFIG_EARLY_PRINTK=y
16	18	CONFIG_GENERIC_NVRAM=y
@@ -19,7 +21,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y · 2 unmodified lines
19	21	CONFIG_PPC_OF=y
20	22	CONFIG_PPC_UDBG_16550=y
21	23	# CONFIG_GENERIC_TBSYNC is not set
22		−# CONFIG_DEFAULT_UIMAGE is not set
	24	+CONFIG_DEFAULT_UIMAGE=y
23	25
24	26	#
25	27	# Processor support
@@ -29,6 +31,7 @@ CONFIG_PPC_UDBG_16550=y · 3 unmodified lines
29	31	# CONFIG_PPC_82xx is not set
30	32	# CONFIG_PPC_83xx is not set
31	33	CONFIG_PPC_85xx=y
	34	+# CONFIG_PPC_86xx is not set
32	35	# CONFIG_40x is not set
33	36	# CONFIG_44x is not set
34	37	# CONFIG_8xx is not set
@@ -39,6 +42,7 @@ CONFIG_BOOKE=y · 4 unmodified lines
39	42	CONFIG_FSL_BOOKE=y
40	43	# CONFIG_PHYS_64BIT is not set
41	44	CONFIG_SPE=y
	45	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
42	46
43	47	#
44	48	# Code maturity level options
@@ -56,6 +60,7 @@ CONFIG_SWAP=y · 11 unmodified lines
56	60	CONFIG_SYSVIPC=y
57	61	# CONFIG_POSIX_MQUEUE is not set
58	62	# CONFIG_BSD_PROCESS_ACCT is not set
	63	+# CONFIG_TASKSTATS is not set
59	64	CONFIG_SYSCTL=y
60	65	# CONFIG_AUDIT is not set
61	66	# CONFIG_IKCONFIG is not set
@@ -71,10 +76,12 @@ CONFIG_PRINTK=y · 9 unmodified lines
71	76	CONFIG_BUG=y
72	77	CONFIG_ELF_CORE=y
73	78	CONFIG_BASE_FULL=y
	79	+CONFIG_RT_MUTEXES=y
74	80	CONFIG_FUTEX=y
75	81	CONFIG_EPOLL=y
76	82	CONFIG_SHMEM=y
77	83	CONFIG_SLAB=y
	84	+CONFIG_VM_EVENT_COUNTERS=y
78	85	# CONFIG_TINY_SHMEM is not set
79	86	CONFIG_BASE_SMALL=0
80	87	# CONFIG_SLOB is not set
@@ -103,7 +110,6 @@ CONFIG_DEFAULT_AS=y · 22 unmodified lines
103	110	# CONFIG_DEFAULT_CFQ is not set
104	111	# CONFIG_DEFAULT_NOOP is not set
105	112	CONFIG_DEFAULT_IOSCHED="anticipatory"
106		−CONFIG_MPIC=y
107	113	# CONFIG_WANT_EARLY_SERIAL is not set
108	114
109	115	#
@@ -113,6 +119,7 @@ CONFIG_MPIC=y · 3 unmodified lines
113	119	CONFIG_MPC85xx_CDS=y
114	120	CONFIG_MPC8540=y
115	121	CONFIG_PPC_INDIRECT_PCI_BE=y
	122	+CONFIG_MPIC=y
116	123
117	124	#
118	125	# Kernel options
@@ -128,6 +135,7 @@ CONFIG_PREEMPT_NONE=y · 9 unmodified lines
128	135	CONFIG_BINFMT_ELF=y
129	136	CONFIG_BINFMT_MISC=y
130	137	CONFIG_MATH_EMULATION=y
	138	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
131	139	CONFIG_ARCH_FLATMEM_ENABLE=y
132	140	CONFIG_SELECT_MEMORY_MODEL=y
133	141	CONFIG_FLATMEM_MANUAL=y
@@ -137,21 +145,23 @@ CONFIG_FLATMEM=y · 3 unmodified lines
137	145	CONFIG_FLAT_NODE_MEM_MAP=y
138	146	# CONFIG_SPARSEMEM_STATIC is not set
139	147	CONFIG_SPLIT_PTLOCK_CPUS=4
	148	+# CONFIG_RESOURCES_64BIT is not set
140	149	CONFIG_PROC_DEVICETREE=y
141	150	# CONFIG_CMDLINE_BOOL is not set
142	151	# CONFIG_PM is not set
143		−# CONFIG_SOFTWARE_SUSPEND is not set
144	152	# CONFIG_SECCOMP is not set
145	153	CONFIG_ISA_DMA_API=y
146	154
147	155	#
148	156	# Bus options
149	157	#
150		−CONFIG_PPC_I8259=y
	158	+# CONFIG_MPIC_WEIRD is not set
	159	+# CONFIG_PPC_I8259 is not set
151	160	CONFIG_PPC_INDIRECT_PCI=y
152	161	CONFIG_FSL_SOC=y
153	162	CONFIG_PCI=y
154	163	CONFIG_PCI_DOMAINS=y
	164	+# CONFIG_PCIEPORTBUS is not set
155	165	# CONFIG_PCI_DEBUG is not set
156	166
157	167	#
@@ -190,6 +200,8 @@ CONFIG_NET=y · 32 unmodified lines
190	200	CONFIG_PACKET=y
191	201	# CONFIG_PACKET_MMAP is not set
192	202	CONFIG_UNIX=y
	203	+CONFIG_XFRM=y
	204	+CONFIG_XFRM_USER=y
193	205	# CONFIG_NET_KEY is not set
194	206	CONFIG_INET=y
195	207	CONFIG_IP_MULTICAST=y
@@ -209,6 +221,8 @@ CONFIG_SYN_COOKIES=y · 13 unmodified lines
209	221	# CONFIG_INET_IPCOMP is not set
210	222	# CONFIG_INET_XFRM_TUNNEL is not set
211	223	# CONFIG_INET_TUNNEL is not set
	224	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	225	+CONFIG_INET_XFRM_MODE_TUNNEL=y
212	226	CONFIG_INET_DIAG=y
213	227	CONFIG_INET_TCP_DIAG=y
214	228	# CONFIG_TCP_CONG_ADVANCED is not set
@@ -216,6 +230,7 @@ CONFIG_TCP_CONG_BIC=y · 1 unmodified line
216	230	# CONFIG_IPV6 is not set
217	231	# CONFIG_INET6_XFRM_TUNNEL is not set
218	232	# CONFIG_INET6_TUNNEL is not set
	233	+# CONFIG_NETWORK_SECMARK is not set
219	234	# CONFIG_NETFILTER is not set
220	235
221	236	#
@@ -270,6 +285,7 @@ CONFIG_STANDALONE=y · 48 unmodified lines
270	285	CONFIG_PREVENT_FIRMWARE_BUILD=y
271	286	# CONFIG_FW_LOADER is not set
272	287	# CONFIG_DEBUG_DRIVER is not set
	288	+# CONFIG_SYS_HYPERVISOR is not set
273	289
274	290	#
275	291	# Connector - unified userspace <-> kernelspace linker
@@ -306,6 +322,7 @@ CONFIG_BLK_DEV_LOOP=y · 30 unmodified lines
306	322	CONFIG_BLK_DEV_RAM=y
307	323	CONFIG_BLK_DEV_RAM_COUNT=16
308	324	CONFIG_BLK_DEV_RAM_SIZE=32768
	325	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
309	326	CONFIG_BLK_DEV_INITRD=y
310	327	# CONFIG_CDROM_PKTCDVD is not set
311	328	# CONFIG_ATA_OVER_ETH is not set
@@ -425,6 +442,9 @@ CONFIG_PHYLIB=y · 113 unmodified lines
425	442	# CONFIG_QSEMI_PHY is not set
426	443	# CONFIG_LXT_PHY is not set
427	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	450	# Ethernet (10 or 100Mbit)
@@ -470,6 +490,7 @@ CONFIG_GFAR_NAPI=y · 39 unmodified lines
470	490	# CONFIG_CHELSIO_T1 is not set
471	491	# CONFIG_IXGB is not set
472	492	# CONFIG_S2IO is not set
	493	+# CONFIG_MYRI10GE is not set
473	494
474	495	#
475	496	# Token Ring devices
@@ -568,6 +589,7 @@ CONFIG_LEGACY_PTY_COUNT=256 · 92 unmodified lines
568	589	# Watchdog Cards
569	590	#
570	591	# CONFIG_WATCHDOG is not set
	592	+# CONFIG_HW_RANDOM is not set
571	593	# CONFIG_NVRAM is not set
572	594	CONFIG_GEN_RTC=y
573	595	# CONFIG_GEN_RTC_X is not set
@@ -602,13 +624,13 @@ CONFIG_GEN_RTC=y · 28 unmodified lines
602	624	#
603	625	# Dallas's 1-wire bus
604	626	#
605		−# CONFIG_W1 is not set
606	627
607	628	#
608	629	# Hardware Monitoring support
609	630	#
610	631	CONFIG_HWMON=y
611	632	# CONFIG_HWMON_VID is not set
	633	+# CONFIG_SENSORS_ABITUGURU is not set
612	634	# CONFIG_SENSORS_F71805F is not set
613	635	# CONFIG_HWMON_DEBUG_CHIP is not set
614	636
@@ -620,6 +642,7 @@ CONFIG_HWMON=y · 5 unmodified lines
620	642	# Multimedia devices
621	643	#
622	644	# CONFIG_VIDEO_DEV is not set
	645	+CONFIG_VIDEO_V4L2=y
623	646
624	647	#
625	648	# Digital Video Broadcasting Devices
@@ -629,7 +652,9 @@ CONFIG_HWMON=y · 3 unmodified lines
629	652	#
630	653	# Graphics support
631	654	#
	655	+CONFIG_FIRMWARE_EDID=y
632	656	# CONFIG_FB is not set
	657	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
633	658
634	659	#
635	660	# Sound
@@ -663,6 +688,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y · 27 unmodified lines
663	688	#
664	689	# CONFIG_NEW_LEDS is not set
665	690
	691	+#
	692	+# LED drivers
	693	+#
	694	+
	695	+#
	696	+# LED Triggers
	697	+#
	698	+
666	699	#
667	700	# InfiniBand support
668	701	#
@@ -677,6 +710,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y · 8 unmodified lines
677	710	#
678	711	# CONFIG_RTC_CLASS is not set
679	712
	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	+
680	726	#
681	727	# File systems
682	728	#
@@ -698,6 +744,7 @@ CONFIG_FS_MBCACHE=y · 15 unmodified lines
698	744	# CONFIG_MINIX_FS is not set
699	745	# CONFIG_ROMFS_FS is not set
700	746	CONFIG_INOTIFY=y
	747	+CONFIG_INOTIFY_USER=y
701	748	# CONFIG_QUOTA is not set
702	749	CONFIG_DNOTIFY=y
703	750	# CONFIG_AUTOFS_FS is not set
@@ -795,6 +842,7 @@ CONFIG_PARTITION_ADVANCED=y · 91 unmodified lines
795	842	# CONFIG_CRC16 is not set
796	843	CONFIG_CRC32=y
797	844	# CONFIG_LIBCRC32C is not set
	845	+CONFIG_PLIST=y
798	846
799	847	#
800	848	# Instrumentation Support
@@ -806,14 +854,19 @@ CONFIG_CRC32=y · 5 unmodified lines
806	854	#
807	855	# CONFIG_PRINTK_TIME is not set
808	856	# CONFIG_MAGIC_SYSRQ is not set
	857	+# CONFIG_UNUSED_SYMBOLS is not set
809	858	CONFIG_DEBUG_KERNEL=y
810	859	CONFIG_LOG_BUF_SHIFT=14
811	860	CONFIG_DETECT_SOFTLOCKUP=y
812	861	# CONFIG_SCHEDSTATS is not set
813	862	# CONFIG_DEBUG_SLAB is not set
814		−CONFIG_DEBUG_MUTEXES=y
	863	+# CONFIG_DEBUG_RT_MUTEXES is not set
	864	+# CONFIG_RT_MUTEX_TESTER is not set
815	865	# CONFIG_DEBUG_SPINLOCK is not set
	866	+CONFIG_DEBUG_MUTEXES=y
	867	+# CONFIG_DEBUG_RWSEMS is not set
816	868	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	869	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
817	870	# CONFIG_DEBUG_KOBJECT is not set
818	871	# CONFIG_DEBUG_INFO is not set
819	872	# CONFIG_DEBUG_FS is not set
@@ -824,11 +877,7 @@ CONFIG_FORCED_INLINING=y · 4 unmodified lines
824	877	# CONFIG_DEBUGGER is not set
825	878	# CONFIG_BDI_SWITCH is not set
826	879	# CONFIG_BOOTX_TEXT is not set
827		−# CONFIG_PPC_EARLY_DEBUG_LPAR 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
	880	+# CONFIG_PPC_EARLY_DEBUG is not set
832	881
833	882	#
834	883	# Security options

arch/powerpc/configs/mpc8641_hpcn_defconfig+52−10

@@ -1,16 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.17-rc3
4		−# Fri Jun 16 10:47:09 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:30:15 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
12	13	CONFIG_GENERIC_HWEIGHT=y
13	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
14	16	CONFIG_PPC=y
15	17	CONFIG_EARLY_PRINTK=y
16	18	CONFIG_GENERIC_NVRAM=y
@@ -41,6 +43,7 @@ CONFIG_PPC_STD_MMU=y · 24 unmodified lines
41	43	CONFIG_PPC_STD_MMU_32=y
42	44	CONFIG_SMP=y
43	45	CONFIG_NR_CPUS=2
	46	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
44	47
45	48	#
46	49	# Code maturity level options
@@ -58,6 +61,7 @@ CONFIG_LOCALVERSION="" · 11 unmodified lines
58	61	# CONFIG_SYSVIPC is not set
59	62	# CONFIG_POSIX_MQUEUE is not set
60	63	# CONFIG_BSD_PROCESS_ACCT is not set
	64	+# CONFIG_TASKSTATS is not set
61	65	CONFIG_SYSCTL=y
62	66	# CONFIG_AUDIT is not set
63	67	CONFIG_IKCONFIG=y
@@ -75,10 +79,12 @@ CONFIG_PRINTK=y · 11 unmodified lines
75	79	CONFIG_BUG=y
76	80	# CONFIG_ELF_CORE is not set
77	81	CONFIG_BASE_FULL=y
	82	+CONFIG_RT_MUTEXES=y
78	83	CONFIG_FUTEX=y
79	84	CONFIG_EPOLL=y
80	85	CONFIG_SHMEM=y
81	86	# CONFIG_SLAB is not set
	87	+CONFIG_VM_EVENT_COUNTERS=y
82	88	# CONFIG_TINY_SHMEM is not set
83	89	CONFIG_BASE_SMALL=0
84	90	CONFIG_SLOB=y
@@ -107,9 +113,9 @@ CONFIG_DEFAULT_DEADLINE=y · 22 unmodified lines
107	113	# CONFIG_DEFAULT_CFQ is not set
108	114	# CONFIG_DEFAULT_NOOP is not set
109	115	CONFIG_DEFAULT_IOSCHED="deadline"
110		−CONFIG_MPIC=y
111	116	# CONFIG_WANT_EARLY_SERIAL is not set
112	117	CONFIG_PPC_INDIRECT_PCI_BE=y
	118	+CONFIG_MPIC=y
113	119
114	120	#
115	121	# Platform Support
@@ -131,6 +137,7 @@ CONFIG_PREEMPT_NONE=y · 15 unmodified lines
131	137	CONFIG_PREEMPT_BKL=y
132	138	CONFIG_BINFMT_ELF=y
133	139	# CONFIG_BINFMT_MISC is not set
	140	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
134	141	# CONFIG_IRQ_ALL_CPUS is not set
135	142	CONFIG_ARCH_FLATMEM_ENABLE=y
136	143	CONFIG_SELECT_MEMORY_MODEL=y
@@ -141,6 +148,7 @@ CONFIG_FLATMEM=y · 4 unmodified lines
141	148	CONFIG_FLAT_NODE_MEM_MAP=y
142	149	# CONFIG_SPARSEMEM_STATIC is not set
143	150	CONFIG_SPLIT_PTLOCK_CPUS=4
	151	+# CONFIG_RESOURCES_64BIT is not set
144	152	CONFIG_PROC_DEVICETREE=y
145	153	# CONFIG_CMDLINE_BOOL is not set
146	154	# CONFIG_PM is not set
@@ -151,11 +159,13 @@ CONFIG_ISA_DMA_API=y · 4 unmodified lines
151	159	# Bus options
152	160	#
153	161	CONFIG_GENERIC_ISA_DMA=y
	162	+# CONFIG_MPIC_WEIRD is not set
154	163	CONFIG_PPC_I8259=y
155	164	CONFIG_PPC_INDIRECT_PCI=y
156	165	CONFIG_FSL_SOC=y
157	166	CONFIG_PCI=y
158	167	CONFIG_PCI_DOMAINS=y
	168	+# CONFIG_PCIEPORTBUS is not set
159	169	# CONFIG_PCI_DEBUG is not set
160	170
161	171	#
@@ -194,6 +204,8 @@ CONFIG_NET=y · 32 unmodified lines
194	204	CONFIG_PACKET=y
195	205	# CONFIG_PACKET_MMAP is not set
196	206	CONFIG_UNIX=y
	207	+CONFIG_XFRM=y
	208	+CONFIG_XFRM_USER=y
197	209	# CONFIG_NET_KEY is not set
198	210	CONFIG_INET=y
199	211	# CONFIG_IP_MULTICAST is not set
@@ -212,6 +224,8 @@ CONFIG_IP_PNP_RARP=y · 12 unmodified lines
212	224	# CONFIG_INET_IPCOMP is not set
213	225	# CONFIG_INET_XFRM_TUNNEL is not set
214	226	# CONFIG_INET_TUNNEL is not set
	227	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	228	+CONFIG_INET_XFRM_MODE_TUNNEL=y
215	229	CONFIG_INET_DIAG=y
216	230	CONFIG_INET_TCP_DIAG=y
217	231	# CONFIG_TCP_CONG_ADVANCED is not set
@@ -224,7 +238,10 @@ CONFIG_IPV6=y · 6 unmodified lines
224	238	# CONFIG_INET6_IPCOMP is not set
225	239	# CONFIG_INET6_XFRM_TUNNEL is not set
226	240	# CONFIG_INET6_TUNNEL is not set
	241	+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
	242	+CONFIG_INET6_XFRM_MODE_TUNNEL=y
227	243	# CONFIG_IPV6_TUNNEL is not set
	244	+# CONFIG_NETWORK_SECMARK is not set
228	245	# CONFIG_NETFILTER is not set
229	246
230	247	#
@@ -279,6 +296,7 @@ CONFIG_STANDALONE=y · 48 unmodified lines
279	296	CONFIG_PREVENT_FIRMWARE_BUILD=y
280	297	CONFIG_FW_LOADER=y
281	298	# CONFIG_DEBUG_DRIVER is not set
	299	+# CONFIG_SYS_HYPERVISOR is not set
282	300
283	301	#
284	302	# Connector - unified userspace <-> kernelspace linker
@@ -315,6 +333,7 @@ CONFIG_BLK_DEV_LOOP=y · 30 unmodified lines
315	333	CONFIG_BLK_DEV_RAM=y
316	334	CONFIG_BLK_DEV_RAM_COUNT=16
317	335	CONFIG_BLK_DEV_RAM_SIZE=131072
	336	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
318	337	CONFIG_BLK_DEV_INITRD=y
319	338	# CONFIG_CDROM_PKTCDVD is not set
320	339	# CONFIG_ATA_OVER_ETH is not set
@@ -383,6 +402,8 @@ CONFIG_PHYLIB=y · 62 unmodified lines
383	402	# CONFIG_LXT_PHY is not set
384	403	# CONFIG_CICADA_PHY is not set
385	404	CONFIG_VITESSE_PHY=y
	405	+# CONFIG_SMSC_PHY is not set
	406	+# CONFIG_FIXED_PHY is not set
386	407
387	408	#
388	409	# Ethernet (10 or 100Mbit)
@@ -426,6 +447,7 @@ CONFIG_GIANFAR=y · 37 unmodified lines
426	447	# CONFIG_CHELSIO_T1 is not set
427	448	# CONFIG_IXGB is not set
428	449	# CONFIG_S2IO is not set
	450	+# CONFIG_MYRI10GE is not set
429	451
430	452	#
431	453	# Token Ring devices
@@ -500,6 +522,7 @@ CONFIG_SERIO_LIBPS2=y · 68 unmodified lines
500	522	CONFIG_VT=y
501	523	CONFIG_VT_CONSOLE=y
502	524	CONFIG_HW_CONSOLE=y
	525	+# CONFIG_VT_HW_CONSOLE_BINDING is not set
503	526	# CONFIG_SERIAL_NONSTANDARD is not set
504	527
505	528	#
@@ -534,6 +557,7 @@ CONFIG_UNIX98_PTYS=y · 28 unmodified lines
534	557	# Watchdog Cards
535	558	#
536	559	# CONFIG_WATCHDOG is not set
	560	+# CONFIG_HW_RANDOM is not set
537	561	# CONFIG_NVRAM is not set
538	562	# CONFIG_GEN_RTC is not set
539	563	# CONFIG_DTLK is not set
@@ -579,6 +603,7 @@ CONFIG_I2C=y · 39 unmodified lines
579	603	# CONFIG_I2C_PIIX4 is not set
580	604	CONFIG_I2C_MPC=y
581	605	# CONFIG_I2C_NFORCE2 is not set
	606	+# CONFIG_I2C_OCORES is not set
582	607	# CONFIG_I2C_PARPORT_LIGHT is not set
583	608	# CONFIG_I2C_PROSAVAGE is not set
584	609	# CONFIG_I2C_SAVAGE4 is not set
@@ -615,7 +640,6 @@ CONFIG_SENSORS_EEPROM=y · 30 unmodified lines
615	640	#
616	641	# Dallas's 1-wire bus
617	642	#
618		−# CONFIG_W1 is not set
619	643
620	644	#
621	645	# Hardware Monitoring support
@@ -631,6 +655,7 @@ CONFIG_SENSORS_EEPROM=y · 9 unmodified lines
631	655	# Multimedia devices
632	656	#
633	657	# CONFIG_VIDEO_DEV is not set
	658	+CONFIG_VIDEO_V4L2=y
634	659
635	660	#
636	661	# Digital Video Broadcasting Devices
@@ -640,6 +665,7 @@ CONFIG_SENSORS_EEPROM=y · 3 unmodified lines
640	665	#
641	666	# Graphics support
642	667	#
	668	+CONFIG_FIRMWARE_EDID=y
643	669	# CONFIG_FB is not set
644	670
645	671	#
@@ -648,6 +674,7 @@ CONFIG_SENSORS_EEPROM=y · 2 unmodified lines
648	674	CONFIG_VGA_CONSOLE=y
649	675	# CONFIG_VGACON_SOFT_SCROLLBACK is not set
650	676	CONFIG_DUMMY_CONSOLE=y
	677	+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
651	678
652	679	#
653	680	# Sound
@@ -703,6 +730,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y · 49 unmodified lines
703	730	#
704	731	# CONFIG_RTC_CLASS is not set
705	732
	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	+
706	746	#
707	747	# File systems
708	748	#
@@ -870,6 +910,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" · 161 unmodified lines
870	910	# CONFIG_CRC16 is not set
871	911	CONFIG_CRC32=y
872	912	# CONFIG_LIBCRC32C is not set
	913	+CONFIG_PLIST=y
873	914
874	915	#
875	916	# Instrumentation Support
@@ -881,13 +922,18 @@ CONFIG_CRC32=y · 5 unmodified lines
881	922	#
882	923	# CONFIG_PRINTK_TIME is not set
883	924	# CONFIG_MAGIC_SYSRQ is not set
	925	+# CONFIG_UNUSED_SYMBOLS is not set
884	926	CONFIG_DEBUG_KERNEL=y
885	927	CONFIG_LOG_BUF_SHIFT=14
886	928	CONFIG_DETECT_SOFTLOCKUP=y
887	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	932	# CONFIG_DEBUG_SPINLOCK is not set
	933	+# CONFIG_DEBUG_MUTEXES is not set
	934	+# CONFIG_DEBUG_RWSEMS is not set
890	935	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	936	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
891	937	# CONFIG_DEBUG_KOBJECT is not set
892	938	# CONFIG_DEBUG_HIGHMEM is not set
893	939	# CONFIG_DEBUG_INFO is not set
@@ -899,11 +945,7 @@ CONFIG_FORCED_INLINING=y · 5 unmodified lines
899	945	# CONFIG_DEBUGGER is not set
900	946	# CONFIG_BDI_SWITCH is not set
901	947	# CONFIG_BOOTX_TEXT is not set
902		−# CONFIG_PPC_EARLY_DEBUG_LPAR 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
	948	+# CONFIG_PPC_EARLY_DEBUG is not set
907	949
908	950	#
909	951	# Security options

arch/powerpc/configs/pmac32_defconfig+11−7

@@ -1,7 +1,7 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.17
4		−# Mon Jul 3 14:20:49 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:30:23 2006
5	5	#
6	6	# CONFIG_PPC64 is not set
7	7	CONFIG_PPC32=y
@@ -60,6 +60,7 @@ CONFIG_SWAP=y · 52 unmodified lines
60	60	CONFIG_SYSVIPC=y
61	61	CONFIG_POSIX_MQUEUE=y
62	62	# CONFIG_BSD_PROCESS_ACCT is not set
	63	+# CONFIG_TASKSTATS is not set
63	64	CONFIG_SYSCTL=y
64	65	# CONFIG_AUDIT is not set
65	66	CONFIG_IKCONFIG=y
@@ -128,7 +129,6 @@ CONFIG_PPC_PMAC=y · 62 unmodified lines
128	129	# CONFIG_PPC_CELL is not set
129	130	# CONFIG_PPC_CELL_NATIVE is not set
130	131	# CONFIG_UDBG_RTAS_CONSOLE is not set
131		−CONFIG_MPIC=y
132	132	# CONFIG_PPC_RTAS is not set
133	133	# CONFIG_MMIO_NVRAM is not set
134	134	CONFIG_PPC_MPC106=y
@@ -149,6 +149,7 @@ CONFIG_CPU_FREQ_PMAC=y · 14 unmodified lines
149	149	CONFIG_PPC601_SYNC_FIX=y
150	150	# CONFIG_TAU is not set
151	151	# CONFIG_WANT_EARLY_SERIAL is not set
	152	+CONFIG_MPIC=y
152	153
153	154	#
154	155	# Kernel options
@@ -189,6 +190,7 @@ CONFIG_ISA_DMA_API=y · 34 unmodified lines
189	190	# Bus options
190	191	#
191	192	CONFIG_GENERIC_ISA_DMA=y
	193	+# CONFIG_MPIC_WEIRD is not set
192	194	# CONFIG_PPC_I8259 is not set
193	195	CONFIG_PPC_INDIRECT_PCI=y
194	196	CONFIG_PCI=y
@@ -559,6 +561,7 @@ CONFIG_BLK_DEV_UB=m · 364 unmodified lines
559	561	CONFIG_BLK_DEV_RAM=y
560	562	CONFIG_BLK_DEV_RAM_COUNT=16
561	563	CONFIG_BLK_DEV_RAM_SIZE=4096
	564	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
562	565	CONFIG_BLK_DEV_INITRD=y
563	566	# CONFIG_CDROM_PKTCDVD is not set
564	567	# CONFIG_ATA_OVER_ETH is not set
@@ -1502,7 +1505,6 @@ CONFIG_USB_MON=y · 937 unmodified lines
1502	1505	CONFIG_USB_SERIAL=m
1503	1506	# CONFIG_USB_SERIAL_GENERIC is not set
1504	1507	# CONFIG_USB_SERIAL_AIRPRIME is not set
1505		−# CONFIG_USB_SERIAL_ANYDATA is not set
1506	1508	# CONFIG_USB_SERIAL_ARK3116 is not set
1507	1509	# CONFIG_USB_SERIAL_BELKIN is not set
1508	1510	# CONFIG_USB_SERIAL_WHITEHEAT is not set
@@ -1540,6 +1542,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y · 31 unmodified lines
1540	1542	# CONFIG_USB_SERIAL_PL2303 is not set
1541	1543	# CONFIG_USB_SERIAL_HP4X is not set
1542	1544	# CONFIG_USB_SERIAL_SAFE is not set
	1545	+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1543	1546	# CONFIG_USB_SERIAL_TI is not set
1544	1547	# CONFIG_USB_SERIAL_CYBERJACK is not set
1545	1548	# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -1557,7 +1560,7 @@ CONFIG_USB_EZUSB=y · 11 unmodified lines
1557	1560	# CONFIG_USB_LEGOTOWER is not set
1558	1561	# CONFIG_USB_LCD is not set
1559	1562	# CONFIG_USB_LED is not set
1560		−# CONFIG_USB_CY7C63 is not set
	1563	+# CONFIG_USB_CYPRESS_CY7C63 is not set
1561	1564	# CONFIG_USB_CYTHERM is not set
1562	1565	# CONFIG_USB_PHIDGETKIT is not set
1563	1566	# CONFIG_USB_PHIDGETSERVO is not set
@@ -1728,7 +1731,6 @@ CONFIG_RPCSEC_GSS_KRB5=y · 164 unmodified lines
1728	1731	CONFIG_SMB_FS=m
1729	1732	# CONFIG_SMB_NLS_DEFAULT is not set
1730	1733	# CONFIG_CIFS is not set
1731		−# CONFIG_CIFS_DEBUG2 is not set
1732	1734	# CONFIG_NCP_FS is not set
1733	1735	# CONFIG_CODA_FS is not set
1734	1736	# CONFIG_AFS_FS is not set
@@ -1831,11 +1833,13 @@ CONFIG_LOG_BUF_SHIFT=14 · 96 unmodified lines
1831	1833	CONFIG_DETECT_SOFTLOCKUP=y
1832	1834	# CONFIG_SCHEDSTATS is not set
1833	1835	# CONFIG_DEBUG_SLAB is not set
1834		−# CONFIG_DEBUG_MUTEXES is not set
1835	1836	# CONFIG_DEBUG_RT_MUTEXES is not set
1836	1837	# CONFIG_RT_MUTEX_TESTER is not set
1837	1838	# CONFIG_DEBUG_SPINLOCK is not set
	1839	+# CONFIG_DEBUG_MUTEXES is not set
	1840	+# CONFIG_DEBUG_RWSEMS is not set
1838	1841	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	1842	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1839	1843	# CONFIG_DEBUG_KOBJECT is not set
1840	1844	# CONFIG_DEBUG_INFO is not set
1841	1845	# CONFIG_DEBUG_FS is not set

arch/powerpc/configs/ppc64_defconfig+140−58

@@ -1,15 +1,18 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.16-rc2
4		−# Fri Feb 10 17:32:14 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:45:11 2006
5	5	#
6	6	CONFIG_PPC64=y
7	7	CONFIG_64BIT=y
8	8	CONFIG_PPC_MERGE=y
9	9	CONFIG_MMU=y
10	10	CONFIG_GENERIC_HARDIRQS=y
	11	+CONFIG_IRQ_PER_CPU=y
11	12	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
	13	+CONFIG_GENERIC_HWEIGHT=y
12	14	CONFIG_GENERIC_CALIBRATE_DELAY=y
	15	+CONFIG_GENERIC_FIND_NEXT_BIT=y
13	16	CONFIG_PPC=y
14	17	CONFIG_EARLY_PRINTK=y
15	18	CONFIG_COMPAT=y
@@ -30,8 +33,10 @@ CONFIG_POWER4=y · 14 unmodified lines
30	33	CONFIG_PPC_FPU=y
31	34	CONFIG_ALTIVEC=y
32	35	CONFIG_PPC_STD_MMU=y
	36	+CONFIG_VIRT_CPU_ACCOUNTING=y
33	37	CONFIG_SMP=y
34	38	CONFIG_NR_CPUS=32
	39	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35	40
36	41	#
37	42	# Code maturity level options
@@ -49,11 +54,14 @@ CONFIG_SWAP=y · 11 unmodified lines
49	54	CONFIG_SYSVIPC=y
50	55	CONFIG_POSIX_MQUEUE=y
51	56	# CONFIG_BSD_PROCESS_ACCT is not set
	57	+CONFIG_TASKSTATS=y
	58	+CONFIG_TASK_DELAY_ACCT=y
52	59	CONFIG_SYSCTL=y
53	60	# CONFIG_AUDIT is not set
54	61	CONFIG_IKCONFIG=y
55	62	CONFIG_IKCONFIG_PROC=y
56	63	CONFIG_CPUSETS=y
	64	+CONFIG_RELAY=y
57	65	CONFIG_INITRAMFS_SOURCE=""
58	66	CONFIG_CC_OPTIMIZE_FOR_SIZE=y
59	67	# CONFIG_EMBEDDED is not set
@@ -65,14 +73,12 @@ CONFIG_PRINTK=y · 5 unmodified lines
65	73	CONFIG_BUG=y
66	74	CONFIG_ELF_CORE=y
67	75	CONFIG_BASE_FULL=y
	76	+CONFIG_RT_MUTEXES=y
68	77	CONFIG_FUTEX=y
69	78	CONFIG_EPOLL=y
70	79	CONFIG_SHMEM=y
71		−CONFIG_CC_ALIGN_FUNCTIONS=0
72		−CONFIG_CC_ALIGN_LABELS=0
73		−CONFIG_CC_ALIGN_LOOPS=0
74		−CONFIG_CC_ALIGN_JUMPS=0
75	80	CONFIG_SLAB=y
	81	+CONFIG_VM_EVENT_COUNTERS=y
76	82	# CONFIG_TINY_SHMEM is not set
77	83	CONFIG_BASE_SMALL=0
78	84	# CONFIG_SLOB is not set
@@ -83,7 +89,6 @@ CONFIG_BASE_SMALL=0 · 4 unmodified lines
83	89	CONFIG_MODULES=y
84	90	CONFIG_MODULE_UNLOAD=y
85	91	# CONFIG_MODULE_FORCE_UNLOAD is not set
86		−CONFIG_OBSOLETE_MODPARM=y
87	92	CONFIG_MODVERSIONS=y
88	93	CONFIG_MODULE_SRCVERSION_ALL=y
89	94	CONFIG_KMOD=y
@@ -92,6 +97,7 @@ CONFIG_STOP_MACHINE=y · 2 unmodified lines
92	97	#
93	98	# Block layer
94	99	#
	100	+CONFIG_BLK_DEV_IO_TRACE=y
95	101
96	102	#
97	103	# IO Schedulers
@@ -117,19 +123,22 @@ CONFIG_PPC_PSERIES=y · 19 unmodified lines
117	123	CONFIG_PPC_PMAC=y
118	124	CONFIG_PPC_PMAC64=y
119	125	CONFIG_PPC_MAPLE=y
120		−# CONFIG_PPC_CELL is not set
	126	+CONFIG_PPC_CELL=y
	127	+CONFIG_PPC_CELL_NATIVE=y
	128	+CONFIG_PPC_IBM_CELL_BLADE=y
	129	+CONFIG_UDBG_RTAS_CONSOLE=y
121	130	CONFIG_XICS=y
122	131	CONFIG_U3_DART=y
123		−CONFIG_MPIC=y
124	132	CONFIG_PPC_RTAS=y
125	133	CONFIG_RTAS_ERROR_LOGGING=y
126	134	CONFIG_RTAS_PROC=y
127	135	CONFIG_RTAS_FLASH=m
128		−# CONFIG_MMIO_NVRAM is not set
	136	+CONFIG_MMIO_NVRAM=y
129	137	CONFIG_MPIC_BROKEN_U3=y
130	138	CONFIG_IBMVIO=y
131	139	# CONFIG_IBMEBUS is not set
132	140	# CONFIG_PPC_MPC106 is not set
	141	+CONFIG_PPC_970_NAP=y
133	142	CONFIG_CPU_FREQ=y
134	143	CONFIG_CPU_FREQ_TABLE=y
135	144	# CONFIG_CPU_FREQ_DEBUG is not set
@@ -144,6 +153,15 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y · 8 unmodified lines
144	153	# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
145	154	CONFIG_CPU_FREQ_PMAC64=y
146	155	# CONFIG_WANT_EARLY_SERIAL is not set
	156	+CONFIG_MPIC=y
	157	+
	158	+#
	159	+# Cell Broadband Engine options
	160	+#
	161	+CONFIG_SPU_FS=m
	162	+CONFIG_SPU_BASE=y
	163	+CONFIG_SPUFS_MMAP=y
	164	+CONFIG_CBE_RAS=y
147	165
148	166	#
149	167	# Kernel options
@@ -161,6 +179,7 @@ CONFIG_BINFMT_MISC=m · 11 unmodified lines
161	179	CONFIG_FORCE_MAX_ZONEORDER=13
162	180	CONFIG_IOMMU_VMERGE=y
163	181	CONFIG_HOTPLUG_CPU=y
	182	+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
164	183	CONFIG_KEXEC=y
165	184	# CONFIG_CRASH_DUMP is not set
166	185	CONFIG_IRQ_ALL_CPUS=y
@@ -181,9 +200,10 @@ CONFIG_SPARSEMEM=y · 14 unmodified lines
181	200	CONFIG_HAVE_MEMORY_PRESENT=y
182	201	# CONFIG_SPARSEMEM_STATIC is not set
183	202	CONFIG_SPARSEMEM_EXTREME=y
184		−# CONFIG_MEMORY_HOTPLUG is not set
	203	+CONFIG_MEMORY_HOTPLUG=y
185	204	CONFIG_SPLIT_PTLOCK_CPUS=4
186		−CONFIG_MIGRATION=y
	205	+CONFIG_RESOURCES_64BIT=y
	206	+CONFIG_ARCH_MEMORY_PROBE=y
187	207	# CONFIG_PPC_64K_PAGES is not set
188	208	# CONFIG_SCHED_SMT is not set
189	209	CONFIG_PROC_DEVICETREE=y
@@ -196,11 +216,12 @@ CONFIG_ISA_DMA_API=y · 6 unmodified lines
196	216	# Bus options
197	217	#
198	218	CONFIG_GENERIC_ISA_DMA=y
	219	+# CONFIG_MPIC_WEIRD is not set
199	220	CONFIG_PPC_I8259=y
200	221	# CONFIG_PPC_INDIRECT_PCI is not set
201	222	CONFIG_PCI=y
202	223	CONFIG_PCI_DOMAINS=y
203		−# CONFIG_PCI_LEGACY_PROC is not set
	224	+# CONFIG_PCIEPORTBUS is not set
204	225	# CONFIG_PCI_DEBUG is not set
205	226
206	227	#
@@ -247,7 +268,10 @@ CONFIG_SYN_COOKIES=y · 40 unmodified lines
247	268	CONFIG_INET_AH=m
248	269	CONFIG_INET_ESP=m
249	270	CONFIG_INET_IPCOMP=m
	271	+CONFIG_INET_XFRM_TUNNEL=m
250	272	CONFIG_INET_TUNNEL=y
	273	+CONFIG_INET_XFRM_MODE_TRANSPORT=y
	274	+CONFIG_INET_XFRM_MODE_TUNNEL=y
251	275	CONFIG_INET_DIAG=y
252	276	CONFIG_INET_TCP_DIAG=y
253	277	# CONFIG_TCP_CONG_ADVANCED is not set
@@ -258,6 +282,9 @@ CONFIG_TCP_CONG_BIC=y · 4 unmodified lines
258	282	#
259	283	# CONFIG_IP_VS is not set
260	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
261	288	CONFIG_NETFILTER=y
262	289	# CONFIG_NETFILTER_DEBUG is not set
263	290
@@ -284,6 +311,8 @@ CONFIG_IP_NF_IRC=m · 20 unmodified lines
284	311	CONFIG_IP_NF_TFTP=m
285	312	CONFIG_IP_NF_AMANDA=m
286	313	# CONFIG_IP_NF_PPTP is not set
	314	+# CONFIG_IP_NF_H323 is not set
	315	+CONFIG_IP_NF_SIP=m
287	316	CONFIG_IP_NF_QUEUE=m
288	317
289	318	#
@@ -339,6 +368,7 @@ CONFIG_STANDALONE=y · 49 unmodified lines
339	368	CONFIG_PREVENT_FIRMWARE_BUILD=y
340	369	CONFIG_FW_LOADER=y
341	370	# CONFIG_DEBUG_DRIVER is not set
	371	+# CONFIG_SYS_HYPERVISOR is not set
342	372
343	373	#
344	374	# Connector - unified userspace <-> kernelspace linker
@@ -376,6 +406,7 @@ CONFIG_BLK_DEV_NBD=m · 31 unmodified lines
376	406	CONFIG_BLK_DEV_RAM=y
377	407	CONFIG_BLK_DEV_RAM_COUNT=16
378	408	CONFIG_BLK_DEV_RAM_SIZE=65536
	409	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
379	410	CONFIG_BLK_DEV_INITRD=y
380	411	# CONFIG_CDROM_PKTCDVD is not set
381	412	# CONFIG_ATA_OVER_ETH is not set
@@ -436,7 +467,6 @@ CONFIG_BLK_DEV_AMD74XX=y · 54 unmodified lines
436	467	CONFIG_BLK_DEV_IDE_PMAC=y
437	468	CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
438	469	CONFIG_BLK_DEV_IDEDMA_PMAC=y
439		−# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set
440	470	# CONFIG_IDE_ARM is not set
441	471	CONFIG_BLK_DEV_IDEDMA=y
442	472	# CONFIG_IDEDMA_IVB is not set
@@ -497,6 +527,7 @@ CONFIG_SCSI_SATA_SVW=y · 54 unmodified lines
497	527	# CONFIG_SCSI_SATA_MV is not set
498	528	# CONFIG_SCSI_SATA_NV is not set
499	529	# CONFIG_SCSI_PDC_ADMA is not set
	530	+# CONFIG_SCSI_HPTIOP is not set
500	531	# CONFIG_SCSI_SATA_QSTOR is not set
501	532	# CONFIG_SCSI_SATA_PROMISE is not set
502	533	# CONFIG_SCSI_SATA_SX4 is not set
@@ -519,11 +550,10 @@ CONFIG_SCSI_SYM53C8XX_2=y · 16 unmodified lines
519	550	CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
520	551	CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
521	552	CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
522		−# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
	553	+CONFIG_SCSI_SYM53C8XX_MMIO=y
523	554	CONFIG_SCSI_IPR=y
524	555	CONFIG_SCSI_IPR_TRACE=y
525	556	CONFIG_SCSI_IPR_DUMP=y
526		−# CONFIG_SCSI_QLOGIC_FC is not set
527	557	# CONFIG_SCSI_QLOGIC_1280 is not set
528	558	# CONFIG_SCSI_QLA_FC is not set
529	559	CONFIG_SCSI_LPFC=m
@@ -540,8 +570,8 @@ CONFIG_MD_LINEAR=y · 10 unmodified lines
540	570	CONFIG_MD_RAID0=y
541	571	CONFIG_MD_RAID1=y
542	572	CONFIG_MD_RAID10=y
543		−CONFIG_MD_RAID5=y
544		−CONFIG_MD_RAID6=m
	573	+CONFIG_MD_RAID456=y
	574	+CONFIG_MD_RAID5_RESHAPE=y
545	575	CONFIG_MD_MULTIPATH=m
546	576	CONFIG_MD_FAULTY=m
547	577	CONFIG_BLK_DEV_DM=y
@@ -585,7 +615,6 @@ CONFIG_IEEE1394_OHCI1394=y · 37 unmodified lines
585	615	#
586	616	CONFIG_IEEE1394_VIDEO1394=m
587	617	CONFIG_IEEE1394_SBP2=m
588		−# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
589	618	CONFIG_IEEE1394_ETH1394=m
590	619	CONFIG_IEEE1394_DV1394=m
591	620	CONFIG_IEEE1394_RAWIO=y
@@ -599,6 +628,7 @@ CONFIG_IEEE1394_RAWIO=y · 7 unmodified lines
599	628	# Macintosh device drivers
600	629	#
601	630	CONFIG_ADB_PMU=y
	631	+# CONFIG_ADB_PMU_LED is not set
602	632	CONFIG_PMAC_SMU=y
603	633	CONFIG_THERM_PM72=y
604	634	CONFIG_WINDFARM=y
@@ -682,6 +712,7 @@ CONFIG_E1000=y · 77 unmodified lines
682	712	# CONFIG_VIA_VELOCITY is not set
683	713	CONFIG_TIGON3=y
684	714	# CONFIG_BNX2 is not set
	715	+CONFIG_SPIDER_NET=m
685	716	# CONFIG_MV643XX_ETH is not set
686	717
687	718	#
@@ -691,6 +722,7 @@ CONFIG_TIGON3=y · 3 unmodified lines
691	722	CONFIG_IXGB=m
692	723	# CONFIG_IXGB_NAPI is not set
693	724	# CONFIG_S2IO is not set
	725	+# CONFIG_MYRI10GE is not set
694	726
695	727	#
696	728	# Token Ring devices
@@ -792,6 +824,7 @@ CONFIG_SERIO_LIBPS2=y · 95 unmodified lines
792	824	CONFIG_VT=y
793	825	CONFIG_VT_CONSOLE=y
794	826	CONFIG_HW_CONSOLE=y
	827	+# CONFIG_VT_HW_CONSOLE_BINDING is not set
795	828	# CONFIG_SERIAL_NONSTANDARD is not set
796	829
797	830	#
@@ -799,6 +832,7 @@ CONFIG_HW_CONSOLE=y · 1 unmodified line
799	832	#
800	833	CONFIG_SERIAL_8250=y
801	834	CONFIG_SERIAL_8250_CONSOLE=y
	835	+CONFIG_SERIAL_8250_PCI=y
802	836	CONFIG_SERIAL_8250_NR_UARTS=4
803	837	CONFIG_SERIAL_8250_RUNTIME_UARTS=4
804	838	# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -814,7 +848,9 @@ CONFIG_SERIAL_ICOM=m · 9 unmodified lines
814	848	CONFIG_UNIX98_PTYS=y
815	849	CONFIG_LEGACY_PTYS=y
816	850	CONFIG_LEGACY_PTY_COUNT=256
	851	+CONFIG_HVC_DRIVER=y
817	852	CONFIG_HVC_CONSOLE=y
	853	+CONFIG_HVC_RTAS=y
818	854	CONFIG_HVCS=m
819	855
820	856	#
@@ -826,7 +862,7 @@ CONFIG_HVCS=m · 5 unmodified lines
826	862	# Watchdog Cards
827	863	#
828	864	# CONFIG_WATCHDOG is not set
829		−# CONFIG_RTC is not set
	865	+# CONFIG_HW_RANDOM is not set
830	866	CONFIG_GEN_RTC=y
831	867	# CONFIG_GEN_RTC_X is not set
832	868	# CONFIG_DTLK is not set
@@ -874,10 +910,10 @@ CONFIG_I2C_AMD8111=y · 41 unmodified lines
874	910	# CONFIG_I2C_PIIX4 is not set
875	911	CONFIG_I2C_POWERMAC=y
876	912	# CONFIG_I2C_NFORCE2 is not set
	913	+# CONFIG_I2C_OCORES is not set
877	914	# CONFIG_I2C_PARPORT_LIGHT is not set
878	915	# CONFIG_I2C_PROSAVAGE is not set
879	916	# CONFIG_I2C_SAVAGE4 is not set
880		−# CONFIG_SCx200_ACB is not set
881	917	# CONFIG_I2C_SIS5595 is not set
882	918	# CONFIG_I2C_SIS630 is not set
883	919	# CONFIG_I2C_SIS96X is not set
@@ -896,9 +932,7 @@ CONFIG_I2C_POWERMAC=y · 12 unmodified lines
896	932	# CONFIG_SENSORS_PCF8574 is not set
897	933	# CONFIG_SENSORS_PCA9539 is not set
898	934	# CONFIG_SENSORS_PCF8591 is not set
899		−# CONFIG_SENSORS_RTC8564 is not set
900	935	# CONFIG_SENSORS_MAX6875 is not set
901		−# CONFIG_RTC_X1205_I2C is not set
902	936	# CONFIG_I2C_DEBUG_CORE is not set
903	937	# CONFIG_I2C_DEBUG_ALGO is not set
904	938	# CONFIG_I2C_DEBUG_BUS is not set
@@ -913,7 +947,6 @@ CONFIG_I2C_POWERMAC=y · 8 unmodified lines
913	947	#
914	948	# Dallas's 1-wire bus
915	949	#
916		−# CONFIG_W1 is not set
917	950
918	951	#
919	952	# Hardware Monitoring support
@@ -925,38 +958,34 @@ CONFIG_I2C_POWERMAC=y · 5 unmodified lines
925	958	# Misc devices
926	959	#
927	960
928		−#
929		−# Multimedia Capabilities Port drivers
930		−#
931		−
932	961	#
933	962	# Multimedia devices
934	963	#
935	964	# CONFIG_VIDEO_DEV is not set
	965	+CONFIG_VIDEO_V4L2=y
936	966
937	967	#
938	968	# Digital Video Broadcasting Devices
939	969	#
940	970	# CONFIG_DVB is not set
	971	+# CONFIG_USB_DABUSB is not set
941	972
942	973	#
943	974	# Graphics support
944	975	#
	976	+CONFIG_FIRMWARE_EDID=y
945	977	CONFIG_FB=y
946	978	CONFIG_FB_CFB_FILLRECT=y
947	979	CONFIG_FB_CFB_COPYAREA=y
948	980	CONFIG_FB_CFB_IMAGEBLIT=y
949	981	CONFIG_FB_MACMODES=y
	982	+# CONFIG_FB_BACKLIGHT is not set
950	983	CONFIG_FB_MODE_HELPERS=y
951	984	CONFIG_FB_TILEBLITTING=y
952	985	# CONFIG_FB_CIRRUS is not set
953	986	# CONFIG_FB_PM2 is not set
954	987	# CONFIG_FB_CYBER2000 is not set
955	988	CONFIG_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	989	# CONFIG_FB_ASILIANT is not set
961	990	# CONFIG_FB_IMSTT is not set
962	991	# CONFIG_FB_VGA16 is not set
@@ -970,7 +999,6 @@ CONFIG_FB_MATROX_G=y · 7 unmodified lines
970	999	CONFIG_FB_MATROX_I2C=m
971	1000	CONFIG_FB_MATROX_MAVEN=m
972	1001	CONFIG_FB_MATROX_MULTIHEAD=y
973		−# CONFIG_FB_RADEON_OLD is not set
974	1002	CONFIG_FB_RADEON=y
975	1003	CONFIG_FB_RADEON_I2C=y
976	1004	# CONFIG_FB_RADEON_DEBUG is not set
@@ -1025,9 +1053,11 @@ CONFIG_SND_SEQ_DUMMY=m · 48 unmodified lines
1025	1053	CONFIG_SND_OSSEMUL=y
1026	1054	CONFIG_SND_MIXER_OSS=m
1027	1055	CONFIG_SND_PCM_OSS=m
	1056	+CONFIG_SND_PCM_OSS_PLUGINS=y
1028	1057	CONFIG_SND_SEQUENCER_OSS=y
1029	1058	# CONFIG_SND_DYNAMIC_MINORS is not set
1030	1059	CONFIG_SND_SUPPORT_OLD_API=y
	1060	+CONFIG_SND_VERBOSE_PROCFS=y
1031	1061	# CONFIG_SND_VERBOSE_PRINTK is not set
1032	1062	# CONFIG_SND_DEBUG is not set
1033	1063
@@ -1044,6 +1074,7 @@ CONFIG_SND_SUPPORT_OLD_API=y · 10 unmodified lines
1044	1074	# PCI devices
1045	1075	#
1046	1076	# CONFIG_SND_AD1889 is not set
	1077	+# CONFIG_SND_ALS300 is not set
1047	1078	# CONFIG_SND_ALS4000 is not set
1048	1079	# CONFIG_SND_ALI5451 is not set
1049	1080	# CONFIG_SND_ATIIXP is not set
@@ -1057,6 +1088,18 @@ CONFIG_SND_SUPPORT_OLD_API=y · 7 unmodified lines
1057	1088	# CONFIG_SND_CMIPCI is not set
1058	1089	# CONFIG_SND_CS4281 is not set
1059	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	1103	# CONFIG_SND_EMU10K1 is not set
1061	1104	# CONFIG_SND_EMU10K1X is not set
1062	1105	# CONFIG_SND_ENS1370 is not set
@@ -1076,6 +1119,7 @@ CONFIG_SND_SUPPORT_OLD_API=y · 13 unmodified lines
1076	1119	# CONFIG_SND_MIXART is not set
1077	1120	# CONFIG_SND_NM256 is not set
1078	1121	# CONFIG_SND_PCXHR is not set
	1122	+# CONFIG_SND_RIPTIDE is not set
1079	1123	# CONFIG_SND_RME32 is not set
1080	1124	# CONFIG_SND_RME96 is not set
1081	1125	# CONFIG_SND_RME9652 is not set
@@ -1092,6 +1136,17 @@ CONFIG_SND_SUPPORT_OLD_API=y · 10 unmodified lines
1092	1136	CONFIG_SND_POWERMAC=m
1093	1137	CONFIG_SND_POWERMAC_AUTO_DRC=y
1094	1138
	1139	+#
	1140	+# Apple Onboard Audio driver
	1141	+#
	1142	+CONFIG_SND_AOA=m
	1143	+CONFIG_SND_AOA_FABRIC_LAYOUT=m
	1144	+CONFIG_SND_AOA_ONYX=m
	1145	+CONFIG_SND_AOA_TAS=m
	1146	+CONFIG_SND_AOA_TOONIE=m
	1147	+CONFIG_SND_AOA_SOUNDBUS=m
	1148	+CONFIG_SND_AOA_SOUNDBUS_I2S=m
	1149	+
1095	1150	#
1096	1151	# USB devices
1097	1152	#
@@ -1108,6 +1163,7 @@ CONFIG_SND_POWERMAC_AUTO_DRC=y · 10 unmodified lines
1108	1163	#
1109	1164	CONFIG_USB_ARCH_HAS_HCD=y
1110	1165	CONFIG_USB_ARCH_HAS_OHCI=y
	1166	+CONFIG_USB_ARCH_HAS_EHCI=y
1111	1167	CONFIG_USB=y
1112	1168	# CONFIG_USB_DEBUG is not set
1113	1169
@@ -1125,6 +1181,7 @@ CONFIG_USB_DEVICEFS=y · 11 unmodified lines
1125	1181	CONFIG_USB_EHCI_HCD=y
1126	1182	# CONFIG_USB_EHCI_SPLIT_ISO is not set
1127	1183	# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
	1184	+CONFIG_USB_EHCI_TT_NEWSCHED=y
1128	1185	# CONFIG_USB_ISP116X_HCD is not set
1129	1186	CONFIG_USB_OHCI_HCD=y
1130	1187	# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1135,7 +1192,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y · 4 unmodified lines
1135	1192	#
1136	1193	# USB Device Class drivers
1137	1194	#
1138		−# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1139	1195	# CONFIG_USB_ACM is not set
1140	1196	# CONFIG_USB_PRINTER is not set
1141	1197
@@ -1173,9 +1229,7 @@ CONFIG_USB_HIDDEV=y · 31 unmodified lines
1173	1229	# CONFIG_USB_ACECAD is not set
1174	1230	# CONFIG_USB_KBTAB is not set
1175	1231	# CONFIG_USB_POWERMATE is not set
1176		−# CONFIG_USB_MTOUCH is not set
1177		−# CONFIG_USB_ITMTOUCH is not set
1178		−# CONFIG_USB_EGALAX is not set
	1232	+# CONFIG_USB_TOUCHSCREEN is not set
1179	1233	# CONFIG_USB_YEALINK is not set
1180	1234	# CONFIG_USB_XPAD is not set
1181	1235	# CONFIG_USB_ATI_REMOTE is not set
@@ -1189,15 +1243,6 @@ CONFIG_USB_HIDDEV=y · 7 unmodified lines
1189	1243	# CONFIG_USB_MDC800 is not set
1190	1244	# CONFIG_USB_MICROTEK is not set
1191	1245
1192		−#
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	1246	#
1202	1247	# USB Network Adapters
1203	1248	#
@@ -1227,10 +1272,12 @@ CONFIG_USB_HIDDEV=y · 23 unmodified lines
1227	1272	# CONFIG_USB_LEGOTOWER is not set
1228	1273	# CONFIG_USB_LCD is not set
1229	1274	# CONFIG_USB_LED is not set
	1275	+# CONFIG_USB_CYPRESS_CY7C63 is not set
1230	1276	# CONFIG_USB_CYTHERM is not set
1231	1277	# CONFIG_USB_PHIDGETKIT is not set
1232	1278	# CONFIG_USB_PHIDGETSERVO is not set
1233	1279	# CONFIG_USB_IDMOUSE is not set
	1280	+CONFIG_USB_APPLEDISPLAY=m
1234	1281	# CONFIG_USB_SISUSBVGA is not set
1235	1282	# CONFIG_USB_LD is not set
1236	1283	# CONFIG_USB_TEST is not set
@@ -1249,24 +1296,54 @@ CONFIG_USB_HIDDEV=y · 12 unmodified lines
1249	1296	#
1250	1297	# CONFIG_MMC is not set
1251	1298
	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	+
1252	1312	#
1253	1313	# InfiniBand support
1254	1314	#
1255	1315	CONFIG_INFINIBAND=m
1256	1316	# CONFIG_INFINIBAND_USER_MAD is not set
1257	1317	# CONFIG_INFINIBAND_USER_ACCESS is not set
	1318	+CONFIG_INFINIBAND_ADDR_TRANS=y
1258	1319	CONFIG_INFINIBAND_MTHCA=m
1259		−# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
	1320	+CONFIG_INFINIBAND_MTHCA_DEBUG=y
1260	1321	CONFIG_INFINIBAND_IPOIB=m
1261		−# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
	1322	+CONFIG_INFINIBAND_IPOIB_DEBUG=y
	1323	+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1262	1324	# CONFIG_INFINIBAND_SRP is not set
	1325	+CONFIG_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 · 25 unmodified lines
1298	1375	# CONFIG_JFS_STATISTICS is not set
1299	1376	CONFIG_FS_POSIX_ACL=y
1300	1377	CONFIG_XFS_FS=m
1301		−CONFIG_XFS_EXPORT=y
1302	1378	# CONFIG_XFS_QUOTA is not set
1303	1379	CONFIG_XFS_SECURITY=y
1304	1380	CONFIG_XFS_POSIX_ACL=y
@@ -1307,6 +1383,7 @@ CONFIG_XFS_POSIX_ACL=y · 2 unmodified lines
1307	1383	# CONFIG_MINIX_FS is not set
1308	1384	# CONFIG_ROMFS_FS is not set
1309	1385	CONFIG_INOTIFY=y
	1386	+CONFIG_INOTIFY_USER=y
1310	1387	# CONFIG_QUOTA is not set
1311	1388	CONFIG_DNOTIFY=y
1312	1389	CONFIG_AUTOFS_FS=y
@@ -1342,7 +1419,6 @@ CONFIG_TMPFS=y · 29 unmodified lines
1342	1419	CONFIG_HUGETLBFS=y
1343	1420	CONFIG_HUGETLB_PAGE=y
1344	1421	CONFIG_RAMFS=y
1345		−# CONFIG_RELAYFS_FS is not set
1346	1422	# CONFIG_CONFIGFS_FS is not set
1347	1423
1348	1424	#
@@ -1388,8 +1464,10 @@ CONFIG_RPCSEC_GSS_SPKM3=m · 39 unmodified lines
1388	1464	# CONFIG_SMB_FS is not set
1389	1465	CONFIG_CIFS=m
1390	1466	# CONFIG_CIFS_STATS is not set
	1467	+# CONFIG_CIFS_WEAK_PW_HASH is not set
1391	1468	CONFIG_CIFS_XATTR=y
1392	1469	CONFIG_CIFS_POSIX=y
	1470	+# CONFIG_CIFS_DEBUG2 is not set
1393	1471	# CONFIG_CIFS_EXPERIMENTAL is not set
1394	1472	# CONFIG_NCP_FS is not set
1395	1473	# CONFIG_CODA_FS is not set
@@ -1470,6 +1548,9 @@ CONFIG_CRC32=y · 74 unmodified lines
1470	1548	CONFIG_LIBCRC32C=m
1471	1549	CONFIG_ZLIB_INFLATE=y
1472	1550	CONFIG_ZLIB_DEFLATE=m
	1551	+CONFIG_TEXTSEARCH=y
	1552	+CONFIG_TEXTSEARCH_KMP=m
	1553	+CONFIG_PLIST=y
1473	1554
1474	1555	#
1475	1556	# Instrumentation Support
@@ -1483,14 +1564,19 @@ CONFIG_OPROFILE=y · 7 unmodified lines
1483	1564	#
1484	1565	# CONFIG_PRINTK_TIME is not set
1485	1566	CONFIG_MAGIC_SYSRQ=y
	1567	+# CONFIG_UNUSED_SYMBOLS is not set
1486	1568	CONFIG_DEBUG_KERNEL=y
1487	1569	CONFIG_LOG_BUF_SHIFT=17
1488	1570	CONFIG_DETECT_SOFTLOCKUP=y
1489	1571	# CONFIG_SCHEDSTATS is not set
1490	1572	# CONFIG_DEBUG_SLAB is not set
1491		−CONFIG_DEBUG_MUTEXES=y
	1573	+# CONFIG_DEBUG_RT_MUTEXES is not set
	1574	+# CONFIG_RT_MUTEX_TESTER is not set
1492	1575	# CONFIG_DEBUG_SPINLOCK is not set
	1576	+CONFIG_DEBUG_MUTEXES=y
	1577	+# CONFIG_DEBUG_RWSEMS is not set
1493	1578	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	1579	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1494	1580	# CONFIG_DEBUG_KOBJECT is not set
1495	1581	# CONFIG_DEBUG_INFO is not set
1496	1582	CONFIG_DEBUG_FS=y
@@ -1504,11 +1590,7 @@ CONFIG_XMON=y · 7 unmodified lines
1504	1590	# CONFIG_XMON_DEFAULT is not set
1505	1591	CONFIG_IRQSTACKS=y
1506	1592	CONFIG_BOOTX_TEXT=y
1507		−# CONFIG_PPC_EARLY_DEBUG_LPAR 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
	1593	+# CONFIG_PPC_EARLY_DEBUG is not set
1512	1594
1513	1595	#
1514	1596	# Security options

arch/powerpc/configs/pseries_defconfig+4−4

@@ -1,7 +1,7 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.18-rc3
4		−# Tue Aug 8 09:14:48 2006
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Sun Sep 10 10:45:12 2006
5	5	#
6	6	CONFIG_PPC64=y
7	7	CONFIG_64BIT=y
@@ -128,7 +128,6 @@ CONFIG_PPC_PSERIES=y · 120 unmodified lines
128	128	# CONFIG_UDBG_RTAS_CONSOLE is not set
129	129	CONFIG_XICS=y
130	130	# CONFIG_U3_DART is not set
131		−CONFIG_MPIC=y
132	131	CONFIG_PPC_RTAS=y
133	132	CONFIG_RTAS_ERROR_LOGGING=y
134	133	CONFIG_RTAS_PROC=y
@@ -140,6 +139,7 @@ CONFIG_IBMEBUS=y · 5 unmodified lines
140	139	# CONFIG_PPC_970_NAP is not set
141	140	# CONFIG_CPU_FREQ is not set
142	141	# CONFIG_WANT_EARLY_SERIAL is not set
	142	+CONFIG_MPIC=y
143	143
144	144	#
145	145	# Kernel options
@@ -196,6 +196,7 @@ CONFIG_ISA_DMA_API=y · 50 unmodified lines
196	196	# Bus options
197	197	#
198	198	CONFIG_GENERIC_ISA_DMA=y
	199	+# CONFIG_MPIC_WEIRD is not set
199	200	CONFIG_PPC_I8259=y
200	201	# CONFIG_PPC_INDIRECT_PCI is not set
201	202	CONFIG_PCI=y
@@ -790,7 +791,6 @@ CONFIG_SERIAL_JSM=m · 588 unmodified lines
790	791	CONFIG_UNIX98_PTYS=y
791	792	CONFIG_LEGACY_PTYS=y
792	793	CONFIG_LEGACY_PTY_COUNT=256
793		−# CONFIG_BRIQ_PANEL is not set
794	794	# CONFIG_PRINTER is not set
795	795	# CONFIG_PPDEV is not set
796	796	# CONFIG_TIPAR is not set

arch/powerpc/kernel/crash.c+1−1

@@ -295,7 +295,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) · 294 unmodified lines
295	295	struct irq_desc *desc = irq_desc + irq;
296	296
297	297	if (desc->status & IRQ_INPROGRESS)
298		− desc->chip->end(irq);
	298	+ desc->chip->eoi(irq);
299	299
300	300	if (!(desc->status & IRQ_DISABLED))
301	301	desc->chip->disable(irq);

arch/powerpc/kernel/misc.S+25−24

@@ -17,15 +17,6 @@ · 16 unmodified lines
17	17
18	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	21	* Returns (address we are running at) - (address we were linked at)
31	22	* for use before the text and data are mapped to KERNELBASE.
@@ -70,6 +61,7 @@ _GLOBAL(add_reloc_offset) · 38 unmodified lines
70	61	* The *_ns versions don't do byte-swapping.
71	62	*/
72	63	_GLOBAL(_insb)
	64	+ sync
73	65	cmpwi 0,r5,0
74	66	mtctr r5
75	67	subi r4,r4,1
@@ -78,7 +70,8 @@ _GLOBAL(_insb) · 2 unmodified lines
78	70	eieio
79	71	stbu r5,1(r4)
80	72	bdnz 00b
81		− IN_SYNC
	73	+ twi 0,r5,0
	74	+ isync
82	75	blr
83	76
84	77	_GLOBAL(_outsb)
@@ -86,14 +79,15 @@ _GLOBAL(_outsb) · 1 unmodified line
86	79	mtctr r5
87	80	subi r4,r4,1
88	81	blelr-
	82	+ sync
89	83	00: lbzu r5,1(r4)
90	84	stb r5,0(r3)
91		− EIEIO_32
92	85	bdnz 00b
93		− SYNC_64
	86	+ sync
94	87	blr
95	88
96	89	_GLOBAL(_insw)
	90	+ sync
97	91	cmpwi 0,r5,0
98	92	mtctr r5
99	93	subi r4,r4,2
@@ -102,7 +96,8 @@ _GLOBAL(_insw) · 2 unmodified lines
102	96	eieio
103	97	sthu r5,2(r4)
104	98	bdnz 00b
105		− IN_SYNC
	99	+ twi 0,r5,0
	100	+ isync
106	101	blr
107	102
108	103	_GLOBAL(_outsw)
@@ -110,14 +105,15 @@ _GLOBAL(_outsw) · 1 unmodified line
110	105	mtctr r5
111	106	subi r4,r4,2
112	107	blelr-
	108	+ sync
113	109	00: lhzu r5,2(r4)
114		− EIEIO_32
115	110	sthbrx r5,0,r3
116	111	bdnz 00b
117		− SYNC_64
	112	+ sync
118	113	blr
119	114
120	115	_GLOBAL(_insl)
	116	+ sync
121	117	cmpwi 0,r5,0
122	118	mtctr r5
123	119	subi r4,r4,4
@@ -126,7 +122,8 @@ _GLOBAL(_insl) · 2 unmodified lines
126	122	eieio
127	123	stwu r5,4(r4)
128	124	bdnz 00b
129		− IN_SYNC
	125	+ twi 0,r5,0
	126	+ isync
130	127	blr
131	128
132	129	_GLOBAL(_outsl)
@@ -134,17 +131,18 @@ _GLOBAL(_outsl) · 1 unmodified line
134	131	mtctr r5
135	132	subi r4,r4,4
136	133	blelr-
	134	+ sync
137	135	00: lwzu r5,4(r4)
138	136	stwbrx r5,0,r3
139		− EIEIO_32
140	137	bdnz 00b
141		− SYNC_64
	138	+ sync
142	139	blr
143	140
144	141	#ifdef CONFIG_PPC32
145	142	_GLOBAL(__ide_mm_insw)
146	143	#endif
147	144	_GLOBAL(_insw_ns)
	145	+ sync
148	146	cmpwi 0,r5,0
149	147	mtctr r5
150	148	subi r4,r4,2
@@ -153,7 +151,8 @@ _GLOBAL(_insw_ns) · 2 unmodified lines
153	151	eieio
154	152	sthu r5,2(r4)
155	153	bdnz 00b
156		− IN_SYNC
	154	+ twi 0,r5,0
	155	+ isync
157	156	blr
158	157
159	158	#ifdef CONFIG_PPC32
@@ -164,17 +163,18 @@ _GLOBAL(_outsw_ns) · 4 unmodified lines
164	163	mtctr r5
165	164	subi r4,r4,2
166	165	blelr-
	166	+ sync
167	167	00: lhzu r5,2(r4)
168	168	sth r5,0(r3)
169		− EIEIO_32
170	169	bdnz 00b
171		− SYNC_64
	170	+ sync
172	171	blr
173	172
174	173	#ifdef CONFIG_PPC32
175	174	_GLOBAL(__ide_mm_insl)
176	175	#endif
177	176	_GLOBAL(_insl_ns)
	177	+ sync
178	178	cmpwi 0,r5,0
179	179	mtctr r5
180	180	subi r4,r4,4
@@ -183,7 +183,8 @@ _GLOBAL(_insl_ns) · 2 unmodified lines
183	183	eieio
184	184	stwu r5,4(r4)
185	185	bdnz 00b
186		− IN_SYNC
	186	+ twi 0,r5,0
	187	+ isync
187	188	blr
188	189
189	190	#ifdef CONFIG_PPC32
@@ -194,10 +195,10 @@ _GLOBAL(_outsl_ns) · 4 unmodified lines
194	195	mtctr r5
195	196	subi r4,r4,4
196	197	blelr-
	198	+ sync
197	199	00: lwzu r5,4(r4)
198	200	stw r5,0(r3)
199		− EIEIO_32
200	201	bdnz 00b
201		− SYNC_64
	202	+ sync
202	203	blr
203	204

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c+1−1

@@ -158,7 +158,7 @@ get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin) · 157 unmodified lines
158	158
159	159	laddr[0] = (hose->first_busno << 16) \| (PCI_DEVFN(slot, 0) << 8);
160	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	162	DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n",
163	163	laddr[0], slot, pin, oirq.specifier[0]);
164	164	return oirq.specifier[0];

arch/powerpc/sysdev/dart_iommu.c+6−1

@@ -139,6 +139,7 @@ wait_more: · 138 unmodified lines
139	139
140	140	static void dart_flush(struct iommu_table *tbl)
141	141	{
	142	+ mb();
142	143	if (dart_dirty) {
143	144	dart_tlb_invalidate_all();
144	145	dart_dirty = 0;
@@ -172,9 +173,13 @@ static void dart_build(struct iommu_table *tbl, long index, · 27 unmodified lines
172	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	181	if (dart_is_u4) {
176	182	rpn = index;
177		− mb(); /* make sure all updates have reached memory */
178	183	while (npages--)
179	184	dart_tlb_invalidate_one(rpn++);
180	185	} else {

arch/ppc/configs/prep_defconfig+319−266

@@ -1,56 +1,63 @@
1	1	#
2	2	# Automatically generated make config: don't edit
3		−# Linux kernel version: 2.6.13-rc3
4		−# Wed Jul 13 13:34:24 2005
	3	+# Linux kernel version: 2.6.18-rc6
	4	+# Wed Sep 6 15:09:32 2006
5	5	#
6	6	CONFIG_MMU=y
7	7	CONFIG_GENERIC_HARDIRQS=y
8	8	CONFIG_RWSEM_XCHGADD_ALGORITHM=y
	9	+CONFIG_GENERIC_HWEIGHT=y
9	10	CONFIG_GENERIC_CALIBRATE_DELAY=y
10		−CONFIG_HAVE_DEC_LOCK=y
11	11	CONFIG_PPC=y
12	12	CONFIG_PPC32=y
13	13	CONFIG_GENERIC_NVRAM=y
	14	+CONFIG_GENERIC_FIND_NEXT_BIT=y
14	15	CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
	16	+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
	17	+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
15	18
16	19	#
17	20	# Code maturity level options
18	21	#
19	22	CONFIG_EXPERIMENTAL=y
20		−CONFIG_CLEAN_COMPILE=y
21	23	CONFIG_BROKEN_ON_SMP=y
22	24	CONFIG_INIT_ENV_ARG_LIMIT=32
23	25
24	26	#
25	27	# General setup
26	28	#
27		−CONFIG_LOCALVERSION=""
	29	+CONFIG_LOCALVERSION="-prep"
	30	+CONFIG_LOCALVERSION_AUTO=y
28	31	CONFIG_SWAP=y
29	32	CONFIG_SYSVIPC=y
30	33	CONFIG_POSIX_MQUEUE=y
31	34	# CONFIG_BSD_PROCESS_ACCT is not set
	35	+# CONFIG_TASKSTATS is not set
32	36	CONFIG_SYSCTL=y
33	37	# CONFIG_AUDIT is not set
34		−CONFIG_HOTPLUG=y
35		−CONFIG_KOBJECT_UEVENT=y
36	38	CONFIG_IKCONFIG=y
37	39	CONFIG_IKCONFIG_PROC=y
	40	+# CONFIG_RELAY is not set
	41	+CONFIG_INITRAMFS_SOURCE=""
	42	+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
38	43	# CONFIG_EMBEDDED is not set
39	44	CONFIG_KALLSYMS=y
40	45	# CONFIG_KALLSYMS_ALL is not set
41	46	# CONFIG_KALLSYMS_EXTRA_PASS is not set
	47	+CONFIG_HOTPLUG=y
42	48	CONFIG_PRINTK=y
43	49	CONFIG_BUG=y
	50	+CONFIG_ELF_CORE=y
44	51	CONFIG_BASE_FULL=y
	52	+CONFIG_RT_MUTEXES=y
45	53	CONFIG_FUTEX=y
46	54	CONFIG_EPOLL=y
47	55	CONFIG_SHMEM=y
48		−CONFIG_CC_ALIGN_FUNCTIONS=0
49		−CONFIG_CC_ALIGN_LABELS=0
50		−CONFIG_CC_ALIGN_LOOPS=0
51		−CONFIG_CC_ALIGN_JUMPS=0
	56	+CONFIG_SLAB=y
	57	+CONFIG_VM_EVENT_COUNTERS=y
52	58	# CONFIG_TINY_SHMEM is not set
53	59	CONFIG_BASE_SMALL=0
	60	+# CONFIG_SLOB is not set
54	61
55	62	#
56	63	# Loadable module support
@@ -58,69 +65,68 @@ CONFIG_BASE_SMALL=0 · 1 unmodified line
58	65	CONFIG_MODULES=y
59	66	CONFIG_MODULE_UNLOAD=y
60	67	# CONFIG_MODULE_FORCE_UNLOAD is not set
61		−CONFIG_OBSOLETE_MODPARM=y
62	68	CONFIG_MODVERSIONS=y
63	69	# CONFIG_MODULE_SRCVERSION_ALL is not set
64	70	CONFIG_KMOD=y
65	71
	72	+#
	73	+# Block layer
	74	+#
	75	+CONFIG_LBD=y
	76	+# CONFIG_BLK_DEV_IO_TRACE is not set
	77	+# CONFIG_LSF is not set
	78	+
	79	+#
	80	+# IO Schedulers
	81	+#
	82	+CONFIG_IOSCHED_NOOP=y
	83	+CONFIG_IOSCHED_AS=y
	84	+CONFIG_IOSCHED_DEADLINE=y
	85	+CONFIG_IOSCHED_CFQ=y
	86	+# CONFIG_DEFAULT_AS is not set
	87	+# CONFIG_DEFAULT_DEADLINE is not set
	88	+CONFIG_DEFAULT_CFQ=y
	89	+# CONFIG_DEFAULT_NOOP is not set
	90	+CONFIG_DEFAULT_IOSCHED="cfq"
	91	+
66	92	#
67	93	# Processor
68	94	#
69	95	CONFIG_6xx=y
70	96	# CONFIG_40x is not set
71	97	# CONFIG_44x is not set
72		−# CONFIG_POWER3 is not set
73		−# CONFIG_POWER4 is not set
74	98	# CONFIG_8xx is not set
75	99	# CONFIG_E200 is not set
76	100	# CONFIG_E500 is not set
77	101	CONFIG_PPC_FPU=y
78		−CONFIG_ALTIVEC=y
79		−CONFIG_TAU=y
80		−# CONFIG_TAU_INT is not set
81		−# CONFIG_TAU_AVERAGE is not set
	102	+# CONFIG_ALTIVEC is not set
	103	+# CONFIG_TAU is not set
82	104	# CONFIG_KEXEC is not set
83		−CONFIG_CPU_FREQ=y
84		−CONFIG_CPU_FREQ_TABLE=y
85		−# CONFIG_CPU_FREQ_DEBUG is not set
86		−CONFIG_CPU_FREQ_STAT=m
87		−CONFIG_CPU_FREQ_STAT_DETAILS=y
88		−CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
89		−# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
90		−CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
91		−CONFIG_CPU_FREQ_GOV_POWERSAVE=m
92		−CONFIG_CPU_FREQ_GOV_USERSPACE=m
93		−CONFIG_CPU_FREQ_GOV_ONDEMAND=m
94		−CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
95		−CONFIG_CPU_FREQ_PMAC=y
	105	+# CONFIG_CPU_FREQ is not set
96	106	CONFIG_PPC601_SYNC_FIX=y
97		−CONFIG_PM=y
	107	+# CONFIG_WANT_EARLY_SERIAL is not set
98	108	CONFIG_PPC_STD_MMU=y
99	109
100	110	#
101	111	# Platform options
102	112	#
103		−CONFIG_PPC_MULTIPLATFORM=y
	113	+CONFIG_PPC_PREP=y
104	114	# CONFIG_APUS is not set
105	115	# CONFIG_KATANA is not set
106	116	# CONFIG_WILLOW is not set
107	117	# CONFIG_CPCI690 is not set
108		−# CONFIG_PCORE is not set
109	118	# CONFIG_POWERPMC250 is not set
110	119	# CONFIG_CHESTNUT is not set
111	120	# CONFIG_SPRUCE is not set
112	121	# CONFIG_HDPU is not set
113	122	# CONFIG_EV64260 is not set
114	123	# CONFIG_LOPEC is not set
115		−# CONFIG_MCPN765 is not set
116	124	# CONFIG_MVME5100 is not set
117	125	# CONFIG_PPLUS is not set
118	126	# CONFIG_PRPMC750 is not set
119	127	# CONFIG_PRPMC800 is not set
120	128	# CONFIG_SANDPOINT is not set
121	129	# CONFIG_RADSTONE_PPC7D is not set
122		−# CONFIG_ADIR is not set
123		−# CONFIG_K2 is not set
124	130	# CONFIG_PAL4 is not set
125	131	# CONFIG_GEMINI is not set
126	132	# CONFIG_EST8260 is not set
@@ -132,10 +138,7 @@ CONFIG_PPC_MULTIPLATFORM=y · 5 unmodified lines
132	138	# CONFIG_PQ2FADS is not set
133	139	# CONFIG_LITE5200 is not set
134	140	# CONFIG_MPC834x_SYS is not set
135		−CONFIG_PPC_CHRP=y
136		−CONFIG_PPC_PMAC=y
137		−CONFIG_PPC_PREP=y
138		−CONFIG_PPC_OF=y
	141	+# CONFIG_EV64360 is not set
139	142	CONFIG_PPCBUG_NVRAM=y
140	143	# CONFIG_SMP is not set
141	144	# CONFIG_HIGHMEM is not set
@@ -152,12 +155,16 @@ CONFIG_FLATMEM_MANUAL=y · 10 unmodified lines
152	155	# CONFIG_SPARSEMEM_MANUAL is not set
153	156	CONFIG_FLATMEM=y
154	157	CONFIG_FLAT_NODE_MEM_MAP=y
	158	+# CONFIG_SPARSEMEM_STATIC is not set
	159	+CONFIG_SPLIT_PTLOCK_CPUS=4
	160	+# CONFIG_RESOURCES_64BIT is not set
155	161	CONFIG_BINFMT_ELF=y
156	162	CONFIG_BINFMT_MISC=m
157		−CONFIG_PROC_DEVICETREE=y
158	163	CONFIG_PREP_RESIDUAL=y
159	164	CONFIG_PROC_PREPRESIDUAL=y
160	165	# CONFIG_CMDLINE_BOOL is not set
	166	+CONFIG_PM=y
	167	+# CONFIG_PM_LEGACY is not set
161	168	# CONFIG_PM_DEBUG is not set
162	169	CONFIG_SOFTWARE_SUSPEND=y
163	170	CONFIG_PM_STD_PARTITION=""
@@ -169,10 +176,10 @@ CONFIG_ISA_DMA_API=y · 5 unmodified lines
169	176	#
170	177	CONFIG_ISA=y
171	178	CONFIG_GENERIC_ISA_DMA=y
	179	+CONFIG_PPC_I8259=y
	180	+CONFIG_PPC_INDIRECT_PCI=y
172	181	CONFIG_PCI=y
173	182	CONFIG_PCI_DOMAINS=y
174		−# CONFIG_PCI_LEGACY_PROC is not set
175		−# CONFIG_PCI_NAMES is not set
176	183	# CONFIG_PCI_DEBUG is not set
177	184
178	185	#
@@ -187,6 +194,11 @@ CONFIG_CARDBUS=y · 8 unmodified lines
187	194	# PC-card bridges
188	195	#
189	196	CONFIG_YENTA=m
	197	+CONFIG_YENTA_O2=y
	198	+CONFIG_YENTA_RICOH=y
	199	+CONFIG_YENTA_TI=y
	200	+CONFIG_YENTA_ENE_TUNE=y
	201	+CONFIG_YENTA_TOSHIBA=y
190	202	CONFIG_PCMCIA_PROBE=y
191	203	CONFIG_PCCARD_NONSTATIC=m
192	204
@@ -212,6 +224,7 @@ CONFIG_NET=y · 19 unmodified lines
212	224	#
213	225	# Networking options
214	226	#
	227	+# CONFIG_NETDEBUG is not set
215	228	CONFIG_PACKET=y
216	229	# CONFIG_PACKET_MMAP is not set
217	230	CONFIG_UNIX=y
@@ -229,9 +242,11 @@ CONFIG_SYN_COOKIES=y · 11 unmodified lines
229	242	# CONFIG_INET_AH is not set
230	243	# CONFIG_INET_ESP is not set
231	244	# CONFIG_INET_IPCOMP is not set
	245	+# CONFIG_INET_XFRM_TUNNEL is not set
232	246	# CONFIG_INET_TUNNEL is not set
233		−CONFIG_IP_TCPDIAG=y
234		−# CONFIG_IP_TCPDIAG_IPV6 is not set
	247	+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
	248	+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
	249	+# CONFIG_INET_DIAG is not set
235	250	# CONFIG_TCP_CONG_ADVANCED is not set
236	251	CONFIG_TCP_CONG_BIC=y
237	252
@@ -240,80 +255,77 @@ CONFIG_TCP_CONG_BIC=y · 2 unmodified lines
240	255	#
241	256	# CONFIG_IP_VS is not set
242	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
243	261	CONFIG_NETFILTER=y
244	262	# CONFIG_NETFILTER_DEBUG is not set
245	263
	264	+#
	265	+# Core Netfilter Configuration
	266	+#
	267	+CONFIG_NETFILTER_NETLINK=m
	268	+CONFIG_NETFILTER_NETLINK_QUEUE=m
	269	+CONFIG_NETFILTER_NETLINK_LOG=m
	270	+CONFIG_NETFILTER_XTABLES=m
	271	+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
	272	+CONFIG_NETFILTER_XT_TARGET_MARK=m
	273	+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
	274	+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
	275	+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
	276	+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
	277	+CONFIG_NETFILTER_XT_MATCH_DCCP=m
	278	+CONFIG_NETFILTER_XT_MATCH_ESP=m
	279	+CONFIG_NETFILTER_XT_MATCH_HELPER=m
	280	+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
	281	+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
	282	+CONFIG_NETFILTER_XT_MATCH_MAC=m
	283	+CONFIG_NETFILTER_XT_MATCH_MARK=m
	284	+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
	285	+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
	286	+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
	287	+CONFIG_NETFILTER_XT_MATCH_REALM=m
	288	+CONFIG_NETFILTER_XT_MATCH_SCTP=m
	289	+CONFIG_NETFILTER_XT_MATCH_STATE=m
	290	+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
	291	+CONFIG_NETFILTER_XT_MATCH_STRING=m
	292	+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
	293	+
246	294	#
247	295	# IP: Netfilter Configuration
248	296	#
249	297	CONFIG_IP_NF_CONNTRACK=m
250	298	# CONFIG_IP_NF_CT_ACCT is not set
251	299	CONFIG_IP_NF_CONNTRACK_MARK=y
	300	+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
	301	+# CONFIG_IP_NF_CONNTRACK_NETLINK is not set
252	302	# CONFIG_IP_NF_CT_PROTO_SCTP is not set
253	303	CONFIG_IP_NF_FTP=m
254	304	CONFIG_IP_NF_IRC=m
	305	+# CONFIG_IP_NF_NETBIOS_NS is not set
255	306	CONFIG_IP_NF_TFTP=m
256	307	CONFIG_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
257	311	CONFIG_IP_NF_QUEUE=m
258		−CONFIG_IP_NF_IPTABLES=m
259		−CONFIG_IP_NF_MATCH_LIMIT=m
260		−CONFIG_IP_NF_MATCH_IPRANGE=m
261		−CONFIG_IP_NF_MATCH_MAC=m
262		−CONFIG_IP_NF_MATCH_PKTTYPE=m
263		−CONFIG_IP_NF_MATCH_MARK=m
264		−CONFIG_IP_NF_MATCH_MULTIPORT=m
265		−CONFIG_IP_NF_MATCH_TOS=m
266		−CONFIG_IP_NF_MATCH_RECENT=m
267		−CONFIG_IP_NF_MATCH_ECN=m
268		−CONFIG_IP_NF_MATCH_DSCP=m
269		−CONFIG_IP_NF_MATCH_AH_ESP=m
270		−CONFIG_IP_NF_MATCH_LENGTH=m
271		−CONFIG_IP_NF_MATCH_TTL=m
272		−CONFIG_IP_NF_MATCH_TCPMSS=m
273		−CONFIG_IP_NF_MATCH_HELPER=m
274		−CONFIG_IP_NF_MATCH_STATE=m
275		−CONFIG_IP_NF_MATCH_CONNTRACK=m
276		−CONFIG_IP_NF_MATCH_OWNER=m
277		−CONFIG_IP_NF_MATCH_ADDRTYPE=m
278		−CONFIG_IP_NF_MATCH_REALM=m
279		−CONFIG_IP_NF_MATCH_SCTP=m
280		−CONFIG_IP_NF_MATCH_COMMENT=m
281		−CONFIG_IP_NF_MATCH_CONNMARK=m
282		−CONFIG_IP_NF_MATCH_HASHLIMIT=m
283		−CONFIG_IP_NF_FILTER=m
284		−CONFIG_IP_NF_TARGET_REJECT=m
285		−CONFIG_IP_NF_TARGET_LOG=m
286		−CONFIG_IP_NF_TARGET_ULOG=m
287		−CONFIG_IP_NF_TARGET_TCPMSS=m
288		−CONFIG_IP_NF_NAT=m
289		−CONFIG_IP_NF_NAT_NEEDED=y
290		−CONFIG_IP_NF_TARGET_MASQUERADE=m
291		−CONFIG_IP_NF_TARGET_REDIRECT=m
292		−CONFIG_IP_NF_TARGET_NETMAP=m
293		−CONFIG_IP_NF_TARGET_SAME=m
294		−CONFIG_IP_NF_NAT_SNMP_BASIC=m
295		−CONFIG_IP_NF_NAT_IRC=m
296		−CONFIG_IP_NF_NAT_FTP=m
297		−CONFIG_IP_NF_NAT_TFTP=m
298		−CONFIG_IP_NF_NAT_AMANDA=m
299		−CONFIG_IP_NF_MANGLE=m
300		−CONFIG_IP_NF_TARGET_TOS=m
301		−CONFIG_IP_NF_TARGET_ECN=m
302		−CONFIG_IP_NF_TARGET_DSCP=m
303		−CONFIG_IP_NF_TARGET_MARK=m
304		−CONFIG_IP_NF_TARGET_CLASSIFY=m
305		−CONFIG_IP_NF_TARGET_CONNMARK=m
306		−CONFIG_IP_NF_TARGET_CLUSTERIP=m
307		−CONFIG_IP_NF_RAW=m
308		−CONFIG_IP_NF_TARGET_NOTRACK=m
309		−CONFIG_IP_NF_ARPTABLES=m
310		−# CONFIG_IP_NF_ARPFILTER is not set
311		−# CONFIG_IP_NF_ARP_MANGLE is not set
	312	+# CONFIG_IP_NF_IPTABLES is not set
	313	+# CONFIG_IP_NF_ARPTABLES is not set
	314	+
	315	+#
	316	+# DCCP Configuration (EXPERIMENTAL)
	317	+#
	318	+# CONFIG_IP_DCCP is not set
312	319
313	320	#
314	321	# SCTP Configuration (EXPERIMENTAL)
315	322	#
316	323	# CONFIG_IP_SCTP is not set
	324	+
	325	+#
	326	+# TIPC Configuration (EXPERIMENTAL)
	327	+#
	328	+# CONFIG_TIPC is not set
317	329	# CONFIG_ATM is not set
318	330	# CONFIG_BRIDGE is not set
319	331	# CONFIG_VLAN_8021Q is not set
@@ -326,6 +338,10 @@ CONFIG_IP_NF_ARPTABLES=m · 6 unmodified lines
326	338	# CONFIG_NET_DIVERT is not set
327	339	# CONFIG_ECONET is not set
328	340	# CONFIG_WAN_ROUTER is not set
	341	+
	342	+#
	343	+# QoS and/or fair queueing
	344	+#
329	345	# CONFIG_NET_SCHED is not set
330	346	CONFIG_NET_CLS_ROUTE=y
331	347
@@ -333,13 +349,11 @@ CONFIG_NET_CLS_ROUTE=y · 1 unmodified line
333	349	# Network testing
334	350	#
335	351	# CONFIG_NET_PKTGEN is not set
336		−CONFIG_NETPOLL=y
337		−# CONFIG_NETPOLL_RX is not set
338		−# CONFIG_NETPOLL_TRAP is not set
339		−CONFIG_NET_POLL_CONTROLLER=y
340	352	# CONFIG_HAMRADIO is not set
341	353	# CONFIG_IRDA is not set
342	354	# CONFIG_BT is not set
	355	+# CONFIG_IEEE80211 is not set
	356	+CONFIG_WIRELESS_EXT=y
343	357
344	358	#
345	359	# Device Drivers
@@ -352,6 +366,12 @@ CONFIG_NET_POLL_CONTROLLER=y · 6 unmodified lines
352	366	CONFIG_PREVENT_FIRMWARE_BUILD=y
353	367	CONFIG_FW_LOADER=m
354	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	377	# Memory Technology Devices (MTD)
@@ -367,6 +387,7 @@ CONFIG_PARPORT_SERIAL=m · 9 unmodified lines
367	387	CONFIG_PARPORT_PC_FIFO=y
368	388	CONFIG_PARPORT_PC_SUPERIO=y
369	389	# CONFIG_PARPORT_GSC is not set
	390	+# CONFIG_PARPORT_AX88796 is not set
370	391	CONFIG_PARPORT_1284=y
371	392
372	393	#
@@ -378,7 +399,6 @@ CONFIG_PARPORT_1284=y · 5 unmodified lines
378	399	# Block devices
379	400	#
380	401	CONFIG_BLK_DEV_FD=m
381		−CONFIG_MAC_FLOPPY=m
382	402	# CONFIG_BLK_DEV_XD is not set
383	403	# CONFIG_PARIDE is not set
384	404	# CONFIG_BLK_CPQ_DA is not set
@@ -394,18 +414,9 @@ CONFIG_BLK_DEV_LOOP=y · 9 unmodified lines
394	414	CONFIG_BLK_DEV_RAM=y
395	415	CONFIG_BLK_DEV_RAM_COUNT=16
396	416	CONFIG_BLK_DEV_RAM_SIZE=4096
	417	+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
397	418	CONFIG_BLK_DEV_INITRD=y
398		−CONFIG_INITRAMFS_SOURCE=""
399		−CONFIG_LBD=y
400	419	# CONFIG_CDROM_PKTCDVD is not set
401		−
402		−#
403		−# IO Schedulers
404		−#
405		−CONFIG_IOSCHED_NOOP=y
406		−CONFIG_IOSCHED_AS=y
407		−CONFIG_IOSCHED_DEADLINE=y
408		−CONFIG_IOSCHED_CFQ=y
409	420	# CONFIG_ATA_OVER_ETH is not set
410	421
411	422	#
@@ -422,7 +433,7 @@ CONFIG_BLK_DEV_IDEDISK=y · 10 unmodified lines
422	433	# CONFIG_IDEDISK_MULTI_MODE is not set
423	434	CONFIG_BLK_DEV_IDECD=y
424	435	# CONFIG_BLK_DEV_IDETAPE is not set
425		−CONFIG_BLK_DEV_IDEFLOPPY=y
	436	+# CONFIG_BLK_DEV_IDEFLOPPY is not set
426	437	CONFIG_BLK_DEV_IDESCSI=y
427	438	# CONFIG_IDE_TASK_IOCTL is not set
428	439
@@ -435,7 +446,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y · 6 unmodified lines
435	446	# CONFIG_BLK_DEV_OFFBOARD is not set
436	447	CONFIG_BLK_DEV_GENERIC=y
437	448	# CONFIG_BLK_DEV_OPTI621 is not set
438		−# CONFIG_BLK_DEV_SL82C105 is not set
	449	+CONFIG_BLK_DEV_SL82C105=y
439	450	CONFIG_BLK_DEV_IDEDMA_PCI=y
440	451	# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
441	452	CONFIG_IDEDMA_PCI_AUTO=y
@@ -443,7 +454,7 @@ CONFIG_IDEDMA_PCI_AUTO=y · 1 unmodified line
443	454	# CONFIG_BLK_DEV_AEC62XX is not set
444	455	# CONFIG_BLK_DEV_ALI15X3 is not set
445	456	# CONFIG_BLK_DEV_AMD74XX is not set
446		−CONFIG_BLK_DEV_CMD64X=y
	457	+# CONFIG_BLK_DEV_CMD64X is not set
447	458	# CONFIG_BLK_DEV_TRIFLEX is not set
448	459	# CONFIG_BLK_DEV_CY82C693 is not set
449	460	# CONFIG_BLK_DEV_CS5520 is not set
@@ -455,17 +466,12 @@ CONFIG_BLK_DEV_CMD64X=y · 5 unmodified lines
455	466	# CONFIG_BLK_DEV_IT821X is not set
456	467	# CONFIG_BLK_DEV_NS87415 is not set
457	468	# CONFIG_BLK_DEV_PDC202XX_OLD is not set
458		−CONFIG_BLK_DEV_PDC202XX_NEW=y
459		−# CONFIG_PDC202XX_FORCE is not set
	469	+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
460	470	# CONFIG_BLK_DEV_SVWKS is not set
461	471	# CONFIG_BLK_DEV_SIIMAGE is not set
462	472	# CONFIG_BLK_DEV_SLC90E66 is not set
463	473	# CONFIG_BLK_DEV_TRM290 is not set
464	474	# CONFIG_BLK_DEV_VIA82CXXX is not set
465		−CONFIG_BLK_DEV_IDE_PMAC=y
466		−CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
467		−CONFIG_BLK_DEV_IDEDMA_PMAC=y
468		−CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
469	475	# CONFIG_IDE_ARM is not set
470	476	# CONFIG_IDE_CHIPSETS is not set
471	477	CONFIG_BLK_DEV_IDEDMA=y
@@ -476,6 +482,7 @@ CONFIG_IDEDMA_AUTO=y · 4 unmodified lines
476	482	#
477	483	# SCSI device support
478	484	#
	485	+# CONFIG_RAID_ATTRS is not set
479	486	CONFIG_SCSI=y
480	487	CONFIG_SCSI_PROC_FS=y
481	488
@@ -503,10 +510,12 @@ CONFIG_SCSI_LOGGING=y · 21 unmodified lines
503	510	CONFIG_SCSI_SPI_ATTRS=y
504	511	# CONFIG_SCSI_FC_ATTRS is not set
505	512	# CONFIG_SCSI_ISCSI_ATTRS is not set
	513	+# CONFIG_SCSI_SAS_ATTRS is not set
506	514
507	515	#
508	516	# SCSI low-level drivers
509	517	#
	518	+# CONFIG_ISCSI_TCP is not set
510	519	# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
511	520	# CONFIG_SCSI_3W_9XXX is not set
512	521	# CONFIG_SCSI_7000FASST is not set
@@ -514,19 +523,16 @@ CONFIG_SCSI_SPI_ATTRS=y · 1 unmodified line
514	523	# CONFIG_SCSI_AHA152X is not set
515	524	# CONFIG_SCSI_AHA1542 is not set
516	525	# CONFIG_SCSI_AACRAID is not set
517		−CONFIG_SCSI_AIC7XXX=m
518		−CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
519		−CONFIG_AIC7XXX_RESET_DELAY_MS=15000
520		−CONFIG_AIC7XXX_DEBUG_ENABLE=y
521		−CONFIG_AIC7XXX_DEBUG_MASK=0
522		−CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
523		−CONFIG_SCSI_AIC7XXX_OLD=m
	526	+# CONFIG_SCSI_AIC7XXX is not set
	527	+# CONFIG_SCSI_AIC7XXX_OLD is not set
524	528	# CONFIG_SCSI_AIC79XX is not set
525	529	# CONFIG_SCSI_DPT_I2O is not set
526	530	# CONFIG_SCSI_IN2000 is not set
527	531	# CONFIG_MEGARAID_NEWGEN is not set
528	532	# CONFIG_MEGARAID_LEGACY is not set
	533	+# CONFIG_MEGARAID_SAS is not set
529	534	# CONFIG_SCSI_SATA is not set
	535	+# CONFIG_SCSI_HPTIOP is not set
530	536	# CONFIG_SCSI_BUSLOGIC is not set
531	537	# CONFIG_SCSI_DMX3191D is not set
532	538	# CONFIG_SCSI_DTC3280 is not set
@@ -545,19 +551,13 @@ CONFIG_SCSI_SYM53C8XX_2=y · 12 unmodified lines
545	551	CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
546	552	CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
547	553	CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
548		−# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
	554	+CONFIG_SCSI_SYM53C8XX_MMIO=y
549	555	# CONFIG_SCSI_IPR is not set
550	556	# CONFIG_SCSI_PAS16 is not set
551	557	# CONFIG_SCSI_PSI240I is not set
552	558	# CONFIG_SCSI_QLOGIC_FAS is not set
553		−# CONFIG_SCSI_QLOGIC_FC is not set
554	559	# CONFIG_SCSI_QLOGIC_1280 is not set
555		−CONFIG_SCSI_QLA2XXX=y
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
	560	+# CONFIG_SCSI_QLA_FC is not set
561	561	# CONFIG_SCSI_LPFC is not set
562	562	# CONFIG_SCSI_SYM53C416 is not set
563	563	# CONFIG_SCSI_DC395x is not set
@@ -566,10 +566,6 @@ CONFIG_SCSI_QLA2XXX=y · 2 unmodified lines
566	566	# CONFIG_SCSI_U14_34F is not set
567	567	# CONFIG_SCSI_NSP32 is not set
568	568	# CONFIG_SCSI_DEBUG is not set
569		−CONFIG_SCSI_MESH=y
570		−CONFIG_SCSI_MESH_SYNC_RATE=5
571		−CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
572		−CONFIG_SCSI_MAC53C94=y
573	569
574	570	#
575	571	# Old CD-ROM drivers (not SCSI, not IDE)
@@ -587,6 +583,7 @@ CONFIG_SCSI_MAC53C94=y · 11 unmodified lines
587	583	# CONFIG_FUSION is not set
588	584	# CONFIG_FUSION_SPI is not set
589	585	# CONFIG_FUSION_FC is not set
	586	+# CONFIG_FUSION_SAS is not set
590	587
591	588	#
592	589	# IEEE 1394 (FireWire) support
@@ -613,12 +610,9 @@ CONFIG_IEEE1394_OHCI1394=m · 20 unmodified lines
613	610	#
614	611	CONFIG_IEEE1394_VIDEO1394=m
615	612	CONFIG_IEEE1394_SBP2=m
616		−# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
617	613	CONFIG_IEEE1394_ETH1394=m
618	614	CONFIG_IEEE1394_DV1394=m
619	615	CONFIG_IEEE1394_RAWIO=m
620		−CONFIG_IEEE1394_CMP=m
621		−CONFIG_IEEE1394_AMDTP=m
622	616
623	617	#
624	618	# I2O device support
@@ -628,18 +622,7 @@ CONFIG_IEEE1394_AMDTP=m · 3 unmodified lines
628	622	#
629	623	# Macintosh device drivers
630	624	#
631		−CONFIG_ADB=y
632		−CONFIG_ADB_CUDA=y
633		−CONFIG_ADB_PMU=y
634		−CONFIG_PMAC_APM_EMU=y
635		−CONFIG_PMAC_MEDIABAY=y
636		−CONFIG_PMAC_BACKLIGHT=y
637		−CONFIG_ADB_MACIO=y
638		−CONFIG_INPUT_ADBHID=y
639		−CONFIG_MAC_EMUMOUSEBTN=y
640		−CONFIG_THERM_WINDTUNNEL=m
641		−CONFIG_THERM_ADT746X=m
642		−# CONFIG_ANSLCD is not set
	625	+# CONFIG_WINDFARM is not set
643	626
644	627	#
645	628	# Network device support
@@ -655,16 +638,19 @@ CONFIG_TUN=m · 9 unmodified lines
655	638	#
656	639	# CONFIG_ARCNET is not set
657	640
	641	+#
	642	+# PHY device support
	643	+#
	644	+# CONFIG_PHYLIB is not set
	645	+
658	646	#
659	647	# Ethernet (10 or 100Mbit)
660	648	#
661	649	CONFIG_NET_ETHERNET=y
662	650	CONFIG_MII=y
663		−CONFIG_MACE=y
664		−# CONFIG_MACE_AAUI_PORT is not set
665		−CONFIG_BMAC=y
666	651	# CONFIG_HAPPYMEAL is not set
667		−CONFIG_SUNGEM=y
	652	+# CONFIG_SUNGEM is not set
	653	+# CONFIG_CASSINI is not set
668	654	# CONFIG_NET_VENDOR_3COM is not set
669	655	# CONFIG_LANCE is not set
670	656	# CONFIG_NET_VENDOR_SMC is not set
@@ -682,6 +668,7 @@ CONFIG_TULIP_MMIO=y · 11 unmodified lines
682	668	CONFIG_DE4X5=m
683	669	# CONFIG_WINBOND_840 is not set
684	670	# CONFIG_DM9102 is not set
	671	+# CONFIG_ULI526X is not set
685	672	# CONFIG_PCMCIA_XIRCOM is not set
686	673	# CONFIG_PCMCIA_XIRTULIP is not set
687	674	# CONFIG_AT1700 is not set
@@ -722,18 +709,21 @@ CONFIG_PCNET32=y · 34 unmodified lines
722	709	# CONFIG_HAMACHI is not set
723	710	# CONFIG_YELLOWFIN is not set
724	711	# CONFIG_R8169 is not set
	712	+# CONFIG_SIS190 is not set
725	713	# CONFIG_SKGE is not set
	714	+# CONFIG_SKY2 is not set
726	715	# CONFIG_SK98LIN is not set
727	716	# CONFIG_VIA_VELOCITY is not set
728	717	# CONFIG_TIGON3 is not set
729	718	# CONFIG_BNX2 is not set
730		−# CONFIG_MV643XX_ETH is not set
731	719
732	720	#
733	721	# Ethernet (10000 Mbit)
734	722	#
	723	+# CONFIG_CHELSIO_T1 is not set
735	724	# CONFIG_IXGB is not set
736	725	# CONFIG_S2IO is not set
	726	+# CONFIG_MYRI10GE is not set
737	727
738	728	#
739	729	# Token Ring devices
@@ -744,6 +734,7 @@ CONFIG_PCNET32=y · 4 unmodified lines
744	734	# Wireless LAN (non-hamradio)
745	735	#
746	736	CONFIG_NET_RADIO=y
	737	+# CONFIG_NET_WIRELESS_RTNETLINK is not set
747	738
748	739	#
749	740	# Obsolete Wireless cards support (pre-802.11)
@@ -755,11 +746,13 @@ CONFIG_NET_RADIO=y · 5 unmodified lines
755	746	#
756	747	# Wireless 802.11b ISA/PCI cards support
757	748	#
	749	+# CONFIG_IPW2100 is not set
	750	+# CONFIG_IPW2200 is not set
758	751	# CONFIG_AIRO is not set
759	752	CONFIG_HERMES=m
760		−CONFIG_APPLE_AIRPORT=m
761	753	# CONFIG_PLX_HERMES is not set
762	754	# CONFIG_TMD_HERMES is not set
	755	+# CONFIG_NORTEL_HERMES is not set
763	756	# CONFIG_PCI_HERMES is not set
764	757	# CONFIG_ATMEL is not set
765	758
@@ -767,6 +760,8 @@ CONFIG_APPLE_AIRPORT=m · 1 unmodified line
767	760	# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
768	761	#
769	762	# CONFIG_PRISM54 is not set
	763	+# CONFIG_USB_ZD1201 is not set
	764	+# CONFIG_HOSTAP is not set
770	765	CONFIG_NET_WIRELESS=y
771	766
772	767	#
@@ -783,11 +778,16 @@ CONFIG_PPP_ASYNC=y · 10 unmodified lines
783	778	# CONFIG_PPP_SYNC_TTY is not set
784	779	CONFIG_PPP_DEFLATE=y
785	780	CONFIG_PPP_BSDCOMP=m
	781	+# CONFIG_PPP_MPPE is not set
786	782	CONFIG_PPPOE=m
787	783	# CONFIG_SLIP is not set
788	784	# CONFIG_NET_FC is not set
789	785	# CONFIG_SHAPER is not set
790	786	CONFIG_NETCONSOLE=m
	787	+CONFIG_NETPOLL=y
	788	+# CONFIG_NETPOLL_RX is not set
	789	+# CONFIG_NETPOLL_TRAP is not set
	790	+CONFIG_NET_POLL_CONTROLLER=y
791	791
792	792	#
793	793	# ISDN subsystem
@@ -835,7 +835,7 @@ CONFIG_MOUSE_PS2=y · 41 unmodified lines
835	835	# CONFIG_INPUT_JOYSTICK is not set
836	836	# CONFIG_INPUT_TOUCHSCREEN is not set
837	837	CONFIG_INPUT_MISC=y
838		−# CONFIG_INPUT_PCSPKR is not set
	838	+CONFIG_INPUT_PCSPKR=m
839	839	CONFIG_INPUT_UINPUT=m
840	840
841	841	#
@@ -856,6 +856,7 @@ CONFIG_SERIO_LIBPS2=y · 14 unmodified lines
856	856	CONFIG_VT=y
857	857	CONFIG_VT_CONSOLE=y
858	858	CONFIG_HW_CONSOLE=y
	859	+# CONFIG_VT_HW_CONSOLE_BINDING is not set
859	860	# CONFIG_SERIAL_NONSTANDARD is not set
860	861
861	862	#
@@ -863,7 +864,9 @@ CONFIG_HW_CONSOLE=y · 1 unmodified line
863	864	#
864	865	CONFIG_SERIAL_8250=y
865	866	CONFIG_SERIAL_8250_CONSOLE=y
	867	+CONFIG_SERIAL_8250_PCI=y
866	868	CONFIG_SERIAL_8250_NR_UARTS=4
	869	+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
867	870	# CONFIG_SERIAL_8250_EXTENDED is not set
868	871
869	872	#
@@ -871,8 +874,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4 · 1 unmodified line
871	874	#
872	875	CONFIG_SERIAL_CORE=y
873	876	CONFIG_SERIAL_CORE_CONSOLE=y
874		−CONFIG_SERIAL_PMACZILOG=y
875		−CONFIG_SERIAL_PMACZILOG_CONSOLE=y
876	877	# CONFIG_SERIAL_JSM is not set
877	878	CONFIG_UNIX98_PTYS=y
878	879	CONFIG_LEGACY_PTYS=y
@@ -890,6 +891,7 @@ CONFIG_LEGACY_PTY_COUNT=256 · 11 unmodified lines
890	891	# Watchdog Cards
891	892	#
892	893	# CONFIG_WATCHDOG is not set
	894	+# CONFIG_HW_RANDOM is not set
893	895	CONFIG_NVRAM=y
894	896	CONFIG_GEN_RTC=y
895	897	# CONFIG_GEN_RTC_X is not set
@@ -900,21 +902,15 @@ CONFIG_GEN_RTC=y · 4 unmodified lines
900	902	#
901	903	# Ftape, the floppy tape device driver
902	904	#
903		−CONFIG_AGP=m
904		−CONFIG_AGP_UNINORTH=m
905		−CONFIG_DRM=m
906		−# CONFIG_DRM_TDFX is not set
907		−CONFIG_DRM_R128=m
908		−CONFIG_DRM_RADEON=m
909		−# CONFIG_DRM_MGA is not set
910		−# CONFIG_DRM_SIS is not set
911		−# CONFIG_DRM_VIA is not set
	905	+# CONFIG_AGP is not set
	906	+# CONFIG_DRM is not set
912	907	# CONFIG_RAW_DRIVER is not set
913	908
914	909	#
915	910	# TPM devices
916	911	#
917	912	# CONFIG_TCG_TPM is not set
	913	+# CONFIG_TELCLOCK is not set
918	914
919	915	#
920	916	# I2C support
@@ -938,19 +934,16 @@ CONFIG_I2C_ALGOBIT=y · 17 unmodified lines
938	934	# CONFIG_I2C_AMD756 is not set
939	935	# CONFIG_I2C_AMD8111 is not set
940	936	# CONFIG_I2C_ELEKTOR is not set
941		−CONFIG_I2C_HYDRA=y
942	937	# CONFIG_I2C_I801 is not set
943	938	# CONFIG_I2C_I810 is not set
944	939	# CONFIG_I2C_PIIX4 is not set
945		−# CONFIG_I2C_ISA is not set
946		−CONFIG_I2C_KEYWEST=m
947	940	# CONFIG_I2C_MPC is not set
948	941	# CONFIG_I2C_NFORCE2 is not set
	942	+# CONFIG_I2C_OCORES is not set
949	943	# CONFIG_I2C_PARPORT is not set
950	944	# CONFIG_I2C_PARPORT_LIGHT is not set
951	945	# CONFIG_I2C_PROSAVAGE is not set
952	946	# CONFIG_I2C_SAVAGE4 is not set
953		−# CONFIG_SCx200_ACB is not set
954	947	# CONFIG_I2C_SIS5595 is not set
955	948	# CONFIG_I2C_SIS630 is not set
956	949	# CONFIG_I2C_SIS96X is not set
@@ -959,7 +952,6 @@ CONFIG_I2C_KEYWEST=m · 2 unmodified lines
959	952	# CONFIG_I2C_VIAPRO is not set
960	953	# CONFIG_I2C_VOODOO3 is not set
961	954	# CONFIG_I2C_PCA_ISA is not set
962		−# CONFIG_I2C_SENSOR is not set
963	955
964	956	#
965	957	# Miscellaneous I2C Chip support
@@ -970,7 +962,6 @@ CONFIG_I2C_KEYWEST=m · 4 unmodified lines
970	962	# CONFIG_SENSORS_PCF8574 is not set
971	963	# CONFIG_SENSORS_PCA9539 is not set
972	964	# CONFIG_SENSORS_PCF8591 is not set
973		−# CONFIG_SENSORS_RTC8564 is not set
974	965	# CONFIG_SENSORS_M41T00 is not set
975	966	# CONFIG_SENSORS_MAX6875 is not set
976	967	# CONFIG_I2C_DEBUG_CORE is not set
@@ -978,15 +969,21 @@ CONFIG_I2C_KEYWEST=m · 1 unmodified line
978	969	# CONFIG_I2C_DEBUG_BUS is not set
979	970	# CONFIG_I2C_DEBUG_CHIP is not set
980	971
	972	+#
	973	+# SPI support
	974	+#
	975	+# CONFIG_SPI is not set
	976	+# CONFIG_SPI_MASTER is not set
	977	+
981	978	#
982	979	# Dallas's 1-wire bus
983	980	#
984		−# CONFIG_W1 is not set
985	981
986	982	#
987	983	# Hardware Monitoring support
988	984	#
989	985	# CONFIG_HWMON is not set
	986	+# CONFIG_HWMON_VID is not set
990	987
991	988	#
992	989	# Misc devices
@@ -996,38 +993,36 @@ CONFIG_I2C_KEYWEST=m · 3 unmodified lines
996	993	# Multimedia devices
997	994	#
998	995	# CONFIG_VIDEO_DEV is not set
	996	+CONFIG_VIDEO_V4L2=y
999	997
1000	998	#
1001	999	# Digital Video Broadcasting Devices
1002	1000	#
1003	1001	# CONFIG_DVB is not set
	1002	+# CONFIG_USB_DABUSB is not set
1004	1003
1005	1004	#
1006	1005	# Graphics support
1007	1006	#
	1007	+# CONFIG_FIRMWARE_EDID is not set
1008	1008	CONFIG_FB=y
1009	1009	CONFIG_FB_CFB_FILLRECT=y
1010	1010	CONFIG_FB_CFB_COPYAREA=y
1011	1011	CONFIG_FB_CFB_IMAGEBLIT=y
1012		−CONFIG_FB_SOFT_CURSOR=y
1013		−CONFIG_FB_MACMODES=y
	1012	+# CONFIG_FB_MACMODES is not set
	1013	+# CONFIG_FB_BACKLIGHT is not set
1014	1014	CONFIG_FB_MODE_HELPERS=y
1015	1015	CONFIG_FB_TILEBLITTING=y
1016	1016	# CONFIG_FB_CIRRUS is not set
1017	1017	# CONFIG_FB_PM2 is not set
1018	1018	# CONFIG_FB_CYBER2000 is not set
1019		−CONFIG_FB_OF=y
1020		−CONFIG_FB_CONTROL=y
1021		−CONFIG_FB_PLATINUM=y
1022		−CONFIG_FB_VALKYRIE=y
1023		−CONFIG_FB_CT65550=y
	1019	+# CONFIG_FB_CT65550 is not set
1024	1020	# CONFIG_FB_ASILIANT is not set
1025		−CONFIG_FB_IMSTT=y
	1021	+# CONFIG_FB_IMSTT is not set
1026	1022	# CONFIG_FB_VGA16 is not set
	1023	+# CONFIG_FB_S1D13XXX is not set
1027	1024	# CONFIG_FB_NVIDIA is not set
1028		−CONFIG_FB_RIVA=y
1029		−CONFIG_FB_RIVA_I2C=y
1030		−# CONFIG_FB_RIVA_DEBUG is not set
	1025	+# CONFIG_FB_RIVA is not set
1031	1026	CONFIG_FB_MATROX=y
1032	1027	CONFIG_FB_MATROX_MILLENIUM=y
1033	1028	CONFIG_FB_MATROX_MYSTIQUE=y
@@ -1035,34 +1030,27 @@ CONFIG_FB_MATROX_G=y · 1 unmodified line
1035	1030	CONFIG_FB_MATROX_I2C=y
1036	1031	CONFIG_FB_MATROX_MAVEN=m
1037	1032	# CONFIG_FB_MATROX_MULTIHEAD is not set
1038		−# CONFIG_FB_RADEON_OLD is not set
1039		−CONFIG_FB_RADEON=y
1040		−CONFIG_FB_RADEON_I2C=y
1041		−# CONFIG_FB_RADEON_DEBUG is not set
1042		−CONFIG_FB_ATY128=y
1043		−CONFIG_FB_ATY=y
1044		−CONFIG_FB_ATY_CT=y
1045		−CONFIG_FB_ATY_GENERIC_LCD=y
1046		−CONFIG_FB_ATY_XL_INIT=y
1047		−CONFIG_FB_ATY_GX=y
	1033	+# CONFIG_FB_RADEON is not set
	1034	+# CONFIG_FB_ATY128 is not set
	1035	+# CONFIG_FB_ATY is not set
1048	1036	# CONFIG_FB_SAVAGE is not set
1049	1037	# CONFIG_FB_SIS is not set
1050	1038	# CONFIG_FB_NEOMAGIC is not set
1051	1039	# CONFIG_FB_KYRO is not set
1052		−CONFIG_FB_3DFX=y
1053		−# CONFIG_FB_3DFX_ACCEL is not set
	1040	+# CONFIG_FB_3DFX is not set
1054	1041	# CONFIG_FB_VOODOO1 is not set
1055	1042	# CONFIG_FB_TRIDENT is not set
1056		−# CONFIG_FB_S1D13XXX is not set
1057	1043	# CONFIG_FB_VIRTUAL is not set
1058	1044
1059	1045	#
1060	1046	# Console display driver support
1061	1047	#
1062	1048	CONFIG_VGA_CONSOLE=y
	1049	+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1063	1050	# CONFIG_MDA_CONSOLE is not set
1064	1051	CONFIG_DUMMY_CONSOLE=y
1065	1052	CONFIG_FRAMEBUFFER_CONSOLE=y
	1053	+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1066	1054	# CONFIG_FONTS is not set
1067	1055	CONFIG_FONT_8x8=y
1068	1056	CONFIG_FONT_8x16=y
@@ -1080,8 +1068,6 @@ CONFIG_LOGO_LINUX_CLUT224=y · 11 unmodified lines
1080	1068	# Sound
1081	1069	#
1082	1070	CONFIG_SOUND=m
1083		−CONFIG_DMASOUND_PMAC=m
1084		−CONFIG_DMASOUND=m
1085	1071
1086	1072	#
1087	1073	# Advanced Linux Sound Architecture
@@ -1096,10 +1082,13 @@ CONFIG_SND_SEQUENCER=m · 8 unmodified lines
1096	1082	CONFIG_SND_OSSEMUL=y
1097	1083	CONFIG_SND_MIXER_OSS=m
1098	1084	CONFIG_SND_PCM_OSS=m
	1085	+CONFIG_SND_PCM_OSS_PLUGINS=y
1099	1086	CONFIG_SND_SEQUENCER_OSS=y
	1087	+# CONFIG_SND_DYNAMIC_MINORS is not set
	1088	+CONFIG_SND_SUPPORT_OLD_API=y
	1089	+CONFIG_SND_VERBOSE_PROCFS=y
1100	1090	# CONFIG_SND_VERBOSE_PRINTK is not set
1101	1091	# CONFIG_SND_DEBUG is not set
1102		−CONFIG_SND_GENERIC_PM=y
1103	1092
1104	1093	#
1105	1094	# Generic devices
@@ -1116,7 +1105,9 @@ CONFIG_SND_OPL3_LIB=m · 10 unmodified lines
1116	1105	# ISA devices
1117	1106	#
1118	1107	CONFIG_SND_CS4231_LIB=m
	1108	+# CONFIG_SND_ADLIB is not set
1119	1109	# CONFIG_SND_AD1848 is not set
	1110	+# CONFIG_SND_CMI8330 is not set
1120	1111	# CONFIG_SND_CS4231 is not set
1121	1112	CONFIG_SND_CS4232=m
1122	1113	# CONFIG_SND_CS4236 is not set
@@ -1125,23 +1116,24 @@ CONFIG_SND_CS4232=m · 2 unmodified lines
1125	1116	# CONFIG_SND_GUSCLASSIC is not set
1126	1117	# CONFIG_SND_GUSEXTREME is not set
1127	1118	# CONFIG_SND_GUSMAX is not set
1128		−# CONFIG_SND_INTERWAVE is not set
1129		−# CONFIG_SND_INTERWAVE_STB is not set
	1119	+# CONFIG_SND_OPL3SA2 is not set
1130	1120	# CONFIG_SND_OPTI92X_AD1848 is not set
1131	1121	# CONFIG_SND_OPTI92X_CS4231 is not set
1132	1122	# CONFIG_SND_OPTI93X is not set
	1123	+# CONFIG_SND_MIRO is not set
1133	1124	# CONFIG_SND_SB8 is not set
1134	1125	# CONFIG_SND_SB16 is not set
1135	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	1127	# CONFIG_SND_SGALAXY is not set
1140	1128	# CONFIG_SND_SSCAPE is not set
	1129	+# CONFIG_SND_WAVEFRONT is not set
1141	1130
1142	1131	#
1143	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	1137	# CONFIG_SND_ALI5451 is not set
1146	1138	# CONFIG_SND_ATIIXP is not set
1147	1139	# CONFIG_SND_ATIIXP_MODEM is not set
@@ -1150,43 +1142,61 @@ CONFIG_SND_CS4232=m · 2 unmodified lines
1150	1142	# CONFIG_SND_AU8830 is not set
1151	1143	# CONFIG_SND_AZT3328 is not set
1152	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	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	1161	# CONFIG_SND_EMU10K1 is not set
1156	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	1163	# CONFIG_SND_ENS1370 is not set
1171	1164	# CONFIG_SND_ENS1371 is not set
1172	1165	# CONFIG_SND_ES1938 is not set
1173	1166	# CONFIG_SND_ES1968 is not set
1174		−# CONFIG_SND_MAESTRO3 is not set
1175	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	1171	# CONFIG_SND_ICE1712 is not set
1177	1172	# CONFIG_SND_ICE1724 is not set
1178	1173	# CONFIG_SND_INTEL8X0 is not set
1179	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	1184	# CONFIG_SND_SONICVIBES is not set
	1185	+# CONFIG_SND_TRIDENT is not set
1181	1186	# CONFIG_SND_VIA82XX is not set
1182	1187	# CONFIG_SND_VIA82XX_MODEM is not set
1183	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	1192	# ALSA PowerMac devices
1188	1193	#
1189		−CONFIG_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	1202	# USB devices
@@ -1204,6 +1214,7 @@ CONFIG_SND_USB_AUDIO=m · 11 unmodified lines
1204	1214	#
1205	1215	CONFIG_USB_ARCH_HAS_HCD=y
1206	1216	CONFIG_USB_ARCH_HAS_OHCI=y
	1217	+CONFIG_USB_ARCH_HAS_EHCI=y
1207	1218	CONFIG_USB=y
1208	1219	# CONFIG_USB_DEBUG is not set
1209	1220
@@ -1222,6 +1233,7 @@ CONFIG_USB_DEVICEFS=y · 12 unmodified lines
1222	1233	CONFIG_USB_EHCI_HCD=m
1223	1234	CONFIG_USB_EHCI_SPLIT_ISO=y
1224	1235	CONFIG_USB_EHCI_ROOT_HUB_TT=y
	1236	+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1225	1237	# CONFIG_USB_ISP116X_HCD is not set
1226	1238	CONFIG_USB_OHCI_HCD=y
1227	1239	# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1232,14 +1244,15 @@ CONFIG_USB_UHCI_HCD=m · 4 unmodified lines
1232	1244	#
1233	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
1238	1247	CONFIG_USB_ACM=m
1239	1248	CONFIG_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	#
1244	1257	CONFIG_USB_STORAGE=m
1245	1258	# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1251,12 +1264,15 @@ CONFIG_USB_STORAGE_USBAT=y · 5 unmodified lines
1251	1264	CONFIG_USB_STORAGE_SDDR09=y
1252	1265	CONFIG_USB_STORAGE_SDDR55=y
1253	1266	CONFIG_USB_STORAGE_JUMPSHOT=y
	1267	+# CONFIG_USB_STORAGE_ALAUDA is not set
	1268	+# CONFIG_USB_LIBUSUAL is not set
1254	1269
1255	1270	#
1256	1271	# USB Input Devices
1257	1272	#
1258	1273	CONFIG_USB_HID=y
1259	1274	CONFIG_USB_HIDINPUT=y
	1275	+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1260	1276	# CONFIG_HID_FF is not set
1261	1277	CONFIG_USB_HIDDEV=y
1262	1278	# CONFIG_USB_AIPTEK is not set
@@ -1264,12 +1280,13 @@ CONFIG_USB_HIDDEV=y · 1 unmodified line
1264	1280	# CONFIG_USB_ACECAD is not set
1265	1281	# CONFIG_USB_KBTAB is not set
1266	1282	# CONFIG_USB_POWERMATE is not set
1267		−# CONFIG_USB_MTOUCH is not set
1268		−# CONFIG_USB_ITMTOUCH is not set
1269		−# CONFIG_USB_EGALAX is not set
	1283	+# CONFIG_USB_TOUCHSCREEN is not set
	1284	+# CONFIG_USB_YEALINK is not set
1270	1285	# CONFIG_USB_XPAD is not set
1271	1286	# CONFIG_USB_ATI_REMOTE is not set
	1287	+# CONFIG_USB_ATI_REMOTE2 is not set
1272	1288	# CONFIG_USB_KEYSPAN_REMOTE is not set
	1289	+# CONFIG_USB_APPLETOUCH is not set
1273	1290
1274	1291	#
1275	1292	# USB Imaging devices
@@ -1277,15 +1294,6 @@ CONFIG_USB_HIDDEV=y · 1 unmodified line
1277	1294	# CONFIG_USB_MDC800 is not set
1278	1295	# CONFIG_USB_MICROTEK is not set
1279	1296
1280		−#
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	1297	#
1290	1298	# USB Network Adapters
1291	1299	#
@@ -1294,7 +1302,6 @@ CONFIG_USB_HIDDEV=y · 2 unmodified lines
1294	1302	CONFIG_USB_PEGASUS=m
1295	1303	# CONFIG_USB_RTL8150 is not set
1296	1304	# CONFIG_USB_USBNET is not set
1297		−# CONFIG_USB_ZD1201 is not set
1298	1305	# CONFIG_USB_MON is not set
1299	1306
1300	1307	#
@@ -1308,6 +1315,7 @@ CONFIG_USB_PEGASUS=m · 7 unmodified lines
1308	1315	CONFIG_USB_SERIAL=m
1309	1316	# CONFIG_USB_SERIAL_GENERIC is not set
1310	1317	# CONFIG_USB_SERIAL_AIRPRIME is not set
	1318	+# CONFIG_USB_SERIAL_ARK3116 is not set
1311	1319	# CONFIG_USB_SERIAL_BELKIN is not set
1312	1320	# CONFIG_USB_SERIAL_WHITEHEAT is not set
1313	1321	# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
@@ -1315,6 +1323,7 @@ CONFIG_USB_SERIAL=m · 1 unmodified line
1315	1323	# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
1316	1324	# CONFIG_USB_SERIAL_EMPEG is not set
1317	1325	# CONFIG_USB_SERIAL_FTDI_SIO is not set
	1326	+# CONFIG_USB_SERIAL_FUNSOFT is not set
1318	1327	CONFIG_USB_SERIAL_VISOR=m
1319	1328	# CONFIG_USB_SERIAL_IPAQ is not set
1320	1329	# CONFIG_USB_SERIAL_IR is not set
@@ -1339,9 +1348,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y · 18 unmodified lines
1339	1348	# CONFIG_USB_SERIAL_KLSI is not set
1340	1349	# CONFIG_USB_SERIAL_KOBIL_SCT is not set
1341	1350	# CONFIG_USB_SERIAL_MCT_U232 is not set
	1351	+# CONFIG_USB_SERIAL_NAVMAN is not set
1342	1352	# CONFIG_USB_SERIAL_PL2303 is not set
1343	1353	# CONFIG_USB_SERIAL_HP4X is not set
1344	1354	# CONFIG_USB_SERIAL_SAFE is not set
	1355	+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1345	1356	# CONFIG_USB_SERIAL_TI is not set
1346	1357	# CONFIG_USB_SERIAL_CYBERJACK is not set
1347	1358	# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -1359,10 +1370,12 @@ CONFIG_USB_EZUSB=y · 11 unmodified lines
1359	1370	# CONFIG_USB_LEGOTOWER is not set
1360	1371	# CONFIG_USB_LCD is not set
1361	1372	# CONFIG_USB_LED is not set
	1373	+# CONFIG_USB_CYPRESS_CY7C63 is not set
1362	1374	# CONFIG_USB_CYTHERM is not set
1363	1375	# CONFIG_USB_PHIDGETKIT is not set
1364	1376	# CONFIG_USB_PHIDGETSERVO is not set
1365	1377	# CONFIG_USB_IDMOUSE is not set
	1378	+# CONFIG_USB_APPLEDISPLAY is not set
1366	1379	# CONFIG_USB_SISUSBVGA is not set
1367	1380	# CONFIG_USB_LD is not set
1368	1381	# CONFIG_USB_TEST is not set
@@ -1381,13 +1394,44 @@ CONFIG_USB_EZUSB=y · 12 unmodified lines
1381	1394	#
1382	1395	# CONFIG_MMC is not set
1383	1396
	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	+
1384	1410	#
1385	1411	# InfiniBand support
1386	1412	#
1387	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 · 23 unmodified lines
1417	1461	# CONFIG_JFS_DEBUG is not set
1418	1462	# CONFIG_JFS_STATISTICS is not set
1419	1463	CONFIG_FS_POSIX_ACL=y
1420		−
1421		−#
1422		−# XFS support
1423		−#
1424	1464	CONFIG_XFS_FS=m
1425		−CONFIG_XFS_EXPORT=y
1426		−# CONFIG_XFS_RT is not set
1427	1465	# CONFIG_XFS_QUOTA is not set
1428	1466	CONFIG_XFS_SECURITY=y
1429	1467	CONFIG_XFS_POSIX_ACL=y
	1468	+# CONFIG_XFS_RT is not set
	1469	+# CONFIG_OCFS2_FS is not set
1430	1470	# CONFIG_MINIX_FS is not set
1431	1471	# CONFIG_ROMFS_FS is not set
1432	1472	CONFIG_INOTIFY=y
	1473	+CONFIG_INOTIFY_USER=y
1433	1474	# CONFIG_QUOTA is not set
1434	1475	CONFIG_DNOTIFY=y
1435	1476	# CONFIG_AUTOFS_FS is not set
1436	1477	CONFIG_AUTOFS4_FS=m
	1478	+# CONFIG_FUSE_FS is not set
1437	1479
1438	1480	#
1439	1481	# CD-ROM/DVD Filesystems
@@ -1460,13 +1502,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" · 20 unmodified lines
1460	1502	CONFIG_PROC_FS=y
1461	1503	CONFIG_PROC_KCORE=y
1462	1504	CONFIG_SYSFS=y
1463		−CONFIG_DEVPTS_FS_XATTR=y
1464		−CONFIG_DEVPTS_FS_SECURITY=y
1465	1505	CONFIG_TMPFS=y
1466		−CONFIG_TMPFS_XATTR=y
1467		−CONFIG_TMPFS_SECURITY=y
1468	1506	# CONFIG_HUGETLB_PAGE is not set
1469	1507	CONFIG_RAMFS=y
	1508	+# CONFIG_CONFIGFS_FS is not set
1470	1509
1471	1510	#
1472	1511	# Miscellaneous filesystems
@@ -1485,6 +1524,7 @@ CONFIG_CRAMFS=m · 12 unmodified lines
1485	1524	# CONFIG_SYSV_FS is not set
1486	1525	CONFIG_UFS_FS=m
1487	1526	# CONFIG_UFS_FS_WRITE is not set
	1527	+# CONFIG_UFS_DEBUG is not set
1488	1528
1489	1529	#
1490	1530	# Network File Systems
@@ -1513,6 +1553,7 @@ CONFIG_SUNRPC=y · 22 unmodified lines
1513	1553	# CONFIG_NCP_FS is not set
1514	1554	# CONFIG_CODA_FS is not set
1515	1555	# CONFIG_AFS_FS is not set
	1556	+# CONFIG_9P_FS is not set
1516	1557
1517	1558	#
1518	1559	# Partition Types
@@ -1532,6 +1573,7 @@ CONFIG_MSDOS_PARTITION=y · 13 unmodified lines
1532	1573	# CONFIG_SGI_PARTITION is not set
1533	1574	# CONFIG_ULTRIX_PARTITION is not set
1534	1575	# CONFIG_SUN_PARTITION is not set
	1576	+# CONFIG_KARMA_PARTITION is not set
1535	1577	# CONFIG_EFI_PARTITION is not set
1536	1578
1537	1579	#
@@ -1582,33 +1624,44 @@ CONFIG_NLS_UTF8=m · 44 unmodified lines
1582	1624	# Library routines
1583	1625	#
1584	1626	CONFIG_CRC_CCITT=y
	1627	+# CONFIG_CRC16 is not set
1585	1628	CONFIG_CRC32=y
1586	1629	# CONFIG_LIBCRC32C is not set
1587	1630	CONFIG_ZLIB_INFLATE=y
1588	1631	CONFIG_ZLIB_DEFLATE=y
1589		−
1590		−#
1591		−# Profiling support
1592		−#
	1632	+CONFIG_TEXTSEARCH=y
	1633	+CONFIG_TEXTSEARCH_KMP=m
	1634	+CONFIG_TEXTSEARCH_BM=m
	1635	+CONFIG_TEXTSEARCH_FSM=m
	1636	+CONFIG_PLIST=y
1593	1637	# CONFIG_PROFILING is not set
1594	1638
1595	1639	#
1596	1640	# Kernel hacking
1597	1641	#
1598	1642	# CONFIG_PRINTK_TIME is not set
1599		−CONFIG_DEBUG_KERNEL=y
1600	1643	CONFIG_MAGIC_SYSRQ=y
	1644	+# CONFIG_UNUSED_SYMBOLS is not set
	1645	+CONFIG_DEBUG_KERNEL=y
1601	1646	CONFIG_LOG_BUF_SHIFT=14
	1647	+CONFIG_DETECT_SOFTLOCKUP=y
1602	1648	# CONFIG_SCHEDSTATS is not set
1603	1649	# CONFIG_DEBUG_SLAB is not set
	1650	+# CONFIG_DEBUG_RT_MUTEXES is not set
	1651	+# CONFIG_RT_MUTEX_TESTER is not set
1604	1652	# CONFIG_DEBUG_SPINLOCK is not set
	1653	+# CONFIG_DEBUG_MUTEXES is not set
	1654	+# CONFIG_DEBUG_RWSEMS is not set
1605	1655	# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
	1656	+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1606	1657	# CONFIG_DEBUG_KOBJECT is not set
1607	1658	# CONFIG_DEBUG_INFO is not set
1608	1659	# CONFIG_DEBUG_FS is not set
	1660	+# CONFIG_DEBUG_VM is not set
	1661	+CONFIG_FORCED_INLINING=y
	1662	+# CONFIG_RCU_TORTURE_TEST is not set
1609	1663	# CONFIG_XMON is not set
1610	1664	# CONFIG_BDI_SWITCH is not set
1611		−CONFIG_BOOTX_TEXT=y
1612	1665
1613	1666	#
1614	1667	# Security options

include/asm-powerpc/eeh.h+3−0

@@ -205,6 +205,7 @@ static inline void eeh_memset_io(volatile void __iomem *addr, int c, · 204 unmodified lines
205	205	lc \|= lc << 8;
206	206	lc \|= lc << 16;
207	207
	208	+ __asm__ __volatile__ ("sync" : : : "memory");
208	209	while(n && !EEH_CHECK_ALIGN(p, 4)) {
209	210	((volatile u8 )p) = c;
210	211	p++;
@@ -229,6 +230,7 @@ static inline void eeh_memcpy_fromio(void dest, const volatile void __iomem sr · 18 unmodified lines
229	230	void *destsave = dest;
230	231	unsigned long nsave = n;
231	232
	233	+ __asm__ __volatile__ ("sync" : : : "memory");
232	234	while(n && (!EEH_CHECK_ALIGN(vsrc, 4) \|\| !EEH_CHECK_ALIGN(dest, 4))) {
233	235	((u8 )dest) = ((volatile u8 )vsrc);
234	236	__asm__ __volatile__ ("eieio" : : : "memory");
@@ -266,6 +268,7 @@ static inline void eeh_memcpy_toio(volatile void __iomem dest, const void src, · 31 unmodified lines
266	268	{
267	269	void vdest = (void __force ) dest;
268	270
	271	+ __asm__ __volatile__ ("sync" : : : "memory");
269	272	while(n && (!EEH_CHECK_ALIGN(vdest, 4) \|\| !EEH_CHECK_ALIGN(src, 4))) {
270	273	((volatile u8 )vdest) = ((u8 )src);
271	274	src++;

include/asm-powerpc/futex.h+27−1

@@ -84,7 +84,33 @@ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr) · 83 unmodified lines
84	84	static inline int
85	85	futex_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\
	102	+4: 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	116	#endif /* __KERNEL__ */

include/asm-powerpc/io.h+28−15

@@ -19,6 +19,7 @@ extern int check_legacy_ioport(unsigned long base_port); · 18 unmodified lines
19	19	#include <linux/compiler.h>
20	20	#include <asm/page.h>
21	21	#include <asm/byteorder.h>
	22	+#include <asm/paca.h>
22	23	#ifdef CONFIG_PPC_ISERIES
23	24	#include <asm/iseries/iseries_io.h>
24	25	#endif
@@ -162,7 +163,11 @@ extern void _outsw_ns(volatile u16 __iomem port, const void buf, int ns); · 137 unmodified lines
162	163	extern void _insl_ns(volatile u32 __iomem port, void buf, int nl);
163	164	extern void _outsl_ns(volatile u32 __iomem port, const void buf, int nl);
164	165
165		−#define mmiowb()
	166	+static inline void mmiowb(void)
	167	+{
	168	+ __asm__ __volatile__ ("sync" : : : "memory");
	169	+ get_paca()->io_sync = 0;
	170	+}
166	171
167	172	/*
168	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) · 109 unmodified lines
278	283	{
279	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	287	: "=r" (ret) : "m" (*addr));
283	288	return ret;
284	289	}
285	290
286	291	static 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	294	: "=m" (*addr) : "r" (val));
	295	+ get_paca()->io_sync = 1;
290	296	}
291	297
292	298	static inline int in_le16(const volatile unsigned short __iomem *addr)
293	299	{
294	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	303	: "=r" (ret) : "r" (addr), "m" (*addr));
298	304	return ret;
299	305	}
@@ -302,28 +308,30 @@ static inline int in_be16(const volatile unsigned short __iomem *addr) · 2 unmodified lines
302	308	{
303	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	312	: "=r" (ret) : "m" (*addr));
307	313	return ret;
308	314	}
309	315
310	316	static 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	319	: "=m" (*addr) : "r" (val), "r" (addr));
	320	+ get_paca()->io_sync = 1;
314	321	}
315	322
316	323	static 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	326	: "=m" (*addr) : "r" (val));
	327	+ get_paca()->io_sync = 1;
320	328	}
321	329
322	330	static inline unsigned in_le32(const volatile unsigned __iomem *addr)
323	331	{
324	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	335	: "=r" (ret) : "r" (addr), "m" (*addr));
328	336	return ret;
329	337	}
@@ -332,21 +340,23 @@ static inline unsigned in_be32(const volatile unsigned __iomem *addr) · 2 unmodified lines
332	340	{
333	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	344	: "=r" (ret) : "m" (*addr));
337	345	return ret;
338	346	}
339	347
340	348	static 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	351	: "r" (val), "r" (addr));
	352	+ get_paca()->io_sync = 1;
344	353	}
345	354
346	355	static 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	358	: "=m" (*addr) : "r" (val));
	359	+ get_paca()->io_sync = 1;
350	360	}
351	361
352	362	static 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) · 1 unmodified line
354	364	unsigned long tmp, ret;
355	365
356	366	__asm__ __volatile__(
	367	+ "sync\n"
357	368	"ld %1,0(%2)\n"
358	369	"twi 0,%1,0\n"
359	370	"isync\n"
@@ -372,7 +383,7 @@ static inline unsigned long in_be64(const volatile unsigned long __iomem *addr) · 12 unmodified lines
372	383	{
373	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	387	: "=r" (ret) : "m" (*addr));
377	388	return ret;
378	389	}
@@ -389,14 +400,16 @@ static inline void out_le64(volatile unsigned long __iomem *addr, unsigned long · 10 unmodified lines
389	400	"rldicl %1,%1,32,0\n"
390	401	"rlwimi %0,%1,8,8,31\n"
391	402	"rlwimi %0,%1,24,16,23\n"
392		− "std %0,0(%3)\n"
393		− "sync"
	403	+ "sync\n"
	404	+ "std %0,0(%3)"
394	405	: "=&r" (tmp) , "=&r" (val) : "1" (val) , "b" (addr) , "m" (*addr));
	406	+ get_paca()->io_sync = 1;
395	407	}
396	408
397	409	static 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	415	#ifndef CONFIG_PPC_ISERIES

include/asm-powerpc/kdump.h+1−1

@@ -7,7 +7,7 @@ · 6 unmodified lines
7	7	/* How many bytes to reserve at zero for kdump. The reserve limit should
8	8	* be greater or equal to the trampoline's end address.
9	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	12	#ifdef CONFIG_CRASH_DUMP
13	13

include/asm-powerpc/paca.h+1−0

@@ -93,6 +93,7 @@ struct paca_struct { · 92 unmodified lines
93	93	u64 saved_r1; /* r1 save for RTAS calls */
94	94	u64 saved_msr; /* MSR saved here by enter_rtas */
95	95	u8 proc_enabled; /* irq soft-enable flag */
	96	+ u8 io_sync; /* writel() needs spin_unlock sync */
96	97
97	98	/* Stuff for accurate time accounting */
98	99	u64 user_time; /* accumulated usermode TB ticks */

include/asm-powerpc/spinlock.h+17−0

@@ -36,6 +36,19 @@ · 35 unmodified lines
36	36	#define LOCK_TOKEN 1
37	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	53	* This returns the old value in the lock, so we succeeded
41	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) · 19 unmodified lines
61	74
62	75	static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock)
63	76	{
	77	+ CLEAR_IO_SYNC;
64	78	return __spin_trylock(lock) == 0;
65	79	}
66	80
@@ -91,6 +105,7 @@ extern void __rw_yield(raw_rwlock_t *lock); · 24 unmodified lines
91	105
92	106	static void __inline__ __raw_spin_lock(raw_spinlock_t *lock)
93	107	{
	108	+ CLEAR_IO_SYNC;
94	109	while (1) {
95	110	if (likely(__spin_trylock(lock) == 0))
96	111	break;
@@ -107,6 +122,7 @@ static void __inline__ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long · 10 unmodified lines
107	122	{
108	123	unsigned long flags_dis;
109	124
	125	+ CLEAR_IO_SYNC;
110	126	while (1) {
111	127	if (likely(__spin_trylock(lock) == 0))
112	128	break;
@@ -124,6 +140,7 @@ static void __inline__ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long · 11 unmodified lines
124	140
125	141	static __inline__ void __raw_spin_unlock(raw_spinlock_t *lock)
126	142	{
	143	+ SYNC_IO;
127	144	__asm__ __volatile__("# __raw_spin_unlock\n\t"
128	145	LWSYNC_ON_SMP: : :"memory");
129	146	lock->slock = 0;

include/asm-ppc/io.h+11−9

@@ -63,7 +63,7 @@ extern inline int in_8(const volatile unsigned char __iomem *addr) · 62 unmodified lines
63	63	int ret;
64	64
65	65	__asm__ __volatile__(
66		− "lbz%U1%X1 %0,%1;\n"
	66	+ "sync; lbz%U1%X1 %0,%1;\n"
67	67	"twi 0,%0,0;\n"
68	68	"isync" : "=r" (ret) : "m" (*addr));
69	69	return ret;
@@ -78,7 +78,7 @@ extern inline int in_le16(const volatile unsigned short __iomem *addr) · 8 unmodified lines
78	78	{
79	79	int ret;
80	80
81		− __asm__ __volatile__("lhbrx %0,0,%1;\n"
	81	+ __asm__ __volatile__("sync; lhbrx %0,0,%1;\n"
82	82	"twi 0,%0,0;\n"
83	83	"isync" : "=r" (ret) :
84	84	"r" (addr), "m" (*addr));
@@ -89,7 +89,7 @@ extern inline int in_be16(const volatile unsigned short __iomem *addr) · 4 unmodified lines
89	89	{
90	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	93	"twi 0,%0,0;\n"
94	94	"isync" : "=r" (ret) : "m" (*addr));
95	95	return ret;
@@ -97,20 +97,20 @@ extern inline int in_be16(const volatile unsigned short __iomem *addr) · 1 unmodified line
97	97
98	98	extern 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	101	"r" (val), "r" (addr));
102	102	}
103	103
104	104	extern 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
109	109	extern inline unsigned in_le32(const volatile unsigned __iomem *addr)
110	110	{
111	111	unsigned ret;
112	112
113		− __asm__ __volatile__("lwbrx %0,0,%1;\n"
	113	+ __asm__ __volatile__("sync; lwbrx %0,0,%1;\n"
114	114	"twi 0,%0,0;\n"
115	115	"isync" : "=r" (ret) :
116	116	"r" (addr), "m" (*addr));
@@ -121,7 +121,7 @@ extern inline unsigned in_be32(const volatile unsigned __iomem *addr) · 4 unmodified lines
121	121	{
122	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	125	"twi 0,%0,0;\n"
126	126	"isync" : "=r" (ret) : "m" (*addr));
127	127	return ret;
@@ -129,13 +129,13 @@ extern inline unsigned in_be32(const volatile unsigned __iomem *addr) · 1 unmodified line
129	129
130	130	extern 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	133	"r" (val), "r" (addr));
134	134	}
135	135
136	136	extern 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	140	#if defined (CONFIG_8260_PCI9)
141	141	#define readb(addr) in_8((volatile u8 *)(addr))
@@ -259,6 +259,7 @@ extern __inline__ unsigned int name(unsigned int port) \ · 117 unmodified lines
259	259	{ \
260	260	unsigned int x; \
261	261	__asm__ __volatile__( \
	262	+ "sync\n" \
262	263	"0:" op " %0,0,%1\n" \
263	264	"1: twi 0,%0,0\n" \
264	265	"2: isync\n" \
@@ -284,6 +285,7 @@ extern __inline__ unsigned int name(unsigned int port) \ · 19 unmodified lines
284	285	extern __inline__ void name(unsigned int val, unsigned int port) \
285	286	{ \
286	287	__asm__ __volatile__( \
	288	+ "sync\n" \
287	289	"0:" op " %0,0,%1\n" \
288	290	"1: sync\n" \
289	291	"2:\n" \