aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 04:30:20 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 04:30:20 -0400
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /arch/ppc
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
Merge with Linus' 2.6 tree
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/Kconfig20
-rw-r--r--arch/ppc/configs/common_defconfig781
-rw-r--r--arch/ppc/configs/pmac_defconfig542
-rw-r--r--arch/ppc/configs/radstone_ppc7d_defconfig234
-rw-r--r--arch/ppc/configs/sandpoint_defconfig2
-rw-r--r--arch/ppc/kernel/head_8xx.S12
-rw-r--r--arch/ppc/mm/init.c3
-rw-r--r--arch/ppc/platforms/4xx/ibm440sp.c4
-rw-r--r--arch/ppc/platforms/85xx/mpc8560_ads.c1
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_cds_common.c2
-rw-r--r--arch/ppc/platforms/85xx/stx_gp3.c3
-rw-r--r--arch/ppc/platforms/pmac_setup.c16
-rw-r--r--arch/ppc/platforms/prpmc750.c1
-rw-r--r--arch/ppc/platforms/sandpoint.c17
-rw-r--r--arch/ppc/platforms/tqm8260_setup.c2
-rw-r--r--arch/ppc/syslib/cpm2_common.c1
-rw-r--r--arch/ppc/syslib/m8260_setup.c3
-rw-r--r--arch/ppc/syslib/m82xx_pci.c6
-rw-r--r--arch/ppc/syslib/mpc10x_common.c53
-rw-r--r--arch/ppc/syslib/ppc85xx_setup.c4
20 files changed, 1024 insertions, 683 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index b833cbcd77f0..2c2da9b43b7a 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -85,7 +85,6 @@ config POWER4
85 bool "POWER4 and 970 (G5)" 85 bool "POWER4 and 970 (G5)"
86 86
87config 8xx 87config 8xx
88 depends on BROKEN
89 bool "8xx" 88 bool "8xx"
90 89
91config E200 90config E200
@@ -878,6 +877,13 @@ config MPC10X_STORE_GATHERING
878 bool "Enable MPC10x store gathering" 877 bool "Enable MPC10x store gathering"
879 depends on MPC10X_BRIDGE 878 depends on MPC10X_BRIDGE
880 879
880config SANDPOINT_ENABLE_UART1
881 bool "Enable DUART mode on Sandpoint"
882 depends on SANDPOINT
883 help
884 If this option is enabled then the MPC824x processor will run
885 in DUART mode instead of UART mode.
886
881config CPC710_DATA_GATHERING 887config CPC710_DATA_GATHERING
882 bool "Enable CPC710 data gathering" 888 bool "Enable CPC710 data gathering"
883 depends on K2 889 depends on K2
@@ -935,19 +941,11 @@ config NR_CPUS
935 depends on SMP 941 depends on SMP
936 default "4" 942 default "4"
937 943
938config PREEMPT
939 bool "Preemptible Kernel"
940 help
941 This option reduces the latency of the kernel when reacting to
942 real-time or interactive events by allowing a low priority process to
943 be preempted even if it is in kernel mode executing a system call.
944
945 Say Y here if you are building a kernel for a desktop, embedded
946 or real-time system. Say N if you are unsure.
947
948config HIGHMEM 944config HIGHMEM
949 bool "High memory support" 945 bool "High memory support"
950 946
947source kernel/Kconfig.hz
948source kernel/Kconfig.preempt
951source "mm/Kconfig" 949source "mm/Kconfig"
952 950
953source "fs/Kconfig.binfmt" 951source "fs/Kconfig.binfmt"
diff --git a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig
index 95ead3f1b1cf..4d33bee23a89 100644
--- a/arch/ppc/configs/common_defconfig
+++ b/arch/ppc/configs/common_defconfig
@@ -1,15 +1,17 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.10-rc2 3# Linux kernel version: 2.6.13-rc3
4# Thu Nov 18 08:22:35 2004 4# Wed Jul 13 13:34:24 2005
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y 7CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
9CONFIG_HAVE_DEC_LOCK=y 10CONFIG_HAVE_DEC_LOCK=y
10CONFIG_PPC=y 11CONFIG_PPC=y
11CONFIG_PPC32=y 12CONFIG_PPC32=y
12CONFIG_GENERIC_NVRAM=y 13CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
13 15
14# 16#
15# Code maturity level options 17# Code maturity level options
@@ -17,6 +19,7 @@ CONFIG_GENERIC_NVRAM=y
17CONFIG_EXPERIMENTAL=y 19CONFIG_EXPERIMENTAL=y
18CONFIG_CLEAN_COMPILE=y 20CONFIG_CLEAN_COMPILE=y
19CONFIG_BROKEN_ON_SMP=y 21CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32
20 23
21# 24#
22# General setup 25# General setup
@@ -28,30 +31,33 @@ CONFIG_POSIX_MQUEUE=y
28# CONFIG_BSD_PROCESS_ACCT is not set 31# CONFIG_BSD_PROCESS_ACCT is not set
29CONFIG_SYSCTL=y 32CONFIG_SYSCTL=y
30# CONFIG_AUDIT is not set 33# CONFIG_AUDIT is not set
31CONFIG_LOG_BUF_SHIFT=14
32CONFIG_HOTPLUG=y 34CONFIG_HOTPLUG=y
33CONFIG_KOBJECT_UEVENT=y 35CONFIG_KOBJECT_UEVENT=y
34CONFIG_IKCONFIG=y 36CONFIG_IKCONFIG=y
35CONFIG_IKCONFIG_PROC=y 37CONFIG_IKCONFIG_PROC=y
36# CONFIG_EMBEDDED is not set 38# CONFIG_EMBEDDED is not set
37CONFIG_KALLSYMS=y 39CONFIG_KALLSYMS=y
40# CONFIG_KALLSYMS_ALL is not set
38# CONFIG_KALLSYMS_EXTRA_PASS is not set 41# CONFIG_KALLSYMS_EXTRA_PASS is not set
42CONFIG_PRINTK=y
43CONFIG_BUG=y
44CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 45CONFIG_FUTEX=y
40CONFIG_EPOLL=y 46CONFIG_EPOLL=y
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SHMEM=y 47CONFIG_SHMEM=y
43CONFIG_CC_ALIGN_FUNCTIONS=0 48CONFIG_CC_ALIGN_FUNCTIONS=0
44CONFIG_CC_ALIGN_LABELS=0 49CONFIG_CC_ALIGN_LABELS=0
45CONFIG_CC_ALIGN_LOOPS=0 50CONFIG_CC_ALIGN_LOOPS=0
46CONFIG_CC_ALIGN_JUMPS=0 51CONFIG_CC_ALIGN_JUMPS=0
47# CONFIG_TINY_SHMEM is not set 52# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0
48 54
49# 55#
50# Loadable module support 56# Loadable module support
51# 57#
52CONFIG_MODULES=y 58CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y 59CONFIG_MODULE_UNLOAD=y
54CONFIG_MODULE_FORCE_UNLOAD=y 60# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y 61CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y 62CONFIG_MODVERSIONS=y
57# CONFIG_MODULE_SRCVERSION_ALL is not set 63# CONFIG_MODULE_SRCVERSION_ALL is not set
@@ -66,22 +72,27 @@ CONFIG_6xx=y
66# CONFIG_POWER3 is not set 72# CONFIG_POWER3 is not set
67# CONFIG_POWER4 is not set 73# CONFIG_POWER4 is not set
68# CONFIG_8xx is not set 74# CONFIG_8xx is not set
75# CONFIG_E200 is not set
69# CONFIG_E500 is not set 76# CONFIG_E500 is not set
77CONFIG_PPC_FPU=y
70CONFIG_ALTIVEC=y 78CONFIG_ALTIVEC=y
71CONFIG_TAU=y 79CONFIG_TAU=y
72# CONFIG_TAU_INT is not set 80# CONFIG_TAU_INT is not set
73# CONFIG_TAU_AVERAGE is not set 81# CONFIG_TAU_AVERAGE is not set
82# CONFIG_KEXEC is not set
74CONFIG_CPU_FREQ=y 83CONFIG_CPU_FREQ=y
84CONFIG_CPU_FREQ_TABLE=y
75# CONFIG_CPU_FREQ_DEBUG is not set 85# CONFIG_CPU_FREQ_DEBUG is not set
76CONFIG_CPU_FREQ_PROC_INTF=y 86CONFIG_CPU_FREQ_STAT=m
87CONFIG_CPU_FREQ_STAT_DETAILS=y
77CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y 88CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
78# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set 89# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
79CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 90CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
80# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set 91CONFIG_CPU_FREQ_GOV_POWERSAVE=m
81# CONFIG_CPU_FREQ_GOV_USERSPACE is not set 92CONFIG_CPU_FREQ_GOV_USERSPACE=m
82# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set 93CONFIG_CPU_FREQ_GOV_ONDEMAND=m
94CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
83CONFIG_CPU_FREQ_PMAC=y 95CONFIG_CPU_FREQ_PMAC=y
84CONFIG_CPU_FREQ_TABLE=y
85CONFIG_PPC601_SYNC_FIX=y 96CONFIG_PPC601_SYNC_FIX=y
86CONFIG_PM=y 97CONFIG_PM=y
87CONFIG_PPC_STD_MMU=y 98CONFIG_PPC_STD_MMU=y
@@ -91,11 +102,15 @@ CONFIG_PPC_STD_MMU=y
91# 102#
92CONFIG_PPC_MULTIPLATFORM=y 103CONFIG_PPC_MULTIPLATFORM=y
93# CONFIG_APUS is not set 104# CONFIG_APUS is not set
105# CONFIG_KATANA is not set
94# CONFIG_WILLOW is not set 106# CONFIG_WILLOW is not set
107# CONFIG_CPCI690 is not set
95# CONFIG_PCORE is not set 108# CONFIG_PCORE is not set
96# CONFIG_POWERPMC250 is not set 109# CONFIG_POWERPMC250 is not set
97# CONFIG_EV64260 is not set 110# CONFIG_CHESTNUT is not set
98# CONFIG_SPRUCE is not set 111# CONFIG_SPRUCE is not set
112# CONFIG_HDPU is not set
113# CONFIG_EV64260 is not set
99# CONFIG_LOPEC is not set 114# CONFIG_LOPEC is not set
100# CONFIG_MCPN765 is not set 115# CONFIG_MCPN765 is not set
101# CONFIG_MVME5100 is not set 116# CONFIG_MVME5100 is not set
@@ -103,6 +118,7 @@ CONFIG_PPC_MULTIPLATFORM=y
103# CONFIG_PRPMC750 is not set 118# CONFIG_PRPMC750 is not set
104# CONFIG_PRPMC800 is not set 119# CONFIG_PRPMC800 is not set
105# CONFIG_SANDPOINT is not set 120# CONFIG_SANDPOINT is not set
121# CONFIG_RADSTONE_PPC7D is not set
106# CONFIG_ADIR is not set 122# CONFIG_ADIR is not set
107# CONFIG_K2 is not set 123# CONFIG_K2 is not set
108# CONFIG_PAL4 is not set 124# CONFIG_PAL4 is not set
@@ -113,22 +129,40 @@ CONFIG_PPC_MULTIPLATFORM=y
113# CONFIG_RPX8260 is not set 129# CONFIG_RPX8260 is not set
114# CONFIG_TQM8260 is not set 130# CONFIG_TQM8260 is not set
115# CONFIG_ADS8272 is not set 131# CONFIG_ADS8272 is not set
132# CONFIG_PQ2FADS is not set
116# CONFIG_LITE5200 is not set 133# CONFIG_LITE5200 is not set
134# CONFIG_MPC834x_SYS is not set
117CONFIG_PPC_CHRP=y 135CONFIG_PPC_CHRP=y
118CONFIG_PPC_PMAC=y 136CONFIG_PPC_PMAC=y
119CONFIG_PPC_PREP=y 137CONFIG_PPC_PREP=y
120CONFIG_PPC_OF=y 138CONFIG_PPC_OF=y
121CONFIG_PPCBUG_NVRAM=y 139CONFIG_PPCBUG_NVRAM=y
122# CONFIG_SMP is not set 140# CONFIG_SMP is not set
123# CONFIG_PREEMPT is not set
124# CONFIG_HIGHMEM is not set 141# CONFIG_HIGHMEM is not set
142# CONFIG_HZ_100 is not set
143CONFIG_HZ_250=y
144# CONFIG_HZ_1000 is not set
145CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set
149CONFIG_SELECT_MEMORY_MODEL=y
150CONFIG_FLATMEM_MANUAL=y
151# CONFIG_DISCONTIGMEM_MANUAL is not set
152# CONFIG_SPARSEMEM_MANUAL is not set
153CONFIG_FLATMEM=y
154CONFIG_FLAT_NODE_MEM_MAP=y
125CONFIG_BINFMT_ELF=y 155CONFIG_BINFMT_ELF=y
126CONFIG_BINFMT_MISC=m 156CONFIG_BINFMT_MISC=m
127CONFIG_PROC_DEVICETREE=y 157CONFIG_PROC_DEVICETREE=y
128CONFIG_PREP_RESIDUAL=y 158CONFIG_PREP_RESIDUAL=y
129CONFIG_PROC_PREPRESIDUAL=y 159CONFIG_PROC_PREPRESIDUAL=y
130CONFIG_CMDLINE_BOOL=y 160# CONFIG_CMDLINE_BOOL is not set
131CONFIG_CMDLINE="console=ttyS0,9600 console=tty0 root=/dev/sda2" 161# CONFIG_PM_DEBUG is not set
162CONFIG_SOFTWARE_SUSPEND=y
163CONFIG_PM_STD_PARTITION=""
164# CONFIG_SECCOMP is not set
165CONFIG_ISA_DMA_API=y
132 166
133# 167#
134# Bus options 168# Bus options
@@ -137,18 +171,24 @@ CONFIG_ISA=y
137CONFIG_GENERIC_ISA_DMA=y 171CONFIG_GENERIC_ISA_DMA=y
138CONFIG_PCI=y 172CONFIG_PCI=y
139CONFIG_PCI_DOMAINS=y 173CONFIG_PCI_DOMAINS=y
140CONFIG_PCI_LEGACY_PROC=y 174# CONFIG_PCI_LEGACY_PROC is not set
141CONFIG_PCI_NAMES=y 175# CONFIG_PCI_NAMES is not set
176# CONFIG_PCI_DEBUG is not set
142 177
143# 178#
144# PCCARD (PCMCIA/CardBus) support 179# PCCARD (PCMCIA/CardBus) support
145# 180#
146# CONFIG_PCCARD is not set 181CONFIG_PCCARD=m
182# CONFIG_PCMCIA_DEBUG is not set
183# CONFIG_PCMCIA is not set
184CONFIG_CARDBUS=y
147 185
148# 186#
149# PC-card bridges 187# PC-card bridges
150# 188#
189CONFIG_YENTA=m
151CONFIG_PCMCIA_PROBE=y 190CONFIG_PCMCIA_PROBE=y
191CONFIG_PCCARD_NONSTATIC=m
152 192
153# 193#
154# Advanced setup 194# Advanced setup
@@ -165,6 +205,143 @@ CONFIG_TASK_SIZE=0x80000000
165CONFIG_BOOT_LOAD=0x00800000 205CONFIG_BOOT_LOAD=0x00800000
166 206
167# 207#
208# Networking
209#
210CONFIG_NET=y
211
212#
213# Networking options
214#
215CONFIG_PACKET=y
216# CONFIG_PACKET_MMAP is not set
217CONFIG_UNIX=y
218# CONFIG_NET_KEY is not set
219CONFIG_INET=y
220CONFIG_IP_MULTICAST=y
221# CONFIG_IP_ADVANCED_ROUTER is not set
222CONFIG_IP_FIB_HASH=y
223# CONFIG_IP_PNP is not set
224# CONFIG_NET_IPIP is not set
225# CONFIG_NET_IPGRE is not set
226# CONFIG_IP_MROUTE is not set
227# CONFIG_ARPD is not set
228CONFIG_SYN_COOKIES=y
229# CONFIG_INET_AH is not set
230# CONFIG_INET_ESP is not set
231# CONFIG_INET_IPCOMP is not set
232# CONFIG_INET_TUNNEL is not set
233CONFIG_IP_TCPDIAG=y
234# CONFIG_IP_TCPDIAG_IPV6 is not set
235# CONFIG_TCP_CONG_ADVANCED is not set
236CONFIG_TCP_CONG_BIC=y
237
238#
239# IP: Virtual Server Configuration
240#
241# CONFIG_IP_VS is not set
242# CONFIG_IPV6 is not set
243CONFIG_NETFILTER=y
244# CONFIG_NETFILTER_DEBUG is not set
245
246#
247# IP: Netfilter Configuration
248#
249CONFIG_IP_NF_CONNTRACK=m
250# CONFIG_IP_NF_CT_ACCT is not set
251CONFIG_IP_NF_CONNTRACK_MARK=y
252# CONFIG_IP_NF_CT_PROTO_SCTP is not set
253CONFIG_IP_NF_FTP=m
254CONFIG_IP_NF_IRC=m
255CONFIG_IP_NF_TFTP=m
256CONFIG_IP_NF_AMANDA=m
257CONFIG_IP_NF_QUEUE=m
258CONFIG_IP_NF_IPTABLES=m
259CONFIG_IP_NF_MATCH_LIMIT=m
260CONFIG_IP_NF_MATCH_IPRANGE=m
261CONFIG_IP_NF_MATCH_MAC=m
262CONFIG_IP_NF_MATCH_PKTTYPE=m
263CONFIG_IP_NF_MATCH_MARK=m
264CONFIG_IP_NF_MATCH_MULTIPORT=m
265CONFIG_IP_NF_MATCH_TOS=m
266CONFIG_IP_NF_MATCH_RECENT=m
267CONFIG_IP_NF_MATCH_ECN=m
268CONFIG_IP_NF_MATCH_DSCP=m
269CONFIG_IP_NF_MATCH_AH_ESP=m
270CONFIG_IP_NF_MATCH_LENGTH=m
271CONFIG_IP_NF_MATCH_TTL=m
272CONFIG_IP_NF_MATCH_TCPMSS=m
273CONFIG_IP_NF_MATCH_HELPER=m
274CONFIG_IP_NF_MATCH_STATE=m
275CONFIG_IP_NF_MATCH_CONNTRACK=m
276CONFIG_IP_NF_MATCH_OWNER=m
277CONFIG_IP_NF_MATCH_ADDRTYPE=m
278CONFIG_IP_NF_MATCH_REALM=m
279CONFIG_IP_NF_MATCH_SCTP=m
280CONFIG_IP_NF_MATCH_COMMENT=m
281CONFIG_IP_NF_MATCH_CONNMARK=m
282CONFIG_IP_NF_MATCH_HASHLIMIT=m
283CONFIG_IP_NF_FILTER=m
284CONFIG_IP_NF_TARGET_REJECT=m
285CONFIG_IP_NF_TARGET_LOG=m
286CONFIG_IP_NF_TARGET_ULOG=m
287CONFIG_IP_NF_TARGET_TCPMSS=m
288CONFIG_IP_NF_NAT=m
289CONFIG_IP_NF_NAT_NEEDED=y
290CONFIG_IP_NF_TARGET_MASQUERADE=m
291CONFIG_IP_NF_TARGET_REDIRECT=m
292CONFIG_IP_NF_TARGET_NETMAP=m
293CONFIG_IP_NF_TARGET_SAME=m
294CONFIG_IP_NF_NAT_SNMP_BASIC=m
295CONFIG_IP_NF_NAT_IRC=m
296CONFIG_IP_NF_NAT_FTP=m
297CONFIG_IP_NF_NAT_TFTP=m
298CONFIG_IP_NF_NAT_AMANDA=m
299CONFIG_IP_NF_MANGLE=m
300CONFIG_IP_NF_TARGET_TOS=m
301CONFIG_IP_NF_TARGET_ECN=m
302CONFIG_IP_NF_TARGET_DSCP=m
303CONFIG_IP_NF_TARGET_MARK=m
304CONFIG_IP_NF_TARGET_CLASSIFY=m
305CONFIG_IP_NF_TARGET_CONNMARK=m
306CONFIG_IP_NF_TARGET_CLUSTERIP=m
307CONFIG_IP_NF_RAW=m
308CONFIG_IP_NF_TARGET_NOTRACK=m
309CONFIG_IP_NF_ARPTABLES=m
310# CONFIG_IP_NF_ARPFILTER is not set
311# CONFIG_IP_NF_ARP_MANGLE is not set
312
313#
314# SCTP Configuration (EXPERIMENTAL)
315#
316# CONFIG_IP_SCTP is not set
317# CONFIG_ATM is not set
318# CONFIG_BRIDGE is not set
319# CONFIG_VLAN_8021Q is not set
320# CONFIG_DECNET is not set
321# CONFIG_LLC2 is not set
322# CONFIG_IPX is not set
323# CONFIG_ATALK is not set
324# CONFIG_X25 is not set
325# CONFIG_LAPB is not set
326# CONFIG_NET_DIVERT is not set
327# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set
329# CONFIG_NET_SCHED is not set
330CONFIG_NET_CLS_ROUTE=y
331
332#
333# Network testing
334#
335# CONFIG_NET_PKTGEN is not set
336CONFIG_NETPOLL=y
337# CONFIG_NETPOLL_RX is not set
338# CONFIG_NETPOLL_TRAP is not set
339CONFIG_NET_POLL_CONTROLLER=y
340# CONFIG_HAMRADIO is not set
341# CONFIG_IRDA is not set
342# CONFIG_BT is not set
343
344#
168# Device Drivers 345# Device Drivers
169# 346#
170 347
@@ -173,7 +350,8 @@ CONFIG_BOOT_LOAD=0x00800000
173# 350#
174# CONFIG_STANDALONE is not set 351# CONFIG_STANDALONE is not set
175CONFIG_PREVENT_FIRMWARE_BUILD=y 352CONFIG_PREVENT_FIRMWARE_BUILD=y
176# CONFIG_FW_LOADER is not set 353CONFIG_FW_LOADER=m
354# CONFIG_DEBUG_DRIVER is not set
177 355
178# 356#
179# Memory Technology Devices (MTD) 357# Memory Technology Devices (MTD)
@@ -183,7 +361,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
183# 361#
184# Parallel port support 362# Parallel port support
185# 363#
186# CONFIG_PARPORT is not set 364CONFIG_PARPORT=m
365CONFIG_PARPORT_PC=m
366CONFIG_PARPORT_SERIAL=m
367CONFIG_PARPORT_PC_FIFO=y
368CONFIG_PARPORT_PC_SUPERIO=y
369# CONFIG_PARPORT_GSC is not set
370CONFIG_PARPORT_1284=y
187 371
188# 372#
189# Plug and Play support 373# Plug and Play support
@@ -194,18 +378,21 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
194# Block devices 378# Block devices
195# 379#
196CONFIG_BLK_DEV_FD=m 380CONFIG_BLK_DEV_FD=m
197# CONFIG_MAC_FLOPPY is not set 381CONFIG_MAC_FLOPPY=m
198# CONFIG_BLK_DEV_XD is not set 382# CONFIG_BLK_DEV_XD is not set
383# CONFIG_PARIDE is not set
199# CONFIG_BLK_CPQ_DA is not set 384# CONFIG_BLK_CPQ_DA is not set
200# CONFIG_BLK_CPQ_CISS_DA is not set 385# CONFIG_BLK_CPQ_CISS_DA is not set
201# CONFIG_BLK_DEV_DAC960 is not set 386# CONFIG_BLK_DEV_DAC960 is not set
202# CONFIG_BLK_DEV_UMEM is not set 387# CONFIG_BLK_DEV_UMEM is not set
388# CONFIG_BLK_DEV_COW_COMMON is not set
203CONFIG_BLK_DEV_LOOP=y 389CONFIG_BLK_DEV_LOOP=y
204# CONFIG_BLK_DEV_CRYPTOLOOP is not set 390# CONFIG_BLK_DEV_CRYPTOLOOP is not set
205# CONFIG_BLK_DEV_NBD is not set 391# CONFIG_BLK_DEV_NBD is not set
206# CONFIG_BLK_DEV_SX8 is not set 392# CONFIG_BLK_DEV_SX8 is not set
207# CONFIG_BLK_DEV_UB is not set 393# CONFIG_BLK_DEV_UB is not set
208CONFIG_BLK_DEV_RAM=y 394CONFIG_BLK_DEV_RAM=y
395CONFIG_BLK_DEV_RAM_COUNT=16
209CONFIG_BLK_DEV_RAM_SIZE=4096 396CONFIG_BLK_DEV_RAM_SIZE=4096
210CONFIG_BLK_DEV_INITRD=y 397CONFIG_BLK_DEV_INITRD=y
211CONFIG_INITRAMFS_SOURCE="" 398CONFIG_INITRAMFS_SOURCE=""
@@ -219,6 +406,7 @@ CONFIG_IOSCHED_NOOP=y
219CONFIG_IOSCHED_AS=y 406CONFIG_IOSCHED_AS=y
220CONFIG_IOSCHED_DEADLINE=y 407CONFIG_IOSCHED_DEADLINE=y
221CONFIG_IOSCHED_CFQ=y 408CONFIG_IOSCHED_CFQ=y
409# CONFIG_ATA_OVER_ETH is not set
222 410
223# 411#
224# ATA/ATAPI/MFM/RLL support 412# ATA/ATAPI/MFM/RLL support
@@ -247,7 +435,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
247# CONFIG_BLK_DEV_OFFBOARD is not set 435# CONFIG_BLK_DEV_OFFBOARD is not set
248CONFIG_BLK_DEV_GENERIC=y 436CONFIG_BLK_DEV_GENERIC=y
249# CONFIG_BLK_DEV_OPTI621 is not set 437# CONFIG_BLK_DEV_OPTI621 is not set
250CONFIG_BLK_DEV_SL82C105=y 438# CONFIG_BLK_DEV_SL82C105 is not set
251CONFIG_BLK_DEV_IDEDMA_PCI=y 439CONFIG_BLK_DEV_IDEDMA_PCI=y
252# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 440# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
253CONFIG_IDEDMA_PCI_AUTO=y 441CONFIG_IDEDMA_PCI_AUTO=y
@@ -264,6 +452,7 @@ CONFIG_BLK_DEV_CMD64X=y
264# CONFIG_BLK_DEV_HPT366 is not set 452# CONFIG_BLK_DEV_HPT366 is not set
265# CONFIG_BLK_DEV_SC1200 is not set 453# CONFIG_BLK_DEV_SC1200 is not set
266# CONFIG_BLK_DEV_PIIX is not set 454# CONFIG_BLK_DEV_PIIX is not set
455# CONFIG_BLK_DEV_IT821X is not set
267# CONFIG_BLK_DEV_NS87415 is not set 456# CONFIG_BLK_DEV_NS87415 is not set
268# CONFIG_BLK_DEV_PDC202XX_OLD is not set 457# CONFIG_BLK_DEV_PDC202XX_OLD is not set
269CONFIG_BLK_DEV_PDC202XX_NEW=y 458CONFIG_BLK_DEV_PDC202XX_NEW=y
@@ -299,19 +488,21 @@ CONFIG_CHR_DEV_ST=y
299CONFIG_BLK_DEV_SR=y 488CONFIG_BLK_DEV_SR=y
300CONFIG_BLK_DEV_SR_VENDOR=y 489CONFIG_BLK_DEV_SR_VENDOR=y
301CONFIG_CHR_DEV_SG=y 490CONFIG_CHR_DEV_SG=y
491# CONFIG_CHR_DEV_SCH is not set
302 492
303# 493#
304# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 494# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
305# 495#
306# CONFIG_SCSI_MULTI_LUN is not set 496# CONFIG_SCSI_MULTI_LUN is not set
307CONFIG_SCSI_CONSTANTS=y 497CONFIG_SCSI_CONSTANTS=y
308# CONFIG_SCSI_LOGGING is not set 498CONFIG_SCSI_LOGGING=y
309 499
310# 500#
311# SCSI Transport Attributes 501# SCSI Transport Attributes
312# 502#
313CONFIG_SCSI_SPI_ATTRS=y 503CONFIG_SCSI_SPI_ATTRS=y
314# CONFIG_SCSI_FC_ATTRS is not set 504# CONFIG_SCSI_FC_ATTRS is not set
505# CONFIG_SCSI_ISCSI_ATTRS is not set
315 506
316# 507#
317# SCSI low-level drivers 508# SCSI low-level drivers
@@ -340,7 +531,6 @@ CONFIG_SCSI_AIC7XXX_OLD=m
340# CONFIG_SCSI_DMX3191D is not set 531# CONFIG_SCSI_DMX3191D is not set
341# CONFIG_SCSI_DTC3280 is not set 532# CONFIG_SCSI_DTC3280 is not set
342# CONFIG_SCSI_EATA is not set 533# CONFIG_SCSI_EATA is not set
343# CONFIG_SCSI_EATA_PIO is not set
344# CONFIG_SCSI_FUTURE_DOMAIN is not set 534# CONFIG_SCSI_FUTURE_DOMAIN is not set
345# CONFIG_SCSI_GDTH is not set 535# CONFIG_SCSI_GDTH is not set
346# CONFIG_SCSI_GENERIC_NCR5380 is not set 536# CONFIG_SCSI_GENERIC_NCR5380 is not set
@@ -348,6 +538,8 @@ CONFIG_SCSI_AIC7XXX_OLD=m
348# CONFIG_SCSI_IPS is not set 538# CONFIG_SCSI_IPS is not set
349# CONFIG_SCSI_INITIO is not set 539# CONFIG_SCSI_INITIO is not set
350# CONFIG_SCSI_INIA100 is not set 540# CONFIG_SCSI_INIA100 is not set
541# CONFIG_SCSI_PPA is not set
542# CONFIG_SCSI_IMM is not set
351# CONFIG_SCSI_NCR53C406A is not set 543# CONFIG_SCSI_NCR53C406A is not set
352CONFIG_SCSI_SYM53C8XX_2=y 544CONFIG_SCSI_SYM53C8XX_2=y
353CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 545CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
@@ -358,17 +550,15 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
358# CONFIG_SCSI_PAS16 is not set 550# CONFIG_SCSI_PAS16 is not set
359# CONFIG_SCSI_PSI240I is not set 551# CONFIG_SCSI_PSI240I is not set
360# CONFIG_SCSI_QLOGIC_FAS is not set 552# CONFIG_SCSI_QLOGIC_FAS is not set
361# CONFIG_SCSI_QLOGIC_ISP is not set
362# CONFIG_SCSI_QLOGIC_FC is not set 553# CONFIG_SCSI_QLOGIC_FC is not set
363# CONFIG_SCSI_QLOGIC_1280 is not set 554# CONFIG_SCSI_QLOGIC_1280 is not set
364# CONFIG_SCSI_QLOGIC_1280_1040 is not set
365CONFIG_SCSI_QLA2XXX=y 555CONFIG_SCSI_QLA2XXX=y
366# CONFIG_SCSI_QLA21XX is not set 556# CONFIG_SCSI_QLA21XX is not set
367# CONFIG_SCSI_QLA22XX is not set 557# CONFIG_SCSI_QLA22XX is not set
368# CONFIG_SCSI_QLA2300 is not set 558# CONFIG_SCSI_QLA2300 is not set
369# CONFIG_SCSI_QLA2322 is not set 559# CONFIG_SCSI_QLA2322 is not set
370# CONFIG_SCSI_QLA6312 is not set 560# CONFIG_SCSI_QLA6312 is not set
371# CONFIG_SCSI_QLA6322 is not set 561# CONFIG_SCSI_LPFC is not set
372# CONFIG_SCSI_SYM53C416 is not set 562# CONFIG_SCSI_SYM53C416 is not set
373# CONFIG_SCSI_DC395x is not set 563# CONFIG_SCSI_DC395x is not set
374# CONFIG_SCSI_DC390T is not set 564# CONFIG_SCSI_DC390T is not set
@@ -395,11 +585,40 @@ CONFIG_SCSI_MAC53C94=y
395# Fusion MPT device support 585# Fusion MPT device support
396# 586#
397# CONFIG_FUSION is not set 587# CONFIG_FUSION is not set
588# CONFIG_FUSION_SPI is not set
589# CONFIG_FUSION_FC is not set
398 590
399# 591#
400# IEEE 1394 (FireWire) support 592# IEEE 1394 (FireWire) support
401# 593#
402# CONFIG_IEEE1394 is not set 594CONFIG_IEEE1394=m
595
596#
597# Subsystem Options
598#
599# CONFIG_IEEE1394_VERBOSEDEBUG is not set
600CONFIG_IEEE1394_OUI_DB=y
601CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
602CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
603# CONFIG_IEEE1394_EXPORT_FULL_API is not set
604
605#
606# Device Drivers
607#
608# CONFIG_IEEE1394_PCILYNX is not set
609CONFIG_IEEE1394_OHCI1394=m
610
611#
612# Protocol Drivers
613#
614CONFIG_IEEE1394_VIDEO1394=m
615CONFIG_IEEE1394_SBP2=m
616# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
617CONFIG_IEEE1394_ETH1394=m
618CONFIG_IEEE1394_DV1394=m
619CONFIG_IEEE1394_RAWIO=m
620CONFIG_IEEE1394_CMP=m
621CONFIG_IEEE1394_AMDTP=m
403 622
404# 623#
405# I2O device support 624# I2O device support
@@ -412,8 +631,8 @@ CONFIG_SCSI_MAC53C94=y
412CONFIG_ADB=y 631CONFIG_ADB=y
413CONFIG_ADB_CUDA=y 632CONFIG_ADB_CUDA=y
414CONFIG_ADB_PMU=y 633CONFIG_ADB_PMU=y
415CONFIG_PMAC_PBOOK=y
416CONFIG_PMAC_APM_EMU=y 634CONFIG_PMAC_APM_EMU=y
635CONFIG_PMAC_MEDIABAY=y
417CONFIG_PMAC_BACKLIGHT=y 636CONFIG_PMAC_BACKLIGHT=y
418CONFIG_ADB_MACIO=y 637CONFIG_ADB_MACIO=y
419CONFIG_INPUT_ADBHID=y 638CONFIG_INPUT_ADBHID=y
@@ -423,138 +642,13 @@ CONFIG_THERM_ADT746X=m
423# CONFIG_ANSLCD is not set 642# CONFIG_ANSLCD is not set
424 643
425# 644#
426# Networking support 645# Network device support
427#
428CONFIG_NET=y
429
430#
431# Networking options
432#
433CONFIG_PACKET=y
434# CONFIG_PACKET_MMAP is not set
435# CONFIG_NETLINK_DEV is not set
436CONFIG_UNIX=y
437# CONFIG_NET_KEY is not set
438CONFIG_INET=y
439CONFIG_IP_MULTICAST=y
440# CONFIG_IP_ADVANCED_ROUTER is not set
441# CONFIG_IP_PNP is not set
442# CONFIG_NET_IPIP is not set
443# CONFIG_NET_IPGRE is not set
444# CONFIG_IP_MROUTE is not set
445# CONFIG_ARPD is not set
446CONFIG_SYN_COOKIES=y
447# CONFIG_INET_AH is not set
448# CONFIG_INET_ESP is not set
449# CONFIG_INET_IPCOMP is not set
450# CONFIG_INET_TUNNEL is not set
451CONFIG_IP_TCPDIAG=y
452# CONFIG_IP_TCPDIAG_IPV6 is not set
453
454#
455# IP: Virtual Server Configuration
456#
457# CONFIG_IP_VS is not set
458# CONFIG_IPV6 is not set
459CONFIG_NETFILTER=y
460# CONFIG_NETFILTER_DEBUG is not set
461
462#
463# IP: Netfilter Configuration
464# 646#
465CONFIG_IP_NF_CONNTRACK=m
466# CONFIG_IP_NF_CT_ACCT is not set
467# CONFIG_IP_NF_CONNTRACK_MARK is not set
468# CONFIG_IP_NF_CT_PROTO_SCTP is not set
469CONFIG_IP_NF_FTP=m
470CONFIG_IP_NF_IRC=m
471CONFIG_IP_NF_TFTP=m
472CONFIG_IP_NF_AMANDA=m
473# CONFIG_IP_NF_QUEUE is not set
474CONFIG_IP_NF_IPTABLES=m
475CONFIG_IP_NF_MATCH_LIMIT=m
476CONFIG_IP_NF_MATCH_IPRANGE=m
477CONFIG_IP_NF_MATCH_MAC=m
478CONFIG_IP_NF_MATCH_PKTTYPE=m
479CONFIG_IP_NF_MATCH_MARK=m
480CONFIG_IP_NF_MATCH_MULTIPORT=m
481CONFIG_IP_NF_MATCH_TOS=m
482CONFIG_IP_NF_MATCH_RECENT=m
483CONFIG_IP_NF_MATCH_ECN=m
484CONFIG_IP_NF_MATCH_DSCP=m
485CONFIG_IP_NF_MATCH_AH_ESP=m
486CONFIG_IP_NF_MATCH_LENGTH=m
487CONFIG_IP_NF_MATCH_TTL=m
488CONFIG_IP_NF_MATCH_TCPMSS=m
489CONFIG_IP_NF_MATCH_HELPER=m
490CONFIG_IP_NF_MATCH_STATE=m
491CONFIG_IP_NF_MATCH_CONNTRACK=m
492CONFIG_IP_NF_MATCH_OWNER=m
493# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
494# CONFIG_IP_NF_MATCH_REALM is not set
495# CONFIG_IP_NF_MATCH_SCTP is not set
496# CONFIG_IP_NF_MATCH_COMMENT is not set
497# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
498CONFIG_IP_NF_FILTER=m
499CONFIG_IP_NF_TARGET_REJECT=m
500# CONFIG_IP_NF_TARGET_LOG is not set
501CONFIG_IP_NF_TARGET_ULOG=m
502CONFIG_IP_NF_TARGET_TCPMSS=m
503CONFIG_IP_NF_NAT=m
504CONFIG_IP_NF_NAT_NEEDED=y
505CONFIG_IP_NF_TARGET_MASQUERADE=m
506CONFIG_IP_NF_TARGET_REDIRECT=m
507CONFIG_IP_NF_TARGET_NETMAP=m
508CONFIG_IP_NF_TARGET_SAME=m
509CONFIG_IP_NF_NAT_SNMP_BASIC=m
510CONFIG_IP_NF_NAT_IRC=m
511CONFIG_IP_NF_NAT_FTP=m
512CONFIG_IP_NF_NAT_TFTP=m
513CONFIG_IP_NF_NAT_AMANDA=m
514# CONFIG_IP_NF_MANGLE is not set
515CONFIG_IP_NF_RAW=m
516CONFIG_IP_NF_TARGET_NOTRACK=m
517# CONFIG_IP_NF_ARPTABLES is not set
518CONFIG_IP_NF_COMPAT_IPCHAINS=m
519# CONFIG_IP_NF_COMPAT_IPFWADM is not set
520
521#
522# SCTP Configuration (EXPERIMENTAL)
523#
524# CONFIG_IP_SCTP is not set
525# CONFIG_ATM is not set
526# CONFIG_BRIDGE is not set
527# CONFIG_VLAN_8021Q is not set
528# CONFIG_DECNET is not set
529# CONFIG_LLC2 is not set
530# CONFIG_IPX is not set
531# CONFIG_ATALK is not set
532# CONFIG_X25 is not set
533# CONFIG_LAPB is not set
534# CONFIG_NET_DIVERT is not set
535# CONFIG_ECONET is not set
536# CONFIG_WAN_ROUTER is not set
537
538#
539# QoS and/or fair queueing
540#
541# CONFIG_NET_SCHED is not set
542# CONFIG_NET_CLS_ROUTE is not set
543
544#
545# Network testing
546#
547# CONFIG_NET_PKTGEN is not set
548# CONFIG_NETPOLL is not set
549# CONFIG_NET_POLL_CONTROLLER is not set
550# CONFIG_HAMRADIO is not set
551# CONFIG_IRDA is not set
552# CONFIG_BT is not set
553CONFIG_NETDEVICES=y 647CONFIG_NETDEVICES=y
554# CONFIG_DUMMY is not set 648# CONFIG_DUMMY is not set
555# CONFIG_BONDING is not set 649# CONFIG_BONDING is not set
556# CONFIG_EQUALIZER is not set 650# CONFIG_EQUALIZER is not set
557# CONFIG_TUN is not set 651CONFIG_TUN=m
558 652
559# 653#
560# ARCnet devices 654# ARCnet devices
@@ -588,6 +682,8 @@ CONFIG_TULIP_MMIO=y
588CONFIG_DE4X5=m 682CONFIG_DE4X5=m
589# CONFIG_WINBOND_840 is not set 683# CONFIG_WINBOND_840 is not set
590# CONFIG_DM9102 is not set 684# CONFIG_DM9102 is not set
685# CONFIG_PCMCIA_XIRCOM is not set
686# CONFIG_PCMCIA_XIRTULIP is not set
591# CONFIG_AT1700 is not set 687# CONFIG_AT1700 is not set
592# CONFIG_DEPCA is not set 688# CONFIG_DEPCA is not set
593# CONFIG_HP100 is not set 689# CONFIG_HP100 is not set
@@ -626,9 +722,12 @@ CONFIG_PCNET32=y
626# CONFIG_HAMACHI is not set 722# CONFIG_HAMACHI is not set
627# CONFIG_YELLOWFIN is not set 723# CONFIG_YELLOWFIN is not set
628# CONFIG_R8169 is not set 724# CONFIG_R8169 is not set
725# CONFIG_SKGE is not set
629# CONFIG_SK98LIN is not set 726# CONFIG_SK98LIN is not set
630# CONFIG_VIA_VELOCITY is not set 727# CONFIG_VIA_VELOCITY is not set
631# CONFIG_TIGON3 is not set 728# CONFIG_TIGON3 is not set
729# CONFIG_BNX2 is not set
730# CONFIG_MV643XX_ETH is not set
632 731
633# 732#
634# Ethernet (10000 Mbit) 733# Ethernet (10000 Mbit)
@@ -676,18 +775,19 @@ CONFIG_NET_WIRELESS=y
676# CONFIG_WAN is not set 775# CONFIG_WAN is not set
677# CONFIG_FDDI is not set 776# CONFIG_FDDI is not set
678# CONFIG_HIPPI is not set 777# CONFIG_HIPPI is not set
778# CONFIG_PLIP is not set
679CONFIG_PPP=y 779CONFIG_PPP=y
680CONFIG_PPP_MULTILINK=y 780CONFIG_PPP_MULTILINK=y
681CONFIG_PPP_FILTER=y 781CONFIG_PPP_FILTER=y
682CONFIG_PPP_ASYNC=y 782CONFIG_PPP_ASYNC=y
683# CONFIG_PPP_SYNC_TTY is not set 783# CONFIG_PPP_SYNC_TTY is not set
684CONFIG_PPP_DEFLATE=y 784CONFIG_PPP_DEFLATE=y
685# CONFIG_PPP_BSDCOMP is not set 785CONFIG_PPP_BSDCOMP=m
686# CONFIG_PPPOE is not set 786CONFIG_PPPOE=m
687# CONFIG_SLIP is not set 787# CONFIG_SLIP is not set
688# CONFIG_NET_FC is not set 788# CONFIG_NET_FC is not set
689# CONFIG_SHAPER is not set 789# CONFIG_SHAPER is not set
690# CONFIG_NETCONSOLE is not set 790CONFIG_NETCONSOLE=m
691 791
692# 792#
693# ISDN subsystem 793# ISDN subsystem
@@ -708,7 +808,7 @@ CONFIG_INPUT=y
708# Userland interfaces 808# Userland interfaces
709# 809#
710CONFIG_INPUT_MOUSEDEV=y 810CONFIG_INPUT_MOUSEDEV=y
711CONFIG_INPUT_MOUSEDEV_PSAUX=y 811# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
712CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 812CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
713CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 813CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
714# CONFIG_INPUT_JOYDEV is not set 814# CONFIG_INPUT_JOYDEV is not set
@@ -717,18 +817,6 @@ CONFIG_INPUT_EVDEV=y
717CONFIG_INPUT_EVBUG=m 817CONFIG_INPUT_EVBUG=m
718 818
719# 819#
720# Input I/O drivers
721#
722# CONFIG_GAMEPORT is not set
723CONFIG_SOUND_GAMEPORT=y
724CONFIG_SERIO=y
725CONFIG_SERIO_I8042=y
726# CONFIG_SERIO_SERPORT is not set
727# CONFIG_SERIO_CT82C710 is not set
728# CONFIG_SERIO_PCIPS2 is not set
729# CONFIG_SERIO_RAW is not set
730
731#
732# Input Device Drivers 820# Input Device Drivers
733# 821#
734CONFIG_INPUT_KEYBOARD=y 822CONFIG_INPUT_KEYBOARD=y
@@ -751,6 +839,18 @@ CONFIG_INPUT_MISC=y
751CONFIG_INPUT_UINPUT=m 839CONFIG_INPUT_UINPUT=m
752 840
753# 841#
842# Hardware I/O ports
843#
844CONFIG_SERIO=y
845CONFIG_SERIO_I8042=y
846# CONFIG_SERIO_SERPORT is not set
847# CONFIG_SERIO_PARKBD is not set
848# CONFIG_SERIO_PCIPS2 is not set
849CONFIG_SERIO_LIBPS2=y
850# CONFIG_SERIO_RAW is not set
851# CONFIG_GAMEPORT is not set
852
853#
754# Character devices 854# Character devices
755# 855#
756CONFIG_VT=y 856CONFIG_VT=y
@@ -761,7 +861,8 @@ CONFIG_HW_CONSOLE=y
761# 861#
762# Serial drivers 862# Serial drivers
763# 863#
764CONFIG_SERIAL_8250=m 864CONFIG_SERIAL_8250=y
865CONFIG_SERIAL_8250_CONSOLE=y
765CONFIG_SERIAL_8250_NR_UARTS=4 866CONFIG_SERIAL_8250_NR_UARTS=4
766# CONFIG_SERIAL_8250_EXTENDED is not set 867# CONFIG_SERIAL_8250_EXTENDED is not set
767 868
@@ -769,11 +870,16 @@ CONFIG_SERIAL_8250_NR_UARTS=4
769# Non-8250 serial port support 870# Non-8250 serial port support
770# 871#
771CONFIG_SERIAL_CORE=y 872CONFIG_SERIAL_CORE=y
873CONFIG_SERIAL_CORE_CONSOLE=y
772CONFIG_SERIAL_PMACZILOG=y 874CONFIG_SERIAL_PMACZILOG=y
773# CONFIG_SERIAL_PMACZILOG_CONSOLE is not set 875CONFIG_SERIAL_PMACZILOG_CONSOLE=y
876# CONFIG_SERIAL_JSM is not set
774CONFIG_UNIX98_PTYS=y 877CONFIG_UNIX98_PTYS=y
775CONFIG_LEGACY_PTYS=y 878CONFIG_LEGACY_PTYS=y
776CONFIG_LEGACY_PTY_COUNT=256 879CONFIG_LEGACY_PTY_COUNT=256
880# CONFIG_PRINTER is not set
881# CONFIG_PPDEV is not set
882# CONFIG_TIPAR is not set
777 883
778# 884#
779# IPMI 885# IPMI
@@ -794,11 +900,23 @@ CONFIG_GEN_RTC=y
794# 900#
795# Ftape, the floppy tape device driver 901# Ftape, the floppy tape device driver
796# 902#
797# CONFIG_AGP is not set 903CONFIG_AGP=m
798# CONFIG_DRM is not set 904CONFIG_AGP_UNINORTH=m
905CONFIG_DRM=m
906# CONFIG_DRM_TDFX is not set
907CONFIG_DRM_R128=m
908CONFIG_DRM_RADEON=m
909# CONFIG_DRM_MGA is not set
910# CONFIG_DRM_SIS is not set
911# CONFIG_DRM_VIA is not set
799# CONFIG_RAW_DRIVER is not set 912# CONFIG_RAW_DRIVER is not set
800 913
801# 914#
915# TPM devices
916#
917# CONFIG_TCG_TPM is not set
918
919#
802# I2C support 920# I2C support
803# 921#
804CONFIG_I2C=y 922CONFIG_I2C=y
@@ -823,11 +941,13 @@ CONFIG_I2C_ALGOBIT=y
823CONFIG_I2C_HYDRA=y 941CONFIG_I2C_HYDRA=y
824# CONFIG_I2C_I801 is not set 942# CONFIG_I2C_I801 is not set
825# CONFIG_I2C_I810 is not set 943# CONFIG_I2C_I810 is not set
944# CONFIG_I2C_PIIX4 is not set
826# CONFIG_I2C_ISA is not set 945# CONFIG_I2C_ISA is not set
827CONFIG_I2C_KEYWEST=m 946CONFIG_I2C_KEYWEST=m
947# CONFIG_I2C_MPC is not set
828# CONFIG_I2C_NFORCE2 is not set 948# CONFIG_I2C_NFORCE2 is not set
949# CONFIG_I2C_PARPORT is not set
829# CONFIG_I2C_PARPORT_LIGHT is not set 950# CONFIG_I2C_PARPORT_LIGHT is not set
830# CONFIG_I2C_PIIX4 is not set
831# CONFIG_I2C_PROSAVAGE is not set 951# CONFIG_I2C_PROSAVAGE is not set
832# CONFIG_I2C_SAVAGE4 is not set 952# CONFIG_I2C_SAVAGE4 is not set
833# CONFIG_SCx200_ACB is not set 953# CONFIG_SCx200_ACB is not set
@@ -839,43 +959,20 @@ CONFIG_I2C_KEYWEST=m
839# CONFIG_I2C_VIAPRO is not set 959# CONFIG_I2C_VIAPRO is not set
840# CONFIG_I2C_VOODOO3 is not set 960# CONFIG_I2C_VOODOO3 is not set
841# CONFIG_I2C_PCA_ISA is not set 961# CONFIG_I2C_PCA_ISA is not set
962# CONFIG_I2C_SENSOR is not set
842 963
843# 964#
844# Hardware Sensors Chip support 965# Miscellaneous I2C Chip support
845#
846# CONFIG_I2C_SENSOR is not set
847# CONFIG_SENSORS_ADM1021 is not set
848# CONFIG_SENSORS_ADM1025 is not set
849# CONFIG_SENSORS_ADM1031 is not set
850# CONFIG_SENSORS_ASB100 is not set
851# CONFIG_SENSORS_DS1621 is not set
852# CONFIG_SENSORS_FSCHER is not set
853# CONFIG_SENSORS_GL518SM is not set
854# CONFIG_SENSORS_IT87 is not set
855# CONFIG_SENSORS_LM63 is not set
856# CONFIG_SENSORS_LM75 is not set
857# CONFIG_SENSORS_LM77 is not set
858# CONFIG_SENSORS_LM78 is not set
859# CONFIG_SENSORS_LM80 is not set
860# CONFIG_SENSORS_LM83 is not set
861# CONFIG_SENSORS_LM85 is not set
862# CONFIG_SENSORS_LM87 is not set
863# CONFIG_SENSORS_LM90 is not set
864# CONFIG_SENSORS_MAX1619 is not set
865# CONFIG_SENSORS_PC87360 is not set
866# CONFIG_SENSORS_SMSC47M1 is not set
867# CONFIG_SENSORS_VIA686A is not set
868# CONFIG_SENSORS_W83781D is not set
869# CONFIG_SENSORS_W83L785TS is not set
870# CONFIG_SENSORS_W83627HF is not set
871
872#
873# Other I2C Chip support
874# 966#
967# CONFIG_SENSORS_DS1337 is not set
968# CONFIG_SENSORS_DS1374 is not set
875# CONFIG_SENSORS_EEPROM is not set 969# CONFIG_SENSORS_EEPROM is not set
876# CONFIG_SENSORS_PCF8574 is not set 970# CONFIG_SENSORS_PCF8574 is not set
971# CONFIG_SENSORS_PCA9539 is not set
877# CONFIG_SENSORS_PCF8591 is not set 972# CONFIG_SENSORS_PCF8591 is not set
878# CONFIG_SENSORS_RTC8564 is not set 973# CONFIG_SENSORS_RTC8564 is not set
974# CONFIG_SENSORS_M41T00 is not set
975# CONFIG_SENSORS_MAX6875 is not set
879# CONFIG_I2C_DEBUG_CORE is not set 976# CONFIG_I2C_DEBUG_CORE is not set
880# CONFIG_I2C_DEBUG_ALGO is not set 977# CONFIG_I2C_DEBUG_ALGO is not set
881# CONFIG_I2C_DEBUG_BUS is not set 978# CONFIG_I2C_DEBUG_BUS is not set
@@ -887,6 +984,11 @@ CONFIG_I2C_KEYWEST=m
887# CONFIG_W1 is not set 984# CONFIG_W1 is not set
888 985
889# 986#
987# Hardware Monitoring support
988#
989# CONFIG_HWMON is not set
990
991#
890# Misc devices 992# Misc devices
891# 993#
892 994
@@ -904,8 +1006,13 @@ CONFIG_I2C_KEYWEST=m
904# Graphics support 1006# Graphics support
905# 1007#
906CONFIG_FB=y 1008CONFIG_FB=y
1009CONFIG_FB_CFB_FILLRECT=y
1010CONFIG_FB_CFB_COPYAREA=y
1011CONFIG_FB_CFB_IMAGEBLIT=y
1012CONFIG_FB_SOFT_CURSOR=y
1013CONFIG_FB_MACMODES=y
907CONFIG_FB_MODE_HELPERS=y 1014CONFIG_FB_MODE_HELPERS=y
908# CONFIG_FB_TILEBLITTING is not set 1015CONFIG_FB_TILEBLITTING=y
909# CONFIG_FB_CIRRUS is not set 1016# CONFIG_FB_CIRRUS is not set
910# CONFIG_FB_PM2 is not set 1017# CONFIG_FB_PM2 is not set
911# CONFIG_FB_CYBER2000 is not set 1018# CONFIG_FB_CYBER2000 is not set
@@ -917,13 +1024,16 @@ CONFIG_FB_CT65550=y
917# CONFIG_FB_ASILIANT is not set 1024# CONFIG_FB_ASILIANT is not set
918CONFIG_FB_IMSTT=y 1025CONFIG_FB_IMSTT=y
919# CONFIG_FB_VGA16 is not set 1026# CONFIG_FB_VGA16 is not set
920# CONFIG_FB_RIVA is not set 1027# CONFIG_FB_NVIDIA is not set
1028CONFIG_FB_RIVA=y
1029CONFIG_FB_RIVA_I2C=y
1030# CONFIG_FB_RIVA_DEBUG is not set
921CONFIG_FB_MATROX=y 1031CONFIG_FB_MATROX=y
922CONFIG_FB_MATROX_MILLENIUM=y 1032CONFIG_FB_MATROX_MILLENIUM=y
923CONFIG_FB_MATROX_MYSTIQUE=y 1033CONFIG_FB_MATROX_MYSTIQUE=y
924# CONFIG_FB_MATROX_G450 is not set 1034CONFIG_FB_MATROX_G=y
925# CONFIG_FB_MATROX_G100A is not set
926CONFIG_FB_MATROX_I2C=y 1035CONFIG_FB_MATROX_I2C=y
1036CONFIG_FB_MATROX_MAVEN=m
927# CONFIG_FB_MATROX_MULTIHEAD is not set 1037# CONFIG_FB_MATROX_MULTIHEAD is not set
928# CONFIG_FB_RADEON_OLD is not set 1038# CONFIG_FB_RADEON_OLD is not set
929CONFIG_FB_RADEON=y 1039CONFIG_FB_RADEON=y
@@ -932,8 +1042,8 @@ CONFIG_FB_RADEON_I2C=y
932CONFIG_FB_ATY128=y 1042CONFIG_FB_ATY128=y
933CONFIG_FB_ATY=y 1043CONFIG_FB_ATY=y
934CONFIG_FB_ATY_CT=y 1044CONFIG_FB_ATY_CT=y
935# CONFIG_FB_ATY_GENERIC_LCD is not set 1045CONFIG_FB_ATY_GENERIC_LCD=y
936# CONFIG_FB_ATY_XL_INIT is not set 1046CONFIG_FB_ATY_XL_INIT=y
937CONFIG_FB_ATY_GX=y 1047CONFIG_FB_ATY_GX=y
938# CONFIG_FB_SAVAGE is not set 1048# CONFIG_FB_SAVAGE is not set
939# CONFIG_FB_SIS is not set 1049# CONFIG_FB_SIS is not set
@@ -943,6 +1053,7 @@ CONFIG_FB_3DFX=y
943# CONFIG_FB_3DFX_ACCEL is not set 1053# CONFIG_FB_3DFX_ACCEL is not set
944# CONFIG_FB_VOODOO1 is not set 1054# CONFIG_FB_VOODOO1 is not set
945# CONFIG_FB_TRIDENT is not set 1055# CONFIG_FB_TRIDENT is not set
1056# CONFIG_FB_S1D13XXX is not set
946# CONFIG_FB_VIRTUAL is not set 1057# CONFIG_FB_VIRTUAL is not set
947 1058
948# 1059#
@@ -960,9 +1071,10 @@ CONFIG_FONT_8x16=y
960# Logo configuration 1071# Logo configuration
961# 1072#
962CONFIG_LOGO=y 1073CONFIG_LOGO=y
963CONFIG_LOGO_LINUX_MONO=y 1074# CONFIG_LOGO_LINUX_MONO is not set
964CONFIG_LOGO_LINUX_VGA16=y 1075# CONFIG_LOGO_LINUX_VGA16 is not set
965CONFIG_LOGO_LINUX_CLUT224=y 1076CONFIG_LOGO_LINUX_CLUT224=y
1077# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
966 1078
967# 1079#
968# Sound 1080# Sound
@@ -987,6 +1099,7 @@ CONFIG_SND_PCM_OSS=m
987CONFIG_SND_SEQUENCER_OSS=y 1099CONFIG_SND_SEQUENCER_OSS=y
988# CONFIG_SND_VERBOSE_PRINTK is not set 1100# CONFIG_SND_VERBOSE_PRINTK is not set
989# CONFIG_SND_DEBUG is not set 1101# CONFIG_SND_DEBUG is not set
1102CONFIG_SND_GENERIC_PM=y
990 1103
991# 1104#
992# Generic devices 1105# Generic devices
@@ -1002,6 +1115,7 @@ CONFIG_SND_OPL3_LIB=m
1002# 1115#
1003# ISA devices 1116# ISA devices
1004# 1117#
1118CONFIG_SND_CS4231_LIB=m
1005# CONFIG_SND_AD1848 is not set 1119# CONFIG_SND_AD1848 is not set
1006# CONFIG_SND_CS4231 is not set 1120# CONFIG_SND_CS4231 is not set
1007CONFIG_SND_CS4232=m 1121CONFIG_SND_CS4232=m
@@ -1039,6 +1153,8 @@ CONFIG_SND_CS4232=m
1039# CONFIG_SND_CS46XX is not set 1153# CONFIG_SND_CS46XX is not set
1040# CONFIG_SND_CS4281 is not set 1154# CONFIG_SND_CS4281 is not set
1041# CONFIG_SND_EMU10K1 is not set 1155# CONFIG_SND_EMU10K1 is not set
1156# CONFIG_SND_EMU10K1X is not set
1157# CONFIG_SND_CA0106 is not set
1042# CONFIG_SND_KORG1212 is not set 1158# CONFIG_SND_KORG1212 is not set
1043# CONFIG_SND_MIXART is not set 1159# CONFIG_SND_MIXART is not set
1044# CONFIG_SND_NM256 is not set 1160# CONFIG_SND_NM256 is not set
@@ -1046,6 +1162,7 @@ CONFIG_SND_CS4232=m
1046# CONFIG_SND_RME96 is not set 1162# CONFIG_SND_RME96 is not set
1047# CONFIG_SND_RME9652 is not set 1163# CONFIG_SND_RME9652 is not set
1048# CONFIG_SND_HDSP is not set 1164# CONFIG_SND_HDSP is not set
1165# CONFIG_SND_HDSPM is not set
1049# CONFIG_SND_TRIDENT is not set 1166# CONFIG_SND_TRIDENT is not set
1050# CONFIG_SND_YMFPCI is not set 1167# CONFIG_SND_YMFPCI is not set
1051# CONFIG_SND_ALS4000 is not set 1168# CONFIG_SND_ALS4000 is not set
@@ -1062,7 +1179,9 @@ CONFIG_SND_CS4232=m
1062# CONFIG_SND_INTEL8X0M is not set 1179# CONFIG_SND_INTEL8X0M is not set
1063# CONFIG_SND_SONICVIBES is not set 1180# CONFIG_SND_SONICVIBES is not set
1064# CONFIG_SND_VIA82XX is not set 1181# CONFIG_SND_VIA82XX is not set
1182# CONFIG_SND_VIA82XX_MODEM is not set
1065# CONFIG_SND_VX222 is not set 1183# CONFIG_SND_VX222 is not set
1184# CONFIG_SND_HDA_INTEL is not set
1066 1185
1067# 1186#
1068# ALSA PowerMac devices 1187# ALSA PowerMac devices
@@ -1083,6 +1202,8 @@ CONFIG_SND_USB_AUDIO=m
1083# 1202#
1084# USB support 1203# USB support
1085# 1204#
1205CONFIG_USB_ARCH_HAS_HCD=y
1206CONFIG_USB_ARCH_HAS_OHCI=y
1086CONFIG_USB=y 1207CONFIG_USB=y
1087# CONFIG_USB_DEBUG is not set 1208# CONFIG_USB_DEBUG is not set
1088 1209
@@ -1094,15 +1215,19 @@ CONFIG_USB_DEVICEFS=y
1094# CONFIG_USB_DYNAMIC_MINORS is not set 1215# CONFIG_USB_DYNAMIC_MINORS is not set
1095# CONFIG_USB_SUSPEND is not set 1216# CONFIG_USB_SUSPEND is not set
1096# CONFIG_USB_OTG is not set 1217# CONFIG_USB_OTG is not set
1097CONFIG_USB_ARCH_HAS_HCD=y
1098CONFIG_USB_ARCH_HAS_OHCI=y
1099 1218
1100# 1219#
1101# USB Host Controller Drivers 1220# USB Host Controller Drivers
1102# 1221#
1103# CONFIG_USB_EHCI_HCD is not set 1222CONFIG_USB_EHCI_HCD=m
1223CONFIG_USB_EHCI_SPLIT_ISO=y
1224CONFIG_USB_EHCI_ROOT_HUB_TT=y
1225# CONFIG_USB_ISP116X_HCD is not set
1104CONFIG_USB_OHCI_HCD=y 1226CONFIG_USB_OHCI_HCD=y
1105# CONFIG_USB_UHCI_HCD is not set 1227# CONFIG_USB_OHCI_BIG_ENDIAN is not set
1228CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1229CONFIG_USB_UHCI_HCD=m
1230# CONFIG_USB_SL811_HCD is not set
1106 1231
1107# 1232#
1108# USB Device Class drivers 1233# USB Device Class drivers
@@ -1112,17 +1237,20 @@ CONFIG_USB_OHCI_HCD=y
1112# CONFIG_USB_MIDI is not set 1237# CONFIG_USB_MIDI is not set
1113CONFIG_USB_ACM=m 1238CONFIG_USB_ACM=m
1114CONFIG_USB_PRINTER=m 1239CONFIG_USB_PRINTER=m
1240
1241#
1242# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
1243#
1115CONFIG_USB_STORAGE=m 1244CONFIG_USB_STORAGE=m
1116# CONFIG_USB_STORAGE_DEBUG is not set 1245# CONFIG_USB_STORAGE_DEBUG is not set
1117# CONFIG_USB_STORAGE_RW_DETECT is not set 1246CONFIG_USB_STORAGE_DATAFAB=y
1118# CONFIG_USB_STORAGE_DATAFAB is not set
1119CONFIG_USB_STORAGE_FREECOM=y 1247CONFIG_USB_STORAGE_FREECOM=y
1120# CONFIG_USB_STORAGE_ISD200 is not set 1248CONFIG_USB_STORAGE_ISD200=y
1121CONFIG_USB_STORAGE_DPCM=y 1249CONFIG_USB_STORAGE_DPCM=y
1122# CONFIG_USB_STORAGE_HP8200e is not set 1250CONFIG_USB_STORAGE_USBAT=y
1123# CONFIG_USB_STORAGE_SDDR09 is not set 1251CONFIG_USB_STORAGE_SDDR09=y
1124# CONFIG_USB_STORAGE_SDDR55 is not set 1252CONFIG_USB_STORAGE_SDDR55=y
1125# CONFIG_USB_STORAGE_JUMPSHOT is not set 1253CONFIG_USB_STORAGE_JUMPSHOT=y
1126 1254
1127# 1255#
1128# USB Input Devices 1256# USB Input Devices
@@ -1130,22 +1258,24 @@ CONFIG_USB_STORAGE_DPCM=y
1130CONFIG_USB_HID=y 1258CONFIG_USB_HID=y
1131CONFIG_USB_HIDINPUT=y 1259CONFIG_USB_HIDINPUT=y
1132# CONFIG_HID_FF is not set 1260# CONFIG_HID_FF is not set
1133# CONFIG_USB_HIDDEV is not set 1261CONFIG_USB_HIDDEV=y
1134# CONFIG_USB_AIPTEK is not set 1262# CONFIG_USB_AIPTEK is not set
1135# CONFIG_USB_WACOM is not set 1263# CONFIG_USB_WACOM is not set
1264# CONFIG_USB_ACECAD is not set
1136# CONFIG_USB_KBTAB is not set 1265# CONFIG_USB_KBTAB is not set
1137# CONFIG_USB_POWERMATE is not set 1266# CONFIG_USB_POWERMATE is not set
1138# CONFIG_USB_MTOUCH is not set 1267# CONFIG_USB_MTOUCH is not set
1268# CONFIG_USB_ITMTOUCH is not set
1139# CONFIG_USB_EGALAX is not set 1269# CONFIG_USB_EGALAX is not set
1140# CONFIG_USB_XPAD is not set 1270# CONFIG_USB_XPAD is not set
1141# CONFIG_USB_ATI_REMOTE is not set 1271# CONFIG_USB_ATI_REMOTE is not set
1272# CONFIG_USB_KEYSPAN_REMOTE is not set
1142 1273
1143# 1274#
1144# USB Imaging devices 1275# USB Imaging devices
1145# 1276#
1146# CONFIG_USB_MDC800 is not set 1277# CONFIG_USB_MDC800 is not set
1147# CONFIG_USB_MICROTEK is not set 1278# CONFIG_USB_MICROTEK is not set
1148# CONFIG_USB_HPUSBSCSI is not set
1149 1279
1150# 1280#
1151# USB Multimedia devices 1281# USB Multimedia devices
@@ -1161,22 +1291,27 @@ CONFIG_USB_HIDINPUT=y
1161# 1291#
1162# CONFIG_USB_CATC is not set 1292# CONFIG_USB_CATC is not set
1163# CONFIG_USB_KAWETH is not set 1293# CONFIG_USB_KAWETH is not set
1164# CONFIG_USB_PEGASUS is not set 1294CONFIG_USB_PEGASUS=m
1165# CONFIG_USB_RTL8150 is not set 1295# CONFIG_USB_RTL8150 is not set
1166# CONFIG_USB_USBNET is not set 1296# CONFIG_USB_USBNET is not set
1297# CONFIG_USB_ZD1201 is not set
1298# CONFIG_USB_MON is not set
1167 1299
1168# 1300#
1169# USB port drivers 1301# USB port drivers
1170# 1302#
1303# CONFIG_USB_USS720 is not set
1171 1304
1172# 1305#
1173# USB Serial Converter support 1306# USB Serial Converter support
1174# 1307#
1175CONFIG_USB_SERIAL=m 1308CONFIG_USB_SERIAL=m
1176# CONFIG_USB_SERIAL_GENERIC is not set 1309# CONFIG_USB_SERIAL_GENERIC is not set
1310# CONFIG_USB_SERIAL_AIRPRIME is not set
1177# CONFIG_USB_SERIAL_BELKIN is not set 1311# CONFIG_USB_SERIAL_BELKIN is not set
1178# CONFIG_USB_SERIAL_WHITEHEAT is not set 1312# CONFIG_USB_SERIAL_WHITEHEAT is not set
1179# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1313# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1314# CONFIG_USB_SERIAL_CP2101 is not set
1180# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 1315# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
1181# CONFIG_USB_SERIAL_EMPEG is not set 1316# CONFIG_USB_SERIAL_EMPEG is not set
1182# CONFIG_USB_SERIAL_FTDI_SIO is not set 1317# CONFIG_USB_SERIAL_FTDI_SIO is not set
@@ -1185,28 +1320,32 @@ CONFIG_USB_SERIAL_VISOR=m
1185# CONFIG_USB_SERIAL_IR is not set 1320# CONFIG_USB_SERIAL_IR is not set
1186# CONFIG_USB_SERIAL_EDGEPORT is not set 1321# CONFIG_USB_SERIAL_EDGEPORT is not set
1187# CONFIG_USB_SERIAL_EDGEPORT_TI is not set 1322# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
1323# CONFIG_USB_SERIAL_GARMIN is not set
1188# CONFIG_USB_SERIAL_IPW is not set 1324# CONFIG_USB_SERIAL_IPW is not set
1189# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set 1325# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
1190CONFIG_USB_SERIAL_KEYSPAN=m 1326CONFIG_USB_SERIAL_KEYSPAN=m
1191# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set 1327CONFIG_USB_SERIAL_KEYSPAN_MPR=y
1192CONFIG_USB_SERIAL_KEYSPAN_USA28=y 1328CONFIG_USB_SERIAL_KEYSPAN_USA28=y
1193CONFIG_USB_SERIAL_KEYSPAN_USA28X=y 1329CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
1194# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set 1330CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
1195# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set 1331CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
1196CONFIG_USB_SERIAL_KEYSPAN_USA19=y 1332CONFIG_USB_SERIAL_KEYSPAN_USA19=y
1197CONFIG_USB_SERIAL_KEYSPAN_USA18X=y 1333CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
1198CONFIG_USB_SERIAL_KEYSPAN_USA19W=y 1334CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
1199CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y 1335CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
1200CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y 1336CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
1201CONFIG_USB_SERIAL_KEYSPAN_USA49W=y 1337CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
1202# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set 1338CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1203# CONFIG_USB_SERIAL_KLSI is not set 1339# CONFIG_USB_SERIAL_KLSI is not set
1204# CONFIG_USB_SERIAL_KOBIL_SCT is not set 1340# CONFIG_USB_SERIAL_KOBIL_SCT is not set
1205# CONFIG_USB_SERIAL_MCT_U232 is not set 1341# CONFIG_USB_SERIAL_MCT_U232 is not set
1206# CONFIG_USB_SERIAL_PL2303 is not set 1342# CONFIG_USB_SERIAL_PL2303 is not set
1343# CONFIG_USB_SERIAL_HP4X is not set
1207# CONFIG_USB_SERIAL_SAFE is not set 1344# CONFIG_USB_SERIAL_SAFE is not set
1345# CONFIG_USB_SERIAL_TI is not set
1208# CONFIG_USB_SERIAL_CYBERJACK is not set 1346# CONFIG_USB_SERIAL_CYBERJACK is not set
1209# CONFIG_USB_SERIAL_XIRCOM is not set 1347# CONFIG_USB_SERIAL_XIRCOM is not set
1348# CONFIG_USB_SERIAL_OPTION is not set
1210# CONFIG_USB_SERIAL_OMNINET is not set 1349# CONFIG_USB_SERIAL_OMNINET is not set
1211CONFIG_USB_EZUSB=y 1350CONFIG_USB_EZUSB=y
1212 1351
@@ -1215,7 +1354,6 @@ CONFIG_USB_EZUSB=y
1215# 1354#
1216# CONFIG_USB_EMI62 is not set 1355# CONFIG_USB_EMI62 is not set
1217# CONFIG_USB_EMI26 is not set 1356# CONFIG_USB_EMI26 is not set
1218# CONFIG_USB_TIGL is not set
1219# CONFIG_USB_AUERSWALD is not set 1357# CONFIG_USB_AUERSWALD is not set
1220# CONFIG_USB_RIO500 is not set 1358# CONFIG_USB_RIO500 is not set
1221# CONFIG_USB_LEGOTOWER is not set 1359# CONFIG_USB_LEGOTOWER is not set
@@ -1224,10 +1362,13 @@ CONFIG_USB_EZUSB=y
1224# CONFIG_USB_CYTHERM is not set 1362# CONFIG_USB_CYTHERM is not set
1225# CONFIG_USB_PHIDGETKIT is not set 1363# CONFIG_USB_PHIDGETKIT is not set
1226# CONFIG_USB_PHIDGETSERVO is not set 1364# CONFIG_USB_PHIDGETSERVO is not set
1365# CONFIG_USB_IDMOUSE is not set
1366# CONFIG_USB_SISUSBVGA is not set
1367# CONFIG_USB_LD is not set
1227# CONFIG_USB_TEST is not set 1368# CONFIG_USB_TEST is not set
1228 1369
1229# 1370#
1230# USB ATM/DSL drivers 1371# USB DSL modem support
1231# 1372#
1232 1373
1233# 1374#
@@ -1236,21 +1377,63 @@ CONFIG_USB_EZUSB=y
1236# CONFIG_USB_GADGET is not set 1377# CONFIG_USB_GADGET is not set
1237 1378
1238# 1379#
1380# MMC/SD Card support
1381#
1382# CONFIG_MMC is not set
1383
1384#
1385# InfiniBand support
1386#
1387# CONFIG_INFINIBAND is not set
1388
1389#
1390# SN Devices
1391#
1392
1393#
1239# File systems 1394# File systems
1240# 1395#
1241CONFIG_EXT2_FS=y 1396CONFIG_EXT2_FS=y
1242# CONFIG_EXT2_FS_XATTR is not set 1397CONFIG_EXT2_FS_XATTR=y
1243# CONFIG_EXT3_FS is not set 1398CONFIG_EXT2_FS_POSIX_ACL=y
1244# CONFIG_JBD is not set 1399CONFIG_EXT2_FS_SECURITY=y
1245# CONFIG_REISERFS_FS is not set 1400# CONFIG_EXT2_FS_XIP is not set
1246# CONFIG_JFS_FS is not set 1401CONFIG_EXT3_FS=y
1247# CONFIG_XFS_FS is not set 1402CONFIG_EXT3_FS_XATTR=y
1403CONFIG_EXT3_FS_POSIX_ACL=y
1404CONFIG_EXT3_FS_SECURITY=y
1405CONFIG_JBD=y
1406# CONFIG_JBD_DEBUG is not set
1407CONFIG_FS_MBCACHE=y
1408CONFIG_REISERFS_FS=y
1409# CONFIG_REISERFS_CHECK is not set
1410# CONFIG_REISERFS_PROC_INFO is not set
1411CONFIG_REISERFS_FS_XATTR=y
1412CONFIG_REISERFS_FS_POSIX_ACL=y
1413CONFIG_REISERFS_FS_SECURITY=y
1414CONFIG_JFS_FS=m
1415CONFIG_JFS_POSIX_ACL=y
1416CONFIG_JFS_SECURITY=y
1417# CONFIG_JFS_DEBUG is not set
1418# CONFIG_JFS_STATISTICS is not set
1419CONFIG_FS_POSIX_ACL=y
1420
1421#
1422# XFS support
1423#
1424CONFIG_XFS_FS=m
1425CONFIG_XFS_EXPORT=y
1426# CONFIG_XFS_RT is not set
1427# CONFIG_XFS_QUOTA is not set
1428CONFIG_XFS_SECURITY=y
1429CONFIG_XFS_POSIX_ACL=y
1248# CONFIG_MINIX_FS is not set 1430# CONFIG_MINIX_FS is not set
1249# CONFIG_ROMFS_FS is not set 1431# CONFIG_ROMFS_FS is not set
1432CONFIG_INOTIFY=y
1250# CONFIG_QUOTA is not set 1433# CONFIG_QUOTA is not set
1251CONFIG_DNOTIFY=y 1434CONFIG_DNOTIFY=y
1252# CONFIG_AUTOFS_FS is not set 1435# CONFIG_AUTOFS_FS is not set
1253# CONFIG_AUTOFS4_FS is not set 1436CONFIG_AUTOFS4_FS=m
1254 1437
1255# 1438#
1256# CD-ROM/DVD Filesystems 1439# CD-ROM/DVD Filesystems
@@ -1258,7 +1441,8 @@ CONFIG_DNOTIFY=y
1258CONFIG_ISO9660_FS=y 1441CONFIG_ISO9660_FS=y
1259# CONFIG_JOLIET is not set 1442# CONFIG_JOLIET is not set
1260# CONFIG_ZISOFS is not set 1443# CONFIG_ZISOFS is not set
1261# CONFIG_UDF_FS is not set 1444CONFIG_UDF_FS=m
1445CONFIG_UDF_NLS=y
1262 1446
1263# 1447#
1264# DOS/FAT/NT Filesystems 1448# DOS/FAT/NT Filesystems
@@ -1276,12 +1460,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1276CONFIG_PROC_FS=y 1460CONFIG_PROC_FS=y
1277CONFIG_PROC_KCORE=y 1461CONFIG_PROC_KCORE=y
1278CONFIG_SYSFS=y 1462CONFIG_SYSFS=y
1279CONFIG_DEVFS_FS=y 1463CONFIG_DEVPTS_FS_XATTR=y
1280# CONFIG_DEVFS_MOUNT is not set 1464CONFIG_DEVPTS_FS_SECURITY=y
1281# CONFIG_DEVFS_DEBUG is not set
1282# CONFIG_DEVPTS_FS_XATTR is not set
1283CONFIG_TMPFS=y 1465CONFIG_TMPFS=y
1284# CONFIG_TMPFS_XATTR is not set 1466CONFIG_TMPFS_XATTR=y
1467CONFIG_TMPFS_SECURITY=y
1285# CONFIG_HUGETLB_PAGE is not set 1468# CONFIG_HUGETLB_PAGE is not set
1286CONFIG_RAMFS=y 1469CONFIG_RAMFS=y
1287 1470
@@ -1295,27 +1478,33 @@ CONFIG_HFSPLUS_FS=m
1295# CONFIG_BEFS_FS is not set 1478# CONFIG_BEFS_FS is not set
1296# CONFIG_BFS_FS is not set 1479# CONFIG_BFS_FS is not set
1297# CONFIG_EFS_FS is not set 1480# CONFIG_EFS_FS is not set
1298# CONFIG_CRAMFS is not set 1481CONFIG_CRAMFS=m
1299# CONFIG_VXFS_FS is not set 1482# CONFIG_VXFS_FS is not set
1300# CONFIG_HPFS_FS is not set 1483# CONFIG_HPFS_FS is not set
1301# CONFIG_QNX4FS_FS is not set 1484# CONFIG_QNX4FS_FS is not set
1302# CONFIG_SYSV_FS is not set 1485# CONFIG_SYSV_FS is not set
1303# CONFIG_UFS_FS is not set 1486CONFIG_UFS_FS=m
1487# CONFIG_UFS_FS_WRITE is not set
1304 1488
1305# 1489#
1306# Network File Systems 1490# Network File Systems
1307# 1491#
1308CONFIG_NFS_FS=y 1492CONFIG_NFS_FS=y
1309CONFIG_NFS_V3=y 1493CONFIG_NFS_V3=y
1494CONFIG_NFS_V3_ACL=y
1310# CONFIG_NFS_V4 is not set 1495# CONFIG_NFS_V4 is not set
1311# CONFIG_NFS_DIRECTIO is not set 1496# CONFIG_NFS_DIRECTIO is not set
1312CONFIG_NFSD=y 1497CONFIG_NFSD=y
1498CONFIG_NFSD_V2_ACL=y
1313CONFIG_NFSD_V3=y 1499CONFIG_NFSD_V3=y
1500CONFIG_NFSD_V3_ACL=y
1314# CONFIG_NFSD_V4 is not set 1501# CONFIG_NFSD_V4 is not set
1315CONFIG_NFSD_TCP=y 1502CONFIG_NFSD_TCP=y
1316CONFIG_LOCKD=y 1503CONFIG_LOCKD=y
1317CONFIG_LOCKD_V4=y 1504CONFIG_LOCKD_V4=y
1318CONFIG_EXPORTFS=y 1505CONFIG_EXPORTFS=y
1506CONFIG_NFS_ACL_SUPPORT=y
1507CONFIG_NFS_COMMON=y
1319CONFIG_SUNRPC=y 1508CONFIG_SUNRPC=y
1320# CONFIG_RPCSEC_GSS_KRB5 is not set 1509# CONFIG_RPCSEC_GSS_KRB5 is not set
1321# CONFIG_RPCSEC_GSS_SPKM3 is not set 1510# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -1348,46 +1537,46 @@ CONFIG_MSDOS_PARTITION=y
1348# 1537#
1349# Native Language Support 1538# Native Language Support
1350# 1539#
1351CONFIG_NLS=y 1540CONFIG_NLS=m
1352CONFIG_NLS_DEFAULT="iso8859-1" 1541CONFIG_NLS_DEFAULT="iso8859-1"
1353# CONFIG_NLS_CODEPAGE_437 is not set 1542CONFIG_NLS_CODEPAGE_437=m
1354# CONFIG_NLS_CODEPAGE_737 is not set 1543CONFIG_NLS_CODEPAGE_737=m
1355# CONFIG_NLS_CODEPAGE_775 is not set 1544CONFIG_NLS_CODEPAGE_775=m
1356# CONFIG_NLS_CODEPAGE_850 is not set 1545CONFIG_NLS_CODEPAGE_850=m
1357# CONFIG_NLS_CODEPAGE_852 is not set 1546CONFIG_NLS_CODEPAGE_852=m
1358# CONFIG_NLS_CODEPAGE_855 is not set 1547CONFIG_NLS_CODEPAGE_855=m
1359# CONFIG_NLS_CODEPAGE_857 is not set 1548CONFIG_NLS_CODEPAGE_857=m
1360# CONFIG_NLS_CODEPAGE_860 is not set 1549CONFIG_NLS_CODEPAGE_860=m
1361# CONFIG_NLS_CODEPAGE_861 is not set 1550CONFIG_NLS_CODEPAGE_861=m
1362# CONFIG_NLS_CODEPAGE_862 is not set 1551CONFIG_NLS_CODEPAGE_862=m
1363# CONFIG_NLS_CODEPAGE_863 is not set 1552CONFIG_NLS_CODEPAGE_863=m
1364# CONFIG_NLS_CODEPAGE_864 is not set 1553CONFIG_NLS_CODEPAGE_864=m
1365# CONFIG_NLS_CODEPAGE_865 is not set 1554CONFIG_NLS_CODEPAGE_865=m
1366# CONFIG_NLS_CODEPAGE_866 is not set 1555CONFIG_NLS_CODEPAGE_866=m
1367# CONFIG_NLS_CODEPAGE_869 is not set 1556CONFIG_NLS_CODEPAGE_869=m
1368# CONFIG_NLS_CODEPAGE_936 is not set 1557CONFIG_NLS_CODEPAGE_936=m
1369# CONFIG_NLS_CODEPAGE_950 is not set 1558CONFIG_NLS_CODEPAGE_950=m
1370# CONFIG_NLS_CODEPAGE_932 is not set 1559CONFIG_NLS_CODEPAGE_932=m
1371# CONFIG_NLS_CODEPAGE_949 is not set 1560CONFIG_NLS_CODEPAGE_949=m
1372# CONFIG_NLS_CODEPAGE_874 is not set 1561CONFIG_NLS_CODEPAGE_874=m
1373# CONFIG_NLS_ISO8859_8 is not set 1562CONFIG_NLS_ISO8859_8=m
1374# CONFIG_NLS_CODEPAGE_1250 is not set 1563CONFIG_NLS_CODEPAGE_1250=m
1375# CONFIG_NLS_CODEPAGE_1251 is not set 1564CONFIG_NLS_CODEPAGE_1251=m
1376# CONFIG_NLS_ASCII is not set 1565CONFIG_NLS_ASCII=m
1377CONFIG_NLS_ISO8859_1=m 1566CONFIG_NLS_ISO8859_1=m
1378# CONFIG_NLS_ISO8859_2 is not set 1567CONFIG_NLS_ISO8859_2=m
1379# CONFIG_NLS_ISO8859_3 is not set 1568CONFIG_NLS_ISO8859_3=m
1380# CONFIG_NLS_ISO8859_4 is not set 1569CONFIG_NLS_ISO8859_4=m
1381# CONFIG_NLS_ISO8859_5 is not set 1570CONFIG_NLS_ISO8859_5=m
1382# CONFIG_NLS_ISO8859_6 is not set 1571CONFIG_NLS_ISO8859_6=m
1383# CONFIG_NLS_ISO8859_7 is not set 1572CONFIG_NLS_ISO8859_7=m
1384# CONFIG_NLS_ISO8859_9 is not set 1573CONFIG_NLS_ISO8859_9=m
1385# CONFIG_NLS_ISO8859_13 is not set 1574CONFIG_NLS_ISO8859_13=m
1386# CONFIG_NLS_ISO8859_14 is not set 1575CONFIG_NLS_ISO8859_14=m
1387# CONFIG_NLS_ISO8859_15 is not set 1576CONFIG_NLS_ISO8859_15=m
1388# CONFIG_NLS_KOI8_R is not set 1577CONFIG_NLS_KOI8_R=m
1389# CONFIG_NLS_KOI8_U is not set 1578CONFIG_NLS_KOI8_U=m
1390# CONFIG_NLS_UTF8 is not set 1579CONFIG_NLS_UTF8=m
1391 1580
1392# 1581#
1393# Library routines 1582# Library routines
@@ -1406,7 +1595,19 @@ CONFIG_ZLIB_DEFLATE=y
1406# 1595#
1407# Kernel hacking 1596# Kernel hacking
1408# 1597#
1409# CONFIG_DEBUG_KERNEL is not set 1598# CONFIG_PRINTK_TIME is not set
1599CONFIG_DEBUG_KERNEL=y
1600CONFIG_MAGIC_SYSRQ=y
1601CONFIG_LOG_BUF_SHIFT=14
1602# CONFIG_SCHEDSTATS is not set
1603# CONFIG_DEBUG_SLAB is not set
1604# CONFIG_DEBUG_SPINLOCK is not set
1605# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1606# CONFIG_DEBUG_KOBJECT is not set
1607# CONFIG_DEBUG_INFO is not set
1608# CONFIG_DEBUG_FS is not set
1609# CONFIG_XMON is not set
1610# CONFIG_BDI_SWITCH is not set
1410CONFIG_BOOTX_TEXT=y 1611CONFIG_BOOTX_TEXT=y
1411 1612
1412# 1613#
@@ -1419,3 +1620,7 @@ CONFIG_BOOTX_TEXT=y
1419# Cryptographic options 1620# Cryptographic options
1420# 1621#
1421# CONFIG_CRYPTO is not set 1622# CONFIG_CRYPTO is not set
1623
1624#
1625# Hardware crypto devices
1626#
diff --git a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig
index 8eebb0455766..a2db8b541c9b 100644
--- a/arch/ppc/configs/pmac_defconfig
+++ b/arch/ppc/configs/pmac_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.11-rc4 3# Linux kernel version: 2.6.13-rc3
4# Sun Feb 13 14:56:58 2005 4# Wed Jul 13 14:13:13 2005
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y 7CONFIG_GENERIC_HARDIRQS=y
@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y 11CONFIG_PPC=y
12CONFIG_PPC32=y 12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y 13CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14 15
15# 16#
16# Code maturity level options 17# Code maturity level options
@@ -18,6 +19,7 @@ CONFIG_GENERIC_NVRAM=y
18CONFIG_EXPERIMENTAL=y 19CONFIG_EXPERIMENTAL=y
19CONFIG_CLEAN_COMPILE=y 20CONFIG_CLEAN_COMPILE=y
20CONFIG_BROKEN_ON_SMP=y 21CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32
21 23
22# 24#
23# General setup 25# General setup
@@ -28,7 +30,7 @@ CONFIG_SYSVIPC=y
28CONFIG_POSIX_MQUEUE=y 30CONFIG_POSIX_MQUEUE=y
29# CONFIG_BSD_PROCESS_ACCT is not set 31# CONFIG_BSD_PROCESS_ACCT is not set
30CONFIG_SYSCTL=y 32CONFIG_SYSCTL=y
31CONFIG_LOG_BUF_SHIFT=16 33# CONFIG_AUDIT is not set
32CONFIG_HOTPLUG=y 34CONFIG_HOTPLUG=y
33CONFIG_KOBJECT_UEVENT=y 35CONFIG_KOBJECT_UEVENT=y
34CONFIG_IKCONFIG=y 36CONFIG_IKCONFIG=y
@@ -37,15 +39,18 @@ CONFIG_IKCONFIG_PROC=y
37CONFIG_KALLSYMS=y 39CONFIG_KALLSYMS=y
38# CONFIG_KALLSYMS_ALL is not set 40# CONFIG_KALLSYMS_ALL is not set
39# CONFIG_KALLSYMS_EXTRA_PASS is not set 41# CONFIG_KALLSYMS_EXTRA_PASS is not set
42CONFIG_PRINTK=y
43CONFIG_BUG=y
44CONFIG_BASE_FULL=y
40CONFIG_FUTEX=y 45CONFIG_FUTEX=y
41CONFIG_EPOLL=y 46CONFIG_EPOLL=y
42# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
43CONFIG_SHMEM=y 47CONFIG_SHMEM=y
44CONFIG_CC_ALIGN_FUNCTIONS=0 48CONFIG_CC_ALIGN_FUNCTIONS=0
45CONFIG_CC_ALIGN_LABELS=0 49CONFIG_CC_ALIGN_LABELS=0
46CONFIG_CC_ALIGN_LOOPS=0 50CONFIG_CC_ALIGN_LOOPS=0
47CONFIG_CC_ALIGN_JUMPS=0 51CONFIG_CC_ALIGN_JUMPS=0
48# CONFIG_TINY_SHMEM is not set 52# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0
49 54
50# 55#
51# Loadable module support 56# Loadable module support
@@ -67,12 +72,16 @@ CONFIG_6xx=y
67# CONFIG_POWER3 is not set 72# CONFIG_POWER3 is not set
68# CONFIG_POWER4 is not set 73# CONFIG_POWER4 is not set
69# CONFIG_8xx is not set 74# CONFIG_8xx is not set
75# CONFIG_E200 is not set
70# CONFIG_E500 is not set 76# CONFIG_E500 is not set
77CONFIG_PPC_FPU=y
71CONFIG_ALTIVEC=y 78CONFIG_ALTIVEC=y
72CONFIG_TAU=y 79CONFIG_TAU=y
73# CONFIG_TAU_INT is not set 80# CONFIG_TAU_INT is not set
74# CONFIG_TAU_AVERAGE is not set 81# CONFIG_TAU_AVERAGE is not set
82# CONFIG_KEXEC is not set
75CONFIG_CPU_FREQ=y 83CONFIG_CPU_FREQ=y
84CONFIG_CPU_FREQ_TABLE=y
76# CONFIG_CPU_FREQ_DEBUG is not set 85# CONFIG_CPU_FREQ_DEBUG is not set
77CONFIG_CPU_FREQ_STAT=m 86CONFIG_CPU_FREQ_STAT=m
78CONFIG_CPU_FREQ_STAT_DETAILS=y 87CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -82,8 +91,8 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
82CONFIG_CPU_FREQ_GOV_POWERSAVE=m 91CONFIG_CPU_FREQ_GOV_POWERSAVE=m
83CONFIG_CPU_FREQ_GOV_USERSPACE=m 92CONFIG_CPU_FREQ_GOV_USERSPACE=m
84CONFIG_CPU_FREQ_GOV_ONDEMAND=m 93CONFIG_CPU_FREQ_GOV_ONDEMAND=m
94CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
85CONFIG_CPU_FREQ_PMAC=y 95CONFIG_CPU_FREQ_PMAC=y
86CONFIG_CPU_FREQ_TABLE=y
87CONFIG_PPC601_SYNC_FIX=y 96CONFIG_PPC601_SYNC_FIX=y
88CONFIG_PM=y 97CONFIG_PM=y
89CONFIG_PPC_STD_MMU=y 98CONFIG_PPC_STD_MMU=y
@@ -100,6 +109,7 @@ CONFIG_PPC_MULTIPLATFORM=y
100# CONFIG_POWERPMC250 is not set 109# CONFIG_POWERPMC250 is not set
101# CONFIG_CHESTNUT is not set 110# CONFIG_CHESTNUT is not set
102# CONFIG_SPRUCE is not set 111# CONFIG_SPRUCE is not set
112# CONFIG_HDPU is not set
103# CONFIG_EV64260 is not set 113# CONFIG_EV64260 is not set
104# CONFIG_LOPEC is not set 114# CONFIG_LOPEC is not set
105# CONFIG_MCPN765 is not set 115# CONFIG_MCPN765 is not set
@@ -108,6 +118,7 @@ CONFIG_PPC_MULTIPLATFORM=y
108# CONFIG_PRPMC750 is not set 118# CONFIG_PRPMC750 is not set
109# CONFIG_PRPMC800 is not set 119# CONFIG_PRPMC800 is not set
110# CONFIG_SANDPOINT is not set 120# CONFIG_SANDPOINT is not set
121# CONFIG_RADSTONE_PPC7D is not set
111# CONFIG_ADIR is not set 122# CONFIG_ADIR is not set
112# CONFIG_K2 is not set 123# CONFIG_K2 is not set
113# CONFIG_PAL4 is not set 124# CONFIG_PAL4 is not set
@@ -120,19 +131,37 @@ CONFIG_PPC_MULTIPLATFORM=y
120# CONFIG_ADS8272 is not set 131# CONFIG_ADS8272 is not set
121# CONFIG_PQ2FADS is not set 132# CONFIG_PQ2FADS is not set
122# CONFIG_LITE5200 is not set 133# CONFIG_LITE5200 is not set
134# CONFIG_MPC834x_SYS is not set
123CONFIG_PPC_CHRP=y 135CONFIG_PPC_CHRP=y
124CONFIG_PPC_PMAC=y 136CONFIG_PPC_PMAC=y
125CONFIG_PPC_PREP=y 137CONFIG_PPC_PREP=y
126CONFIG_PPC_OF=y 138CONFIG_PPC_OF=y
127CONFIG_PPCBUG_NVRAM=y 139CONFIG_PPCBUG_NVRAM=y
128# CONFIG_SMP is not set 140# CONFIG_SMP is not set
129# CONFIG_PREEMPT is not set
130# CONFIG_HIGHMEM is not set 141# CONFIG_HIGHMEM is not set
142# CONFIG_HZ_100 is not set
143CONFIG_HZ_250=y
144# CONFIG_HZ_1000 is not set
145CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set
149CONFIG_SELECT_MEMORY_MODEL=y
150CONFIG_FLATMEM_MANUAL=y
151# CONFIG_DISCONTIGMEM_MANUAL is not set
152# CONFIG_SPARSEMEM_MANUAL is not set
153CONFIG_FLATMEM=y
154CONFIG_FLAT_NODE_MEM_MAP=y
131CONFIG_BINFMT_ELF=y 155CONFIG_BINFMT_ELF=y
132CONFIG_BINFMT_MISC=m 156CONFIG_BINFMT_MISC=m
133CONFIG_PROC_DEVICETREE=y 157CONFIG_PROC_DEVICETREE=y
134# CONFIG_PREP_RESIDUAL is not set 158# CONFIG_PREP_RESIDUAL is not set
135# CONFIG_CMDLINE_BOOL is not set 159# CONFIG_CMDLINE_BOOL is not set
160# CONFIG_PM_DEBUG is not set
161CONFIG_SOFTWARE_SUSPEND=y
162CONFIG_PM_STD_PARTITION=""
163# CONFIG_SECCOMP is not set
164CONFIG_ISA_DMA_API=y
136 165
137# 166#
138# Bus options 167# Bus options
@@ -143,6 +172,7 @@ CONFIG_PCI=y
143CONFIG_PCI_DOMAINS=y 172CONFIG_PCI_DOMAINS=y
144CONFIG_PCI_LEGACY_PROC=y 173CONFIG_PCI_LEGACY_PROC=y
145CONFIG_PCI_NAMES=y 174CONFIG_PCI_NAMES=y
175# CONFIG_PCI_DEBUG is not set
146 176
147# 177#
148# PCCARD (PCMCIA/CardBus) support 178# PCCARD (PCMCIA/CardBus) support
@@ -150,6 +180,8 @@ CONFIG_PCI_NAMES=y
150CONFIG_PCCARD=m 180CONFIG_PCCARD=m
151# CONFIG_PCMCIA_DEBUG is not set 181# CONFIG_PCMCIA_DEBUG is not set
152CONFIG_PCMCIA=m 182CONFIG_PCMCIA=m
183# CONFIG_PCMCIA_LOAD_CIS is not set
184# CONFIG_PCMCIA_IOCTL is not set
153CONFIG_CARDBUS=y 185CONFIG_CARDBUS=y
154 186
155# 187#
@@ -175,6 +207,194 @@ CONFIG_TASK_SIZE=0xc0000000
175CONFIG_BOOT_LOAD=0x00800000 207CONFIG_BOOT_LOAD=0x00800000
176 208
177# 209#
210# Networking
211#
212CONFIG_NET=y
213
214#
215# Networking options
216#
217CONFIG_PACKET=y
218# CONFIG_PACKET_MMAP is not set
219CONFIG_UNIX=y
220# CONFIG_NET_KEY is not set
221CONFIG_INET=y
222CONFIG_IP_MULTICAST=y
223# CONFIG_IP_ADVANCED_ROUTER is not set
224CONFIG_IP_FIB_HASH=y
225# CONFIG_IP_PNP is not set
226# CONFIG_NET_IPIP is not set
227# CONFIG_NET_IPGRE is not set
228# CONFIG_IP_MROUTE is not set
229# CONFIG_ARPD is not set
230CONFIG_SYN_COOKIES=y
231# CONFIG_INET_AH is not set
232# CONFIG_INET_ESP is not set
233# CONFIG_INET_IPCOMP is not set
234# CONFIG_INET_TUNNEL is not set
235CONFIG_IP_TCPDIAG=y
236# CONFIG_IP_TCPDIAG_IPV6 is not set
237# CONFIG_TCP_CONG_ADVANCED is not set
238CONFIG_TCP_CONG_BIC=y
239
240#
241# IP: Virtual Server Configuration
242#
243# CONFIG_IP_VS is not set
244# CONFIG_IPV6 is not set
245CONFIG_NETFILTER=y
246# CONFIG_NETFILTER_DEBUG is not set
247
248#
249# IP: Netfilter Configuration
250#
251CONFIG_IP_NF_CONNTRACK=m
252CONFIG_IP_NF_CT_ACCT=y
253CONFIG_IP_NF_CONNTRACK_MARK=y
254CONFIG_IP_NF_CT_PROTO_SCTP=m
255CONFIG_IP_NF_FTP=m
256CONFIG_IP_NF_IRC=m
257CONFIG_IP_NF_TFTP=m
258CONFIG_IP_NF_AMANDA=m
259CONFIG_IP_NF_QUEUE=m
260CONFIG_IP_NF_IPTABLES=m
261CONFIG_IP_NF_MATCH_LIMIT=m
262CONFIG_IP_NF_MATCH_IPRANGE=m
263CONFIG_IP_NF_MATCH_MAC=m
264CONFIG_IP_NF_MATCH_PKTTYPE=m
265CONFIG_IP_NF_MATCH_MARK=m
266CONFIG_IP_NF_MATCH_MULTIPORT=m
267CONFIG_IP_NF_MATCH_TOS=m
268CONFIG_IP_NF_MATCH_RECENT=m
269CONFIG_IP_NF_MATCH_ECN=m
270CONFIG_IP_NF_MATCH_DSCP=m
271CONFIG_IP_NF_MATCH_AH_ESP=m
272CONFIG_IP_NF_MATCH_LENGTH=m
273CONFIG_IP_NF_MATCH_TTL=m
274CONFIG_IP_NF_MATCH_TCPMSS=m
275CONFIG_IP_NF_MATCH_HELPER=m
276CONFIG_IP_NF_MATCH_STATE=m
277CONFIG_IP_NF_MATCH_CONNTRACK=m
278CONFIG_IP_NF_MATCH_OWNER=m
279CONFIG_IP_NF_MATCH_ADDRTYPE=m
280CONFIG_IP_NF_MATCH_REALM=m
281CONFIG_IP_NF_MATCH_SCTP=m
282CONFIG_IP_NF_MATCH_COMMENT=m
283CONFIG_IP_NF_MATCH_CONNMARK=m
284CONFIG_IP_NF_MATCH_HASHLIMIT=m
285CONFIG_IP_NF_FILTER=m
286CONFIG_IP_NF_TARGET_REJECT=m
287CONFIG_IP_NF_TARGET_LOG=m
288CONFIG_IP_NF_TARGET_ULOG=m
289CONFIG_IP_NF_TARGET_TCPMSS=m
290CONFIG_IP_NF_NAT=m
291CONFIG_IP_NF_NAT_NEEDED=y
292CONFIG_IP_NF_TARGET_MASQUERADE=m
293CONFIG_IP_NF_TARGET_REDIRECT=m
294CONFIG_IP_NF_TARGET_NETMAP=m
295CONFIG_IP_NF_TARGET_SAME=m
296CONFIG_IP_NF_NAT_SNMP_BASIC=m
297CONFIG_IP_NF_NAT_IRC=m
298CONFIG_IP_NF_NAT_FTP=m
299CONFIG_IP_NF_NAT_TFTP=m
300CONFIG_IP_NF_NAT_AMANDA=m
301CONFIG_IP_NF_MANGLE=m
302CONFIG_IP_NF_TARGET_TOS=m
303CONFIG_IP_NF_TARGET_ECN=m
304CONFIG_IP_NF_TARGET_DSCP=m
305CONFIG_IP_NF_TARGET_MARK=m
306CONFIG_IP_NF_TARGET_CLASSIFY=m
307CONFIG_IP_NF_TARGET_CONNMARK=m
308CONFIG_IP_NF_TARGET_CLUSTERIP=m
309CONFIG_IP_NF_RAW=m
310CONFIG_IP_NF_TARGET_NOTRACK=m
311CONFIG_IP_NF_ARPTABLES=m
312CONFIG_IP_NF_ARPFILTER=m
313CONFIG_IP_NF_ARP_MANGLE=m
314
315#
316# SCTP Configuration (EXPERIMENTAL)
317#
318# CONFIG_IP_SCTP is not set
319# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set
321# CONFIG_VLAN_8021Q is not set
322# CONFIG_DECNET is not set
323# CONFIG_LLC2 is not set
324# CONFIG_IPX is not set
325# CONFIG_ATALK is not set
326# CONFIG_X25 is not set
327# CONFIG_LAPB is not set
328# CONFIG_NET_DIVERT is not set
329# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set
331# CONFIG_NET_SCHED is not set
332CONFIG_NET_CLS_ROUTE=y
333
334#
335# Network testing
336#
337# CONFIG_NET_PKTGEN is not set
338CONFIG_NETPOLL=y
339# CONFIG_NETPOLL_RX is not set
340# CONFIG_NETPOLL_TRAP is not set
341CONFIG_NET_POLL_CONTROLLER=y
342# CONFIG_HAMRADIO is not set
343CONFIG_IRDA=m
344
345#
346# IrDA protocols
347#
348CONFIG_IRLAN=m
349CONFIG_IRNET=m
350CONFIG_IRCOMM=m
351# CONFIG_IRDA_ULTRA is not set
352
353#
354# IrDA options
355#
356CONFIG_IRDA_CACHE_LAST_LSAP=y
357CONFIG_IRDA_FAST_RR=y
358# CONFIG_IRDA_DEBUG is not set
359
360#
361# Infrared-port device drivers
362#
363
364#
365# SIR device drivers
366#
367CONFIG_IRTTY_SIR=m
368
369#
370# Dongle support
371#
372# CONFIG_DONGLE is not set
373
374#
375# Old SIR device drivers
376#
377# CONFIG_IRPORT_SIR is not set
378
379#
380# Old Serial dongle support
381#
382
383#
384# FIR device drivers
385#
386# CONFIG_USB_IRDA is not set
387# CONFIG_SIGMATEL_FIR is not set
388# CONFIG_NSC_FIR is not set
389# CONFIG_WINBOND_FIR is not set
390# CONFIG_TOSHIBA_FIR is not set
391# CONFIG_SMC_IRCC_FIR is not set
392# CONFIG_ALI_FIR is not set
393# CONFIG_VLSI_FIR is not set
394# CONFIG_VIA_FIR is not set
395# CONFIG_BT is not set
396
397#
178# Device Drivers 398# Device Drivers
179# 399#
180 400
@@ -183,7 +403,7 @@ CONFIG_BOOT_LOAD=0x00800000
183# 403#
184# CONFIG_STANDALONE is not set 404# CONFIG_STANDALONE is not set
185CONFIG_PREVENT_FIRMWARE_BUILD=y 405CONFIG_PREVENT_FIRMWARE_BUILD=y
186# CONFIG_FW_LOADER is not set 406CONFIG_FW_LOADER=m
187# CONFIG_DEBUG_DRIVER is not set 407# CONFIG_DEBUG_DRIVER is not set
188 408
189# 409#
@@ -279,6 +499,7 @@ CONFIG_BLK_DEV_CMD64X=y
279# CONFIG_BLK_DEV_HPT366 is not set 499# CONFIG_BLK_DEV_HPT366 is not set
280# CONFIG_BLK_DEV_SC1200 is not set 500# CONFIG_BLK_DEV_SC1200 is not set
281# CONFIG_BLK_DEV_PIIX is not set 501# CONFIG_BLK_DEV_PIIX is not set
502# CONFIG_BLK_DEV_IT821X is not set
282# CONFIG_BLK_DEV_NS87415 is not set 503# CONFIG_BLK_DEV_NS87415 is not set
283# CONFIG_BLK_DEV_PDC202XX_OLD is not set 504# CONFIG_BLK_DEV_PDC202XX_OLD is not set
284CONFIG_BLK_DEV_PDC202XX_NEW=y 505CONFIG_BLK_DEV_PDC202XX_NEW=y
@@ -313,6 +534,7 @@ CONFIG_CHR_DEV_ST=y
313CONFIG_BLK_DEV_SR=y 534CONFIG_BLK_DEV_SR=y
314CONFIG_BLK_DEV_SR_VENDOR=y 535CONFIG_BLK_DEV_SR_VENDOR=y
315CONFIG_CHR_DEV_SG=y 536CONFIG_CHR_DEV_SG=y
537# CONFIG_CHR_DEV_SCH is not set
316 538
317# 539#
318# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 540# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -350,7 +572,6 @@ CONFIG_SCSI_AIC7XXX_OLD=m
350# CONFIG_SCSI_BUSLOGIC is not set 572# CONFIG_SCSI_BUSLOGIC is not set
351# CONFIG_SCSI_DMX3191D is not set 573# CONFIG_SCSI_DMX3191D is not set
352# CONFIG_SCSI_EATA is not set 574# CONFIG_SCSI_EATA is not set
353# CONFIG_SCSI_EATA_PIO is not set
354# CONFIG_SCSI_FUTURE_DOMAIN is not set 575# CONFIG_SCSI_FUTURE_DOMAIN is not set
355# CONFIG_SCSI_GDTH is not set 576# CONFIG_SCSI_GDTH is not set
356# CONFIG_SCSI_IPS is not set 577# CONFIG_SCSI_IPS is not set
@@ -362,7 +583,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
362CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 583CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
363# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 584# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
364# CONFIG_SCSI_IPR is not set 585# CONFIG_SCSI_IPR is not set
365# CONFIG_SCSI_QLOGIC_ISP is not set
366# CONFIG_SCSI_QLOGIC_FC is not set 586# CONFIG_SCSI_QLOGIC_FC is not set
367# CONFIG_SCSI_QLOGIC_1280 is not set 587# CONFIG_SCSI_QLOGIC_1280 is not set
368CONFIG_SCSI_QLA2XXX=y 588CONFIG_SCSI_QLA2XXX=y
@@ -371,6 +591,7 @@ CONFIG_SCSI_QLA2XXX=y
371# CONFIG_SCSI_QLA2300 is not set 591# CONFIG_SCSI_QLA2300 is not set
372# CONFIG_SCSI_QLA2322 is not set 592# CONFIG_SCSI_QLA2322 is not set
373# CONFIG_SCSI_QLA6312 is not set 593# CONFIG_SCSI_QLA6312 is not set
594# CONFIG_SCSI_LPFC is not set
374# CONFIG_SCSI_DC395x is not set 595# CONFIG_SCSI_DC395x is not set
375# CONFIG_SCSI_DC390T is not set 596# CONFIG_SCSI_DC390T is not set
376# CONFIG_SCSI_NSP32 is not set 597# CONFIG_SCSI_NSP32 is not set
@@ -398,6 +619,8 @@ CONFIG_SCSI_MAC53C94=y
398# Fusion MPT device support 619# Fusion MPT device support
399# 620#
400# CONFIG_FUSION is not set 621# CONFIG_FUSION is not set
622# CONFIG_FUSION_SPI is not set
623# CONFIG_FUSION_FC is not set
401 624
402# 625#
403# IEEE 1394 (FireWire) support 626# IEEE 1394 (FireWire) support
@@ -411,6 +634,7 @@ CONFIG_IEEE1394=m
411# CONFIG_IEEE1394_OUI_DB is not set 634# CONFIG_IEEE1394_OUI_DB is not set
412CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y 635CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
413CONFIG_IEEE1394_CONFIG_ROM_IP1394=y 636CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
637# CONFIG_IEEE1394_EXPORT_FULL_API is not set
414 638
415# 639#
416# Device Drivers 640# Device Drivers
@@ -441,8 +665,8 @@ CONFIG_IEEE1394_AMDTP=m
441CONFIG_ADB=y 665CONFIG_ADB=y
442CONFIG_ADB_CUDA=y 666CONFIG_ADB_CUDA=y
443CONFIG_ADB_PMU=y 667CONFIG_ADB_PMU=y
444CONFIG_PMAC_PBOOK=y
445CONFIG_PMAC_APM_EMU=y 668CONFIG_PMAC_APM_EMU=y
669CONFIG_PMAC_MEDIABAY=y
446CONFIG_PMAC_BACKLIGHT=y 670CONFIG_PMAC_BACKLIGHT=y
447CONFIG_ADB_MACIO=y 671CONFIG_ADB_MACIO=y
448CONFIG_INPUT_ADBHID=y 672CONFIG_INPUT_ADBHID=y
@@ -452,192 +676,13 @@ CONFIG_THERM_ADT746X=m
452# CONFIG_ANSLCD is not set 676# CONFIG_ANSLCD is not set
453 677
454# 678#
455# Networking support 679# Network device support
456#
457CONFIG_NET=y
458
459#
460# Networking options
461#
462CONFIG_PACKET=y
463# CONFIG_PACKET_MMAP is not set
464# CONFIG_NETLINK_DEV is not set
465CONFIG_UNIX=y
466# CONFIG_NET_KEY is not set
467CONFIG_INET=y
468CONFIG_IP_MULTICAST=y
469# CONFIG_IP_ADVANCED_ROUTER is not set
470# CONFIG_IP_PNP is not set
471# CONFIG_NET_IPIP is not set
472# CONFIG_NET_IPGRE is not set
473# CONFIG_IP_MROUTE is not set
474# CONFIG_ARPD is not set
475CONFIG_SYN_COOKIES=y
476# CONFIG_INET_AH is not set
477# CONFIG_INET_ESP is not set
478# CONFIG_INET_IPCOMP is not set
479# CONFIG_INET_TUNNEL is not set
480CONFIG_IP_TCPDIAG=y
481# CONFIG_IP_TCPDIAG_IPV6 is not set
482
483#
484# IP: Virtual Server Configuration
485#
486# CONFIG_IP_VS is not set
487# CONFIG_IPV6 is not set
488CONFIG_NETFILTER=y
489# CONFIG_NETFILTER_DEBUG is not set
490
491#
492# IP: Netfilter Configuration
493#
494CONFIG_IP_NF_CONNTRACK=m
495CONFIG_IP_NF_CT_ACCT=y
496CONFIG_IP_NF_CONNTRACK_MARK=y
497CONFIG_IP_NF_CT_PROTO_SCTP=m
498CONFIG_IP_NF_FTP=m
499CONFIG_IP_NF_IRC=m
500CONFIG_IP_NF_TFTP=m
501CONFIG_IP_NF_AMANDA=m
502CONFIG_IP_NF_QUEUE=m
503CONFIG_IP_NF_IPTABLES=m
504CONFIG_IP_NF_MATCH_LIMIT=m
505CONFIG_IP_NF_MATCH_IPRANGE=m
506CONFIG_IP_NF_MATCH_MAC=m
507CONFIG_IP_NF_MATCH_PKTTYPE=m
508CONFIG_IP_NF_MATCH_MARK=m
509CONFIG_IP_NF_MATCH_MULTIPORT=m
510CONFIG_IP_NF_MATCH_TOS=m
511CONFIG_IP_NF_MATCH_RECENT=m
512CONFIG_IP_NF_MATCH_ECN=m
513CONFIG_IP_NF_MATCH_DSCP=m
514CONFIG_IP_NF_MATCH_AH_ESP=m
515CONFIG_IP_NF_MATCH_LENGTH=m
516CONFIG_IP_NF_MATCH_TTL=m
517CONFIG_IP_NF_MATCH_TCPMSS=m
518CONFIG_IP_NF_MATCH_HELPER=m
519CONFIG_IP_NF_MATCH_STATE=m
520CONFIG_IP_NF_MATCH_CONNTRACK=m
521CONFIG_IP_NF_MATCH_OWNER=m
522CONFIG_IP_NF_MATCH_ADDRTYPE=m
523CONFIG_IP_NF_MATCH_REALM=m
524CONFIG_IP_NF_MATCH_SCTP=m
525CONFIG_IP_NF_MATCH_COMMENT=m
526CONFIG_IP_NF_MATCH_CONNMARK=m
527CONFIG_IP_NF_MATCH_HASHLIMIT=m
528CONFIG_IP_NF_FILTER=m
529CONFIG_IP_NF_TARGET_REJECT=m
530CONFIG_IP_NF_TARGET_LOG=m
531CONFIG_IP_NF_TARGET_ULOG=m
532CONFIG_IP_NF_TARGET_TCPMSS=m
533CONFIG_IP_NF_NAT=m
534CONFIG_IP_NF_NAT_NEEDED=y
535CONFIG_IP_NF_TARGET_MASQUERADE=m
536CONFIG_IP_NF_TARGET_REDIRECT=m
537CONFIG_IP_NF_TARGET_NETMAP=m
538CONFIG_IP_NF_TARGET_SAME=m
539CONFIG_IP_NF_NAT_SNMP_BASIC=m
540CONFIG_IP_NF_NAT_IRC=m
541CONFIG_IP_NF_NAT_FTP=m
542CONFIG_IP_NF_NAT_TFTP=m
543CONFIG_IP_NF_NAT_AMANDA=m
544CONFIG_IP_NF_MANGLE=m
545CONFIG_IP_NF_TARGET_TOS=m
546CONFIG_IP_NF_TARGET_ECN=m
547CONFIG_IP_NF_TARGET_DSCP=m
548CONFIG_IP_NF_TARGET_MARK=m
549CONFIG_IP_NF_TARGET_CLASSIFY=m
550CONFIG_IP_NF_TARGET_CONNMARK=m
551CONFIG_IP_NF_TARGET_CLUSTERIP=m
552CONFIG_IP_NF_RAW=m
553CONFIG_IP_NF_TARGET_NOTRACK=m
554CONFIG_IP_NF_ARPTABLES=m
555CONFIG_IP_NF_ARPFILTER=m
556CONFIG_IP_NF_ARP_MANGLE=m
557
558#
559# SCTP Configuration (EXPERIMENTAL)
560#
561# CONFIG_IP_SCTP is not set
562# CONFIG_ATM is not set
563# CONFIG_BRIDGE is not set
564# CONFIG_VLAN_8021Q is not set
565# CONFIG_DECNET is not set
566# CONFIG_LLC2 is not set
567# CONFIG_IPX is not set
568# CONFIG_ATALK is not set
569# CONFIG_X25 is not set
570# CONFIG_LAPB is not set
571# CONFIG_NET_DIVERT is not set
572# CONFIG_ECONET is not set
573# CONFIG_WAN_ROUTER is not set
574
575#
576# QoS and/or fair queueing
577#
578# CONFIG_NET_SCHED is not set
579CONFIG_NET_CLS_ROUTE=y
580
581#
582# Network testing
583#
584# CONFIG_NET_PKTGEN is not set
585# CONFIG_NETPOLL is not set
586# CONFIG_NET_POLL_CONTROLLER is not set
587# CONFIG_HAMRADIO is not set
588CONFIG_IRDA=m
589
590#
591# IrDA protocols
592#
593CONFIG_IRLAN=m
594CONFIG_IRNET=m
595CONFIG_IRCOMM=m
596# CONFIG_IRDA_ULTRA is not set
597
598#
599# IrDA options
600#
601CONFIG_IRDA_CACHE_LAST_LSAP=y
602CONFIG_IRDA_FAST_RR=y
603# CONFIG_IRDA_DEBUG is not set
604
605#
606# Infrared-port device drivers
607#
608
609#
610# SIR device drivers
611#
612CONFIG_IRTTY_SIR=m
613
614#
615# Dongle support
616#
617# CONFIG_DONGLE is not set
618
619#
620# Old SIR device drivers
621#
622# CONFIG_IRPORT_SIR is not set
623
624#
625# Old Serial dongle support
626#
627
628#
629# FIR device drivers
630# 680#
631# CONFIG_USB_IRDA is not set
632# CONFIG_SIGMATEL_FIR is not set
633# CONFIG_TOSHIBA_FIR is not set
634# CONFIG_VLSI_FIR is not set
635# CONFIG_BT is not set
636CONFIG_NETDEVICES=y 681CONFIG_NETDEVICES=y
637# CONFIG_DUMMY is not set 682# CONFIG_DUMMY is not set
638# CONFIG_BONDING is not set 683# CONFIG_BONDING is not set
639# CONFIG_EQUALIZER is not set 684# CONFIG_EQUALIZER is not set
640# CONFIG_TUN is not set 685CONFIG_TUN=m
641 686
642# 687#
643# ARCnet devices 688# ARCnet devices
@@ -691,9 +736,12 @@ CONFIG_PCNET32=y
691# CONFIG_HAMACHI is not set 736# CONFIG_HAMACHI is not set
692# CONFIG_YELLOWFIN is not set 737# CONFIG_YELLOWFIN is not set
693# CONFIG_R8169 is not set 738# CONFIG_R8169 is not set
739# CONFIG_SKGE is not set
694# CONFIG_SK98LIN is not set 740# CONFIG_SK98LIN is not set
695# CONFIG_VIA_VELOCITY is not set 741# CONFIG_VIA_VELOCITY is not set
696# CONFIG_TIGON3 is not set 742# CONFIG_TIGON3 is not set
743# CONFIG_BNX2 is not set
744# CONFIG_MV643XX_ETH is not set
697 745
698# 746#
699# Ethernet (10000 Mbit) 747# Ethernet (10000 Mbit)
@@ -768,7 +816,7 @@ CONFIG_PPPOE=m
768# CONFIG_SLIP is not set 816# CONFIG_SLIP is not set
769# CONFIG_NET_FC is not set 817# CONFIG_NET_FC is not set
770# CONFIG_SHAPER is not set 818# CONFIG_SHAPER is not set
771# CONFIG_NETCONSOLE is not set 819CONFIG_NETCONSOLE=m
772 820
773# 821#
774# ISDN subsystem 822# ISDN subsystem
@@ -798,14 +846,6 @@ CONFIG_INPUT_EVDEV=y
798# CONFIG_INPUT_EVBUG is not set 846# CONFIG_INPUT_EVBUG is not set
799 847
800# 848#
801# Input I/O drivers
802#
803# CONFIG_GAMEPORT is not set
804CONFIG_SOUND_GAMEPORT=y
805# CONFIG_SERIO is not set
806# CONFIG_SERIO_I8042 is not set
807
808#
809# Input Device Drivers 849# Input Device Drivers
810# 850#
811CONFIG_INPUT_KEYBOARD=y 851CONFIG_INPUT_KEYBOARD=y
@@ -823,6 +863,12 @@ CONFIG_INPUT_MOUSE=y
823# CONFIG_INPUT_MISC is not set 863# CONFIG_INPUT_MISC is not set
824 864
825# 865#
866# Hardware I/O ports
867#
868# CONFIG_SERIO is not set
869# CONFIG_GAMEPORT is not set
870
871#
826# Character devices 872# Character devices
827# 873#
828CONFIG_VT=y 874CONFIG_VT=y
@@ -845,6 +891,7 @@ CONFIG_SERIAL_CORE=y
845CONFIG_SERIAL_CORE_CONSOLE=y 891CONFIG_SERIAL_CORE_CONSOLE=y
846CONFIG_SERIAL_PMACZILOG=y 892CONFIG_SERIAL_PMACZILOG=y
847CONFIG_SERIAL_PMACZILOG_CONSOLE=y 893CONFIG_SERIAL_PMACZILOG_CONSOLE=y
894# CONFIG_SERIAL_JSM is not set
848CONFIG_UNIX98_PTYS=y 895CONFIG_UNIX98_PTYS=y
849CONFIG_LEGACY_PTYS=y 896CONFIG_LEGACY_PTYS=y
850CONFIG_LEGACY_PTY_COUNT=256 897CONFIG_LEGACY_PTY_COUNT=256
@@ -876,6 +923,7 @@ CONFIG_DRM_R128=m
876CONFIG_DRM_RADEON=m 923CONFIG_DRM_RADEON=m
877# CONFIG_DRM_MGA is not set 924# CONFIG_DRM_MGA is not set
878# CONFIG_DRM_SIS is not set 925# CONFIG_DRM_SIS is not set
926# CONFIG_DRM_VIA is not set
879 927
880# 928#
881# PCMCIA character devices 929# PCMCIA character devices
@@ -884,6 +932,11 @@ CONFIG_DRM_RADEON=m
884# CONFIG_RAW_DRIVER is not set 932# CONFIG_RAW_DRIVER is not set
885 933
886# 934#
935# TPM devices
936#
937# CONFIG_TCG_TPM is not set
938
939#
887# I2C support 940# I2C support
888# 941#
889CONFIG_I2C=y 942CONFIG_I2C=y
@@ -907,12 +960,12 @@ CONFIG_I2C_ALGOBIT=y
907# CONFIG_I2C_HYDRA is not set 960# CONFIG_I2C_HYDRA is not set
908# CONFIG_I2C_I801 is not set 961# CONFIG_I2C_I801 is not set
909# CONFIG_I2C_I810 is not set 962# CONFIG_I2C_I810 is not set
963# CONFIG_I2C_PIIX4 is not set
910# CONFIG_I2C_ISA is not set 964# CONFIG_I2C_ISA is not set
911CONFIG_I2C_KEYWEST=m 965CONFIG_I2C_KEYWEST=m
912# CONFIG_I2C_MPC is not set 966# CONFIG_I2C_MPC is not set
913# CONFIG_I2C_NFORCE2 is not set 967# CONFIG_I2C_NFORCE2 is not set
914# CONFIG_I2C_PARPORT_LIGHT is not set 968# CONFIG_I2C_PARPORT_LIGHT is not set
915# CONFIG_I2C_PIIX4 is not set
916# CONFIG_I2C_PROSAVAGE is not set 969# CONFIG_I2C_PROSAVAGE is not set
917# CONFIG_I2C_SAVAGE4 is not set 970# CONFIG_I2C_SAVAGE4 is not set
918# CONFIG_SCx200_ACB is not set 971# CONFIG_SCx200_ACB is not set
@@ -924,45 +977,20 @@ CONFIG_I2C_KEYWEST=m
924# CONFIG_I2C_VIAPRO is not set 977# CONFIG_I2C_VIAPRO is not set
925# CONFIG_I2C_VOODOO3 is not set 978# CONFIG_I2C_VOODOO3 is not set
926# CONFIG_I2C_PCA_ISA is not set 979# CONFIG_I2C_PCA_ISA is not set
980# CONFIG_I2C_SENSOR is not set
927 981
928# 982#
929# Hardware Sensors Chip support 983# Miscellaneous I2C Chip support
930#
931# CONFIG_I2C_SENSOR is not set
932# CONFIG_SENSORS_ADM1021 is not set
933# CONFIG_SENSORS_ADM1025 is not set
934# CONFIG_SENSORS_ADM1026 is not set
935# CONFIG_SENSORS_ADM1031 is not set
936# CONFIG_SENSORS_ASB100 is not set
937# CONFIG_SENSORS_DS1621 is not set
938# CONFIG_SENSORS_FSCHER is not set
939# CONFIG_SENSORS_GL518SM is not set
940# CONFIG_SENSORS_IT87 is not set
941# CONFIG_SENSORS_LM63 is not set
942# CONFIG_SENSORS_LM75 is not set
943# CONFIG_SENSORS_LM77 is not set
944# CONFIG_SENSORS_LM78 is not set
945# CONFIG_SENSORS_LM80 is not set
946# CONFIG_SENSORS_LM83 is not set
947# CONFIG_SENSORS_LM85 is not set
948# CONFIG_SENSORS_LM87 is not set
949# CONFIG_SENSORS_LM90 is not set
950# CONFIG_SENSORS_MAX1619 is not set
951# CONFIG_SENSORS_PC87360 is not set
952# CONFIG_SENSORS_SMSC47B397 is not set
953# CONFIG_SENSORS_SMSC47M1 is not set
954# CONFIG_SENSORS_VIA686A is not set
955# CONFIG_SENSORS_W83781D is not set
956# CONFIG_SENSORS_W83L785TS is not set
957# CONFIG_SENSORS_W83627HF is not set
958
959#
960# Other I2C Chip support
961# 984#
985# CONFIG_SENSORS_DS1337 is not set
986# CONFIG_SENSORS_DS1374 is not set
962# CONFIG_SENSORS_EEPROM is not set 987# CONFIG_SENSORS_EEPROM is not set
963# CONFIG_SENSORS_PCF8574 is not set 988# CONFIG_SENSORS_PCF8574 is not set
989# CONFIG_SENSORS_PCA9539 is not set
964# CONFIG_SENSORS_PCF8591 is not set 990# CONFIG_SENSORS_PCF8591 is not set
965# CONFIG_SENSORS_RTC8564 is not set 991# CONFIG_SENSORS_RTC8564 is not set
992# CONFIG_SENSORS_M41T00 is not set
993# CONFIG_SENSORS_MAX6875 is not set
966# CONFIG_I2C_DEBUG_CORE is not set 994# CONFIG_I2C_DEBUG_CORE is not set
967# CONFIG_I2C_DEBUG_ALGO is not set 995# CONFIG_I2C_DEBUG_ALGO is not set
968# CONFIG_I2C_DEBUG_BUS is not set 996# CONFIG_I2C_DEBUG_BUS is not set
@@ -974,6 +1002,11 @@ CONFIG_I2C_KEYWEST=m
974# CONFIG_W1 is not set 1002# CONFIG_W1 is not set
975 1003
976# 1004#
1005# Hardware Monitoring support
1006#
1007# CONFIG_HWMON is not set
1008
1009#
977# Misc devices 1010# Misc devices
978# 1011#
979 1012
@@ -991,6 +1024,11 @@ CONFIG_I2C_KEYWEST=m
991# Graphics support 1024# Graphics support
992# 1025#
993CONFIG_FB=y 1026CONFIG_FB=y
1027CONFIG_FB_CFB_FILLRECT=y
1028CONFIG_FB_CFB_COPYAREA=y
1029CONFIG_FB_CFB_IMAGEBLIT=y
1030CONFIG_FB_SOFT_CURSOR=y
1031CONFIG_FB_MACMODES=y
994CONFIG_FB_MODE_HELPERS=y 1032CONFIG_FB_MODE_HELPERS=y
995CONFIG_FB_TILEBLITTING=y 1033CONFIG_FB_TILEBLITTING=y
996# CONFIG_FB_CIRRUS is not set 1034# CONFIG_FB_CIRRUS is not set
@@ -1004,6 +1042,7 @@ CONFIG_FB_CT65550=y
1004# CONFIG_FB_ASILIANT is not set 1042# CONFIG_FB_ASILIANT is not set
1005CONFIG_FB_IMSTT=y 1043CONFIG_FB_IMSTT=y
1006# CONFIG_FB_VGA16 is not set 1044# CONFIG_FB_VGA16 is not set
1045# CONFIG_FB_NVIDIA is not set
1007# CONFIG_FB_RIVA is not set 1046# CONFIG_FB_RIVA is not set
1008CONFIG_FB_MATROX=y 1047CONFIG_FB_MATROX=y
1009CONFIG_FB_MATROX_MILLENIUM=y 1048CONFIG_FB_MATROX_MILLENIUM=y
@@ -1029,6 +1068,7 @@ CONFIG_FB_3DFX=y
1029CONFIG_FB_3DFX_ACCEL=y 1068CONFIG_FB_3DFX_ACCEL=y
1030# CONFIG_FB_VOODOO1 is not set 1069# CONFIG_FB_VOODOO1 is not set
1031# CONFIG_FB_TRIDENT is not set 1070# CONFIG_FB_TRIDENT is not set
1071# CONFIG_FB_S1D13XXX is not set
1032# CONFIG_FB_VIRTUAL is not set 1072# CONFIG_FB_VIRTUAL is not set
1033 1073
1034# 1074#
@@ -1110,6 +1150,7 @@ CONFIG_SND_DUMMY=m
1110# CONFIG_SND_RME96 is not set 1150# CONFIG_SND_RME96 is not set
1111# CONFIG_SND_RME9652 is not set 1151# CONFIG_SND_RME9652 is not set
1112# CONFIG_SND_HDSP is not set 1152# CONFIG_SND_HDSP is not set
1153# CONFIG_SND_HDSPM is not set
1113# CONFIG_SND_TRIDENT is not set 1154# CONFIG_SND_TRIDENT is not set
1114# CONFIG_SND_YMFPCI is not set 1155# CONFIG_SND_YMFPCI is not set
1115# CONFIG_SND_ALS4000 is not set 1156# CONFIG_SND_ALS4000 is not set
@@ -1128,6 +1169,7 @@ CONFIG_SND_DUMMY=m
1128# CONFIG_SND_VIA82XX is not set 1169# CONFIG_SND_VIA82XX is not set
1129# CONFIG_SND_VIA82XX_MODEM is not set 1170# CONFIG_SND_VIA82XX_MODEM is not set
1130# CONFIG_SND_VX222 is not set 1171# CONFIG_SND_VX222 is not set
1172# CONFIG_SND_HDA_INTEL is not set
1131 1173
1132# 1174#
1133# ALSA PowerMac devices 1175# ALSA PowerMac devices
@@ -1152,6 +1194,8 @@ CONFIG_SND_USB_USX2Y=m
1152# 1194#
1153# USB support 1195# USB support
1154# 1196#
1197CONFIG_USB_ARCH_HAS_HCD=y
1198CONFIG_USB_ARCH_HAS_OHCI=y
1155CONFIG_USB=y 1199CONFIG_USB=y
1156# CONFIG_USB_DEBUG is not set 1200# CONFIG_USB_DEBUG is not set
1157 1201
@@ -1163,14 +1207,15 @@ CONFIG_USB_DEVICEFS=y
1163CONFIG_USB_DYNAMIC_MINORS=y 1207CONFIG_USB_DYNAMIC_MINORS=y
1164CONFIG_USB_SUSPEND=y 1208CONFIG_USB_SUSPEND=y
1165# CONFIG_USB_OTG is not set 1209# CONFIG_USB_OTG is not set
1166CONFIG_USB_ARCH_HAS_HCD=y
1167CONFIG_USB_ARCH_HAS_OHCI=y
1168 1210
1169# 1211#
1170# USB Host Controller Drivers 1212# USB Host Controller Drivers
1171# 1213#
1172# CONFIG_USB_EHCI_HCD is not set 1214# CONFIG_USB_EHCI_HCD is not set
1215# CONFIG_USB_ISP116X_HCD is not set
1173CONFIG_USB_OHCI_HCD=y 1216CONFIG_USB_OHCI_HCD=y
1217# CONFIG_USB_OHCI_BIG_ENDIAN is not set
1218CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1174# CONFIG_USB_UHCI_HCD is not set 1219# CONFIG_USB_UHCI_HCD is not set
1175# CONFIG_USB_SL811_HCD is not set 1220# CONFIG_USB_SL811_HCD is not set
1176 1221
@@ -1197,12 +1242,15 @@ CONFIG_USB_HIDINPUT=y
1197CONFIG_USB_HIDDEV=y 1242CONFIG_USB_HIDDEV=y
1198# CONFIG_USB_AIPTEK is not set 1243# CONFIG_USB_AIPTEK is not set
1199# CONFIG_USB_WACOM is not set 1244# CONFIG_USB_WACOM is not set
1245# CONFIG_USB_ACECAD is not set
1200# CONFIG_USB_KBTAB is not set 1246# CONFIG_USB_KBTAB is not set
1201# CONFIG_USB_POWERMATE is not set 1247# CONFIG_USB_POWERMATE is not set
1202# CONFIG_USB_MTOUCH is not set 1248# CONFIG_USB_MTOUCH is not set
1249# CONFIG_USB_ITMTOUCH is not set
1203# CONFIG_USB_EGALAX is not set 1250# CONFIG_USB_EGALAX is not set
1204# CONFIG_USB_XPAD is not set 1251# CONFIG_USB_XPAD is not set
1205# CONFIG_USB_ATI_REMOTE is not set 1252# CONFIG_USB_ATI_REMOTE is not set
1253# CONFIG_USB_KEYSPAN_REMOTE is not set
1206 1254
1207# 1255#
1208# USB Imaging devices 1256# USB Imaging devices
@@ -1227,6 +1275,8 @@ CONFIG_USB_HIDDEV=y
1227CONFIG_USB_PEGASUS=m 1275CONFIG_USB_PEGASUS=m
1228# CONFIG_USB_RTL8150 is not set 1276# CONFIG_USB_RTL8150 is not set
1229# CONFIG_USB_USBNET is not set 1277# CONFIG_USB_USBNET is not set
1278# CONFIG_USB_ZD1201 is not set
1279# CONFIG_USB_MON is not set
1230 1280
1231# 1281#
1232# USB port drivers 1282# USB port drivers
@@ -1237,9 +1287,11 @@ CONFIG_USB_PEGASUS=m
1237# 1287#
1238CONFIG_USB_SERIAL=m 1288CONFIG_USB_SERIAL=m
1239# CONFIG_USB_SERIAL_GENERIC is not set 1289# CONFIG_USB_SERIAL_GENERIC is not set
1290# CONFIG_USB_SERIAL_AIRPRIME is not set
1240# CONFIG_USB_SERIAL_BELKIN is not set 1291# CONFIG_USB_SERIAL_BELKIN is not set
1241# CONFIG_USB_SERIAL_WHITEHEAT is not set 1292# CONFIG_USB_SERIAL_WHITEHEAT is not set
1242# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 1293# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1294# CONFIG_USB_SERIAL_CP2101 is not set
1243# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 1295# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
1244# CONFIG_USB_SERIAL_EMPEG is not set 1296# CONFIG_USB_SERIAL_EMPEG is not set
1245# CONFIG_USB_SERIAL_FTDI_SIO is not set 1297# CONFIG_USB_SERIAL_FTDI_SIO is not set
@@ -1268,10 +1320,12 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1268# CONFIG_USB_SERIAL_KOBIL_SCT is not set 1320# CONFIG_USB_SERIAL_KOBIL_SCT is not set
1269# CONFIG_USB_SERIAL_MCT_U232 is not set 1321# CONFIG_USB_SERIAL_MCT_U232 is not set
1270# CONFIG_USB_SERIAL_PL2303 is not set 1322# CONFIG_USB_SERIAL_PL2303 is not set
1323# CONFIG_USB_SERIAL_HP4X is not set
1271# CONFIG_USB_SERIAL_SAFE is not set 1324# CONFIG_USB_SERIAL_SAFE is not set
1272# CONFIG_USB_SERIAL_TI is not set 1325# CONFIG_USB_SERIAL_TI is not set
1273# CONFIG_USB_SERIAL_CYBERJACK is not set 1326# CONFIG_USB_SERIAL_CYBERJACK is not set
1274# CONFIG_USB_SERIAL_XIRCOM is not set 1327# CONFIG_USB_SERIAL_XIRCOM is not set
1328# CONFIG_USB_SERIAL_OPTION is not set
1275# CONFIG_USB_SERIAL_OMNINET is not set 1329# CONFIG_USB_SERIAL_OMNINET is not set
1276CONFIG_USB_EZUSB=y 1330CONFIG_USB_EZUSB=y
1277 1331
@@ -1289,10 +1343,11 @@ CONFIG_USB_EZUSB=y
1289# CONFIG_USB_PHIDGETKIT is not set 1343# CONFIG_USB_PHIDGETKIT is not set
1290# CONFIG_USB_PHIDGETSERVO is not set 1344# CONFIG_USB_PHIDGETSERVO is not set
1291# CONFIG_USB_IDMOUSE is not set 1345# CONFIG_USB_IDMOUSE is not set
1346# CONFIG_USB_LD is not set
1292# CONFIG_USB_TEST is not set 1347# CONFIG_USB_TEST is not set
1293 1348
1294# 1349#
1295# USB ATM/DSL drivers 1350# USB DSL modem support
1296# 1351#
1297 1352
1298# 1353#
@@ -1311,12 +1366,17 @@ CONFIG_USB_EZUSB=y
1311# CONFIG_INFINIBAND is not set 1366# CONFIG_INFINIBAND is not set
1312 1367
1313# 1368#
1369# SN Devices
1370#
1371
1372#
1314# File systems 1373# File systems
1315# 1374#
1316CONFIG_EXT2_FS=y 1375CONFIG_EXT2_FS=y
1317CONFIG_EXT2_FS_XATTR=y 1376CONFIG_EXT2_FS_XATTR=y
1318# CONFIG_EXT2_FS_POSIX_ACL is not set 1377# CONFIG_EXT2_FS_POSIX_ACL is not set
1319# CONFIG_EXT2_FS_SECURITY is not set 1378# CONFIG_EXT2_FS_SECURITY is not set
1379# CONFIG_EXT2_FS_XIP is not set
1320CONFIG_EXT3_FS=y 1380CONFIG_EXT3_FS=y
1321CONFIG_EXT3_FS_XATTR=y 1381CONFIG_EXT3_FS_XATTR=y
1322# CONFIG_EXT3_FS_POSIX_ACL is not set 1382# CONFIG_EXT3_FS_POSIX_ACL is not set
@@ -1326,6 +1386,7 @@ CONFIG_JBD=y
1326CONFIG_FS_MBCACHE=y 1386CONFIG_FS_MBCACHE=y
1327# CONFIG_REISERFS_FS is not set 1387# CONFIG_REISERFS_FS is not set
1328# CONFIG_JFS_FS is not set 1388# CONFIG_JFS_FS is not set
1389CONFIG_FS_POSIX_ACL=y
1329 1390
1330# 1391#
1331# XFS support 1392# XFS support
@@ -1333,6 +1394,7 @@ CONFIG_FS_MBCACHE=y
1333# CONFIG_XFS_FS is not set 1394# CONFIG_XFS_FS is not set
1334# CONFIG_MINIX_FS is not set 1395# CONFIG_MINIX_FS is not set
1335# CONFIG_ROMFS_FS is not set 1396# CONFIG_ROMFS_FS is not set
1397CONFIG_INOTIFY=y
1336# CONFIG_QUOTA is not set 1398# CONFIG_QUOTA is not set
1337CONFIG_DNOTIFY=y 1399CONFIG_DNOTIFY=y
1338# CONFIG_AUTOFS_FS is not set 1400# CONFIG_AUTOFS_FS is not set
@@ -1363,7 +1425,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1363CONFIG_PROC_FS=y 1425CONFIG_PROC_FS=y
1364CONFIG_PROC_KCORE=y 1426CONFIG_PROC_KCORE=y
1365CONFIG_SYSFS=y 1427CONFIG_SYSFS=y
1366# CONFIG_DEVFS_FS is not set
1367CONFIG_DEVPTS_FS_XATTR=y 1428CONFIG_DEVPTS_FS_XATTR=y
1368CONFIG_DEVPTS_FS_SECURITY=y 1429CONFIG_DEVPTS_FS_SECURITY=y
1369CONFIG_TMPFS=y 1430CONFIG_TMPFS=y
@@ -1394,15 +1455,20 @@ CONFIG_CRAMFS=m
1394# 1455#
1395CONFIG_NFS_FS=y 1456CONFIG_NFS_FS=y
1396CONFIG_NFS_V3=y 1457CONFIG_NFS_V3=y
1458CONFIG_NFS_V3_ACL=y
1397# CONFIG_NFS_V4 is not set 1459# CONFIG_NFS_V4 is not set
1398# CONFIG_NFS_DIRECTIO is not set 1460# CONFIG_NFS_DIRECTIO is not set
1399CONFIG_NFSD=y 1461CONFIG_NFSD=y
1462CONFIG_NFSD_V2_ACL=y
1400CONFIG_NFSD_V3=y 1463CONFIG_NFSD_V3=y
1464CONFIG_NFSD_V3_ACL=y
1401# CONFIG_NFSD_V4 is not set 1465# CONFIG_NFSD_V4 is not set
1402CONFIG_NFSD_TCP=y 1466CONFIG_NFSD_TCP=y
1403CONFIG_LOCKD=y 1467CONFIG_LOCKD=y
1404CONFIG_LOCKD_V4=y 1468CONFIG_LOCKD_V4=y
1405CONFIG_EXPORTFS=y 1469CONFIG_EXPORTFS=y
1470CONFIG_NFS_ACL_SUPPORT=y
1471CONFIG_NFS_COMMON=y
1406CONFIG_SUNRPC=y 1472CONFIG_SUNRPC=y
1407# CONFIG_RPCSEC_GSS_KRB5 is not set 1473# CONFIG_RPCSEC_GSS_KRB5 is not set
1408# CONFIG_RPCSEC_GSS_SPKM3 is not set 1474# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -1494,8 +1560,10 @@ CONFIG_ZLIB_DEFLATE=y
1494# 1560#
1495# Kernel hacking 1561# Kernel hacking
1496# 1562#
1563# CONFIG_PRINTK_TIME is not set
1497CONFIG_DEBUG_KERNEL=y 1564CONFIG_DEBUG_KERNEL=y
1498CONFIG_MAGIC_SYSRQ=y 1565CONFIG_MAGIC_SYSRQ=y
1566CONFIG_LOG_BUF_SHIFT=16
1499# CONFIG_SCHEDSTATS is not set 1567# CONFIG_SCHEDSTATS is not set
1500# CONFIG_DEBUG_SLAB is not set 1568# CONFIG_DEBUG_SLAB is not set
1501# CONFIG_DEBUG_SPINLOCK is not set 1569# CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/ppc/configs/radstone_ppc7d_defconfig b/arch/ppc/configs/radstone_ppc7d_defconfig
index 7f6467e77949..ca4d1fd0ca05 100644
--- a/arch/ppc/configs/radstone_ppc7d_defconfig
+++ b/arch/ppc/configs/radstone_ppc7d_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.11 3# Linux kernel version: 2.6.13-rc3
4# Tue Mar 15 14:31:19 2005 4# Tue Jul 26 00:02:09 2005
5# 5#
6CONFIG_MMU=y 6CONFIG_MMU=y
7CONFIG_GENERIC_HARDIRQS=y 7CONFIG_GENERIC_HARDIRQS=y
@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=y
11CONFIG_PPC=y 11CONFIG_PPC=y
12CONFIG_PPC32=y 12CONFIG_PPC32=y
13CONFIG_GENERIC_NVRAM=y 13CONFIG_GENERIC_NVRAM=y
14CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14 15
15# 16#
16# Code maturity level options 17# Code maturity level options
@@ -18,6 +19,7 @@ CONFIG_GENERIC_NVRAM=y
18CONFIG_EXPERIMENTAL=y 19CONFIG_EXPERIMENTAL=y
19CONFIG_CLEAN_COMPILE=y 20CONFIG_CLEAN_COMPILE=y
20CONFIG_BROKEN_ON_SMP=y 21CONFIG_BROKEN_ON_SMP=y
22CONFIG_INIT_ENV_ARG_LIMIT=32
21 23
22# 24#
23# General setup 25# General setup
@@ -35,6 +37,8 @@ CONFIG_KOBJECT_UEVENT=y
35CONFIG_EMBEDDED=y 37CONFIG_EMBEDDED=y
36CONFIG_KALLSYMS=y 38CONFIG_KALLSYMS=y
37CONFIG_KALLSYMS_EXTRA_PASS=y 39CONFIG_KALLSYMS_EXTRA_PASS=y
40CONFIG_PRINTK=y
41CONFIG_BUG=y
38CONFIG_BASE_FULL=y 42CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 43CONFIG_FUTEX=y
40CONFIG_EPOLL=y 44CONFIG_EPOLL=y
@@ -67,9 +71,12 @@ CONFIG_6xx=y
67# CONFIG_POWER3 is not set 71# CONFIG_POWER3 is not set
68# CONFIG_POWER4 is not set 72# CONFIG_POWER4 is not set
69# CONFIG_8xx is not set 73# CONFIG_8xx is not set
74# CONFIG_E200 is not set
70# CONFIG_E500 is not set 75# CONFIG_E500 is not set
76CONFIG_PPC_FPU=y
71CONFIG_ALTIVEC=y 77CONFIG_ALTIVEC=y
72# CONFIG_TAU is not set 78# CONFIG_TAU is not set
79# CONFIG_KEXEC is not set
73# CONFIG_CPU_FREQ is not set 80# CONFIG_CPU_FREQ is not set
74CONFIG_PPC_GEN550=y 81CONFIG_PPC_GEN550=y
75# CONFIG_PM is not set 82# CONFIG_PM is not set
@@ -84,21 +91,18 @@ CONFIG_PPC_STD_MMU=y
84# CONFIG_KATANA is not set 91# CONFIG_KATANA is not set
85# CONFIG_WILLOW is not set 92# CONFIG_WILLOW is not set
86# CONFIG_CPCI690 is not set 93# CONFIG_CPCI690 is not set
87# CONFIG_PCORE is not set
88# CONFIG_POWERPMC250 is not set 94# CONFIG_POWERPMC250 is not set
89# CONFIG_CHESTNUT is not set 95# CONFIG_CHESTNUT is not set
90# CONFIG_SPRUCE is not set 96# CONFIG_SPRUCE is not set
97# CONFIG_HDPU is not set
91# CONFIG_EV64260 is not set 98# CONFIG_EV64260 is not set
92# CONFIG_LOPEC is not set 99# CONFIG_LOPEC is not set
93# CONFIG_MCPN765 is not set
94# CONFIG_MVME5100 is not set 100# CONFIG_MVME5100 is not set
95# CONFIG_PPLUS is not set 101# CONFIG_PPLUS is not set
96# CONFIG_PRPMC750 is not set 102# CONFIG_PRPMC750 is not set
97# CONFIG_PRPMC800 is not set 103# CONFIG_PRPMC800 is not set
98# CONFIG_SANDPOINT is not set 104# CONFIG_SANDPOINT is not set
99CONFIG_RADSTONE_PPC7D=y 105CONFIG_RADSTONE_PPC7D=y
100# CONFIG_ADIR is not set
101# CONFIG_K2 is not set
102# CONFIG_PAL4 is not set 106# CONFIG_PAL4 is not set
103# CONFIG_GEMINI is not set 107# CONFIG_GEMINI is not set
104# CONFIG_EST8260 is not set 108# CONFIG_EST8260 is not set
@@ -121,10 +125,18 @@ CONFIG_MV64X60_NEW_BASE=0xfef00000
121# CONFIG_SMP is not set 125# CONFIG_SMP is not set
122# CONFIG_PREEMPT is not set 126# CONFIG_PREEMPT is not set
123# CONFIG_HIGHMEM is not set 127# CONFIG_HIGHMEM is not set
128CONFIG_SELECT_MEMORY_MODEL=y
129CONFIG_FLATMEM_MANUAL=y
130# CONFIG_DISCONTIGMEM_MANUAL is not set
131# CONFIG_SPARSEMEM_MANUAL is not set
132CONFIG_FLATMEM=y
133CONFIG_FLAT_NODE_MEM_MAP=y
124CONFIG_BINFMT_ELF=y 134CONFIG_BINFMT_ELF=y
125CONFIG_BINFMT_MISC=y 135CONFIG_BINFMT_MISC=y
126CONFIG_CMDLINE_BOOL=y 136CONFIG_CMDLINE_BOOL=y
127CONFIG_CMDLINE="console=ttyS0,9600" 137CONFIG_CMDLINE="console=ttyS0,9600"
138CONFIG_SECCOMP=y
139CONFIG_ISA_DMA_API=y
128 140
129# 141#
130# Bus options 142# Bus options
@@ -155,6 +167,69 @@ CONFIG_TASK_SIZE=0x80000000
155CONFIG_BOOT_LOAD=0x00800000 167CONFIG_BOOT_LOAD=0x00800000
156 168
157# 169#
170# Networking
171#
172CONFIG_NET=y
173
174#
175# Networking options
176#
177CONFIG_PACKET=y
178# CONFIG_PACKET_MMAP is not set
179CONFIG_UNIX=y
180# CONFIG_NET_KEY is not set
181CONFIG_INET=y
182CONFIG_IP_MULTICAST=y
183# CONFIG_IP_ADVANCED_ROUTER is not set
184CONFIG_IP_FIB_HASH=y
185CONFIG_IP_PNP=y
186CONFIG_IP_PNP_DHCP=y
187CONFIG_IP_PNP_BOOTP=y
188# CONFIG_IP_PNP_RARP is not set
189# CONFIG_NET_IPIP is not set
190# CONFIG_NET_IPGRE is not set
191# CONFIG_IP_MROUTE is not set
192# CONFIG_ARPD is not set
193CONFIG_SYN_COOKIES=y
194# CONFIG_INET_AH is not set
195# CONFIG_INET_ESP is not set
196# CONFIG_INET_IPCOMP is not set
197# CONFIG_INET_TUNNEL is not set
198CONFIG_IP_TCPDIAG=y
199# CONFIG_IP_TCPDIAG_IPV6 is not set
200# CONFIG_TCP_CONG_ADVANCED is not set
201CONFIG_TCP_CONG_BIC=y
202# CONFIG_IPV6 is not set
203# CONFIG_NETFILTER is not set
204
205#
206# SCTP Configuration (EXPERIMENTAL)
207#
208# CONFIG_IP_SCTP is not set
209# CONFIG_ATM is not set
210CONFIG_BRIDGE=y
211# CONFIG_VLAN_8021Q is not set
212# CONFIG_DECNET is not set
213# CONFIG_LLC2 is not set
214# CONFIG_IPX is not set
215# CONFIG_ATALK is not set
216# CONFIG_X25 is not set
217# CONFIG_LAPB is not set
218# CONFIG_NET_DIVERT is not set
219# CONFIG_ECONET is not set
220# CONFIG_WAN_ROUTER is not set
221# CONFIG_NET_SCHED is not set
222# CONFIG_NET_CLS_ROUTE is not set
223
224#
225# Network testing
226#
227# CONFIG_NET_PKTGEN is not set
228# CONFIG_HAMRADIO is not set
229# CONFIG_IRDA is not set
230# CONFIG_BT is not set
231
232#
158# Device Drivers 233# Device Drivers
159# 234#
160 235
@@ -203,6 +278,7 @@ CONFIG_MTD_CFI_I1=y
203CONFIG_MTD_CFI_I2=y 278CONFIG_MTD_CFI_I2=y
204# CONFIG_MTD_CFI_I4 is not set 279# CONFIG_MTD_CFI_I4 is not set
205# CONFIG_MTD_CFI_I8 is not set 280# CONFIG_MTD_CFI_I8 is not set
281# CONFIG_MTD_OTP is not set
206CONFIG_MTD_CFI_INTELEXT=y 282CONFIG_MTD_CFI_INTELEXT=y
207# CONFIG_MTD_CFI_AMDSTD is not set 283# CONFIG_MTD_CFI_AMDSTD is not set
208# CONFIG_MTD_CFI_STAA is not set 284# CONFIG_MTD_CFI_STAA is not set
@@ -210,13 +286,13 @@ CONFIG_MTD_CFI_UTIL=y
210# CONFIG_MTD_RAM is not set 286# CONFIG_MTD_RAM is not set
211# CONFIG_MTD_ROM is not set 287# CONFIG_MTD_ROM is not set
212# CONFIG_MTD_ABSENT is not set 288# CONFIG_MTD_ABSENT is not set
213# CONFIG_MTD_XIP is not set
214 289
215# 290#
216# Mapping drivers for chip access 291# Mapping drivers for chip access
217# 292#
218# CONFIG_MTD_COMPLEX_MAPPINGS is not set 293# CONFIG_MTD_COMPLEX_MAPPINGS is not set
219# CONFIG_MTD_PHYSMAP is not set 294# CONFIG_MTD_PHYSMAP is not set
295# CONFIG_MTD_PLATRAM is not set
220 296
221# 297#
222# Self-contained MTD device drivers 298# Self-contained MTD device drivers
@@ -299,6 +375,7 @@ CONFIG_BLK_DEV_SD=y
299CONFIG_BLK_DEV_SR=y 375CONFIG_BLK_DEV_SR=y
300CONFIG_BLK_DEV_SR_VENDOR=y 376CONFIG_BLK_DEV_SR_VENDOR=y
301CONFIG_CHR_DEV_SG=y 377CONFIG_CHR_DEV_SG=y
378# CONFIG_CHR_DEV_SCH is not set
302 379
303# 380#
304# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 381# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -331,7 +408,6 @@ CONFIG_SCSI_SPI_ATTRS=y
331# CONFIG_SCSI_BUSLOGIC is not set 408# CONFIG_SCSI_BUSLOGIC is not set
332# CONFIG_SCSI_DMX3191D is not set 409# CONFIG_SCSI_DMX3191D is not set
333# CONFIG_SCSI_EATA is not set 410# CONFIG_SCSI_EATA is not set
334# CONFIG_SCSI_EATA_PIO is not set
335# CONFIG_SCSI_FUTURE_DOMAIN is not set 411# CONFIG_SCSI_FUTURE_DOMAIN is not set
336# CONFIG_SCSI_GDTH is not set 412# CONFIG_SCSI_GDTH is not set
337# CONFIG_SCSI_IPS is not set 413# CONFIG_SCSI_IPS is not set
@@ -343,7 +419,6 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
343CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 419CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
344# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 420# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
345# CONFIG_SCSI_IPR is not set 421# CONFIG_SCSI_IPR is not set
346# CONFIG_SCSI_QLOGIC_ISP is not set
347# CONFIG_SCSI_QLOGIC_FC is not set 422# CONFIG_SCSI_QLOGIC_FC is not set
348# CONFIG_SCSI_QLOGIC_1280 is not set 423# CONFIG_SCSI_QLOGIC_1280 is not set
349CONFIG_SCSI_QLA2XXX=y 424CONFIG_SCSI_QLA2XXX=y
@@ -352,6 +427,7 @@ CONFIG_SCSI_QLA2XXX=y
352# CONFIG_SCSI_QLA2300 is not set 427# CONFIG_SCSI_QLA2300 is not set
353# CONFIG_SCSI_QLA2322 is not set 428# CONFIG_SCSI_QLA2322 is not set
354# CONFIG_SCSI_QLA6312 is not set 429# CONFIG_SCSI_QLA6312 is not set
430# CONFIG_SCSI_LPFC is not set
355# CONFIG_SCSI_DC395x is not set 431# CONFIG_SCSI_DC395x is not set
356# CONFIG_SCSI_DC390T is not set 432# CONFIG_SCSI_DC390T is not set
357# CONFIG_SCSI_NSP32 is not set 433# CONFIG_SCSI_NSP32 is not set
@@ -366,6 +442,8 @@ CONFIG_SCSI_QLA2XXX=y
366# Fusion MPT device support 442# Fusion MPT device support
367# 443#
368# CONFIG_FUSION is not set 444# CONFIG_FUSION is not set
445# CONFIG_FUSION_SPI is not set
446# CONFIG_FUSION_FC is not set
369 447
370# 448#
371# IEEE 1394 (FireWire) support 449# IEEE 1394 (FireWire) support
@@ -382,71 +460,8 @@ CONFIG_SCSI_QLA2XXX=y
382# 460#
383 461
384# 462#
385# Networking support 463# Network device support
386# 464#
387CONFIG_NET=y
388
389#
390# Networking options
391#
392CONFIG_PACKET=y
393# CONFIG_PACKET_MMAP is not set
394# CONFIG_NETLINK_DEV is not set
395CONFIG_UNIX=y
396# CONFIG_NET_KEY is not set
397CONFIG_INET=y
398CONFIG_IP_MULTICAST=y
399# CONFIG_IP_ADVANCED_ROUTER is not set
400CONFIG_IP_PNP=y
401CONFIG_IP_PNP_DHCP=y
402CONFIG_IP_PNP_BOOTP=y
403# CONFIG_IP_PNP_RARP is not set
404# CONFIG_NET_IPIP is not set
405# CONFIG_NET_IPGRE is not set
406# CONFIG_IP_MROUTE is not set
407# CONFIG_ARPD is not set
408CONFIG_SYN_COOKIES=y
409# CONFIG_INET_AH is not set
410# CONFIG_INET_ESP is not set
411# CONFIG_INET_IPCOMP is not set
412# CONFIG_INET_TUNNEL is not set
413CONFIG_IP_TCPDIAG=y
414# CONFIG_IP_TCPDIAG_IPV6 is not set
415# CONFIG_IPV6 is not set
416# CONFIG_NETFILTER is not set
417
418#
419# SCTP Configuration (EXPERIMENTAL)
420#
421# CONFIG_IP_SCTP is not set
422# CONFIG_ATM is not set
423CONFIG_BRIDGE=y
424# CONFIG_VLAN_8021Q is not set
425# CONFIG_DECNET is not set
426# CONFIG_LLC2 is not set
427# CONFIG_IPX is not set
428# CONFIG_ATALK is not set
429# CONFIG_X25 is not set
430# CONFIG_LAPB is not set
431# CONFIG_NET_DIVERT is not set
432# CONFIG_ECONET is not set
433# CONFIG_WAN_ROUTER is not set
434
435#
436# QoS and/or fair queueing
437#
438# CONFIG_NET_SCHED is not set
439# CONFIG_NET_CLS_ROUTE is not set
440
441#
442# Network testing
443#
444# CONFIG_NET_PKTGEN is not set
445# CONFIG_NETPOLL is not set
446# CONFIG_NET_POLL_CONTROLLER is not set
447# CONFIG_HAMRADIO is not set
448# CONFIG_IRDA is not set
449# CONFIG_BT is not set
450CONFIG_NETDEVICES=y 465CONFIG_NETDEVICES=y
451# CONFIG_DUMMY is not set 466# CONFIG_DUMMY is not set
452# CONFIG_BONDING is not set 467# CONFIG_BONDING is not set
@@ -511,9 +526,11 @@ CONFIG_E100=y
511# CONFIG_YELLOWFIN is not set 526# CONFIG_YELLOWFIN is not set
512CONFIG_R8169=y 527CONFIG_R8169=y
513CONFIG_R8169_NAPI=y 528CONFIG_R8169_NAPI=y
529# CONFIG_SKGE is not set
514CONFIG_SK98LIN=y 530CONFIG_SK98LIN=y
515# CONFIG_VIA_VELOCITY is not set 531# CONFIG_VIA_VELOCITY is not set
516CONFIG_TIGON3=y 532CONFIG_TIGON3=y
533# CONFIG_BNX2 is not set
517CONFIG_MV643XX_ETH=y 534CONFIG_MV643XX_ETH=y
518CONFIG_MV643XX_ETH_0=y 535CONFIG_MV643XX_ETH_0=y
519CONFIG_MV643XX_ETH_1=y 536CONFIG_MV643XX_ETH_1=y
@@ -546,6 +563,8 @@ CONFIG_MV643XX_ETH_1=y
546# CONFIG_NET_FC is not set 563# CONFIG_NET_FC is not set
547# CONFIG_SHAPER is not set 564# CONFIG_SHAPER is not set
548# CONFIG_NETCONSOLE is not set 565# CONFIG_NETCONSOLE is not set
566# CONFIG_NETPOLL is not set
567# CONFIG_NET_POLL_CONTROLLER is not set
549 568
550# 569#
551# ISDN subsystem 570# ISDN subsystem
@@ -598,7 +617,6 @@ CONFIG_SERIO_SERPORT=y
598CONFIG_SERIO_LIBPS2=y 617CONFIG_SERIO_LIBPS2=y
599# CONFIG_SERIO_RAW is not set 618# CONFIG_SERIO_RAW is not set
600# CONFIG_GAMEPORT is not set 619# CONFIG_GAMEPORT is not set
601CONFIG_SOUND_GAMEPORT=y
602 620
603# 621#
604# Character devices 622# Character devices
@@ -623,6 +641,7 @@ CONFIG_SERIAL_MPSC=y
623# CONFIG_SERIAL_MPSC_CONSOLE is not set 641# CONFIG_SERIAL_MPSC_CONSOLE is not set
624CONFIG_SERIAL_CORE=y 642CONFIG_SERIAL_CORE=y
625CONFIG_SERIAL_CORE_CONSOLE=y 643CONFIG_SERIAL_CORE_CONSOLE=y
644# CONFIG_SERIAL_JSM is not set
626CONFIG_UNIX98_PTYS=y 645CONFIG_UNIX98_PTYS=y
627CONFIG_LEGACY_PTYS=y 646CONFIG_LEGACY_PTYS=y
628CONFIG_LEGACY_PTY_COUNT=256 647CONFIG_LEGACY_PTY_COUNT=256
@@ -690,11 +709,11 @@ CONFIG_I2C_CHARDEV=y
690# CONFIG_I2C_AMD8111 is not set 709# CONFIG_I2C_AMD8111 is not set
691# CONFIG_I2C_I801 is not set 710# CONFIG_I2C_I801 is not set
692# CONFIG_I2C_I810 is not set 711# CONFIG_I2C_I810 is not set
712# CONFIG_I2C_PIIX4 is not set
693# CONFIG_I2C_ISA is not set 713# CONFIG_I2C_ISA is not set
694# CONFIG_I2C_MPC is not set 714# CONFIG_I2C_MPC is not set
695# CONFIG_I2C_NFORCE2 is not set 715# CONFIG_I2C_NFORCE2 is not set
696# CONFIG_I2C_PARPORT_LIGHT is not set 716# CONFIG_I2C_PARPORT_LIGHT is not set
697# CONFIG_I2C_PIIX4 is not set
698# CONFIG_I2C_PROSAVAGE is not set 717# CONFIG_I2C_PROSAVAGE is not set
699# CONFIG_I2C_SAVAGE4 is not set 718# CONFIG_I2C_SAVAGE4 is not set
700# CONFIG_SCx200_ACB is not set 719# CONFIG_SCx200_ACB is not set
@@ -707,16 +726,41 @@ CONFIG_I2C_CHARDEV=y
707# CONFIG_I2C_VOODOO3 is not set 726# CONFIG_I2C_VOODOO3 is not set
708# CONFIG_I2C_PCA_ISA is not set 727# CONFIG_I2C_PCA_ISA is not set
709CONFIG_I2C_MV64XXX=y 728CONFIG_I2C_MV64XXX=y
729CONFIG_I2C_SENSOR=y
710 730
711# 731#
712# Hardware Sensors Chip support 732# Miscellaneous I2C Chip support
713# 733#
714CONFIG_I2C_SENSOR=y 734CONFIG_SENSORS_DS1337=y
735# CONFIG_SENSORS_DS1374 is not set
736# CONFIG_SENSORS_EEPROM is not set
737# CONFIG_SENSORS_PCF8574 is not set
738# CONFIG_SENSORS_PCA9539 is not set
739# CONFIG_SENSORS_PCF8591 is not set
740# CONFIG_SENSORS_RTC8564 is not set
741# CONFIG_SENSORS_M41T00 is not set
742# CONFIG_SENSORS_MAX6875 is not set
743# CONFIG_I2C_DEBUG_CORE is not set
744# CONFIG_I2C_DEBUG_ALGO is not set
745# CONFIG_I2C_DEBUG_BUS is not set
746# CONFIG_I2C_DEBUG_CHIP is not set
747
748#
749# Dallas's 1-wire bus
750#
751# CONFIG_W1 is not set
752
753#
754# Hardware Monitoring support
755#
756CONFIG_HWMON=y
715# CONFIG_SENSORS_ADM1021 is not set 757# CONFIG_SENSORS_ADM1021 is not set
716# CONFIG_SENSORS_ADM1025 is not set 758# CONFIG_SENSORS_ADM1025 is not set
717# CONFIG_SENSORS_ADM1026 is not set 759# CONFIG_SENSORS_ADM1026 is not set
718# CONFIG_SENSORS_ADM1031 is not set 760# CONFIG_SENSORS_ADM1031 is not set
761# CONFIG_SENSORS_ADM9240 is not set
719# CONFIG_SENSORS_ASB100 is not set 762# CONFIG_SENSORS_ASB100 is not set
763# CONFIG_SENSORS_ATXP1 is not set
720# CONFIG_SENSORS_DS1621 is not set 764# CONFIG_SENSORS_DS1621 is not set
721# CONFIG_SENSORS_FSCHER is not set 765# CONFIG_SENSORS_FSCHER is not set
722# CONFIG_SENSORS_FSCPOS is not set 766# CONFIG_SENSORS_FSCPOS is not set
@@ -732,33 +776,18 @@ CONFIG_I2C_SENSOR=y
732# CONFIG_SENSORS_LM85 is not set 776# CONFIG_SENSORS_LM85 is not set
733# CONFIG_SENSORS_LM87 is not set 777# CONFIG_SENSORS_LM87 is not set
734CONFIG_SENSORS_LM90=y 778CONFIG_SENSORS_LM90=y
779# CONFIG_SENSORS_LM92 is not set
735# CONFIG_SENSORS_MAX1619 is not set 780# CONFIG_SENSORS_MAX1619 is not set
736# CONFIG_SENSORS_PC87360 is not set 781# CONFIG_SENSORS_PC87360 is not set
737# CONFIG_SENSORS_SMSC47B397 is not set
738# CONFIG_SENSORS_SIS5595 is not set 782# CONFIG_SENSORS_SIS5595 is not set
739# CONFIG_SENSORS_SMSC47M1 is not set 783# CONFIG_SENSORS_SMSC47M1 is not set
784# CONFIG_SENSORS_SMSC47B397 is not set
740# CONFIG_SENSORS_VIA686A is not set 785# CONFIG_SENSORS_VIA686A is not set
741# CONFIG_SENSORS_W83781D is not set 786# CONFIG_SENSORS_W83781D is not set
742# CONFIG_SENSORS_W83L785TS is not set 787# CONFIG_SENSORS_W83L785TS is not set
743# CONFIG_SENSORS_W83627HF is not set 788# CONFIG_SENSORS_W83627HF is not set
744 789# CONFIG_SENSORS_W83627EHF is not set
745# 790# CONFIG_HWMON_DEBUG_CHIP is not set
746# Other I2C Chip support
747#
748# CONFIG_SENSORS_EEPROM is not set
749# CONFIG_SENSORS_PCF8574 is not set
750# CONFIG_SENSORS_PCF8591 is not set
751# CONFIG_SENSORS_RTC8564 is not set
752# CONFIG_SENSORS_M41T00 is not set
753# CONFIG_I2C_DEBUG_CORE is not set
754# CONFIG_I2C_DEBUG_ALGO is not set
755# CONFIG_I2C_DEBUG_BUS is not set
756# CONFIG_I2C_DEBUG_CHIP is not set
757
758#
759# Dallas's 1-wire bus
760#
761# CONFIG_W1 is not set
762 791
763# 792#
764# Misc devices 793# Misc devices
@@ -813,14 +842,20 @@ CONFIG_USB_ARCH_HAS_OHCI=y
813# CONFIG_INFINIBAND is not set 842# CONFIG_INFINIBAND is not set
814 843
815# 844#
845# SN Devices
846#
847
848#
816# File systems 849# File systems
817# 850#
818CONFIG_EXT2_FS=y 851CONFIG_EXT2_FS=y
819# CONFIG_EXT2_FS_XATTR is not set 852# CONFIG_EXT2_FS_XATTR is not set
853# CONFIG_EXT2_FS_XIP is not set
820# CONFIG_EXT3_FS is not set 854# CONFIG_EXT3_FS is not set
821# CONFIG_JBD is not set 855# CONFIG_JBD is not set
822# CONFIG_REISERFS_FS is not set 856# CONFIG_REISERFS_FS is not set
823# CONFIG_JFS_FS is not set 857# CONFIG_JFS_FS is not set
858# CONFIG_FS_POSIX_ACL is not set
824 859
825# 860#
826# XFS support 861# XFS support
@@ -828,6 +863,7 @@ CONFIG_EXT2_FS=y
828# CONFIG_XFS_FS is not set 863# CONFIG_XFS_FS is not set
829# CONFIG_MINIX_FS is not set 864# CONFIG_MINIX_FS is not set
830# CONFIG_ROMFS_FS is not set 865# CONFIG_ROMFS_FS is not set
866CONFIG_INOTIFY=y
831# CONFIG_QUOTA is not set 867# CONFIG_QUOTA is not set
832CONFIG_DNOTIFY=y 868CONFIG_DNOTIFY=y
833# CONFIG_AUTOFS_FS is not set 869# CONFIG_AUTOFS_FS is not set
@@ -854,7 +890,6 @@ CONFIG_ISO9660_FS=y
854CONFIG_PROC_FS=y 890CONFIG_PROC_FS=y
855CONFIG_PROC_KCORE=y 891CONFIG_PROC_KCORE=y
856CONFIG_SYSFS=y 892CONFIG_SYSFS=y
857# CONFIG_DEVFS_FS is not set
858# CONFIG_DEVPTS_FS_XATTR is not set 893# CONFIG_DEVPTS_FS_XATTR is not set
859CONFIG_TMPFS=y 894CONFIG_TMPFS=y
860# CONFIG_TMPFS_XATTR is not set 895# CONFIG_TMPFS_XATTR is not set
@@ -874,8 +909,7 @@ CONFIG_RAMFS=y
874# CONFIG_JFFS_FS is not set 909# CONFIG_JFFS_FS is not set
875CONFIG_JFFS2_FS=y 910CONFIG_JFFS2_FS=y
876CONFIG_JFFS2_FS_DEBUG=0 911CONFIG_JFFS2_FS_DEBUG=0
877# CONFIG_JFFS2_FS_NAND is not set 912CONFIG_JFFS2_FS_WRITEBUFFER=y
878# CONFIG_JFFS2_FS_NOR_ECC is not set
879# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 913# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
880CONFIG_JFFS2_ZLIB=y 914CONFIG_JFFS2_ZLIB=y
881CONFIG_JFFS2_RTIME=y 915CONFIG_JFFS2_RTIME=y
@@ -892,12 +926,14 @@ CONFIG_JFFS2_RTIME=y
892# 926#
893CONFIG_NFS_FS=y 927CONFIG_NFS_FS=y
894CONFIG_NFS_V3=y 928CONFIG_NFS_V3=y
929# CONFIG_NFS_V3_ACL is not set
895# CONFIG_NFS_V4 is not set 930# CONFIG_NFS_V4 is not set
896# CONFIG_NFS_DIRECTIO is not set 931# CONFIG_NFS_DIRECTIO is not set
897# CONFIG_NFSD is not set 932# CONFIG_NFSD is not set
898CONFIG_ROOT_NFS=y 933CONFIG_ROOT_NFS=y
899CONFIG_LOCKD=y 934CONFIG_LOCKD=y
900CONFIG_LOCKD_V4=y 935CONFIG_LOCKD_V4=y
936CONFIG_NFS_COMMON=y
901CONFIG_SUNRPC=y 937CONFIG_SUNRPC=y
902# CONFIG_RPCSEC_GSS_KRB5 is not set 938# CONFIG_RPCSEC_GSS_KRB5 is not set
903# CONFIG_RPCSEC_GSS_SPKM3 is not set 939# CONFIG_RPCSEC_GSS_SPKM3 is not set
diff --git a/arch/ppc/configs/sandpoint_defconfig b/arch/ppc/configs/sandpoint_defconfig
index 0f4393a07f82..fb493a67c60d 100644
--- a/arch/ppc/configs/sandpoint_defconfig
+++ b/arch/ppc/configs/sandpoint_defconfig
@@ -437,7 +437,7 @@ CONFIG_SOUND_GAMEPORT=y
437# 437#
438CONFIG_SERIAL_8250=y 438CONFIG_SERIAL_8250=y
439CONFIG_SERIAL_8250_CONSOLE=y 439CONFIG_SERIAL_8250_CONSOLE=y
440CONFIG_SERIAL_8250_NR_UARTS=2 440CONFIG_SERIAL_8250_NR_UARTS=4
441# CONFIG_SERIAL_8250_EXTENDED is not set 441# CONFIG_SERIAL_8250_EXTENDED is not set
442 442
443# 443#
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index 5a7a64e91fc5..eb18cadb3755 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -288,13 +288,11 @@ SystemCall:
288 * For the MPC8xx, this is a software tablewalk to load the instruction 288 * For the MPC8xx, this is a software tablewalk to load the instruction
289 * TLB. It is modelled after the example in the Motorola manual. The task 289 * TLB. It is modelled after the example in the Motorola manual. The task
290 * switch loads the M_TWB register with the pointer to the first level table. 290 * switch loads the M_TWB register with the pointer to the first level table.
291 * If we discover there is no second level table (the value is zero), the 291 * If we discover there is no second level table (value is zero) or if there
292 * plan was to load that into the TLB, which causes another fault into the 292 * is an invalid pte, we load that into the TLB, which causes another fault
293 * TLB Error interrupt where we can handle such problems. However, that did 293 * into the TLB Error interrupt where we can handle such problems.
294 * not work, so if we discover there is no second level table, we restore 294 * We have to use the MD_xxx registers for the tablewalk because the
295 * registers and branch to the error exception. We have to use the MD_xxx 295 * equivalent MI_xxx registers only perform the attribute functions.
296 * registers for the tablewalk because the equivalent MI_xxx registers
297 * only perform the attribute functions.
298 */ 296 */
299InstructionTLBMiss: 297InstructionTLBMiss:
300#ifdef CONFIG_8xx_CPU6 298#ifdef CONFIG_8xx_CPU6
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 6164a2b34733..33ada72c7330 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -562,6 +562,9 @@ void flush_dcache_icache_page(struct page *page)
562#ifdef CONFIG_BOOKE 562#ifdef CONFIG_BOOKE
563 __flush_dcache_icache(kmap(page)); 563 __flush_dcache_icache(kmap(page));
564 kunmap(page); 564 kunmap(page);
565#elif CONFIG_8xx
566 /* On 8xx there is no need to kmap since highmem is not supported */
567 __flush_dcache_icache(page_address(page));
565#else 568#else
566 __flush_dcache_icache_phys(page_to_pfn(page) << PAGE_SHIFT); 569 __flush_dcache_icache_phys(page_to_pfn(page) << PAGE_SHIFT);
567#endif 570#endif
diff --git a/arch/ppc/platforms/4xx/ibm440sp.c b/arch/ppc/platforms/4xx/ibm440sp.c
index a203efb47aba..fa3e003a0db9 100644
--- a/arch/ppc/platforms/4xx/ibm440sp.c
+++ b/arch/ppc/platforms/4xx/ibm440sp.c
@@ -36,8 +36,8 @@ static struct ocp_func_emac_data ibm440sp_emac0_def = {
36OCP_SYSFS_EMAC_DATA() 36OCP_SYSFS_EMAC_DATA()
37 37
38static struct ocp_func_mal_data ibm440sp_mal0_def = { 38static struct ocp_func_mal_data ibm440sp_mal0_def = {
39 .num_tx_chans = 4, /* Number of TX channels */ 39 .num_tx_chans = 1, /* Number of TX channels */
40 .num_rx_chans = 4, /* Number of RX channels */ 40 .num_rx_chans = 1, /* Number of RX channels */
41 .txeob_irq = 38, /* TX End Of Buffer IRQ */ 41 .txeob_irq = 38, /* TX End Of Buffer IRQ */
42 .rxeob_irq = 39, /* RX End Of Buffer IRQ */ 42 .rxeob_irq = 39, /* RX End Of Buffer IRQ */
43 .txde_irq = 34, /* TX Descriptor Error IRQ */ 43 .txde_irq = 34, /* TX Descriptor Error IRQ */
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
index e18380258b68..f2748c88665a 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.c
@@ -56,7 +56,6 @@
56#include <syslib/ppc85xx_common.h> 56#include <syslib/ppc85xx_common.h>
57#include <syslib/ppc85xx_setup.h> 57#include <syslib/ppc85xx_setup.h>
58 58
59extern void cpm2_reset(void);
60 59
61/* ************************************************************************ 60/* ************************************************************************
62 * 61 *
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index b52c4317fefd..6267b294f704 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -49,7 +49,7 @@
49#include <asm/mpc85xx.h> 49#include <asm/mpc85xx.h>
50#include <asm/irq.h> 50#include <asm/irq.h>
51#include <asm/immap_85xx.h> 51#include <asm/immap_85xx.h>
52#include <asm/immap_cpm2.h> 52#include <asm/cpm2.h>
53#include <asm/ppc_sys.h> 53#include <asm/ppc_sys.h>
54#include <asm/kgdb.h> 54#include <asm/kgdb.h>
55 55
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
index bb41265cfc85..c99b365d6110 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/arch/ppc/platforms/85xx/stx_gp3.c
@@ -52,14 +52,13 @@
52#include <asm/mpc85xx.h> 52#include <asm/mpc85xx.h>
53#include <asm/irq.h> 53#include <asm/irq.h>
54#include <asm/immap_85xx.h> 54#include <asm/immap_85xx.h>
55#include <asm/immap_cpm2.h> 55#include <asm/cpm2.h>
56#include <asm/mpc85xx.h> 56#include <asm/mpc85xx.h>
57#include <asm/ppc_sys.h> 57#include <asm/ppc_sys.h>
58 58
59#include <syslib/cpm2_pic.h> 59#include <syslib/cpm2_pic.h>
60#include <syslib/ppc85xx_common.h> 60#include <syslib/ppc85xx_common.h>
61 61
62extern void cpm2_reset(void);
63 62
64unsigned char __res[sizeof(bd_t)]; 63unsigned char __res[sizeof(bd_t)];
65 64
diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c
index 4d324b630f4f..b392b9a15987 100644
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
@@ -113,7 +113,7 @@ extern int pmac_newworld;
113extern void zs_kgdb_hook(int tty_num); 113extern void zs_kgdb_hook(int tty_num);
114static void ohare_init(void); 114static void ohare_init(void);
115#ifdef CONFIG_BOOTX_TEXT 115#ifdef CONFIG_BOOTX_TEXT
116void pmac_progress(char *s, unsigned short hex); 116static void pmac_progress(char *s, unsigned short hex);
117#endif 117#endif
118 118
119sys_ctrler_t sys_ctrler = SYS_CTRLER_UNKNOWN; 119sys_ctrler_t sys_ctrler = SYS_CTRLER_UNKNOWN;
@@ -123,7 +123,7 @@ extern struct smp_ops_t psurge_smp_ops;
123extern struct smp_ops_t core99_smp_ops; 123extern struct smp_ops_t core99_smp_ops;
124#endif /* CONFIG_SMP */ 124#endif /* CONFIG_SMP */
125 125
126int __pmac 126static int __pmac
127pmac_show_cpuinfo(struct seq_file *m) 127pmac_show_cpuinfo(struct seq_file *m)
128{ 128{
129 struct device_node *np; 129 struct device_node *np;
@@ -227,7 +227,7 @@ pmac_show_cpuinfo(struct seq_file *m)
227 return 0; 227 return 0;
228} 228}
229 229
230int __openfirmware 230static int __openfirmware
231pmac_show_percpuinfo(struct seq_file *m, int i) 231pmac_show_percpuinfo(struct seq_file *m, int i)
232{ 232{
233#ifdef CONFIG_CPU_FREQ_PMAC 233#ifdef CONFIG_CPU_FREQ_PMAC
@@ -415,7 +415,7 @@ find_ide_boot(void)
415} 415}
416#endif /* CONFIG_BLK_DEV_IDE && CONFIG_BLK_DEV_IDE_PMAC */ 416#endif /* CONFIG_BLK_DEV_IDE && CONFIG_BLK_DEV_IDE_PMAC */
417 417
418void __init 418static void __init
419find_boot_device(void) 419find_boot_device(void)
420{ 420{
421#if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC) 421#if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC)
@@ -512,7 +512,7 @@ note_bootable_part(dev_t dev, int part, int goodness)
512 } 512 }
513} 513}
514 514
515void __pmac 515static void __pmac
516pmac_restart(char *cmd) 516pmac_restart(char *cmd)
517{ 517{
518#ifdef CONFIG_ADB_CUDA 518#ifdef CONFIG_ADB_CUDA
@@ -537,7 +537,7 @@ pmac_restart(char *cmd)
537 } 537 }
538} 538}
539 539
540void __pmac 540static void __pmac
541pmac_power_off(void) 541pmac_power_off(void)
542{ 542{
543#ifdef CONFIG_ADB_CUDA 543#ifdef CONFIG_ADB_CUDA
@@ -562,7 +562,7 @@ pmac_power_off(void)
562 } 562 }
563} 563}
564 564
565void __pmac 565static void __pmac
566pmac_halt(void) 566pmac_halt(void)
567{ 567{
568 pmac_power_off(); 568 pmac_power_off();
@@ -700,7 +700,7 @@ pmac_init(unsigned long r3, unsigned long r4, unsigned long r5,
700} 700}
701 701
702#ifdef CONFIG_BOOTX_TEXT 702#ifdef CONFIG_BOOTX_TEXT
703void __init 703static void __init
704pmac_progress(char *s, unsigned short hex) 704pmac_progress(char *s, unsigned short hex)
705{ 705{
706 if (boot_text_mapped) { 706 if (boot_text_mapped) {
diff --git a/arch/ppc/platforms/prpmc750.c b/arch/ppc/platforms/prpmc750.c
index c894e1ab5934..24ae1caafc61 100644
--- a/arch/ppc/platforms/prpmc750.c
+++ b/arch/ppc/platforms/prpmc750.c
@@ -29,6 +29,7 @@
29#include <linux/ide.h> 29#include <linux/ide.h>
30#include <linux/root_dev.h> 30#include <linux/root_dev.h>
31#include <linux/slab.h> 31#include <linux/slab.h>
32#include <linux/serial_reg.h>
32 33
33#include <asm/byteorder.h> 34#include <asm/byteorder.h>
34#include <asm/system.h> 35#include <asm/system.h>
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index 8b149c2fc54f..21e31346b12b 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -311,19 +311,22 @@ sandpoint_setup_arch(void)
311 { 311 {
312 bd_t *bp = (bd_t *)__res; 312 bd_t *bp = (bd_t *)__res;
313 struct plat_serial8250_port *pdata; 313 struct plat_serial8250_port *pdata;
314 pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC10X_DUART);
315 314
315 pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC10X_UART0);
316 if (pdata) 316 if (pdata)
317 { 317 {
318 pdata[0].uartclk = bp->bi_busfreq; 318 pdata[0].uartclk = bp->bi_busfreq;
319 pdata[0].membase = ioremap(pdata[0].mapbase, 0x100); 319 }
320 320
321 /* this disables the 2nd serial port on the DUART 321#ifdef CONFIG_SANDPOINT_ENABLE_UART1
322 * since the sandpoint does not have it connected */ 322 pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC10X_UART1);
323 pdata[1].uartclk = 0; 323 if (pdata)
324 pdata[1].irq = 0; 324 {
325 pdata[1].mapbase = 0; 325 pdata[0].uartclk = bp->bi_busfreq;
326 } 326 }
327#else
328 ppc_sys_device_remove(MPC10X_UART1);
329#endif
327 } 330 }
328 331
329 printk(KERN_INFO "Motorola SPS Sandpoint Test Platform\n"); 332 printk(KERN_INFO "Motorola SPS Sandpoint Test Platform\n");
diff --git a/arch/ppc/platforms/tqm8260_setup.c b/arch/ppc/platforms/tqm8260_setup.c
index a8880bfc034b..3409139330b1 100644
--- a/arch/ppc/platforms/tqm8260_setup.c
+++ b/arch/ppc/platforms/tqm8260_setup.c
@@ -16,8 +16,8 @@
16 16
17#include <linux/init.h> 17#include <linux/init.h>
18 18
19#include <asm/immap_cpm2.h>
20#include <asm/mpc8260.h> 19#include <asm/mpc8260.h>
20#include <asm/cpm2.h>
21#include <asm/machdep.h> 21#include <asm/machdep.h>
22 22
23static int 23static int
diff --git a/arch/ppc/syslib/cpm2_common.c b/arch/ppc/syslib/cpm2_common.c
index 4c19a4ac7163..cbac44b1620c 100644
--- a/arch/ppc/syslib/cpm2_common.c
+++ b/arch/ppc/syslib/cpm2_common.c
@@ -27,7 +27,6 @@
27#include <asm/mpc8260.h> 27#include <asm/mpc8260.h>
28#include <asm/page.h> 28#include <asm/page.h>
29#include <asm/pgtable.h> 29#include <asm/pgtable.h>
30#include <asm/immap_cpm2.h>
31#include <asm/cpm2.h> 30#include <asm/cpm2.h>
32#include <asm/rheap.h> 31#include <asm/rheap.h>
33 32
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c
index fda75d79050c..8f80a42dfdb7 100644
--- a/arch/ppc/syslib/m8260_setup.c
+++ b/arch/ppc/syslib/m8260_setup.c
@@ -24,7 +24,7 @@
24#include <asm/io.h> 24#include <asm/io.h>
25#include <asm/pgtable.h> 25#include <asm/pgtable.h>
26#include <asm/mpc8260.h> 26#include <asm/mpc8260.h>
27#include <asm/immap_cpm2.h> 27#include <asm/cpm2.h>
28#include <asm/machdep.h> 28#include <asm/machdep.h>
29#include <asm/bootinfo.h> 29#include <asm/bootinfo.h>
30#include <asm/time.h> 30#include <asm/time.h>
@@ -33,7 +33,6 @@
33 33
34unsigned char __res[sizeof(bd_t)]; 34unsigned char __res[sizeof(bd_t)];
35 35
36extern void cpm2_reset(void);
37extern void pq2_find_bridges(void); 36extern void pq2_find_bridges(void);
38extern void pq2pci_init_irq(void); 37extern void pq2pci_init_irq(void);
39extern void idma_pci9_init(void); 38extern void idma_pci9_init(void);
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c
index 5e7a7edcea74..9db58c587b46 100644
--- a/arch/ppc/syslib/m82xx_pci.c
+++ b/arch/ppc/syslib/m82xx_pci.c
@@ -238,9 +238,9 @@ pq2ads_setup_pci(struct pci_controller *hose)
238 * Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]), 238 * Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]),
239 * and local bus for PCI (SIUMCR [LBPC]). 239 * and local bus for PCI (SIUMCR [LBPC]).
240 */ 240 */
241 immap->im_siu_conf.siu_82xx.sc_siumcr = (immap->im_siu_conf.sc_siumcr & 241 immap->im_siu_conf.siu_82xx.sc_siumcr = (immap->im_siu_conf.siu_82xx.sc_siumcr &
242 ~(SIUMCR_L2PC11 | SIUMCR_LBPC11 | SIUMCR_CS10PC11 | SIUMCR_APPC11) | 242 ~(SIUMCR_L2CPC11 | SIUMCR_LBPC11 | SIUMCR_CS10PC11 | SIUMCR_APPC11) |
243 SIUMCR_BBD | SIUMCR_LBPC01 | SIUMCR_DPPC11 | SIUMCR_APPC10; 243 SIUMCR_BBD | SIUMCR_LBPC01 | SIUMCR_DPPC11 | SIUMCR_APPC10);
244#endif 244#endif
245 /* Enable PCI */ 245 /* Enable PCI */
246 immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN); 246 immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN);
diff --git a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c
index 8fc5f4154521..87065e2e4c5f 100644
--- a/arch/ppc/syslib/mpc10x_common.c
+++ b/arch/ppc/syslib/mpc10x_common.c
@@ -45,24 +45,29 @@
45#define MPC10X_DMA0_IRQ (EPIC_IRQ_BASE + 1 + NUM_8259_INTERRUPTS) 45#define MPC10X_DMA0_IRQ (EPIC_IRQ_BASE + 1 + NUM_8259_INTERRUPTS)
46#define MPC10X_DMA1_IRQ (EPIC_IRQ_BASE + 2 + NUM_8259_INTERRUPTS) 46#define MPC10X_DMA1_IRQ (EPIC_IRQ_BASE + 2 + NUM_8259_INTERRUPTS)
47#define MPC10X_UART0_IRQ (EPIC_IRQ_BASE + 4 + NUM_8259_INTERRUPTS) 47#define MPC10X_UART0_IRQ (EPIC_IRQ_BASE + 4 + NUM_8259_INTERRUPTS)
48#define MPC10X_UART1_IRQ (EPIC_IRQ_BASE + 5 + NUM_8259_INTERRUPTS)
48#else 49#else
49#define MPC10X_I2C_IRQ -1 50#define MPC10X_I2C_IRQ -1
50#define MPC10X_DMA0_IRQ -1 51#define MPC10X_DMA0_IRQ -1
51#define MPC10X_DMA1_IRQ -1 52#define MPC10X_DMA1_IRQ -1
52#define MPC10X_UART0_IRQ -1 53#define MPC10X_UART0_IRQ -1
54#define MPC10X_UART1_IRQ -1
53#endif 55#endif
54 56
55static struct fsl_i2c_platform_data mpc10x_i2c_pdata = { 57static struct fsl_i2c_platform_data mpc10x_i2c_pdata = {
56 .device_flags = 0, 58 .device_flags = 0,
57}; 59};
58 60
59static struct plat_serial8250_port serial_platform_data[] = { 61static struct plat_serial8250_port serial_plat_uart0[] = {
60 [0] = { 62 [0] = {
61 .mapbase = 0x4500, 63 .mapbase = 0x4500,
62 .iotype = UPIO_MEM, 64 .iotype = UPIO_MEM,
63 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, 65 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
64 }, 66 },
65 [1] = { 67 { },
68};
69static struct plat_serial8250_port serial_plat_uart1[] = {
70 [0] = {
66 .mapbase = 0x4600, 71 .mapbase = 0x4600,
67 .iotype = UPIO_MEM, 72 .iotype = UPIO_MEM,
68 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, 73 .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
@@ -133,11 +138,17 @@ struct platform_device ppc_sys_platform_devices[] = {
133 }, 138 },
134 }, 139 },
135 }, 140 },
136 [MPC10X_DUART] = { 141 [MPC10X_UART0] = {
137 .name = "serial8250", 142 .name = "serial8250",
138 .id = 0, 143 .id = 0,
139 .dev.platform_data = serial_platform_data, 144 .dev.platform_data = serial_plat_uart0,
140 }, 145 },
146 [MPC10X_UART1] = {
147 .name = "serial8250",
148 .id = 1,
149 .dev.platform_data = serial_plat_uart1,
150 },
151
141}; 152};
142 153
143/* We use the PCI ID to match on */ 154/* We use the PCI ID to match on */
@@ -147,10 +158,10 @@ struct ppc_sys_spec ppc_sys_specs[] = {
147 .ppc_sys_name = "8245", 158 .ppc_sys_name = "8245",
148 .mask = 0xFFFFFFFF, 159 .mask = 0xFFFFFFFF,
149 .value = MPC10X_BRIDGE_8245, 160 .value = MPC10X_BRIDGE_8245,
150 .num_devices = 4, 161 .num_devices = 5,
151 .device_list = (enum ppc_sys_devices[]) 162 .device_list = (enum ppc_sys_devices[])
152 { 163 {
153 MPC10X_IIC1, MPC10X_DMA0, MPC10X_DMA1, MPC10X_DUART, 164 MPC10X_IIC1, MPC10X_DMA0, MPC10X_DMA1, MPC10X_UART0, MPC10X_UART1,
154 }, 165 },
155 }, 166 },
156 { 167 {
@@ -180,6 +191,25 @@ struct ppc_sys_spec ppc_sys_specs[] = {
180 }, 191 },
181}; 192};
182 193
194/*
195 * mach_mpc10x_fixup: This function enables DUART mode if it detects
196 * if it detects two UARTS in the platform device entries.
197 */
198static int __init mach_mpc10x_fixup(struct platform_device *pdev)
199{
200 if (strncmp (pdev->name, "serial8250", 10) == 0 && pdev->id == 1)
201 writeb(readb(serial_plat_uart1[0].membase + 0x11) | 0x1,
202 serial_plat_uart1[0].membase + 0x11);
203 return 0;
204}
205
206static int __init mach_mpc10x_init(void)
207{
208 ppc_sys_device_fixup = mach_mpc10x_fixup;
209 return 0;
210}
211postcore_initcall(mach_mpc10x_init);
212
183/* Set resources to match bridge memory map */ 213/* Set resources to match bridge memory map */
184void __init 214void __init
185mpc10x_bridge_set_resources(int map, struct pci_controller *hose) 215mpc10x_bridge_set_resources(int map, struct pci_controller *hose)
@@ -219,6 +249,7 @@ mpc10x_bridge_set_resources(int map, struct pci_controller *hose)
219 ppc_md.progress("mpc10x:exit1", 0x100); 249 ppc_md.progress("mpc10x:exit1", 0x100);
220 } 250 }
221} 251}
252
222/* 253/*
223 * Do some initialization and put the EUMB registers at the specified address 254 * Do some initialization and put the EUMB registers at the specified address
224 * (also map the EPIC registers into virtual space--OpenPIC_Addr will be set). 255 * (also map the EPIC registers into virtual space--OpenPIC_Addr will be set).
@@ -411,11 +442,13 @@ mpc10x_bridge_init(struct pci_controller *hose,
411 ppc_sys_platform_devices[MPC10X_DMA1].resource[1].start = MPC10X_DMA1_IRQ; 442 ppc_sys_platform_devices[MPC10X_DMA1].resource[1].start = MPC10X_DMA1_IRQ;
412 ppc_sys_platform_devices[MPC10X_DMA1].resource[1].end = MPC10X_DMA1_IRQ; 443 ppc_sys_platform_devices[MPC10X_DMA1].resource[1].end = MPC10X_DMA1_IRQ;
413 444
414 serial_platform_data[0].mapbase += phys_eumb_base; 445 serial_plat_uart0[0].mapbase += phys_eumb_base;
415 serial_platform_data[0].irq = MPC10X_UART0_IRQ; 446 serial_plat_uart0[0].irq = MPC10X_UART0_IRQ;
447 serial_plat_uart0[0].membase = ioremap(serial_plat_uart0[0].mapbase, 0x100);
416 448
417 serial_platform_data[1].mapbase += phys_eumb_base; 449 serial_plat_uart1[0].mapbase += phys_eumb_base;
418 serial_platform_data[1].irq = MPC10X_UART0_IRQ + 1; 450 serial_plat_uart1[0].irq = MPC10X_UART1_IRQ;
451 serial_plat_uart1[0].membase = ioremap(serial_plat_uart1[0].mapbase, 0x100);
419 452
420 /* 453 /*
421 * 8240 erratum 26, 8241/8245 erratum 29, 107 erratum 23: speculative 454 * 8240 erratum 26, 8241/8245 erratum 29, 107 erratum 23: speculative
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index ca95d79a704e..b7242f1bd931 100644
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -233,14 +233,14 @@ mpc85xx_setup_pci2(struct pci_controller *hose)
233 pci->powbar1 = (MPC85XX_PCI2_LOWER_MEM >> 12) & 0x000fffff; 233 pci->powbar1 = (MPC85XX_PCI2_LOWER_MEM >> 12) & 0x000fffff;
234 /* Enable, Mem R/W */ 234 /* Enable, Mem R/W */
235 pci->powar1 = 0x80044000 | 235 pci->powar1 = 0x80044000 |
236 (__ilog2(MPC85XX_PCI1_UPPER_MEM - MPC85XX_PCI1_LOWER_MEM + 1) - 1); 236 (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
237 237
238 /* Setup outboud IO windows @ MPC85XX_PCI2_IO_BASE */ 238 /* Setup outboud IO windows @ MPC85XX_PCI2_IO_BASE */
239 pci->potar2 = 0x00000000; 239 pci->potar2 = 0x00000000;
240 pci->potear2 = 0x00000000; 240 pci->potear2 = 0x00000000;
241 pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff; 241 pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
242 /* Enable, IO R/W */ 242 /* Enable, IO R/W */
243 pci->powar2 = 0x80088000 | (__ilog2(MPC85XX_PCI1_IO_SIZE) - 1); 243 pci->powar2 = 0x80088000 | (__ilog2(MPC85XX_PCI2_IO_SIZE) - 1);
244 244
245 /* Setup 2G inbound Memory Window @ 0 */ 245 /* Setup 2G inbound Memory Window @ 0 */
246 pci->pitar1 = 0x00000000; 246 pci->pitar1 = 0x00000000;
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-13 15:45:15 -0500