aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/lib/csum_ipv6_magic.S51
-rw-r--r--arch/alpha/lib/ev6-csum_ipv6_magic.S42
-rw-r--r--arch/avr32/boards/atngw100/setup.c3
-rw-r--r--arch/avr32/configs/atngw100_defconfig152
-rw-r--r--arch/avr32/configs/atstk1002_defconfig180
-rw-r--r--arch/avr32/mach-at32ap/at32ap7000.c12
-rw-r--r--arch/avr32/mm/cache.c14
-rw-r--r--arch/blackfin/kernel/setup.c8
-rw-r--r--arch/blackfin/kernel/traps.c141
-rw-r--r--arch/blackfin/lib/memcmp.S5
-rw-r--r--arch/blackfin/lib/memcpy.S13
-rw-r--r--arch/blackfin/lib/memmove.S17
-rw-r--r--arch/blackfin/mach-common/cache.S20
-rw-r--r--arch/blackfin/mach-common/interrupt.S2
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/Kconfig.cpu2
-rw-r--r--arch/i386/kernel/acpi/wakeup.S2
-rw-r--r--arch/i386/kernel/cpu/mtrr/generic.c4
-rw-r--r--arch/i386/kernel/cpu/mtrr/main.c2
-rw-r--r--arch/i386/kernel/pci-dma.c27
-rw-r--r--arch/i386/mm/init.c3
-rw-r--r--arch/i386/mm/pageattr.c30
-rw-r--r--arch/m68k/Kconfig3
-rw-r--r--arch/mips/Kconfig5
-rw-r--r--arch/mips/au1000/pb1100/init.c2
-rw-r--r--arch/mips/au1000/pb1500/board_setup.c2
-rw-r--r--arch/mips/cobalt/pci.c1
-rw-r--r--arch/mips/configs/emma2rh_defconfig3
-rw-r--r--arch/mips/kernel/cpu-probe.c12
-rw-r--r--arch/mips/kernel/signal32.c62
-rw-r--r--arch/mips/kernel/signal_n32.c6
-rw-r--r--arch/mips/kernel/smtc.c6
-rw-r--r--arch/mips/kernel/time.c13
-rw-r--r--arch/mips/kernel/traps.c20
-rw-r--r--arch/mips/lib/ucmpdi2.c2
-rw-r--r--arch/mips/mips-boards/atlas/atlas_int.c8
-rw-r--r--arch/mips/mips-boards/generic/time.c50
-rw-r--r--arch/mips/mips-boards/malta/malta_int.c14
-rw-r--r--arch/mips/mips-boards/sead/sead_int.c2
-rw-r--r--arch/mips/mips-boards/sead/sead_setup.c2
-rw-r--r--arch/mips/mips-boards/sim/sim_int.c2
-rw-r--r--arch/mips/mips-boards/sim/sim_time.c8
-rw-r--r--arch/parisc/kernel/unwind.c43
-rw-r--r--arch/powerpc/configs/cell_defconfig243
-rw-r--r--arch/powerpc/configs/celleb_defconfig169
-rw-r--r--arch/powerpc/configs/chrp32_defconfig353
-rw-r--r--arch/powerpc/configs/ebony_defconfig138
-rw-r--r--arch/powerpc/configs/g5_defconfig342
-rw-r--r--arch/powerpc/configs/holly_defconfig125
-rw-r--r--arch/powerpc/configs/iseries_defconfig36
-rw-r--r--arch/powerpc/configs/linkstation_defconfig384
-rw-r--r--arch/powerpc/configs/lite5200_defconfig182
-rw-r--r--arch/powerpc/configs/maple_defconfig248
-rw-r--r--arch/powerpc/configs/pasemi_defconfig58
-rw-r--r--arch/powerpc/configs/pmac32_defconfig375
-rw-r--r--arch/powerpc/configs/ppc64_defconfig460
-rw-r--r--arch/powerpc/configs/prpmc2800_defconfig98
-rw-r--r--arch/powerpc/configs/ps3_defconfig79
-rw-r--r--arch/powerpc/configs/pseries_defconfig387
-rw-r--r--arch/powerpc/kernel/signal_64.c10
-rw-r--r--arch/powerpc/kernel/vdso32/gettimeofday.S4
-rw-r--r--arch/powerpc/kernel/vdso64/gettimeofday.S7
-rw-r--r--arch/powerpc/lib/rheap.c48
-rw-r--r--arch/powerpc/mm/fault.c5
-rw-r--r--arch/powerpc/platforms/powermac/setup.c3
-rw-r--r--arch/s390/appldata/appldata_base.c5
-rw-r--r--arch/s390/kernel/entry.S8
-rw-r--r--arch/s390/kernel/entry64.S8
-rw-r--r--arch/s390/kernel/setup.c1
-rw-r--r--arch/s390/kernel/traps.c9
-rw-r--r--arch/sh/kernel/signal.c9
-rw-r--r--arch/sh/kernel/traps.c3
-rw-r--r--arch/sh64/kernel/signal.c1
-rw-r--r--arch/x86_64/ia32/ia32entry.S6
-rw-r--r--arch/x86_64/ia32/sys_ia32.c19
-rw-r--r--arch/x86_64/kernel/entry.S7
-rw-r--r--arch/x86_64/kernel/mce.c6
-rw-r--r--arch/x86_64/kernel/pci-dma.c12
-rw-r--r--arch/x86_64/kernel/setup64.c3
-rw-r--r--arch/x86_64/mm/init.c5
-rw-r--r--arch/x86_64/mm/pageattr.c7
81 files changed, 2385 insertions, 2476 deletions
diff --git a/arch/alpha/lib/csum_ipv6_magic.S b/arch/alpha/lib/csum_ipv6_magic.S
index e09748dbf2ed..2c2acb96deb6 100644
--- a/arch/alpha/lib/csum_ipv6_magic.S
+++ b/arch/alpha/lib/csum_ipv6_magic.S
@@ -7,6 +7,9 @@
7 * __u32 len, 7 * __u32 len,
8 * unsigned short proto, 8 * unsigned short proto,
9 * unsigned int csum); 9 * unsigned int csum);
10 *
11 * Misalignment handling (which costs 16 instructions / 8 cycles)
12 * added by Ivan Kokshaysky <ink@jurassic.park.msu.ru>
10 */ 13 */
11 14
12 .globl csum_ipv6_magic 15 .globl csum_ipv6_magic
@@ -16,37 +19,57 @@
16csum_ipv6_magic: 19csum_ipv6_magic:
17 .prologue 0 20 .prologue 0
18 21
19 ldq $0,0($16) # e0 : load src & dst addr words 22 ldq_u $0,0($16) # e0 : load src & dst addr words
20 zapnot $20,15,$20 # .. e1 : zero extend incoming csum 23 zapnot $20,15,$20 # .. e1 : zero extend incoming csum
21 extqh $18,1,$4 # e0 : byte swap len & proto while we wait 24 extqh $18,1,$4 # e0 : byte swap len & proto while we wait
22 ldq $1,8($16) # .. e1 : 25 ldq_u $21,7($16) # .. e1 : handle misalignment
23 26
24 extbl $18,1,$5 # e0 : 27 extbl $18,1,$5 # e0 :
25 ldq $2,0($17) # .. e1 : 28 ldq_u $1,8($16) # .. e1 :
26 extbl $18,2,$6 # e0 : 29 extbl $18,2,$6 # e0 :
27 ldq $3,8($17) # .. e1 : 30 ldq_u $22,15($16) # .. e1 :
28 31
29 extbl $18,3,$18 # e0 : 32 extbl $18,3,$18 # e0 :
33 ldq_u $2,0($17) # .. e1 :
30 sra $4,32,$4 # e0 : 34 sra $4,32,$4 # e0 :
35 ldq_u $23,7($17) # .. e1 :
36
37 extql $0,$16,$0 # e0 :
38 ldq_u $3,8($17) # .. e1 :
39 extqh $21,$16,$21 # e0 :
40 ldq_u $24,15($17) # .. e1 :
41
31 sll $5,16,$5 # e0 : 42 sll $5,16,$5 # e0 :
43 or $0,$21,$0 # .. e1 : 1st src word complete
44 extql $1,$16,$1 # e0 :
32 addq $20,$0,$20 # .. e1 : begin summing the words 45 addq $20,$0,$20 # .. e1 : begin summing the words
33 46
34 sll $6,8,$6 # e0 : 47 extqh $22,$16,$22 # e0 :
35 cmpult $20,$0,$0 # .. e1 : 48 cmpult $20,$0,$0 # .. e1 :
36 extwh $19,7,$7 # e0 : 49 sll $6,8,$6 # e0 :
37 or $4,$18,$18 # .. e1 : 50 or $1,$22,$1 # .. e1 : 2nd src word complete
38 51
39 extbl $19,1,$19 # e0 : 52 extql $2,$17,$2 # e0 :
53 or $4,$18,$18 # .. e1 :
54 extqh $23,$17,$23 # e0 :
40 or $5,$6,$5 # .. e1 : 55 or $5,$6,$5 # .. e1 :
41 or $18,$5,$18 # e0 : len complete
42 or $19,$7,$19 # .. e1 :
43 56
44 sll $19,48,$19 # e0 : 57 extql $3,$17,$3 # e0 :
58 or $2,$23,$2 # .. e1 : 1st dst word complete
59 extqh $24,$17,$24 # e0 :
60 or $18,$5,$18 # .. e1 : len complete
61
62 extwh $19,7,$7 # e0 :
63 or $3,$24,$3 # .. e1 : 2nd dst word complete
64 extbl $19,1,$19 # e0 :
45 addq $20,$1,$20 # .. e1 : 65 addq $20,$1,$20 # .. e1 :
46 sra $19,32,$19 # e0 : proto complete 66
67 or $19,$7,$19 # e0 :
47 cmpult $20,$1,$1 # .. e1 : 68 cmpult $20,$1,$1 # .. e1 :
69 sll $19,48,$19 # e0 :
70 nop # .. e0 :
48 71
49 nop # e0 : 72 sra $19,32,$19 # e0 : proto complete
50 addq $20,$2,$20 # .. e1 : 73 addq $20,$2,$20 # .. e1 :
51 cmpult $20,$2,$2 # e0 : 74 cmpult $20,$2,$2 # e0 :
52 addq $20,$3,$20 # .. e1 : 75 addq $20,$3,$20 # .. e1 :
@@ -84,7 +107,7 @@ csum_ipv6_magic:
84 extwl $0,2,$1 # e0 : fold 17-bit value 107 extwl $0,2,$1 # e0 : fold 17-bit value
85 zapnot $0,3,$0 # .. e1 : 108 zapnot $0,3,$0 # .. e1 :
86 addq $0,$1,$0 # e0 : 109 addq $0,$1,$0 # e0 :
87 not $0,$0 # e1 : and complement. 110 not $0,$0 # .. e1 : and complement.
88 111
89 zapnot $0,3,$0 # e0 : 112 zapnot $0,3,$0 # e0 :
90 ret # .. e1 : 113 ret # .. e1 :
diff --git a/arch/alpha/lib/ev6-csum_ipv6_magic.S b/arch/alpha/lib/ev6-csum_ipv6_magic.S
index de1948a69118..fc0bc399f872 100644
--- a/arch/alpha/lib/ev6-csum_ipv6_magic.S
+++ b/arch/alpha/lib/ev6-csum_ipv6_magic.S
@@ -46,6 +46,10 @@
46 * add the 3 low ushorts together, generating a uint 46 * add the 3 low ushorts together, generating a uint
47 * a final add of the 2 lower ushorts 47 * a final add of the 2 lower ushorts
48 * truncating the result. 48 * truncating the result.
49 *
50 * Misalignment handling added by Ivan Kokshaysky <ink@jurassic.park.msu.ru>
51 * The cost is 16 instructions (~8 cycles), including two extra loads which
52 * may cause additional delay in rare cases (load-load replay traps).
49 */ 53 */
50 54
51 .globl csum_ipv6_magic 55 .globl csum_ipv6_magic
@@ -55,25 +59,45 @@
55csum_ipv6_magic: 59csum_ipv6_magic:
56 .prologue 0 60 .prologue 0
57 61
58 ldq $0,0($16) # L : Latency: 3 62 ldq_u $0,0($16) # L : Latency: 3
59 inslh $18,7,$4 # U : 0000000000AABBCC 63 inslh $18,7,$4 # U : 0000000000AABBCC
60 ldq $1,8($16) # L : Latency: 3 64 ldq_u $1,8($16) # L : Latency: 3
61 sll $19,8,$7 # U : U L U L : 0x00000000 00aabb00 65 sll $19,8,$7 # U : U L U L : 0x00000000 00aabb00
62 66
67 and $16,7,$6 # E : src misalignment
68 ldq_u $5,15($16) # L : Latency: 3
63 zapnot $20,15,$20 # U : zero extend incoming csum 69 zapnot $20,15,$20 # U : zero extend incoming csum
64 ldq $2,0($17) # L : Latency: 3 70 ldq_u $2,0($17) # L : U L U L : Latency: 3
65 sll $19,24,$19 # U : U L L U : 0x000000aa bb000000 71
72 extql $0,$6,$0 # U :
73 extqh $1,$6,$22 # U :
74 ldq_u $3,8($17) # L : Latency: 3
75 sll $19,24,$19 # U : U U L U : 0x000000aa bb000000
76
77 cmoveq $6,$31,$22 # E : src aligned?
78 ldq_u $23,15($17) # L : Latency: 3
66 inswl $18,3,$18 # U : 000000CCDD000000 79 inswl $18,3,$18 # U : 000000CCDD000000
80 addl $19,$7,$19 # E : U L U L : <sign bits>bbaabb00
67 81
68 ldq $3,8($17) # L : Latency: 3 82 or $0,$22,$0 # E : 1st src word complete
69 bis $18,$4,$18 # E : 000000CCDDAABBCC 83 extql $1,$6,$1 # U :
70 addl $19,$7,$19 # E : <sign bits>bbaabb00 84 or $18,$4,$18 # E : 000000CCDDAABBCC
71 nop # E : U L U L 85 extqh $5,$6,$5 # U : L U L U
72 86
87 and $17,7,$6 # E : dst misalignment
88 extql $2,$6,$2 # U :
89 or $1,$5,$1 # E : 2nd src word complete
90 extqh $3,$6,$22 # U : L U L U :
91
92 cmoveq $6,$31,$22 # E : dst aligned?
93 extql $3,$6,$3 # U :
73 addq $20,$0,$20 # E : begin summing the words 94 addq $20,$0,$20 # E : begin summing the words
95 extqh $23,$6,$23 # U : L U L U :
96
74 srl $18,16,$4 # U : 0000000000CCDDAA 97 srl $18,16,$4 # U : 0000000000CCDDAA
98 or $2,$22,$2 # E : 1st dst word complete
75 zap $19,0x3,$19 # U : <sign bits>bbaa0000 99 zap $19,0x3,$19 # U : <sign bits>bbaa0000
76 nop # E : L U U L 100 or $3,$23,$3 # E : U L U L : 2nd dst word complete
77 101
78 cmpult $20,$0,$0 # E : 102 cmpult $20,$0,$0 # E :
79 addq $20,$1,$20 # E : 103 addq $20,$1,$20 # E :
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 9bc37d4f6687..6c4dc0a00e9f 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -94,9 +94,6 @@ static void __init set_hw_addr(struct platform_device *pdev)
94 clk_put(pclk); 94 clk_put(pclk);
95} 95}
96 96
97struct platform_device *at32_usart_map[1];
98unsigned int at32_nr_usarts = 1;
99
100void __init setup_board(void) 97void __init setup_board(void)
101{ 98{
102 at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */ 99 at32_map_usart(1, 0); /* USART 1: /dev/ttyS0, DB9 */
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index c254ffcfa458..49493ad3b5a9 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_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.21-rc6 3# Linux kernel version: 2.6.22-rc5
4# Thu Apr 12 16:35:07 2007 4# Sat Jun 23 15:40:05 2007
5# 5#
6CONFIG_AVR32=y 6CONFIG_AVR32=y
7CONFIG_GENERIC_GPIO=y 7CONFIG_GENERIC_GPIO=y
@@ -40,6 +40,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
40# CONFIG_UTS_NS is not set 40# CONFIG_UTS_NS is not set
41# CONFIG_AUDIT is not set 41# CONFIG_AUDIT is not set
42# CONFIG_IKCONFIG is not set 42# CONFIG_IKCONFIG is not set
43CONFIG_LOG_BUF_SHIFT=14
43CONFIG_SYSFS_DEPRECATED=y 44CONFIG_SYSFS_DEPRECATED=y
44# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
45CONFIG_BLK_DEV_INITRD=y 46CONFIG_BLK_DEV_INITRD=y
@@ -57,14 +58,20 @@ CONFIG_BUG=y
57CONFIG_ELF_CORE=y 58CONFIG_ELF_CORE=y
58# CONFIG_BASE_FULL is not set 59# CONFIG_BASE_FULL is not set
59CONFIG_FUTEX=y 60CONFIG_FUTEX=y
61CONFIG_ANON_INODES=y
60CONFIG_EPOLL=y 62CONFIG_EPOLL=y
63CONFIG_SIGNALFD=y
64CONFIG_TIMERFD=y
65CONFIG_EVENTFD=y
61CONFIG_SHMEM=y 66CONFIG_SHMEM=y
62CONFIG_SLAB=y
63CONFIG_VM_EVENT_COUNTERS=y 67CONFIG_VM_EVENT_COUNTERS=y
68# CONFIG_SLUB_DEBUG is not set
69# CONFIG_SLAB is not set
70CONFIG_SLUB=y
71# CONFIG_SLOB is not set
64CONFIG_RT_MUTEXES=y 72CONFIG_RT_MUTEXES=y
65# CONFIG_TINY_SHMEM is not set 73# CONFIG_TINY_SHMEM is not set
66CONFIG_BASE_SMALL=1 74CONFIG_BASE_SMALL=1
67# CONFIG_SLOB is not set
68 75
69# 76#
70# Loadable module support 77# Loadable module support
@@ -148,6 +155,7 @@ CONFIG_CMDLINE=""
148# 155#
149# Bus options 156# Bus options
150# 157#
158# CONFIG_ARCH_SUPPORTS_MSI is not set
151 159
152# 160#
153# PCCARD (PCMCIA/CardBus) support 161# PCCARD (PCMCIA/CardBus) support
@@ -168,7 +176,6 @@ CONFIG_NET=y
168# 176#
169# Networking options 177# Networking options
170# 178#
171# CONFIG_NETDEBUG is not set
172CONFIG_PACKET=y 179CONFIG_PACKET=y
173CONFIG_PACKET_MMAP=y 180CONFIG_PACKET_MMAP=y
174CONFIG_UNIX=y 181CONFIG_UNIX=y
@@ -212,14 +219,11 @@ CONFIG_INET_TCP_DIAG=y
212CONFIG_TCP_CONG_CUBIC=y 219CONFIG_TCP_CONG_CUBIC=y
213CONFIG_DEFAULT_TCP_CONG="cubic" 220CONFIG_DEFAULT_TCP_CONG="cubic"
214# CONFIG_TCP_MD5SIG is not set 221# CONFIG_TCP_MD5SIG is not set
215
216#
217# IP: Virtual Server Configuration
218#
219# CONFIG_IP_VS is not set 222# CONFIG_IP_VS is not set
220CONFIG_IPV6=y 223CONFIG_IPV6=y
221# CONFIG_IPV6_PRIVACY is not set 224# CONFIG_IPV6_PRIVACY is not set
222# CONFIG_IPV6_ROUTER_PREF is not set 225# CONFIG_IPV6_ROUTER_PREF is not set
226# CONFIG_IPV6_OPTIMISTIC_DAD is not set
223CONFIG_INET6_AH=y 227CONFIG_INET6_AH=y
224CONFIG_INET6_ESP=y 228CONFIG_INET6_ESP=y
225CONFIG_INET6_IPCOMP=y 229CONFIG_INET6_IPCOMP=y
@@ -242,8 +246,6 @@ CONFIG_NETFILTER=y
242# 246#
243# CONFIG_NETFILTER_NETLINK is not set 247# CONFIG_NETFILTER_NETLINK is not set
244CONFIG_NF_CONNTRACK_ENABLED=m 248CONFIG_NF_CONNTRACK_ENABLED=m
245CONFIG_NF_CONNTRACK_SUPPORT=y
246# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
247CONFIG_NF_CONNTRACK=m 249CONFIG_NF_CONNTRACK=m
248CONFIG_NF_CT_ACCT=y 250CONFIG_NF_CT_ACCT=y
249CONFIG_NF_CONNTRACK_MARK=y 251CONFIG_NF_CONNTRACK_MARK=y
@@ -357,20 +359,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m
357CONFIG_IP6_NF_MANGLE=m 359CONFIG_IP6_NF_MANGLE=m
358CONFIG_IP6_NF_TARGET_HL=m 360CONFIG_IP6_NF_TARGET_HL=m
359CONFIG_IP6_NF_RAW=m 361CONFIG_IP6_NF_RAW=m
360
361#
362# DCCP Configuration (EXPERIMENTAL)
363#
364# CONFIG_IP_DCCP is not set 362# CONFIG_IP_DCCP is not set
365
366#
367# SCTP Configuration (EXPERIMENTAL)
368#
369# CONFIG_IP_SCTP is not set 363# CONFIG_IP_SCTP is not set
370
371#
372# TIPC Configuration (EXPERIMENTAL)
373#
374# CONFIG_TIPC is not set 364# CONFIG_TIPC is not set
375# CONFIG_ATM is not set 365# CONFIG_ATM is not set
376# CONFIG_BRIDGE is not set 366# CONFIG_BRIDGE is not set
@@ -397,7 +387,16 @@ CONFIG_NET_CLS_ROUTE=y
397# CONFIG_HAMRADIO is not set 387# CONFIG_HAMRADIO is not set
398# CONFIG_IRDA is not set 388# CONFIG_IRDA is not set
399# CONFIG_BT is not set 389# CONFIG_BT is not set
390# CONFIG_AF_RXRPC is not set
391
392#
393# Wireless
394#
395# CONFIG_CFG80211 is not set
396# CONFIG_WIRELESS_EXT is not set
397# CONFIG_MAC80211 is not set
400# CONFIG_IEEE80211 is not set 398# CONFIG_IEEE80211 is not set
399# CONFIG_RFKILL is not set
401 400
402# 401#
403# Device Drivers 402# Device Drivers
@@ -417,10 +416,6 @@ CONFIG_STANDALONE=y
417# Connector - unified userspace <-> kernelspace linker 416# Connector - unified userspace <-> kernelspace linker
418# 417#
419# CONFIG_CONNECTOR is not set 418# CONFIG_CONNECTOR is not set
420
421#
422# Memory Technology Devices (MTD)
423#
424CONFIG_MTD=y 419CONFIG_MTD=y
425# CONFIG_MTD_DEBUG is not set 420# CONFIG_MTD_DEBUG is not set
426# CONFIG_MTD_CONCAT is not set 421# CONFIG_MTD_CONCAT is not set
@@ -464,7 +459,6 @@ CONFIG_MTD_CFI_UTIL=y
464# CONFIG_MTD_RAM is not set 459# CONFIG_MTD_RAM is not set
465# CONFIG_MTD_ROM is not set 460# CONFIG_MTD_ROM is not set
466# CONFIG_MTD_ABSENT is not set 461# CONFIG_MTD_ABSENT is not set
467# CONFIG_MTD_OBSOLETE_CHIPS is not set
468 462
469# 463#
470# Mapping drivers for chip access 464# Mapping drivers for chip access
@@ -492,16 +486,13 @@ CONFIG_MTD_DATAFLASH=y
492# CONFIG_MTD_DOC2000 is not set 486# CONFIG_MTD_DOC2000 is not set
493# CONFIG_MTD_DOC2001 is not set 487# CONFIG_MTD_DOC2001 is not set
494# CONFIG_MTD_DOC2001PLUS is not set 488# CONFIG_MTD_DOC2001PLUS is not set
495
496#
497# NAND Flash Device Drivers
498#
499# CONFIG_MTD_NAND is not set 489# CONFIG_MTD_NAND is not set
490# CONFIG_MTD_ONENAND is not set
500 491
501# 492#
502# OneNAND Flash Device Drivers 493# UBI - Unsorted block images
503# 494#
504# CONFIG_MTD_ONENAND is not set 495# CONFIG_MTD_UBI is not set
505 496
506# 497#
507# Parallel port support 498# Parallel port support
@@ -530,10 +521,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
530# 521#
531# Misc devices 522# Misc devices
532# 523#
533 524# CONFIG_BLINK is not set
534#
535# ATA/ATAPI/MFM/RLL support
536#
537# CONFIG_IDE is not set 525# CONFIG_IDE is not set
538 526
539# 527#
@@ -542,10 +530,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
542# CONFIG_RAID_ATTRS is not set 530# CONFIG_RAID_ATTRS is not set
543# CONFIG_SCSI is not set 531# CONFIG_SCSI is not set
544# CONFIG_SCSI_NETLINK is not set 532# CONFIG_SCSI_NETLINK is not set
545
546#
547# Serial ATA (prod) and Parallel ATA (experimental) drivers
548#
549# CONFIG_ATA is not set 533# CONFIG_ATA is not set
550 534
551# 535#
@@ -554,19 +538,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
554# CONFIG_MD is not set 538# CONFIG_MD is not set
555 539
556# 540#
557# Fusion MPT device support
558#
559# CONFIG_FUSION is not set
560
561#
562# IEEE 1394 (FireWire) support
563#
564
565#
566# I2O device support
567#
568
569#
570# Network device support 541# Network device support
571# 542#
572CONFIG_NETDEVICES=y 543CONFIG_NETDEVICES=y
@@ -574,10 +545,6 @@ CONFIG_NETDEVICES=y
574# CONFIG_BONDING is not set 545# CONFIG_BONDING is not set
575# CONFIG_EQUALIZER is not set 546# CONFIG_EQUALIZER is not set
576CONFIG_TUN=m 547CONFIG_TUN=m
577
578#
579# PHY device support
580#
581# CONFIG_PHYLIB is not set 548# CONFIG_PHYLIB is not set
582 549
583# 550#
@@ -586,27 +553,14 @@ CONFIG_TUN=m
586CONFIG_NET_ETHERNET=y 553CONFIG_NET_ETHERNET=y
587CONFIG_MII=y 554CONFIG_MII=y
588CONFIG_MACB=y 555CONFIG_MACB=y
556# CONFIG_NETDEV_1000 is not set
557# CONFIG_NETDEV_10000 is not set
589 558
590# 559#
591# Ethernet (1000 Mbit) 560# Wireless LAN
592#
593
594#
595# Ethernet (10000 Mbit)
596#
597
598#
599# Token Ring devices
600#
601
602#
603# Wireless LAN (non-hamradio)
604#
605# CONFIG_NET_RADIO is not set
606
607#
608# Wan interfaces
609# 561#
562# CONFIG_WLAN_PRE80211 is not set
563# CONFIG_WLAN_80211 is not set
610# CONFIG_WAN is not set 564# CONFIG_WAN is not set
611CONFIG_PPP=m 565CONFIG_PPP=m
612# CONFIG_PPP_MULTILINK is not set 566# CONFIG_PPP_MULTILINK is not set
@@ -671,15 +625,10 @@ CONFIG_UNIX98_PTYS=y
671# IPMI 625# IPMI
672# 626#
673# CONFIG_IPMI_HANDLER is not set 627# CONFIG_IPMI_HANDLER is not set
674
675#
676# Watchdog Cards
677#
678# CONFIG_WATCHDOG is not set 628# CONFIG_WATCHDOG is not set
679# CONFIG_HW_RANDOM is not set 629# CONFIG_HW_RANDOM is not set
680# CONFIG_RTC is not set 630# CONFIG_RTC is not set
681# CONFIG_GEN_RTC is not set 631# CONFIG_GEN_RTC is not set
682# CONFIG_DTLK is not set
683# CONFIG_R3964 is not set 632# CONFIG_R3964 is not set
684# CONFIG_RAW_DRIVER is not set 633# CONFIG_RAW_DRIVER is not set
685 634
@@ -687,10 +636,6 @@ CONFIG_UNIX98_PTYS=y
687# TPM devices 636# TPM devices
688# 637#
689# CONFIG_TCG_TPM is not set 638# CONFIG_TCG_TPM is not set
690
691#
692# I2C support
693#
694# CONFIG_I2C is not set 639# CONFIG_I2C is not set
695 640
696# 641#
@@ -710,17 +655,13 @@ CONFIG_SPI_ATMEL=y
710# SPI Protocol Masters 655# SPI Protocol Masters
711# 656#
712# CONFIG_SPI_AT25 is not set 657# CONFIG_SPI_AT25 is not set
658# CONFIG_SPI_SPIDEV is not set
713 659
714# 660#
715# Dallas's 1-wire bus 661# Dallas's 1-wire bus
716# 662#
717# CONFIG_W1 is not set 663# CONFIG_W1 is not set
718
719#
720# Hardware Monitoring support
721#
722# CONFIG_HWMON is not set 664# CONFIG_HWMON is not set
723# CONFIG_HWMON_VID is not set
724 665
725# 666#
726# Multifunction device drivers 667# Multifunction device drivers
@@ -731,16 +672,19 @@ CONFIG_SPI_ATMEL=y
731# Multimedia devices 672# Multimedia devices
732# 673#
733# CONFIG_VIDEO_DEV is not set 674# CONFIG_VIDEO_DEV is not set
675# CONFIG_DVB_CORE is not set
676# CONFIG_DAB is not set
734 677
735# 678#
736# Digital Video Broadcasting Devices 679# Graphics support
737# 680#
738# CONFIG_DVB is not set 681# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
739 682
740# 683#
741# Graphics support 684# Display device support
742# 685#
743# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 686# CONFIG_DISPLAY_SUPPORT is not set
687# CONFIG_VGASTATE is not set
744# CONFIG_FB is not set 688# CONFIG_FB is not set
745 689
746# 690#
@@ -763,10 +707,6 @@ CONFIG_SPI_ATMEL=y
763# USB Gadget Support 707# USB Gadget Support
764# 708#
765# CONFIG_USB_GADGET is not set 709# CONFIG_USB_GADGET is not set
766
767#
768# MMC/SD Card support
769#
770# CONFIG_MMC is not set 710# CONFIG_MMC is not set
771 711
772# 712#
@@ -809,14 +749,6 @@ CONFIG_SPI_ATMEL=y
809# 749#
810 750
811# 751#
812# Auxiliary Display support
813#
814
815#
816# Virtualization
817#
818
819#
820# File systems 752# File systems
821# 753#
822CONFIG_EXT2_FS=y 754CONFIG_EXT2_FS=y
@@ -911,6 +843,7 @@ CONFIG_LOCKD=y
911CONFIG_LOCKD_V4=y 843CONFIG_LOCKD_V4=y
912CONFIG_NFS_COMMON=y 844CONFIG_NFS_COMMON=y
913CONFIG_SUNRPC=y 845CONFIG_SUNRPC=y
846# CONFIG_SUNRPC_BIND34 is not set
914# CONFIG_RPCSEC_GSS_KRB5 is not set 847# CONFIG_RPCSEC_GSS_KRB5 is not set
915# CONFIG_RPCSEC_GSS_SPKM3 is not set 848# CONFIG_RPCSEC_GSS_SPKM3 is not set
916CONFIG_SMB_FS=m 849CONFIG_SMB_FS=m
@@ -993,11 +926,9 @@ CONFIG_MAGIC_SYSRQ=y
993# CONFIG_HEADERS_CHECK is not set 926# CONFIG_HEADERS_CHECK is not set
994CONFIG_DEBUG_KERNEL=y 927CONFIG_DEBUG_KERNEL=y
995# CONFIG_DEBUG_SHIRQ is not set 928# CONFIG_DEBUG_SHIRQ is not set
996CONFIG_LOG_BUF_SHIFT=14
997CONFIG_DETECT_SOFTLOCKUP=y 929CONFIG_DETECT_SOFTLOCKUP=y
998# CONFIG_SCHEDSTATS is not set 930# CONFIG_SCHEDSTATS is not set
999# CONFIG_TIMER_STATS is not set 931# CONFIG_TIMER_STATS is not set
1000# CONFIG_DEBUG_SLAB is not set
1001# CONFIG_DEBUG_RT_MUTEXES is not set 932# CONFIG_DEBUG_RT_MUTEXES is not set
1002# CONFIG_RT_MUTEX_TESTER is not set 933# CONFIG_RT_MUTEX_TESTER is not set
1003# CONFIG_DEBUG_SPINLOCK is not set 934# CONFIG_DEBUG_SPINLOCK is not set
@@ -1044,6 +975,7 @@ CONFIG_CRYPTO_ECB=m
1044CONFIG_CRYPTO_CBC=y 975CONFIG_CRYPTO_CBC=y
1045CONFIG_CRYPTO_PCBC=m 976CONFIG_CRYPTO_PCBC=m
1046# CONFIG_CRYPTO_LRW is not set 977# CONFIG_CRYPTO_LRW is not set
978# CONFIG_CRYPTO_CRYPTD is not set
1047CONFIG_CRYPTO_DES=y 979CONFIG_CRYPTO_DES=y
1048# CONFIG_CRYPTO_FCRYPT is not set 980# CONFIG_CRYPTO_FCRYPT is not set
1049# CONFIG_CRYPTO_BLOWFISH is not set 981# CONFIG_CRYPTO_BLOWFISH is not set
@@ -1072,6 +1004,7 @@ CONFIG_CRYPTO_DEFLATE=y
1072CONFIG_BITREVERSE=y 1004CONFIG_BITREVERSE=y
1073CONFIG_CRC_CCITT=m 1005CONFIG_CRC_CCITT=m
1074# CONFIG_CRC16 is not set 1006# CONFIG_CRC16 is not set
1007# CONFIG_CRC_ITU_T is not set
1075CONFIG_CRC32=y 1008CONFIG_CRC32=y
1076# CONFIG_LIBCRC32C is not set 1009# CONFIG_LIBCRC32C is not set
1077CONFIG_ZLIB_INFLATE=y 1010CONFIG_ZLIB_INFLATE=y
@@ -1083,3 +1016,4 @@ CONFIG_TEXTSEARCH_FSM=m
1083CONFIG_PLIST=y 1016CONFIG_PLIST=y
1084CONFIG_HAS_IOMEM=y 1017CONFIG_HAS_IOMEM=y
1085CONFIG_HAS_IOPORT=y 1018CONFIG_HAS_IOPORT=y
1019CONFIG_HAS_DMA=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index 77dace9d54bc..3b977fdbaa78 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -1,9 +1,10 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc6 3# Linux kernel version: 2.6.22-rc5
4# Fri Jan 26 13:12:59 2007 4# Sat Jun 23 15:32:08 2007
5# 5#
6CONFIG_AVR32=y 6CONFIG_AVR32=y
7CONFIG_GENERIC_GPIO=y
7CONFIG_GENERIC_HARDIRQS=y 8CONFIG_GENERIC_HARDIRQS=y
8CONFIG_HARDIRQS_SW_RESEND=y 9CONFIG_HARDIRQS_SW_RESEND=y
9CONFIG_GENERIC_IRQ_PROBE=y 10CONFIG_GENERIC_IRQ_PROBE=y
@@ -13,6 +14,7 @@ CONFIG_GENERIC_TIME=y
13# CONFIG_ARCH_HAS_ILOG2_U64 is not set 14# CONFIG_ARCH_HAS_ILOG2_U64 is not set
14CONFIG_GENERIC_HWEIGHT=y 15CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 16CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_BUG=y
16CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 18CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
17 19
18# 20#
@@ -30,19 +32,22 @@ CONFIG_LOCALVERSION=""
30CONFIG_SWAP=y 32CONFIG_SWAP=y
31CONFIG_SYSVIPC=y 33CONFIG_SYSVIPC=y
32# CONFIG_IPC_NS is not set 34# CONFIG_IPC_NS is not set
35CONFIG_SYSVIPC_SYSCTL=y
33CONFIG_POSIX_MQUEUE=y 36CONFIG_POSIX_MQUEUE=y
34CONFIG_BSD_PROCESS_ACCT=y 37CONFIG_BSD_PROCESS_ACCT=y
35CONFIG_BSD_PROCESS_ACCT_V3=y 38CONFIG_BSD_PROCESS_ACCT_V3=y
36CONFIG_TASKSTATS=y 39CONFIG_TASKSTATS=y
37CONFIG_TASK_DELAY_ACCT=y 40CONFIG_TASK_DELAY_ACCT=y
41# CONFIG_TASK_XACCT is not set
38# CONFIG_UTS_NS is not set 42# CONFIG_UTS_NS is not set
39CONFIG_AUDIT=y 43CONFIG_AUDIT=y
40# CONFIG_IKCONFIG is not set 44# CONFIG_IKCONFIG is not set
45CONFIG_LOG_BUF_SHIFT=14
41CONFIG_SYSFS_DEPRECATED=y 46CONFIG_SYSFS_DEPRECATED=y
42CONFIG_RELAY=y 47CONFIG_RELAY=y
48CONFIG_BLK_DEV_INITRD=y
43CONFIG_INITRAMFS_SOURCE="" 49CONFIG_INITRAMFS_SOURCE=""
44CONFIG_CC_OPTIMIZE_FOR_SIZE=y 50CONFIG_CC_OPTIMIZE_FOR_SIZE=y
45# CONFIG_TASK_XACCT is not set
46CONFIG_SYSCTL=y 51CONFIG_SYSCTL=y
47CONFIG_EMBEDDED=y 52CONFIG_EMBEDDED=y
48# CONFIG_SYSCTL_SYSCALL is not set 53# CONFIG_SYSCTL_SYSCALL is not set
@@ -55,14 +60,20 @@ CONFIG_BUG=y
55CONFIG_ELF_CORE=y 60CONFIG_ELF_CORE=y
56# CONFIG_BASE_FULL is not set 61# CONFIG_BASE_FULL is not set
57CONFIG_FUTEX=y 62CONFIG_FUTEX=y
63CONFIG_ANON_INODES=y
58CONFIG_EPOLL=y 64CONFIG_EPOLL=y
65CONFIG_SIGNALFD=y
66CONFIG_TIMERFD=y
67CONFIG_EVENTFD=y
59CONFIG_SHMEM=y 68CONFIG_SHMEM=y
60CONFIG_SLAB=y
61CONFIG_VM_EVENT_COUNTERS=y 69CONFIG_VM_EVENT_COUNTERS=y
70# CONFIG_SLUB_DEBUG is not set
71# CONFIG_SLAB is not set
72CONFIG_SLUB=y
73# CONFIG_SLOB is not set
62CONFIG_RT_MUTEXES=y 74CONFIG_RT_MUTEXES=y
63# CONFIG_TINY_SHMEM is not set 75# CONFIG_TINY_SHMEM is not set
64CONFIG_BASE_SMALL=1 76CONFIG_BASE_SMALL=1
65# CONFIG_SLOB is not set
66 77
67# 78#
68# Loadable module support 79# Loadable module support
@@ -105,7 +116,15 @@ CONFIG_PLATFORM_AT32AP=y
105CONFIG_CPU_AT32AP7000=y 116CONFIG_CPU_AT32AP7000=y
106CONFIG_BOARD_ATSTK1002=y 117CONFIG_BOARD_ATSTK1002=y
107CONFIG_BOARD_ATSTK1000=y 118CONFIG_BOARD_ATSTK1000=y
119# CONFIG_BOARD_ATNGW100 is not set
108CONFIG_LOADER_U_BOOT=y 120CONFIG_LOADER_U_BOOT=y
121
122#
123# Atmel AVR32 AP options
124#
125# CONFIG_AP7000_32_BIT_SMC is not set
126CONFIG_AP7000_16_BIT_SMC=y
127# CONFIG_AP7000_8_BIT_SMC is not set
109CONFIG_LOAD_ADDRESS=0x10000000 128CONFIG_LOAD_ADDRESS=0x10000000
110CONFIG_ENTRY_ADDRESS=0x90000000 129CONFIG_ENTRY_ADDRESS=0x90000000
111CONFIG_PHYS_OFFSET=0x10000000 130CONFIG_PHYS_OFFSET=0x10000000
@@ -127,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
127# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
128CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
129# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=0
130# CONFIG_OWNERSHIP_TRACE is not set 150# CONFIG_OWNERSHIP_TRACE is not set
131# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
132CONFIG_HZ_250=y 152CONFIG_HZ_250=y
@@ -138,6 +158,7 @@ CONFIG_CMDLINE=""
138# 158#
139# Bus options 159# Bus options
140# 160#
161# CONFIG_ARCH_SUPPORTS_MSI is not set
141 162
142# 163#
143# PCCARD (PCMCIA/CardBus) support 164# PCCARD (PCMCIA/CardBus) support
@@ -158,7 +179,6 @@ CONFIG_NET=y
158# 179#
159# Networking options 180# Networking options
160# 181#
161# CONFIG_NETDEBUG is not set
162CONFIG_PACKET=y 182CONFIG_PACKET=y
163CONFIG_PACKET_MMAP=y 183CONFIG_PACKET_MMAP=y
164CONFIG_UNIX=y 184CONFIG_UNIX=y
@@ -194,20 +214,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
194# CONFIG_INET6_TUNNEL is not set 214# CONFIG_INET6_TUNNEL is not set
195# CONFIG_NETWORK_SECMARK is not set 215# CONFIG_NETWORK_SECMARK is not set
196# CONFIG_NETFILTER is not set 216# CONFIG_NETFILTER is not set
197
198#
199# DCCP Configuration (EXPERIMENTAL)
200#
201# CONFIG_IP_DCCP is not set 217# CONFIG_IP_DCCP is not set
202
203#
204# SCTP Configuration (EXPERIMENTAL)
205#
206# CONFIG_IP_SCTP is not set 218# CONFIG_IP_SCTP is not set
207
208#
209# TIPC Configuration (EXPERIMENTAL)
210#
211# CONFIG_TIPC is not set 219# CONFIG_TIPC is not set
212# CONFIG_ATM is not set 220# CONFIG_ATM is not set
213# CONFIG_BRIDGE is not set 221# CONFIG_BRIDGE is not set
@@ -233,7 +241,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
233# CONFIG_HAMRADIO is not set 241# CONFIG_HAMRADIO is not set
234# CONFIG_IRDA is not set 242# CONFIG_IRDA is not set
235# CONFIG_BT is not set 243# CONFIG_BT is not set
244# CONFIG_AF_RXRPC is not set
245
246#
247# Wireless
248#
249# CONFIG_CFG80211 is not set
250# CONFIG_WIRELESS_EXT is not set
251# CONFIG_MAC80211 is not set
236# CONFIG_IEEE80211 is not set 252# CONFIG_IEEE80211 is not set
253# CONFIG_RFKILL is not set
237 254
238# 255#
239# Device Drivers 256# Device Drivers
@@ -246,16 +263,13 @@ CONFIG_STANDALONE=y
246# CONFIG_PREVENT_FIRMWARE_BUILD is not set 263# CONFIG_PREVENT_FIRMWARE_BUILD is not set
247# CONFIG_FW_LOADER is not set 264# CONFIG_FW_LOADER is not set
248# CONFIG_DEBUG_DRIVER is not set 265# CONFIG_DEBUG_DRIVER is not set
266# CONFIG_DEBUG_DEVRES is not set
249# CONFIG_SYS_HYPERVISOR is not set 267# CONFIG_SYS_HYPERVISOR is not set
250 268
251# 269#
252# Connector - unified userspace <-> kernelspace linker 270# Connector - unified userspace <-> kernelspace linker
253# 271#
254# CONFIG_CONNECTOR is not set 272# CONFIG_CONNECTOR is not set
255
256#
257# Memory Technology Devices (MTD)
258#
259CONFIG_MTD=y 273CONFIG_MTD=y
260# CONFIG_MTD_DEBUG is not set 274# CONFIG_MTD_DEBUG is not set
261# CONFIG_MTD_CONCAT is not set 275# CONFIG_MTD_CONCAT is not set
@@ -299,7 +313,6 @@ CONFIG_MTD_CFI_UTIL=y
299# CONFIG_MTD_RAM is not set 313# CONFIG_MTD_RAM is not set
300# CONFIG_MTD_ROM is not set 314# CONFIG_MTD_ROM is not set
301# CONFIG_MTD_ABSENT is not set 315# CONFIG_MTD_ABSENT is not set
302# CONFIG_MTD_OBSOLETE_CHIPS is not set
303 316
304# 317#
305# Mapping drivers for chip access 318# Mapping drivers for chip access
@@ -325,16 +338,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
325# CONFIG_MTD_DOC2000 is not set 338# CONFIG_MTD_DOC2000 is not set
326# CONFIG_MTD_DOC2001 is not set 339# CONFIG_MTD_DOC2001 is not set
327# CONFIG_MTD_DOC2001PLUS is not set 340# CONFIG_MTD_DOC2001PLUS is not set
328
329#
330# NAND Flash Device Drivers
331#
332# CONFIG_MTD_NAND is not set 341# CONFIG_MTD_NAND is not set
342# CONFIG_MTD_ONENAND is not set
333 343
334# 344#
335# OneNAND Flash Device Drivers 345# UBI - Unsorted block images
336# 346#
337# CONFIG_MTD_ONENAND is not set 347# CONFIG_MTD_UBI is not set
338 348
339# 349#
340# Parallel port support 350# Parallel port support
@@ -344,6 +354,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
344# 354#
345# Plug and Play support 355# Plug and Play support
346# 356#
357# CONFIG_PNPACPI is not set
347 358
348# 359#
349# Block devices 360# Block devices
@@ -356,18 +367,13 @@ CONFIG_BLK_DEV_RAM=m
356CONFIG_BLK_DEV_RAM_COUNT=16 367CONFIG_BLK_DEV_RAM_COUNT=16
357CONFIG_BLK_DEV_RAM_SIZE=4096 368CONFIG_BLK_DEV_RAM_SIZE=4096
358CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 369CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
359CONFIG_BLK_DEV_INITRD=y
360# CONFIG_CDROM_PKTCDVD is not set 370# CONFIG_CDROM_PKTCDVD is not set
361# CONFIG_ATA_OVER_ETH is not set 371# CONFIG_ATA_OVER_ETH is not set
362 372
363# 373#
364# Misc devices 374# Misc devices
365# 375#
366# CONFIG_TIFM_CORE is not set 376# CONFIG_BLINK is not set
367
368#
369# ATA/ATAPI/MFM/RLL support
370#
371# CONFIG_IDE is not set 377# CONFIG_IDE is not set
372 378
373# 379#
@@ -376,10 +382,6 @@ CONFIG_BLK_DEV_INITRD=y
376# CONFIG_RAID_ATTRS is not set 382# CONFIG_RAID_ATTRS is not set
377# CONFIG_SCSI is not set 383# CONFIG_SCSI is not set
378# CONFIG_SCSI_NETLINK is not set 384# CONFIG_SCSI_NETLINK is not set
379
380#
381# Serial ATA (prod) and Parallel ATA (experimental) drivers
382#
383# CONFIG_ATA is not set 385# CONFIG_ATA is not set
384 386
385# 387#
@@ -388,19 +390,6 @@ CONFIG_BLK_DEV_INITRD=y
388# CONFIG_MD is not set 390# CONFIG_MD is not set
389 391
390# 392#
391# Fusion MPT device support
392#
393# CONFIG_FUSION is not set
394
395#
396# IEEE 1394 (FireWire) support
397#
398
399#
400# I2O device support
401#
402
403#
404# Network device support 393# Network device support
405# 394#
406CONFIG_NETDEVICES=y 395CONFIG_NETDEVICES=y
@@ -408,10 +397,6 @@ CONFIG_DUMMY=y
408# CONFIG_BONDING is not set 397# CONFIG_BONDING is not set
409# CONFIG_EQUALIZER is not set 398# CONFIG_EQUALIZER is not set
410CONFIG_TUN=m 399CONFIG_TUN=m
411
412#
413# PHY device support
414#
415# CONFIG_PHYLIB is not set 400# CONFIG_PHYLIB is not set
416 401
417# 402#
@@ -420,27 +405,14 @@ CONFIG_TUN=m
420CONFIG_NET_ETHERNET=y 405CONFIG_NET_ETHERNET=y
421CONFIG_MII=y 406CONFIG_MII=y
422CONFIG_MACB=y 407CONFIG_MACB=y
408# CONFIG_NETDEV_1000 is not set
409# CONFIG_NETDEV_10000 is not set
423 410
424# 411#
425# Ethernet (1000 Mbit) 412# Wireless LAN
426#
427
428#
429# Ethernet (10000 Mbit)
430#
431
432#
433# Token Ring devices
434#
435
436#
437# Wireless LAN (non-hamradio)
438#
439# CONFIG_NET_RADIO is not set
440
441#
442# Wan interfaces
443# 413#
414# CONFIG_WLAN_PRE80211 is not set
415# CONFIG_WLAN_80211 is not set
444# CONFIG_WAN is not set 416# CONFIG_WAN is not set
445CONFIG_PPP=m 417CONFIG_PPP=m
446# CONFIG_PPP_MULTILINK is not set 418# CONFIG_PPP_MULTILINK is not set
@@ -505,15 +477,10 @@ CONFIG_UNIX98_PTYS=y
505# IPMI 477# IPMI
506# 478#
507# CONFIG_IPMI_HANDLER is not set 479# CONFIG_IPMI_HANDLER is not set
508
509#
510# Watchdog Cards
511#
512# CONFIG_WATCHDOG is not set 480# CONFIG_WATCHDOG is not set
513# CONFIG_HW_RANDOM is not set 481# CONFIG_HW_RANDOM is not set
514# CONFIG_RTC is not set 482# CONFIG_RTC is not set
515# CONFIG_GEN_RTC is not set 483# CONFIG_GEN_RTC is not set
516# CONFIG_DTLK is not set
517# CONFIG_R3964 is not set 484# CONFIG_R3964 is not set
518# CONFIG_RAW_DRIVER is not set 485# CONFIG_RAW_DRIVER is not set
519 486
@@ -521,10 +488,6 @@ CONFIG_UNIX98_PTYS=y
521# TPM devices 488# TPM devices
522# 489#
523# CONFIG_TCG_TPM is not set 490# CONFIG_TCG_TPM is not set
524
525#
526# I2C support
527#
528# CONFIG_I2C is not set 491# CONFIG_I2C is not set
529 492
530# 493#
@@ -537,29 +500,31 @@ CONFIG_UNIX98_PTYS=y
537# Dallas's 1-wire bus 500# Dallas's 1-wire bus
538# 501#
539# CONFIG_W1 is not set 502# CONFIG_W1 is not set
503# CONFIG_HWMON is not set
540 504
541# 505#
542# Hardware Monitoring support 506# Multifunction device drivers
543# 507#
544# CONFIG_HWMON is not set 508# CONFIG_MFD_SM501 is not set
545# CONFIG_HWMON_VID is not set
546 509
547# 510#
548# Multimedia devices 511# Multimedia devices
549# 512#
550# CONFIG_VIDEO_DEV is not set 513# CONFIG_VIDEO_DEV is not set
514# CONFIG_DVB_CORE is not set
515# CONFIG_DAB is not set
551 516
552# 517#
553# Digital Video Broadcasting Devices 518# Graphics support
554# 519#
555# CONFIG_DVB is not set 520# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
556 521
557# 522#
558# Graphics support 523# Display device support
559# 524#
560# CONFIG_FIRMWARE_EDID is not set 525# CONFIG_DISPLAY_SUPPORT is not set
526# CONFIG_VGASTATE is not set
561# CONFIG_FB is not set 527# CONFIG_FB is not set
562# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
563 528
564# 529#
565# Sound 530# Sound
@@ -581,10 +546,6 @@ CONFIG_UNIX98_PTYS=y
581# USB Gadget Support 546# USB Gadget Support
582# 547#
583# CONFIG_USB_GADGET is not set 548# CONFIG_USB_GADGET is not set
584
585#
586# MMC/SD Card support
587#
588# CONFIG_MMC is not set 549# CONFIG_MMC is not set
589 550
590# 551#
@@ -627,10 +588,6 @@ CONFIG_UNIX98_PTYS=y
627# 588#
628 589
629# 590#
630# Virtualization
631#
632
633#
634# File systems 591# File systems
635# 592#
636CONFIG_EXT2_FS=m 593CONFIG_EXT2_FS=m
@@ -712,8 +669,20 @@ CONFIG_JFFS2_RTIME=y
712# 669#
713# Network File Systems 670# Network File Systems
714# 671#
715# CONFIG_NFS_FS is not set 672CONFIG_NFS_FS=y
673CONFIG_NFS_V3=y
674# CONFIG_NFS_V3_ACL is not set
675# CONFIG_NFS_V4 is not set
676# CONFIG_NFS_DIRECTIO is not set
716# CONFIG_NFSD is not set 677# CONFIG_NFSD is not set
678CONFIG_ROOT_NFS=y
679CONFIG_LOCKD=y
680CONFIG_LOCKD_V4=y
681CONFIG_NFS_COMMON=y
682CONFIG_SUNRPC=y
683# CONFIG_SUNRPC_BIND34 is not set
684# CONFIG_RPCSEC_GSS_KRB5 is not set
685# CONFIG_RPCSEC_GSS_SPKM3 is not set
717# CONFIG_SMB_FS is not set 686# CONFIG_SMB_FS is not set
718# CONFIG_CIFS is not set 687# CONFIG_CIFS is not set
719# CONFIG_NCP_FS is not set 688# CONFIG_NCP_FS is not set
@@ -787,15 +756,14 @@ CONFIG_MAGIC_SYSRQ=y
787CONFIG_DEBUG_FS=y 756CONFIG_DEBUG_FS=y
788# CONFIG_HEADERS_CHECK is not set 757# CONFIG_HEADERS_CHECK is not set
789CONFIG_DEBUG_KERNEL=y 758CONFIG_DEBUG_KERNEL=y
790CONFIG_LOG_BUF_SHIFT=14 759# CONFIG_DEBUG_SHIRQ is not set
791CONFIG_DETECT_SOFTLOCKUP=y 760CONFIG_DETECT_SOFTLOCKUP=y
792# CONFIG_SCHEDSTATS is not set 761# CONFIG_SCHEDSTATS is not set
793# CONFIG_DEBUG_SLAB is not set 762# CONFIG_TIMER_STATS is not set
794# CONFIG_DEBUG_RT_MUTEXES is not set 763# CONFIG_DEBUG_RT_MUTEXES is not set
795# CONFIG_RT_MUTEX_TESTER is not set 764# CONFIG_RT_MUTEX_TESTER is not set
796# CONFIG_DEBUG_SPINLOCK is not set 765# CONFIG_DEBUG_SPINLOCK is not set
797# CONFIG_DEBUG_MUTEXES is not set 766# CONFIG_DEBUG_MUTEXES is not set
798# CONFIG_DEBUG_RWSEMS is not set
799# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 767# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
800# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 768# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
801# CONFIG_DEBUG_KOBJECT is not set 769# CONFIG_DEBUG_KOBJECT is not set
@@ -806,6 +774,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
806CONFIG_FRAME_POINTER=y 774CONFIG_FRAME_POINTER=y
807CONFIG_FORCED_INLINING=y 775CONFIG_FORCED_INLINING=y
808# CONFIG_RCU_TORTURE_TEST is not set 776# CONFIG_RCU_TORTURE_TEST is not set
777# CONFIG_FAULT_INJECTION is not set
809# CONFIG_KPROBES is not set 778# CONFIG_KPROBES is not set
810 779
811# 780#
@@ -825,10 +794,13 @@ CONFIG_FORCED_INLINING=y
825CONFIG_BITREVERSE=y 794CONFIG_BITREVERSE=y
826CONFIG_CRC_CCITT=m 795CONFIG_CRC_CCITT=m
827# CONFIG_CRC16 is not set 796# CONFIG_CRC16 is not set
797# CONFIG_CRC_ITU_T is not set
828CONFIG_CRC32=y 798CONFIG_CRC32=y
829# CONFIG_LIBCRC32C is not set 799# CONFIG_LIBCRC32C is not set
830CONFIG_AUDIT_GENERIC=y 800CONFIG_AUDIT_GENERIC=y
831CONFIG_ZLIB_INFLATE=y 801CONFIG_ZLIB_INFLATE=y
832CONFIG_ZLIB_DEFLATE=y 802CONFIG_ZLIB_DEFLATE=y
833CONFIG_PLIST=y 803CONFIG_PLIST=y
834CONFIG_IOMAP_COPY=y 804CONFIG_HAS_IOMEM=y
805CONFIG_HAS_IOPORT=y
806CONFIG_HAS_DMA=y
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 1d2bf347a1d6..4dda42d3f6d5 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -9,6 +9,7 @@
9#include <linux/fb.h> 9#include <linux/fb.h>
10#include <linux/init.h> 10#include <linux/init.h>
11#include <linux/platform_device.h> 11#include <linux/platform_device.h>
12#include <linux/dma-mapping.h>
12#include <linux/spi/spi.h> 13#include <linux/spi/spi.h>
13 14
14#include <asm/io.h> 15#include <asm/io.h>
@@ -45,19 +46,30 @@
45 .flags = IORESOURCE_IRQ, \ 46 .flags = IORESOURCE_IRQ, \
46 } 47 }
47 48
49/* REVISIT these assume *every* device supports DMA, but several
50 * don't ... tc, smc, pio, rtc, watchdog, pwm, ps2, and more.
51 */
48#define DEFINE_DEV(_name, _id) \ 52#define DEFINE_DEV(_name, _id) \
53static u64 _name##_id##_dma_mask = DMA_32BIT_MASK; \
49static struct platform_device _name##_id##_device = { \ 54static struct platform_device _name##_id##_device = { \
50 .name = #_name, \ 55 .name = #_name, \
51 .id = _id, \ 56 .id = _id, \
57 .dev = { \
58 .dma_mask = &_name##_id##_dma_mask, \
59 .coherent_dma_mask = DMA_32BIT_MASK, \
60 }, \
52 .resource = _name##_id##_resource, \ 61 .resource = _name##_id##_resource, \
53 .num_resources = ARRAY_SIZE(_name##_id##_resource), \ 62 .num_resources = ARRAY_SIZE(_name##_id##_resource), \
54} 63}
55#define DEFINE_DEV_DATA(_name, _id) \ 64#define DEFINE_DEV_DATA(_name, _id) \
65static u64 _name##_id##_dma_mask = DMA_32BIT_MASK; \
56static struct platform_device _name##_id##_device = { \ 66static struct platform_device _name##_id##_device = { \
57 .name = #_name, \ 67 .name = #_name, \
58 .id = _id, \ 68 .id = _id, \
59 .dev = { \ 69 .dev = { \
70 .dma_mask = &_name##_id##_dma_mask, \
60 .platform_data = &_name##_id##_data, \ 71 .platform_data = &_name##_id##_data, \
72 .coherent_dma_mask = DMA_32BIT_MASK, \
61 }, \ 73 }, \
62 .resource = _name##_id##_resource, \ 74 .resource = _name##_id##_resource, \
63 .num_resources = ARRAY_SIZE(_name##_id##_resource), \ 75 .num_resources = ARRAY_SIZE(_name##_id##_resource), \
diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c
index 8f7b1c3cd0f9..c1233c615e67 100644
--- a/arch/avr32/mm/cache.c
+++ b/arch/avr32/mm/cache.c
@@ -23,7 +23,6 @@
23void invalidate_dcache_region(void *start, size_t size) 23void invalidate_dcache_region(void *start, size_t size)
24{ 24{
25 unsigned long v, begin, end, linesz, mask; 25 unsigned long v, begin, end, linesz, mask;
26 int flush = 0;
27 26
28 linesz = boot_cpu_data.dcache.linesz; 27 linesz = boot_cpu_data.dcache.linesz;
29 mask = linesz - 1; 28 mask = linesz - 1;
@@ -32,24 +31,21 @@ void invalidate_dcache_region(void *start, size_t size)
32 * instead of invalidating ... never discard valid data! 31 * instead of invalidating ... never discard valid data!
33 */ 32 */
34 begin = (unsigned long)start; 33 begin = (unsigned long)start;
35 end = begin + size - 1; 34 end = begin + size;
36 35
37 if (begin & mask) { 36 if (begin & mask) {
38 flush_dcache_line(start); 37 flush_dcache_line(start);
39 begin += linesz; 38 begin += linesz;
40 flush = 1;
41 } 39 }
42 if ((end & mask) != mask) { 40 if (end & mask) {
43 flush_dcache_line((void *)end); 41 flush_dcache_line((void *)end);
44 end -= linesz; 42 end &= ~mask;
45 flush = 1;
46 } 43 }
47 44
48 /* remaining cachelines only need invalidation */ 45 /* remaining cachelines only need invalidation */
49 for (v = begin; v <= end; v += linesz) 46 for (v = begin; v < end; v += linesz)
50 invalidate_dcache_line((void *)v); 47 invalidate_dcache_line((void *)v);
51 if (flush) 48 flush_write_buffer();
52 flush_write_buffer();
53} 49}
54 50
55void clean_dcache_region(void *start, size_t size) 51void clean_dcache_region(void *start, size_t size)
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index a24fa1ab802b..5b9b434c1ed9 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -329,9 +329,10 @@ void __init setup_arch(char **cmdline_p)
329 329
330 printk(KERN_INFO "Memory map:\n" 330 printk(KERN_INFO "Memory map:\n"
331 KERN_INFO " text = 0x%p-0x%p\n" 331 KERN_INFO " text = 0x%p-0x%p\n"
332 KERN_INFO " init = 0x%p-0x%p\n" 332 KERN_INFO " rodata = 0x%p-0x%p\n"
333 KERN_INFO " data = 0x%p-0x%p\n" 333 KERN_INFO " data = 0x%p-0x%p\n"
334 KERN_INFO " stack = 0x%p-0x%p\n" 334 KERN_INFO " stack = 0x%p-0x%p\n"
335 KERN_INFO " init = 0x%p-0x%p\n"
335 KERN_INFO " bss = 0x%p-0x%p\n" 336 KERN_INFO " bss = 0x%p-0x%p\n"
336 KERN_INFO " available = 0x%p-0x%p\n" 337 KERN_INFO " available = 0x%p-0x%p\n"
337#ifdef CONFIG_MTD_UCLINUX 338#ifdef CONFIG_MTD_UCLINUX
@@ -341,9 +342,10 @@ void __init setup_arch(char **cmdline_p)
341 KERN_INFO " DMA Zone = 0x%p-0x%p\n" 342 KERN_INFO " DMA Zone = 0x%p-0x%p\n"
342#endif 343#endif
343 , _stext, _etext, 344 , _stext, _etext,
344 __init_begin, __init_end, 345 __start_rodata, __end_rodata,
345 _sdata, _edata, 346 _sdata, _edata,
346 (void*)&init_thread_union, (void*)((int)(&init_thread_union) + 0x2000), 347 (void*)&init_thread_union, (void*)((int)(&init_thread_union) + 0x2000),
348 __init_begin, __init_end,
347 __bss_start, __bss_stop, 349 __bss_start, __bss_stop,
348 (void*)_ramstart, (void*)memory_end 350 (void*)_ramstart, (void*)memory_end
349#ifdef CONFIG_MTD_UCLINUX 351#ifdef CONFIG_MTD_UCLINUX
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 5ab87b0b92dd..aa660f32d8c8 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -148,8 +148,15 @@ asmlinkage void trap_c(struct pt_regs *fp)
148 unsigned long trapnr = fp->seqstat & SEQSTAT_EXCAUSE; 148 unsigned long trapnr = fp->seqstat & SEQSTAT_EXCAUSE;
149 149
150#ifdef CONFIG_KGDB 150#ifdef CONFIG_KGDB
151# define CHK_DEBUGGER_TRAP() do { CHK_DEBUGGER(trapnr, sig, info.si_code, fp,); } while (0) 151# define CHK_DEBUGGER_TRAP() \
152# define CHK_DEBUGGER_TRAP_MAYBE() do { if (kgdb_connected) CHK_DEBUGGER_TRAP(); } while (0) 152 do { \
153 CHK_DEBUGGER(trapnr, sig, info.si_code, fp); \
154 } while (0)
155# define CHK_DEBUGGER_TRAP_MAYBE() \
156 do { \
157 if (kgdb_connected) \
158 CHK_DEBUGGER_TRAP(); \
159 } while (0)
153#else 160#else
154# define CHK_DEBUGGER_TRAP() do { } while (0) 161# define CHK_DEBUGGER_TRAP() do { } while (0)
155# define CHK_DEBUGGER_TRAP_MAYBE() do { } while (0) 162# define CHK_DEBUGGER_TRAP_MAYBE() do { } while (0)
@@ -297,7 +304,8 @@ asmlinkage void trap_c(struct pt_regs *fp)
297 info.si_code = ILL_CPLB_MULHIT; 304 info.si_code = ILL_CPLB_MULHIT;
298#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO 305#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
299 sig = SIGSEGV; 306 sig = SIGSEGV;
300 printk(KERN_EMERG "\n\nNULL pointer access (probably)\n"); 307 printk(KERN_EMERG "\n"
308 KERN_EMERG "NULL pointer access (probably)\n");
301#else 309#else
302 sig = SIGILL; 310 sig = SIGILL;
303 printk(KERN_EMERG EXC_0x27); 311 printk(KERN_EMERG EXC_0x27);
@@ -418,7 +426,9 @@ asmlinkage void trap_c(struct pt_regs *fp)
418 if (current->mm) { 426 if (current->mm) {
419 fp->pc = current->mm->start_code; 427 fp->pc = current->mm->start_code;
420 } else { 428 } else {
421 printk(KERN_EMERG "I can't return to memory that doesn't exist - bad things happen\n"); 429 printk(KERN_EMERG
430 "I can't return to memory that doesn't exist"
431 " - bad things happen\n");
422 panic("Help - I've fallen and can't get up\n"); 432 panic("Help - I've fallen and can't get up\n");
423 } 433 }
424 } 434 }
@@ -522,15 +532,19 @@ EXPORT_SYMBOL(dump_stack);
522void dump_bfin_regs(struct pt_regs *fp, void *retaddr) 532void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
523{ 533{
524 if (current->pid) { 534 if (current->pid) {
525 printk("\nCURRENT PROCESS:\n\n"); 535 printk(KERN_EMERG "\n" KERN_EMERG "CURRENT PROCESS:\n"
526 printk("COMM=%s PID=%d\n", current->comm, current->pid); 536 KERN_EMERG "\n");
537 printk(KERN_EMERG "COMM=%s PID=%d\n",
538 current->comm, current->pid);
527 } else { 539 } else {
528 printk 540 printk
529 ("\nNo Valid pid - Either things are really messed up, or you are in the kernel\n"); 541 (KERN_EMERG "\n" KERN_EMERG
542 "No Valid pid - Either things are really messed up,"
543 " or you are in the kernel\n");
530 } 544 }
531 545
532 if (current->mm) { 546 if (current->mm) {
533 printk("TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n" 547 printk(KERN_EMERG "TEXT = 0x%p-0x%p DATA = 0x%p-0x%p\n"
534 "BSS = 0x%p-0x%p USER-STACK = 0x%p\n\n", 548 "BSS = 0x%p-0x%p USER-STACK = 0x%p\n\n",
535 (void*)current->mm->start_code, 549 (void*)current->mm->start_code,
536 (void*)current->mm->end_code, 550 (void*)current->mm->end_code,
@@ -541,7 +555,7 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
541 (void*)current->mm->start_stack); 555 (void*)current->mm->start_stack);
542 } 556 }
543 557
544 printk("return address: 0x%p; contents of [PC-16...PC+8]:\n", retaddr); 558 printk(KERN_EMERG "return address: [0x%p]; contents of:", retaddr);
545 if (retaddr != 0 && retaddr <= (void*)physical_mem_end 559 if (retaddr != 0 && retaddr <= (void*)physical_mem_end
546#if L1_CODE_LENGTH != 0 560#if L1_CODE_LENGTH != 0
547 /* FIXME: Copy the code out of L1 Instruction SRAM through dma 561 /* FIXME: Copy the code out of L1 Instruction SRAM through dma
@@ -550,10 +564,15 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
550 && retaddr < (void*)(L1_CODE_START + L1_CODE_LENGTH)) 564 && retaddr < (void*)(L1_CODE_START + L1_CODE_LENGTH))
551#endif 565#endif
552 ) { 566 ) {
553 int i = 0; 567 int i = ((unsigned int)retaddr & 0xFFFFFFF0) - 32;
554 unsigned short x = 0; 568 unsigned short x = 0;
555 for (i = -16; i < 8; i++) { 569 for (; i < ((unsigned int)retaddr & 0xFFFFFFF0 ) + 32 ;
556 if (get_user(x, (unsigned short *)retaddr + i)) 570 i += 2) {
571 if ( !(i & 0xF) )
572 printk(KERN_EMERG "\n" KERN_EMERG
573 "0x%08x: ", i);
574
575 if (get_user(x, (unsigned short *)i))
557 break; 576 break;
558#ifndef CONFIG_DEBUG_HWERR 577#ifndef CONFIG_DEBUG_HWERR
559 /* If one of the last few instructions was a STI 578 /* If one of the last few instructions was a STI
@@ -561,53 +580,65 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
561 * and we just noticed 580 * and we just noticed
562 */ 581 */
563 if (x >= 0x0040 && x <= 0x0047 && i <= 0) 582 if (x >= 0x0040 && x <= 0x0047 && i <= 0)
564 panic("\n\nWARNING : You should reconfigure the kernel to turn on\n" 583 panic("\n\nWARNING : You should reconfigure"
565 " 'Hardware error interrupt debugging'\n" 584 " the kernel to turn on\n"
566 " The rest of this error is meanless\n"); 585 " 'Hardware error interrupt"
586 " debugging'\n"
587 " The rest of this error"
588 " is meanless\n");
567#endif 589#endif
568 590 if ( i == (unsigned int)retaddr )
569 if (i == -8) 591 printk("[%04x]", x);
570 printk("\n"); 592 else
571 if (i == 0) 593 printk(" %04x ", x);
572 printk("X\n");
573 printk("%04x ", x);
574 } 594 }
595 printk("\n" KERN_EMERG "\n");
575 } else 596 } else
576 printk("Cannot look at the [PC] for it is in unreadable L1 SRAM - sorry\n"); 597 printk(KERN_EMERG
577 598 "Cannot look at the [PC] for it is"
578 printk("\n\n"); 599 "in unreadable L1 SRAM - sorry\n");
579 600
580 printk("RETE: %08lx RETN: %08lx RETX: %08lx RETS: %08lx\n", 601
581 fp->rete, fp->retn, fp->retx, fp->rets); 602 printk(KERN_EMERG
582 printk("IPEND: %04lx SYSCFG: %04lx\n", fp->ipend, fp->syscfg); 603 "RETE: %08lx RETN: %08lx RETX: %08lx RETS: %08lx\n",
583 printk("SEQSTAT: %08lx SP: %08lx\n", (long)fp->seqstat, (long)fp); 604 fp->rete, fp->retn, fp->retx, fp->rets);
584 printk("R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n", 605 printk(KERN_EMERG "IPEND: %04lx SYSCFG: %04lx\n",
585 fp->r0, fp->r1, fp->r2, fp->r3); 606 fp->ipend, fp->syscfg);
586 printk("R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n", 607 printk(KERN_EMERG "SEQSTAT: %08lx SP: %08lx\n",
587 fp->r4, fp->r5, fp->r6, fp->r7); 608 (long)fp->seqstat, (long)fp);
588 printk("P0: %08lx P1: %08lx P2: %08lx P3: %08lx\n", 609 printk(KERN_EMERG "R0: %08lx R1: %08lx R2: %08lx R3: %08lx\n",
589 fp->p0, fp->p1, fp->p2, fp->p3); 610 fp->r0, fp->r1, fp->r2, fp->r3);
590 printk("P4: %08lx P5: %08lx FP: %08lx\n", fp->p4, fp->p5, fp->fp); 611 printk(KERN_EMERG "R4: %08lx R5: %08lx R6: %08lx R7: %08lx\n",
591 printk("A0.w: %08lx A0.x: %08lx A1.w: %08lx A1.x: %08lx\n", 612 fp->r4, fp->r5, fp->r6, fp->r7);
592 fp->a0w, fp->a0x, fp->a1w, fp->a1x); 613 printk(KERN_EMERG "P0: %08lx P1: %08lx P2: %08lx P3: %08lx\n",
593 614 fp->p0, fp->p1, fp->p2, fp->p3);
594 printk("LB0: %08lx LT0: %08lx LC0: %08lx\n", fp->lb0, fp->lt0, 615 printk(KERN_EMERG
595 fp->lc0); 616 "P4: %08lx P5: %08lx FP: %08lx\n",
596 printk("LB1: %08lx LT1: %08lx LC1: %08lx\n", fp->lb1, fp->lt1, 617 fp->p4, fp->p5, fp->fp);
597 fp->lc1); 618 printk(KERN_EMERG
598 printk("B0: %08lx L0: %08lx M0: %08lx I0: %08lx\n", fp->b0, fp->l0, 619 "A0.w: %08lx A0.x: %08lx A1.w: %08lx A1.x: %08lx\n",
599 fp->m0, fp->i0); 620 fp->a0w, fp->a0x, fp->a1w, fp->a1x);
600 printk("B1: %08lx L1: %08lx M1: %08lx I1: %08lx\n", fp->b1, fp->l1, 621
601 fp->m1, fp->i1); 622 printk(KERN_EMERG "LB0: %08lx LT0: %08lx LC0: %08lx\n",
602 printk("B2: %08lx L2: %08lx M2: %08lx I2: %08lx\n", fp->b2, fp->l2, 623 fp->lb0, fp->lt0, fp->lc0);
603 fp->m2, fp->i2); 624 printk(KERN_EMERG "LB1: %08lx LT1: %08lx LC1: %08lx\n",
604 printk("B3: %08lx L3: %08lx M3: %08lx I3: %08lx\n", fp->b3, fp->l3, 625 fp->lb1, fp->lt1, fp->lc1);
605 fp->m3, fp->i3); 626 printk(KERN_EMERG "B0: %08lx L0: %08lx M0: %08lx I0: %08lx\n",
606 627 fp->b0, fp->l0, fp->m0, fp->i0);
607 printk("\nUSP: %08lx ASTAT: %08lx\n", rdusp(), fp->astat); 628 printk(KERN_EMERG "B1: %08lx L1: %08lx M1: %08lx I1: %08lx\n",
629 fp->b1, fp->l1, fp->m1, fp->i1);
630 printk(KERN_EMERG "B2: %08lx L2: %08lx M2: %08lx I2: %08lx\n",
631 fp->b2, fp->l2, fp->m2, fp->i2);
632 printk(KERN_EMERG "B3: %08lx L3: %08lx M3: %08lx I3: %08lx\n",
633 fp->b3, fp->l3, fp->m3, fp->i3);
634
635 printk(KERN_EMERG "\n" KERN_EMERG "USP: %08lx ASTAT: %08lx\n",
636 rdusp(), fp->astat);
608 if ((long)fp->seqstat & SEQSTAT_EXCAUSE) { 637 if ((long)fp->seqstat & SEQSTAT_EXCAUSE) {
609 printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", (void*)bfin_read_DCPLB_FAULT_ADDR()); 638 printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n",
610 printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", (void*)bfin_read_ICPLB_FAULT_ADDR()); 639 (void *)bfin_read_DCPLB_FAULT_ADDR());
640 printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n",
641 (void *)bfin_read_ICPLB_FAULT_ADDR());
611 } 642 }
612 643
613 printk("\n\n"); 644 printk("\n\n");
diff --git a/arch/blackfin/lib/memcmp.S b/arch/blackfin/lib/memcmp.S
index a6b8ee6a6bf2..b88c5d2d1ebe 100644
--- a/arch/blackfin/lib/memcmp.S
+++ b/arch/blackfin/lib/memcmp.S
@@ -61,7 +61,12 @@ ENTRY(_memcmp)
61 61
62 LSETUP (.Lquad_loop_s, .Lquad_loop_e) LC0=P1; 62 LSETUP (.Lquad_loop_s, .Lquad_loop_e) LC0=P1;
63.Lquad_loop_s: 63.Lquad_loop_s:
64#ifdef ANOMALY_05000202
65 R0 = [P0++];
66 R1 = [I0++];
67#else
64 MNOP || R0 = [P0++] || R1 = [I0++]; 68 MNOP || R0 = [P0++] || R1 = [I0++];
69#endif
65 CC = R0 == R1; 70 CC = R0 == R1;
66 IF !CC JUMP .Lquad_different; 71 IF !CC JUMP .Lquad_different;
67.Lquad_loop_e: 72.Lquad_loop_e:
diff --git a/arch/blackfin/lib/memcpy.S b/arch/blackfin/lib/memcpy.S
index 34b5a91c215c..14a5585bbd02 100644
--- a/arch/blackfin/lib/memcpy.S
+++ b/arch/blackfin/lib/memcpy.S
@@ -94,13 +94,20 @@ ENTRY(_memcpy)
94.Lmore_than_seven: 94.Lmore_than_seven:
95 /* There's at least eight bytes to copy. */ 95 /* There's at least eight bytes to copy. */
96 P2 += -1; /* because we unroll one iteration */ 96 P2 += -1; /* because we unroll one iteration */
97 LSETUP(.Lword_loop, .Lword_loop) LC0=P2; 97 LSETUP(.Lword_loops, .Lword_loope) LC0=P2;
98 R0 = R1; 98 R0 = R1;
99 I1 = P1; 99 I1 = P1;
100 R3 = [I1++]; 100 R3 = [I1++];
101.Lword_loop: 101#ifdef ANOMALY_05000202
102.Lword_loops:
103 [P0++] = R3;
104.Lword_loope:
105 R3 = [I1++];
106#else
107.Lword_loops:
108.Lword_loope:
102 MNOP || [P0++] = R3 || R3 = [I1++]; 109 MNOP || [P0++] = R3 || R3 = [I1++];
103 110#endif
104 [P0++] = R3; 111 [P0++] = R3;
105 /* Any remaining bytes to copy? */ 112 /* Any remaining bytes to copy? */
106 R3 = 0x3; 113 R3 = 0x3;
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S
index c371585e9dbd..6ee6e206e77c 100644
--- a/arch/blackfin/lib/memmove.S
+++ b/arch/blackfin/lib/memmove.S
@@ -69,8 +69,17 @@ ENTRY(_memmove)
69 P2 = R2; /* set remainder */ 69 P2 = R2; /* set remainder */
70 R1 = [I0++]; 70 R1 = [I0++];
71 71
72 LSETUP (.Lquad_loop, .Lquad_loop) LC0=P1; 72 LSETUP (.Lquad_loops, .Lquad_loope) LC0=P1;
73.Lquad_loop: MNOP || [P0++] = R1 || R1 = [I0++]; 73#ifdef ANOMALY_05000202
74.Lquad_loops:
75 [P0++] = R1;
76.Lquad_loope:
77 R1 = [I0++];
78#else
79.Lquad_loops:
80.Lquad_loope:
81 MNOP || [P0++] = R1 || R1 = [I0++];
82#endif
74 [P0++] = R1; 83 [P0++] = R1;
75 84
76 CC = P2 == 0; /* any remaining bytes? */ 85 CC = P2 == 0; /* any remaining bytes? */
@@ -93,6 +102,10 @@ ENTRY(_memmove)
93 R1 = B[P3--] (Z); 102 R1 = B[P3--] (Z);
94 CC = P2 == 0; 103 CC = P2 == 0;
95 IF CC JUMP .Lno_loop; 104 IF CC JUMP .Lno_loop;
105#ifdef ANOMALY_05000245
106 NOP;
107 NOP;
108#endif
96 LSETUP (.Lol_s, .Lol_e) LC0 = P2; 109 LSETUP (.Lol_s, .Lol_e) LC0 = P2;
97.Lol_s: B[P0--] = R1; 110.Lol_s: B[P0--] = R1;
98.Lol_e: R1 = B[P3--] (Z); 111.Lol_e: R1 = B[P3--] (Z);
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S
index 8bd2af1935bd..7063795eb7c0 100644
--- a/arch/blackfin/mach-common/cache.S
+++ b/arch/blackfin/mach-common/cache.S
@@ -123,14 +123,14 @@ ENTRY(_blackfin_icache_flush_range)
123 R2 = R0 & R2; 123 R2 = R0 & R2;
124 P0 = R2; 124 P0 = R2;
125 P1 = R1; 125 P1 = R1;
126 CSYNC; 126 CSYNC(R3);
127 IFLUSH [P0]; 127 IFLUSH [P0];
1281: 1281:
129 IFLUSH [P0++]; 129 IFLUSH [P0++];
130 CC = P0 < P1 (iu); 130 CC = P0 < P1 (iu);
131 IF CC JUMP 1b (bp); 131 IF CC JUMP 1b (bp);
132 IFLUSH [P0]; 132 IFLUSH [P0];
133 SSYNC; 133 SSYNC(R3);
134 RTS; 134 RTS;
135ENDPROC(_blackfin_icache_flush_range) 135ENDPROC(_blackfin_icache_flush_range)
136 136
@@ -148,7 +148,7 @@ ENTRY(_blackfin_icache_dcache_flush_range)
148 R2 = R0 & R2; 148 R2 = R0 & R2;
149 P0 = R2; 149 P0 = R2;
150 P1 = R1; 150 P1 = R1;
151 CSYNC; 151 CSYNC(R3);
152 IFLUSH [P0]; 152 IFLUSH [P0];
1531: 1531:
154 FLUSH [P0]; 154 FLUSH [P0];
@@ -157,7 +157,7 @@ ENTRY(_blackfin_icache_dcache_flush_range)
157 IF CC JUMP 1b (bp); 157 IF CC JUMP 1b (bp);
158 IFLUSH [P0]; 158 IFLUSH [P0];
159 FLUSH [P0]; 159 FLUSH [P0];
160 SSYNC; 160 SSYNC(R3);
161 RTS; 161 RTS;
162ENDPROC(_blackfin_icache_dcache_flush_range) 162ENDPROC(_blackfin_icache_dcache_flush_range)
163 163
@@ -174,7 +174,7 @@ ENTRY(_blackfin_dcache_invalidate_range)
174 R2 = R0 & R2; 174 R2 = R0 & R2;
175 P0 = R2; 175 P0 = R2;
176 P1 = R1; 176 P1 = R1;
177 CSYNC; 177 CSYNC(R3);
178 FLUSHINV[P0]; 178 FLUSHINV[P0];
1791: 1791:
180 FLUSHINV[P0++]; 180 FLUSHINV[P0++];
@@ -186,7 +186,7 @@ ENTRY(_blackfin_dcache_invalidate_range)
186 * so do one more. 186 * so do one more.
187 */ 187 */
188 FLUSHINV[P0]; 188 FLUSHINV[P0];
189 SSYNC; 189 SSYNC(R3);
190 RTS; 190 RTS;
191ENDPROC(_blackfin_dcache_invalidate_range) 191ENDPROC(_blackfin_dcache_invalidate_range)
192 192
@@ -235,7 +235,7 @@ ENTRY(_blackfin_dcache_flush_range)
235 R2 = R0 & R2; 235 R2 = R0 & R2;
236 P0 = R2; 236 P0 = R2;
237 P1 = R1; 237 P1 = R1;
238 CSYNC; 238 CSYNC(R3);
239 FLUSH[P0]; 239 FLUSH[P0];
2401: 2401:
241 FLUSH[P0++]; 241 FLUSH[P0++];
@@ -247,17 +247,17 @@ ENTRY(_blackfin_dcache_flush_range)
247 * one more. 247 * one more.
248 */ 248 */
249 FLUSH[P0]; 249 FLUSH[P0];
250 SSYNC; 250 SSYNC(R3);
251 RTS; 251 RTS;
252ENDPROC(_blackfin_dcache_flush_range) 252ENDPROC(_blackfin_dcache_flush_range)
253 253
254ENTRY(_blackfin_dflush_page) 254ENTRY(_blackfin_dflush_page)
255 P1 = 1 << (PAGE_SHIFT - L1_CACHE_SHIFT); 255 P1 = 1 << (PAGE_SHIFT - L1_CACHE_SHIFT);
256 P0 = R0; 256 P0 = R0;
257 CSYNC; 257 CSYNC(R3);
258 FLUSH[P0]; 258 FLUSH[P0];
259 LSETUP (.Lfl1, .Lfl1) LC0 = P1; 259 LSETUP (.Lfl1, .Lfl1) LC0 = P1;
260.Lfl1: FLUSH [P0++]; 260.Lfl1: FLUSH [P0++];
261 SSYNC; 261 SSYNC(R3);
262 RTS; 262 RTS;
263ENDPROC(_blackfin_dflush_page) 263ENDPROC(_blackfin_dflush_page)
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index b69f517a650b..8be548e061bf 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -139,7 +139,7 @@ __common_int_entry:
139 fp = 0; 139 fp = 0;
140#endif 140#endif
141 141
142#ifdef ANOMALY_05000283 142#if defined (ANOMALY_05000283) || defined (ANOMALY_05000315)
143 cc = r7 == r7; 143 cc = r7 == r7;
144 p5.h = 0xffc0; 144 p5.h = 0xffc0;
145 p5.l = 0x0014; 145 p5.l = 0x0014;
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8770a5d0b143..d2f6a247414d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -541,7 +541,7 @@ config HIGHMEM4G
541 541
542config HIGHMEM64G 542config HIGHMEM64G
543 bool "64GB" 543 bool "64GB"
544 depends on X86_CMPXCHG64 544 depends on !M386 && !M486
545 help 545 help
546 Select this if you have a 32-bit processor and more than 4 546 Select this if you have a 32-bit processor and more than 4
547 gigabytes of physical RAM. 547 gigabytes of physical RAM.
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index d7f6fb0b30f2..5c95ceb7f122 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -299,7 +299,7 @@ config X86_POPAD_OK
299 299
300config X86_CMPXCHG64 300config X86_CMPXCHG64
301 bool 301 bool
302 depends on !M386 && !M486 302 depends on X86_PAE
303 default y 303 default y
304 304
305config X86_ALIGNMENT_16 305config X86_ALIGNMENT_16
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index b781b38131c0..a2295a34b2c7 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -230,6 +230,7 @@ bogus_magic:
230# 230#
231ENTRY(acpi_copy_wakeup_routine) 231ENTRY(acpi_copy_wakeup_routine)
232 232
233 pushl %ebx
233 sgdt saved_gdt 234 sgdt saved_gdt
234 sidt saved_idt 235 sidt saved_idt
235 sldt saved_ldt 236 sldt saved_ldt
@@ -263,6 +264,7 @@ ENTRY(acpi_copy_wakeup_routine)
263 movl %edx, video_flags - wakeup_start (%eax) 264 movl %edx, video_flags - wakeup_start (%eax)
264 movl $0x12345678, real_magic - wakeup_start (%eax) 265 movl $0x12345678, real_magic - wakeup_start (%eax)
265 movl $0x12345678, saved_magic 266 movl $0x12345678, saved_magic
267 popl %ebx
266 ret 268 ret
267 269
268save_registers: 270save_registers:
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c
index c4ebb5126ef7..6d5937891b46 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -42,7 +42,7 @@ static int mtrr_show;
42module_param_named(show, mtrr_show, bool, 0); 42module_param_named(show, mtrr_show, bool, 0);
43 43
44/* Get the MSR pair relating to a var range */ 44/* Get the MSR pair relating to a var range */
45static void __init 45static void
46get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr) 46get_mtrr_var_range(unsigned int index, struct mtrr_var_range *vr)
47{ 47{
48 rdmsr(MTRRphysBase_MSR(index), vr->base_lo, vr->base_hi); 48 rdmsr(MTRRphysBase_MSR(index), vr->base_lo, vr->base_hi);
@@ -68,7 +68,7 @@ void mtrr_save_fixed_ranges(void *info)
68 get_fixed_ranges(mtrr_state.fixed_ranges); 68 get_fixed_ranges(mtrr_state.fixed_ranges);
69} 69}
70 70
71static void __cpuinit print_fixed(unsigned base, unsigned step, const mtrr_type*types) 71static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
72{ 72{
73 unsigned i; 73 unsigned i;
74 74
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index 7202b98aac4f..55b005152a11 100644
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
@@ -639,7 +639,7 @@ static struct sysdev_driver mtrr_sysdev_driver = {
639 * initialized (i.e. before smp_init()). 639 * initialized (i.e. before smp_init()).
640 * 640 *
641 */ 641 */
642void mtrr_bp_init(void) 642__init void mtrr_bp_init(void)
643{ 643{
644 init_ifs(); 644 init_ifs();
645 645
diff --git a/arch/i386/kernel/pci-dma.c b/arch/i386/kernel/pci-dma.c
index 30b754f7cbec..048f09b62553 100644
--- a/arch/i386/kernel/pci-dma.c
+++ b/arch/i386/kernel/pci-dma.c
@@ -12,6 +12,7 @@
12#include <linux/string.h> 12#include <linux/string.h>
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <linux/module.h> 14#include <linux/module.h>
15#include <linux/pci.h>
15#include <asm/io.h> 16#include <asm/io.h>
16 17
17struct dma_coherent_mem { 18struct dma_coherent_mem {
@@ -148,3 +149,29 @@ void *dma_mark_declared_memory_occupied(struct device *dev,
148 return mem->virt_base + (pos << PAGE_SHIFT); 149 return mem->virt_base + (pos << PAGE_SHIFT);
149} 150}
150EXPORT_SYMBOL(dma_mark_declared_memory_occupied); 151EXPORT_SYMBOL(dma_mark_declared_memory_occupied);
152
153#ifdef CONFIG_PCI
154/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
155
156int forbid_dac;
157EXPORT_SYMBOL(forbid_dac);
158
159static __devinit void via_no_dac(struct pci_dev *dev)
160{
161 if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
162 printk(KERN_INFO "PCI: VIA PCI bridge detected. Disabling DAC.\n");
163 forbid_dac = 1;
164 }
165}
166DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
167
168static int check_iommu(char *s)
169{
170 if (!strcmp(s, "usedac")) {
171 forbid_dac = -1;
172 return 1;
173 }
174 return 0;
175}
176__setup("iommu=", check_iommu);
177#endif
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index b22ce8d6b1ba..7135946d3663 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -799,6 +799,7 @@ void mark_rodata_ro(void)
799 unsigned long start = PFN_ALIGN(_text); 799 unsigned long start = PFN_ALIGN(_text);
800 unsigned long size = PFN_ALIGN(_etext) - start; 800 unsigned long size = PFN_ALIGN(_etext) - start;
801 801
802#ifndef CONFIG_KPROBES
802#ifdef CONFIG_HOTPLUG_CPU 803#ifdef CONFIG_HOTPLUG_CPU
803 /* It must still be possible to apply SMP alternatives. */ 804 /* It must still be possible to apply SMP alternatives. */
804 if (num_possible_cpus() <= 1) 805 if (num_possible_cpus() <= 1)
@@ -808,7 +809,7 @@ void mark_rodata_ro(void)
808 size >> PAGE_SHIFT, PAGE_KERNEL_RX); 809 size >> PAGE_SHIFT, PAGE_KERNEL_RX);
809 printk("Write protecting the kernel text: %luk\n", size >> 10); 810 printk("Write protecting the kernel text: %luk\n", size >> 10);
810 } 811 }
811 812#endif
812 start += size; 813 start += size;
813 size = (unsigned long)__end_rodata - start; 814 size = (unsigned long)__end_rodata - start;
814 change_page_attr(virt_to_page(start), 815 change_page_attr(virt_to_page(start),
diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index 47bd477c8ecc..2eb14a73be9c 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -68,14 +68,23 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot,
68 return base; 68 return base;
69} 69}
70 70
71static void flush_kernel_map(void *arg) 71static void cache_flush_page(struct page *p)
72{ 72{
73 unsigned long adr = (unsigned long)arg; 73 unsigned long adr = (unsigned long)page_address(p);
74 int i;
75 for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size)
76 asm volatile("clflush (%0)" :: "r" (adr + i));
77}
78
79static void flush_kernel_map(void *arg)
80{
81 struct list_head *lh = (struct list_head *)arg;
82 struct page *p;
74 83
75 if (adr && cpu_has_clflush) { 84 /* High level code is not ready for clflush yet */
76 int i; 85 if (0 && cpu_has_clflush) {
77 for (i = 0; i < PAGE_SIZE; i += boot_cpu_data.x86_clflush_size) 86 list_for_each_entry (p, lh, lru)
78 asm volatile("clflush (%0)" :: "r" (adr + i)); 87 cache_flush_page(p);
79 } else if (boot_cpu_data.x86_model >= 4) 88 } else if (boot_cpu_data.x86_model >= 4)
80 wbinvd(); 89 wbinvd();
81 90
@@ -181,9 +190,9 @@ __change_page_attr(struct page *page, pgprot_t prot)
181 return 0; 190 return 0;
182} 191}
183 192
184static inline void flush_map(void *adr) 193static inline void flush_map(struct list_head *l)
185{ 194{
186 on_each_cpu(flush_kernel_map, adr, 1, 1); 195 on_each_cpu(flush_kernel_map, l, 1, 1);
187} 196}
188 197
189/* 198/*
@@ -225,11 +234,8 @@ void global_flush_tlb(void)
225 spin_lock_irq(&cpa_lock); 234 spin_lock_irq(&cpa_lock);
226 list_replace_init(&df_list, &l); 235 list_replace_init(&df_list, &l);
227 spin_unlock_irq(&cpa_lock); 236 spin_unlock_irq(&cpa_lock);
228 if (!cpu_has_clflush) 237 flush_map(&l);
229 flush_map(NULL);
230 list_for_each_entry_safe(pg, next, &l, lru) { 238 list_for_each_entry_safe(pg, next, &l, lru) {
231 if (cpu_has_clflush)
232 flush_map(page_address(pg));
233 __free_page(pg); 239 __free_page(pg);
234 } 240 }
235} 241}
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 85cdd23b0447..a86e2e9a639f 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -418,9 +418,6 @@ config STRAM_PROC
418 help 418 help
419 Say Y here to report ST-RAM usage statistics in /proc/stram. 419 Say Y here to report ST-RAM usage statistics in /proc/stram.
420 420
421config ATARI_KBD_CORE
422 bool
423
424config HEARTBEAT 421config HEARTBEAT
425 bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40 422 bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
426 default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300 423 default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9528ee90640a..73455389257a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -317,7 +317,7 @@ config PNX8550_JBS
317 select SYS_SUPPORTS_LITTLE_ENDIAN 317 select SYS_SUPPORTS_LITTLE_ENDIAN
318 318
319config PNX8550_STB810 319config PNX8550_STB810
320 bool "Support for Philips PNX8550 based STB810 board" 320 bool "Philips PNX8550 based STB810 board"
321 select PNX8550 321 select PNX8550
322 select SYS_SUPPORTS_LITTLE_ENDIAN 322 select SYS_SUPPORTS_LITTLE_ENDIAN
323 323
@@ -392,7 +392,7 @@ config QEMU
392 can be found at http://www.linux-mips.org/wiki/Qemu. 392 can be found at http://www.linux-mips.org/wiki/Qemu.
393 393
394config MARKEINS 394config MARKEINS
395 bool "Support for NEC EMMA2RH Mark-eins" 395 bool "NEC EMMA2RH Mark-eins"
396 select DMA_NONCOHERENT 396 select DMA_NONCOHERENT
397 select HW_HAS_PCI 397 select HW_HAS_PCI
398 select IRQ_CPU 398 select IRQ_CPU
@@ -1392,6 +1392,7 @@ config MIPS_VPE_LOADER
1392 depends on SYS_SUPPORTS_MULTITHREADING 1392 depends on SYS_SUPPORTS_MULTITHREADING
1393 select CPU_MIPSR2_IRQ_VI 1393 select CPU_MIPSR2_IRQ_VI
1394 select CPU_MIPSR2_IRQ_EI 1394 select CPU_MIPSR2_IRQ_EI
1395 select CPU_MIPSR2_SRS
1395 select MIPS_MT 1396 select MIPS_MT
1396 help 1397 help
1397 Includes a loader for loading an elf relocatable object 1398 Includes a loader for loading an elf relocatable object
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index 1fae39a608cf..6131b56f41b5 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -53,7 +53,7 @@ void __init prom_init(void)
53 53
54 prom_argc = fw_arg0; 54 prom_argc = fw_arg0;
55 prom_argv = (char **) fw_arg1; 55 prom_argv = (char **) fw_arg1;
56 prom_envp = (int *) fw_arg3; 56 prom_envp = (char **) fw_arg3;
57 57
58 mips_machgroup = MACH_GROUP_ALCHEMY; 58 mips_machgroup = MACH_GROUP_ALCHEMY;
59 mips_machtype = MACH_PB1100; 59 mips_machtype = MACH_PB1100;
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c
index 0ffdb4fd575b..c9b655616fb3 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -125,7 +125,7 @@ void __init board_setup(void)
125 au_writel((au_readl(0xac000028) | 0x20), 0xac000028); 125 au_writel((au_readl(0xac000028) | 0x20), 0xac000028);
126 } 126 }
127 /* Put the clock in BCD mode */ 127 /* Put the clock in BCD mode */
128 if (readl(0xac00002C) & 0x4) { /* reg B */ 128 if (au_readl(0xac00002C) & 0x4) { /* reg B */
129 au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c); 129 au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);
130 au_sync(); 130 au_sync();
131 } 131 }
diff --git a/arch/mips/cobalt/pci.c b/arch/mips/cobalt/pci.c
index d91027f43de6..cfce7af1bca9 100644
--- a/arch/mips/cobalt/pci.c
+++ b/arch/mips/cobalt/pci.c
@@ -35,6 +35,7 @@ static struct pci_controller cobalt_pci_controller = {
35 .mem_resource = &cobalt_mem_resource, 35 .mem_resource = &cobalt_mem_resource,
36 .io_resource = &cobalt_io_resource, 36 .io_resource = &cobalt_io_resource,
37 .io_offset = 0 - GT_DEF_PCI0_IO_BASE, 37 .io_offset = 0 - GT_DEF_PCI0_IO_BASE,
38 .io_map_base = CKSEG1ADDR(GT_DEF_PCI0_IO_BASE),
38}; 39};
39 40
40static int __init cobalt_pci_init(void) 41static int __init cobalt_pci_init(void)
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index 3044579f171a..2e3e155b4c55 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -951,8 +951,7 @@ CONFIG_LEGACY_PTY_COUNT=256
951# CONFIG_WATCHDOG is not set 951# CONFIG_WATCHDOG is not set
952# CONFIG_HW_RANDOM is not set 952# CONFIG_HW_RANDOM is not set
953CONFIG_RTC=m 953CONFIG_RTC=m
954CONFIG_GEN_RTC=m 954# CONFIG_GEN_RTC is not set
955CONFIG_GEN_RTC_X=y
956# CONFIG_DTLK is not set 955# CONFIG_DTLK is not set
957# CONFIG_R3964 is not set 956# CONFIG_R3964 is not set
958# CONFIG_APPLICOM is not set 957# CONFIG_APPLICOM is not set
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index ab755ea26c6a..0fc90ba16ae1 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -137,7 +137,6 @@ static inline void check_wait(void)
137 case CPU_4KEC: 137 case CPU_4KEC:
138 case CPU_4KSC: 138 case CPU_4KSC:
139 case CPU_5KC: 139 case CPU_5KC:
140/* case CPU_20KC:*/
141 case CPU_24K: 140 case CPU_24K:
142 case CPU_25KF: 141 case CPU_25KF:
143 case CPU_34K: 142 case CPU_34K:
@@ -156,6 +155,17 @@ static inline void check_wait(void)
156 if (allow_au1k_wait) 155 if (allow_au1k_wait)
157 cpu_wait = au1k_wait; 156 cpu_wait = au1k_wait;
158 break; 157 break;
158 case CPU_20KC:
159 /*
160 * WAIT on Rev1.0 has E1, E2, E3 and E16.
161 * WAIT on Rev2.0 and Rev3.0 has E16.
162 * Rev3.1 WAIT is nop, why bother
163 */
164 if ((c->processor_id & 0xff) <= 0x64)
165 break;
166
167 cpu_wait = r4k_wait;
168 break;
159 case CPU_RM9000: 169 case CPU_RM9000:
160 if ((c->processor_id & 0x00ff) >= 0x40) 170 if ((c->processor_id & 0x00ff) >= 0x40)
161 cpu_wait = r4k_wait; 171 cpu_wait = r4k_wait;
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 003f8152b9ed..486b8e5f52d0 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -36,68 +36,6 @@
36 36
37#include "signal-common.h" 37#include "signal-common.h"
38 38
39#define SI_PAD_SIZE32 ((SI_MAX_SIZE/sizeof(int)) - 3)
40
41typedef struct compat_siginfo {
42 int si_signo;
43 int si_code;
44 int si_errno;
45
46 union {
47 int _pad[SI_PAD_SIZE32];
48
49 /* kill() */
50 struct {
51 compat_pid_t _pid; /* sender's pid */
52 compat_uid_t _uid; /* sender's uid */
53 } _kill;
54
55 /* SIGCHLD */
56 struct {
57 compat_pid_t _pid; /* which child */
58 compat_uid_t _uid; /* sender's uid */
59 int _status; /* exit code */
60 compat_clock_t _utime;
61 compat_clock_t _stime;
62 } _sigchld;
63
64 /* IRIX SIGCHLD */
65 struct {
66 compat_pid_t _pid; /* which child */
67 compat_clock_t _utime;
68 int _status; /* exit code */
69 compat_clock_t _stime;
70 } _irix_sigchld;
71
72 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
73 struct {
74 s32 _addr; /* faulting insn/memory ref. */
75 } _sigfault;
76
77 /* SIGPOLL, SIGXFSZ (To do ...) */
78 struct {
79 int _band; /* POLL_IN, POLL_OUT, POLL_MSG */
80 int _fd;
81 } _sigpoll;
82
83 /* POSIX.1b timers */
84 struct {
85 timer_t _tid; /* timer id */
86 int _overrun; /* overrun count */
87 compat_sigval_t _sigval;/* same as below */
88 int _sys_private; /* not to be passed to user */
89 } _timer;
90
91 /* POSIX.1b signals */
92 struct {
93 compat_pid_t _pid; /* sender's pid */
94 compat_uid_t _uid; /* sender's uid */
95 compat_sigval_t _sigval;
96 } _rt;
97
98 } _sifields;
99} compat_siginfo_t;
100
101/* 39/*
102 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ... 40 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...
103 */ 41 */
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 4cf9ff24d1f7..eb7e05926ebe 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -72,7 +72,7 @@ struct ucontextn32 {
72struct rt_sigframe_n32 { 72struct rt_sigframe_n32 {
73 u32 rs_ass[4]; /* argument save space for o32 */ 73 u32 rs_ass[4]; /* argument save space for o32 */
74 u32 rs_code[2]; /* signal trampoline */ 74 u32 rs_code[2]; /* signal trampoline */
75 struct siginfo rs_info; 75 struct compat_siginfo rs_info;
76 struct ucontextn32 rs_uc; 76 struct ucontextn32 rs_uc;
77}; 77};
78 78
@@ -81,7 +81,7 @@ struct rt_sigframe_n32 {
81struct rt_sigframe_n32 { 81struct rt_sigframe_n32 {
82 u32 rs_ass[4]; /* argument save space for o32 */ 82 u32 rs_ass[4]; /* argument save space for o32 */
83 u32 rs_pad[2]; 83 u32 rs_pad[2];
84 struct siginfo rs_info; 84 struct compat_siginfo rs_info;
85 struct ucontextn32 rs_uc; 85 struct ucontextn32 rs_uc;
86 u32 rs_code[8] ____cacheline_aligned; /* signal trampoline */ 86 u32 rs_code[8] ____cacheline_aligned; /* signal trampoline */
87}; 87};
@@ -187,7 +187,7 @@ static int setup_rt_frame_n32(struct k_sigaction * ka,
187 install_sigtramp(frame->rs_code, __NR_N32_rt_sigreturn); 187 install_sigtramp(frame->rs_code, __NR_N32_rt_sigreturn);
188 188
189 /* Create siginfo. */ 189 /* Create siginfo. */
190 err |= copy_siginfo_to_user(&frame->rs_info, info); 190 err |= copy_siginfo_to_user32(&frame->rs_info, info);
191 191
192 /* Create the ucontext. */ 192 /* Create the ucontext. */
193 err |= __put_user(0, &frame->rs_uc.uc_flags); 193 err |= __put_user(0, &frame->rs_uc.uc_flags);
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 21eb5993a19f..046b03b1705a 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -13,9 +13,9 @@
13#include <asm/system.h> 13#include <asm/system.h>
14#include <asm/hardirq.h> 14#include <asm/hardirq.h>
15#include <asm/hazards.h> 15#include <asm/hazards.h>
16#include <asm/irq.h>
16#include <asm/mmu_context.h> 17#include <asm/mmu_context.h>
17#include <asm/smp.h> 18#include <asm/smp.h>
18#include <asm/mips-boards/maltaint.h>
19#include <asm/mipsregs.h> 19#include <asm/mipsregs.h>
20#include <asm/cacheflush.h> 20#include <asm/cacheflush.h>
21#include <asm/time.h> 21#include <asm/time.h>
@@ -614,7 +614,7 @@ int setup_irq_smtc(unsigned int irq, struct irqaction * new,
614#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG 614#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
615 unsigned int vpe = current_cpu_data.vpe_id; 615 unsigned int vpe = current_cpu_data.vpe_id;
616 616
617 vpemask[vpe][irq - MIPSCPU_INT_BASE] = 1; 617 vpemask[vpe][irq - MIPS_CPU_IRQ_BASE] = 1;
618#endif 618#endif
619 irq_hwmask[irq] = hwmask; 619 irq_hwmask[irq] = hwmask;
620 620
@@ -822,7 +822,7 @@ void ipi_decode(struct smtc_ipi *pipi)
822 switch (type_copy) { 822 switch (type_copy) {
823 case SMTC_CLOCK_TICK: 823 case SMTC_CLOCK_TICK:
824 irq_enter(); 824 irq_enter();
825 kstat_this_cpu.irqs[MIPSCPU_INT_BASE + MIPSCPU_INT_CPUCTR]++; 825 kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + cp0_compare_irq]++;
826 /* Invoke Clock "Interrupt" */ 826 /* Invoke Clock "Interrupt" */
827 ipi_timer_latch[dest_copy] = 0; 827 ipi_timer_latch[dest_copy] = 0;
828#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG 828#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 7def1ff3da94..d48d1d5bea0a 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -200,10 +200,15 @@ EXPORT_SYMBOL(null_perf_irq);
200EXPORT_SYMBOL(perf_irq); 200EXPORT_SYMBOL(perf_irq);
201 201
202/* 202/*
203 * Timer interrupt
204 */
205int cp0_compare_irq;
206
207/*
203 * Performance counter IRQ or -1 if shared with timer 208 * Performance counter IRQ or -1 if shared with timer
204 */ 209 */
205int mipsxx_perfcount_irq; 210int cp0_perfcount_irq;
206EXPORT_SYMBOL(mipsxx_perfcount_irq); 211EXPORT_SYMBOL_GPL(cp0_perfcount_irq);
207 212
208/* 213/*
209 * Possibly handle a performance counter interrupt. 214 * Possibly handle a performance counter interrupt.
@@ -213,12 +218,12 @@ static inline int handle_perf_irq (int r2)
213{ 218{
214 /* 219 /*
215 * The performance counter overflow interrupt may be shared with the 220 * The performance counter overflow interrupt may be shared with the
216 * timer interrupt (mipsxx_perfcount_irq < 0). If it is and a 221 * timer interrupt (cp0_perfcount_irq < 0). If it is and a
217 * performance counter has overflowed (perf_irq() == IRQ_HANDLED) 222 * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
218 * and we can't reliably determine if a counter interrupt has also 223 * and we can't reliably determine if a counter interrupt has also
219 * happened (!r2) then don't check for a timer interrupt. 224 * happened (!r2) then don't check for a timer interrupt.
220 */ 225 */
221 return (mipsxx_perfcount_irq < 0) && 226 return (cp0_perfcount_irq < 0) &&
222 perf_irq() == IRQ_HANDLED && 227 perf_irq() == IRQ_HANDLED &&
223 !r2; 228 !r2;
224} 229}
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index a7a17eb9bfcd..b1233644fcca 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1350,9 +1350,6 @@ void __init per_cpu_trap_init(void)
1350 if (!secondaryTC) { 1350 if (!secondaryTC) {
1351#endif /* CONFIG_MIPS_MT_SMTC */ 1351#endif /* CONFIG_MIPS_MT_SMTC */
1352 1352
1353 /*
1354 * Interrupt handling.
1355 */
1356 if (cpu_has_veic || cpu_has_vint) { 1353 if (cpu_has_veic || cpu_has_vint) {
1357 write_c0_ebase (ebase); 1354 write_c0_ebase (ebase);
1358 /* Setting vector spacing enables EI/VI mode */ 1355 /* Setting vector spacing enables EI/VI mode */
@@ -1366,6 +1363,23 @@ void __init per_cpu_trap_init(void)
1366 } else 1363 } else
1367 set_c0_cause(CAUSEF_IV); 1364 set_c0_cause(CAUSEF_IV);
1368 } 1365 }
1366
1367 /*
1368 * Before R2 both interrupt numbers were fixed to 7, so on R2 only:
1369 *
1370 * o read IntCtl.IPTI to determine the timer interrupt
1371 * o read IntCtl.IPPCI to determine the performance counter interrupt
1372 */
1373 if (cpu_has_mips_r2) {
1374 cp0_compare_irq = (read_c0_intctl () >> 29) & 7;
1375 cp0_perfcount_irq = -1;
1376 } else {
1377 cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
1378 cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7;
1379 if (cp0_perfcount_irq != cp0_compare_irq)
1380 cp0_perfcount_irq = -1;
1381 }
1382
1369#ifdef CONFIG_MIPS_MT_SMTC 1383#ifdef CONFIG_MIPS_MT_SMTC
1370 } 1384 }
1371#endif /* CONFIG_MIPS_MT_SMTC */ 1385#endif /* CONFIG_MIPS_MT_SMTC */
diff --git a/arch/mips/lib/ucmpdi2.c b/arch/mips/lib/ucmpdi2.c
index e9ff258ef028..e2ff6072b5a3 100644
--- a/arch/mips/lib/ucmpdi2.c
+++ b/arch/mips/lib/ucmpdi2.c
@@ -2,7 +2,7 @@
2 2
3#include "libgcc.h" 3#include "libgcc.h"
4 4
5word_type __ucmpdi2 (unsigned long a, unsigned long b) 5word_type __ucmpdi2 (unsigned long long a, unsigned long long b)
6{ 6{
7 const DWunion au = {.ll = a}; 7 const DWunion au = {.ll = a};
8 const DWunion bu = {.ll = b}; 8 const DWunion bu = {.ll = b};
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
index 9f49da95aacf..6c8f0255e85d 100644
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ b/arch/mips/mips-boards/atlas/atlas_int.c
@@ -189,7 +189,7 @@ asmlinkage void plat_irq_dispatch(void)
189 if (irq == MIPSCPU_INT_ATLAS) 189 if (irq == MIPSCPU_INT_ATLAS)
190 atlas_hw0_irqdispatch(); 190 atlas_hw0_irqdispatch();
191 else if (irq >= 0) 191 else if (irq >= 0)
192 do_IRQ(MIPSCPU_INT_BASE + irq); 192 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
193 else 193 else
194 spurious_interrupt(); 194 spurious_interrupt();
195} 195}
@@ -261,11 +261,11 @@ void __init arch_init_irq(void)
261 } else if (cpu_has_vint) { 261 } else if (cpu_has_vint) {
262 set_vi_handler (MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch); 262 set_vi_handler (MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch);
263#ifdef CONFIG_MIPS_MT_SMTC 263#ifdef CONFIG_MIPS_MT_SMTC
264 setup_irq_smtc (MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS, 264 setup_irq_smtc (MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS,
265 &atlasirq, (0x100 << MIPSCPU_INT_ATLAS)); 265 &atlasirq, (0x100 << MIPSCPU_INT_ATLAS));
266#else /* Not SMTC */ 266#else /* Not SMTC */
267 setup_irq(MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS, &atlasirq); 267 setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
268#endif /* CONFIG_MIPS_MT_SMTC */ 268#endif /* CONFIG_MIPS_MT_SMTC */
269 } else 269 } else
270 setup_irq(MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS, &atlasirq); 270 setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
271} 271}
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index 8f1000f51b3d..c45d556aa96b 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -54,7 +54,7 @@
54unsigned long cpu_khz; 54unsigned long cpu_khz;
55 55
56static int mips_cpu_timer_irq; 56static int mips_cpu_timer_irq;
57extern int mipsxx_perfcount_irq; 57extern int cp0_perfcount_irq;
58extern void smtc_timer_broadcast(int); 58extern void smtc_timer_broadcast(int);
59 59
60static void mips_timer_dispatch(void) 60static void mips_timer_dispatch(void)
@@ -64,7 +64,7 @@ static void mips_timer_dispatch(void)
64 64
65static void mips_perf_dispatch(void) 65static void mips_perf_dispatch(void)
66{ 66{
67 do_IRQ(mipsxx_perfcount_irq); 67 do_IRQ(cp0_perfcount_irq);
68} 68}
69 69
70/* 70/*
@@ -82,12 +82,12 @@ static inline int handle_perf_irq (int r2)
82{ 82{
83 /* 83 /*
84 * The performance counter overflow interrupt may be shared with the 84 * The performance counter overflow interrupt may be shared with the
85 * timer interrupt (mipsxx_perfcount_irq < 0). If it is and a 85 * timer interrupt (cp0_perfcount_irq < 0). If it is and a
86 * performance counter has overflowed (perf_irq() == IRQ_HANDLED) 86 * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
87 * and we can't reliably determine if a counter interrupt has also 87 * and we can't reliably determine if a counter interrupt has also
88 * happened (!r2) then don't check for a timer interrupt. 88 * happened (!r2) then don't check for a timer interrupt.
89 */ 89 */
90 return (mipsxx_perfcount_irq < 0) && 90 return (cp0_perfcount_irq < 0) &&
91 perf_irq() == IRQ_HANDLED && 91 perf_irq() == IRQ_HANDLED &&
92 !r2; 92 !r2;
93} 93}
@@ -259,42 +259,31 @@ static struct irqaction perf_irqaction = {
259 259
260void __init plat_perf_setup(struct irqaction *irq) 260void __init plat_perf_setup(struct irqaction *irq)
261{ 261{
262 int hwint = 0; 262 cp0_perfcount_irq = -1;
263 mipsxx_perfcount_irq = -1;
264 263
265#ifdef MSC01E_INT_BASE 264#ifdef MSC01E_INT_BASE
266 if (cpu_has_veic) { 265 if (cpu_has_veic) {
267 set_vi_handler (MSC01E_INT_PERFCTR, mips_perf_dispatch); 266 set_vi_handler (MSC01E_INT_PERFCTR, mips_perf_dispatch);
268 mipsxx_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR; 267 cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR;
269 } else 268 } else
270#endif 269#endif
271 if (cpu_has_mips_r2) { 270 if (cp0_perfcount_irq >= 0) {
272 /* 271 if (cpu_has_vint)
273 * Read IntCtl.IPPCI to determine the performance 272 set_vi_handler(cp0_perfcount_irq, mips_perf_dispatch);
274 * counter interrupt
275 */
276 hwint = (read_c0_intctl () >> 26) & 7;
277 if (hwint != MIPSCPU_INT_CPUCTR) {
278 if (cpu_has_vint)
279 set_vi_handler (hwint, mips_perf_dispatch);
280 mipsxx_perfcount_irq = MIPSCPU_INT_BASE + hwint;
281 }
282 }
283 if (mipsxx_perfcount_irq >= 0) {
284#ifdef CONFIG_MIPS_MT_SMTC 273#ifdef CONFIG_MIPS_MT_SMTC
285 setup_irq_smtc(mipsxx_perfcount_irq, irq, 0x100 << hwint); 274 setup_irq_smtc(cp0_perfcount_irq, irq,
275 0x100 << cp0_perfcount_irq);
286#else 276#else
287 setup_irq(mipsxx_perfcount_irq, irq); 277 setup_irq(cp0_perfcount_irq, irq);
288#endif /* CONFIG_MIPS_MT_SMTC */ 278#endif /* CONFIG_MIPS_MT_SMTC */
289#ifdef CONFIG_SMP 279#ifdef CONFIG_SMP
290 set_irq_handler(mipsxx_perfcount_irq, handle_percpu_irq); 280 set_irq_handler(cp0_perfcount_irq, handle_percpu_irq);
291#endif 281#endif
292 } 282 }
293} 283}
294 284
295void __init plat_timer_setup(struct irqaction *irq) 285void __init plat_timer_setup(struct irqaction *irq)
296{ 286{
297 int hwint = 0;
298#ifdef MSC01E_INT_BASE 287#ifdef MSC01E_INT_BASE
299 if (cpu_has_veic) { 288 if (cpu_has_veic) {
300 set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch); 289 set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);
@@ -303,22 +292,15 @@ void __init plat_timer_setup(struct irqaction *irq)
303 else 292 else
304#endif 293#endif
305 { 294 {
306 if (cpu_has_mips_r2)
307 /*
308 * Read IntCtl.IPTI to determine the timer interrupt
309 */
310 hwint = (read_c0_intctl () >> 29) & 7;
311 else
312 hwint = MIPSCPU_INT_CPUCTR;
313 if (cpu_has_vint) 295 if (cpu_has_vint)
314 set_vi_handler (hwint, mips_timer_dispatch); 296 set_vi_handler(cp0_compare_irq, mips_timer_dispatch);
315 mips_cpu_timer_irq = MIPSCPU_INT_BASE + hwint; 297 mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
316 } 298 }
317 299
318 /* we are using the cpu counter for timer interrupts */ 300 /* we are using the cpu counter for timer interrupts */
319 irq->handler = mips_timer_interrupt; /* we use our own handler */ 301 irq->handler = mips_timer_interrupt; /* we use our own handler */
320#ifdef CONFIG_MIPS_MT_SMTC 302#ifdef CONFIG_MIPS_MT_SMTC
321 setup_irq_smtc(mips_cpu_timer_irq, irq, 0x100 << hwint); 303 setup_irq_smtc(mips_cpu_timer_irq, irq, 0x100 << cp0_compare_irq);
322#else 304#else
323 setup_irq(mips_cpu_timer_irq, irq); 305 setup_irq(mips_cpu_timer_irq, irq);
324#endif /* CONFIG_MIPS_MT_SMTC */ 306#endif /* CONFIG_MIPS_MT_SMTC */
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index 1668cc21d5b5..c78d48349600 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -257,7 +257,7 @@ asmlinkage void plat_irq_dispatch(void)
257 if (irq == MIPSCPU_INT_I8259A) 257 if (irq == MIPSCPU_INT_I8259A)
258 malta_hw0_irqdispatch(); 258 malta_hw0_irqdispatch();
259 else if (irq > 0) 259 else if (irq > 0)
260 do_IRQ(MIPSCPU_INT_BASE + irq); 260 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
261 else 261 else
262 spurious_interrupt(); 262 spurious_interrupt();
263} 263}
@@ -326,17 +326,17 @@ void __init arch_init_irq(void)
326 set_vi_handler (MIPSCPU_INT_I8259A, malta_hw0_irqdispatch); 326 set_vi_handler (MIPSCPU_INT_I8259A, malta_hw0_irqdispatch);
327 set_vi_handler (MIPSCPU_INT_COREHI, corehi_irqdispatch); 327 set_vi_handler (MIPSCPU_INT_COREHI, corehi_irqdispatch);
328#ifdef CONFIG_MIPS_MT_SMTC 328#ifdef CONFIG_MIPS_MT_SMTC
329 setup_irq_smtc (MIPSCPU_INT_BASE+MIPSCPU_INT_I8259A, &i8259irq, 329 setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq,
330 (0x100 << MIPSCPU_INT_I8259A)); 330 (0x100 << MIPSCPU_INT_I8259A));
331 setup_irq_smtc (MIPSCPU_INT_BASE+MIPSCPU_INT_COREHI, 331 setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI,
332 &corehi_irqaction, (0x100 << MIPSCPU_INT_COREHI)); 332 &corehi_irqaction, (0x100 << MIPSCPU_INT_COREHI));
333#else /* Not SMTC */ 333#else /* Not SMTC */
334 setup_irq (MIPSCPU_INT_BASE+MIPSCPU_INT_I8259A, &i8259irq); 334 setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
335 setup_irq (MIPSCPU_INT_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); 335 setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
336#endif /* CONFIG_MIPS_MT_SMTC */ 336#endif /* CONFIG_MIPS_MT_SMTC */
337 } 337 }
338 else { 338 else {
339 setup_irq (MIPSCPU_INT_BASE+MIPSCPU_INT_I8259A, &i8259irq); 339 setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
340 setup_irq (MIPSCPU_INT_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); 340 setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
341 } 341 }
342} 342}
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c
index c4b9de3a7f27..9ca0f82f1360 100644
--- a/arch/mips/mips-boards/sead/sead_int.c
+++ b/arch/mips/mips-boards/sead/sead_int.c
@@ -106,7 +106,7 @@ asmlinkage void plat_irq_dispatch(void)
106 irq = irq_ffs(pending); 106 irq = irq_ffs(pending);
107 107
108 if (irq >= 0) 108 if (irq >= 0)
109 do_IRQ(MIPSCPU_INT_BASE + irq); 109 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
110 else 110 else
111 spurious_interrupt(); 111 spurious_interrupt();
112} 112}
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index 811aba100605..bb801409d39b 100644
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -68,7 +68,7 @@ static void __init serial_init(void)
68#else 68#else
69 s.iobase = SEAD_UART0_REGS_BASE+3; 69 s.iobase = SEAD_UART0_REGS_BASE+3;
70#endif 70#endif
71 s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0; 71 s.irq = MIPS_CPU_IRQ_BASE + MIPSCPU_INT_UART0;
72 s.uartclk = SEAD_BASE_BAUD * 16; 72 s.uartclk = SEAD_BASE_BAUD * 16;
73 s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ; 73 s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
74 s.iotype = UPIO_PORT; 74 s.iotype = UPIO_PORT;
diff --git a/arch/mips/mips-boards/sim/sim_int.c b/arch/mips/mips-boards/sim/sim_int.c
index 15ac0655c1ff..766e0159ee5b 100644
--- a/arch/mips/mips-boards/sim/sim_int.c
+++ b/arch/mips/mips-boards/sim/sim_int.c
@@ -77,7 +77,7 @@ asmlinkage void plat_irq_dispatch(void)
77 irq = irq_ffs(pending); 77 irq = irq_ffs(pending);
78 78
79 if (irq > 0) 79 if (irq > 0)
80 do_IRQ(MIPSCPU_INT_BASE + irq); 80 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
81 else 81 else
82 spurious_interrupt(); 82 spurious_interrupt();
83} 83}
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c
index d3a21c741514..7224ffe31d36 100644
--- a/arch/mips/mips-boards/sim/sim_time.c
+++ b/arch/mips/mips-boards/sim/sim_time.c
@@ -71,8 +71,8 @@ irqreturn_t sim_timer_interrupt(int irq, void *dev_id)
71 71
72 int vpflags = dvpe(); 72 int vpflags = dvpe();
73 write_c0_compare (read_c0_count() - 1); 73 write_c0_compare (read_c0_count() - 1);
74 clear_c0_cause(0x100 << MIPSCPU_INT_CPUCTR); 74 clear_c0_cause(0x100 << cp0_compare_irq);
75 set_c0_status(0x100 << MIPSCPU_INT_CPUCTR); 75 set_c0_status(0x100 << cp0_compare_irq);
76 irq_enable_hazard(); 76 irq_enable_hazard();
77 evpe(vpflags); 77 evpe(vpflags);
78 78
@@ -183,8 +183,8 @@ void __init plat_timer_setup(struct irqaction *irq)
183 } 183 }
184 else { 184 else {
185 if (cpu_has_vint) 185 if (cpu_has_vint)
186 set_vi_handler(MIPSCPU_INT_CPUCTR, mips_timer_dispatch); 186 set_vi_handler(cp0_compare_irq, mips_timer_dispatch);
187 mips_cpu_timer_irq = MIPSCPU_INT_BASE + MIPSCPU_INT_CPUCTR; 187 mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
188 } 188 }
189 189
190 /* we are using the cpu counter for timer interrupts */ 190 /* we are using the cpu counter for timer interrupts */
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index e70f57e27643..322167737de7 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -16,6 +16,8 @@
16 16
17#include <asm/uaccess.h> 17#include <asm/uaccess.h>
18#include <asm/assembly.h> 18#include <asm/assembly.h>
19#include <asm/asm-offsets.h>
20#include <asm/ptrace.h>
19 21
20#include <asm/unwind.h> 22#include <asm/unwind.h>
21 23
@@ -26,6 +28,8 @@
26#define dbg(x...) 28#define dbg(x...)
27#endif 29#endif
28 30
31#define KERNEL_START (KERNEL_BINARY_TEXT_START - 0x1000)
32
29extern struct unwind_table_entry __start___unwind[]; 33extern struct unwind_table_entry __start___unwind[];
30extern struct unwind_table_entry __stop___unwind[]; 34extern struct unwind_table_entry __stop___unwind[];
31 35
@@ -197,6 +201,29 @@ static int unwind_init(void)
197 return 0; 201 return 0;
198} 202}
199 203
204#ifdef CONFIG_64BIT
205#define get_func_addr(fptr) fptr[2]
206#else
207#define get_func_addr(fptr) fptr[0]
208#endif
209
210static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int frame_size)
211{
212 void handle_interruption(int, struct pt_regs *);
213 static unsigned long *hi = (unsigned long)&handle_interruption;
214
215 if (pc == get_func_addr(hi)) {
216 struct pt_regs *regs = (struct pt_regs *)(info->sp - frame_size - PT_SZ_ALGN);
217 dbg("Unwinding through handle_interruption()\n");
218 info->prev_sp = regs->gr[30];
219 info->prev_ip = regs->iaoq[0];
220
221 return 1;
222 }
223
224 return 0;
225}
226
200static void unwind_frame_regs(struct unwind_frame_info *info) 227static void unwind_frame_regs(struct unwind_frame_info *info)
201{ 228{
202 const struct unwind_table_entry *e; 229 const struct unwind_table_entry *e;
@@ -310,13 +337,15 @@ static void unwind_frame_regs(struct unwind_frame_info *info)
310 } 337 }
311 } 338 }
312 339
313 info->prev_sp = info->sp - frame_size; 340 if (!unwind_special(info, e->region_start, frame_size)) {
314 if (e->Millicode) 341 info->prev_sp = info->sp - frame_size;
315 info->rp = info->r31; 342 if (e->Millicode)
316 else if (rpoffset) 343 info->rp = info->r31;
317 info->rp = *(unsigned long *)(info->prev_sp - rpoffset); 344 else if (rpoffset)
318 info->prev_ip = info->rp; 345 info->rp = *(unsigned long *)(info->prev_sp - rpoffset);
319 info->rp = 0; 346 info->prev_ip = info->rp;
347 info->rp = 0;
348 }
320 349
321 dbg("analyzing func @ %lx, setting prev_sp=%lx " 350 dbg("analyzing func @ %lx, setting prev_sp=%lx "
322 "prev_ip=%lx npc=%lx\n", info->ip, info->prev_sp, 351 "prev_ip=%lx npc=%lx\n", info->ip, info->prev_sp,
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 02c428affc8f..74f83f4a4e5e 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-rc6 3# Linux kernel version: 2.6.22-rc6
4# Mon Apr 23 20:46:48 2007 4# Tue Jun 26 12:32:34 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -41,6 +41,7 @@ CONFIG_PPC_DCR=y
41CONFIG_PPC_OF_PLATFORM_PCI=y 41CONFIG_PPC_OF_PLATFORM_PCI=y
42CONFIG_ALTIVEC=y 42CONFIG_ALTIVEC=y
43CONFIG_PPC_STD_MMU=y 43CONFIG_PPC_STD_MMU=y
44CONFIG_PPC_MM_SLICES=y
44CONFIG_VIRT_CPU_ACCOUNTING=y 45CONFIG_VIRT_CPU_ACCOUNTING=y
45CONFIG_SMP=y 46CONFIG_SMP=y
46CONFIG_NR_CPUS=4 47CONFIG_NR_CPUS=4
@@ -69,6 +70,7 @@ CONFIG_SYSVIPC_SYSCTL=y
69# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
70CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=15
72CONFIG_CPUSETS=y 74CONFIG_CPUSETS=y
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
@@ -87,14 +89,19 @@ CONFIG_BUG=y
87CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
88CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 97CONFIG_SHMEM=y
92CONFIG_SLAB=y
93CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
94CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
95# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
96CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
97# CONFIG_SLOB is not set
98 105
99# 106#
100# Loadable module support 107# Loadable module support
@@ -163,9 +170,14 @@ CONFIG_SPU_FS=m
163CONFIG_SPU_BASE=y 170CONFIG_SPU_BASE=y
164CONFIG_CBE_RAS=y 171CONFIG_CBE_RAS=y
165CONFIG_CBE_THERM=m 172CONFIG_CBE_THERM=m
173CONFIG_CBE_CPUFREQ=m
174# CONFIG_PQ2ADS is not set
166CONFIG_PPC_NATIVE=y 175CONFIG_PPC_NATIVE=y
167CONFIG_UDBG_RTAS_CONSOLE=y 176CONFIG_UDBG_RTAS_CONSOLE=y
168CONFIG_PPC_UDBG_BEAT=y 177CONFIG_PPC_UDBG_BEAT=y
178CONFIG_MPIC=y
179# CONFIG_MPIC_WEIRD is not set
180# CONFIG_PPC_I8259 is not set
169# CONFIG_U3_DART is not set 181# CONFIG_U3_DART is not set
170CONFIG_PPC_RTAS=y 182CONFIG_PPC_RTAS=y
171# CONFIG_RTAS_ERROR_LOGGING is not set 183# CONFIG_RTAS_ERROR_LOGGING is not set
@@ -177,9 +189,23 @@ CONFIG_MMIO_NVRAM=y
177# CONFIG_PPC_970_NAP is not set 189# CONFIG_PPC_970_NAP is not set
178CONFIG_PPC_INDIRECT_IO=y 190CONFIG_PPC_INDIRECT_IO=y
179CONFIG_GENERIC_IOMAP=y 191CONFIG_GENERIC_IOMAP=y
180# CONFIG_CPU_FREQ_PMAC64 is not set 192CONFIG_CPU_FREQ=y
181# CONFIG_WANT_EARLY_SERIAL is not set 193CONFIG_CPU_FREQ_TABLE=y
182CONFIG_MPIC=y 194# CONFIG_CPU_FREQ_DEBUG is not set
195CONFIG_CPU_FREQ_STAT=y
196# CONFIG_CPU_FREQ_STAT_DETAILS is not set
197CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
198# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
199CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
200CONFIG_CPU_FREQ_GOV_POWERSAVE=y
201CONFIG_CPU_FREQ_GOV_USERSPACE=y
202CONFIG_CPU_FREQ_GOV_ONDEMAND=y
203CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
204
205#
206# CPU Frequency drivers
207#
208# CONFIG_CPM2 is not set
183 209
184# 210#
185# Kernel options 211# Kernel options
@@ -224,12 +250,14 @@ CONFIG_RESOURCES_64BIT=y
224CONFIG_ZONE_DMA_FLAG=1 250CONFIG_ZONE_DMA_FLAG=1
225CONFIG_ARCH_MEMORY_PROBE=y 251CONFIG_ARCH_MEMORY_PROBE=y
226CONFIG_NODES_SPAN_OTHER_NODES=y 252CONFIG_NODES_SPAN_OTHER_NODES=y
253CONFIG_PPC_HAS_HASH_64K=y
227CONFIG_PPC_64K_PAGES=y 254CONFIG_PPC_64K_PAGES=y
228CONFIG_SCHED_SMT=y 255CONFIG_SCHED_SMT=y
229CONFIG_PROC_DEVICETREE=y 256CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 257# CONFIG_CMDLINE_BOOL is not set
231# CONFIG_PM is not set 258# CONFIG_PM is not set
232CONFIG_SECCOMP=y 259CONFIG_SECCOMP=y
260# CONFIG_WANT_DEVICE_TREE is not set
233CONFIG_ISA_DMA_API=y 261CONFIG_ISA_DMA_API=y
234 262
235# 263#
@@ -237,22 +265,18 @@ CONFIG_ISA_DMA_API=y
237# 265#
238CONFIG_ZONE_DMA=y 266CONFIG_ZONE_DMA=y
239CONFIG_GENERIC_ISA_DMA=y 267CONFIG_GENERIC_ISA_DMA=y
240# CONFIG_MPIC_WEIRD is not set
241# CONFIG_PPC_I8259 is not set
242# CONFIG_PPC_INDIRECT_PCI is not set 268# CONFIG_PPC_INDIRECT_PCI is not set
243CONFIG_PCI=y 269CONFIG_PCI=y
244CONFIG_PCI_DOMAINS=y 270CONFIG_PCI_DOMAINS=y
245CONFIG_PCIEPORTBUS=y 271CONFIG_PCIEPORTBUS=y
272CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set
246# CONFIG_PCI_DEBUG is not set 274# CONFIG_PCI_DEBUG is not set
247 275
248# 276#
249# PCCARD (PCMCIA/CardBus) support 277# PCCARD (PCMCIA/CardBus) support
250# 278#
251# CONFIG_PCCARD is not set 279# CONFIG_PCCARD is not set
252
253#
254# PCI Hotplug Support
255#
256# CONFIG_HOTPLUG_PCI is not set 280# CONFIG_HOTPLUG_PCI is not set
257CONFIG_KERNEL_START=0xc000000000000000 281CONFIG_KERNEL_START=0xc000000000000000
258 282
@@ -264,7 +288,6 @@ CONFIG_NET=y
264# 288#
265# Networking options 289# Networking options
266# 290#
267# CONFIG_NETDEBUG is not set
268CONFIG_PACKET=y 291CONFIG_PACKET=y
269# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
270CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -300,14 +323,11 @@ CONFIG_INET_TCP_DIAG=y
300CONFIG_TCP_CONG_CUBIC=y 323CONFIG_TCP_CONG_CUBIC=y
301CONFIG_DEFAULT_TCP_CONG="cubic" 324CONFIG_DEFAULT_TCP_CONG="cubic"
302# CONFIG_TCP_MD5SIG is not set 325# CONFIG_TCP_MD5SIG is not set
303
304#
305# IP: Virtual Server Configuration
306#
307# CONFIG_IP_VS is not set 326# CONFIG_IP_VS is not set
308CONFIG_IPV6=y 327CONFIG_IPV6=y
309# CONFIG_IPV6_PRIVACY is not set 328# CONFIG_IPV6_PRIVACY is not set
310# CONFIG_IPV6_ROUTER_PREF is not set 329# CONFIG_IPV6_ROUTER_PREF is not set
330# CONFIG_IPV6_OPTIMISTIC_DAD is not set
311CONFIG_INET6_AH=m 331CONFIG_INET6_AH=m
312CONFIG_INET6_ESP=m 332CONFIG_INET6_ESP=m
313CONFIG_INET6_IPCOMP=m 333CONFIG_INET6_IPCOMP=m
@@ -332,6 +352,7 @@ CONFIG_NETFILTER_NETLINK=m
332CONFIG_NETFILTER_NETLINK_QUEUE=m 352CONFIG_NETFILTER_NETLINK_QUEUE=m
333CONFIG_NETFILTER_NETLINK_LOG=m 353CONFIG_NETFILTER_NETLINK_LOG=m
334# CONFIG_NF_CONNTRACK_ENABLED is not set 354# CONFIG_NF_CONNTRACK_ENABLED is not set
355# CONFIG_NF_CONNTRACK is not set
335CONFIG_NETFILTER_XTABLES=m 356CONFIG_NETFILTER_XTABLES=m
336CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 357CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
337CONFIG_NETFILTER_XT_TARGET_DSCP=m 358CONFIG_NETFILTER_XT_TARGET_DSCP=m
@@ -389,20 +410,8 @@ CONFIG_IP_NF_ARP_MANGLE=m
389# 410#
390# CONFIG_IP6_NF_QUEUE is not set 411# CONFIG_IP6_NF_QUEUE is not set
391# CONFIG_IP6_NF_IPTABLES is not set 412# CONFIG_IP6_NF_IPTABLES is not set
392
393#
394# DCCP Configuration (EXPERIMENTAL)
395#
396# CONFIG_IP_DCCP is not set 413# CONFIG_IP_DCCP is not set
397
398#
399# SCTP Configuration (EXPERIMENTAL)
400#
401# CONFIG_IP_SCTP is not set 414# CONFIG_IP_SCTP is not set
402
403#
404# TIPC Configuration (EXPERIMENTAL)
405#
406# CONFIG_TIPC is not set 415# CONFIG_TIPC is not set
407# CONFIG_ATM is not set 416# CONFIG_ATM is not set
408# CONFIG_BRIDGE is not set 417# CONFIG_BRIDGE is not set
@@ -429,7 +438,16 @@ CONFIG_NET_CLS_ROUTE=y
429# CONFIG_HAMRADIO is not set 438# CONFIG_HAMRADIO is not set
430# CONFIG_IRDA is not set 439# CONFIG_IRDA is not set
431# CONFIG_BT is not set 440# CONFIG_BT is not set
441# CONFIG_AF_RXRPC is not set
442
443#
444# Wireless
445#
446# CONFIG_CFG80211 is not set
447# CONFIG_WIRELESS_EXT is not set
448# CONFIG_MAC80211 is not set
432# CONFIG_IEEE80211 is not set 449# CONFIG_IEEE80211 is not set
450# CONFIG_RFKILL is not set
433 451
434# 452#
435# Device Drivers 453# Device Drivers
@@ -449,10 +467,6 @@ CONFIG_FW_LOADER=y
449# Connector - unified userspace <-> kernelspace linker 467# Connector - unified userspace <-> kernelspace linker
450# 468#
451# CONFIG_CONNECTOR is not set 469# CONFIG_CONNECTOR is not set
452
453#
454# Memory Technology Devices (MTD)
455#
456# CONFIG_MTD is not set 470# CONFIG_MTD is not set
457 471
458# 472#
@@ -489,12 +503,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
489# 503#
490# Misc devices 504# Misc devices
491# 505#
506# CONFIG_PHANTOM is not set
492# CONFIG_SGI_IOC4 is not set 507# CONFIG_SGI_IOC4 is not set
493# CONFIG_TIFM_CORE is not set 508# CONFIG_TIFM_CORE is not set
494 509# CONFIG_BLINK is not set
495#
496# ATA/ATAPI/MFM/RLL support
497#
498CONFIG_IDE=y 510CONFIG_IDE=y
499CONFIG_BLK_DEV_IDE=y 511CONFIG_BLK_DEV_IDE=y
500 512
@@ -509,6 +521,7 @@ CONFIG_IDEDISK_MULTI_MODE=y
509# CONFIG_BLK_DEV_IDEFLOPPY is not set 521# CONFIG_BLK_DEV_IDEFLOPPY is not set
510# CONFIG_BLK_DEV_IDESCSI is not set 522# CONFIG_BLK_DEV_IDESCSI is not set
511# CONFIG_IDE_TASK_IOCTL is not set 523# CONFIG_IDE_TASK_IOCTL is not set
524CONFIG_IDE_PROC_FS=y
512 525
513# 526#
514# IDE chipset support/bugfixes 527# IDE chipset support/bugfixes
@@ -516,6 +529,7 @@ CONFIG_IDEDISK_MULTI_MODE=y
516CONFIG_IDE_GENERIC=y 529CONFIG_IDE_GENERIC=y
517CONFIG_BLK_DEV_IDEPCI=y 530CONFIG_BLK_DEV_IDEPCI=y
518CONFIG_IDEPCI_SHARE_IRQ=y 531CONFIG_IDEPCI_SHARE_IRQ=y
532CONFIG_IDEPCI_PCIBUS_ORDER=y
519# CONFIG_BLK_DEV_OFFBOARD is not set 533# CONFIG_BLK_DEV_OFFBOARD is not set
520CONFIG_BLK_DEV_GENERIC=y 534CONFIG_BLK_DEV_GENERIC=y
521# CONFIG_BLK_DEV_OPTI621 is not set 535# CONFIG_BLK_DEV_OPTI621 is not set
@@ -580,6 +594,7 @@ CONFIG_CHR_DEV_SG=y
580# CONFIG_SCSI_CONSTANTS is not set 594# CONFIG_SCSI_CONSTANTS is not set
581# CONFIG_SCSI_LOGGING is not set 595# CONFIG_SCSI_LOGGING is not set
582# CONFIG_SCSI_SCAN_ASYNC is not set 596# CONFIG_SCSI_SCAN_ASYNC is not set
597CONFIG_SCSI_WAIT_SCAN=m
583 598
584# 599#
585# SCSI Transports 600# SCSI Transports
@@ -626,10 +641,6 @@ CONFIG_SCSI_SAS_ATTRS=y
626# CONFIG_SCSI_DC390T is not set 641# CONFIG_SCSI_DC390T is not set
627# CONFIG_SCSI_DEBUG is not set 642# CONFIG_SCSI_DEBUG is not set
628# CONFIG_SCSI_SRP is not set 643# CONFIG_SCSI_SRP is not set
629
630#
631# Serial ATA (prod) and Parallel ATA (experimental) drivers
632#
633CONFIG_ATA=y 644CONFIG_ATA=y
634# CONFIG_ATA_NONSTANDARD is not set 645# CONFIG_ATA_NONSTANDARD is not set
635# CONFIG_SATA_AHCI is not set 646# CONFIG_SATA_AHCI is not set
@@ -652,6 +663,7 @@ CONFIG_SATA_PROMISE=y
652# CONFIG_PATA_AMD is not set 663# CONFIG_PATA_AMD is not set
653# CONFIG_PATA_ARTOP is not set 664# CONFIG_PATA_ARTOP is not set
654# CONFIG_PATA_ATIIXP is not set 665# CONFIG_PATA_ATIIXP is not set
666# CONFIG_PATA_CMD640_PCI is not set
655# CONFIG_PATA_CMD64X is not set 667# CONFIG_PATA_CMD64X is not set
656# CONFIG_PATA_CS5520 is not set 668# CONFIG_PATA_CS5520 is not set
657# CONFIG_PATA_CS5530 is not set 669# CONFIG_PATA_CS5530 is not set
@@ -705,6 +717,7 @@ CONFIG_DM_MIRROR=m
705CONFIG_DM_ZERO=m 717CONFIG_DM_ZERO=m
706CONFIG_DM_MULTIPATH=m 718CONFIG_DM_MULTIPATH=m
707# CONFIG_DM_MULTIPATH_EMC is not set 719# CONFIG_DM_MULTIPATH_EMC is not set
720# CONFIG_DM_DELAY is not set
708 721
709# 722#
710# Fusion MPT device support 723# Fusion MPT device support
@@ -719,18 +732,14 @@ CONFIG_FUSION_MAX_SGE=128
719# 732#
720# IEEE 1394 (FireWire) support 733# IEEE 1394 (FireWire) support
721# 734#
735# CONFIG_FIREWIRE is not set
722# CONFIG_IEEE1394 is not set 736# CONFIG_IEEE1394 is not set
723 737
724# 738#
725# I2O device support 739# I2O device support
726# 740#
727# CONFIG_I2O is not set 741# CONFIG_I2O is not set
728 742# CONFIG_MACINTOSH_DRIVERS is not set
729#
730# Macintosh device drivers
731#
732# CONFIG_MAC_EMUMOUSEBTN is not set
733# CONFIG_WINDFARM is not set
734 743
735# 744#
736# Network device support 745# Network device support
@@ -740,15 +749,7 @@ CONFIG_NETDEVICES=y
740CONFIG_BONDING=m 749CONFIG_BONDING=m
741# CONFIG_EQUALIZER is not set 750# CONFIG_EQUALIZER is not set
742CONFIG_TUN=y 751CONFIG_TUN=y
743
744#
745# ARCnet devices
746#
747# CONFIG_ARCNET is not set 752# CONFIG_ARCNET is not set
748
749#
750# PHY device support
751#
752# CONFIG_PHYLIB is not set 753# CONFIG_PHYLIB is not set
753 754
754# 755#
@@ -767,10 +768,7 @@ CONFIG_MII=y
767# CONFIG_NET_TULIP is not set 768# CONFIG_NET_TULIP is not set
768# CONFIG_HP100 is not set 769# CONFIG_HP100 is not set
769# CONFIG_NET_PCI is not set 770# CONFIG_NET_PCI is not set
770 771CONFIG_NETDEV_1000=y
771#
772# Ethernet (1000 Mbit)
773#
774# CONFIG_ACENIC is not set 772# CONFIG_ACENIC is not set
775# CONFIG_DL2K is not set 773# CONFIG_DL2K is not set
776CONFIG_E1000=m 774CONFIG_E1000=m
@@ -784,15 +782,13 @@ CONFIG_E1000_NAPI=y
784CONFIG_SKGE=m 782CONFIG_SKGE=m
785CONFIG_SKY2=m 783CONFIG_SKY2=m
786# CONFIG_SK98LIN is not set 784# CONFIG_SK98LIN is not set
785# CONFIG_VIA_VELOCITY is not set
787CONFIG_TIGON3=y 786CONFIG_TIGON3=y
788# CONFIG_BNX2 is not set 787# CONFIG_BNX2 is not set
789CONFIG_SPIDER_NET=y 788CONFIG_SPIDER_NET=y
790# CONFIG_QLA3XXX is not set 789# CONFIG_QLA3XXX is not set
791# CONFIG_ATL1 is not set 790# CONFIG_ATL1 is not set
792 791CONFIG_NETDEV_10000=y
793#
794# Ethernet (10000 Mbit)
795#
796# CONFIG_CHELSIO_T1 is not set 792# CONFIG_CHELSIO_T1 is not set
797# CONFIG_CHELSIO_T3 is not set 793# CONFIG_CHELSIO_T3 is not set
798# CONFIG_IXGB is not set 794# CONFIG_IXGB is not set
@@ -800,20 +796,24 @@ CONFIG_SPIDER_NET=y
800# CONFIG_MYRI10GE is not set 796# CONFIG_MYRI10GE is not set
801# CONFIG_NETXEN_NIC is not set 797# CONFIG_NETXEN_NIC is not set
802# CONFIG_PASEMI_MAC is not set 798# CONFIG_PASEMI_MAC is not set
803 799# CONFIG_MLX4_CORE is not set
804#
805# Token Ring devices
806#
807# CONFIG_TR is not set 800# CONFIG_TR is not set
808 801
809# 802#
810# Wireless LAN (non-hamradio) 803# Wireless LAN
811# 804#
812# CONFIG_NET_RADIO is not set 805# CONFIG_WLAN_PRE80211 is not set
806# CONFIG_WLAN_80211 is not set
813 807
814# 808#
815# Wan interfaces 809# USB Network Adapters
816# 810#
811# CONFIG_USB_CATC is not set
812# CONFIG_USB_KAWETH is not set
813# CONFIG_USB_PEGASUS is not set
814# CONFIG_USB_RTL8150 is not set
815# CONFIG_USB_USBNET_MII is not set
816# CONFIG_USB_USBNET is not set
817# CONFIG_WAN is not set 817# CONFIG_WAN is not set
818# CONFIG_FDDI is not set 818# CONFIG_FDDI is not set
819# CONFIG_HIPPI is not set 819# CONFIG_HIPPI is not set
@@ -840,6 +840,7 @@ CONFIG_SPIDER_NET=y
840# 840#
841CONFIG_INPUT=y 841CONFIG_INPUT=y
842# CONFIG_INPUT_FF_MEMLESS is not set 842# CONFIG_INPUT_FF_MEMLESS is not set
843# CONFIG_INPUT_POLLDEV is not set
843 844
844# 845#
845# Userland interfaces 846# Userland interfaces
@@ -859,6 +860,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
859# CONFIG_INPUT_KEYBOARD is not set 860# CONFIG_INPUT_KEYBOARD is not set
860# CONFIG_INPUT_MOUSE is not set 861# CONFIG_INPUT_MOUSE is not set
861# CONFIG_INPUT_JOYSTICK is not set 862# CONFIG_INPUT_JOYSTICK is not set
863# CONFIG_INPUT_TABLET is not set
862# CONFIG_INPUT_TOUCHSCREEN is not set 864# CONFIG_INPUT_TOUCHSCREEN is not set
863# CONFIG_INPUT_MISC is not set 865# CONFIG_INPUT_MISC is not set
864 866
@@ -933,10 +935,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
933CONFIG_IPMI_SI=m 935CONFIG_IPMI_SI=m
934CONFIG_IPMI_WATCHDOG=m 936CONFIG_IPMI_WATCHDOG=m
935CONFIG_IPMI_POWEROFF=m 937CONFIG_IPMI_POWEROFF=m
936
937#
938# Watchdog Cards
939#
940CONFIG_WATCHDOG=y 938CONFIG_WATCHDOG=y
941# CONFIG_WATCHDOG_NOWAYOUT is not set 939# CONFIG_WATCHDOG_NOWAYOUT is not set
942 940
@@ -959,7 +957,6 @@ CONFIG_WATCHDOG=y
959# CONFIG_HW_RANDOM is not set 957# CONFIG_HW_RANDOM is not set
960CONFIG_GEN_RTC=y 958CONFIG_GEN_RTC=y
961# CONFIG_GEN_RTC_X is not set 959# CONFIG_GEN_RTC_X is not set
962# CONFIG_DTLK is not set
963# CONFIG_R3964 is not set 960# CONFIG_R3964 is not set
964# CONFIG_APPLICOM is not set 961# CONFIG_APPLICOM is not set
965# CONFIG_AGP is not set 962# CONFIG_AGP is not set
@@ -971,11 +968,9 @@ CONFIG_GEN_RTC=y
971# TPM devices 968# TPM devices
972# 969#
973# CONFIG_TCG_TPM is not set 970# CONFIG_TCG_TPM is not set
974 971CONFIG_DEVPORT=y
975#
976# I2C support
977#
978CONFIG_I2C=y 972CONFIG_I2C=y
973CONFIG_I2C_BOARDINFO=y
979# CONFIG_I2C_CHARDEV is not set 974# CONFIG_I2C_CHARDEV is not set
980 975
981# 976#
@@ -999,17 +994,17 @@ CONFIG_I2C_ALGOBIT=y
999# CONFIG_I2C_NFORCE2 is not set 994# CONFIG_I2C_NFORCE2 is not set
1000# CONFIG_I2C_OCORES is not set 995# CONFIG_I2C_OCORES is not set
1001# CONFIG_I2C_PARPORT_LIGHT is not set 996# CONFIG_I2C_PARPORT_LIGHT is not set
1002# CONFIG_I2C_PASEMI is not set
1003# CONFIG_I2C_PROSAVAGE is not set 997# CONFIG_I2C_PROSAVAGE is not set
1004# CONFIG_I2C_SAVAGE4 is not set 998# CONFIG_I2C_SAVAGE4 is not set
999# CONFIG_I2C_SIMTEC is not set
1005# CONFIG_I2C_SIS5595 is not set 1000# CONFIG_I2C_SIS5595 is not set
1006# CONFIG_I2C_SIS630 is not set 1001# CONFIG_I2C_SIS630 is not set
1007# CONFIG_I2C_SIS96X is not set 1002# CONFIG_I2C_SIS96X is not set
1008# CONFIG_I2C_STUB is not set 1003# CONFIG_I2C_STUB is not set
1004# CONFIG_I2C_TINY_USB is not set
1009# CONFIG_I2C_VIA is not set 1005# CONFIG_I2C_VIA is not set
1010# CONFIG_I2C_VIAPRO is not set 1006# CONFIG_I2C_VIAPRO is not set
1011# CONFIG_I2C_VOODOO3 is not set 1007# CONFIG_I2C_VOODOO3 is not set
1012# CONFIG_I2C_PCA_ISA is not set
1013 1008
1014# 1009#
1015# Miscellaneous I2C Chip support 1010# Miscellaneous I2C Chip support
@@ -1036,12 +1031,7 @@ CONFIG_I2C_ALGOBIT=y
1036# Dallas's 1-wire bus 1031# Dallas's 1-wire bus
1037# 1032#
1038# CONFIG_W1 is not set 1033# CONFIG_W1 is not set
1039
1040#
1041# Hardware Monitoring support
1042#
1043# CONFIG_HWMON is not set 1034# CONFIG_HWMON is not set
1044# CONFIG_HWMON_VID is not set
1045 1035
1046# 1036#
1047# Multifunction device drivers 1037# Multifunction device drivers
@@ -1052,17 +1042,19 @@ CONFIG_I2C_ALGOBIT=y
1052# Multimedia devices 1042# Multimedia devices
1053# 1043#
1054# CONFIG_VIDEO_DEV is not set 1044# CONFIG_VIDEO_DEV is not set
1045# CONFIG_DVB_CORE is not set
1046# CONFIG_DAB is not set
1055 1047
1056# 1048#
1057# Digital Video Broadcasting Devices 1049# Graphics support
1058# 1050#
1059# CONFIG_DVB is not set 1051# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1060# CONFIG_USB_DABUSB is not set
1061 1052
1062# 1053#
1063# Graphics support 1054# Display device support
1064# 1055#
1065# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 1056# CONFIG_DISPLAY_SUPPORT is not set
1057# CONFIG_VGASTATE is not set
1066# CONFIG_FB is not set 1058# CONFIG_FB is not set
1067# CONFIG_FB_IBM_GXT4500 is not set 1059# CONFIG_FB_IBM_GXT4500 is not set
1068 1060
@@ -1084,6 +1076,17 @@ CONFIG_HID=m
1084# CONFIG_HID_DEBUG is not set 1076# CONFIG_HID_DEBUG is not set
1085 1077
1086# 1078#
1079# USB Input Devices
1080#
1081# CONFIG_USB_HID is not set
1082
1083#
1084# USB HID Boot Protocol drivers
1085#
1086# CONFIG_USB_KBD is not set
1087# CONFIG_USB_MOUSE is not set
1088
1089#
1087# USB support 1090# USB support
1088# 1091#
1089CONFIG_USB_ARCH_HAS_HCD=y 1092CONFIG_USB_ARCH_HAS_HCD=y
@@ -1096,6 +1099,7 @@ CONFIG_USB=m
1096# Miscellaneous USB options 1099# Miscellaneous USB options
1097# 1100#
1098CONFIG_USB_DEVICEFS=y 1101CONFIG_USB_DEVICEFS=y
1102CONFIG_USB_DEVICE_CLASS=y
1099# CONFIG_USB_DYNAMIC_MINORS is not set 1103# CONFIG_USB_DYNAMIC_MINORS is not set
1100# CONFIG_USB_OTG is not set 1104# CONFIG_USB_OTG is not set
1101 1105
@@ -1147,44 +1151,10 @@ CONFIG_USB_STORAGE=m
1147# CONFIG_USB_LIBUSUAL is not set 1151# CONFIG_USB_LIBUSUAL is not set
1148 1152
1149# 1153#
1150# USB Input Devices
1151#
1152# CONFIG_USB_HID is not set
1153
1154#
1155# USB HID Boot Protocol drivers
1156#
1157# CONFIG_USB_KBD is not set
1158# CONFIG_USB_MOUSE is not set
1159# CONFIG_USB_AIPTEK is not set
1160# CONFIG_USB_WACOM is not set
1161# CONFIG_USB_ACECAD is not set
1162# CONFIG_USB_KBTAB is not set
1163# CONFIG_USB_POWERMATE is not set
1164# CONFIG_USB_TOUCHSCREEN is not set
1165# CONFIG_USB_YEALINK is not set
1166# CONFIG_USB_XPAD is not set
1167# CONFIG_USB_ATI_REMOTE is not set
1168# CONFIG_USB_ATI_REMOTE2 is not set
1169# CONFIG_USB_KEYSPAN_REMOTE is not set
1170# CONFIG_USB_APPLETOUCH is not set
1171# CONFIG_USB_GTCO is not set
1172
1173#
1174# USB Imaging devices 1154# USB Imaging devices
1175# 1155#
1176# CONFIG_USB_MDC800 is not set 1156# CONFIG_USB_MDC800 is not set
1177# CONFIG_USB_MICROTEK is not set 1157# CONFIG_USB_MICROTEK is not set
1178
1179#
1180# USB Network Adapters
1181#
1182# CONFIG_USB_CATC is not set
1183# CONFIG_USB_KAWETH is not set
1184# CONFIG_USB_PEGASUS is not set
1185# CONFIG_USB_RTL8150 is not set
1186# CONFIG_USB_USBNET_MII is not set
1187# CONFIG_USB_USBNET is not set
1188CONFIG_USB_MON=y 1158CONFIG_USB_MON=y
1189 1159
1190# 1160#
@@ -1228,10 +1198,6 @@ CONFIG_USB_MON=y
1228# USB Gadget Support 1198# USB Gadget Support
1229# 1199#
1230# CONFIG_USB_GADGET is not set 1200# CONFIG_USB_GADGET is not set
1231
1232#
1233# MMC/SD Card support
1234#
1235# CONFIG_MMC is not set 1201# CONFIG_MMC is not set
1236 1202
1237# 1203#
@@ -1253,10 +1219,12 @@ CONFIG_USB_MON=y
1253CONFIG_INFINIBAND=m 1219CONFIG_INFINIBAND=m
1254CONFIG_INFINIBAND_USER_MAD=m 1220CONFIG_INFINIBAND_USER_MAD=m
1255CONFIG_INFINIBAND_USER_ACCESS=m 1221CONFIG_INFINIBAND_USER_ACCESS=m
1222CONFIG_INFINIBAND_USER_MEM=y
1256CONFIG_INFINIBAND_ADDR_TRANS=y 1223CONFIG_INFINIBAND_ADDR_TRANS=y
1257CONFIG_INFINIBAND_MTHCA=m 1224CONFIG_INFINIBAND_MTHCA=m
1258CONFIG_INFINIBAND_MTHCA_DEBUG=y 1225CONFIG_INFINIBAND_MTHCA_DEBUG=y
1259# CONFIG_INFINIBAND_AMSO1100 is not set 1226# CONFIG_INFINIBAND_AMSO1100 is not set
1227# CONFIG_MLX4_INFINIBAND is not set
1260CONFIG_INFINIBAND_IPOIB=m 1228CONFIG_INFINIBAND_IPOIB=m
1261# CONFIG_INFINIBAND_IPOIB_CM is not set 1229# CONFIG_INFINIBAND_IPOIB_CM is not set
1262CONFIG_INFINIBAND_IPOIB_DEBUG=y 1230CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1287,14 +1255,6 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
1287# 1255#
1288 1256
1289# 1257#
1290# Auxiliary Display support
1291#
1292
1293#
1294# Virtualization
1295#
1296
1297#
1298# File systems 1258# File systems
1299# 1259#
1300CONFIG_EXT2_FS=y 1260CONFIG_EXT2_FS=y
@@ -1389,6 +1349,7 @@ CONFIG_LOCKD_V4=y
1389CONFIG_NFS_ACL_SUPPORT=y 1349CONFIG_NFS_ACL_SUPPORT=y
1390CONFIG_NFS_COMMON=y 1350CONFIG_NFS_COMMON=y
1391CONFIG_SUNRPC=y 1351CONFIG_SUNRPC=y
1352# CONFIG_SUNRPC_BIND34 is not set
1392# CONFIG_RPCSEC_GSS_KRB5 is not set 1353# CONFIG_RPCSEC_GSS_KRB5 is not set
1393# CONFIG_RPCSEC_GSS_SPKM3 is not set 1354# CONFIG_RPCSEC_GSS_SPKM3 is not set
1394# CONFIG_SMB_FS is not set 1355# CONFIG_SMB_FS is not set
@@ -1418,6 +1379,7 @@ CONFIG_MSDOS_PARTITION=y
1418# CONFIG_SUN_PARTITION is not set 1379# CONFIG_SUN_PARTITION is not set
1419# CONFIG_KARMA_PARTITION is not set 1380# CONFIG_KARMA_PARTITION is not set
1420CONFIG_EFI_PARTITION=y 1381CONFIG_EFI_PARTITION=y
1382# CONFIG_SYSV68_PARTITION is not set
1421 1383
1422# 1384#
1423# Native Language Support 1385# Native Language Support
@@ -1468,7 +1430,6 @@ CONFIG_NLS_ISO8859_15=m
1468# 1430#
1469# CONFIG_DLM is not set 1431# CONFIG_DLM is not set
1470# CONFIG_UCC_SLOW is not set 1432# CONFIG_UCC_SLOW is not set
1471# CONFIG_UCC_FAST is not set
1472 1433
1473# 1434#
1474# Library routines 1435# Library routines
@@ -1476,6 +1437,7 @@ CONFIG_NLS_ISO8859_15=m
1476CONFIG_BITREVERSE=y 1437CONFIG_BITREVERSE=y
1477# CONFIG_CRC_CCITT is not set 1438# CONFIG_CRC_CCITT is not set
1478# CONFIG_CRC16 is not set 1439# CONFIG_CRC16 is not set
1440# CONFIG_CRC_ITU_T is not set
1479CONFIG_CRC32=y 1441CONFIG_CRC32=y
1480# CONFIG_LIBCRC32C is not set 1442# CONFIG_LIBCRC32C is not set
1481CONFIG_ZLIB_INFLATE=m 1443CONFIG_ZLIB_INFLATE=m
@@ -1487,6 +1449,7 @@ CONFIG_TEXTSEARCH_FSM=m
1487CONFIG_PLIST=y 1449CONFIG_PLIST=y
1488CONFIG_HAS_IOMEM=y 1450CONFIG_HAS_IOMEM=y
1489CONFIG_HAS_IOPORT=y 1451CONFIG_HAS_IOPORT=y
1452CONFIG_HAS_DMA=y
1490 1453
1491# 1454#
1492# Instrumentation Support 1455# Instrumentation Support
@@ -1506,7 +1469,6 @@ CONFIG_DEBUG_FS=y
1506# CONFIG_HEADERS_CHECK is not set 1469# CONFIG_HEADERS_CHECK is not set
1507CONFIG_DEBUG_KERNEL=y 1470CONFIG_DEBUG_KERNEL=y
1508# CONFIG_DEBUG_SHIRQ is not set 1471# CONFIG_DEBUG_SHIRQ is not set
1509CONFIG_LOG_BUF_SHIFT=15
1510# CONFIG_DETECT_SOFTLOCKUP is not set 1472# CONFIG_DETECT_SOFTLOCKUP is not set
1511# CONFIG_SCHEDSTATS is not set 1473# CONFIG_SCHEDSTATS is not set
1512# CONFIG_TIMER_STATS is not set 1474# CONFIG_TIMER_STATS is not set
@@ -1565,6 +1527,7 @@ CONFIG_CRYPTO_ECB=m
1565CONFIG_CRYPTO_CBC=m 1527CONFIG_CRYPTO_CBC=m
1566CONFIG_CRYPTO_PCBC=m 1528CONFIG_CRYPTO_PCBC=m
1567# CONFIG_CRYPTO_LRW is not set 1529# CONFIG_CRYPTO_LRW is not set
1530# CONFIG_CRYPTO_CRYPTD is not set
1568CONFIG_CRYPTO_DES=m 1531CONFIG_CRYPTO_DES=m
1569# CONFIG_CRYPTO_FCRYPT is not set 1532# CONFIG_CRYPTO_FCRYPT is not set
1570# CONFIG_CRYPTO_BLOWFISH is not set 1533# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 91b657b339b4..0dc9874b46e3 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.22-rc6
4# Tue May 8 12:32:16 2007 4# Tue Jun 26 12:33:17 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -40,6 +40,7 @@ CONFIG_PPC_FPU=y
40CONFIG_PPC_OF_PLATFORM_PCI=y 40CONFIG_PPC_OF_PLATFORM_PCI=y
41CONFIG_ALTIVEC=y 41CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_MM_SLICES=y
43CONFIG_VIRT_CPU_ACCOUNTING=y 44CONFIG_VIRT_CPU_ACCOUNTING=y
44CONFIG_SMP=y 45CONFIG_SMP=y
45CONFIG_NR_CPUS=4 46CONFIG_NR_CPUS=4
@@ -68,6 +69,7 @@ CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_AUDIT is not set 69# CONFIG_AUDIT is not set
69CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
72CONFIG_LOG_BUF_SHIFT=15
71# CONFIG_CPUSETS is not set 73# CONFIG_CPUSETS is not set
72CONFIG_SYSFS_DEPRECATED=y 74CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 75# CONFIG_RELAY is not set
@@ -86,14 +88,19 @@ CONFIG_BUG=y
86CONFIG_ELF_CORE=y 88CONFIG_ELF_CORE=y
87CONFIG_BASE_FULL=y 89CONFIG_BASE_FULL=y
88CONFIG_FUTEX=y 90CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 92CONFIG_EPOLL=y
93CONFIG_SIGNALFD=y
94CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 96CONFIG_SHMEM=y
91CONFIG_SLAB=y
92CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
98CONFIG_SLAB=y
99# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set
93CONFIG_RT_MUTEXES=y 101CONFIG_RT_MUTEXES=y
94# CONFIG_TINY_SHMEM is not set 102# CONFIG_TINY_SHMEM is not set
95CONFIG_BASE_SMALL=0 103CONFIG_BASE_SMALL=0
96# CONFIG_SLOB is not set
97 104
98# 105#
99# Loadable module support 106# Loadable module support
@@ -148,6 +155,7 @@ CONFIG_PPC_CELL=y
148# Cell Broadband Engine options 155# Cell Broadband Engine options
149# 156#
150CONFIG_SPU_FS=y 157CONFIG_SPU_FS=y
158CONFIG_SPU_FS_64K_LS=y
151CONFIG_SPU_BASE=y 159CONFIG_SPU_BASE=y
152# CONFIG_PQ2ADS is not set 160# CONFIG_PQ2ADS is not set
153CONFIG_PPC_UDBG_BEAT=y 161CONFIG_PPC_UDBG_BEAT=y
@@ -206,6 +214,7 @@ CONFIG_RESOURCES_64BIT=y
206CONFIG_ZONE_DMA_FLAG=1 214CONFIG_ZONE_DMA_FLAG=1
207CONFIG_ARCH_MEMORY_PROBE=y 215CONFIG_ARCH_MEMORY_PROBE=y
208CONFIG_NODES_SPAN_OTHER_NODES=y 216CONFIG_NODES_SPAN_OTHER_NODES=y
217CONFIG_PPC_HAS_HASH_64K=y
209# CONFIG_PPC_64K_PAGES is not set 218# CONFIG_PPC_64K_PAGES is not set
210# CONFIG_SCHED_SMT is not set 219# CONFIG_SCHED_SMT is not set
211CONFIG_PROC_DEVICETREE=y 220CONFIG_PROC_DEVICETREE=y
@@ -224,16 +233,14 @@ CONFIG_GENERIC_ISA_DMA=y
224CONFIG_PCI=y 233CONFIG_PCI=y
225CONFIG_PCI_DOMAINS=y 234CONFIG_PCI_DOMAINS=y
226# CONFIG_PCIEPORTBUS is not set 235# CONFIG_PCIEPORTBUS is not set
236CONFIG_ARCH_SUPPORTS_MSI=y
237# CONFIG_PCI_MSI is not set
227# CONFIG_PCI_DEBUG is not set 238# CONFIG_PCI_DEBUG is not set
228 239
229# 240#
230# PCCARD (PCMCIA/CardBus) support 241# PCCARD (PCMCIA/CardBus) support
231# 242#
232# CONFIG_PCCARD is not set 243# CONFIG_PCCARD is not set
233
234#
235# PCI Hotplug Support
236#
237# CONFIG_HOTPLUG_PCI is not set 244# CONFIG_HOTPLUG_PCI is not set
238CONFIG_KERNEL_START=0xc000000000000000 245CONFIG_KERNEL_START=0xc000000000000000
239 246
@@ -277,10 +284,6 @@ CONFIG_INET_TCP_DIAG=y
277CONFIG_TCP_CONG_CUBIC=y 284CONFIG_TCP_CONG_CUBIC=y
278CONFIG_DEFAULT_TCP_CONG="cubic" 285CONFIG_DEFAULT_TCP_CONG="cubic"
279# CONFIG_TCP_MD5SIG is not set 286# CONFIG_TCP_MD5SIG is not set
280
281#
282# IP: Virtual Server Configuration
283#
284# CONFIG_IP_VS is not set 287# CONFIG_IP_VS is not set
285CONFIG_IPV6=y 288CONFIG_IPV6=y
286# CONFIG_IPV6_PRIVACY is not set 289# CONFIG_IPV6_PRIVACY is not set
@@ -323,20 +326,8 @@ CONFIG_IP_NF_QUEUE=m
323# 326#
324# CONFIG_IP6_NF_QUEUE is not set 327# CONFIG_IP6_NF_QUEUE is not set
325# CONFIG_IP6_NF_IPTABLES is not set 328# CONFIG_IP6_NF_IPTABLES is not set
326
327#
328# DCCP Configuration (EXPERIMENTAL)
329#
330# CONFIG_IP_DCCP is not set 329# CONFIG_IP_DCCP is not set
331
332#
333# SCTP Configuration (EXPERIMENTAL)
334#
335# CONFIG_IP_SCTP is not set 330# CONFIG_IP_SCTP is not set
336
337#
338# TIPC Configuration (EXPERIMENTAL)
339#
340# CONFIG_TIPC is not set 331# CONFIG_TIPC is not set
341# CONFIG_ATM is not set 332# CONFIG_ATM is not set
342# CONFIG_BRIDGE is not set 333# CONFIG_BRIDGE is not set
@@ -369,7 +360,9 @@ CONFIG_IP_NF_QUEUE=m
369# 360#
370# CONFIG_CFG80211 is not set 361# CONFIG_CFG80211 is not set
371# CONFIG_WIRELESS_EXT is not set 362# CONFIG_WIRELESS_EXT is not set
363# CONFIG_MAC80211 is not set
372# CONFIG_IEEE80211 is not set 364# CONFIG_IEEE80211 is not set
365# CONFIG_RFKILL is not set
373 366
374# 367#
375# Device Drivers 368# Device Drivers
@@ -425,12 +418,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
425# 418#
426# Misc devices 419# Misc devices
427# 420#
421# CONFIG_PHANTOM is not set
428# CONFIG_SGI_IOC4 is not set 422# CONFIG_SGI_IOC4 is not set
429# CONFIG_TIFM_CORE is not set 423# CONFIG_TIFM_CORE is not set
430 424# CONFIG_BLINK is not set
431#
432# ATA/ATAPI/MFM/RLL support
433#
434CONFIG_IDE=y 425CONFIG_IDE=y
435CONFIG_BLK_DEV_IDE=y 426CONFIG_BLK_DEV_IDE=y
436 427
@@ -445,6 +436,7 @@ CONFIG_BLK_DEV_IDECD=m
445# CONFIG_BLK_DEV_IDEFLOPPY is not set 436# CONFIG_BLK_DEV_IDEFLOPPY is not set
446# CONFIG_BLK_DEV_IDESCSI is not set 437# CONFIG_BLK_DEV_IDESCSI is not set
447# CONFIG_IDE_TASK_IOCTL is not set 438# CONFIG_IDE_TASK_IOCTL is not set
439CONFIG_IDE_PROC_FS=y
448 440
449# 441#
450# IDE chipset support/bugfixes 442# IDE chipset support/bugfixes
@@ -452,6 +444,7 @@ CONFIG_BLK_DEV_IDECD=m
452CONFIG_IDE_GENERIC=y 444CONFIG_IDE_GENERIC=y
453CONFIG_BLK_DEV_IDEPCI=y 445CONFIG_BLK_DEV_IDEPCI=y
454CONFIG_IDEPCI_SHARE_IRQ=y 446CONFIG_IDEPCI_SHARE_IRQ=y
447CONFIG_IDEPCI_PCIBUS_ORDER=y
455# CONFIG_BLK_DEV_OFFBOARD is not set 448# CONFIG_BLK_DEV_OFFBOARD is not set
456CONFIG_BLK_DEV_GENERIC=y 449CONFIG_BLK_DEV_GENERIC=y
457# CONFIG_BLK_DEV_OPTI621 is not set 450# CONFIG_BLK_DEV_OPTI621 is not set
@@ -516,6 +509,7 @@ CONFIG_SCSI_MULTI_LUN=y
516# CONFIG_SCSI_CONSTANTS is not set 509# CONFIG_SCSI_CONSTANTS is not set
517# CONFIG_SCSI_LOGGING is not set 510# CONFIG_SCSI_LOGGING is not set
518# CONFIG_SCSI_SCAN_ASYNC is not set 511# CONFIG_SCSI_SCAN_ASYNC is not set
512CONFIG_SCSI_WAIT_SCAN=m
519 513
520# 514#
521# SCSI Transports 515# SCSI Transports
@@ -560,12 +554,7 @@ CONFIG_SCSI_MULTI_LUN=y
560# CONFIG_SCSI_DC395x is not set 554# CONFIG_SCSI_DC395x is not set
561# CONFIG_SCSI_DC390T is not set 555# CONFIG_SCSI_DC390T is not set
562# CONFIG_SCSI_DEBUG is not set 556# CONFIG_SCSI_DEBUG is not set
563# CONFIG_SCSI_ESP_CORE is not set
564# CONFIG_SCSI_SRP is not set 557# CONFIG_SCSI_SRP is not set
565
566#
567# Serial ATA (prod) and Parallel ATA (experimental) drivers
568#
569# CONFIG_ATA is not set 558# CONFIG_ATA is not set
570 559
571# 560#
@@ -588,6 +577,7 @@ CONFIG_DM_MIRROR=m
588CONFIG_DM_ZERO=m 577CONFIG_DM_ZERO=m
589CONFIG_DM_MULTIPATH=m 578CONFIG_DM_MULTIPATH=m
590# CONFIG_DM_MULTIPATH_EMC is not set 579# CONFIG_DM_MULTIPATH_EMC is not set
580# CONFIG_DM_DELAY is not set
591 581
592# 582#
593# Fusion MPT device support 583# Fusion MPT device support
@@ -600,6 +590,7 @@ CONFIG_DM_MULTIPATH=m
600# 590#
601# IEEE 1394 (FireWire) support 591# IEEE 1394 (FireWire) support
602# 592#
593# CONFIG_FIREWIRE is not set
603# CONFIG_IEEE1394 is not set 594# CONFIG_IEEE1394 is not set
604 595
605# 596#
@@ -616,15 +607,7 @@ CONFIG_NETDEVICES=y
616# CONFIG_BONDING is not set 607# CONFIG_BONDING is not set
617# CONFIG_EQUALIZER is not set 608# CONFIG_EQUALIZER is not set
618# CONFIG_TUN is not set 609# CONFIG_TUN is not set
619
620#
621# ARCnet devices
622#
623# CONFIG_ARCNET is not set 610# CONFIG_ARCNET is not set
624
625#
626# PHY device support
627#
628# CONFIG_PHYLIB is not set 611# CONFIG_PHYLIB is not set
629 612
630# 613#
@@ -643,10 +626,7 @@ CONFIG_MII=y
643# CONFIG_NET_TULIP is not set 626# CONFIG_NET_TULIP is not set
644# CONFIG_HP100 is not set 627# CONFIG_HP100 is not set
645# CONFIG_NET_PCI is not set 628# CONFIG_NET_PCI is not set
646 629CONFIG_NETDEV_1000=y
647#
648# Ethernet (1000 Mbit)
649#
650# CONFIG_ACENIC is not set 630# CONFIG_ACENIC is not set
651# CONFIG_DL2K is not set 631# CONFIG_DL2K is not set
652# CONFIG_E1000 is not set 632# CONFIG_E1000 is not set
@@ -658,15 +638,13 @@ CONFIG_MII=y
658# CONFIG_SKGE is not set 638# CONFIG_SKGE is not set
659# CONFIG_SKY2 is not set 639# CONFIG_SKY2 is not set
660# CONFIG_SK98LIN is not set 640# CONFIG_SK98LIN is not set
641# CONFIG_VIA_VELOCITY is not set
661# CONFIG_TIGON3 is not set 642# CONFIG_TIGON3 is not set
662# CONFIG_BNX2 is not set 643# CONFIG_BNX2 is not set
663CONFIG_SPIDER_NET=y 644CONFIG_SPIDER_NET=y
664# CONFIG_QLA3XXX is not set 645# CONFIG_QLA3XXX is not set
665# CONFIG_ATL1 is not set 646# CONFIG_ATL1 is not set
666 647CONFIG_NETDEV_10000=y
667#
668# Ethernet (10000 Mbit)
669#
670# CONFIG_CHELSIO_T1 is not set 648# CONFIG_CHELSIO_T1 is not set
671# CONFIG_CHELSIO_T3 is not set 649# CONFIG_CHELSIO_T3 is not set
672# CONFIG_IXGB is not set 650# CONFIG_IXGB is not set
@@ -674,10 +652,7 @@ CONFIG_SPIDER_NET=y
674# CONFIG_MYRI10GE is not set 652# CONFIG_MYRI10GE is not set
675# CONFIG_NETXEN_NIC is not set 653# CONFIG_NETXEN_NIC is not set
676# CONFIG_PASEMI_MAC is not set 654# CONFIG_PASEMI_MAC is not set
677 655# CONFIG_MLX4_CORE is not set
678#
679# Token Ring devices
680#
681# CONFIG_TR is not set 656# CONFIG_TR is not set
682 657
683# 658#
@@ -687,8 +662,14 @@ CONFIG_SPIDER_NET=y
687# CONFIG_WLAN_80211 is not set 662# CONFIG_WLAN_80211 is not set
688 663
689# 664#
690# Wan interfaces 665# USB Network Adapters
691# 666#
667# CONFIG_USB_CATC is not set
668# CONFIG_USB_KAWETH is not set
669# CONFIG_USB_PEGASUS is not set
670# CONFIG_USB_RTL8150 is not set
671# CONFIG_USB_USBNET_MII is not set
672# CONFIG_USB_USBNET is not set
692# CONFIG_WAN is not set 673# CONFIG_WAN is not set
693# CONFIG_FDDI is not set 674# CONFIG_FDDI is not set
694# CONFIG_HIPPI is not set 675# CONFIG_HIPPI is not set
@@ -715,6 +696,7 @@ CONFIG_SPIDER_NET=y
715# 696#
716CONFIG_INPUT=y 697CONFIG_INPUT=y
717# CONFIG_INPUT_FF_MEMLESS is not set 698# CONFIG_INPUT_FF_MEMLESS is not set
699# CONFIG_INPUT_POLLDEV is not set
718 700
719# 701#
720# Userland interfaces 702# Userland interfaces
@@ -734,6 +716,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
734# CONFIG_INPUT_KEYBOARD is not set 716# CONFIG_INPUT_KEYBOARD is not set
735# CONFIG_INPUT_MOUSE is not set 717# CONFIG_INPUT_MOUSE is not set
736# CONFIG_INPUT_JOYSTICK is not set 718# CONFIG_INPUT_JOYSTICK is not set
719# CONFIG_INPUT_TABLET is not set
737# CONFIG_INPUT_TOUCHSCREEN is not set 720# CONFIG_INPUT_TOUCHSCREEN is not set
738# CONFIG_INPUT_MISC is not set 721# CONFIG_INPUT_MISC is not set
739 722
@@ -797,10 +780,6 @@ CONFIG_HVC_BEAT=y
797# IPMI 780# IPMI
798# 781#
799# CONFIG_IPMI_HANDLER is not set 782# CONFIG_IPMI_HANDLER is not set
800
801#
802# Watchdog Cards
803#
804CONFIG_WATCHDOG=y 783CONFIG_WATCHDOG=y
805# CONFIG_WATCHDOG_NOWAYOUT is not set 784# CONFIG_WATCHDOG_NOWAYOUT is not set
806 785
@@ -822,7 +801,6 @@ CONFIG_WATCHDOG=y
822# CONFIG_HW_RANDOM is not set 801# CONFIG_HW_RANDOM is not set
823CONFIG_GEN_RTC=y 802CONFIG_GEN_RTC=y
824# CONFIG_GEN_RTC_X is not set 803# CONFIG_GEN_RTC_X is not set
825# CONFIG_DTLK is not set
826# CONFIG_R3964 is not set 804# CONFIG_R3964 is not set
827# CONFIG_APPLICOM is not set 805# CONFIG_APPLICOM is not set
828# CONFIG_AGP is not set 806# CONFIG_AGP is not set
@@ -834,11 +812,9 @@ CONFIG_GEN_RTC=y
834# TPM devices 812# TPM devices
835# 813#
836# CONFIG_TCG_TPM is not set 814# CONFIG_TCG_TPM is not set
837 815CONFIG_DEVPORT=y
838#
839# I2C support
840#
841CONFIG_I2C=y 816CONFIG_I2C=y
817CONFIG_I2C_BOARDINFO=y
842# CONFIG_I2C_CHARDEV is not set 818# CONFIG_I2C_CHARDEV is not set
843 819
844# 820#
@@ -864,14 +840,15 @@ CONFIG_I2C_ALGOBIT=y
864# CONFIG_I2C_PARPORT_LIGHT is not set 840# CONFIG_I2C_PARPORT_LIGHT is not set
865# CONFIG_I2C_PROSAVAGE is not set 841# CONFIG_I2C_PROSAVAGE is not set
866# CONFIG_I2C_SAVAGE4 is not set 842# CONFIG_I2C_SAVAGE4 is not set
843# CONFIG_I2C_SIMTEC is not set
867# CONFIG_I2C_SIS5595 is not set 844# CONFIG_I2C_SIS5595 is not set
868# CONFIG_I2C_SIS630 is not set 845# CONFIG_I2C_SIS630 is not set
869# CONFIG_I2C_SIS96X is not set 846# CONFIG_I2C_SIS96X is not set
870# CONFIG_I2C_STUB is not set 847# CONFIG_I2C_STUB is not set
848# CONFIG_I2C_TINY_USB is not set
871# CONFIG_I2C_VIA is not set 849# CONFIG_I2C_VIA is not set
872# CONFIG_I2C_VIAPRO is not set 850# CONFIG_I2C_VIAPRO is not set
873# CONFIG_I2C_VOODOO3 is not set 851# CONFIG_I2C_VOODOO3 is not set
874# CONFIG_I2C_PCA_ISA is not set
875 852
876# 853#
877# Miscellaneous I2C Chip support 854# Miscellaneous I2C Chip support
@@ -898,12 +875,7 @@ CONFIG_I2C_ALGOBIT=y
898# Dallas's 1-wire bus 875# Dallas's 1-wire bus
899# 876#
900# CONFIG_W1 is not set 877# CONFIG_W1 is not set
901
902#
903# Hardware Monitoring support
904#
905# CONFIG_HWMON is not set 878# CONFIG_HWMON is not set
906# CONFIG_HWMON_VID is not set
907 879
908# 880#
909# Multifunction device drivers 881# Multifunction device drivers
@@ -914,17 +886,19 @@ CONFIG_I2C_ALGOBIT=y
914# Multimedia devices 886# Multimedia devices
915# 887#
916# CONFIG_VIDEO_DEV is not set 888# CONFIG_VIDEO_DEV is not set
889# CONFIG_DVB_CORE is not set
890# CONFIG_DAB is not set
917 891
918# 892#
919# Digital Video Broadcasting Devices 893# Graphics support
920# 894#
921# CONFIG_DVB is not set 895# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
922# CONFIG_USB_DABUSB is not set
923 896
924# 897#
925# Graphics support 898# Display device support
926# 899#
927# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 900# CONFIG_DISPLAY_SUPPORT is not set
901# CONFIG_VGASTATE is not set
928# CONFIG_FB is not set 902# CONFIG_FB is not set
929# CONFIG_FB_IBM_GXT4500 is not set 903# CONFIG_FB_IBM_GXT4500 is not set
930 904
@@ -1015,37 +989,10 @@ CONFIG_USB_STORAGE=m
1015# CONFIG_USB_LIBUSUAL is not set 989# CONFIG_USB_LIBUSUAL is not set
1016 990
1017# 991#
1018# USB Input Devices
1019#
1020# CONFIG_USB_AIPTEK is not set
1021# CONFIG_USB_WACOM is not set
1022# CONFIG_USB_ACECAD is not set
1023# CONFIG_USB_KBTAB is not set
1024# CONFIG_USB_POWERMATE is not set
1025# CONFIG_USB_TOUCHSCREEN is not set
1026# CONFIG_USB_YEALINK is not set
1027# CONFIG_USB_XPAD is not set
1028# CONFIG_USB_ATI_REMOTE is not set
1029# CONFIG_USB_ATI_REMOTE2 is not set
1030# CONFIG_USB_KEYSPAN_REMOTE is not set
1031# CONFIG_USB_APPLETOUCH is not set
1032# CONFIG_USB_GTCO is not set
1033
1034#
1035# USB Imaging devices 992# USB Imaging devices
1036# 993#
1037# CONFIG_USB_MDC800 is not set 994# CONFIG_USB_MDC800 is not set
1038# CONFIG_USB_MICROTEK is not set 995# CONFIG_USB_MICROTEK is not set
1039
1040#
1041# USB Network Adapters
1042#
1043# CONFIG_USB_CATC is not set
1044# CONFIG_USB_KAWETH is not set
1045# CONFIG_USB_PEGASUS is not set
1046# CONFIG_USB_RTL8150 is not set
1047# CONFIG_USB_USBNET_MII is not set
1048# CONFIG_USB_USBNET is not set
1049CONFIG_USB_MON=y 996CONFIG_USB_MON=y
1050 997
1051# 998#
@@ -1089,10 +1036,6 @@ CONFIG_USB_MON=y
1089# USB Gadget Support 1036# USB Gadget Support
1090# 1037#
1091# CONFIG_USB_GADGET is not set 1038# CONFIG_USB_GADGET is not set
1092
1093#
1094# MMC/SD Card support
1095#
1096# CONFIG_MMC is not set 1039# CONFIG_MMC is not set
1097 1040
1098# 1041#
@@ -1136,14 +1079,6 @@ CONFIG_USB_MON=y
1136# 1079#
1137 1080
1138# 1081#
1139# Auxiliary Display support
1140#
1141
1142#
1143# Virtualization
1144#
1145
1146#
1147# File systems 1082# File systems
1148# 1083#
1149CONFIG_EXT2_FS=y 1084CONFIG_EXT2_FS=y
@@ -1246,6 +1181,7 @@ CONFIG_EXPORTFS=m
1246CONFIG_NFS_ACL_SUPPORT=m 1181CONFIG_NFS_ACL_SUPPORT=m
1247CONFIG_NFS_COMMON=y 1182CONFIG_NFS_COMMON=y
1248CONFIG_SUNRPC=m 1183CONFIG_SUNRPC=m
1184# CONFIG_SUNRPC_BIND34 is not set
1249# CONFIG_RPCSEC_GSS_KRB5 is not set 1185# CONFIG_RPCSEC_GSS_KRB5 is not set
1250# CONFIG_RPCSEC_GSS_SPKM3 is not set 1186# CONFIG_RPCSEC_GSS_SPKM3 is not set
1251# CONFIG_SMB_FS is not set 1187# CONFIG_SMB_FS is not set
@@ -1275,6 +1211,7 @@ CONFIG_MSDOS_PARTITION=y
1275# CONFIG_SUN_PARTITION is not set 1211# CONFIG_SUN_PARTITION is not set
1276# CONFIG_KARMA_PARTITION is not set 1212# CONFIG_KARMA_PARTITION is not set
1277CONFIG_EFI_PARTITION=y 1213CONFIG_EFI_PARTITION=y
1214# CONFIG_SYSV68_PARTITION is not set
1278 1215
1279# 1216#
1280# Native Language Support 1217# Native Language Support
@@ -1325,7 +1262,6 @@ CONFIG_NLS_ISO8859_15=m
1325# 1262#
1326# CONFIG_DLM is not set 1263# CONFIG_DLM is not set
1327# CONFIG_UCC_SLOW is not set 1264# CONFIG_UCC_SLOW is not set
1328# CONFIG_UCC_FAST is not set
1329 1265
1330# 1266#
1331# Library routines 1267# Library routines
@@ -1333,6 +1269,7 @@ CONFIG_NLS_ISO8859_15=m
1333CONFIG_BITREVERSE=y 1269CONFIG_BITREVERSE=y
1334# CONFIG_CRC_CCITT is not set 1270# CONFIG_CRC_CCITT is not set
1335# CONFIG_CRC16 is not set 1271# CONFIG_CRC16 is not set
1272# CONFIG_CRC_ITU_T is not set
1336CONFIG_CRC32=y 1273CONFIG_CRC32=y
1337CONFIG_LIBCRC32C=m 1274CONFIG_LIBCRC32C=m
1338CONFIG_ZLIB_INFLATE=m 1275CONFIG_ZLIB_INFLATE=m
@@ -1340,6 +1277,7 @@ CONFIG_ZLIB_DEFLATE=m
1340CONFIG_PLIST=y 1277CONFIG_PLIST=y
1341CONFIG_HAS_IOMEM=y 1278CONFIG_HAS_IOMEM=y
1342CONFIG_HAS_IOPORT=y 1279CONFIG_HAS_IOPORT=y
1280CONFIG_HAS_DMA=y
1343 1281
1344# 1282#
1345# Instrumentation Support 1283# Instrumentation Support
@@ -1358,7 +1296,6 @@ CONFIG_DEBUG_FS=y
1358# CONFIG_HEADERS_CHECK is not set 1296# CONFIG_HEADERS_CHECK is not set
1359CONFIG_DEBUG_KERNEL=y 1297CONFIG_DEBUG_KERNEL=y
1360# CONFIG_DEBUG_SHIRQ is not set 1298# CONFIG_DEBUG_SHIRQ is not set
1361CONFIG_LOG_BUF_SHIFT=15
1362CONFIG_DETECT_SOFTLOCKUP=y 1299CONFIG_DETECT_SOFTLOCKUP=y
1363# CONFIG_SCHEDSTATS is not set 1300# CONFIG_SCHEDSTATS is not set
1364# CONFIG_TIMER_STATS is not set 1301# CONFIG_TIMER_STATS is not set
@@ -1395,6 +1332,7 @@ CONFIG_PPC_EARLY_DEBUG=y
1395# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set 1332# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
1396# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 1333# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
1397CONFIG_PPC_EARLY_DEBUG_BEAT=y 1334CONFIG_PPC_EARLY_DEBUG_BEAT=y
1335# CONFIG_PPC_EARLY_DEBUG_44x is not set
1398 1336
1399# 1337#
1400# Security options 1338# Security options
@@ -1425,6 +1363,7 @@ CONFIG_CRYPTO_ECB=m
1425CONFIG_CRYPTO_CBC=m 1363CONFIG_CRYPTO_CBC=m
1426CONFIG_CRYPTO_PCBC=m 1364CONFIG_CRYPTO_PCBC=m
1427# CONFIG_CRYPTO_LRW is not set 1365# CONFIG_CRYPTO_LRW is not set
1366# CONFIG_CRYPTO_CRYPTD is not set
1428CONFIG_CRYPTO_DES=m 1367CONFIG_CRYPTO_DES=m
1429# CONFIG_CRYPTO_FCRYPT is not set 1368# CONFIG_CRYPTO_FCRYPT is not set
1430CONFIG_CRYPTO_BLOWFISH=m 1369CONFIG_CRYPTO_BLOWFISH=m
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 029c9a0e730c..7a747c438536 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:12:58 2007 4# Tue Jun 26 12:36:45 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -34,9 +34,9 @@ CONFIG_CLASSIC32=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set 36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_6xx=y 41CONFIG_6xx=y
42CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_ALTIVEC is not set 45# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48CONFIG_SMP=y 49CONFIG_SMP=y
49CONFIG_NR_CPUS=4 50CONFIG_NR_CPUS=4
50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 51CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -64,6 +65,7 @@ CONFIG_LOCALVERSION=""
64CONFIG_SWAP=y 65CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 66CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set 67# CONFIG_IPC_NS is not set
68CONFIG_SYSVIPC_SYSCTL=y
67CONFIG_POSIX_MQUEUE=y 69CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 70# CONFIG_BSD_PROCESS_ACCT is not set
69# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
@@ -71,9 +73,11 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
72CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=15
74# CONFIG_CPUSETS is not set 77# CONFIG_CPUSETS is not set
75CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
76# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
80CONFIG_BLK_DEV_INITRD=y
77CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
78# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
79CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
@@ -88,14 +92,19 @@ CONFIG_BUG=y
88CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
89CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
90CONFIG_FUTEX=y 94CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y
91CONFIG_EPOLL=y 96CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 100CONFIG_SHMEM=y
93CONFIG_SLAB=y
94CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y
103# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set
95CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
96# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
97CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
98# CONFIG_SLOB is not set
99 108
100# 109#
101# Loadable module support 110# Loadable module support
@@ -137,13 +146,18 @@ CONFIG_PPC_MULTIPLATFORM=y
137# CONFIG_APUS is not set 146# CONFIG_APUS is not set
138CONFIG_PPC_CHRP=y 147CONFIG_PPC_CHRP=y
139# CONFIG_PPC_MPC52xx is not set 148# CONFIG_PPC_MPC52xx is not set
149# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_EFIKA is not set 150# CONFIG_PPC_EFIKA is not set
141# CONFIG_PPC_LITE5200 is not set 151# CONFIG_PPC_LITE5200 is not set
142# CONFIG_PPC_PMAC is not set 152# CONFIG_PPC_PMAC is not set
143# CONFIG_PPC_CELL is not set 153# CONFIG_PPC_CELL is not set
144# CONFIG_PPC_CELL_NATIVE is not set 154# CONFIG_PPC_CELL_NATIVE is not set
155# CONFIG_PQ2ADS is not set
145CONFIG_PPC_NATIVE=y 156CONFIG_PPC_NATIVE=y
146# CONFIG_UDBG_RTAS_CONSOLE is not set 157# CONFIG_UDBG_RTAS_CONSOLE is not set
158CONFIG_MPIC=y
159# CONFIG_MPIC_WEIRD is not set
160CONFIG_PPC_I8259=y
147CONFIG_PPC_RTAS=y 161CONFIG_PPC_RTAS=y
148# CONFIG_RTAS_ERROR_LOGGING is not set 162# CONFIG_RTAS_ERROR_LOGGING is not set
149CONFIG_RTAS_PROC=y 163CONFIG_RTAS_PROC=y
@@ -154,8 +168,7 @@ CONFIG_PPC_MPC106=y
154# CONFIG_GENERIC_IOMAP is not set 168# CONFIG_GENERIC_IOMAP is not set
155# CONFIG_CPU_FREQ is not set 169# CONFIG_CPU_FREQ is not set
156# CONFIG_TAU is not set 170# CONFIG_TAU is not set
157# CONFIG_WANT_EARLY_SERIAL is not set 171# CONFIG_CPM2 is not set
158CONFIG_MPIC=y
159 172
160# 173#
161# Kernel options 174# Kernel options
@@ -186,33 +199,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
187CONFIG_SPLIT_PTLOCK_CPUS=4 200CONFIG_SPLIT_PTLOCK_CPUS=4
188# CONFIG_RESOURCES_64BIT is not set 201# CONFIG_RESOURCES_64BIT is not set
202CONFIG_ZONE_DMA_FLAG=1
189CONFIG_PROC_DEVICETREE=y 203CONFIG_PROC_DEVICETREE=y
190# CONFIG_CMDLINE_BOOL is not set 204# CONFIG_CMDLINE_BOOL is not set
191# CONFIG_PM is not set 205# CONFIG_PM is not set
192CONFIG_SECCOMP=y 206CONFIG_SECCOMP=y
207# CONFIG_WANT_DEVICE_TREE is not set
193CONFIG_ISA_DMA_API=y 208CONFIG_ISA_DMA_API=y
194 209
195# 210#
196# Bus options 211# Bus options
197# 212#
198CONFIG_ISA=y 213CONFIG_ISA=y
214CONFIG_ZONE_DMA=y
199CONFIG_GENERIC_ISA_DMA=y 215CONFIG_GENERIC_ISA_DMA=y
200# CONFIG_MPIC_WEIRD is not set
201CONFIG_PPC_I8259=y
202CONFIG_PPC_INDIRECT_PCI=y 216CONFIG_PPC_INDIRECT_PCI=y
217# CONFIG_PPC_INDIRECT_PCI_BE is not set
203CONFIG_PCI=y 218CONFIG_PCI=y
204CONFIG_PCI_DOMAINS=y 219CONFIG_PCI_DOMAINS=y
205# CONFIG_PCIEPORTBUS is not set 220# CONFIG_PCIEPORTBUS is not set
221CONFIG_ARCH_SUPPORTS_MSI=y
222# CONFIG_PCI_MSI is not set
206# CONFIG_PCI_DEBUG is not set 223# CONFIG_PCI_DEBUG is not set
207 224
208# 225#
209# PCCARD (PCMCIA/CardBus) support 226# PCCARD (PCMCIA/CardBus) support
210# 227#
211# CONFIG_PCCARD is not set 228# CONFIG_PCCARD is not set
212
213#
214# PCI Hotplug Support
215#
216# CONFIG_HOTPLUG_PCI is not set 229# CONFIG_HOTPLUG_PCI is not set
217 230
218# 231#
@@ -237,7 +250,6 @@ CONFIG_NET=y
237# 250#
238# Networking options 251# Networking options
239# 252#
240# CONFIG_NETDEBUG is not set
241CONFIG_PACKET=y 253CONFIG_PACKET=y
242# CONFIG_PACKET_MMAP is not set 254# CONFIG_PACKET_MMAP is not set
243CONFIG_UNIX=y 255CONFIG_UNIX=y
@@ -266,10 +278,6 @@ CONFIG_INET_TCP_DIAG=y
266CONFIG_TCP_CONG_CUBIC=y 278CONFIG_TCP_CONG_CUBIC=y
267CONFIG_DEFAULT_TCP_CONG="cubic" 279CONFIG_DEFAULT_TCP_CONG="cubic"
268# CONFIG_TCP_MD5SIG is not set 280# CONFIG_TCP_MD5SIG is not set
269
270#
271# IP: Virtual Server Configuration
272#
273# CONFIG_IP_VS is not set 281# CONFIG_IP_VS is not set
274# CONFIG_IPV6 is not set 282# CONFIG_IPV6 is not set
275# CONFIG_INET6_XFRM_TUNNEL is not set 283# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -283,8 +291,6 @@ CONFIG_NETFILTER=y
283# 291#
284# CONFIG_NETFILTER_NETLINK is not set 292# CONFIG_NETFILTER_NETLINK is not set
285CONFIG_NF_CONNTRACK_ENABLED=m 293CONFIG_NF_CONNTRACK_ENABLED=m
286CONFIG_NF_CONNTRACK_SUPPORT=y
287# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
288CONFIG_NF_CONNTRACK=m 294CONFIG_NF_CONNTRACK=m
289# CONFIG_NF_CT_ACCT is not set 295# CONFIG_NF_CT_ACCT is not set
290# CONFIG_NF_CONNTRACK_MARK is not set 296# CONFIG_NF_CONNTRACK_MARK is not set
@@ -296,9 +302,37 @@ CONFIG_NF_CONNTRACK_FTP=m
296CONFIG_NF_CONNTRACK_IRC=m 302CONFIG_NF_CONNTRACK_IRC=m
297# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set 303# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
298# CONFIG_NF_CONNTRACK_PPTP is not set 304# CONFIG_NF_CONNTRACK_PPTP is not set
305# CONFIG_NF_CONNTRACK_SANE is not set
299CONFIG_NF_CONNTRACK_SIP=m 306CONFIG_NF_CONNTRACK_SIP=m
300CONFIG_NF_CONNTRACK_TFTP=m 307CONFIG_NF_CONNTRACK_TFTP=m
301# CONFIG_NETFILTER_XTABLES is not set 308CONFIG_NETFILTER_XTABLES=m
309# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
310# CONFIG_NETFILTER_XT_TARGET_MARK is not set
311# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
312# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
313# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
314# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
315# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
316# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
317# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
318# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
319# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
320# CONFIG_NETFILTER_XT_MATCH_ESP is not set
321# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
322# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
323# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
324# CONFIG_NETFILTER_XT_MATCH_MAC is not set
325# CONFIG_NETFILTER_XT_MATCH_MARK is not set
326# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
327# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
328# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
329# CONFIG_NETFILTER_XT_MATCH_REALM is not set
330# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
331# CONFIG_NETFILTER_XT_MATCH_STATE is not set
332# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
333# CONFIG_NETFILTER_XT_MATCH_STRING is not set
334# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
335# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
302 336
303# 337#
304# IP: Netfilter Configuration 338# IP: Netfilter Configuration
@@ -306,20 +340,38 @@ CONFIG_NF_CONNTRACK_TFTP=m
306CONFIG_NF_CONNTRACK_IPV4=m 340CONFIG_NF_CONNTRACK_IPV4=m
307CONFIG_NF_CONNTRACK_PROC_COMPAT=y 341CONFIG_NF_CONNTRACK_PROC_COMPAT=y
308# CONFIG_IP_NF_QUEUE is not set 342# CONFIG_IP_NF_QUEUE is not set
309 343CONFIG_IP_NF_IPTABLES=m
310# 344# CONFIG_IP_NF_MATCH_IPRANGE is not set
311# DCCP Configuration (EXPERIMENTAL) 345# CONFIG_IP_NF_MATCH_TOS is not set
312# 346# CONFIG_IP_NF_MATCH_RECENT is not set
347# CONFIG_IP_NF_MATCH_ECN is not set
348# CONFIG_IP_NF_MATCH_AH is not set
349# CONFIG_IP_NF_MATCH_TTL is not set
350# CONFIG_IP_NF_MATCH_OWNER is not set
351# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
352CONFIG_IP_NF_FILTER=m
353CONFIG_IP_NF_TARGET_REJECT=m
354CONFIG_IP_NF_TARGET_LOG=m
355# CONFIG_IP_NF_TARGET_ULOG is not set
356CONFIG_NF_NAT=m
357CONFIG_NF_NAT_NEEDED=y
358CONFIG_IP_NF_TARGET_MASQUERADE=m
359CONFIG_IP_NF_TARGET_REDIRECT=m
360# CONFIG_IP_NF_TARGET_NETMAP is not set
361# CONFIG_IP_NF_TARGET_SAME is not set
362# CONFIG_NF_NAT_SNMP_BASIC is not set
363CONFIG_NF_NAT_FTP=m
364CONFIG_NF_NAT_IRC=m
365CONFIG_NF_NAT_TFTP=m
366# CONFIG_NF_NAT_AMANDA is not set
367# CONFIG_NF_NAT_PPTP is not set
368# CONFIG_NF_NAT_H323 is not set
369CONFIG_NF_NAT_SIP=m
370# CONFIG_IP_NF_MANGLE is not set
371# CONFIG_IP_NF_RAW is not set
372# CONFIG_IP_NF_ARPTABLES is not set
313# CONFIG_IP_DCCP is not set 373# CONFIG_IP_DCCP is not set
314
315#
316# SCTP Configuration (EXPERIMENTAL)
317#
318# CONFIG_IP_SCTP is not set 374# CONFIG_IP_SCTP is not set
319
320#
321# TIPC Configuration (EXPERIMENTAL)
322#
323# CONFIG_TIPC is not set 375# CONFIG_TIPC is not set
324# CONFIG_ATM is not set 376# CONFIG_ATM is not set
325# CONFIG_BRIDGE is not set 377# CONFIG_BRIDGE is not set
@@ -345,7 +397,16 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
345# CONFIG_HAMRADIO is not set 397# CONFIG_HAMRADIO is not set
346# CONFIG_IRDA is not set 398# CONFIG_IRDA is not set
347# CONFIG_BT is not set 399# CONFIG_BT is not set
400# CONFIG_AF_RXRPC is not set
401
402#
403# Wireless
404#
405# CONFIG_CFG80211 is not set
406# CONFIG_WIRELESS_EXT is not set
407# CONFIG_MAC80211 is not set
348# CONFIG_IEEE80211 is not set 408# CONFIG_IEEE80211 is not set
409# CONFIG_RFKILL is not set
349 410
350# 411#
351# Device Drivers 412# Device Drivers
@@ -358,16 +419,13 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
358CONFIG_PREVENT_FIRMWARE_BUILD=y 419CONFIG_PREVENT_FIRMWARE_BUILD=y
359# CONFIG_FW_LOADER is not set 420# CONFIG_FW_LOADER is not set
360# CONFIG_DEBUG_DRIVER is not set 421# CONFIG_DEBUG_DRIVER is not set
422# CONFIG_DEBUG_DEVRES is not set
361# CONFIG_SYS_HYPERVISOR is not set 423# CONFIG_SYS_HYPERVISOR is not set
362 424
363# 425#
364# Connector - unified userspace <-> kernelspace linker 426# Connector - unified userspace <-> kernelspace linker
365# 427#
366# CONFIG_CONNECTOR is not set 428# CONFIG_CONNECTOR is not set
367
368#
369# Memory Technology Devices (MTD)
370#
371# CONFIG_MTD is not set 429# CONFIG_MTD is not set
372 430
373# 431#
@@ -379,6 +437,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
379# Plug and Play support 437# Plug and Play support
380# 438#
381# CONFIG_PNP is not set 439# CONFIG_PNP is not set
440# CONFIG_PNPACPI is not set
382 441
383# 442#
384# Block devices 443# Block devices
@@ -399,19 +458,16 @@ CONFIG_BLK_DEV_RAM=y
399CONFIG_BLK_DEV_RAM_COUNT=16 458CONFIG_BLK_DEV_RAM_COUNT=16
400CONFIG_BLK_DEV_RAM_SIZE=4096 459CONFIG_BLK_DEV_RAM_SIZE=4096
401CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 460CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
402CONFIG_BLK_DEV_INITRD=y
403# CONFIG_CDROM_PKTCDVD is not set 461# CONFIG_CDROM_PKTCDVD is not set
404# CONFIG_ATA_OVER_ETH is not set 462# CONFIG_ATA_OVER_ETH is not set
405 463
406# 464#
407# Misc devices 465# Misc devices
408# 466#
467# CONFIG_PHANTOM is not set
409# CONFIG_SGI_IOC4 is not set 468# CONFIG_SGI_IOC4 is not set
410# CONFIG_TIFM_CORE is not set 469# CONFIG_TIFM_CORE is not set
411 470# CONFIG_BLINK is not set
412#
413# ATA/ATAPI/MFM/RLL support
414#
415CONFIG_IDE=y 471CONFIG_IDE=y
416CONFIG_BLK_DEV_IDE=y 472CONFIG_BLK_DEV_IDE=y
417 473
@@ -426,6 +482,7 @@ CONFIG_BLK_DEV_IDECD=y
426# CONFIG_BLK_DEV_IDEFLOPPY is not set 482# CONFIG_BLK_DEV_IDEFLOPPY is not set
427# CONFIG_BLK_DEV_IDESCSI is not set 483# CONFIG_BLK_DEV_IDESCSI is not set
428# CONFIG_IDE_TASK_IOCTL is not set 484# CONFIG_IDE_TASK_IOCTL is not set
485CONFIG_IDE_PROC_FS=y
429 486
430# 487#
431# IDE chipset support/bugfixes 488# IDE chipset support/bugfixes
@@ -433,12 +490,12 @@ CONFIG_BLK_DEV_IDECD=y
433CONFIG_IDE_GENERIC=y 490CONFIG_IDE_GENERIC=y
434CONFIG_BLK_DEV_IDEPCI=y 491CONFIG_BLK_DEV_IDEPCI=y
435CONFIG_IDEPCI_SHARE_IRQ=y 492CONFIG_IDEPCI_SHARE_IRQ=y
493CONFIG_IDEPCI_PCIBUS_ORDER=y
436# CONFIG_BLK_DEV_OFFBOARD is not set 494# CONFIG_BLK_DEV_OFFBOARD is not set
437CONFIG_BLK_DEV_GENERIC=y 495CONFIG_BLK_DEV_GENERIC=y
438# CONFIG_BLK_DEV_OPTI621 is not set 496# CONFIG_BLK_DEV_OPTI621 is not set
439CONFIG_BLK_DEV_IDEDMA_PCI=y 497CONFIG_BLK_DEV_IDEDMA_PCI=y
440# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 498# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
441CONFIG_IDEDMA_PCI_AUTO=y
442# CONFIG_IDEDMA_ONLYDISK is not set 499# CONFIG_IDEDMA_ONLYDISK is not set
443# CONFIG_BLK_DEV_AEC62XX is not set 500# CONFIG_BLK_DEV_AEC62XX is not set
444# CONFIG_BLK_DEV_ALI15X3 is not set 501# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -453,6 +510,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
453# CONFIG_BLK_DEV_JMICRON is not set 510# CONFIG_BLK_DEV_JMICRON is not set
454# CONFIG_BLK_DEV_SC1200 is not set 511# CONFIG_BLK_DEV_SC1200 is not set
455# CONFIG_BLK_DEV_PIIX is not set 512# CONFIG_BLK_DEV_PIIX is not set
513# CONFIG_BLK_DEV_IT8213 is not set
456# CONFIG_BLK_DEV_IT821X is not set 514# CONFIG_BLK_DEV_IT821X is not set
457# CONFIG_BLK_DEV_NS87415 is not set 515# CONFIG_BLK_DEV_NS87415 is not set
458# CONFIG_BLK_DEV_PDC202XX_OLD is not set 516# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -463,11 +521,11 @@ CONFIG_BLK_DEV_SL82C105=y
463# CONFIG_BLK_DEV_SLC90E66 is not set 521# CONFIG_BLK_DEV_SLC90E66 is not set
464# CONFIG_BLK_DEV_TRM290 is not set 522# CONFIG_BLK_DEV_TRM290 is not set
465CONFIG_BLK_DEV_VIA82CXXX=y 523CONFIG_BLK_DEV_VIA82CXXX=y
524# CONFIG_BLK_DEV_TC86C001 is not set
466# CONFIG_IDE_ARM is not set 525# CONFIG_IDE_ARM is not set
467# CONFIG_IDE_CHIPSETS is not set 526# CONFIG_IDE_CHIPSETS is not set
468CONFIG_BLK_DEV_IDEDMA=y 527CONFIG_BLK_DEV_IDEDMA=y
469# CONFIG_IDEDMA_IVB is not set 528# CONFIG_IDEDMA_IVB is not set
470CONFIG_IDEDMA_AUTO=y
471# CONFIG_BLK_DEV_HD is not set 529# CONFIG_BLK_DEV_HD is not set
472 530
473# 531#
@@ -497,6 +555,7 @@ CONFIG_CHR_DEV_SG=y
497CONFIG_SCSI_CONSTANTS=y 555CONFIG_SCSI_CONSTANTS=y
498# CONFIG_SCSI_LOGGING is not set 556# CONFIG_SCSI_LOGGING is not set
499# CONFIG_SCSI_SCAN_ASYNC is not set 557# CONFIG_SCSI_SCAN_ASYNC is not set
558CONFIG_SCSI_WAIT_SCAN=m
500 559
501# 560#
502# SCSI Transports 561# SCSI Transports
@@ -562,10 +621,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
562# CONFIG_SCSI_NSP32 is not set 621# CONFIG_SCSI_NSP32 is not set
563# CONFIG_SCSI_DEBUG is not set 622# CONFIG_SCSI_DEBUG is not set
564# CONFIG_SCSI_SRP is not set 623# CONFIG_SCSI_SRP is not set
565
566#
567# Serial ATA (prod) and Parallel ATA (experimental) drivers
568#
569# CONFIG_ATA is not set 624# CONFIG_ATA is not set
570 625
571# 626#
@@ -589,18 +644,14 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
589# 644#
590# IEEE 1394 (FireWire) support 645# IEEE 1394 (FireWire) support
591# 646#
647# CONFIG_FIREWIRE is not set
592# CONFIG_IEEE1394 is not set 648# CONFIG_IEEE1394 is not set
593 649
594# 650#
595# I2O device support 651# I2O device support
596# 652#
597# CONFIG_I2O is not set 653# CONFIG_I2O is not set
598 654# CONFIG_MACINTOSH_DRIVERS is not set
599#
600# Macintosh device drivers
601#
602# CONFIG_MAC_EMUMOUSEBTN is not set
603# CONFIG_WINDFARM is not set
604 655
605# 656#
606# Network device support 657# Network device support
@@ -610,15 +661,7 @@ CONFIG_NETDEVICES=y
610# CONFIG_BONDING is not set 661# CONFIG_BONDING is not set
611# CONFIG_EQUALIZER is not set 662# CONFIG_EQUALIZER is not set
612# CONFIG_TUN is not set 663# CONFIG_TUN is not set
613
614#
615# ARCnet devices
616#
617# CONFIG_ARCNET is not set 664# CONFIG_ARCNET is not set
618
619#
620# PHY device support
621#
622# CONFIG_PHYLIB is not set 665# CONFIG_PHYLIB is not set
623 666
624# 667#
@@ -677,10 +720,8 @@ CONFIG_8139TOO=y
677CONFIG_VIA_RHINE=y 720CONFIG_VIA_RHINE=y
678# CONFIG_VIA_RHINE_MMIO is not set 721# CONFIG_VIA_RHINE_MMIO is not set
679# CONFIG_VIA_RHINE_NAPI is not set 722# CONFIG_VIA_RHINE_NAPI is not set
680 723# CONFIG_SC92031 is not set
681# 724CONFIG_NETDEV_1000=y
682# Ethernet (1000 Mbit)
683#
684# CONFIG_ACENIC is not set 725# CONFIG_ACENIC is not set
685# CONFIG_DL2K is not set 726# CONFIG_DL2K is not set
686# CONFIG_E1000 is not set 727# CONFIG_E1000 is not set
@@ -696,33 +737,33 @@ CONFIG_VIA_RHINE=y
696# CONFIG_TIGON3 is not set 737# CONFIG_TIGON3 is not set
697# CONFIG_BNX2 is not set 738# CONFIG_BNX2 is not set
698CONFIG_MV643XX_ETH=y 739CONFIG_MV643XX_ETH=y
699# CONFIG_MV643XX_ETH_0 is not set
700# CONFIG_MV643XX_ETH_1 is not set
701# CONFIG_MV643XX_ETH_2 is not set
702# CONFIG_QLA3XXX is not set 740# CONFIG_QLA3XXX is not set
703 741# CONFIG_ATL1 is not set
704# 742CONFIG_NETDEV_10000=y
705# Ethernet (10000 Mbit)
706#
707# CONFIG_CHELSIO_T1 is not set 743# CONFIG_CHELSIO_T1 is not set
744# CONFIG_CHELSIO_T3 is not set
708# CONFIG_IXGB is not set 745# CONFIG_IXGB is not set
709# CONFIG_S2IO is not set 746# CONFIG_S2IO is not set
710# CONFIG_MYRI10GE is not set 747# CONFIG_MYRI10GE is not set
711# CONFIG_NETXEN_NIC is not set 748# CONFIG_NETXEN_NIC is not set
712 749# CONFIG_MLX4_CORE is not set
713#
714# Token Ring devices
715#
716# CONFIG_TR is not set 750# CONFIG_TR is not set
717 751
718# 752#
719# Wireless LAN (non-hamradio) 753# Wireless LAN
720# 754#
721# CONFIG_NET_RADIO is not set 755# CONFIG_WLAN_PRE80211 is not set
756# CONFIG_WLAN_80211 is not set
722 757
723# 758#
724# Wan interfaces 759# USB Network Adapters
725# 760#
761# CONFIG_USB_CATC is not set
762# CONFIG_USB_KAWETH is not set
763# CONFIG_USB_PEGASUS is not set
764# CONFIG_USB_RTL8150 is not set
765# CONFIG_USB_USBNET_MII is not set
766# CONFIG_USB_USBNET is not set
726# CONFIG_WAN is not set 767# CONFIG_WAN is not set
727# CONFIG_FDDI is not set 768# CONFIG_FDDI is not set
728# CONFIG_HIPPI is not set 769# CONFIG_HIPPI is not set
@@ -758,6 +799,7 @@ CONFIG_SLHC=m
758# 799#
759CONFIG_INPUT=y 800CONFIG_INPUT=y
760# CONFIG_INPUT_FF_MEMLESS is not set 801# CONFIG_INPUT_FF_MEMLESS is not set
802# CONFIG_INPUT_POLLDEV is not set
761 803
762# 804#
763# Userland interfaces 805# Userland interfaces
@@ -783,15 +825,28 @@ CONFIG_KEYBOARD_ATKBD=y
783# CONFIG_KEYBOARD_STOWAWAY is not set 825# CONFIG_KEYBOARD_STOWAWAY is not set
784CONFIG_INPUT_MOUSE=y 826CONFIG_INPUT_MOUSE=y
785CONFIG_MOUSE_PS2=y 827CONFIG_MOUSE_PS2=y
828CONFIG_MOUSE_PS2_ALPS=y
829CONFIG_MOUSE_PS2_LOGIPS2PP=y
830CONFIG_MOUSE_PS2_SYNAPTICS=y
831CONFIG_MOUSE_PS2_LIFEBOOK=y
832CONFIG_MOUSE_PS2_TRACKPOINT=y
833# CONFIG_MOUSE_PS2_TOUCHKIT is not set
786# CONFIG_MOUSE_SERIAL is not set 834# CONFIG_MOUSE_SERIAL is not set
835# CONFIG_MOUSE_APPLETOUCH is not set
787# CONFIG_MOUSE_INPORT is not set 836# CONFIG_MOUSE_INPORT is not set
788# CONFIG_MOUSE_LOGIBM is not set 837# CONFIG_MOUSE_LOGIBM is not set
789# CONFIG_MOUSE_PC110PAD is not set 838# CONFIG_MOUSE_PC110PAD is not set
790# CONFIG_MOUSE_VSXXXAA is not set 839# CONFIG_MOUSE_VSXXXAA is not set
791# CONFIG_INPUT_JOYSTICK is not set 840# CONFIG_INPUT_JOYSTICK is not set
841# CONFIG_INPUT_TABLET is not set
792# CONFIG_INPUT_TOUCHSCREEN is not set 842# CONFIG_INPUT_TOUCHSCREEN is not set
793CONFIG_INPUT_MISC=y 843CONFIG_INPUT_MISC=y
794# CONFIG_INPUT_PCSPKR is not set 844# CONFIG_INPUT_PCSPKR is not set
845# CONFIG_INPUT_ATI_REMOTE is not set
846# CONFIG_INPUT_ATI_REMOTE2 is not set
847# CONFIG_INPUT_KEYSPAN_REMOTE is not set
848# CONFIG_INPUT_POWERMATE is not set
849# CONFIG_INPUT_YEALINK is not set
795CONFIG_INPUT_UINPUT=y 850CONFIG_INPUT_UINPUT=y
796 851
797# 852#
@@ -831,6 +886,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
831CONFIG_SERIAL_CORE=y 886CONFIG_SERIAL_CORE=y
832CONFIG_SERIAL_CORE_CONSOLE=y 887CONFIG_SERIAL_CORE_CONSOLE=y
833# CONFIG_SERIAL_JSM is not set 888# CONFIG_SERIAL_JSM is not set
889# CONFIG_SERIAL_OF_PLATFORM is not set
834CONFIG_UNIX98_PTYS=y 890CONFIG_UNIX98_PTYS=y
835CONFIG_LEGACY_PTYS=y 891CONFIG_LEGACY_PTYS=y
836CONFIG_LEGACY_PTY_COUNT=256 892CONFIG_LEGACY_PTY_COUNT=256
@@ -841,10 +897,6 @@ CONFIG_BRIQ_PANEL=m
841# IPMI 897# IPMI
842# 898#
843# CONFIG_IPMI_HANDLER is not set 899# CONFIG_IPMI_HANDLER is not set
844
845#
846# Watchdog Cards
847#
848# CONFIG_WATCHDOG is not set 900# CONFIG_WATCHDOG is not set
849# CONFIG_HW_RANDOM is not set 901# CONFIG_HW_RANDOM is not set
850CONFIG_NVRAM=y 902CONFIG_NVRAM=y
@@ -861,11 +913,9 @@ CONFIG_GEN_RTC=y
861# TPM devices 913# TPM devices
862# 914#
863# CONFIG_TCG_TPM is not set 915# CONFIG_TCG_TPM is not set
864 916CONFIG_DEVPORT=y
865#
866# I2C support
867#
868CONFIG_I2C=y 917CONFIG_I2C=y
918CONFIG_I2C_BOARDINFO=y
869# CONFIG_I2C_CHARDEV is not set 919# CONFIG_I2C_CHARDEV is not set
870 920
871# 921#
@@ -893,10 +943,12 @@ CONFIG_I2C_ALGOBIT=y
893# CONFIG_I2C_PARPORT_LIGHT is not set 943# CONFIG_I2C_PARPORT_LIGHT is not set
894# CONFIG_I2C_PROSAVAGE is not set 944# CONFIG_I2C_PROSAVAGE is not set
895# CONFIG_I2C_SAVAGE4 is not set 945# CONFIG_I2C_SAVAGE4 is not set
946# CONFIG_I2C_SIMTEC is not set
896# CONFIG_I2C_SIS5595 is not set 947# CONFIG_I2C_SIS5595 is not set
897# CONFIG_I2C_SIS630 is not set 948# CONFIG_I2C_SIS630 is not set
898# CONFIG_I2C_SIS96X is not set 949# CONFIG_I2C_SIS96X is not set
899# CONFIG_I2C_STUB is not set 950# CONFIG_I2C_STUB is not set
951# CONFIG_I2C_TINY_USB is not set
900# CONFIG_I2C_VIA is not set 952# CONFIG_I2C_VIA is not set
901# CONFIG_I2C_VIAPRO is not set 953# CONFIG_I2C_VIAPRO is not set
902# CONFIG_I2C_VOODOO3 is not set 954# CONFIG_I2C_VOODOO3 is not set
@@ -928,37 +980,56 @@ CONFIG_I2C_ALGOBIT=y
928# Dallas's 1-wire bus 980# Dallas's 1-wire bus
929# 981#
930# CONFIG_W1 is not set 982# CONFIG_W1 is not set
983# CONFIG_HWMON is not set
931 984
932# 985#
933# Hardware Monitoring support 986# Multifunction device drivers
934# 987#
935# CONFIG_HWMON is not set 988# CONFIG_MFD_SM501 is not set
936# CONFIG_HWMON_VID is not set
937 989
938# 990#
939# Multimedia devices 991# Multimedia devices
940# 992#
941# CONFIG_VIDEO_DEV is not set 993# CONFIG_VIDEO_DEV is not set
994# CONFIG_DVB_CORE is not set
995# CONFIG_DAB is not set
942 996
943# 997#
944# Digital Video Broadcasting Devices 998# Graphics support
945# 999#
946# CONFIG_DVB is not set 1000CONFIG_BACKLIGHT_LCD_SUPPORT=y
947# CONFIG_USB_DABUSB is not set 1001CONFIG_BACKLIGHT_CLASS_DEVICE=y
1002CONFIG_LCD_CLASS_DEVICE=m
948 1003
949# 1004#
950# Graphics support 1005# Display device support
951# 1006#
952CONFIG_FIRMWARE_EDID=y 1007CONFIG_DISPLAY_SUPPORT=m
1008
1009#
1010# Display hardware drivers
1011#
1012# CONFIG_VGASTATE is not set
953CONFIG_FB=y 1013CONFIG_FB=y
1014CONFIG_FIRMWARE_EDID=y
954CONFIG_FB_DDC=y 1015CONFIG_FB_DDC=y
955CONFIG_FB_CFB_FILLRECT=y 1016CONFIG_FB_CFB_FILLRECT=y
956CONFIG_FB_CFB_COPYAREA=y 1017CONFIG_FB_CFB_COPYAREA=y
957CONFIG_FB_CFB_IMAGEBLIT=y 1018CONFIG_FB_CFB_IMAGEBLIT=y
1019# CONFIG_FB_SYS_FILLRECT is not set
1020# CONFIG_FB_SYS_COPYAREA is not set
1021# CONFIG_FB_SYS_IMAGEBLIT is not set
1022# CONFIG_FB_SYS_FOPS is not set
1023CONFIG_FB_DEFERRED_IO=y
1024# CONFIG_FB_SVGALIB is not set
958CONFIG_FB_MACMODES=y 1025CONFIG_FB_MACMODES=y
959# CONFIG_FB_BACKLIGHT is not set 1026CONFIG_FB_BACKLIGHT=y
960CONFIG_FB_MODE_HELPERS=y 1027CONFIG_FB_MODE_HELPERS=y
961CONFIG_FB_TILEBLITTING=y 1028CONFIG_FB_TILEBLITTING=y
1029
1030#
1031# Frame buffer hardware drivers
1032#
962# CONFIG_FB_CIRRUS is not set 1033# CONFIG_FB_CIRRUS is not set
963# CONFIG_FB_PM2 is not set 1034# CONFIG_FB_PM2 is not set
964# CONFIG_FB_CYBER2000 is not set 1035# CONFIG_FB_CYBER2000 is not set
@@ -978,12 +1049,15 @@ CONFIG_FB_MATROX_G=y
978# CONFIG_FB_MATROX_MULTIHEAD is not set 1049# CONFIG_FB_MATROX_MULTIHEAD is not set
979CONFIG_FB_RADEON=y 1050CONFIG_FB_RADEON=y
980CONFIG_FB_RADEON_I2C=y 1051CONFIG_FB_RADEON_I2C=y
1052CONFIG_FB_RADEON_BACKLIGHT=y
981# CONFIG_FB_RADEON_DEBUG is not set 1053# CONFIG_FB_RADEON_DEBUG is not set
982# CONFIG_FB_ATY128 is not set 1054# CONFIG_FB_ATY128 is not set
983CONFIG_FB_ATY=y 1055CONFIG_FB_ATY=y
984CONFIG_FB_ATY_CT=y 1056CONFIG_FB_ATY_CT=y
985# CONFIG_FB_ATY_GENERIC_LCD is not set 1057# CONFIG_FB_ATY_GENERIC_LCD is not set
986CONFIG_FB_ATY_GX=y 1058CONFIG_FB_ATY_GX=y
1059CONFIG_FB_ATY_BACKLIGHT=y
1060# CONFIG_FB_S3 is not set
987# CONFIG_FB_SAVAGE is not set 1061# CONFIG_FB_SAVAGE is not set
988# CONFIG_FB_SIS is not set 1062# CONFIG_FB_SIS is not set
989# CONFIG_FB_NEOMAGIC is not set 1063# CONFIG_FB_NEOMAGIC is not set
@@ -991,7 +1065,10 @@ CONFIG_FB_ATY_GX=y
991CONFIG_FB_3DFX=y 1065CONFIG_FB_3DFX=y
992# CONFIG_FB_3DFX_ACCEL is not set 1066# CONFIG_FB_3DFX_ACCEL is not set
993# CONFIG_FB_VOODOO1 is not set 1067# CONFIG_FB_VOODOO1 is not set
1068# CONFIG_FB_VT8623 is not set
994# CONFIG_FB_TRIDENT is not set 1069# CONFIG_FB_TRIDENT is not set
1070# CONFIG_FB_ARK is not set
1071# CONFIG_FB_PM3 is not set
995# CONFIG_FB_IBM_GXT4500 is not set 1072# CONFIG_FB_IBM_GXT4500 is not set
996# CONFIG_FB_VIRTUAL is not set 1073# CONFIG_FB_VIRTUAL is not set
997 1074
@@ -1007,15 +1084,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
1007# CONFIG_FONTS is not set 1084# CONFIG_FONTS is not set
1008CONFIG_FONT_8x8=y 1085CONFIG_FONT_8x8=y
1009CONFIG_FONT_8x16=y 1086CONFIG_FONT_8x16=y
1010
1011#
1012# Logo configuration
1013#
1014CONFIG_LOGO=y 1087CONFIG_LOGO=y
1015CONFIG_LOGO_LINUX_MONO=y 1088CONFIG_LOGO_LINUX_MONO=y
1016CONFIG_LOGO_LINUX_VGA16=y 1089CONFIG_LOGO_LINUX_VGA16=y
1017CONFIG_LOGO_LINUX_CLUT224=y 1090CONFIG_LOGO_LINUX_CLUT224=y
1018# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1019 1091
1020# 1092#
1021# Sound 1093# Sound
@@ -1026,6 +1098,15 @@ CONFIG_LOGO_LINUX_CLUT224=y
1026# HID Devices 1098# HID Devices
1027# 1099#
1028CONFIG_HID=y 1100CONFIG_HID=y
1101# CONFIG_HID_DEBUG is not set
1102
1103#
1104# USB Input Devices
1105#
1106CONFIG_USB_HID=y
1107# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1108# CONFIG_HID_FF is not set
1109# CONFIG_USB_HIDDEV is not set
1029 1110
1030# 1111#
1031# USB support 1112# USB support
@@ -1040,9 +1121,8 @@ CONFIG_USB=y
1040# Miscellaneous USB options 1121# Miscellaneous USB options
1041# 1122#
1042CONFIG_USB_DEVICEFS=y 1123CONFIG_USB_DEVICEFS=y
1043# CONFIG_USB_BANDWIDTH is not set 1124CONFIG_USB_DEVICE_CLASS=y
1044# CONFIG_USB_DYNAMIC_MINORS is not set 1125# CONFIG_USB_DYNAMIC_MINORS is not set
1045# CONFIG_USB_MULTITHREAD_PROBE is not set
1046# CONFIG_USB_OTG is not set 1126# CONFIG_USB_OTG is not set
1047 1127
1048# 1128#
@@ -1052,9 +1132,12 @@ CONFIG_USB_EHCI_HCD=m
1052# CONFIG_USB_EHCI_SPLIT_ISO is not set 1132# CONFIG_USB_EHCI_SPLIT_ISO is not set
1053# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1133# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1054# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1134# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1135# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1055# CONFIG_USB_ISP116X_HCD is not set 1136# CONFIG_USB_ISP116X_HCD is not set
1056CONFIG_USB_OHCI_HCD=y 1137CONFIG_USB_OHCI_HCD=y
1057# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1138# CONFIG_USB_OHCI_HCD_PPC_OF is not set
1139# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1140# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1058CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1141CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1059CONFIG_USB_UHCI_HCD=y 1142CONFIG_USB_UHCI_HCD=y
1060# CONFIG_USB_SL811_HCD is not set 1143# CONFIG_USB_SL811_HCD is not set
@@ -1088,40 +1171,10 @@ CONFIG_USB_STORAGE=m
1088# CONFIG_USB_LIBUSUAL is not set 1171# CONFIG_USB_LIBUSUAL is not set
1089 1172
1090# 1173#
1091# USB Input Devices
1092#
1093CONFIG_USB_HID=y
1094# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1095# CONFIG_HID_FF is not set
1096# CONFIG_USB_HIDDEV is not set
1097# CONFIG_USB_AIPTEK is not set
1098# CONFIG_USB_WACOM is not set
1099# CONFIG_USB_ACECAD is not set
1100# CONFIG_USB_KBTAB is not set
1101# CONFIG_USB_POWERMATE is not set
1102# CONFIG_USB_TOUCHSCREEN is not set
1103# CONFIG_USB_YEALINK is not set
1104# CONFIG_USB_XPAD is not set
1105# CONFIG_USB_ATI_REMOTE is not set
1106# CONFIG_USB_ATI_REMOTE2 is not set
1107# CONFIG_USB_KEYSPAN_REMOTE is not set
1108# CONFIG_USB_APPLETOUCH is not set
1109
1110#
1111# USB Imaging devices 1174# USB Imaging devices
1112# 1175#
1113# CONFIG_USB_MDC800 is not set 1176# CONFIG_USB_MDC800 is not set
1114# CONFIG_USB_MICROTEK is not set 1177# CONFIG_USB_MICROTEK is not set
1115
1116#
1117# USB Network Adapters
1118#
1119# CONFIG_USB_CATC is not set
1120# CONFIG_USB_KAWETH is not set
1121# CONFIG_USB_PEGASUS is not set
1122# CONFIG_USB_RTL8150 is not set
1123# CONFIG_USB_USBNET_MII is not set
1124# CONFIG_USB_USBNET is not set
1125CONFIG_USB_MON=y 1178CONFIG_USB_MON=y
1126 1179
1127# 1180#
@@ -1143,6 +1196,7 @@ CONFIG_USB_MON=y
1143# CONFIG_USB_RIO500 is not set 1196# CONFIG_USB_RIO500 is not set
1144# CONFIG_USB_LEGOTOWER is not set 1197# CONFIG_USB_LEGOTOWER is not set
1145# CONFIG_USB_LCD is not set 1198# CONFIG_USB_LCD is not set
1199# CONFIG_USB_BERRY_CHARGE is not set
1146# CONFIG_USB_LED is not set 1200# CONFIG_USB_LED is not set
1147# CONFIG_USB_CYPRESS_CY7C63 is not set 1201# CONFIG_USB_CYPRESS_CY7C63 is not set
1148# CONFIG_USB_CYTHERM is not set 1202# CONFIG_USB_CYTHERM is not set
@@ -1153,6 +1207,7 @@ CONFIG_USB_MON=y
1153# CONFIG_USB_SISUSBVGA is not set 1207# CONFIG_USB_SISUSBVGA is not set
1154# CONFIG_USB_LD is not set 1208# CONFIG_USB_LD is not set
1155# CONFIG_USB_TRANCEVIBRATOR is not set 1209# CONFIG_USB_TRANCEVIBRATOR is not set
1210# CONFIG_USB_IOWARRIOR is not set
1156# CONFIG_USB_TEST is not set 1211# CONFIG_USB_TEST is not set
1157 1212
1158# 1213#
@@ -1163,10 +1218,6 @@ CONFIG_USB_MON=y
1163# USB Gadget Support 1218# USB Gadget Support
1164# 1219#
1165# CONFIG_USB_GADGET is not set 1220# CONFIG_USB_GADGET is not set
1166
1167#
1168# MMC/SD Card support
1169#
1170# CONFIG_MMC is not set 1221# CONFIG_MMC is not set
1171 1222
1172# 1223#
@@ -1210,10 +1261,6 @@ CONFIG_USB_MON=y
1210# 1261#
1211 1262
1212# 1263#
1213# Virtualization
1214#
1215
1216#
1217# File systems 1264# File systems
1218# 1265#
1219CONFIG_EXT2_FS=y 1266CONFIG_EXT2_FS=y
@@ -1323,6 +1370,7 @@ CONFIG_MSDOS_PARTITION=y
1323# CONFIG_SUN_PARTITION is not set 1370# CONFIG_SUN_PARTITION is not set
1324# CONFIG_KARMA_PARTITION is not set 1371# CONFIG_KARMA_PARTITION is not set
1325# CONFIG_EFI_PARTITION is not set 1372# CONFIG_EFI_PARTITION is not set
1373# CONFIG_SYSV68_PARTITION is not set
1326 1374
1327# 1375#
1328# Native Language Support 1376# Native Language Support
@@ -1372,6 +1420,7 @@ CONFIG_NLS_ISO8859_1=m
1372# Distributed Lock Manager 1420# Distributed Lock Manager
1373# 1421#
1374# CONFIG_DLM is not set 1422# CONFIG_DLM is not set
1423# CONFIG_UCC_SLOW is not set
1375 1424
1376# 1425#
1377# Library routines 1426# Library routines
@@ -1379,17 +1428,21 @@ CONFIG_NLS_ISO8859_1=m
1379CONFIG_BITREVERSE=y 1428CONFIG_BITREVERSE=y
1380CONFIG_CRC_CCITT=m 1429CONFIG_CRC_CCITT=m
1381# CONFIG_CRC16 is not set 1430# CONFIG_CRC16 is not set
1431# CONFIG_CRC_ITU_T is not set
1382CONFIG_CRC32=y 1432CONFIG_CRC32=y
1383# CONFIG_LIBCRC32C is not set 1433# CONFIG_LIBCRC32C is not set
1384CONFIG_ZLIB_INFLATE=m 1434CONFIG_ZLIB_INFLATE=m
1385CONFIG_ZLIB_DEFLATE=m 1435CONFIG_ZLIB_DEFLATE=m
1386CONFIG_PLIST=y 1436CONFIG_PLIST=y
1387CONFIG_IOMAP_COPY=y 1437CONFIG_HAS_IOMEM=y
1438CONFIG_HAS_IOPORT=y
1439CONFIG_HAS_DMA=y
1388 1440
1389# 1441#
1390# Instrumentation Support 1442# Instrumentation Support
1391# 1443#
1392# CONFIG_PROFILING is not set 1444# CONFIG_PROFILING is not set
1445# CONFIG_KPROBES is not set
1393 1446
1394# 1447#
1395# Kernel hacking 1448# Kernel hacking
@@ -1401,15 +1454,15 @@ CONFIG_MAGIC_SYSRQ=y
1401# CONFIG_DEBUG_FS is not set 1454# CONFIG_DEBUG_FS is not set
1402# CONFIG_HEADERS_CHECK is not set 1455# CONFIG_HEADERS_CHECK is not set
1403CONFIG_DEBUG_KERNEL=y 1456CONFIG_DEBUG_KERNEL=y
1404CONFIG_LOG_BUF_SHIFT=15 1457# CONFIG_DEBUG_SHIRQ is not set
1405CONFIG_DETECT_SOFTLOCKUP=y 1458CONFIG_DETECT_SOFTLOCKUP=y
1406# CONFIG_SCHEDSTATS is not set 1459# CONFIG_SCHEDSTATS is not set
1460# CONFIG_TIMER_STATS is not set
1407# CONFIG_DEBUG_SLAB is not set 1461# CONFIG_DEBUG_SLAB is not set
1408# CONFIG_DEBUG_RT_MUTEXES is not set 1462# CONFIG_DEBUG_RT_MUTEXES is not set
1409# CONFIG_RT_MUTEX_TESTER is not set 1463# CONFIG_RT_MUTEX_TESTER is not set
1410# CONFIG_DEBUG_SPINLOCK is not set 1464# CONFIG_DEBUG_SPINLOCK is not set
1411CONFIG_DEBUG_MUTEXES=y 1465CONFIG_DEBUG_MUTEXES=y
1412# CONFIG_DEBUG_RWSEMS is not set
1413CONFIG_DEBUG_SPINLOCK_SLEEP=y 1466CONFIG_DEBUG_SPINLOCK_SLEEP=y
1414# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1467# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1415# CONFIG_DEBUG_KOBJECT is not set 1468# CONFIG_DEBUG_KOBJECT is not set
@@ -1420,6 +1473,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1420# CONFIG_DEBUG_LIST is not set 1473# CONFIG_DEBUG_LIST is not set
1421CONFIG_FORCED_INLINING=y 1474CONFIG_FORCED_INLINING=y
1422# CONFIG_RCU_TORTURE_TEST is not set 1475# CONFIG_RCU_TORTURE_TEST is not set
1476# CONFIG_FAULT_INJECTION is not set
1477# CONFIG_DEBUG_STACKOVERFLOW is not set
1478# CONFIG_DEBUG_STACK_USAGE is not set
1479# CONFIG_DEBUG_PAGEALLOC is not set
1423CONFIG_DEBUGGER=y 1480CONFIG_DEBUGGER=y
1424CONFIG_XMON=y 1481CONFIG_XMON=y
1425CONFIG_XMON_DEFAULT=y 1482CONFIG_XMON_DEFAULT=y
@@ -1454,8 +1511,11 @@ CONFIG_CRYPTO_SHA1=m
1454# CONFIG_CRYPTO_GF128MUL is not set 1511# CONFIG_CRYPTO_GF128MUL is not set
1455CONFIG_CRYPTO_ECB=m 1512CONFIG_CRYPTO_ECB=m
1456CONFIG_CRYPTO_CBC=m 1513CONFIG_CRYPTO_CBC=m
1514CONFIG_CRYPTO_PCBC=m
1457# CONFIG_CRYPTO_LRW is not set 1515# CONFIG_CRYPTO_LRW is not set
1516# CONFIG_CRYPTO_CRYPTD is not set
1458# CONFIG_CRYPTO_DES is not set 1517# CONFIG_CRYPTO_DES is not set
1518# CONFIG_CRYPTO_FCRYPT is not set
1459# CONFIG_CRYPTO_BLOWFISH is not set 1519# CONFIG_CRYPTO_BLOWFISH is not set
1460# CONFIG_CRYPTO_TWOFISH is not set 1520# CONFIG_CRYPTO_TWOFISH is not set
1461# CONFIG_CRYPTO_SERPENT is not set 1521# CONFIG_CRYPTO_SERPENT is not set
@@ -1469,6 +1529,7 @@ CONFIG_CRYPTO_ARC4=m
1469# CONFIG_CRYPTO_DEFLATE is not set 1529# CONFIG_CRYPTO_DEFLATE is not set
1470# CONFIG_CRYPTO_MICHAEL_MIC is not set 1530# CONFIG_CRYPTO_MICHAEL_MIC is not set
1471# CONFIG_CRYPTO_CRC32C is not set 1531# CONFIG_CRYPTO_CRC32C is not set
1532# CONFIG_CRYPTO_CAMELLIA is not set
1472# CONFIG_CRYPTO_TEST is not set 1533# CONFIG_CRYPTO_TEST is not set
1473 1534
1474# 1535#
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index c3b96ef3c2d1..5762cddfc148 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.22-rc6
4# Fri May 4 13:47:08 2007 4# Tue Jun 26 12:38:33 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_4xx=y
45CONFIG_BOOKE=y 45CONFIG_BOOKE=y
46CONFIG_PTE_64BIT=y 46CONFIG_PTE_64BIT=y
47CONFIG_PHYS_64BIT=y 47CONFIG_PHYS_64BIT=y
48# CONFIG_PPC_MM_SLICES is not set
48CONFIG_NOT_COHERENT_CACHE=y 49CONFIG_NOT_COHERENT_CACHE=y
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -70,6 +71,7 @@ CONFIG_POSIX_MQUEUE=y
70# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 77CONFIG_BLK_DEV_INITRD=y
@@ -87,14 +89,19 @@ CONFIG_BUG=y
87CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
88CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 97CONFIG_SHMEM=y
92CONFIG_SLAB=y
93CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
94CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
95# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
96CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
97# CONFIG_SLOB is not set
98 105
99# 106#
100# Loadable module support 107# Loadable module support
@@ -193,16 +200,14 @@ CONFIG_PPC_INDIRECT_PCI=y
193CONFIG_PCI=y 200CONFIG_PCI=y
194CONFIG_PCI_DOMAINS=y 201CONFIG_PCI_DOMAINS=y
195# CONFIG_PCIEPORTBUS is not set 202# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set
196# CONFIG_PCI_DEBUG is not set 205# CONFIG_PCI_DEBUG is not set
197 206
198# 207#
199# PCCARD (PCMCIA/CardBus) support 208# PCCARD (PCMCIA/CardBus) support
200# 209#
201# CONFIG_PCCARD is not set 210# CONFIG_PCCARD is not set
202
203#
204# PCI Hotplug Support
205#
206# CONFIG_HOTPLUG_PCI is not set 211# CONFIG_HOTPLUG_PCI is not set
207 212
208# 213#
@@ -264,20 +269,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
264# CONFIG_INET6_TUNNEL is not set 269# CONFIG_INET6_TUNNEL is not set
265# CONFIG_NETWORK_SECMARK is not set 270# CONFIG_NETWORK_SECMARK is not set
266# CONFIG_NETFILTER is not set 271# CONFIG_NETFILTER is not set
267
268#
269# DCCP Configuration (EXPERIMENTAL)
270#
271# CONFIG_IP_DCCP is not set 272# CONFIG_IP_DCCP is not set
272
273#
274# SCTP Configuration (EXPERIMENTAL)
275#
276# CONFIG_IP_SCTP is not set 273# CONFIG_IP_SCTP is not set
277
278#
279# TIPC Configuration (EXPERIMENTAL)
280#
281# CONFIG_TIPC is not set 274# CONFIG_TIPC is not set
282# CONFIG_ATM is not set 275# CONFIG_ATM is not set
283# CONFIG_BRIDGE is not set 276# CONFIG_BRIDGE is not set
@@ -310,7 +303,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
310# 303#
311# CONFIG_CFG80211 is not set 304# CONFIG_CFG80211 is not set
312# CONFIG_WIRELESS_EXT is not set 305# CONFIG_WIRELESS_EXT is not set
306# CONFIG_MAC80211 is not set
313# CONFIG_IEEE80211 is not set 307# CONFIG_IEEE80211 is not set
308# CONFIG_RFKILL is not set
314 309
315# 310#
316# Device Drivers 311# Device Drivers
@@ -365,12 +360,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
365# 360#
366# Misc devices 361# Misc devices
367# 362#
363# CONFIG_PHANTOM is not set
368# CONFIG_SGI_IOC4 is not set 364# CONFIG_SGI_IOC4 is not set
369# CONFIG_TIFM_CORE is not set 365# CONFIG_TIFM_CORE is not set
370 366# CONFIG_BLINK is not set
371#
372# ATA/ATAPI/MFM/RLL support
373#
374# CONFIG_IDE is not set 367# CONFIG_IDE is not set
375 368
376# 369#
@@ -379,10 +372,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
379# CONFIG_RAID_ATTRS is not set 372# CONFIG_RAID_ATTRS is not set
380# CONFIG_SCSI is not set 373# CONFIG_SCSI is not set
381# CONFIG_SCSI_NETLINK is not set 374# CONFIG_SCSI_NETLINK is not set
382
383#
384# Serial ATA (prod) and Parallel ATA (experimental) drivers
385#
386# CONFIG_ATA is not set 375# CONFIG_ATA is not set
387 376
388# 377#
@@ -398,6 +387,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
398# 387#
399# IEEE 1394 (FireWire) support 388# IEEE 1394 (FireWire) support
400# 389#
390# CONFIG_FIREWIRE is not set
401# CONFIG_IEEE1394 is not set 391# CONFIG_IEEE1394 is not set
402 392
403# 393#
@@ -414,35 +404,21 @@ CONFIG_NETDEVICES=y
414# CONFIG_BONDING is not set 404# CONFIG_BONDING is not set
415# CONFIG_EQUALIZER is not set 405# CONFIG_EQUALIZER is not set
416# CONFIG_TUN is not set 406# CONFIG_TUN is not set
417
418#
419# ARCnet devices
420#
421# CONFIG_ARCNET is not set 407# CONFIG_ARCNET is not set
422 408
423# 409#
424# PHY device support
425#
426
427#
428# Ethernet (10 or 100Mbit) 410# Ethernet (10 or 100Mbit)
429# 411#
430# CONFIG_NET_ETHERNET is not set 412# CONFIG_NET_ETHERNET is not set
431CONFIG_IBM_NEW_EMAC=y 413CONFIG_IBM_EMAC=y
432CONFIG_IBM_NEW_EMAC_RXB=128 414CONFIG_IBM_EMAC_RXB=128
433CONFIG_IBM_NEW_EMAC_TXB=64 415CONFIG_IBM_EMAC_TXB=64
434CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 416CONFIG_IBM_EMAC_POLL_WEIGHT=32
435CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 417CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
436CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 418CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
437# CONFIG_IBM_NEW_EMAC_DEBUG is not set 419# CONFIG_IBM_EMAC_DEBUG is not set
438CONFIG_IBM_NEW_EMAC_ZMII=y 420CONFIG_IBM_EMAC_ZMII=y
439# CONFIG_IBM_NEW_EMAC_RGMII is not set 421CONFIG_NETDEV_1000=y
440# CONFIG_IBM_NEW_EMAC_TAH is not set
441# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
442
443#
444# Ethernet (1000 Mbit)
445#
446# CONFIG_ACENIC is not set 422# CONFIG_ACENIC is not set
447# CONFIG_DL2K is not set 423# CONFIG_DL2K is not set
448# CONFIG_E1000 is not set 424# CONFIG_E1000 is not set
@@ -454,24 +430,19 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
454# CONFIG_SKGE is not set 430# CONFIG_SKGE is not set
455# CONFIG_SKY2 is not set 431# CONFIG_SKY2 is not set
456# CONFIG_SK98LIN is not set 432# CONFIG_SK98LIN is not set
433# CONFIG_VIA_VELOCITY is not set
457# CONFIG_TIGON3 is not set 434# CONFIG_TIGON3 is not set
458# CONFIG_BNX2 is not set 435# CONFIG_BNX2 is not set
459# CONFIG_QLA3XXX is not set 436# CONFIG_QLA3XXX is not set
460# CONFIG_ATL1 is not set 437# CONFIG_ATL1 is not set
461 438CONFIG_NETDEV_10000=y
462#
463# Ethernet (10000 Mbit)
464#
465# CONFIG_CHELSIO_T1 is not set 439# CONFIG_CHELSIO_T1 is not set
466# CONFIG_CHELSIO_T3 is not set 440# CONFIG_CHELSIO_T3 is not set
467# CONFIG_IXGB is not set 441# CONFIG_IXGB is not set
468# CONFIG_S2IO is not set 442# CONFIG_S2IO is not set
469# CONFIG_MYRI10GE is not set 443# CONFIG_MYRI10GE is not set
470# CONFIG_NETXEN_NIC is not set 444# CONFIG_NETXEN_NIC is not set
471 445# CONFIG_MLX4_CORE is not set
472#
473# Token Ring devices
474#
475# CONFIG_TR is not set 446# CONFIG_TR is not set
476 447
477# 448#
@@ -479,10 +450,6 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
479# 450#
480# CONFIG_WLAN_PRE80211 is not set 451# CONFIG_WLAN_PRE80211 is not set
481# CONFIG_WLAN_80211 is not set 452# CONFIG_WLAN_80211 is not set
482
483#
484# Wan interfaces
485#
486# CONFIG_WAN is not set 453# CONFIG_WAN is not set
487# CONFIG_FDDI is not set 454# CONFIG_FDDI is not set
488# CONFIG_HIPPI is not set 455# CONFIG_HIPPI is not set
@@ -550,15 +517,10 @@ CONFIG_LEGACY_PTY_COUNT=256
550# IPMI 517# IPMI
551# 518#
552# CONFIG_IPMI_HANDLER is not set 519# CONFIG_IPMI_HANDLER is not set
553
554#
555# Watchdog Cards
556#
557# CONFIG_WATCHDOG is not set 520# CONFIG_WATCHDOG is not set
558# CONFIG_HW_RANDOM is not set 521# CONFIG_HW_RANDOM is not set
559# CONFIG_NVRAM is not set 522# CONFIG_NVRAM is not set
560# CONFIG_GEN_RTC is not set 523# CONFIG_GEN_RTC is not set
561# CONFIG_DTLK is not set
562# CONFIG_R3964 is not set 524# CONFIG_R3964 is not set
563# CONFIG_APPLICOM is not set 525# CONFIG_APPLICOM is not set
564# CONFIG_AGP is not set 526# CONFIG_AGP is not set
@@ -569,10 +531,7 @@ CONFIG_LEGACY_PTY_COUNT=256
569# TPM devices 531# TPM devices
570# 532#
571# CONFIG_TCG_TPM is not set 533# CONFIG_TCG_TPM is not set
572 534CONFIG_DEVPORT=y
573#
574# I2C support
575#
576# CONFIG_I2C is not set 535# CONFIG_I2C is not set
577 536
578# 537#
@@ -585,12 +544,7 @@ CONFIG_LEGACY_PTY_COUNT=256
585# Dallas's 1-wire bus 544# Dallas's 1-wire bus
586# 545#
587# CONFIG_W1 is not set 546# CONFIG_W1 is not set
588
589#
590# Hardware Monitoring support
591#
592# CONFIG_HWMON is not set 547# CONFIG_HWMON is not set
593# CONFIG_HWMON_VID is not set
594 548
595# 549#
596# Multifunction device drivers 550# Multifunction device drivers
@@ -601,16 +555,19 @@ CONFIG_LEGACY_PTY_COUNT=256
601# Multimedia devices 555# Multimedia devices
602# 556#
603# CONFIG_VIDEO_DEV is not set 557# CONFIG_VIDEO_DEV is not set
558# CONFIG_DVB_CORE is not set
559# CONFIG_DAB is not set
604 560
605# 561#
606# Digital Video Broadcasting Devices 562# Graphics support
607# 563#
608# CONFIG_DVB is not set 564# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
609 565
610# 566#
611# Graphics support 567# Display device support
612# 568#
613# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 569# CONFIG_DISPLAY_SUPPORT is not set
570# CONFIG_VGASTATE is not set
614# CONFIG_FB is not set 571# CONFIG_FB is not set
615# CONFIG_FB_IBM_GXT4500 is not set 572# CONFIG_FB_IBM_GXT4500 is not set
616 573
@@ -635,10 +592,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
635# USB Gadget Support 592# USB Gadget Support
636# 593#
637# CONFIG_USB_GADGET is not set 594# CONFIG_USB_GADGET is not set
638
639#
640# MMC/SD Card support
641#
642# CONFIG_MMC is not set 595# CONFIG_MMC is not set
643 596
644# 597#
@@ -682,14 +635,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
682# 635#
683 636
684# 637#
685# Auxiliary Display support
686#
687
688#
689# Virtualization
690#
691
692#
693# File systems 638# File systems
694# 639#
695CONFIG_EXT2_FS=y 640CONFIG_EXT2_FS=y
@@ -770,6 +715,7 @@ CONFIG_LOCKD=y
770CONFIG_LOCKD_V4=y 715CONFIG_LOCKD_V4=y
771CONFIG_NFS_COMMON=y 716CONFIG_NFS_COMMON=y
772CONFIG_SUNRPC=y 717CONFIG_SUNRPC=y
718# CONFIG_SUNRPC_BIND34 is not set
773# CONFIG_RPCSEC_GSS_KRB5 is not set 719# CONFIG_RPCSEC_GSS_KRB5 is not set
774# CONFIG_RPCSEC_GSS_SPKM3 is not set 720# CONFIG_RPCSEC_GSS_SPKM3 is not set
775# CONFIG_SMB_FS is not set 721# CONFIG_SMB_FS is not set
@@ -795,7 +741,6 @@ CONFIG_MSDOS_PARTITION=y
795# 741#
796# CONFIG_DLM is not set 742# CONFIG_DLM is not set
797# CONFIG_UCC_SLOW is not set 743# CONFIG_UCC_SLOW is not set
798# CONFIG_UCC_FAST is not set
799 744
800# 745#
801# Library routines 746# Library routines
@@ -803,12 +748,14 @@ CONFIG_MSDOS_PARTITION=y
803CONFIG_BITREVERSE=y 748CONFIG_BITREVERSE=y
804# CONFIG_CRC_CCITT is not set 749# CONFIG_CRC_CCITT is not set
805# CONFIG_CRC16 is not set 750# CONFIG_CRC16 is not set
751# CONFIG_CRC_ITU_T is not set
806CONFIG_CRC32=y 752CONFIG_CRC32=y
807# CONFIG_LIBCRC32C is not set 753# CONFIG_LIBCRC32C is not set
808CONFIG_ZLIB_INFLATE=y 754CONFIG_ZLIB_INFLATE=y
809CONFIG_PLIST=y 755CONFIG_PLIST=y
810CONFIG_HAS_IOMEM=y 756CONFIG_HAS_IOMEM=y
811CONFIG_HAS_IOPORT=y 757CONFIG_HAS_IOPORT=y
758CONFIG_HAS_DMA=y
812 759
813# 760#
814# Instrumentation Support 761# Instrumentation Support
@@ -826,7 +773,6 @@ CONFIG_MAGIC_SYSRQ=y
826# CONFIG_HEADERS_CHECK is not set 773# CONFIG_HEADERS_CHECK is not set
827CONFIG_DEBUG_KERNEL=y 774CONFIG_DEBUG_KERNEL=y
828# CONFIG_DEBUG_SHIRQ is not set 775# CONFIG_DEBUG_SHIRQ is not set
829CONFIG_LOG_BUF_SHIFT=14
830CONFIG_DETECT_SOFTLOCKUP=y 776CONFIG_DETECT_SOFTLOCKUP=y
831# CONFIG_SCHEDSTATS is not set 777# CONFIG_SCHEDSTATS is not set
832# CONFIG_TIMER_STATS is not set 778# CONFIG_TIMER_STATS is not set
@@ -851,7 +797,6 @@ CONFIG_FORCED_INLINING=y
851# CONFIG_DEBUGGER is not set 797# CONFIG_DEBUGGER is not set
852# CONFIG_BDI_SWITCH is not set 798# CONFIG_BDI_SWITCH is not set
853# CONFIG_BOOTX_TEXT is not set 799# CONFIG_BOOTX_TEXT is not set
854# CONFIG_SERIAL_TEXT_DEBUG is not set
855# CONFIG_PPC_EARLY_DEBUG is not set 800# CONFIG_PPC_EARLY_DEBUG is not set
856 801
857# 802#
@@ -882,6 +827,7 @@ CONFIG_CRYPTO_ECB=y
882CONFIG_CRYPTO_CBC=y 827CONFIG_CRYPTO_CBC=y
883CONFIG_CRYPTO_PCBC=y 828CONFIG_CRYPTO_PCBC=y
884# CONFIG_CRYPTO_LRW is not set 829# CONFIG_CRYPTO_LRW is not set
830# CONFIG_CRYPTO_CRYPTD is not set
885CONFIG_CRYPTO_DES=y 831CONFIG_CRYPTO_DES=y
886# CONFIG_CRYPTO_FCRYPT is not set 832# CONFIG_CRYPTO_FCRYPT is not set
887# CONFIG_CRYPTO_BLOWFISH is not set 833# CONFIG_CRYPTO_BLOWFISH is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 3ccf19d8da38..a217f4ebcf71 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:15:04 2007 4# Tue Jun 26 12:38:34 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TBSYNC=y
27CONFIG_AUDIT_ARCH=y 27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 28CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
30CONFIG_PPC64_SWSUSP=y
30 31
31# 32#
32# Processor support 33# Processor support
@@ -39,6 +40,7 @@ CONFIG_PPC_FPU=y
39# CONFIG_PPC_OF_PLATFORM_PCI is not set 40# CONFIG_PPC_OF_PLATFORM_PCI is not set
40CONFIG_ALTIVEC=y 41CONFIG_ALTIVEC=y
41CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_MM_SLICES=y
42CONFIG_VIRT_CPU_ACCOUNTING=y 44CONFIG_VIRT_CPU_ACCOUNTING=y
43CONFIG_SMP=y 45CONFIG_SMP=y
44CONFIG_NR_CPUS=4 46CONFIG_NR_CPUS=4
@@ -59,6 +61,7 @@ CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 61CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 62CONFIG_SYSVIPC=y
61# CONFIG_IPC_NS is not set 63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y
62CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
@@ -66,9 +69,11 @@ CONFIG_POSIX_MQUEUE=y
66# CONFIG_AUDIT is not set 69# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 70CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 71CONFIG_IKCONFIG_PROC=y
72CONFIG_LOG_BUF_SHIFT=17
69# CONFIG_CPUSETS is not set 73# CONFIG_CPUSETS is not set
70CONFIG_SYSFS_DEPRECATED=y 74CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 75# CONFIG_RELAY is not set
76CONFIG_BLK_DEV_INITRD=y
72CONFIG_INITRAMFS_SOURCE="" 77CONFIG_INITRAMFS_SOURCE=""
73CONFIG_CC_OPTIMIZE_FOR_SIZE=y 78CONFIG_CC_OPTIMIZE_FOR_SIZE=y
74CONFIG_SYSCTL=y 79CONFIG_SYSCTL=y
@@ -83,14 +88,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 88CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 89CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 90CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y
86CONFIG_EPOLL=y 92CONFIG_EPOLL=y
93CONFIG_SIGNALFD=y
94CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 96CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
98CONFIG_SLAB=y
99# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 101CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 102# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 103CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 104
95# 105#
96# Loadable module support 106# Loadable module support
@@ -131,15 +141,21 @@ CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_PPC_PSERIES is not set 141# CONFIG_PPC_PSERIES is not set
132# CONFIG_PPC_ISERIES is not set 142# CONFIG_PPC_ISERIES is not set
133# CONFIG_PPC_MPC52xx is not set 143# CONFIG_PPC_MPC52xx is not set
144# CONFIG_PPC_MPC5200 is not set
134CONFIG_PPC_PMAC=y 145CONFIG_PPC_PMAC=y
135CONFIG_PPC_PMAC64=y 146CONFIG_PPC_PMAC64=y
136# CONFIG_PPC_MAPLE is not set 147# CONFIG_PPC_MAPLE is not set
137# CONFIG_PPC_PASEMI is not set 148# CONFIG_PPC_PASEMI is not set
149# CONFIG_PPC_CELLEB is not set
150# CONFIG_PPC_PS3 is not set
138# CONFIG_PPC_CELL is not set 151# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 152# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PPC_IBM_CELL_BLADE is not set 153# CONFIG_PPC_IBM_CELL_BLADE is not set
141# CONFIG_PPC_PS3 is not set 154# CONFIG_PQ2ADS is not set
142CONFIG_PPC_NATIVE=y 155CONFIG_PPC_NATIVE=y
156CONFIG_MPIC=y
157# CONFIG_MPIC_WEIRD is not set
158# CONFIG_PPC_I8259 is not set
143CONFIG_U3_DART=y 159CONFIG_U3_DART=y
144# CONFIG_PPC_RTAS is not set 160# CONFIG_PPC_RTAS is not set
145# CONFIG_MMIO_NVRAM is not set 161# CONFIG_MMIO_NVRAM is not set
@@ -160,9 +176,12 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
160CONFIG_CPU_FREQ_GOV_USERSPACE=y 176CONFIG_CPU_FREQ_GOV_USERSPACE=y
161# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set 177# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
162# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 178# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
179
180#
181# CPU Frequency drivers
182#
163CONFIG_CPU_FREQ_PMAC64=y 183CONFIG_CPU_FREQ_PMAC64=y
164# CONFIG_WANT_EARLY_SERIAL is not set 184# CONFIG_CPM2 is not set
165CONFIG_MPIC=y
166 185
167# 186#
168# Kernel options 187# Kernel options
@@ -199,34 +218,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
199# CONFIG_SPARSEMEM_STATIC is not set 218# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4 219CONFIG_SPLIT_PTLOCK_CPUS=4
201CONFIG_RESOURCES_64BIT=y 220CONFIG_RESOURCES_64BIT=y
221CONFIG_ZONE_DMA_FLAG=1
222# CONFIG_PPC_HAS_HASH_64K is not set
202# CONFIG_PPC_64K_PAGES is not set 223# CONFIG_PPC_64K_PAGES is not set
203# CONFIG_SCHED_SMT is not set 224# CONFIG_SCHED_SMT is not set
204CONFIG_PROC_DEVICETREE=y 225CONFIG_PROC_DEVICETREE=y
205# CONFIG_CMDLINE_BOOL is not set 226# CONFIG_CMDLINE_BOOL is not set
206# CONFIG_PM is not set 227# CONFIG_PM is not set
207CONFIG_SECCOMP=y 228CONFIG_SECCOMP=y
229# CONFIG_WANT_DEVICE_TREE is not set
208CONFIG_ISA_DMA_API=y 230CONFIG_ISA_DMA_API=y
209 231
210# 232#
211# Bus options 233# Bus options
212# 234#
235CONFIG_ZONE_DMA=y
213CONFIG_GENERIC_ISA_DMA=y 236CONFIG_GENERIC_ISA_DMA=y
214# CONFIG_MPIC_WEIRD is not set
215# CONFIG_PPC_I8259 is not set
216# CONFIG_PPC_INDIRECT_PCI is not set 237# CONFIG_PPC_INDIRECT_PCI is not set
217CONFIG_PCI=y 238CONFIG_PCI=y
218CONFIG_PCI_DOMAINS=y 239CONFIG_PCI_DOMAINS=y
219# CONFIG_PCIEPORTBUS is not set 240# CONFIG_PCIEPORTBUS is not set
241CONFIG_ARCH_SUPPORTS_MSI=y
242CONFIG_PCI_MSI=y
220# CONFIG_PCI_DEBUG is not set 243# CONFIG_PCI_DEBUG is not set
221 244
222# 245#
223# PCCARD (PCMCIA/CardBus) support 246# PCCARD (PCMCIA/CardBus) support
224# 247#
225# CONFIG_PCCARD is not set 248# CONFIG_PCCARD is not set
226
227#
228# PCI Hotplug Support
229#
230# CONFIG_HOTPLUG_PCI is not set 249# CONFIG_HOTPLUG_PCI is not set
231CONFIG_KERNEL_START=0xc000000000000000 250CONFIG_KERNEL_START=0xc000000000000000
232 251
@@ -238,14 +257,15 @@ CONFIG_NET=y
238# 257#
239# Networking options 258# Networking options
240# 259#
241# CONFIG_NETDEBUG is not set
242CONFIG_PACKET=y 260CONFIG_PACKET=y
243# CONFIG_PACKET_MMAP is not set 261# CONFIG_PACKET_MMAP is not set
244CONFIG_UNIX=y 262CONFIG_UNIX=y
245CONFIG_XFRM=y 263CONFIG_XFRM=y
246CONFIG_XFRM_USER=m 264CONFIG_XFRM_USER=m
247# CONFIG_XFRM_SUB_POLICY is not set 265# CONFIG_XFRM_SUB_POLICY is not set
266# CONFIG_XFRM_MIGRATE is not set
248CONFIG_NET_KEY=m 267CONFIG_NET_KEY=m
268# CONFIG_NET_KEY_MIGRATE is not set
249CONFIG_INET=y 269CONFIG_INET=y
250CONFIG_IP_MULTICAST=y 270CONFIG_IP_MULTICAST=y
251# CONFIG_IP_ADVANCED_ROUTER is not set 271# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -270,10 +290,6 @@ CONFIG_INET_TCP_DIAG=y
270CONFIG_TCP_CONG_CUBIC=y 290CONFIG_TCP_CONG_CUBIC=y
271CONFIG_DEFAULT_TCP_CONG="cubic" 291CONFIG_DEFAULT_TCP_CONG="cubic"
272# CONFIG_TCP_MD5SIG is not set 292# CONFIG_TCP_MD5SIG is not set
273
274#
275# IP: Virtual Server Configuration
276#
277# CONFIG_IP_VS is not set 293# CONFIG_IP_VS is not set
278# CONFIG_IPV6 is not set 294# CONFIG_IPV6 is not set
279# CONFIG_INET6_XFRM_TUNNEL is not set 295# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -287,8 +303,6 @@ CONFIG_NETFILTER=y
287# 303#
288# CONFIG_NETFILTER_NETLINK is not set 304# CONFIG_NETFILTER_NETLINK is not set
289CONFIG_NF_CONNTRACK_ENABLED=m 305CONFIG_NF_CONNTRACK_ENABLED=m
290CONFIG_NF_CONNTRACK_SUPPORT=y
291# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
292CONFIG_NF_CONNTRACK=m 306CONFIG_NF_CONNTRACK=m
293# CONFIG_NF_CT_ACCT is not set 307# CONFIG_NF_CT_ACCT is not set
294CONFIG_NF_CONNTRACK_MARK=y 308CONFIG_NF_CONNTRACK_MARK=y
@@ -300,6 +314,7 @@ CONFIG_NF_CONNTRACK_FTP=m
300CONFIG_NF_CONNTRACK_IRC=m 314CONFIG_NF_CONNTRACK_IRC=m
301# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set 315# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
302# CONFIG_NF_CONNTRACK_PPTP is not set 316# CONFIG_NF_CONNTRACK_PPTP is not set
317# CONFIG_NF_CONNTRACK_SANE is not set
303# CONFIG_NF_CONNTRACK_SIP is not set 318# CONFIG_NF_CONNTRACK_SIP is not set
304CONFIG_NF_CONNTRACK_TFTP=m 319CONFIG_NF_CONNTRACK_TFTP=m
305# CONFIG_NETFILTER_XTABLES is not set 320# CONFIG_NETFILTER_XTABLES is not set
@@ -310,20 +325,10 @@ CONFIG_NF_CONNTRACK_TFTP=m
310CONFIG_NF_CONNTRACK_IPV4=m 325CONFIG_NF_CONNTRACK_IPV4=m
311CONFIG_NF_CONNTRACK_PROC_COMPAT=y 326CONFIG_NF_CONNTRACK_PROC_COMPAT=y
312CONFIG_IP_NF_QUEUE=m 327CONFIG_IP_NF_QUEUE=m
313 328# CONFIG_IP_NF_IPTABLES is not set
314# 329# CONFIG_IP_NF_ARPTABLES is not set
315# DCCP Configuration (EXPERIMENTAL)
316#
317# CONFIG_IP_DCCP is not set 330# CONFIG_IP_DCCP is not set
318
319#
320# SCTP Configuration (EXPERIMENTAL)
321#
322# CONFIG_IP_SCTP is not set 331# CONFIG_IP_SCTP is not set
323
324#
325# TIPC Configuration (EXPERIMENTAL)
326#
327# CONFIG_TIPC is not set 332# CONFIG_TIPC is not set
328# CONFIG_ATM is not set 333# CONFIG_ATM is not set
329# CONFIG_BRIDGE is not set 334# CONFIG_BRIDGE is not set
@@ -350,7 +355,16 @@ CONFIG_LLC=y
350# CONFIG_HAMRADIO is not set 355# CONFIG_HAMRADIO is not set
351# CONFIG_IRDA is not set 356# CONFIG_IRDA is not set
352# CONFIG_BT is not set 357# CONFIG_BT is not set
358# CONFIG_AF_RXRPC is not set
359
360#
361# Wireless
362#
363# CONFIG_CFG80211 is not set
364# CONFIG_WIRELESS_EXT is not set
365# CONFIG_MAC80211 is not set
353# CONFIG_IEEE80211 is not set 366# CONFIG_IEEE80211 is not set
367# CONFIG_RFKILL is not set
354 368
355# 369#
356# Device Drivers 370# Device Drivers
@@ -363,16 +377,13 @@ CONFIG_STANDALONE=y
363CONFIG_PREVENT_FIRMWARE_BUILD=y 377CONFIG_PREVENT_FIRMWARE_BUILD=y
364CONFIG_FW_LOADER=y 378CONFIG_FW_LOADER=y
365# CONFIG_DEBUG_DRIVER is not set 379# CONFIG_DEBUG_DRIVER is not set
380# CONFIG_DEBUG_DEVRES is not set
366# CONFIG_SYS_HYPERVISOR is not set 381# CONFIG_SYS_HYPERVISOR is not set
367 382
368# 383#
369# Connector - unified userspace <-> kernelspace linker 384# Connector - unified userspace <-> kernelspace linker
370# 385#
371# CONFIG_CONNECTOR is not set 386# CONFIG_CONNECTOR is not set
372
373#
374# Memory Technology Devices (MTD)
375#
376# CONFIG_MTD is not set 387# CONFIG_MTD is not set
377 388
378# 389#
@@ -383,6 +394,7 @@ CONFIG_FW_LOADER=y
383# 394#
384# Plug and Play support 395# Plug and Play support
385# 396#
397# CONFIG_PNPACPI is not set
386 398
387# 399#
388# Block devices 400# Block devices
@@ -402,7 +414,6 @@ CONFIG_BLK_DEV_RAM=y
402CONFIG_BLK_DEV_RAM_COUNT=16 414CONFIG_BLK_DEV_RAM_COUNT=16
403CONFIG_BLK_DEV_RAM_SIZE=65536 415CONFIG_BLK_DEV_RAM_SIZE=65536
404CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 416CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
405CONFIG_BLK_DEV_INITRD=y
406CONFIG_CDROM_PKTCDVD=m 417CONFIG_CDROM_PKTCDVD=m
407CONFIG_CDROM_PKTCDVD_BUFFERS=8 418CONFIG_CDROM_PKTCDVD_BUFFERS=8
408# CONFIG_CDROM_PKTCDVD_WCACHE is not set 419# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -411,12 +422,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
411# 422#
412# Misc devices 423# Misc devices
413# 424#
425# CONFIG_PHANTOM is not set
414# CONFIG_SGI_IOC4 is not set 426# CONFIG_SGI_IOC4 is not set
415# CONFIG_TIFM_CORE is not set 427# CONFIG_TIFM_CORE is not set
416 428# CONFIG_BLINK is not set
417#
418# ATA/ATAPI/MFM/RLL support
419#
420CONFIG_IDE=y 429CONFIG_IDE=y
421CONFIG_BLK_DEV_IDE=y 430CONFIG_BLK_DEV_IDE=y
422 431
@@ -431,6 +440,7 @@ CONFIG_BLK_DEV_IDECD=y
431# CONFIG_BLK_DEV_IDEFLOPPY is not set 440# CONFIG_BLK_DEV_IDEFLOPPY is not set
432# CONFIG_BLK_DEV_IDESCSI is not set 441# CONFIG_BLK_DEV_IDESCSI is not set
433# CONFIG_IDE_TASK_IOCTL is not set 442# CONFIG_IDE_TASK_IOCTL is not set
443CONFIG_IDE_PROC_FS=y
434 444
435# 445#
436# IDE chipset support/bugfixes 446# IDE chipset support/bugfixes
@@ -438,12 +448,12 @@ CONFIG_BLK_DEV_IDECD=y
438CONFIG_IDE_GENERIC=y 448CONFIG_IDE_GENERIC=y
439CONFIG_BLK_DEV_IDEPCI=y 449CONFIG_BLK_DEV_IDEPCI=y
440# CONFIG_IDEPCI_SHARE_IRQ is not set 450# CONFIG_IDEPCI_SHARE_IRQ is not set
451CONFIG_IDEPCI_PCIBUS_ORDER=y
441# CONFIG_BLK_DEV_OFFBOARD is not set 452# CONFIG_BLK_DEV_OFFBOARD is not set
442# CONFIG_BLK_DEV_GENERIC is not set 453# CONFIG_BLK_DEV_GENERIC is not set
443# CONFIG_BLK_DEV_OPTI621 is not set 454# CONFIG_BLK_DEV_OPTI621 is not set
444CONFIG_BLK_DEV_IDEDMA_PCI=y 455CONFIG_BLK_DEV_IDEDMA_PCI=y
445# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 456# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
446CONFIG_IDEDMA_PCI_AUTO=y
447# CONFIG_IDEDMA_ONLYDISK is not set 457# CONFIG_IDEDMA_ONLYDISK is not set
448# CONFIG_BLK_DEV_AEC62XX is not set 458# CONFIG_BLK_DEV_AEC62XX is not set
449# CONFIG_BLK_DEV_ALI15X3 is not set 459# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -458,6 +468,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
458# CONFIG_BLK_DEV_JMICRON is not set 468# CONFIG_BLK_DEV_JMICRON is not set
459# CONFIG_BLK_DEV_SC1200 is not set 469# CONFIG_BLK_DEV_SC1200 is not set
460# CONFIG_BLK_DEV_PIIX is not set 470# CONFIG_BLK_DEV_PIIX is not set
471# CONFIG_BLK_DEV_IT8213 is not set
461# CONFIG_BLK_DEV_IT821X is not set 472# CONFIG_BLK_DEV_IT821X is not set
462# CONFIG_BLK_DEV_NS87415 is not set 473# CONFIG_BLK_DEV_NS87415 is not set
463# CONFIG_BLK_DEV_PDC202XX_OLD is not set 474# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -468,13 +479,13 @@ CONFIG_IDEDMA_PCI_AUTO=y
468# CONFIG_BLK_DEV_SLC90E66 is not set 479# CONFIG_BLK_DEV_SLC90E66 is not set
469# CONFIG_BLK_DEV_TRM290 is not set 480# CONFIG_BLK_DEV_TRM290 is not set
470# CONFIG_BLK_DEV_VIA82CXXX is not set 481# CONFIG_BLK_DEV_VIA82CXXX is not set
482# CONFIG_BLK_DEV_TC86C001 is not set
471CONFIG_BLK_DEV_IDE_PMAC=y 483CONFIG_BLK_DEV_IDE_PMAC=y
472CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 484CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
473CONFIG_BLK_DEV_IDEDMA_PMAC=y 485CONFIG_BLK_DEV_IDEDMA_PMAC=y
474# CONFIG_IDE_ARM is not set 486# CONFIG_IDE_ARM is not set
475CONFIG_BLK_DEV_IDEDMA=y 487CONFIG_BLK_DEV_IDEDMA=y
476# CONFIG_IDEDMA_IVB is not set 488# CONFIG_IDEDMA_IVB is not set
477CONFIG_IDEDMA_AUTO=y
478# CONFIG_BLK_DEV_HD is not set 489# CONFIG_BLK_DEV_HD is not set
479 490
480# 491#
@@ -504,6 +515,7 @@ CONFIG_SCSI_MULTI_LUN=y
504CONFIG_SCSI_CONSTANTS=y 515CONFIG_SCSI_CONSTANTS=y
505# CONFIG_SCSI_LOGGING is not set 516# CONFIG_SCSI_LOGGING is not set
506# CONFIG_SCSI_SCAN_ASYNC is not set 517# CONFIG_SCSI_SCAN_ASYNC is not set
518CONFIG_SCSI_WAIT_SCAN=m
507 519
508# 520#
509# SCSI Transports 521# SCSI Transports
@@ -550,11 +562,8 @@ CONFIG_SCSI_SPI_ATTRS=y
550# CONFIG_SCSI_DC390T is not set 562# CONFIG_SCSI_DC390T is not set
551# CONFIG_SCSI_DEBUG is not set 563# CONFIG_SCSI_DEBUG is not set
552# CONFIG_SCSI_SRP is not set 564# CONFIG_SCSI_SRP is not set
553
554#
555# Serial ATA (prod) and Parallel ATA (experimental) drivers
556#
557CONFIG_ATA=y 565CONFIG_ATA=y
566# CONFIG_ATA_NONSTANDARD is not set
558# CONFIG_SATA_AHCI is not set 567# CONFIG_SATA_AHCI is not set
559CONFIG_SATA_SVW=y 568CONFIG_SATA_SVW=y
560# CONFIG_ATA_PIIX is not set 569# CONFIG_ATA_PIIX is not set
@@ -570,10 +579,12 @@ CONFIG_SATA_SVW=y
570# CONFIG_SATA_ULI is not set 579# CONFIG_SATA_ULI is not set
571# CONFIG_SATA_VIA is not set 580# CONFIG_SATA_VIA is not set
572# CONFIG_SATA_VITESSE is not set 581# CONFIG_SATA_VITESSE is not set
582# CONFIG_SATA_INIC162X is not set
573# CONFIG_PATA_ALI is not set 583# CONFIG_PATA_ALI is not set
574# CONFIG_PATA_AMD is not set 584# CONFIG_PATA_AMD is not set
575# CONFIG_PATA_ARTOP is not set 585# CONFIG_PATA_ARTOP is not set
576# CONFIG_PATA_ATIIXP is not set 586# CONFIG_PATA_ATIIXP is not set
587# CONFIG_PATA_CMD640_PCI is not set
577# CONFIG_PATA_CMD64X is not set 588# CONFIG_PATA_CMD64X is not set
578# CONFIG_PATA_CS5520 is not set 589# CONFIG_PATA_CS5520 is not set
579# CONFIG_PATA_CS5530 is not set 590# CONFIG_PATA_CS5530 is not set
@@ -585,6 +596,7 @@ CONFIG_SATA_SVW=y
585# CONFIG_PATA_HPT3X2N is not set 596# CONFIG_PATA_HPT3X2N is not set
586# CONFIG_PATA_HPT3X3 is not set 597# CONFIG_PATA_HPT3X3 is not set
587# CONFIG_PATA_IT821X is not set 598# CONFIG_PATA_IT821X is not set
599# CONFIG_PATA_IT8213 is not set
588# CONFIG_PATA_JMICRON is not set 600# CONFIG_PATA_JMICRON is not set
589# CONFIG_PATA_TRIFLEX is not set 601# CONFIG_PATA_TRIFLEX is not set
590# CONFIG_PATA_MARVELL is not set 602# CONFIG_PATA_MARVELL is not set
@@ -624,6 +636,7 @@ CONFIG_DM_SNAPSHOT=m
624CONFIG_DM_MIRROR=m 636CONFIG_DM_MIRROR=m
625CONFIG_DM_ZERO=m 637CONFIG_DM_ZERO=m
626# CONFIG_DM_MULTIPATH is not set 638# CONFIG_DM_MULTIPATH is not set
639# CONFIG_DM_DELAY is not set
627 640
628# 641#
629# Fusion MPT device support 642# Fusion MPT device support
@@ -636,28 +649,26 @@ CONFIG_DM_ZERO=m
636# 649#
637# IEEE 1394 (FireWire) support 650# IEEE 1394 (FireWire) support
638# 651#
652# CONFIG_FIREWIRE is not set
639CONFIG_IEEE1394=y 653CONFIG_IEEE1394=y
640 654
641# 655#
642# Subsystem Options 656# Subsystem Options
643# 657#
644# CONFIG_IEEE1394_VERBOSEDEBUG is not set 658# CONFIG_IEEE1394_VERBOSEDEBUG is not set
645CONFIG_IEEE1394_OUI_DB=y
646CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
647CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
648# CONFIG_IEEE1394_EXPORT_FULL_API is not set
649 659
650# 660#
651# Device Drivers 661# Controllers
652# 662#
653# CONFIG_IEEE1394_PCILYNX is not set 663# CONFIG_IEEE1394_PCILYNX is not set
654CONFIG_IEEE1394_OHCI1394=y 664CONFIG_IEEE1394_OHCI1394=y
655 665
656# 666#
657# Protocol Drivers 667# Protocols
658# 668#
659CONFIG_IEEE1394_VIDEO1394=m 669CONFIG_IEEE1394_VIDEO1394=m
660CONFIG_IEEE1394_SBP2=m 670CONFIG_IEEE1394_SBP2=m
671CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
661CONFIG_IEEE1394_ETH1394=m 672CONFIG_IEEE1394_ETH1394=m
662CONFIG_IEEE1394_DV1394=m 673CONFIG_IEEE1394_DV1394=m
663CONFIG_IEEE1394_RAWIO=y 674CONFIG_IEEE1394_RAWIO=y
@@ -666,10 +677,7 @@ CONFIG_IEEE1394_RAWIO=y
666# I2O device support 677# I2O device support
667# 678#
668# CONFIG_I2O is not set 679# CONFIG_I2O is not set
669 680CONFIG_MACINTOSH_DRIVERS=y
670#
671# Macintosh device drivers
672#
673CONFIG_ADB_PMU=y 681CONFIG_ADB_PMU=y
674# CONFIG_ADB_PMU_LED is not set 682# CONFIG_ADB_PMU_LED is not set
675CONFIG_PMAC_SMU=y 683CONFIG_PMAC_SMU=y
@@ -689,15 +697,7 @@ CONFIG_DUMMY=m
689CONFIG_BONDING=m 697CONFIG_BONDING=m
690# CONFIG_EQUALIZER is not set 698# CONFIG_EQUALIZER is not set
691CONFIG_TUN=m 699CONFIG_TUN=m
692
693#
694# ARCnet devices
695#
696# CONFIG_ARCNET is not set 700# CONFIG_ARCNET is not set
697
698#
699# PHY device support
700#
701# CONFIG_PHYLIB is not set 701# CONFIG_PHYLIB is not set
702 702
703# 703#
@@ -716,10 +716,7 @@ CONFIG_SUNGEM=y
716# CONFIG_NET_TULIP is not set 716# CONFIG_NET_TULIP is not set
717# CONFIG_HP100 is not set 717# CONFIG_HP100 is not set
718# CONFIG_NET_PCI is not set 718# CONFIG_NET_PCI is not set
719 719CONFIG_NETDEV_1000=y
720#
721# Ethernet (1000 Mbit)
722#
723CONFIG_ACENIC=y 720CONFIG_ACENIC=y
724CONFIG_ACENIC_OMIT_TIGON_I=y 721CONFIG_ACENIC_OMIT_TIGON_I=y
725# CONFIG_DL2K is not set 722# CONFIG_DL2K is not set
@@ -734,35 +731,50 @@ CONFIG_E1000=y
734# CONFIG_SKGE is not set 731# CONFIG_SKGE is not set
735# CONFIG_SKY2 is not set 732# CONFIG_SKY2 is not set
736# CONFIG_SK98LIN is not set 733# CONFIG_SK98LIN is not set
734# CONFIG_VIA_VELOCITY is not set
737CONFIG_TIGON3=y 735CONFIG_TIGON3=y
738# CONFIG_BNX2 is not set 736# CONFIG_BNX2 is not set
739# CONFIG_QLA3XXX is not set 737# CONFIG_QLA3XXX is not set
740 738# CONFIG_ATL1 is not set
741# 739CONFIG_NETDEV_10000=y
742# Ethernet (10000 Mbit)
743#
744# CONFIG_CHELSIO_T1 is not set 740# CONFIG_CHELSIO_T1 is not set
741# CONFIG_CHELSIO_T3 is not set
745# CONFIG_IXGB is not set 742# CONFIG_IXGB is not set
746# CONFIG_S2IO is not set 743# CONFIG_S2IO is not set
747# CONFIG_MYRI10GE is not set 744# CONFIG_MYRI10GE is not set
748# CONFIG_NETXEN_NIC is not set 745# CONFIG_NETXEN_NIC is not set
749 746# CONFIG_PASEMI_MAC is not set
750# 747# CONFIG_MLX4_CORE is not set
751# Token Ring devices
752#
753CONFIG_TR=y 748CONFIG_TR=y
754CONFIG_IBMOL=y 749CONFIG_IBMOL=y
755# CONFIG_3C359 is not set 750# CONFIG_3C359 is not set
756# CONFIG_TMS380TR is not set 751# CONFIG_TMS380TR is not set
757 752
758# 753#
759# Wireless LAN (non-hamradio) 754# Wireless LAN
760# 755#
761# CONFIG_NET_RADIO is not set 756# CONFIG_WLAN_PRE80211 is not set
757# CONFIG_WLAN_80211 is not set
762 758
763# 759#
764# Wan interfaces 760# USB Network Adapters
765# 761#
762CONFIG_USB_CATC=m
763CONFIG_USB_KAWETH=m
764CONFIG_USB_PEGASUS=m
765CONFIG_USB_RTL8150=m
766# CONFIG_USB_USBNET_MII is not set
767CONFIG_USB_USBNET=m
768# CONFIG_USB_NET_AX8817X is not set
769CONFIG_USB_NET_CDCETHER=m
770# CONFIG_USB_NET_DM9601 is not set
771# CONFIG_USB_NET_GL620A is not set
772# CONFIG_USB_NET_NET1080 is not set
773# CONFIG_USB_NET_PLUSB is not set
774# CONFIG_USB_NET_MCS7830 is not set
775# CONFIG_USB_NET_RNDIS_HOST is not set
776# CONFIG_USB_NET_CDC_SUBSET is not set
777# CONFIG_USB_NET_ZAURUS is not set
766# CONFIG_WAN is not set 778# CONFIG_WAN is not set
767# CONFIG_FDDI is not set 779# CONFIG_FDDI is not set
768# CONFIG_HIPPI is not set 780# CONFIG_HIPPI is not set
@@ -798,6 +810,7 @@ CONFIG_SLHC=m
798# 810#
799CONFIG_INPUT=y 811CONFIG_INPUT=y
800CONFIG_INPUT_FF_MEMLESS=y 812CONFIG_INPUT_FF_MEMLESS=y
813# CONFIG_INPUT_POLLDEV is not set
801 814
802# 815#
803# Userland interfaces 816# Userland interfaces
@@ -824,8 +837,10 @@ CONFIG_INPUT_KEYBOARD=y
824CONFIG_INPUT_MOUSE=y 837CONFIG_INPUT_MOUSE=y
825# CONFIG_MOUSE_PS2 is not set 838# CONFIG_MOUSE_PS2 is not set
826# CONFIG_MOUSE_SERIAL is not set 839# CONFIG_MOUSE_SERIAL is not set
840# CONFIG_MOUSE_APPLETOUCH is not set
827# CONFIG_MOUSE_VSXXXAA is not set 841# CONFIG_MOUSE_VSXXXAA is not set
828# CONFIG_INPUT_JOYSTICK is not set 842# CONFIG_INPUT_JOYSTICK is not set
843# CONFIG_INPUT_TABLET is not set
829# CONFIG_INPUT_TOUCHSCREEN is not set 844# CONFIG_INPUT_TOUCHSCREEN is not set
830# CONFIG_INPUT_MISC is not set 845# CONFIG_INPUT_MISC is not set
831 846
@@ -866,15 +881,10 @@ CONFIG_LEGACY_PTY_COUNT=256
866# IPMI 881# IPMI
867# 882#
868# CONFIG_IPMI_HANDLER is not set 883# CONFIG_IPMI_HANDLER is not set
869
870#
871# Watchdog Cards
872#
873# CONFIG_WATCHDOG is not set 884# CONFIG_WATCHDOG is not set
874# CONFIG_HW_RANDOM is not set 885# CONFIG_HW_RANDOM is not set
875CONFIG_GEN_RTC=y 886CONFIG_GEN_RTC=y
876# CONFIG_GEN_RTC_X is not set 887# CONFIG_GEN_RTC_X is not set
877# CONFIG_DTLK is not set
878# CONFIG_R3964 is not set 888# CONFIG_R3964 is not set
879# CONFIG_APPLICOM is not set 889# CONFIG_APPLICOM is not set
880CONFIG_AGP=m 890CONFIG_AGP=m
@@ -888,11 +898,9 @@ CONFIG_MAX_RAW_DEVS=256
888# TPM devices 898# TPM devices
889# 899#
890# CONFIG_TCG_TPM is not set 900# CONFIG_TCG_TPM is not set
891 901CONFIG_DEVPORT=y
892#
893# I2C support
894#
895CONFIG_I2C=y 902CONFIG_I2C=y
903CONFIG_I2C_BOARDINFO=y
896CONFIG_I2C_CHARDEV=y 904CONFIG_I2C_CHARDEV=y
897 905
898# 906#
@@ -919,14 +927,15 @@ CONFIG_I2C_POWERMAC=y
919# CONFIG_I2C_PARPORT_LIGHT is not set 927# CONFIG_I2C_PARPORT_LIGHT is not set
920# CONFIG_I2C_PROSAVAGE is not set 928# CONFIG_I2C_PROSAVAGE is not set
921# CONFIG_I2C_SAVAGE4 is not set 929# CONFIG_I2C_SAVAGE4 is not set
930# CONFIG_I2C_SIMTEC is not set
922# CONFIG_I2C_SIS5595 is not set 931# CONFIG_I2C_SIS5595 is not set
923# CONFIG_I2C_SIS630 is not set 932# CONFIG_I2C_SIS630 is not set
924# CONFIG_I2C_SIS96X is not set 933# CONFIG_I2C_SIS96X is not set
925# CONFIG_I2C_STUB is not set 934# CONFIG_I2C_STUB is not set
935# CONFIG_I2C_TINY_USB is not set
926# CONFIG_I2C_VIA is not set 936# CONFIG_I2C_VIA is not set
927# CONFIG_I2C_VIAPRO is not set 937# CONFIG_I2C_VIAPRO is not set
928# CONFIG_I2C_VOODOO3 is not set 938# CONFIG_I2C_VOODOO3 is not set
929# CONFIG_I2C_PCA_ISA is not set
930 939
931# 940#
932# Miscellaneous I2C Chip support 941# Miscellaneous I2C Chip support
@@ -953,37 +962,53 @@ CONFIG_I2C_POWERMAC=y
953# Dallas's 1-wire bus 962# Dallas's 1-wire bus
954# 963#
955# CONFIG_W1 is not set 964# CONFIG_W1 is not set
965# CONFIG_HWMON is not set
956 966
957# 967#
958# Hardware Monitoring support 968# Multifunction device drivers
959# 969#
960# CONFIG_HWMON is not set 970# CONFIG_MFD_SM501 is not set
961# CONFIG_HWMON_VID is not set
962 971
963# 972#
964# Multimedia devices 973# Multimedia devices
965# 974#
966# CONFIG_VIDEO_DEV is not set 975# CONFIG_VIDEO_DEV is not set
976# CONFIG_DVB_CORE is not set
977CONFIG_DAB=y
978# CONFIG_USB_DABUSB is not set
967 979
968# 980#
969# Digital Video Broadcasting Devices 981# Graphics support
970# 982#
971# CONFIG_DVB is not set 983CONFIG_BACKLIGHT_LCD_SUPPORT=y
972# CONFIG_USB_DABUSB is not set 984CONFIG_BACKLIGHT_CLASS_DEVICE=y
985CONFIG_LCD_CLASS_DEVICE=m
973 986
974# 987#
975# Graphics support 988# Display device support
976# 989#
977CONFIG_FIRMWARE_EDID=y 990# CONFIG_DISPLAY_SUPPORT is not set
991CONFIG_VGASTATE=y
978CONFIG_FB=y 992CONFIG_FB=y
993CONFIG_FIRMWARE_EDID=y
979CONFIG_FB_DDC=y 994CONFIG_FB_DDC=y
980CONFIG_FB_CFB_FILLRECT=y 995CONFIG_FB_CFB_FILLRECT=y
981CONFIG_FB_CFB_COPYAREA=y 996CONFIG_FB_CFB_COPYAREA=y
982CONFIG_FB_CFB_IMAGEBLIT=y 997CONFIG_FB_CFB_IMAGEBLIT=y
998# CONFIG_FB_SYS_FILLRECT is not set
999# CONFIG_FB_SYS_COPYAREA is not set
1000# CONFIG_FB_SYS_IMAGEBLIT is not set
1001# CONFIG_FB_SYS_FOPS is not set
1002CONFIG_FB_DEFERRED_IO=y
1003# CONFIG_FB_SVGALIB is not set
983CONFIG_FB_MACMODES=y 1004CONFIG_FB_MACMODES=y
984# CONFIG_FB_BACKLIGHT is not set 1005CONFIG_FB_BACKLIGHT=y
985CONFIG_FB_MODE_HELPERS=y 1006CONFIG_FB_MODE_HELPERS=y
986CONFIG_FB_TILEBLITTING=y 1007CONFIG_FB_TILEBLITTING=y
1008
1009#
1010# Frame buffer hardware drivers
1011#
987# CONFIG_FB_CIRRUS is not set 1012# CONFIG_FB_CIRRUS is not set
988# CONFIG_FB_PM2 is not set 1013# CONFIG_FB_PM2 is not set
989# CONFIG_FB_CYBER2000 is not set 1014# CONFIG_FB_CYBER2000 is not set
@@ -994,20 +1019,27 @@ CONFIG_FB_OF=y
994# CONFIG_FB_S1D13XXX is not set 1019# CONFIG_FB_S1D13XXX is not set
995CONFIG_FB_NVIDIA=y 1020CONFIG_FB_NVIDIA=y
996CONFIG_FB_NVIDIA_I2C=y 1021CONFIG_FB_NVIDIA_I2C=y
1022# CONFIG_FB_NVIDIA_DEBUG is not set
1023CONFIG_FB_NVIDIA_BACKLIGHT=y
997# CONFIG_FB_RIVA is not set 1024# CONFIG_FB_RIVA is not set
998# CONFIG_FB_MATROX is not set 1025# CONFIG_FB_MATROX is not set
999CONFIG_FB_RADEON=y 1026CONFIG_FB_RADEON=y
1000CONFIG_FB_RADEON_I2C=y 1027CONFIG_FB_RADEON_I2C=y
1028CONFIG_FB_RADEON_BACKLIGHT=y
1001# CONFIG_FB_RADEON_DEBUG is not set 1029# CONFIG_FB_RADEON_DEBUG is not set
1002# CONFIG_FB_ATY128 is not set 1030# CONFIG_FB_ATY128 is not set
1003# CONFIG_FB_ATY is not set 1031# CONFIG_FB_ATY is not set
1032# CONFIG_FB_S3 is not set
1004# CONFIG_FB_SAVAGE is not set 1033# CONFIG_FB_SAVAGE is not set
1005# CONFIG_FB_SIS is not set 1034# CONFIG_FB_SIS is not set
1006# CONFIG_FB_NEOMAGIC is not set 1035# CONFIG_FB_NEOMAGIC is not set
1007# CONFIG_FB_KYRO is not set 1036# CONFIG_FB_KYRO is not set
1008# CONFIG_FB_3DFX is not set 1037# CONFIG_FB_3DFX is not set
1009# CONFIG_FB_VOODOO1 is not set 1038# CONFIG_FB_VOODOO1 is not set
1039# CONFIG_FB_VT8623 is not set
1010# CONFIG_FB_TRIDENT is not set 1040# CONFIG_FB_TRIDENT is not set
1041# CONFIG_FB_ARK is not set
1042# CONFIG_FB_PM3 is not set
1011# CONFIG_FB_IBM_GXT4500 is not set 1043# CONFIG_FB_IBM_GXT4500 is not set
1012# CONFIG_FB_VIRTUAL is not set 1044# CONFIG_FB_VIRTUAL is not set
1013 1045
@@ -1021,19 +1053,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
1021# CONFIG_FONTS is not set 1053# CONFIG_FONTS is not set
1022CONFIG_FONT_8x8=y 1054CONFIG_FONT_8x8=y
1023CONFIG_FONT_8x16=y 1055CONFIG_FONT_8x16=y
1024
1025#
1026# Logo configuration
1027#
1028CONFIG_LOGO=y 1056CONFIG_LOGO=y
1029CONFIG_LOGO_LINUX_MONO=y 1057CONFIG_LOGO_LINUX_MONO=y
1030CONFIG_LOGO_LINUX_VGA16=y 1058CONFIG_LOGO_LINUX_VGA16=y
1031CONFIG_LOGO_LINUX_CLUT224=y 1059CONFIG_LOGO_LINUX_CLUT224=y
1032CONFIG_BACKLIGHT_LCD_SUPPORT=y
1033CONFIG_BACKLIGHT_CLASS_DEVICE=m
1034CONFIG_BACKLIGHT_DEVICE=y
1035CONFIG_LCD_CLASS_DEVICE=m
1036CONFIG_LCD_DEVICE=y
1037 1060
1038# 1061#
1039# Sound 1062# Sound
@@ -1152,6 +1175,12 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
1152# 1175#
1153CONFIG_SND_USB_AUDIO=m 1176CONFIG_SND_USB_AUDIO=m
1154# CONFIG_SND_USB_USX2Y is not set 1177# CONFIG_SND_USB_USX2Y is not set
1178# CONFIG_SND_USB_CAIAQ is not set
1179
1180#
1181# System on Chip audio support
1182#
1183# CONFIG_SND_SOC is not set
1155 1184
1156# 1185#
1157# Open Sound System 1186# Open Sound System
@@ -1162,6 +1191,20 @@ CONFIG_SND_USB_AUDIO=m
1162# HID Devices 1191# HID Devices
1163# 1192#
1164CONFIG_HID=y 1193CONFIG_HID=y
1194# CONFIG_HID_DEBUG is not set
1195
1196#
1197# USB Input Devices
1198#
1199CONFIG_USB_HID=y
1200# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1201CONFIG_HID_FF=y
1202CONFIG_HID_PID=y
1203CONFIG_LOGITECH_FF=y
1204# CONFIG_PANTHERLORD_FF is not set
1205CONFIG_THRUSTMASTER_FF=y
1206# CONFIG_ZEROPLUS_FF is not set
1207CONFIG_USB_HIDDEV=y
1165 1208
1166# 1209#
1167# USB support 1210# USB support
@@ -1176,9 +1219,8 @@ CONFIG_USB=y
1176# Miscellaneous USB options 1219# Miscellaneous USB options
1177# 1220#
1178CONFIG_USB_DEVICEFS=y 1221CONFIG_USB_DEVICEFS=y
1179# CONFIG_USB_BANDWIDTH is not set 1222CONFIG_USB_DEVICE_CLASS=y
1180# CONFIG_USB_DYNAMIC_MINORS is not set 1223# CONFIG_USB_DYNAMIC_MINORS is not set
1181# CONFIG_USB_MULTITHREAD_PROBE is not set
1182# CONFIG_USB_OTG is not set 1224# CONFIG_USB_OTG is not set
1183 1225
1184# 1226#
@@ -1188,9 +1230,15 @@ CONFIG_USB_EHCI_HCD=y
1188# CONFIG_USB_EHCI_SPLIT_ISO is not set 1230# CONFIG_USB_EHCI_SPLIT_ISO is not set
1189# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1231# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1190# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1232# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1233# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1191# CONFIG_USB_ISP116X_HCD is not set 1234# CONFIG_USB_ISP116X_HCD is not set
1192CONFIG_USB_OHCI_HCD=y 1235CONFIG_USB_OHCI_HCD=y
1193# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1236CONFIG_USB_OHCI_HCD_PPC_OF=y
1237CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1238# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
1239CONFIG_USB_OHCI_HCD_PCI=y
1240CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1241CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1194CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1242CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1195# CONFIG_USB_UHCI_HCD is not set 1243# CONFIG_USB_UHCI_HCD is not set
1196# CONFIG_USB_SL811_HCD is not set 1244# CONFIG_USB_SL811_HCD is not set
@@ -1224,53 +1272,10 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
1224# CONFIG_USB_LIBUSUAL is not set 1272# CONFIG_USB_LIBUSUAL is not set
1225 1273
1226# 1274#
1227# USB Input Devices
1228#
1229CONFIG_USB_HID=y
1230# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1231CONFIG_HID_FF=y
1232CONFIG_HID_PID=y
1233CONFIG_LOGITECH_FF=y
1234CONFIG_THRUSTMASTER_FF=y
1235# CONFIG_ZEROPLUS_FF is not set
1236CONFIG_USB_HIDDEV=y
1237# CONFIG_USB_AIPTEK is not set
1238# CONFIG_USB_WACOM is not set
1239# CONFIG_USB_ACECAD is not set
1240# CONFIG_USB_KBTAB is not set
1241# CONFIG_USB_POWERMATE is not set
1242# CONFIG_USB_TOUCHSCREEN is not set
1243# CONFIG_USB_YEALINK is not set
1244# CONFIG_USB_XPAD is not set
1245# CONFIG_USB_ATI_REMOTE is not set
1246# CONFIG_USB_ATI_REMOTE2 is not set
1247# CONFIG_USB_KEYSPAN_REMOTE is not set
1248# CONFIG_USB_APPLETOUCH is not set
1249
1250#
1251# USB Imaging devices 1275# USB Imaging devices
1252# 1276#
1253# CONFIG_USB_MDC800 is not set 1277# CONFIG_USB_MDC800 is not set
1254# CONFIG_USB_MICROTEK is not set 1278# CONFIG_USB_MICROTEK is not set
1255
1256#
1257# USB Network Adapters
1258#
1259CONFIG_USB_CATC=m
1260CONFIG_USB_KAWETH=m
1261CONFIG_USB_PEGASUS=m
1262CONFIG_USB_RTL8150=m
1263# CONFIG_USB_USBNET_MII is not set
1264CONFIG_USB_USBNET=m
1265# CONFIG_USB_NET_AX8817X is not set
1266CONFIG_USB_NET_CDCETHER=m
1267# CONFIG_USB_NET_GL620A is not set
1268# CONFIG_USB_NET_NET1080 is not set
1269# CONFIG_USB_NET_PLUSB is not set
1270# CONFIG_USB_NET_MCS7830 is not set
1271# CONFIG_USB_NET_RNDIS_HOST is not set
1272# CONFIG_USB_NET_CDC_SUBSET is not set
1273# CONFIG_USB_NET_ZAURUS is not set
1274CONFIG_USB_MON=y 1279CONFIG_USB_MON=y
1275 1280
1276# 1281#
@@ -1343,6 +1348,7 @@ CONFIG_USB_EZUSB=y
1343# CONFIG_USB_RIO500 is not set 1348# CONFIG_USB_RIO500 is not set
1344# CONFIG_USB_LEGOTOWER is not set 1349# CONFIG_USB_LEGOTOWER is not set
1345# CONFIG_USB_LCD is not set 1350# CONFIG_USB_LCD is not set
1351# CONFIG_USB_BERRY_CHARGE is not set
1346# CONFIG_USB_LED is not set 1352# CONFIG_USB_LED is not set
1347# CONFIG_USB_CYPRESS_CY7C63 is not set 1353# CONFIG_USB_CYPRESS_CY7C63 is not set
1348# CONFIG_USB_CYTHERM is not set 1354# CONFIG_USB_CYTHERM is not set
@@ -1353,6 +1359,7 @@ CONFIG_USB_APPLEDISPLAY=m
1353# CONFIG_USB_SISUSBVGA is not set 1359# CONFIG_USB_SISUSBVGA is not set
1354# CONFIG_USB_LD is not set 1360# CONFIG_USB_LD is not set
1355# CONFIG_USB_TRANCEVIBRATOR is not set 1361# CONFIG_USB_TRANCEVIBRATOR is not set
1362# CONFIG_USB_IOWARRIOR is not set
1356# CONFIG_USB_TEST is not set 1363# CONFIG_USB_TEST is not set
1357 1364
1358# 1365#
@@ -1363,10 +1370,6 @@ CONFIG_USB_APPLEDISPLAY=m
1363# USB Gadget Support 1370# USB Gadget Support
1364# 1371#
1365# CONFIG_USB_GADGET is not set 1372# CONFIG_USB_GADGET is not set
1366
1367#
1368# MMC/SD Card support
1369#
1370# CONFIG_MMC is not set 1373# CONFIG_MMC is not set
1371 1374
1372# 1375#
@@ -1410,10 +1413,6 @@ CONFIG_USB_APPLEDISPLAY=m
1410# 1413#
1411 1414
1412# 1415#
1413# Virtualization
1414#
1415
1416#
1417# File systems 1416# File systems
1418# 1417#
1419CONFIG_EXT2_FS=y 1418CONFIG_EXT2_FS=y
@@ -1461,7 +1460,6 @@ CONFIG_AUTOFS_FS=m
1461CONFIG_ISO9660_FS=y 1460CONFIG_ISO9660_FS=y
1462CONFIG_JOLIET=y 1461CONFIG_JOLIET=y
1463CONFIG_ZISOFS=y 1462CONFIG_ZISOFS=y
1464CONFIG_ZISOFS_FS=y
1465CONFIG_UDF_FS=m 1463CONFIG_UDF_FS=m
1466CONFIG_UDF_NLS=y 1464CONFIG_UDF_NLS=y
1467 1465
@@ -1527,6 +1525,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1527CONFIG_NFS_COMMON=y 1525CONFIG_NFS_COMMON=y
1528CONFIG_SUNRPC=y 1526CONFIG_SUNRPC=y
1529CONFIG_SUNRPC_GSS=y 1527CONFIG_SUNRPC_GSS=y
1528# CONFIG_SUNRPC_BIND34 is not set
1530CONFIG_RPCSEC_GSS_KRB5=y 1529CONFIG_RPCSEC_GSS_KRB5=y
1531# CONFIG_RPCSEC_GSS_SPKM3 is not set 1530# CONFIG_RPCSEC_GSS_SPKM3 is not set
1532# CONFIG_SMB_FS is not set 1531# CONFIG_SMB_FS is not set
@@ -1561,6 +1560,7 @@ CONFIG_MSDOS_PARTITION=y
1561# CONFIG_SUN_PARTITION is not set 1560# CONFIG_SUN_PARTITION is not set
1562# CONFIG_KARMA_PARTITION is not set 1561# CONFIG_KARMA_PARTITION is not set
1563# CONFIG_EFI_PARTITION is not set 1562# CONFIG_EFI_PARTITION is not set
1563# CONFIG_SYSV68_PARTITION is not set
1564 1564
1565# 1565#
1566# Native Language Support 1566# Native Language Support
@@ -1610,6 +1610,7 @@ CONFIG_NLS_UTF8=y
1610# Distributed Lock Manager 1610# Distributed Lock Manager
1611# 1611#
1612# CONFIG_DLM is not set 1612# CONFIG_DLM is not set
1613# CONFIG_UCC_SLOW is not set
1613 1614
1614# 1615#
1615# Library routines 1616# Library routines
@@ -1617,12 +1618,15 @@ CONFIG_NLS_UTF8=y
1617CONFIG_BITREVERSE=y 1618CONFIG_BITREVERSE=y
1618CONFIG_CRC_CCITT=m 1619CONFIG_CRC_CCITT=m
1619# CONFIG_CRC16 is not set 1620# CONFIG_CRC16 is not set
1621# CONFIG_CRC_ITU_T is not set
1620CONFIG_CRC32=y 1622CONFIG_CRC32=y
1621CONFIG_LIBCRC32C=m 1623CONFIG_LIBCRC32C=m
1622CONFIG_ZLIB_INFLATE=y 1624CONFIG_ZLIB_INFLATE=y
1623CONFIG_ZLIB_DEFLATE=m 1625CONFIG_ZLIB_DEFLATE=m
1624CONFIG_PLIST=y 1626CONFIG_PLIST=y
1625CONFIG_IOMAP_COPY=y 1627CONFIG_HAS_IOMEM=y
1628CONFIG_HAS_IOPORT=y
1629CONFIG_HAS_DMA=y
1626 1630
1627# 1631#
1628# Instrumentation Support 1632# Instrumentation Support
@@ -1641,15 +1645,15 @@ CONFIG_MAGIC_SYSRQ=y
1641CONFIG_DEBUG_FS=y 1645CONFIG_DEBUG_FS=y
1642# CONFIG_HEADERS_CHECK is not set 1646# CONFIG_HEADERS_CHECK is not set
1643CONFIG_DEBUG_KERNEL=y 1647CONFIG_DEBUG_KERNEL=y
1644CONFIG_LOG_BUF_SHIFT=17 1648# CONFIG_DEBUG_SHIRQ is not set
1645CONFIG_DETECT_SOFTLOCKUP=y 1649CONFIG_DETECT_SOFTLOCKUP=y
1646# CONFIG_SCHEDSTATS is not set 1650# CONFIG_SCHEDSTATS is not set
1651# CONFIG_TIMER_STATS is not set
1647# CONFIG_DEBUG_SLAB is not set 1652# CONFIG_DEBUG_SLAB is not set
1648# CONFIG_DEBUG_RT_MUTEXES is not set 1653# CONFIG_DEBUG_RT_MUTEXES is not set
1649# CONFIG_RT_MUTEX_TESTER is not set 1654# CONFIG_RT_MUTEX_TESTER is not set
1650# CONFIG_DEBUG_SPINLOCK is not set 1655# CONFIG_DEBUG_SPINLOCK is not set
1651CONFIG_DEBUG_MUTEXES=y 1656CONFIG_DEBUG_MUTEXES=y
1652# CONFIG_DEBUG_RWSEMS is not set
1653# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1657# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1654# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1658# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1655# CONFIG_DEBUG_KOBJECT is not set 1659# CONFIG_DEBUG_KOBJECT is not set
@@ -1659,8 +1663,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1659# CONFIG_DEBUG_LIST is not set 1663# CONFIG_DEBUG_LIST is not set
1660CONFIG_FORCED_INLINING=y 1664CONFIG_FORCED_INLINING=y
1661# CONFIG_RCU_TORTURE_TEST is not set 1665# CONFIG_RCU_TORTURE_TEST is not set
1666# CONFIG_FAULT_INJECTION is not set
1662# CONFIG_DEBUG_STACKOVERFLOW is not set 1667# CONFIG_DEBUG_STACKOVERFLOW is not set
1663# CONFIG_DEBUG_STACK_USAGE is not set 1668# CONFIG_DEBUG_STACK_USAGE is not set
1669# CONFIG_DEBUG_PAGEALLOC is not set
1664# CONFIG_DEBUGGER is not set 1670# CONFIG_DEBUGGER is not set
1665CONFIG_IRQSTACKS=y 1671CONFIG_IRQSTACKS=y
1666CONFIG_BOOTX_TEXT=y 1672CONFIG_BOOTX_TEXT=y
@@ -1693,8 +1699,11 @@ CONFIG_CRYPTO_WP512=m
1693# CONFIG_CRYPTO_GF128MUL is not set 1699# CONFIG_CRYPTO_GF128MUL is not set
1694CONFIG_CRYPTO_ECB=m 1700CONFIG_CRYPTO_ECB=m
1695CONFIG_CRYPTO_CBC=y 1701CONFIG_CRYPTO_CBC=y
1702CONFIG_CRYPTO_PCBC=m
1696# CONFIG_CRYPTO_LRW is not set 1703# CONFIG_CRYPTO_LRW is not set
1704# CONFIG_CRYPTO_CRYPTD is not set
1697CONFIG_CRYPTO_DES=y 1705CONFIG_CRYPTO_DES=y
1706# CONFIG_CRYPTO_FCRYPT is not set
1698CONFIG_CRYPTO_BLOWFISH=m 1707CONFIG_CRYPTO_BLOWFISH=m
1699CONFIG_CRYPTO_TWOFISH=m 1708CONFIG_CRYPTO_TWOFISH=m
1700CONFIG_CRYPTO_TWOFISH_COMMON=m 1709CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1709,6 +1718,7 @@ CONFIG_CRYPTO_ANUBIS=m
1709CONFIG_CRYPTO_DEFLATE=m 1718CONFIG_CRYPTO_DEFLATE=m
1710CONFIG_CRYPTO_MICHAEL_MIC=m 1719CONFIG_CRYPTO_MICHAEL_MIC=m
1711CONFIG_CRYPTO_CRC32C=m 1720CONFIG_CRYPTO_CRC32C=m
1721# CONFIG_CRYPTO_CAMELLIA is not set
1712CONFIG_CRYPTO_TEST=m 1722CONFIG_CRYPTO_TEST=m
1713 1723
1714# 1724#
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index be633b9b57c3..32781849ad4c 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.22-rc6
4# Sat May 5 11:02:35 2007 4# Tue Jun 26 13:22:36 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_ALTIVEC is not set 45# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -70,6 +71,7 @@ CONFIG_SYSVIPC_SYSCTL=y
70# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 76# CONFIG_RELAY is not set
75CONFIG_BLK_DEV_INITRD=y 77CONFIG_BLK_DEV_INITRD=y
@@ -87,14 +89,19 @@ CONFIG_BUG=y
87CONFIG_ELF_CORE=y 89CONFIG_ELF_CORE=y
88CONFIG_BASE_FULL=y 90CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 91CONFIG_FUTEX=y
92CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 93CONFIG_EPOLL=y
94CONFIG_SIGNALFD=y
95CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 97CONFIG_SHMEM=y
92CONFIG_SLAB=y
93CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y
100# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set
94CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
95# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
96CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
97# CONFIG_SLOB is not set
98 105
99# 106#
100# Loadable module support 107# Loadable module support
@@ -140,6 +147,7 @@ CONFIG_EMBEDDED6xx=y
140# CONFIG_LINKSTATION is not set 147# CONFIG_LINKSTATION is not set
141# CONFIG_MPC7448HPC2 is not set 148# CONFIG_MPC7448HPC2 is not set
142CONFIG_PPC_HOLLY=y 149CONFIG_PPC_HOLLY=y
150# CONFIG_PPC_PRPMC2800 is not set
143CONFIG_TSI108_BRIDGE=y 151CONFIG_TSI108_BRIDGE=y
144CONFIG_MPIC=y 152CONFIG_MPIC=y
145CONFIG_MPIC_WEIRD=y 153CONFIG_MPIC_WEIRD=y
@@ -197,16 +205,14 @@ CONFIG_GENERIC_ISA_DMA=y
197CONFIG_PCI=y 205CONFIG_PCI=y
198CONFIG_PCI_DOMAINS=y 206CONFIG_PCI_DOMAINS=y
199# CONFIG_PCIEPORTBUS is not set 207# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set
200# CONFIG_PCI_DEBUG is not set 210# CONFIG_PCI_DEBUG is not set
201 211
202# 212#
203# PCCARD (PCMCIA/CardBus) support 213# PCCARD (PCMCIA/CardBus) support
204# 214#
205# CONFIG_PCCARD is not set 215# CONFIG_PCCARD is not set
206
207#
208# PCI Hotplug Support
209#
210# CONFIG_HOTPLUG_PCI is not set 216# CONFIG_HOTPLUG_PCI is not set
211 217
212# 218#
@@ -271,20 +277,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
271# CONFIG_INET6_TUNNEL is not set 277# CONFIG_INET6_TUNNEL is not set
272# CONFIG_NETWORK_SECMARK is not set 278# CONFIG_NETWORK_SECMARK is not set
273# CONFIG_NETFILTER is not set 279# CONFIG_NETFILTER is not set
274
275#
276# DCCP Configuration (EXPERIMENTAL)
277#
278# CONFIG_IP_DCCP is not set 280# CONFIG_IP_DCCP is not set
279
280#
281# SCTP Configuration (EXPERIMENTAL)
282#
283# CONFIG_IP_SCTP is not set 281# CONFIG_IP_SCTP is not set
284
285#
286# TIPC Configuration (EXPERIMENTAL)
287#
288# CONFIG_TIPC is not set 282# CONFIG_TIPC is not set
289# CONFIG_ATM is not set 283# CONFIG_ATM is not set
290# CONFIG_BRIDGE is not set 284# CONFIG_BRIDGE is not set
@@ -317,7 +311,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# 311#
318# CONFIG_CFG80211 is not set 312# CONFIG_CFG80211 is not set
319# CONFIG_WIRELESS_EXT is not set 313# CONFIG_WIRELESS_EXT is not set
314# CONFIG_MAC80211 is not set
320# CONFIG_IEEE80211 is not set 315# CONFIG_IEEE80211 is not set
316# CONFIG_RFKILL is not set
321 317
322# 318#
323# Device Drivers 319# Device Drivers
@@ -372,12 +368,10 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
372# 368#
373# Misc devices 369# Misc devices
374# 370#
371# CONFIG_PHANTOM is not set
375# CONFIG_SGI_IOC4 is not set 372# CONFIG_SGI_IOC4 is not set
376# CONFIG_TIFM_CORE is not set 373# CONFIG_TIFM_CORE is not set
377 374# CONFIG_BLINK is not set
378#
379# ATA/ATAPI/MFM/RLL support
380#
381# CONFIG_IDE is not set 375# CONFIG_IDE is not set
382 376
383# 377#
@@ -406,6 +400,7 @@ CONFIG_BLK_DEV_SD=y
406# CONFIG_SCSI_CONSTANTS is not set 400# CONFIG_SCSI_CONSTANTS is not set
407# CONFIG_SCSI_LOGGING is not set 401# CONFIG_SCSI_LOGGING is not set
408# CONFIG_SCSI_SCAN_ASYNC is not set 402# CONFIG_SCSI_SCAN_ASYNC is not set
403CONFIG_SCSI_WAIT_SCAN=m
409 404
410# 405#
411# SCSI Transports 406# SCSI Transports
@@ -453,12 +448,7 @@ CONFIG_BLK_DEV_SD=y
453# CONFIG_SCSI_DC390T is not set 448# CONFIG_SCSI_DC390T is not set
454# CONFIG_SCSI_NSP32 is not set 449# CONFIG_SCSI_NSP32 is not set
455# CONFIG_SCSI_DEBUG is not set 450# CONFIG_SCSI_DEBUG is not set
456# CONFIG_SCSI_ESP_CORE is not set
457# CONFIG_SCSI_SRP is not set 451# CONFIG_SCSI_SRP is not set
458
459#
460# Serial ATA (prod) and Parallel ATA (experimental) drivers
461#
462CONFIG_ATA=y 452CONFIG_ATA=y
463# CONFIG_ATA_NONSTANDARD is not set 453# CONFIG_ATA_NONSTANDARD is not set
464# CONFIG_SATA_AHCI is not set 454# CONFIG_SATA_AHCI is not set
@@ -531,6 +521,7 @@ CONFIG_ATA=y
531# 521#
532# IEEE 1394 (FireWire) support 522# IEEE 1394 (FireWire) support
533# 523#
524# CONFIG_FIREWIRE is not set
534# CONFIG_IEEE1394 is not set 525# CONFIG_IEEE1394 is not set
535 526
536# 527#
@@ -547,15 +538,7 @@ CONFIG_NETDEVICES=y
547# CONFIG_BONDING is not set 538# CONFIG_BONDING is not set
548# CONFIG_EQUALIZER is not set 539# CONFIG_EQUALIZER is not set
549# CONFIG_TUN is not set 540# CONFIG_TUN is not set
550
551#
552# ARCnet devices
553#
554# CONFIG_ARCNET is not set 541# CONFIG_ARCNET is not set
555
556#
557# PHY device support
558#
559CONFIG_PHYLIB=y 542CONFIG_PHYLIB=y
560 543
561# 544#
@@ -589,10 +572,7 @@ CONFIG_VORTEX=y
589# CONFIG_NET_TULIP is not set 572# CONFIG_NET_TULIP is not set
590# CONFIG_HP100 is not set 573# CONFIG_HP100 is not set
591# CONFIG_NET_PCI is not set 574# CONFIG_NET_PCI is not set
592 575CONFIG_NETDEV_1000=y
593#
594# Ethernet (1000 Mbit)
595#
596# CONFIG_ACENIC is not set 576# CONFIG_ACENIC is not set
597# CONFIG_DL2K is not set 577# CONFIG_DL2K is not set
598# CONFIG_E1000 is not set 578# CONFIG_E1000 is not set
@@ -604,25 +584,20 @@ CONFIG_VORTEX=y
604# CONFIG_SKGE is not set 584# CONFIG_SKGE is not set
605# CONFIG_SKY2 is not set 585# CONFIG_SKY2 is not set
606# CONFIG_SK98LIN is not set 586# CONFIG_SK98LIN is not set
587# CONFIG_VIA_VELOCITY is not set
607# CONFIG_TIGON3 is not set 588# CONFIG_TIGON3 is not set
608# CONFIG_BNX2 is not set 589# CONFIG_BNX2 is not set
609CONFIG_TSI108_ETH=y 590CONFIG_TSI108_ETH=y
610# CONFIG_QLA3XXX is not set 591# CONFIG_QLA3XXX is not set
611# CONFIG_ATL1 is not set 592# CONFIG_ATL1 is not set
612 593CONFIG_NETDEV_10000=y
613#
614# Ethernet (10000 Mbit)
615#
616# CONFIG_CHELSIO_T1 is not set 594# CONFIG_CHELSIO_T1 is not set
617# CONFIG_CHELSIO_T3 is not set 595# CONFIG_CHELSIO_T3 is not set
618# CONFIG_IXGB is not set 596# CONFIG_IXGB is not set
619# CONFIG_S2IO is not set 597# CONFIG_S2IO is not set
620# CONFIG_MYRI10GE is not set 598# CONFIG_MYRI10GE is not set
621# CONFIG_NETXEN_NIC is not set 599# CONFIG_NETXEN_NIC is not set
622 600# CONFIG_MLX4_CORE is not set
623#
624# Token Ring devices
625#
626# CONFIG_TR is not set 601# CONFIG_TR is not set
627 602
628# 603#
@@ -630,10 +605,6 @@ CONFIG_TSI108_ETH=y
630# 605#
631# CONFIG_WLAN_PRE80211 is not set 606# CONFIG_WLAN_PRE80211 is not set
632# CONFIG_WLAN_80211 is not set 607# CONFIG_WLAN_80211 is not set
633
634#
635# Wan interfaces
636#
637# CONFIG_WAN is not set 608# CONFIG_WAN is not set
638# CONFIG_FDDI is not set 609# CONFIG_FDDI is not set
639# CONFIG_HIPPI is not set 610# CONFIG_HIPPI is not set
@@ -660,6 +631,7 @@ CONFIG_TSI108_ETH=y
660# 631#
661CONFIG_INPUT=y 632CONFIG_INPUT=y
662# CONFIG_INPUT_FF_MEMLESS is not set 633# CONFIG_INPUT_FF_MEMLESS is not set
634# CONFIG_INPUT_POLLDEV is not set
663 635
664# 636#
665# Userland interfaces 637# Userland interfaces
@@ -676,6 +648,7 @@ CONFIG_INPUT=y
676# CONFIG_INPUT_KEYBOARD is not set 648# CONFIG_INPUT_KEYBOARD is not set
677# CONFIG_INPUT_MOUSE is not set 649# CONFIG_INPUT_MOUSE is not set
678# CONFIG_INPUT_JOYSTICK is not set 650# CONFIG_INPUT_JOYSTICK is not set
651# CONFIG_INPUT_TABLET is not set
679# CONFIG_INPUT_TOUCHSCREEN is not set 652# CONFIG_INPUT_TOUCHSCREEN is not set
680# CONFIG_INPUT_MISC is not set 653# CONFIG_INPUT_MISC is not set
681 654
@@ -721,16 +694,11 @@ CONFIG_LEGACY_PTY_COUNT=256
721# IPMI 694# IPMI
722# 695#
723# CONFIG_IPMI_HANDLER is not set 696# CONFIG_IPMI_HANDLER is not set
724
725#
726# Watchdog Cards
727#
728# CONFIG_WATCHDOG is not set 697# CONFIG_WATCHDOG is not set
729# CONFIG_HW_RANDOM is not set 698# CONFIG_HW_RANDOM is not set
730# CONFIG_NVRAM is not set 699# CONFIG_NVRAM is not set
731CONFIG_GEN_RTC=y 700CONFIG_GEN_RTC=y
732# CONFIG_GEN_RTC_X is not set 701# CONFIG_GEN_RTC_X is not set
733# CONFIG_DTLK is not set
734# CONFIG_R3964 is not set 702# CONFIG_R3964 is not set
735# CONFIG_APPLICOM is not set 703# CONFIG_APPLICOM is not set
736# CONFIG_AGP is not set 704# CONFIG_AGP is not set
@@ -741,10 +709,7 @@ CONFIG_GEN_RTC=y
741# TPM devices 709# TPM devices
742# 710#
743# CONFIG_TCG_TPM is not set 711# CONFIG_TCG_TPM is not set
744 712CONFIG_DEVPORT=y
745#
746# I2C support
747#
748# CONFIG_I2C is not set 713# CONFIG_I2C is not set
749 714
750# 715#
@@ -757,16 +722,15 @@ CONFIG_GEN_RTC=y
757# Dallas's 1-wire bus 722# Dallas's 1-wire bus
758# 723#
759# CONFIG_W1 is not set 724# CONFIG_W1 is not set
760
761#
762# Hardware Monitoring support
763#
764CONFIG_HWMON=y 725CONFIG_HWMON=y
765# CONFIG_HWMON_VID is not set 726# CONFIG_HWMON_VID is not set
766# CONFIG_SENSORS_ABITUGURU is not set 727# CONFIG_SENSORS_ABITUGURU is not set
767# CONFIG_SENSORS_F71805F is not set 728# CONFIG_SENSORS_F71805F is not set
768# CONFIG_SENSORS_PC87427 is not set 729# CONFIG_SENSORS_PC87427 is not set
730# CONFIG_SENSORS_SMSC47M1 is not set
731# CONFIG_SENSORS_SMSC47B397 is not set
769# CONFIG_SENSORS_VT1211 is not set 732# CONFIG_SENSORS_VT1211 is not set
733# CONFIG_SENSORS_W83627HF is not set
770# CONFIG_HWMON_DEBUG_CHIP is not set 734# CONFIG_HWMON_DEBUG_CHIP is not set
771 735
772# 736#
@@ -778,16 +742,19 @@ CONFIG_HWMON=y
778# Multimedia devices 742# Multimedia devices
779# 743#
780# CONFIG_VIDEO_DEV is not set 744# CONFIG_VIDEO_DEV is not set
745# CONFIG_DVB_CORE is not set
746# CONFIG_DAB is not set
781 747
782# 748#
783# Digital Video Broadcasting Devices 749# Graphics support
784# 750#
785# CONFIG_DVB is not set 751# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
786 752
787# 753#
788# Graphics support 754# Display device support
789# 755#
790# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 756# CONFIG_DISPLAY_SUPPORT is not set
757# CONFIG_VGASTATE is not set
791# CONFIG_FB is not set 758# CONFIG_FB is not set
792# CONFIG_FB_IBM_GXT4500 is not set 759# CONFIG_FB_IBM_GXT4500 is not set
793 760
@@ -818,10 +785,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
818# USB Gadget Support 785# USB Gadget Support
819# 786#
820# CONFIG_USB_GADGET is not set 787# CONFIG_USB_GADGET is not set
821
822#
823# MMC/SD Card support
824#
825# CONFIG_MMC is not set 788# CONFIG_MMC is not set
826 789
827# 790#
@@ -865,14 +828,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
865# 828#
866 829
867# 830#
868# Auxiliary Display support
869#
870
871#
872# Virtualization
873#
874
875#
876# File systems 831# File systems
877# 832#
878CONFIG_EXT2_FS=y 833CONFIG_EXT2_FS=y
@@ -957,6 +912,7 @@ CONFIG_ROOT_NFS=y
957CONFIG_LOCKD=y 912CONFIG_LOCKD=y
958CONFIG_NFS_COMMON=y 913CONFIG_NFS_COMMON=y
959CONFIG_SUNRPC=y 914CONFIG_SUNRPC=y
915# CONFIG_SUNRPC_BIND34 is not set
960# CONFIG_RPCSEC_GSS_KRB5 is not set 916# CONFIG_RPCSEC_GSS_KRB5 is not set
961# CONFIG_RPCSEC_GSS_SPKM3 is not set 917# CONFIG_RPCSEC_GSS_SPKM3 is not set
962# CONFIG_SMB_FS is not set 918# CONFIG_SMB_FS is not set
@@ -986,6 +942,7 @@ CONFIG_MSDOS_PARTITION=y
986# CONFIG_SUN_PARTITION is not set 942# CONFIG_SUN_PARTITION is not set
987# CONFIG_KARMA_PARTITION is not set 943# CONFIG_KARMA_PARTITION is not set
988# CONFIG_EFI_PARTITION is not set 944# CONFIG_EFI_PARTITION is not set
945# CONFIG_SYSV68_PARTITION is not set
989 946
990# 947#
991# Native Language Support 948# Native Language Support
@@ -997,7 +954,6 @@ CONFIG_MSDOS_PARTITION=y
997# 954#
998# CONFIG_DLM is not set 955# CONFIG_DLM is not set
999# CONFIG_UCC_SLOW is not set 956# CONFIG_UCC_SLOW is not set
1000# CONFIG_UCC_FAST is not set
1001 957
1002# 958#
1003# Library routines 959# Library routines
@@ -1005,11 +961,13 @@ CONFIG_MSDOS_PARTITION=y
1005CONFIG_BITREVERSE=y 961CONFIG_BITREVERSE=y
1006# CONFIG_CRC_CCITT is not set 962# CONFIG_CRC_CCITT is not set
1007# CONFIG_CRC16 is not set 963# CONFIG_CRC16 is not set
964# CONFIG_CRC_ITU_T is not set
1008CONFIG_CRC32=y 965CONFIG_CRC32=y
1009# CONFIG_LIBCRC32C is not set 966# CONFIG_LIBCRC32C is not set
1010CONFIG_PLIST=y 967CONFIG_PLIST=y
1011CONFIG_HAS_IOMEM=y 968CONFIG_HAS_IOMEM=y
1012CONFIG_HAS_IOPORT=y 969CONFIG_HAS_IOPORT=y
970CONFIG_HAS_DMA=y
1013 971
1014# 972#
1015# Instrumentation Support 973# Instrumentation Support
@@ -1028,7 +986,6 @@ CONFIG_MAGIC_SYSRQ=y
1028# CONFIG_HEADERS_CHECK is not set 986# CONFIG_HEADERS_CHECK is not set
1029CONFIG_DEBUG_KERNEL=y 987CONFIG_DEBUG_KERNEL=y
1030# CONFIG_DEBUG_SHIRQ is not set 988# CONFIG_DEBUG_SHIRQ is not set
1031CONFIG_LOG_BUF_SHIFT=14
1032CONFIG_DETECT_SOFTLOCKUP=y 989CONFIG_DETECT_SOFTLOCKUP=y
1033# CONFIG_SCHEDSTATS is not set 990# CONFIG_SCHEDSTATS is not set
1034# CONFIG_TIMER_STATS is not set 991# CONFIG_TIMER_STATS is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index af25118c8f24..8e3367452427 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc1 3# Linux kernel version: 2.6.22-rc6
4# Mon May 14 14:27:46 2007 4# Tue Jun 26 13:22:39 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -281,10 +281,6 @@ CONFIG_INET_TCP_DIAG=y
281CONFIG_TCP_CONG_CUBIC=y 281CONFIG_TCP_CONG_CUBIC=y
282CONFIG_DEFAULT_TCP_CONG="cubic" 282CONFIG_DEFAULT_TCP_CONG="cubic"
283# CONFIG_TCP_MD5SIG is not set 283# CONFIG_TCP_MD5SIG is not set
284
285#
286# IP: Virtual Server Configuration
287#
288# CONFIG_IP_VS is not set 284# CONFIG_IP_VS is not set
289# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 286# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -387,25 +383,13 @@ CONFIG_IP_NF_RAW=m
387CONFIG_IP_NF_ARPTABLES=m 383CONFIG_IP_NF_ARPTABLES=m
388CONFIG_IP_NF_ARPFILTER=m 384CONFIG_IP_NF_ARPFILTER=m
389CONFIG_IP_NF_ARP_MANGLE=m 385CONFIG_IP_NF_ARP_MANGLE=m
390
391#
392# DCCP Configuration (EXPERIMENTAL)
393#
394# CONFIG_IP_DCCP is not set 386# CONFIG_IP_DCCP is not set
395
396#
397# SCTP Configuration (EXPERIMENTAL)
398#
399CONFIG_IP_SCTP=m 387CONFIG_IP_SCTP=m
400# CONFIG_SCTP_DBG_MSG is not set 388# CONFIG_SCTP_DBG_MSG is not set
401# CONFIG_SCTP_DBG_OBJCNT is not set 389# CONFIG_SCTP_DBG_OBJCNT is not set
402# CONFIG_SCTP_HMAC_NONE is not set 390# CONFIG_SCTP_HMAC_NONE is not set
403# CONFIG_SCTP_HMAC_SHA1 is not set 391# CONFIG_SCTP_HMAC_SHA1 is not set
404CONFIG_SCTP_HMAC_MD5=y 392CONFIG_SCTP_HMAC_MD5=y
405
406#
407# TIPC Configuration (EXPERIMENTAL)
408#
409# CONFIG_TIPC is not set 393# CONFIG_TIPC is not set
410# CONFIG_ATM is not set 394# CONFIG_ATM is not set
411# CONFIG_BRIDGE is not set 395# CONFIG_BRIDGE is not set
@@ -501,10 +485,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
501# CONFIG_SGI_IOC4 is not set 485# CONFIG_SGI_IOC4 is not set
502# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
503# CONFIG_BLINK is not set 487# CONFIG_BLINK is not set
504
505#
506# ATA/ATAPI/MFM/RLL support
507#
508# CONFIG_IDE is not set 488# CONFIG_IDE is not set
509 489
510# 490#
@@ -581,7 +561,6 @@ CONFIG_SCSI_IBMVSCSI=m
581# CONFIG_SCSI_DC395x is not set 561# CONFIG_SCSI_DC395x is not set
582# CONFIG_SCSI_DC390T is not set 562# CONFIG_SCSI_DC390T is not set
583# CONFIG_SCSI_DEBUG is not set 563# CONFIG_SCSI_DEBUG is not set
584# CONFIG_SCSI_ESP_CORE is not set
585# CONFIG_SCSI_SRP is not set 564# CONFIG_SCSI_SRP is not set
586# CONFIG_ATA is not set 565# CONFIG_ATA is not set
587 566
@@ -634,10 +613,6 @@ CONFIG_DUMMY=m
634CONFIG_BONDING=m 613CONFIG_BONDING=m
635# CONFIG_EQUALIZER is not set 614# CONFIG_EQUALIZER is not set
636CONFIG_TUN=m 615CONFIG_TUN=m
637
638#
639# ARCnet devices
640#
641# CONFIG_ARCNET is not set 616# CONFIG_ARCNET is not set
642# CONFIG_PHYLIB is not set 617# CONFIG_PHYLIB is not set
643 618
@@ -705,11 +680,6 @@ CONFIG_NETDEV_10000=y
705# CONFIG_NETXEN_NIC is not set 680# CONFIG_NETXEN_NIC is not set
706# CONFIG_PASEMI_MAC is not set 681# CONFIG_PASEMI_MAC is not set
707# CONFIG_MLX4_CORE is not set 682# CONFIG_MLX4_CORE is not set
708CONFIG_MLX4_DEBUG=y
709
710#
711# Token Ring devices
712#
713CONFIG_TR=y 683CONFIG_TR=y
714CONFIG_IBMOL=y 684CONFIG_IBMOL=y
715# CONFIG_3C359 is not set 685# CONFIG_3C359 is not set
@@ -757,6 +727,7 @@ CONFIG_NET_POLL_CONTROLLER=y
757# 727#
758CONFIG_INPUT=y 728CONFIG_INPUT=y
759# CONFIG_INPUT_FF_MEMLESS is not set 729# CONFIG_INPUT_FF_MEMLESS is not set
730# CONFIG_INPUT_POLLDEV is not set
760 731
761# 732#
762# Userland interfaces 733# Userland interfaces
@@ -1139,7 +1110,6 @@ CONFIG_NLS_ISO8859_1=y
1139CONFIG_DLM=m 1110CONFIG_DLM=m
1140# CONFIG_DLM_DEBUG is not set 1111# CONFIG_DLM_DEBUG is not set
1141# CONFIG_UCC_SLOW is not set 1112# CONFIG_UCC_SLOW is not set
1142# CONFIG_UCC_FAST is not set
1143 1113
1144# 1114#
1145# Library routines 1115# Library routines
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index dde66a597a8d..78fd07c5f47f 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc6 3# Linux kernel version: 2.6.22-rc6
4# Sun Jan 28 23:13:56 2007 4# Tue Jun 26 13:25:19 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y
24# CONFIG_GENERIC_TBSYNC is not set 24# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 25CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 26CONFIG_GENERIC_BUG=y
27# CONFIG_DEFAULT_UIMAGE is not set 27CONFIG_DEFAULT_UIMAGE=y
28 28
29# 29#
30# Processor support 30# Processor support
@@ -34,9 +34,9 @@ CONFIG_CLASSIC32=y
34# CONFIG_PPC_83xx is not set 34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set 35# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set 36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 38# CONFIG_40x is not set
38# CONFIG_44x is not set 39# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 40# CONFIG_E200 is not set
41CONFIG_6xx=y 41CONFIG_6xx=y
42CONFIG_PPC_FPU=y 42CONFIG_PPC_FPU=y
@@ -45,6 +45,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_ALTIVEC is not set 45# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y 46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 49# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 51
@@ -63,6 +64,7 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 64CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 65CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y
66CONFIG_POSIX_MQUEUE=y 68CONFIG_POSIX_MQUEUE=y
67# CONFIG_BSD_PROCESS_ACCT is not set 69# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 70# CONFIG_TASKSTATS is not set
@@ -70,8 +72,10 @@ CONFIG_POSIX_MQUEUE=y
70# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
71CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y
75CONFIG_INITRAMFS_SOURCE="" 79CONFIG_INITRAMFS_SOURCE=""
76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
77CONFIG_SYSCTL=y 81CONFIG_SYSCTL=y
@@ -86,14 +90,19 @@ CONFIG_BUG=y
86CONFIG_ELF_CORE=y 90CONFIG_ELF_CORE=y
87CONFIG_BASE_FULL=y 91CONFIG_BASE_FULL=y
88CONFIG_FUTEX=y 92CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 94CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y
96CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 98CONFIG_SHMEM=y
91CONFIG_SLAB=y
92CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
100CONFIG_SLAB=y
101# CONFIG_SLUB is not set
102# CONFIG_SLOB is not set
93CONFIG_RT_MUTEXES=y 103CONFIG_RT_MUTEXES=y
94# CONFIG_TINY_SHMEM is not set 104# CONFIG_TINY_SHMEM is not set
95CONFIG_BASE_SMALL=0 105CONFIG_BASE_SMALL=0
96# CONFIG_SLOB is not set
97 106
98# 107#
99# Loadable module support 108# Loadable module support
@@ -133,8 +142,20 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133CONFIG_EMBEDDED6xx=y 142CONFIG_EMBEDDED6xx=y
134# CONFIG_APUS is not set 143# CONFIG_APUS is not set
135# CONFIG_PPC_MPC52xx is not set 144# CONFIG_PPC_MPC52xx is not set
145# CONFIG_PPC_MPC5200 is not set
136# CONFIG_PPC_CELL is not set 146# CONFIG_PPC_CELL is not set
137# CONFIG_PPC_CELL_NATIVE is not set 147# CONFIG_PPC_CELL_NATIVE is not set
148# CONFIG_PQ2ADS is not set
149CONFIG_LINKSTATION=y
150# CONFIG_MPC7448HPC2 is not set
151# CONFIG_PPC_HOLLY is not set
152# CONFIG_PPC_PRPMC2800 is not set
153CONFIG_MPC10X_BRIDGE=y
154CONFIG_MPC10X_OPENPIC=y
155# CONFIG_MPC10X_STORE_GATHERING is not set
156CONFIG_MPIC=y
157# CONFIG_MPIC_WEIRD is not set
158# CONFIG_PPC_I8259 is not set
138# CONFIG_PPC_RTAS is not set 159# CONFIG_PPC_RTAS is not set
139# CONFIG_MMIO_NVRAM is not set 160# CONFIG_MMIO_NVRAM is not set
140# CONFIG_PPC_MPC106 is not set 161# CONFIG_PPC_MPC106 is not set
@@ -143,39 +164,7 @@ CONFIG_EMBEDDED6xx=y
143# CONFIG_GENERIC_IOMAP is not set 164# CONFIG_GENERIC_IOMAP is not set
144# CONFIG_CPU_FREQ is not set 165# CONFIG_CPU_FREQ is not set
145# CONFIG_TAU is not set 166# CONFIG_TAU is not set
146# CONFIG_KATANA is not set 167# CONFIG_CPM2 is not set
147# CONFIG_WILLOW is not set
148# CONFIG_CPCI690 is not set
149# CONFIG_POWERPMC250 is not set
150# CONFIG_CHESTNUT is not set
151# CONFIG_SPRUCE is not set
152# CONFIG_HDPU is not set
153# CONFIG_EV64260 is not set
154# CONFIG_LOPEC is not set
155# CONFIG_MVME5100 is not set
156# CONFIG_PPLUS is not set
157# CONFIG_PRPMC750 is not set
158# CONFIG_PRPMC800 is not set
159# CONFIG_SANDPOINT is not set
160CONFIG_LINKSTATION=y
161# CONFIG_MPC7448HPC2 is not set
162# CONFIG_RADSTONE_PPC7D is not set
163# CONFIG_PAL4 is not set
164# CONFIG_GEMINI is not set
165# CONFIG_EST8260 is not set
166# CONFIG_SBC82xx is not set
167# CONFIG_SBS8260 is not set
168# CONFIG_RPX8260 is not set
169# CONFIG_TQM8260 is not set
170# CONFIG_ADS8272 is not set
171# CONFIG_PQ2FADS is not set
172# CONFIG_EV64360 is not set
173CONFIG_PPC_GEN550=y
174CONFIG_MPC10X_BRIDGE=y
175CONFIG_MPC10X_OPENPIC=y
176# CONFIG_MPC10X_STORE_GATHERING is not set
177# CONFIG_WANT_EARLY_SERIAL is not set
178CONFIG_MPIC=y
179 168
180# 169#
181# Kernel options 170# Kernel options
@@ -203,33 +192,33 @@ CONFIG_FLAT_NODE_MEM_MAP=y
203# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
204CONFIG_SPLIT_PTLOCK_CPUS=4 193CONFIG_SPLIT_PTLOCK_CPUS=4
205# CONFIG_RESOURCES_64BIT is not set 194# CONFIG_RESOURCES_64BIT is not set
195CONFIG_ZONE_DMA_FLAG=1
206CONFIG_PROC_DEVICETREE=y 196CONFIG_PROC_DEVICETREE=y
207# CONFIG_CMDLINE_BOOL is not set 197# CONFIG_CMDLINE_BOOL is not set
208# CONFIG_PM is not set 198# CONFIG_PM is not set
209CONFIG_SECCOMP=y 199CONFIG_SECCOMP=y
200# CONFIG_WANT_DEVICE_TREE is not set
210CONFIG_ISA_DMA_API=y 201CONFIG_ISA_DMA_API=y
211 202
212# 203#
213# Bus options 204# Bus options
214# 205#
206CONFIG_ZONE_DMA=y
215CONFIG_GENERIC_ISA_DMA=y 207CONFIG_GENERIC_ISA_DMA=y
216# CONFIG_MPIC_WEIRD is not set
217# CONFIG_PPC_I8259 is not set
218CONFIG_PPC_INDIRECT_PCI=y 208CONFIG_PPC_INDIRECT_PCI=y
209# CONFIG_PPC_INDIRECT_PCI_BE is not set
219CONFIG_FSL_SOC=y 210CONFIG_FSL_SOC=y
220CONFIG_PCI=y 211CONFIG_PCI=y
221CONFIG_PCI_DOMAINS=y 212CONFIG_PCI_DOMAINS=y
222# CONFIG_PCIEPORTBUS is not set 213# CONFIG_PCIEPORTBUS is not set
214CONFIG_ARCH_SUPPORTS_MSI=y
215# CONFIG_PCI_MSI is not set
223# CONFIG_PCI_DEBUG is not set 216# CONFIG_PCI_DEBUG is not set
224 217
225# 218#
226# PCCARD (PCMCIA/CardBus) support 219# PCCARD (PCMCIA/CardBus) support
227# 220#
228# CONFIG_PCCARD is not set 221# CONFIG_PCCARD is not set
229
230#
231# PCI Hotplug Support
232#
233# CONFIG_HOTPLUG_PCI is not set 222# CONFIG_HOTPLUG_PCI is not set
234 223
235# 224#
@@ -254,13 +243,13 @@ CONFIG_NET=y
254# 243#
255# Networking options 244# Networking options
256# 245#
257# CONFIG_NETDEBUG is not set
258CONFIG_PACKET=y 246CONFIG_PACKET=y
259CONFIG_PACKET_MMAP=y 247CONFIG_PACKET_MMAP=y
260CONFIG_UNIX=y 248CONFIG_UNIX=y
261CONFIG_XFRM=y 249CONFIG_XFRM=y
262# CONFIG_XFRM_USER is not set 250# CONFIG_XFRM_USER is not set
263# CONFIG_XFRM_SUB_POLICY is not set 251# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set
264# CONFIG_NET_KEY is not set 253# CONFIG_NET_KEY is not set
265CONFIG_INET=y 254CONFIG_INET=y
266CONFIG_IP_MULTICAST=y 255CONFIG_IP_MULTICAST=y
@@ -289,10 +278,6 @@ CONFIG_INET_TCP_DIAG=y
289CONFIG_TCP_CONG_CUBIC=y 278CONFIG_TCP_CONG_CUBIC=y
290CONFIG_DEFAULT_TCP_CONG="cubic" 279CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_TCP_MD5SIG is not set 280# CONFIG_TCP_MD5SIG is not set
292
293#
294# IP: Virtual Server Configuration
295#
296# CONFIG_IP_VS is not set 281# CONFIG_IP_VS is not set
297# CONFIG_IPV6 is not set 282# CONFIG_IPV6 is not set
298# CONFIG_INET6_XFRM_TUNNEL is not set 283# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -306,8 +291,6 @@ CONFIG_NETFILTER=y
306# 291#
307# CONFIG_NETFILTER_NETLINK is not set 292# CONFIG_NETFILTER_NETLINK is not set
308CONFIG_NF_CONNTRACK_ENABLED=m 293CONFIG_NF_CONNTRACK_ENABLED=m
309CONFIG_NF_CONNTRACK_SUPPORT=y
310# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
311CONFIG_NF_CONNTRACK=m 294CONFIG_NF_CONNTRACK=m
312# CONFIG_NF_CT_ACCT is not set 295# CONFIG_NF_CT_ACCT is not set
313# CONFIG_NF_CONNTRACK_MARK is not set 296# CONFIG_NF_CONNTRACK_MARK is not set
@@ -320,16 +303,21 @@ CONFIG_NF_CONNTRACK_H323=m
320CONFIG_NF_CONNTRACK_IRC=m 303CONFIG_NF_CONNTRACK_IRC=m
321CONFIG_NF_CONNTRACK_NETBIOS_NS=m 304CONFIG_NF_CONNTRACK_NETBIOS_NS=m
322CONFIG_NF_CONNTRACK_PPTP=m 305CONFIG_NF_CONNTRACK_PPTP=m
306# CONFIG_NF_CONNTRACK_SANE is not set
323CONFIG_NF_CONNTRACK_SIP=m 307CONFIG_NF_CONNTRACK_SIP=m
324CONFIG_NF_CONNTRACK_TFTP=m 308CONFIG_NF_CONNTRACK_TFTP=m
325CONFIG_NETFILTER_XTABLES=m 309CONFIG_NETFILTER_XTABLES=m
326# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set 310# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
311# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
327# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 312# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
328# CONFIG_NETFILTER_XT_TARGET_MARK is not set 313# CONFIG_NETFILTER_XT_TARGET_MARK is not set
329# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 314# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
330# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 315# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
331# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 316# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
317# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
332# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 318# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
319# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
320# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
333# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 321# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
334# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 322# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
335# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 323# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
@@ -370,7 +358,6 @@ CONFIG_IP_NF_FILTER=m
370CONFIG_IP_NF_TARGET_REJECT=m 358CONFIG_IP_NF_TARGET_REJECT=m
371# CONFIG_IP_NF_TARGET_LOG is not set 359# CONFIG_IP_NF_TARGET_LOG is not set
372# CONFIG_IP_NF_TARGET_ULOG is not set 360# CONFIG_IP_NF_TARGET_ULOG is not set
373# CONFIG_IP_NF_TARGET_TCPMSS is not set
374CONFIG_NF_NAT=m 361CONFIG_NF_NAT=m
375CONFIG_NF_NAT_NEEDED=y 362CONFIG_NF_NAT_NEEDED=y
376CONFIG_IP_NF_TARGET_MASQUERADE=m 363CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -390,24 +377,13 @@ CONFIG_IP_NF_MANGLE=m
390CONFIG_IP_NF_TARGET_TOS=m 377CONFIG_IP_NF_TARGET_TOS=m
391CONFIG_IP_NF_TARGET_ECN=m 378CONFIG_IP_NF_TARGET_ECN=m
392CONFIG_IP_NF_TARGET_TTL=m 379CONFIG_IP_NF_TARGET_TTL=m
380# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
393CONFIG_IP_NF_RAW=m 381CONFIG_IP_NF_RAW=m
394CONFIG_IP_NF_ARPTABLES=m 382CONFIG_IP_NF_ARPTABLES=m
395CONFIG_IP_NF_ARPFILTER=m 383CONFIG_IP_NF_ARPFILTER=m
396CONFIG_IP_NF_ARP_MANGLE=m 384CONFIG_IP_NF_ARP_MANGLE=m
397
398#
399# DCCP Configuration (EXPERIMENTAL)
400#
401# CONFIG_IP_DCCP is not set 385# CONFIG_IP_DCCP is not set
402
403#
404# SCTP Configuration (EXPERIMENTAL)
405#
406# CONFIG_IP_SCTP is not set 386# CONFIG_IP_SCTP is not set
407
408#
409# TIPC Configuration (EXPERIMENTAL)
410#
411# CONFIG_TIPC is not set 387# CONFIG_TIPC is not set
412# CONFIG_ATM is not set 388# CONFIG_ATM is not set
413# CONFIG_BRIDGE is not set 389# CONFIG_BRIDGE is not set
@@ -433,6 +409,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
433# CONFIG_HAMRADIO is not set 409# CONFIG_HAMRADIO is not set
434# CONFIG_IRDA is not set 410# CONFIG_IRDA is not set
435# CONFIG_BT is not set 411# CONFIG_BT is not set
412# CONFIG_AF_RXRPC is not set
413
414#
415# Wireless
416#
417# CONFIG_CFG80211 is not set
418CONFIG_WIRELESS_EXT=y
419# CONFIG_MAC80211 is not set
436CONFIG_IEEE80211=m 420CONFIG_IEEE80211=m
437CONFIG_IEEE80211_DEBUG=y 421CONFIG_IEEE80211_DEBUG=y
438CONFIG_IEEE80211_CRYPT_WEP=m 422CONFIG_IEEE80211_CRYPT_WEP=m
@@ -440,7 +424,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
440CONFIG_IEEE80211_CRYPT_TKIP=m 424CONFIG_IEEE80211_CRYPT_TKIP=m
441CONFIG_IEEE80211_SOFTMAC=m 425CONFIG_IEEE80211_SOFTMAC=m
442CONFIG_IEEE80211_SOFTMAC_DEBUG=y 426CONFIG_IEEE80211_SOFTMAC_DEBUG=y
443CONFIG_WIRELESS_EXT=y 427# CONFIG_RFKILL is not set
444 428
445# 429#
446# Device Drivers 430# Device Drivers
@@ -453,16 +437,13 @@ CONFIG_STANDALONE=y
453CONFIG_PREVENT_FIRMWARE_BUILD=y 437CONFIG_PREVENT_FIRMWARE_BUILD=y
454CONFIG_FW_LOADER=m 438CONFIG_FW_LOADER=m
455# CONFIG_DEBUG_DRIVER is not set 439# CONFIG_DEBUG_DRIVER is not set
440# CONFIG_DEBUG_DEVRES is not set
456# CONFIG_SYS_HYPERVISOR is not set 441# CONFIG_SYS_HYPERVISOR is not set
457 442
458# 443#
459# Connector - unified userspace <-> kernelspace linker 444# Connector - unified userspace <-> kernelspace linker
460# 445#
461# CONFIG_CONNECTOR is not set 446# CONFIG_CONNECTOR is not set
462
463#
464# Memory Technology Devices (MTD)
465#
466CONFIG_MTD=y 447CONFIG_MTD=y
467# CONFIG_MTD_DEBUG is not set 448# CONFIG_MTD_DEBUG is not set
468CONFIG_MTD_CONCAT=y 449CONFIG_MTD_CONCAT=y
@@ -511,7 +492,6 @@ CONFIG_MTD_CFI_UTIL=y
511# CONFIG_MTD_RAM is not set 492# CONFIG_MTD_RAM is not set
512# CONFIG_MTD_ROM is not set 493# CONFIG_MTD_ROM is not set
513# CONFIG_MTD_ABSENT is not set 494# CONFIG_MTD_ABSENT is not set
514# CONFIG_MTD_OBSOLETE_CHIPS is not set
515 495
516# 496#
517# Mapping drivers for chip access 497# Mapping drivers for chip access
@@ -539,17 +519,13 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
539# CONFIG_MTD_DOC2000 is not set 519# CONFIG_MTD_DOC2000 is not set
540# CONFIG_MTD_DOC2001 is not set 520# CONFIG_MTD_DOC2001 is not set
541# CONFIG_MTD_DOC2001PLUS is not set 521# CONFIG_MTD_DOC2001PLUS is not set
542
543#
544# NAND Flash Device Drivers
545#
546# CONFIG_MTD_NAND is not set 522# CONFIG_MTD_NAND is not set
547# CONFIG_MTD_NAND_CAFE is not set 523# CONFIG_MTD_ONENAND is not set
548 524
549# 525#
550# OneNAND Flash Device Drivers 526# UBI - Unsorted block images
551# 527#
552# CONFIG_MTD_ONENAND is not set 528# CONFIG_MTD_UBI is not set
553 529
554# 530#
555# Parallel port support 531# Parallel port support
@@ -559,6 +535,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
559# 535#
560# Plug and Play support 536# Plug and Play support
561# 537#
538# CONFIG_PNPACPI is not set
562 539
563# 540#
564# Block devices 541# Block devices
@@ -578,19 +555,16 @@ CONFIG_BLK_DEV_RAM=y
578CONFIG_BLK_DEV_RAM_COUNT=2 555CONFIG_BLK_DEV_RAM_COUNT=2
579CONFIG_BLK_DEV_RAM_SIZE=8192 556CONFIG_BLK_DEV_RAM_SIZE=8192
580CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 557CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
581CONFIG_BLK_DEV_INITRD=y
582# CONFIG_CDROM_PKTCDVD is not set 558# CONFIG_CDROM_PKTCDVD is not set
583# CONFIG_ATA_OVER_ETH is not set 559# CONFIG_ATA_OVER_ETH is not set
584 560
585# 561#
586# Misc devices 562# Misc devices
587# 563#
564# CONFIG_PHANTOM is not set
588# CONFIG_SGI_IOC4 is not set 565# CONFIG_SGI_IOC4 is not set
589# CONFIG_TIFM_CORE is not set 566# CONFIG_TIFM_CORE is not set
590 567# CONFIG_BLINK is not set
591#
592# ATA/ATAPI/MFM/RLL support
593#
594# CONFIG_IDE is not set 568# CONFIG_IDE is not set
595 569
596# 570#
@@ -619,6 +593,7 @@ CONFIG_SCSI_MULTI_LUN=y
619# CONFIG_SCSI_CONSTANTS is not set 593# CONFIG_SCSI_CONSTANTS is not set
620# CONFIG_SCSI_LOGGING is not set 594# CONFIG_SCSI_LOGGING is not set
621# CONFIG_SCSI_SCAN_ASYNC is not set 595# CONFIG_SCSI_SCAN_ASYNC is not set
596CONFIG_SCSI_WAIT_SCAN=m
622 597
623# 598#
624# SCSI Transports 599# SCSI Transports
@@ -667,11 +642,8 @@ CONFIG_SCSI_MULTI_LUN=y
667# CONFIG_SCSI_NSP32 is not set 642# CONFIG_SCSI_NSP32 is not set
668# CONFIG_SCSI_DEBUG is not set 643# CONFIG_SCSI_DEBUG is not set
669# CONFIG_SCSI_SRP is not set 644# CONFIG_SCSI_SRP is not set
670
671#
672# Serial ATA (prod) and Parallel ATA (experimental) drivers
673#
674CONFIG_ATA=y 645CONFIG_ATA=y
646# CONFIG_ATA_NONSTANDARD is not set
675# CONFIG_SATA_AHCI is not set 647# CONFIG_SATA_AHCI is not set
676# CONFIG_SATA_SVW is not set 648# CONFIG_SATA_SVW is not set
677# CONFIG_ATA_PIIX is not set 649# CONFIG_ATA_PIIX is not set
@@ -687,10 +659,12 @@ CONFIG_ATA=y
687# CONFIG_SATA_ULI is not set 659# CONFIG_SATA_ULI is not set
688# CONFIG_SATA_VIA is not set 660# CONFIG_SATA_VIA is not set
689# CONFIG_SATA_VITESSE is not set 661# CONFIG_SATA_VITESSE is not set
662# CONFIG_SATA_INIC162X is not set
690# CONFIG_PATA_ALI is not set 663# CONFIG_PATA_ALI is not set
691# CONFIG_PATA_AMD is not set 664# CONFIG_PATA_AMD is not set
692# CONFIG_PATA_ARTOP is not set 665# CONFIG_PATA_ARTOP is not set
693# CONFIG_PATA_ATIIXP is not set 666# CONFIG_PATA_ATIIXP is not set
667# CONFIG_PATA_CMD640_PCI is not set
694# CONFIG_PATA_CMD64X is not set 668# CONFIG_PATA_CMD64X is not set
695# CONFIG_PATA_CS5520 is not set 669# CONFIG_PATA_CS5520 is not set
696# CONFIG_PATA_CS5530 is not set 670# CONFIG_PATA_CS5530 is not set
@@ -702,6 +676,7 @@ CONFIG_ATA=y
702# CONFIG_PATA_HPT3X2N is not set 676# CONFIG_PATA_HPT3X2N is not set
703# CONFIG_PATA_HPT3X3 is not set 677# CONFIG_PATA_HPT3X3 is not set
704CONFIG_PATA_IT821X=y 678CONFIG_PATA_IT821X=y
679# CONFIG_PATA_IT8213 is not set
705# CONFIG_PATA_JMICRON is not set 680# CONFIG_PATA_JMICRON is not set
706# CONFIG_PATA_TRIFLEX is not set 681# CONFIG_PATA_TRIFLEX is not set
707# CONFIG_PATA_MARVELL is not set 682# CONFIG_PATA_MARVELL is not set
@@ -738,18 +713,14 @@ CONFIG_PATA_SIL680=y
738# 713#
739# IEEE 1394 (FireWire) support 714# IEEE 1394 (FireWire) support
740# 715#
716# CONFIG_FIREWIRE is not set
741# CONFIG_IEEE1394 is not set 717# CONFIG_IEEE1394 is not set
742 718
743# 719#
744# I2O device support 720# I2O device support
745# 721#
746# CONFIG_I2O is not set 722# CONFIG_I2O is not set
747 723# CONFIG_MACINTOSH_DRIVERS is not set
748#
749# Macintosh device drivers
750#
751# CONFIG_MAC_EMUMOUSEBTN is not set
752# CONFIG_WINDFARM is not set
753 724
754# 725#
755# Network device support 726# Network device support
@@ -759,15 +730,7 @@ CONFIG_NETDEVICES=y
759# CONFIG_BONDING is not set 730# CONFIG_BONDING is not set
760# CONFIG_EQUALIZER is not set 731# CONFIG_EQUALIZER is not set
761CONFIG_TUN=m 732CONFIG_TUN=m
762
763#
764# ARCnet devices
765#
766# CONFIG_ARCNET is not set 733# CONFIG_ARCNET is not set
767
768#
769# PHY device support
770#
771# CONFIG_PHYLIB is not set 734# CONFIG_PHYLIB is not set
772 735
773# 736#
@@ -795,10 +758,7 @@ CONFIG_TULIP_MMIO=y
795# CONFIG_ULI526X is not set 758# CONFIG_ULI526X is not set
796# CONFIG_HP100 is not set 759# CONFIG_HP100 is not set
797# CONFIG_NET_PCI is not set 760# CONFIG_NET_PCI is not set
798 761CONFIG_NETDEV_1000=y
799#
800# Ethernet (1000 Mbit)
801#
802# CONFIG_ACENIC is not set 762# CONFIG_ACENIC is not set
803# CONFIG_DL2K is not set 763# CONFIG_DL2K is not set
804# CONFIG_E1000 is not set 764# CONFIG_E1000 is not set
@@ -811,58 +771,36 @@ CONFIG_R8169=y
811# CONFIG_SKGE is not set 771# CONFIG_SKGE is not set
812# CONFIG_SKY2 is not set 772# CONFIG_SKY2 is not set
813# CONFIG_SK98LIN is not set 773# CONFIG_SK98LIN is not set
774# CONFIG_VIA_VELOCITY is not set
814# CONFIG_TIGON3 is not set 775# CONFIG_TIGON3 is not set
815# CONFIG_BNX2 is not set 776# CONFIG_BNX2 is not set
816# CONFIG_QLA3XXX is not set 777# CONFIG_QLA3XXX is not set
817 778# CONFIG_ATL1 is not set
818# 779CONFIG_NETDEV_10000=y
819# Ethernet (10000 Mbit)
820#
821# CONFIG_CHELSIO_T1 is not set 780# CONFIG_CHELSIO_T1 is not set
781# CONFIG_CHELSIO_T3 is not set
822# CONFIG_IXGB is not set 782# CONFIG_IXGB is not set
823# CONFIG_S2IO is not set 783# CONFIG_S2IO is not set
824# CONFIG_MYRI10GE is not set 784# CONFIG_MYRI10GE is not set
825# CONFIG_NETXEN_NIC is not set 785# CONFIG_NETXEN_NIC is not set
826 786# CONFIG_MLX4_CORE is not set
827#
828# Token Ring devices
829#
830# CONFIG_TR is not set 787# CONFIG_TR is not set
831 788
832# 789#
833# Wireless LAN (non-hamradio) 790# Wireless LAN
834#
835CONFIG_NET_RADIO=y
836# CONFIG_NET_WIRELESS_RTNETLINK is not set
837
838#
839# Obsolete Wireless cards support (pre-802.11)
840#
841# CONFIG_STRIP is not set
842
843#
844# Wireless 802.11b ISA/PCI cards support
845#
846# CONFIG_IPW2100 is not set
847# CONFIG_IPW2200 is not set
848# CONFIG_AIRO is not set
849# CONFIG_HERMES is not set
850# CONFIG_ATMEL is not set
851
852#
853# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
854# 791#
855# CONFIG_PRISM54 is not set 792# CONFIG_WLAN_PRE80211 is not set
856# CONFIG_USB_ZD1201 is not set 793# CONFIG_WLAN_80211 is not set
857# CONFIG_HOSTAP is not set
858# CONFIG_BCM43XX is not set
859CONFIG_ZD1211RW=m
860# CONFIG_ZD1211RW_DEBUG is not set
861CONFIG_NET_WIRELESS=y
862 794
863# 795#
864# Wan interfaces 796# USB Network Adapters
865# 797#
798# CONFIG_USB_CATC is not set
799# CONFIG_USB_KAWETH is not set
800# CONFIG_USB_PEGASUS is not set
801# CONFIG_USB_RTL8150 is not set
802# CONFIG_USB_USBNET_MII is not set
803# CONFIG_USB_USBNET is not set
866# CONFIG_WAN is not set 804# CONFIG_WAN is not set
867# CONFIG_FDDI is not set 805# CONFIG_FDDI is not set
868# CONFIG_HIPPI is not set 806# CONFIG_HIPPI is not set
@@ -872,7 +810,6 @@ CONFIG_NET_WIRELESS=y
872# CONFIG_SHAPER is not set 810# CONFIG_SHAPER is not set
873CONFIG_NETCONSOLE=y 811CONFIG_NETCONSOLE=y
874CONFIG_NETPOLL=y 812CONFIG_NETPOLL=y
875# CONFIG_NETPOLL_RX is not set
876# CONFIG_NETPOLL_TRAP is not set 813# CONFIG_NETPOLL_TRAP is not set
877CONFIG_NET_POLL_CONTROLLER=y 814CONFIG_NET_POLL_CONTROLLER=y
878 815
@@ -891,6 +828,7 @@ CONFIG_NET_POLL_CONTROLLER=y
891# 828#
892CONFIG_INPUT=y 829CONFIG_INPUT=y
893# CONFIG_INPUT_FF_MEMLESS is not set 830# CONFIG_INPUT_FF_MEMLESS is not set
831# CONFIG_INPUT_POLLDEV is not set
894 832
895# 833#
896# Userland interfaces 834# Userland interfaces
@@ -910,8 +848,14 @@ CONFIG_INPUT_EVDEV=m
910# CONFIG_INPUT_KEYBOARD is not set 848# CONFIG_INPUT_KEYBOARD is not set
911# CONFIG_INPUT_MOUSE is not set 849# CONFIG_INPUT_MOUSE is not set
912# CONFIG_INPUT_JOYSTICK is not set 850# CONFIG_INPUT_JOYSTICK is not set
851# CONFIG_INPUT_TABLET is not set
913# CONFIG_INPUT_TOUCHSCREEN is not set 852# CONFIG_INPUT_TOUCHSCREEN is not set
914CONFIG_INPUT_MISC=y 853CONFIG_INPUT_MISC=y
854# CONFIG_INPUT_ATI_REMOTE is not set
855# CONFIG_INPUT_ATI_REMOTE2 is not set
856# CONFIG_INPUT_KEYSPAN_REMOTE is not set
857# CONFIG_INPUT_POWERMATE is not set
858# CONFIG_INPUT_YEALINK is not set
915CONFIG_INPUT_UINPUT=m 859CONFIG_INPUT_UINPUT=m
916 860
917# 861#
@@ -950,6 +894,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
950CONFIG_SERIAL_CORE=y 894CONFIG_SERIAL_CORE=y
951CONFIG_SERIAL_CORE_CONSOLE=y 895CONFIG_SERIAL_CORE_CONSOLE=y
952# CONFIG_SERIAL_JSM is not set 896# CONFIG_SERIAL_JSM is not set
897CONFIG_SERIAL_OF_PLATFORM=y
953CONFIG_UNIX98_PTYS=y 898CONFIG_UNIX98_PTYS=y
954CONFIG_LEGACY_PTYS=y 899CONFIG_LEGACY_PTYS=y
955CONFIG_LEGACY_PTY_COUNT=256 900CONFIG_LEGACY_PTY_COUNT=256
@@ -958,15 +903,10 @@ CONFIG_LEGACY_PTY_COUNT=256
958# IPMI 903# IPMI
959# 904#
960# CONFIG_IPMI_HANDLER is not set 905# CONFIG_IPMI_HANDLER is not set
961
962#
963# Watchdog Cards
964#
965# CONFIG_WATCHDOG is not set 906# CONFIG_WATCHDOG is not set
966CONFIG_HW_RANDOM=y 907CONFIG_HW_RANDOM=y
967# CONFIG_NVRAM is not set 908# CONFIG_NVRAM is not set
968# CONFIG_GEN_RTC is not set 909# CONFIG_GEN_RTC is not set
969# CONFIG_DTLK is not set
970# CONFIG_R3964 is not set 910# CONFIG_R3964 is not set
971# CONFIG_APPLICOM is not set 911# CONFIG_APPLICOM is not set
972# CONFIG_AGP is not set 912# CONFIG_AGP is not set
@@ -977,11 +917,9 @@ CONFIG_HW_RANDOM=y
977# TPM devices 917# TPM devices
978# 918#
979# CONFIG_TCG_TPM is not set 919# CONFIG_TCG_TPM is not set
980 920CONFIG_DEVPORT=y
981#
982# I2C support
983#
984CONFIG_I2C=y 921CONFIG_I2C=y
922CONFIG_I2C_BOARDINFO=y
985CONFIG_I2C_CHARDEV=y 923CONFIG_I2C_CHARDEV=y
986 924
987# 925#
@@ -1008,14 +946,15 @@ CONFIG_I2C_MPC=y
1008# CONFIG_I2C_PARPORT_LIGHT is not set 946# CONFIG_I2C_PARPORT_LIGHT is not set
1009# CONFIG_I2C_PROSAVAGE is not set 947# CONFIG_I2C_PROSAVAGE is not set
1010# CONFIG_I2C_SAVAGE4 is not set 948# CONFIG_I2C_SAVAGE4 is not set
949# CONFIG_I2C_SIMTEC is not set
1011# CONFIG_I2C_SIS5595 is not set 950# CONFIG_I2C_SIS5595 is not set
1012# CONFIG_I2C_SIS630 is not set 951# CONFIG_I2C_SIS630 is not set
1013# CONFIG_I2C_SIS96X is not set 952# CONFIG_I2C_SIS96X is not set
1014# CONFIG_I2C_STUB is not set 953# CONFIG_I2C_STUB is not set
954# CONFIG_I2C_TINY_USB is not set
1015# CONFIG_I2C_VIA is not set 955# CONFIG_I2C_VIA is not set
1016# CONFIG_I2C_VIAPRO is not set 956# CONFIG_I2C_VIAPRO is not set
1017# CONFIG_I2C_VOODOO3 is not set 957# CONFIG_I2C_VOODOO3 is not set
1018# CONFIG_I2C_PCA_ISA is not set
1019 958
1020# 959#
1021# Miscellaneous I2C Chip support 960# Miscellaneous I2C Chip support
@@ -1043,16 +982,14 @@ CONFIG_SENSORS_EEPROM=m
1043# Dallas's 1-wire bus 982# Dallas's 1-wire bus
1044# 983#
1045# CONFIG_W1 is not set 984# CONFIG_W1 is not set
1046
1047#
1048# Hardware Monitoring support
1049#
1050CONFIG_HWMON=y 985CONFIG_HWMON=y
1051# CONFIG_HWMON_VID is not set 986# CONFIG_HWMON_VID is not set
1052# CONFIG_SENSORS_ABITUGURU is not set 987# CONFIG_SENSORS_ABITUGURU is not set
988# CONFIG_SENSORS_AD7418 is not set
1053# CONFIG_SENSORS_ADM1021 is not set 989# CONFIG_SENSORS_ADM1021 is not set
1054# CONFIG_SENSORS_ADM1025 is not set 990# CONFIG_SENSORS_ADM1025 is not set
1055# CONFIG_SENSORS_ADM1026 is not set 991# CONFIG_SENSORS_ADM1026 is not set
992# CONFIG_SENSORS_ADM1029 is not set
1056# CONFIG_SENSORS_ADM1031 is not set 993# CONFIG_SENSORS_ADM1031 is not set
1057# CONFIG_SENSORS_ADM9240 is not set 994# CONFIG_SENSORS_ADM9240 is not set
1058# CONFIG_SENSORS_ASB100 is not set 995# CONFIG_SENSORS_ASB100 is not set
@@ -1075,6 +1012,7 @@ CONFIG_HWMON=y
1075# CONFIG_SENSORS_LM90 is not set 1012# CONFIG_SENSORS_LM90 is not set
1076# CONFIG_SENSORS_LM92 is not set 1013# CONFIG_SENSORS_LM92 is not set
1077# CONFIG_SENSORS_MAX1619 is not set 1014# CONFIG_SENSORS_MAX1619 is not set
1015# CONFIG_SENSORS_MAX6650 is not set
1078# CONFIG_SENSORS_PC87360 is not set 1016# CONFIG_SENSORS_PC87360 is not set
1079# CONFIG_SENSORS_PC87427 is not set 1017# CONFIG_SENSORS_PC87427 is not set
1080# CONFIG_SENSORS_SIS5595 is not set 1018# CONFIG_SENSORS_SIS5595 is not set
@@ -1094,20 +1032,27 @@ CONFIG_HWMON=y
1094# CONFIG_HWMON_DEBUG_CHIP is not set 1032# CONFIG_HWMON_DEBUG_CHIP is not set
1095 1033
1096# 1034#
1035# Multifunction device drivers
1036#
1037# CONFIG_MFD_SM501 is not set
1038
1039#
1097# Multimedia devices 1040# Multimedia devices
1098# 1041#
1099# CONFIG_VIDEO_DEV is not set 1042# CONFIG_VIDEO_DEV is not set
1043# CONFIG_DVB_CORE is not set
1044# CONFIG_DAB is not set
1100 1045
1101# 1046#
1102# Digital Video Broadcasting Devices 1047# Graphics support
1103# 1048#
1104# CONFIG_DVB is not set 1049# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1105# CONFIG_USB_DABUSB is not set
1106 1050
1107# 1051#
1108# Graphics support 1052# Display device support
1109# 1053#
1110CONFIG_FIRMWARE_EDID=y 1054# CONFIG_DISPLAY_SUPPORT is not set
1055# CONFIG_VGASTATE is not set
1111# CONFIG_FB is not set 1056# CONFIG_FB is not set
1112# CONFIG_FB_IBM_GXT4500 is not set 1057# CONFIG_FB_IBM_GXT4500 is not set
1113 1058
@@ -1116,7 +1061,6 @@ CONFIG_FIRMWARE_EDID=y
1116# 1061#
1117# CONFIG_VGA_CONSOLE is not set 1062# CONFIG_VGA_CONSOLE is not set
1118CONFIG_DUMMY_CONSOLE=y 1063CONFIG_DUMMY_CONSOLE=y
1119# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1120 1064
1121# 1065#
1122# Sound 1066# Sound
@@ -1127,6 +1071,18 @@ CONFIG_DUMMY_CONSOLE=y
1127# HID Devices 1071# HID Devices
1128# 1072#
1129CONFIG_HID=m 1073CONFIG_HID=m
1074# CONFIG_HID_DEBUG is not set
1075
1076#
1077# USB Input Devices
1078#
1079# CONFIG_USB_HID is not set
1080
1081#
1082# USB HID Boot Protocol drivers
1083#
1084# CONFIG_USB_KBD is not set
1085# CONFIG_USB_MOUSE is not set
1130 1086
1131# 1087#
1132# USB support 1088# USB support
@@ -1141,7 +1097,7 @@ CONFIG_USB=y
1141# Miscellaneous USB options 1097# Miscellaneous USB options
1142# 1098#
1143CONFIG_USB_DEVICEFS=y 1099CONFIG_USB_DEVICEFS=y
1144# CONFIG_USB_BANDWIDTH is not set 1100CONFIG_USB_DEVICE_CLASS=y
1145# CONFIG_USB_DYNAMIC_MINORS is not set 1101# CONFIG_USB_DYNAMIC_MINORS is not set
1146# CONFIG_USB_OTG is not set 1102# CONFIG_USB_OTG is not set
1147 1103
@@ -1152,9 +1108,15 @@ CONFIG_USB_EHCI_HCD=y
1152# CONFIG_USB_EHCI_SPLIT_ISO is not set 1108# CONFIG_USB_EHCI_SPLIT_ISO is not set
1153# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1109# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1154# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1110# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1111# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1155# CONFIG_USB_ISP116X_HCD is not set 1112# CONFIG_USB_ISP116X_HCD is not set
1156CONFIG_USB_OHCI_HCD=y 1113CONFIG_USB_OHCI_HCD=y
1157# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1114CONFIG_USB_OHCI_HCD_PPC_OF=y
1115CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1116# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
1117CONFIG_USB_OHCI_HCD_PCI=y
1118CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1119CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1158CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1120CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1159# CONFIG_USB_UHCI_HCD is not set 1121# CONFIG_USB_UHCI_HCD is not set
1160# CONFIG_USB_SL811_HCD is not set 1122# CONFIG_USB_SL811_HCD is not set
@@ -1187,43 +1149,10 @@ CONFIG_USB_STORAGE=m
1187# CONFIG_USB_LIBUSUAL is not set 1149# CONFIG_USB_LIBUSUAL is not set
1188 1150
1189# 1151#
1190# USB Input Devices
1191#
1192# CONFIG_USB_HID is not set
1193
1194#
1195# USB HID Boot Protocol drivers
1196#
1197# CONFIG_USB_KBD is not set
1198# CONFIG_USB_MOUSE is not set
1199# CONFIG_USB_AIPTEK is not set
1200# CONFIG_USB_WACOM is not set
1201# CONFIG_USB_ACECAD is not set
1202# CONFIG_USB_KBTAB is not set
1203# CONFIG_USB_POWERMATE is not set
1204# CONFIG_USB_TOUCHSCREEN is not set
1205# CONFIG_USB_YEALINK is not set
1206# CONFIG_USB_XPAD is not set
1207# CONFIG_USB_ATI_REMOTE is not set
1208# CONFIG_USB_ATI_REMOTE2 is not set
1209# CONFIG_USB_KEYSPAN_REMOTE is not set
1210# CONFIG_USB_APPLETOUCH is not set
1211
1212#
1213# USB Imaging devices 1152# USB Imaging devices
1214# 1153#
1215# CONFIG_USB_MDC800 is not set 1154# CONFIG_USB_MDC800 is not set
1216# CONFIG_USB_MICROTEK is not set 1155# CONFIG_USB_MICROTEK is not set
1217
1218#
1219# USB Network Adapters
1220#
1221# CONFIG_USB_CATC is not set
1222# CONFIG_USB_KAWETH is not set
1223# CONFIG_USB_PEGASUS is not set
1224# CONFIG_USB_RTL8150 is not set
1225# CONFIG_USB_USBNET_MII is not set
1226# CONFIG_USB_USBNET is not set
1227CONFIG_USB_MON=y 1156CONFIG_USB_MON=y
1228 1157
1229# 1158#
@@ -1283,6 +1212,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1283# CONFIG_USB_RIO500 is not set 1212# CONFIG_USB_RIO500 is not set
1284# CONFIG_USB_LEGOTOWER is not set 1213# CONFIG_USB_LEGOTOWER is not set
1285# CONFIG_USB_LCD is not set 1214# CONFIG_USB_LCD is not set
1215# CONFIG_USB_BERRY_CHARGE is not set
1286# CONFIG_USB_LED is not set 1216# CONFIG_USB_LED is not set
1287# CONFIG_USB_CYPRESS_CY7C63 is not set 1217# CONFIG_USB_CYPRESS_CY7C63 is not set
1288# CONFIG_USB_CYTHERM is not set 1218# CONFIG_USB_CYTHERM is not set
@@ -1293,6 +1223,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1293# CONFIG_USB_SISUSBVGA is not set 1223# CONFIG_USB_SISUSBVGA is not set
1294# CONFIG_USB_LD is not set 1224# CONFIG_USB_LD is not set
1295# CONFIG_USB_TRANCEVIBRATOR is not set 1225# CONFIG_USB_TRANCEVIBRATOR is not set
1226# CONFIG_USB_IOWARRIOR is not set
1296# CONFIG_USB_TEST is not set 1227# CONFIG_USB_TEST is not set
1297 1228
1298# 1229#
@@ -1303,10 +1234,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1303# USB Gadget Support 1234# USB Gadget Support
1304# 1235#
1305# CONFIG_USB_GADGET is not set 1236# CONFIG_USB_GADGET is not set
1306
1307#
1308# MMC/SD Card support
1309#
1310# CONFIG_MMC is not set 1237# CONFIG_MMC is not set
1311 1238
1312# 1239#
@@ -1347,24 +1274,37 @@ CONFIG_RTC_INTF_SYSFS=y
1347CONFIG_RTC_INTF_PROC=y 1274CONFIG_RTC_INTF_PROC=y
1348CONFIG_RTC_INTF_DEV=y 1275CONFIG_RTC_INTF_DEV=y
1349# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 1276# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1277# CONFIG_RTC_DRV_TEST is not set
1350 1278
1351# 1279#
1352# RTC drivers 1280# I2C RTC drivers
1353# 1281#
1354# CONFIG_RTC_DRV_X1205 is not set
1355# CONFIG_RTC_DRV_DS1307 is not set 1282# CONFIG_RTC_DRV_DS1307 is not set
1356# CONFIG_RTC_DRV_DS1553 is not set
1357# CONFIG_RTC_DRV_ISL1208 is not set
1358# CONFIG_RTC_DRV_DS1672 is not set 1283# CONFIG_RTC_DRV_DS1672 is not set
1359# CONFIG_RTC_DRV_DS1742 is not set 1284# CONFIG_RTC_DRV_MAX6900 is not set
1285CONFIG_RTC_DRV_RS5C372=y
1286# CONFIG_RTC_DRV_ISL1208 is not set
1287# CONFIG_RTC_DRV_X1205 is not set
1360# CONFIG_RTC_DRV_PCF8563 is not set 1288# CONFIG_RTC_DRV_PCF8563 is not set
1361# CONFIG_RTC_DRV_PCF8583 is not set 1289# CONFIG_RTC_DRV_PCF8583 is not set
1362CONFIG_RTC_DRV_RS5C372=y 1290
1291#
1292# SPI RTC drivers
1293#
1294
1295#
1296# Platform RTC drivers
1297#
1298# CONFIG_RTC_DRV_DS1553 is not set
1299# CONFIG_RTC_DRV_DS1742 is not set
1363# CONFIG_RTC_DRV_M48T86 is not set 1300# CONFIG_RTC_DRV_M48T86 is not set
1364# CONFIG_RTC_DRV_TEST is not set
1365# CONFIG_RTC_DRV_V3020 is not set 1301# CONFIG_RTC_DRV_V3020 is not set
1366 1302
1367# 1303#
1304# on-CPU RTC drivers
1305#
1306
1307#
1368# DMA Engine support 1308# DMA Engine support
1369# 1309#
1370# CONFIG_DMA_ENGINE is not set 1310# CONFIG_DMA_ENGINE is not set
@@ -1378,10 +1318,6 @@ CONFIG_RTC_DRV_RS5C372=y
1378# 1318#
1379 1319
1380# 1320#
1381# Virtualization
1382#
1383
1384#
1385# File systems 1321# File systems
1386# 1322#
1387CONFIG_EXT2_FS=y 1323CONFIG_EXT2_FS=y
@@ -1421,7 +1357,6 @@ CONFIG_DNOTIFY=y
1421CONFIG_ISO9660_FS=m 1357CONFIG_ISO9660_FS=m
1422CONFIG_JOLIET=y 1358CONFIG_JOLIET=y
1423CONFIG_ZISOFS=y 1359CONFIG_ZISOFS=y
1424CONFIG_ZISOFS_FS=m
1425CONFIG_UDF_FS=m 1360CONFIG_UDF_FS=m
1426CONFIG_UDF_NLS=y 1361CONFIG_UDF_NLS=y
1427 1362
@@ -1489,6 +1424,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1489CONFIG_NFS_COMMON=y 1424CONFIG_NFS_COMMON=y
1490CONFIG_SUNRPC=y 1425CONFIG_SUNRPC=y
1491CONFIG_SUNRPC_GSS=y 1426CONFIG_SUNRPC_GSS=y
1427# CONFIG_SUNRPC_BIND34 is not set
1492CONFIG_RPCSEC_GSS_KRB5=y 1428CONFIG_RPCSEC_GSS_KRB5=y
1493# CONFIG_RPCSEC_GSS_SPKM3 is not set 1429# CONFIG_RPCSEC_GSS_SPKM3 is not set
1494# CONFIG_SMB_FS is not set 1430# CONFIG_SMB_FS is not set
@@ -1557,6 +1493,7 @@ CONFIG_NLS_UTF8=m
1557# Distributed Lock Manager 1493# Distributed Lock Manager
1558# 1494#
1559# CONFIG_DLM is not set 1495# CONFIG_DLM is not set
1496# CONFIG_UCC_SLOW is not set
1560 1497
1561# 1498#
1562# Library routines 1499# Library routines
@@ -1564,6 +1501,7 @@ CONFIG_NLS_UTF8=m
1564CONFIG_BITREVERSE=y 1501CONFIG_BITREVERSE=y
1565CONFIG_CRC_CCITT=m 1502CONFIG_CRC_CCITT=m
1566# CONFIG_CRC16 is not set 1503# CONFIG_CRC16 is not set
1504# CONFIG_CRC_ITU_T is not set
1567CONFIG_CRC32=y 1505CONFIG_CRC32=y
1568CONFIG_LIBCRC32C=m 1506CONFIG_LIBCRC32C=m
1569CONFIG_ZLIB_INFLATE=m 1507CONFIG_ZLIB_INFLATE=m
@@ -1571,13 +1509,16 @@ CONFIG_ZLIB_DEFLATE=m
1571CONFIG_TEXTSEARCH=y 1509CONFIG_TEXTSEARCH=y
1572CONFIG_TEXTSEARCH_KMP=m 1510CONFIG_TEXTSEARCH_KMP=m
1573CONFIG_PLIST=y 1511CONFIG_PLIST=y
1574CONFIG_IOMAP_COPY=y 1512CONFIG_HAS_IOMEM=y
1513CONFIG_HAS_IOPORT=y
1514CONFIG_HAS_DMA=y
1575 1515
1576# 1516#
1577# Instrumentation Support 1517# Instrumentation Support
1578# 1518#
1579CONFIG_PROFILING=y 1519CONFIG_PROFILING=y
1580CONFIG_OPROFILE=m 1520CONFIG_OPROFILE=m
1521# CONFIG_KPROBES is not set
1581 1522
1582# 1523#
1583# Kernel hacking 1524# Kernel hacking
@@ -1589,15 +1530,15 @@ CONFIG_MAGIC_SYSRQ=y
1589# CONFIG_DEBUG_FS is not set 1530# CONFIG_DEBUG_FS is not set
1590# CONFIG_HEADERS_CHECK is not set 1531# CONFIG_HEADERS_CHECK is not set
1591CONFIG_DEBUG_KERNEL=y 1532CONFIG_DEBUG_KERNEL=y
1592CONFIG_LOG_BUF_SHIFT=14 1533# CONFIG_DEBUG_SHIRQ is not set
1593CONFIG_DETECT_SOFTLOCKUP=y 1534CONFIG_DETECT_SOFTLOCKUP=y
1594# CONFIG_SCHEDSTATS is not set 1535# CONFIG_SCHEDSTATS is not set
1536# CONFIG_TIMER_STATS is not set
1595# CONFIG_DEBUG_SLAB is not set 1537# CONFIG_DEBUG_SLAB is not set
1596# CONFIG_DEBUG_RT_MUTEXES is not set 1538# CONFIG_DEBUG_RT_MUTEXES is not set
1597# CONFIG_RT_MUTEX_TESTER is not set 1539# CONFIG_RT_MUTEX_TESTER is not set
1598# CONFIG_DEBUG_SPINLOCK is not set 1540# CONFIG_DEBUG_SPINLOCK is not set
1599# CONFIG_DEBUG_MUTEXES is not set 1541# CONFIG_DEBUG_MUTEXES is not set
1600# CONFIG_DEBUG_RWSEMS is not set
1601# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1542# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1602# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1543# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1603# CONFIG_DEBUG_KOBJECT is not set 1544# CONFIG_DEBUG_KOBJECT is not set
@@ -1607,10 +1548,13 @@ CONFIG_DEBUG_BUGVERBOSE=y
1607# CONFIG_DEBUG_LIST is not set 1548# CONFIG_DEBUG_LIST is not set
1608CONFIG_FORCED_INLINING=y 1549CONFIG_FORCED_INLINING=y
1609# CONFIG_RCU_TORTURE_TEST is not set 1550# CONFIG_RCU_TORTURE_TEST is not set
1551# CONFIG_FAULT_INJECTION is not set
1552# CONFIG_DEBUG_STACKOVERFLOW is not set
1553# CONFIG_DEBUG_STACK_USAGE is not set
1554# CONFIG_DEBUG_PAGEALLOC is not set
1610# CONFIG_DEBUGGER is not set 1555# CONFIG_DEBUGGER is not set
1611# CONFIG_BDI_SWITCH is not set 1556# CONFIG_BDI_SWITCH is not set
1612# CONFIG_BOOTX_TEXT is not set 1557# CONFIG_BOOTX_TEXT is not set
1613# CONFIG_SERIAL_TEXT_DEBUG is not set
1614# CONFIG_PPC_EARLY_DEBUG is not set 1558# CONFIG_PPC_EARLY_DEBUG is not set
1615 1559
1616# 1560#
@@ -1639,8 +1583,11 @@ CONFIG_CRYPTO_SHA1=m
1639# CONFIG_CRYPTO_GF128MUL is not set 1583# CONFIG_CRYPTO_GF128MUL is not set
1640CONFIG_CRYPTO_ECB=m 1584CONFIG_CRYPTO_ECB=m
1641CONFIG_CRYPTO_CBC=y 1585CONFIG_CRYPTO_CBC=y
1586CONFIG_CRYPTO_PCBC=m
1642# CONFIG_CRYPTO_LRW is not set 1587# CONFIG_CRYPTO_LRW is not set
1588# CONFIG_CRYPTO_CRYPTD is not set
1643CONFIG_CRYPTO_DES=y 1589CONFIG_CRYPTO_DES=y
1590# CONFIG_CRYPTO_FCRYPT is not set
1644CONFIG_CRYPTO_BLOWFISH=m 1591CONFIG_CRYPTO_BLOWFISH=m
1645CONFIG_CRYPTO_TWOFISH=m 1592CONFIG_CRYPTO_TWOFISH=m
1646CONFIG_CRYPTO_TWOFISH_COMMON=m 1593CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1655,6 +1602,7 @@ CONFIG_CRYPTO_ARC4=m
1655CONFIG_CRYPTO_DEFLATE=m 1602CONFIG_CRYPTO_DEFLATE=m
1656CONFIG_CRYPTO_MICHAEL_MIC=m 1603CONFIG_CRYPTO_MICHAEL_MIC=m
1657CONFIG_CRYPTO_CRC32C=m 1604CONFIG_CRYPTO_CRC32C=m
1605# CONFIG_CRYPTO_CAMELLIA is not set
1658# CONFIG_CRYPTO_TEST is not set 1606# CONFIG_CRYPTO_TEST is not set
1659 1607
1660# 1608#
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index 8cbd87ded6b4..d12a981398b8 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -1,9 +1,10 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:18:18 2007 4# Tue Jun 26 13:26:09 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC_PM_NEEDS_RTC_LIB=y
7CONFIG_PPC32=y 8CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 9CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 10CONFIG_MMU=y
@@ -34,9 +35,9 @@ CONFIG_CLASSIC32=y
34# CONFIG_PPC_83xx is not set 35# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set 36# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set 37# CONFIG_PPC_86xx is not set
38# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 39# CONFIG_40x is not set
38# CONFIG_44x is not set 40# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 41# CONFIG_E200 is not set
41CONFIG_6xx=y 42CONFIG_6xx=y
42CONFIG_PPC_FPU=y 43CONFIG_PPC_FPU=y
@@ -45,6 +46,7 @@ CONFIG_PPC_FPU=y
45# CONFIG_ALTIVEC is not set 46# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y 47CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 48CONFIG_PPC_STD_MMU_32=y
49# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 50# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 51CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 52
@@ -63,14 +65,17 @@ CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 65CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 66CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 67# CONFIG_IPC_NS is not set
68CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 69# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 70# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 71# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 72# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14
72CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
73# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
78CONFIG_BLK_DEV_INITRD=y
74CONFIG_INITRAMFS_SOURCE="" 79CONFIG_INITRAMFS_SOURCE=""
75# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 80# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
76CONFIG_SYSCTL=y 81CONFIG_SYSCTL=y
@@ -83,14 +88,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 88CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 89CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 90CONFIG_FUTEX=y
91CONFIG_ANON_INODES=y
86# CONFIG_EPOLL is not set 92# CONFIG_EPOLL is not set
93CONFIG_SIGNALFD=y
94CONFIG_TIMERFD=y
95CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 96CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
98CONFIG_SLAB=y
99# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 101CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 102# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 103CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 104
95# 105#
96# Loadable module support 106# Loadable module support
@@ -131,11 +141,17 @@ CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_APUS is not set 141# CONFIG_APUS is not set
132# CONFIG_PPC_CHRP is not set 142# CONFIG_PPC_CHRP is not set
133CONFIG_PPC_MPC52xx=y 143CONFIG_PPC_MPC52xx=y
144CONFIG_PPC_MPC5200=y
145CONFIG_PPC_MPC5200_BUGFIX=y
134# CONFIG_PPC_EFIKA is not set 146# CONFIG_PPC_EFIKA is not set
135CONFIG_PPC_LITE5200=y 147CONFIG_PPC_LITE5200=y
136# CONFIG_PPC_PMAC is not set 148# CONFIG_PPC_PMAC is not set
137# CONFIG_PPC_CELL is not set 149# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set 150# CONFIG_PPC_CELL_NATIVE is not set
151# CONFIG_PQ2ADS is not set
152# CONFIG_MPIC is not set
153# CONFIG_MPIC_WEIRD is not set
154# CONFIG_PPC_I8259 is not set
139# CONFIG_PPC_RTAS is not set 155# CONFIG_PPC_RTAS is not set
140# CONFIG_MMIO_NVRAM is not set 156# CONFIG_MMIO_NVRAM is not set
141# CONFIG_PPC_MPC106 is not set 157# CONFIG_PPC_MPC106 is not set
@@ -144,8 +160,7 @@ CONFIG_PPC_LITE5200=y
144# CONFIG_GENERIC_IOMAP is not set 160# CONFIG_GENERIC_IOMAP is not set
145# CONFIG_CPU_FREQ is not set 161# CONFIG_CPU_FREQ is not set
146# CONFIG_TAU is not set 162# CONFIG_TAU is not set
147# CONFIG_WANT_EARLY_SERIAL is not set 163# CONFIG_CPM2 is not set
148# CONFIG_MPIC is not set
149 164
150# 165#
151# Kernel options 166# Kernel options
@@ -174,6 +189,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 189# CONFIG_SPARSEMEM_STATIC is not set
175CONFIG_SPLIT_PTLOCK_CPUS=4 190CONFIG_SPLIT_PTLOCK_CPUS=4
176# CONFIG_RESOURCES_64BIT is not set 191# CONFIG_RESOURCES_64BIT is not set
192CONFIG_ZONE_DMA_FLAG=1
177CONFIG_PROC_DEVICETREE=y 193CONFIG_PROC_DEVICETREE=y
178# CONFIG_CMDLINE_BOOL is not set 194# CONFIG_CMDLINE_BOOL is not set
179CONFIG_PM=y 195CONFIG_PM=y
@@ -182,28 +198,27 @@ CONFIG_PM=y
182# CONFIG_PM_SYSFS_DEPRECATED is not set 198# CONFIG_PM_SYSFS_DEPRECATED is not set
183# CONFIG_SOFTWARE_SUSPEND is not set 199# CONFIG_SOFTWARE_SUSPEND is not set
184CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
201# CONFIG_WANT_DEVICE_TREE is not set
185CONFIG_ISA_DMA_API=y 202CONFIG_ISA_DMA_API=y
186 203
187# 204#
188# Bus options 205# Bus options
189# 206#
207CONFIG_ZONE_DMA=y
190CONFIG_GENERIC_ISA_DMA=y 208CONFIG_GENERIC_ISA_DMA=y
191# CONFIG_MPIC_WEIRD is not set
192# CONFIG_PPC_I8259 is not set
193# CONFIG_PPC_INDIRECT_PCI is not set 209# CONFIG_PPC_INDIRECT_PCI is not set
210CONFIG_FSL_SOC=y
194CONFIG_PCI=y 211CONFIG_PCI=y
195CONFIG_PCI_DOMAINS=y 212CONFIG_PCI_DOMAINS=y
196# CONFIG_PCIEPORTBUS is not set 213# CONFIG_PCIEPORTBUS is not set
214CONFIG_ARCH_SUPPORTS_MSI=y
215# CONFIG_PCI_MSI is not set
197# CONFIG_PCI_DEBUG is not set 216# CONFIG_PCI_DEBUG is not set
198 217
199# 218#
200# PCCARD (PCMCIA/CardBus) support 219# PCCARD (PCMCIA/CardBus) support
201# 220#
202# CONFIG_PCCARD is not set 221# CONFIG_PCCARD is not set
203
204#
205# PCI Hotplug Support
206#
207# CONFIG_HOTPLUG_PCI is not set 222# CONFIG_HOTPLUG_PCI is not set
208 223
209# 224#
@@ -228,13 +243,13 @@ CONFIG_NET=y
228# 243#
229# Networking options 244# Networking options
230# 245#
231# CONFIG_NETDEBUG is not set
232CONFIG_PACKET=y 246CONFIG_PACKET=y
233# CONFIG_PACKET_MMAP is not set 247# CONFIG_PACKET_MMAP is not set
234CONFIG_UNIX=y 248CONFIG_UNIX=y
235CONFIG_XFRM=y 249CONFIG_XFRM=y
236CONFIG_XFRM_USER=m 250CONFIG_XFRM_USER=m
237# CONFIG_XFRM_SUB_POLICY is not set 251# CONFIG_XFRM_SUB_POLICY is not set
252# CONFIG_XFRM_MIGRATE is not set
238# CONFIG_NET_KEY is not set 253# CONFIG_NET_KEY is not set
239CONFIG_INET=y 254CONFIG_INET=y
240CONFIG_IP_MULTICAST=y 255CONFIG_IP_MULTICAST=y
@@ -268,20 +283,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
268# CONFIG_INET6_TUNNEL is not set 283# CONFIG_INET6_TUNNEL is not set
269# CONFIG_NETWORK_SECMARK is not set 284# CONFIG_NETWORK_SECMARK is not set
270# CONFIG_NETFILTER is not set 285# CONFIG_NETFILTER is not set
271
272#
273# DCCP Configuration (EXPERIMENTAL)
274#
275# CONFIG_IP_DCCP is not set 286# CONFIG_IP_DCCP is not set
276
277#
278# SCTP Configuration (EXPERIMENTAL)
279#
280# CONFIG_IP_SCTP is not set 287# CONFIG_IP_SCTP is not set
281
282#
283# TIPC Configuration (EXPERIMENTAL)
284#
285# CONFIG_TIPC is not set 288# CONFIG_TIPC is not set
286# CONFIG_ATM is not set 289# CONFIG_ATM is not set
287# CONFIG_BRIDGE is not set 290# CONFIG_BRIDGE is not set
@@ -307,7 +310,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
307# CONFIG_HAMRADIO is not set 310# CONFIG_HAMRADIO is not set
308# CONFIG_IRDA is not set 311# CONFIG_IRDA is not set
309# CONFIG_BT is not set 312# CONFIG_BT is not set
313# CONFIG_AF_RXRPC is not set
314
315#
316# Wireless
317#
318# CONFIG_CFG80211 is not set
319# CONFIG_WIRELESS_EXT is not set
320# CONFIG_MAC80211 is not set
310# CONFIG_IEEE80211 is not set 321# CONFIG_IEEE80211 is not set
322# CONFIG_RFKILL is not set
311 323
312# 324#
313# Device Drivers 325# Device Drivers
@@ -320,16 +332,13 @@ CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y 332CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set 333# CONFIG_FW_LOADER is not set
322# CONFIG_DEBUG_DRIVER is not set 334# CONFIG_DEBUG_DRIVER is not set
335# CONFIG_DEBUG_DEVRES is not set
323# CONFIG_SYS_HYPERVISOR is not set 336# CONFIG_SYS_HYPERVISOR is not set
324 337
325# 338#
326# Connector - unified userspace <-> kernelspace linker 339# Connector - unified userspace <-> kernelspace linker
327# 340#
328# CONFIG_CONNECTOR is not set 341# CONFIG_CONNECTOR is not set
329
330#
331# Memory Technology Devices (MTD)
332#
333# CONFIG_MTD is not set 342# CONFIG_MTD is not set
334 343
335# 344#
@@ -340,6 +349,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
340# 349#
341# Plug and Play support 350# Plug and Play support
342# 351#
352# CONFIG_PNPACPI is not set
343 353
344# 354#
345# Block devices 355# Block devices
@@ -358,19 +368,16 @@ CONFIG_BLK_DEV_RAM=y
358CONFIG_BLK_DEV_RAM_COUNT=16 368CONFIG_BLK_DEV_RAM_COUNT=16
359CONFIG_BLK_DEV_RAM_SIZE=32768 369CONFIG_BLK_DEV_RAM_SIZE=32768
360CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 370CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
361CONFIG_BLK_DEV_INITRD=y
362# CONFIG_CDROM_PKTCDVD is not set 371# CONFIG_CDROM_PKTCDVD is not set
363# CONFIG_ATA_OVER_ETH is not set 372# CONFIG_ATA_OVER_ETH is not set
364 373
365# 374#
366# Misc devices 375# Misc devices
367# 376#
377# CONFIG_PHANTOM is not set
368# CONFIG_SGI_IOC4 is not set 378# CONFIG_SGI_IOC4 is not set
369# CONFIG_TIFM_CORE is not set 379# CONFIG_TIFM_CORE is not set
370 380# CONFIG_BLINK is not set
371#
372# ATA/ATAPI/MFM/RLL support
373#
374# CONFIG_IDE is not set 381# CONFIG_IDE is not set
375 382
376# 383#
@@ -399,6 +406,7 @@ CONFIG_SCSI=y
399# CONFIG_SCSI_CONSTANTS is not set 406# CONFIG_SCSI_CONSTANTS is not set
400# CONFIG_SCSI_LOGGING is not set 407# CONFIG_SCSI_LOGGING is not set
401# CONFIG_SCSI_SCAN_ASYNC is not set 408# CONFIG_SCSI_SCAN_ASYNC is not set
409CONFIG_SCSI_WAIT_SCAN=m
402 410
403# 411#
404# SCSI Transports 412# SCSI Transports
@@ -447,11 +455,8 @@ CONFIG_SCSI=y
447# CONFIG_SCSI_NSP32 is not set 455# CONFIG_SCSI_NSP32 is not set
448# CONFIG_SCSI_DEBUG is not set 456# CONFIG_SCSI_DEBUG is not set
449# CONFIG_SCSI_SRP is not set 457# CONFIG_SCSI_SRP is not set
450
451#
452# Serial ATA (prod) and Parallel ATA (experimental) drivers
453#
454CONFIG_ATA=y 458CONFIG_ATA=y
459# CONFIG_ATA_NONSTANDARD is not set
455# CONFIG_SATA_AHCI is not set 460# CONFIG_SATA_AHCI is not set
456# CONFIG_SATA_SVW is not set 461# CONFIG_SATA_SVW is not set
457# CONFIG_ATA_PIIX is not set 462# CONFIG_ATA_PIIX is not set
@@ -467,10 +472,12 @@ CONFIG_ATA=y
467# CONFIG_SATA_ULI is not set 472# CONFIG_SATA_ULI is not set
468# CONFIG_SATA_VIA is not set 473# CONFIG_SATA_VIA is not set
469# CONFIG_SATA_VITESSE is not set 474# CONFIG_SATA_VITESSE is not set
475# CONFIG_SATA_INIC162X is not set
470# CONFIG_PATA_ALI is not set 476# CONFIG_PATA_ALI is not set
471# CONFIG_PATA_AMD is not set 477# CONFIG_PATA_AMD is not set
472# CONFIG_PATA_ARTOP is not set 478# CONFIG_PATA_ARTOP is not set
473# CONFIG_PATA_ATIIXP is not set 479# CONFIG_PATA_ATIIXP is not set
480# CONFIG_PATA_CMD640_PCI is not set
474# CONFIG_PATA_CMD64X is not set 481# CONFIG_PATA_CMD64X is not set
475# CONFIG_PATA_CS5520 is not set 482# CONFIG_PATA_CS5520 is not set
476# CONFIG_PATA_CS5530 is not set 483# CONFIG_PATA_CS5530 is not set
@@ -482,9 +489,11 @@ CONFIG_ATA=y
482# CONFIG_PATA_HPT3X2N is not set 489# CONFIG_PATA_HPT3X2N is not set
483# CONFIG_PATA_HPT3X3 is not set 490# CONFIG_PATA_HPT3X3 is not set
484# CONFIG_PATA_IT821X is not set 491# CONFIG_PATA_IT821X is not set
492# CONFIG_PATA_IT8213 is not set
485# CONFIG_PATA_JMICRON is not set 493# CONFIG_PATA_JMICRON is not set
486# CONFIG_PATA_TRIFLEX is not set 494# CONFIG_PATA_TRIFLEX is not set
487# CONFIG_PATA_MARVELL is not set 495# CONFIG_PATA_MARVELL is not set
496CONFIG_PATA_MPC52xx=y
488# CONFIG_PATA_MPIIX is not set 497# CONFIG_PATA_MPIIX is not set
489# CONFIG_PATA_OLDPIIX is not set 498# CONFIG_PATA_OLDPIIX is not set
490# CONFIG_PATA_NETCELL is not set 499# CONFIG_PATA_NETCELL is not set
@@ -519,18 +528,14 @@ CONFIG_ATA=y
519# 528#
520# IEEE 1394 (FireWire) support 529# IEEE 1394 (FireWire) support
521# 530#
531# CONFIG_FIREWIRE is not set
522# CONFIG_IEEE1394 is not set 532# CONFIG_IEEE1394 is not set
523 533
524# 534#
525# I2O device support 535# I2O device support
526# 536#
527# CONFIG_I2O is not set 537# CONFIG_I2O is not set
528 538# CONFIG_MACINTOSH_DRIVERS is not set
529#
530# Macintosh device drivers
531#
532# CONFIG_MAC_EMUMOUSEBTN is not set
533# CONFIG_WINDFARM is not set
534 539
535# 540#
536# Network device support 541# Network device support
@@ -540,24 +545,13 @@ CONFIG_NETDEVICES=y
540# CONFIG_BONDING is not set 545# CONFIG_BONDING is not set
541# CONFIG_EQUALIZER is not set 546# CONFIG_EQUALIZER is not set
542# CONFIG_TUN is not set 547# CONFIG_TUN is not set
543
544#
545# ARCnet devices
546#
547# CONFIG_ARCNET is not set 548# CONFIG_ARCNET is not set
548 549
549# 550#
550# PHY device support
551#
552
553#
554# Ethernet (10 or 100Mbit) 551# Ethernet (10 or 100Mbit)
555# 552#
556# CONFIG_NET_ETHERNET is not set 553# CONFIG_NET_ETHERNET is not set
557 554CONFIG_NETDEV_1000=y
558#
559# Ethernet (1000 Mbit)
560#
561# CONFIG_ACENIC is not set 555# CONFIG_ACENIC is not set
562# CONFIG_DL2K is not set 556# CONFIG_DL2K is not set
563# CONFIG_E1000 is not set 557# CONFIG_E1000 is not set
@@ -569,33 +563,27 @@ CONFIG_NETDEVICES=y
569# CONFIG_SKGE is not set 563# CONFIG_SKGE is not set
570# CONFIG_SKY2 is not set 564# CONFIG_SKY2 is not set
571# CONFIG_SK98LIN is not set 565# CONFIG_SK98LIN is not set
566# CONFIG_VIA_VELOCITY is not set
572# CONFIG_TIGON3 is not set 567# CONFIG_TIGON3 is not set
573# CONFIG_BNX2 is not set 568# CONFIG_BNX2 is not set
574# CONFIG_MV643XX_ETH is not set 569# CONFIG_MV643XX_ETH is not set
575# CONFIG_QLA3XXX is not set 570# CONFIG_QLA3XXX is not set
576 571# CONFIG_ATL1 is not set
577# 572CONFIG_NETDEV_10000=y
578# Ethernet (10000 Mbit)
579#
580# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574# CONFIG_CHELSIO_T3 is not set
581# CONFIG_IXGB is not set 575# CONFIG_IXGB is not set
582# CONFIG_S2IO is not set 576# CONFIG_S2IO is not set
583# CONFIG_MYRI10GE is not set 577# CONFIG_MYRI10GE is not set
584# CONFIG_NETXEN_NIC is not set 578# CONFIG_NETXEN_NIC is not set
585 579# CONFIG_MLX4_CORE is not set
586#
587# Token Ring devices
588#
589# CONFIG_TR is not set 580# CONFIG_TR is not set
590 581
591# 582#
592# Wireless LAN (non-hamradio) 583# Wireless LAN
593#
594# CONFIG_NET_RADIO is not set
595
596#
597# Wan interfaces
598# 584#
585# CONFIG_WLAN_PRE80211 is not set
586# CONFIG_WLAN_80211 is not set
599# CONFIG_WAN is not set 587# CONFIG_WAN is not set
600# CONFIG_FDDI is not set 588# CONFIG_FDDI is not set
601# CONFIG_HIPPI is not set 589# CONFIG_HIPPI is not set
@@ -657,15 +645,10 @@ CONFIG_LEGACY_PTY_COUNT=256
657# IPMI 645# IPMI
658# 646#
659# CONFIG_IPMI_HANDLER is not set 647# CONFIG_IPMI_HANDLER is not set
660
661#
662# Watchdog Cards
663#
664# CONFIG_WATCHDOG is not set 648# CONFIG_WATCHDOG is not set
665# CONFIG_HW_RANDOM is not set 649# CONFIG_HW_RANDOM is not set
666# CONFIG_NVRAM is not set 650# CONFIG_NVRAM is not set
667# CONFIG_GEN_RTC is not set 651# CONFIG_GEN_RTC is not set
668# CONFIG_DTLK is not set
669# CONFIG_R3964 is not set 652# CONFIG_R3964 is not set
670# CONFIG_APPLICOM is not set 653# CONFIG_APPLICOM is not set
671# CONFIG_AGP is not set 654# CONFIG_AGP is not set
@@ -676,10 +659,7 @@ CONFIG_LEGACY_PTY_COUNT=256
676# TPM devices 659# TPM devices
677# 660#
678# CONFIG_TCG_TPM is not set 661# CONFIG_TCG_TPM is not set
679 662CONFIG_DEVPORT=y
680#
681# I2C support
682#
683# CONFIG_I2C is not set 663# CONFIG_I2C is not set
684 664
685# 665#
@@ -692,30 +672,32 @@ CONFIG_LEGACY_PTY_COUNT=256
692# Dallas's 1-wire bus 672# Dallas's 1-wire bus
693# 673#
694# CONFIG_W1 is not set 674# CONFIG_W1 is not set
675# CONFIG_HWMON is not set
695 676
696# 677#
697# Hardware Monitoring support 678# Multifunction device drivers
698# 679#
699# CONFIG_HWMON is not set 680# CONFIG_MFD_SM501 is not set
700# CONFIG_HWMON_VID is not set
701 681
702# 682#
703# Multimedia devices 683# Multimedia devices
704# 684#
705# CONFIG_VIDEO_DEV is not set 685# CONFIG_VIDEO_DEV is not set
686# CONFIG_DVB_CORE is not set
687# CONFIG_DAB is not set
706 688
707# 689#
708# Digital Video Broadcasting Devices 690# Graphics support
709# 691#
710# CONFIG_DVB is not set 692# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
711 693
712# 694#
713# Graphics support 695# Display device support
714# 696#
715# CONFIG_FIRMWARE_EDID is not set 697# CONFIG_DISPLAY_SUPPORT is not set
698# CONFIG_VGASTATE is not set
716# CONFIG_FB is not set 699# CONFIG_FB is not set
717# CONFIG_FB_IBM_GXT4500 is not set 700# CONFIG_FB_IBM_GXT4500 is not set
718# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
719 701
720# 702#
721# Sound 703# Sound
@@ -738,10 +720,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
738# USB Gadget Support 720# USB Gadget Support
739# 721#
740# CONFIG_USB_GADGET is not set 722# CONFIG_USB_GADGET is not set
741
742#
743# MMC/SD Card support
744#
745# CONFIG_MMC is not set 723# CONFIG_MMC is not set
746 724
747# 725#
@@ -769,6 +747,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
769# 747#
770# Real Time Clock 748# Real Time Clock
771# 749#
750CONFIG_RTC_LIB=y
772# CONFIG_RTC_CLASS is not set 751# CONFIG_RTC_CLASS is not set
773 752
774# 753#
@@ -785,10 +764,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
785# 764#
786 765
787# 766#
788# Virtualization
789#
790
791#
792# File systems 767# File systems
793# 768#
794CONFIG_EXT2_FS=y 769CONFIG_EXT2_FS=y
@@ -888,16 +863,20 @@ CONFIG_MSDOS_PARTITION=y
888# Distributed Lock Manager 863# Distributed Lock Manager
889# 864#
890# CONFIG_DLM is not set 865# CONFIG_DLM is not set
866# CONFIG_UCC_SLOW is not set
891 867
892# 868#
893# Library routines 869# Library routines
894# 870#
895# CONFIG_CRC_CCITT is not set 871# CONFIG_CRC_CCITT is not set
896# CONFIG_CRC16 is not set 872# CONFIG_CRC16 is not set
873# CONFIG_CRC_ITU_T is not set
897# CONFIG_CRC32 is not set 874# CONFIG_CRC32 is not set
898# CONFIG_LIBCRC32C is not set 875# CONFIG_LIBCRC32C is not set
899CONFIG_PLIST=y 876CONFIG_PLIST=y
900CONFIG_IOMAP_COPY=y 877CONFIG_HAS_IOMEM=y
878CONFIG_HAS_IOPORT=y
879CONFIG_HAS_DMA=y
901 880
902# 881#
903# Instrumentation Support 882# Instrumentation Support
@@ -914,15 +893,15 @@ CONFIG_ENABLE_MUST_CHECK=y
914# CONFIG_DEBUG_FS is not set 893# CONFIG_DEBUG_FS is not set
915# CONFIG_HEADERS_CHECK is not set 894# CONFIG_HEADERS_CHECK is not set
916CONFIG_DEBUG_KERNEL=y 895CONFIG_DEBUG_KERNEL=y
917CONFIG_LOG_BUF_SHIFT=14 896# CONFIG_DEBUG_SHIRQ is not set
918CONFIG_DETECT_SOFTLOCKUP=y 897CONFIG_DETECT_SOFTLOCKUP=y
919# CONFIG_SCHEDSTATS is not set 898# CONFIG_SCHEDSTATS is not set
899# CONFIG_TIMER_STATS is not set
920# CONFIG_DEBUG_SLAB is not set 900# CONFIG_DEBUG_SLAB is not set
921# CONFIG_DEBUG_RT_MUTEXES is not set 901# CONFIG_DEBUG_RT_MUTEXES is not set
922# CONFIG_RT_MUTEX_TESTER is not set 902# CONFIG_RT_MUTEX_TESTER is not set
923# CONFIG_DEBUG_SPINLOCK is not set 903# CONFIG_DEBUG_SPINLOCK is not set
924# CONFIG_DEBUG_MUTEXES is not set 904# CONFIG_DEBUG_MUTEXES is not set
925# CONFIG_DEBUG_RWSEMS is not set
926# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 905# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
927# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 906# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
928# CONFIG_DEBUG_KOBJECT is not set 907# CONFIG_DEBUG_KOBJECT is not set
@@ -932,10 +911,13 @@ CONFIG_DEBUG_INFO=y
932# CONFIG_DEBUG_LIST is not set 911# CONFIG_DEBUG_LIST is not set
933CONFIG_FORCED_INLINING=y 912CONFIG_FORCED_INLINING=y
934# CONFIG_RCU_TORTURE_TEST is not set 913# CONFIG_RCU_TORTURE_TEST is not set
914# CONFIG_FAULT_INJECTION is not set
915# CONFIG_DEBUG_STACKOVERFLOW is not set
916# CONFIG_DEBUG_STACK_USAGE is not set
917# CONFIG_DEBUG_PAGEALLOC is not set
935# CONFIG_DEBUGGER is not set 918# CONFIG_DEBUGGER is not set
936# CONFIG_BDI_SWITCH is not set 919# CONFIG_BDI_SWITCH is not set
937# CONFIG_BOOTX_TEXT is not set 920# CONFIG_BOOTX_TEXT is not set
938# CONFIG_SERIAL_TEXT_DEBUG is not set
939# CONFIG_PPC_EARLY_DEBUG is not set 921# CONFIG_PPC_EARLY_DEBUG is not set
940 922
941# 923#
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 15366f0e489f..eb3d9ad655ea 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:19:02 2007 4# Tue Jun 26 13:27:35 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -39,6 +39,7 @@ CONFIG_PPC_FPU=y
39# CONFIG_PPC_OF_PLATFORM_PCI is not set 39# CONFIG_PPC_OF_PLATFORM_PCI is not set
40# CONFIG_ALTIVEC is not set 40# CONFIG_ALTIVEC is not set
41CONFIG_PPC_STD_MMU=y 41CONFIG_PPC_STD_MMU=y
42CONFIG_PPC_MM_SLICES=y
42CONFIG_VIRT_CPU_ACCOUNTING=y 43CONFIG_VIRT_CPU_ACCOUNTING=y
43CONFIG_SMP=y 44CONFIG_SMP=y
44CONFIG_NR_CPUS=4 45CONFIG_NR_CPUS=4
@@ -59,6 +60,7 @@ CONFIG_LOCALVERSION_AUTO=y
59CONFIG_SWAP=y 60CONFIG_SWAP=y
60CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
61# CONFIG_IPC_NS is not set 62# CONFIG_IPC_NS is not set
63CONFIG_SYSVIPC_SYSCTL=y
62CONFIG_POSIX_MQUEUE=y 64CONFIG_POSIX_MQUEUE=y
63# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
64# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
@@ -66,10 +68,11 @@ CONFIG_POSIX_MQUEUE=y
66# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
67CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
68CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=17
69# CONFIG_CPUSETS is not set 72# CONFIG_CPUSETS is not set
70CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
72CONFIG_INITRAMFS_SOURCE="" 75# CONFIG_BLK_DEV_INITRD is not set
73CONFIG_CC_OPTIMIZE_FOR_SIZE=y 76CONFIG_CC_OPTIMIZE_FOR_SIZE=y
74CONFIG_SYSCTL=y 77CONFIG_SYSCTL=y
75# CONFIG_EMBEDDED is not set 78# CONFIG_EMBEDDED is not set
@@ -83,14 +86,19 @@ CONFIG_BUG=y
83CONFIG_ELF_CORE=y 86CONFIG_ELF_CORE=y
84CONFIG_BASE_FULL=y 87CONFIG_BASE_FULL=y
85CONFIG_FUTEX=y 88CONFIG_FUTEX=y
89CONFIG_ANON_INODES=y
86CONFIG_EPOLL=y 90CONFIG_EPOLL=y
91CONFIG_SIGNALFD=y
92CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 94CONFIG_SHMEM=y
88CONFIG_SLAB=y
89CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_SLAB=y
97# CONFIG_SLUB is not set
98# CONFIG_SLOB is not set
90CONFIG_RT_MUTEXES=y 99CONFIG_RT_MUTEXES=y
91# CONFIG_TINY_SHMEM is not set 100# CONFIG_TINY_SHMEM is not set
92CONFIG_BASE_SMALL=0 101CONFIG_BASE_SMALL=0
93# CONFIG_SLOB is not set
94 102
95# 103#
96# Loadable module support 104# Loadable module support
@@ -131,29 +139,34 @@ CONFIG_PPC_MULTIPLATFORM=y
131# CONFIG_PPC_PSERIES is not set 139# CONFIG_PPC_PSERIES is not set
132# CONFIG_PPC_ISERIES is not set 140# CONFIG_PPC_ISERIES is not set
133# CONFIG_PPC_MPC52xx is not set 141# CONFIG_PPC_MPC52xx is not set
142# CONFIG_PPC_MPC5200 is not set
134# CONFIG_PPC_PMAC is not set 143# CONFIG_PPC_PMAC is not set
135CONFIG_PPC_MAPLE=y 144CONFIG_PPC_MAPLE=y
136# CONFIG_PPC_PASEMI is not set 145# CONFIG_PPC_PASEMI is not set
146# CONFIG_PPC_CELLEB is not set
147# CONFIG_PPC_PS3 is not set
137# CONFIG_PPC_CELL is not set 148# CONFIG_PPC_CELL is not set
138# CONFIG_PPC_CELL_NATIVE is not set 149# CONFIG_PPC_CELL_NATIVE is not set
139# CONFIG_PPC_IBM_CELL_BLADE is not set 150# CONFIG_PPC_IBM_CELL_BLADE is not set
140# CONFIG_PPC_PS3 is not set 151# CONFIG_PQ2ADS is not set
141CONFIG_PPC_NATIVE=y 152CONFIG_PPC_NATIVE=y
142CONFIG_UDBG_RTAS_CONSOLE=y 153CONFIG_UDBG_RTAS_CONSOLE=y
154CONFIG_MPIC=y
155# CONFIG_MPIC_WEIRD is not set
156# CONFIG_PPC_I8259 is not set
143CONFIG_U3_DART=y 157CONFIG_U3_DART=y
144CONFIG_PPC_RTAS=y 158CONFIG_PPC_RTAS=y
145# CONFIG_RTAS_ERROR_LOGGING is not set 159# CONFIG_RTAS_ERROR_LOGGING is not set
146CONFIG_RTAS_PROC=y 160CONFIG_RTAS_PROC=y
147# CONFIG_RTAS_FLASH is not set 161# CONFIG_RTAS_FLASH is not set
148# CONFIG_MMIO_NVRAM is not set 162CONFIG_MMIO_NVRAM=y
149CONFIG_MPIC_U3_HT_IRQS=y 163CONFIG_MPIC_U3_HT_IRQS=y
150# CONFIG_PPC_MPC106 is not set 164# CONFIG_PPC_MPC106 is not set
151CONFIG_PPC_970_NAP=y 165CONFIG_PPC_970_NAP=y
152# CONFIG_PPC_INDIRECT_IO is not set 166# CONFIG_PPC_INDIRECT_IO is not set
153# CONFIG_GENERIC_IOMAP is not set 167# CONFIG_GENERIC_IOMAP is not set
154# CONFIG_CPU_FREQ is not set 168# CONFIG_CPU_FREQ is not set
155# CONFIG_WANT_EARLY_SERIAL is not set 169# CONFIG_CPM2 is not set
156CONFIG_MPIC=y
157 170
158# 171#
159# Kernel options 172# Kernel options
@@ -189,34 +202,34 @@ CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 202# CONFIG_SPARSEMEM_STATIC is not set
190CONFIG_SPLIT_PTLOCK_CPUS=4 203CONFIG_SPLIT_PTLOCK_CPUS=4
191CONFIG_RESOURCES_64BIT=y 204CONFIG_RESOURCES_64BIT=y
205CONFIG_ZONE_DMA_FLAG=1
206# CONFIG_PPC_HAS_HASH_64K is not set
192# CONFIG_PPC_64K_PAGES is not set 207# CONFIG_PPC_64K_PAGES is not set
193# CONFIG_SCHED_SMT is not set 208# CONFIG_SCHED_SMT is not set
194CONFIG_PROC_DEVICETREE=y 209CONFIG_PROC_DEVICETREE=y
195# CONFIG_CMDLINE_BOOL is not set 210# CONFIG_CMDLINE_BOOL is not set
196# CONFIG_PM is not set 211# CONFIG_PM is not set
197CONFIG_SECCOMP=y 212CONFIG_SECCOMP=y
213# CONFIG_WANT_DEVICE_TREE is not set
198CONFIG_ISA_DMA_API=y 214CONFIG_ISA_DMA_API=y
199 215
200# 216#
201# Bus options 217# Bus options
202# 218#
219CONFIG_ZONE_DMA=y
203CONFIG_GENERIC_ISA_DMA=y 220CONFIG_GENERIC_ISA_DMA=y
204# CONFIG_MPIC_WEIRD is not set
205# CONFIG_PPC_I8259 is not set
206# CONFIG_PPC_INDIRECT_PCI is not set 221# CONFIG_PPC_INDIRECT_PCI is not set
207CONFIG_PCI=y 222CONFIG_PCI=y
208CONFIG_PCI_DOMAINS=y 223CONFIG_PCI_DOMAINS=y
209# CONFIG_PCIEPORTBUS is not set 224# CONFIG_PCIEPORTBUS is not set
225CONFIG_ARCH_SUPPORTS_MSI=y
226CONFIG_PCI_MSI=y
210# CONFIG_PCI_DEBUG is not set 227# CONFIG_PCI_DEBUG is not set
211 228
212# 229#
213# PCCARD (PCMCIA/CardBus) support 230# PCCARD (PCMCIA/CardBus) support
214# 231#
215# CONFIG_PCCARD is not set 232# CONFIG_PCCARD is not set
216
217#
218# PCI Hotplug Support
219#
220# CONFIG_HOTPLUG_PCI is not set 233# CONFIG_HOTPLUG_PCI is not set
221CONFIG_KERNEL_START=0xc000000000000000 234CONFIG_KERNEL_START=0xc000000000000000
222 235
@@ -228,13 +241,13 @@ CONFIG_NET=y
228# 241#
229# Networking options 242# Networking options
230# 243#
231# CONFIG_NETDEBUG is not set
232CONFIG_PACKET=y 244CONFIG_PACKET=y
233CONFIG_PACKET_MMAP=y 245CONFIG_PACKET_MMAP=y
234CONFIG_UNIX=y 246CONFIG_UNIX=y
235CONFIG_XFRM=y 247CONFIG_XFRM=y
236CONFIG_XFRM_USER=m 248CONFIG_XFRM_USER=m
237# CONFIG_XFRM_SUB_POLICY is not set 249# CONFIG_XFRM_SUB_POLICY is not set
250# CONFIG_XFRM_MIGRATE is not set
238# CONFIG_NET_KEY is not set 251# CONFIG_NET_KEY is not set
239CONFIG_INET=y 252CONFIG_INET=y
240CONFIG_IP_MULTICAST=y 253CONFIG_IP_MULTICAST=y
@@ -268,20 +281,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
268# CONFIG_INET6_TUNNEL is not set 281# CONFIG_INET6_TUNNEL is not set
269# CONFIG_NETWORK_SECMARK is not set 282# CONFIG_NETWORK_SECMARK is not set
270# CONFIG_NETFILTER is not set 283# CONFIG_NETFILTER is not set
271
272#
273# DCCP Configuration (EXPERIMENTAL)
274#
275# CONFIG_IP_DCCP is not set 284# CONFIG_IP_DCCP is not set
276
277#
278# SCTP Configuration (EXPERIMENTAL)
279#
280# CONFIG_IP_SCTP is not set 285# CONFIG_IP_SCTP is not set
281
282#
283# TIPC Configuration (EXPERIMENTAL)
284#
285# CONFIG_TIPC is not set 286# CONFIG_TIPC is not set
286# CONFIG_ATM is not set 287# CONFIG_ATM is not set
287# CONFIG_BRIDGE is not set 288# CONFIG_BRIDGE is not set
@@ -307,7 +308,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
307# CONFIG_HAMRADIO is not set 308# CONFIG_HAMRADIO is not set
308# CONFIG_IRDA is not set 309# CONFIG_IRDA is not set
309# CONFIG_BT is not set 310# CONFIG_BT is not set
311# CONFIG_AF_RXRPC is not set
312
313#
314# Wireless
315#
316# CONFIG_CFG80211 is not set
317# CONFIG_WIRELESS_EXT is not set
318# CONFIG_MAC80211 is not set
310# CONFIG_IEEE80211 is not set 319# CONFIG_IEEE80211 is not set
320# CONFIG_RFKILL is not set
311 321
312# 322#
313# Device Drivers 323# Device Drivers
@@ -320,16 +330,13 @@ CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y 330CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set 331# CONFIG_FW_LOADER is not set
322# CONFIG_DEBUG_DRIVER is not set 332# CONFIG_DEBUG_DRIVER is not set
333# CONFIG_DEBUG_DEVRES is not set
323# CONFIG_SYS_HYPERVISOR is not set 334# CONFIG_SYS_HYPERVISOR is not set
324 335
325# 336#
326# Connector - unified userspace <-> kernelspace linker 337# Connector - unified userspace <-> kernelspace linker
327# 338#
328# CONFIG_CONNECTOR is not set 339# CONFIG_CONNECTOR is not set
329
330#
331# Memory Technology Devices (MTD)
332#
333# CONFIG_MTD is not set 340# CONFIG_MTD is not set
334 341
335# 342#
@@ -340,6 +347,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
340# 347#
341# Plug and Play support 348# Plug and Play support
342# 349#
350# CONFIG_PNPACPI is not set
343 351
344# 352#
345# Block devices 353# Block devices
@@ -358,19 +366,16 @@ CONFIG_BLK_DEV_RAM=y
358CONFIG_BLK_DEV_RAM_COUNT=16 366CONFIG_BLK_DEV_RAM_COUNT=16
359CONFIG_BLK_DEV_RAM_SIZE=8192 367CONFIG_BLK_DEV_RAM_SIZE=8192
360CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 368CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
361# CONFIG_BLK_DEV_INITRD is not set
362# CONFIG_CDROM_PKTCDVD is not set 369# CONFIG_CDROM_PKTCDVD is not set
363# CONFIG_ATA_OVER_ETH is not set 370# CONFIG_ATA_OVER_ETH is not set
364 371
365# 372#
366# Misc devices 373# Misc devices
367# 374#
375# CONFIG_PHANTOM is not set
368# CONFIG_SGI_IOC4 is not set 376# CONFIG_SGI_IOC4 is not set
369# CONFIG_TIFM_CORE is not set 377# CONFIG_TIFM_CORE is not set
370 378# CONFIG_BLINK is not set
371#
372# ATA/ATAPI/MFM/RLL support
373#
374CONFIG_IDE=y 379CONFIG_IDE=y
375CONFIG_BLK_DEV_IDE=y 380CONFIG_BLK_DEV_IDE=y
376 381
@@ -384,6 +389,7 @@ CONFIG_BLK_DEV_IDECD=y
384# CONFIG_BLK_DEV_IDETAPE is not set 389# CONFIG_BLK_DEV_IDETAPE is not set
385# CONFIG_BLK_DEV_IDEFLOPPY is not set 390# CONFIG_BLK_DEV_IDEFLOPPY is not set
386CONFIG_IDE_TASK_IOCTL=y 391CONFIG_IDE_TASK_IOCTL=y
392CONFIG_IDE_PROC_FS=y
387 393
388# 394#
389# IDE chipset support/bugfixes 395# IDE chipset support/bugfixes
@@ -391,12 +397,12 @@ CONFIG_IDE_TASK_IOCTL=y
391CONFIG_IDE_GENERIC=y 397CONFIG_IDE_GENERIC=y
392CONFIG_BLK_DEV_IDEPCI=y 398CONFIG_BLK_DEV_IDEPCI=y
393CONFIG_IDEPCI_SHARE_IRQ=y 399CONFIG_IDEPCI_SHARE_IRQ=y
400CONFIG_IDEPCI_PCIBUS_ORDER=y
394# CONFIG_BLK_DEV_OFFBOARD is not set 401# CONFIG_BLK_DEV_OFFBOARD is not set
395CONFIG_BLK_DEV_GENERIC=y 402CONFIG_BLK_DEV_GENERIC=y
396# CONFIG_BLK_DEV_OPTI621 is not set 403# CONFIG_BLK_DEV_OPTI621 is not set
397CONFIG_BLK_DEV_IDEDMA_PCI=y 404CONFIG_BLK_DEV_IDEDMA_PCI=y
398# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 405# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
399CONFIG_IDEDMA_PCI_AUTO=y
400# CONFIG_IDEDMA_ONLYDISK is not set 406# CONFIG_IDEDMA_ONLYDISK is not set
401# CONFIG_BLK_DEV_AEC62XX is not set 407# CONFIG_BLK_DEV_AEC62XX is not set
402# CONFIG_BLK_DEV_ALI15X3 is not set 408# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -411,6 +417,7 @@ CONFIG_BLK_DEV_AMD74XX=y
411# CONFIG_BLK_DEV_JMICRON is not set 417# CONFIG_BLK_DEV_JMICRON is not set
412# CONFIG_BLK_DEV_SC1200 is not set 418# CONFIG_BLK_DEV_SC1200 is not set
413# CONFIG_BLK_DEV_PIIX is not set 419# CONFIG_BLK_DEV_PIIX is not set
420# CONFIG_BLK_DEV_IT8213 is not set
414# CONFIG_BLK_DEV_IT821X is not set 421# CONFIG_BLK_DEV_IT821X is not set
415# CONFIG_BLK_DEV_NS87415 is not set 422# CONFIG_BLK_DEV_NS87415 is not set
416# CONFIG_BLK_DEV_PDC202XX_OLD is not set 423# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -421,10 +428,10 @@ CONFIG_BLK_DEV_AMD74XX=y
421# CONFIG_BLK_DEV_SLC90E66 is not set 428# CONFIG_BLK_DEV_SLC90E66 is not set
422# CONFIG_BLK_DEV_TRM290 is not set 429# CONFIG_BLK_DEV_TRM290 is not set
423# CONFIG_BLK_DEV_VIA82CXXX is not set 430# CONFIG_BLK_DEV_VIA82CXXX is not set
431# CONFIG_BLK_DEV_TC86C001 is not set
424# CONFIG_IDE_ARM is not set 432# CONFIG_IDE_ARM is not set
425CONFIG_BLK_DEV_IDEDMA=y 433CONFIG_BLK_DEV_IDEDMA=y
426# CONFIG_IDEDMA_IVB is not set 434# CONFIG_IDEDMA_IVB is not set
427CONFIG_IDEDMA_AUTO=y
428# CONFIG_BLK_DEV_HD is not set 435# CONFIG_BLK_DEV_HD is not set
429 436
430# 437#
@@ -433,10 +440,6 @@ CONFIG_IDEDMA_AUTO=y
433# CONFIG_RAID_ATTRS is not set 440# CONFIG_RAID_ATTRS is not set
434# CONFIG_SCSI is not set 441# CONFIG_SCSI is not set
435# CONFIG_SCSI_NETLINK is not set 442# CONFIG_SCSI_NETLINK is not set
436
437#
438# Serial ATA (prod) and Parallel ATA (experimental) drivers
439#
440# CONFIG_ATA is not set 443# CONFIG_ATA is not set
441 444
442# 445#
@@ -452,18 +455,14 @@ CONFIG_IDEDMA_AUTO=y
452# 455#
453# IEEE 1394 (FireWire) support 456# IEEE 1394 (FireWire) support
454# 457#
458# CONFIG_FIREWIRE is not set
455# CONFIG_IEEE1394 is not set 459# CONFIG_IEEE1394 is not set
456 460
457# 461#
458# I2O device support 462# I2O device support
459# 463#
460# CONFIG_I2O is not set 464# CONFIG_I2O is not set
461 465# CONFIG_MACINTOSH_DRIVERS is not set
462#
463# Macintosh device drivers
464#
465# CONFIG_MAC_EMUMOUSEBTN is not set
466# CONFIG_WINDFARM is not set
467 466
468# 467#
469# Network device support 468# Network device support
@@ -473,15 +472,7 @@ CONFIG_NETDEVICES=y
473# CONFIG_BONDING is not set 472# CONFIG_BONDING is not set
474# CONFIG_EQUALIZER is not set 473# CONFIG_EQUALIZER is not set
475# CONFIG_TUN is not set 474# CONFIG_TUN is not set
476
477#
478# ARCnet devices
479#
480# CONFIG_ARCNET is not set 475# CONFIG_ARCNET is not set
481
482#
483# PHY device support
484#
485# CONFIG_PHYLIB is not set 476# CONFIG_PHYLIB is not set
486 477
487# 478#
@@ -518,10 +509,8 @@ CONFIG_AMD8111_ETH=y
518# CONFIG_EPIC100 is not set 509# CONFIG_EPIC100 is not set
519# CONFIG_SUNDANCE is not set 510# CONFIG_SUNDANCE is not set
520# CONFIG_VIA_RHINE is not set 511# CONFIG_VIA_RHINE is not set
521 512# CONFIG_SC92031 is not set
522# 513CONFIG_NETDEV_1000=y
523# Ethernet (1000 Mbit)
524#
525# CONFIG_ACENIC is not set 514# CONFIG_ACENIC is not set
526# CONFIG_DL2K is not set 515# CONFIG_DL2K is not set
527CONFIG_E1000=y 516CONFIG_E1000=y
@@ -539,29 +528,33 @@ CONFIG_E1000=y
539CONFIG_TIGON3=y 528CONFIG_TIGON3=y
540# CONFIG_BNX2 is not set 529# CONFIG_BNX2 is not set
541# CONFIG_QLA3XXX is not set 530# CONFIG_QLA3XXX is not set
542 531# CONFIG_ATL1 is not set
543# 532CONFIG_NETDEV_10000=y
544# Ethernet (10000 Mbit)
545#
546# CONFIG_CHELSIO_T1 is not set 533# CONFIG_CHELSIO_T1 is not set
534# CONFIG_CHELSIO_T3 is not set
547# CONFIG_IXGB is not set 535# CONFIG_IXGB is not set
548# CONFIG_S2IO is not set 536# CONFIG_S2IO is not set
549# CONFIG_MYRI10GE is not set 537# CONFIG_MYRI10GE is not set
550# CONFIG_NETXEN_NIC is not set 538# CONFIG_NETXEN_NIC is not set
551 539# CONFIG_PASEMI_MAC is not set
552# 540# CONFIG_MLX4_CORE is not set
553# Token Ring devices
554#
555# CONFIG_TR is not set 541# CONFIG_TR is not set
556 542
557# 543#
558# Wireless LAN (non-hamradio) 544# Wireless LAN
559# 545#
560# CONFIG_NET_RADIO is not set 546# CONFIG_WLAN_PRE80211 is not set
547# CONFIG_WLAN_80211 is not set
561 548
562# 549#
563# Wan interfaces 550# USB Network Adapters
564# 551#
552# CONFIG_USB_CATC is not set
553# CONFIG_USB_KAWETH is not set
554CONFIG_USB_PEGASUS=y
555# CONFIG_USB_RTL8150 is not set
556# CONFIG_USB_USBNET_MII is not set
557# CONFIG_USB_USBNET is not set
565# CONFIG_WAN is not set 558# CONFIG_WAN is not set
566# CONFIG_FDDI is not set 559# CONFIG_FDDI is not set
567# CONFIG_HIPPI is not set 560# CONFIG_HIPPI is not set
@@ -587,6 +580,7 @@ CONFIG_TIGON3=y
587# 580#
588CONFIG_INPUT=y 581CONFIG_INPUT=y
589# CONFIG_INPUT_FF_MEMLESS is not set 582# CONFIG_INPUT_FF_MEMLESS is not set
583# CONFIG_INPUT_POLLDEV is not set
590 584
591# 585#
592# Userland interfaces 586# Userland interfaces
@@ -606,6 +600,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
606# CONFIG_INPUT_KEYBOARD is not set 600# CONFIG_INPUT_KEYBOARD is not set
607# CONFIG_INPUT_MOUSE is not set 601# CONFIG_INPUT_MOUSE is not set
608# CONFIG_INPUT_JOYSTICK is not set 602# CONFIG_INPUT_JOYSTICK is not set
603# CONFIG_INPUT_TABLET is not set
609# CONFIG_INPUT_TOUCHSCREEN is not set 604# CONFIG_INPUT_TOUCHSCREEN is not set
610# CONFIG_INPUT_MISC is not set 605# CONFIG_INPUT_MISC is not set
611 606
@@ -640,6 +635,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
640CONFIG_SERIAL_CORE=y 635CONFIG_SERIAL_CORE=y
641CONFIG_SERIAL_CORE_CONSOLE=y 636CONFIG_SERIAL_CORE_CONSOLE=y
642# CONFIG_SERIAL_JSM is not set 637# CONFIG_SERIAL_JSM is not set
638# CONFIG_SERIAL_OF_PLATFORM is not set
643CONFIG_UNIX98_PTYS=y 639CONFIG_UNIX98_PTYS=y
644CONFIG_LEGACY_PTYS=y 640CONFIG_LEGACY_PTYS=y
645CONFIG_LEGACY_PTY_COUNT=256 641CONFIG_LEGACY_PTY_COUNT=256
@@ -650,15 +646,10 @@ CONFIG_HVC_RTAS=y
650# IPMI 646# IPMI
651# 647#
652# CONFIG_IPMI_HANDLER is not set 648# CONFIG_IPMI_HANDLER is not set
653
654#
655# Watchdog Cards
656#
657# CONFIG_WATCHDOG is not set 649# CONFIG_WATCHDOG is not set
658# CONFIG_HW_RANDOM is not set 650# CONFIG_HW_RANDOM is not set
659CONFIG_GEN_RTC=y 651CONFIG_GEN_RTC=y
660# CONFIG_GEN_RTC_X is not set 652# CONFIG_GEN_RTC_X is not set
661# CONFIG_DTLK is not set
662# CONFIG_R3964 is not set 653# CONFIG_R3964 is not set
663# CONFIG_APPLICOM is not set 654# CONFIG_APPLICOM is not set
664# CONFIG_AGP is not set 655# CONFIG_AGP is not set
@@ -670,11 +661,9 @@ CONFIG_GEN_RTC=y
670# TPM devices 661# TPM devices
671# 662#
672# CONFIG_TCG_TPM is not set 663# CONFIG_TCG_TPM is not set
673 664CONFIG_DEVPORT=y
674#
675# I2C support
676#
677CONFIG_I2C=y 665CONFIG_I2C=y
666CONFIG_I2C_BOARDINFO=y
678CONFIG_I2C_CHARDEV=y 667CONFIG_I2C_CHARDEV=y
679 668
680# 669#
@@ -700,14 +689,15 @@ CONFIG_I2C_AMD8111=y
700# CONFIG_I2C_PARPORT_LIGHT is not set 689# CONFIG_I2C_PARPORT_LIGHT is not set
701# CONFIG_I2C_PROSAVAGE is not set 690# CONFIG_I2C_PROSAVAGE is not set
702# CONFIG_I2C_SAVAGE4 is not set 691# CONFIG_I2C_SAVAGE4 is not set
692# CONFIG_I2C_SIMTEC is not set
703# CONFIG_I2C_SIS5595 is not set 693# CONFIG_I2C_SIS5595 is not set
704# CONFIG_I2C_SIS630 is not set 694# CONFIG_I2C_SIS630 is not set
705# CONFIG_I2C_SIS96X is not set 695# CONFIG_I2C_SIS96X is not set
706# CONFIG_I2C_STUB is not set 696# CONFIG_I2C_STUB is not set
697# CONFIG_I2C_TINY_USB is not set
707# CONFIG_I2C_VIA is not set 698# CONFIG_I2C_VIA is not set
708# CONFIG_I2C_VIAPRO is not set 699# CONFIG_I2C_VIAPRO is not set
709# CONFIG_I2C_VOODOO3 is not set 700# CONFIG_I2C_VOODOO3 is not set
710# CONFIG_I2C_PCA_ISA is not set
711 701
712# 702#
713# Miscellaneous I2C Chip support 703# Miscellaneous I2C Chip support
@@ -734,28 +724,30 @@ CONFIG_I2C_AMD8111=y
734# Dallas's 1-wire bus 724# Dallas's 1-wire bus
735# 725#
736# CONFIG_W1 is not set 726# CONFIG_W1 is not set
727# CONFIG_HWMON is not set
737 728
738# 729#
739# Hardware Monitoring support 730# Multifunction device drivers
740# 731#
741# CONFIG_HWMON is not set 732# CONFIG_MFD_SM501 is not set
742# CONFIG_HWMON_VID is not set
743 733
744# 734#
745# Multimedia devices 735# Multimedia devices
746# 736#
747# CONFIG_VIDEO_DEV is not set 737# CONFIG_VIDEO_DEV is not set
738# CONFIG_DVB_CORE is not set
739# CONFIG_DAB is not set
748 740
749# 741#
750# Digital Video Broadcasting Devices 742# Graphics support
751# 743#
752# CONFIG_DVB is not set 744# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
753# CONFIG_USB_DABUSB is not set
754 745
755# 746#
756# Graphics support 747# Display device support
757# 748#
758CONFIG_FIRMWARE_EDID=y 749# CONFIG_DISPLAY_SUPPORT is not set
750# CONFIG_VGASTATE is not set
759# CONFIG_FB is not set 751# CONFIG_FB is not set
760# CONFIG_FB_IBM_GXT4500 is not set 752# CONFIG_FB_IBM_GXT4500 is not set
761 753
@@ -764,7 +756,6 @@ CONFIG_FIRMWARE_EDID=y
764# 756#
765# CONFIG_VGA_CONSOLE is not set 757# CONFIG_VGA_CONSOLE is not set
766CONFIG_DUMMY_CONSOLE=y 758CONFIG_DUMMY_CONSOLE=y
767# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
768 759
769# 760#
770# Sound 761# Sound
@@ -775,6 +766,15 @@ CONFIG_DUMMY_CONSOLE=y
775# HID Devices 766# HID Devices
776# 767#
777CONFIG_HID=y 768CONFIG_HID=y
769# CONFIG_HID_DEBUG is not set
770
771#
772# USB Input Devices
773#
774CONFIG_USB_HID=y
775# CONFIG_USB_HIDINPUT_POWERBOOK is not set
776# CONFIG_HID_FF is not set
777# CONFIG_USB_HIDDEV is not set
778 778
779# 779#
780# USB support 780# USB support
@@ -789,9 +789,8 @@ CONFIG_USB=y
789# Miscellaneous USB options 789# Miscellaneous USB options
790# 790#
791CONFIG_USB_DEVICEFS=y 791CONFIG_USB_DEVICEFS=y
792# CONFIG_USB_BANDWIDTH is not set 792CONFIG_USB_DEVICE_CLASS=y
793# CONFIG_USB_DYNAMIC_MINORS is not set 793# CONFIG_USB_DYNAMIC_MINORS is not set
794# CONFIG_USB_MULTITHREAD_PROBE is not set
795# CONFIG_USB_OTG is not set 794# CONFIG_USB_OTG is not set
796 795
797# 796#
@@ -801,9 +800,12 @@ CONFIG_USB_EHCI_HCD=y
801CONFIG_USB_EHCI_SPLIT_ISO=y 800CONFIG_USB_EHCI_SPLIT_ISO=y
802CONFIG_USB_EHCI_ROOT_HUB_TT=y 801CONFIG_USB_EHCI_ROOT_HUB_TT=y
803# CONFIG_USB_EHCI_TT_NEWSCHED is not set 802# CONFIG_USB_EHCI_TT_NEWSCHED is not set
803# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
804# CONFIG_USB_ISP116X_HCD is not set 804# CONFIG_USB_ISP116X_HCD is not set
805CONFIG_USB_OHCI_HCD=y 805CONFIG_USB_OHCI_HCD=y
806# CONFIG_USB_OHCI_BIG_ENDIAN is not set 806# CONFIG_USB_OHCI_HCD_PPC_OF is not set
807# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
808# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
807CONFIG_USB_OHCI_LITTLE_ENDIAN=y 809CONFIG_USB_OHCI_LITTLE_ENDIAN=y
808CONFIG_USB_UHCI_HCD=y 810CONFIG_USB_UHCI_HCD=y
809# CONFIG_USB_SL811_HCD is not set 811# CONFIG_USB_SL811_HCD is not set
@@ -824,39 +826,9 @@ CONFIG_USB_UHCI_HCD=y
824# CONFIG_USB_LIBUSUAL is not set 826# CONFIG_USB_LIBUSUAL is not set
825 827
826# 828#
827# USB Input Devices
828#
829CONFIG_USB_HID=y
830# CONFIG_USB_HIDINPUT_POWERBOOK is not set
831# CONFIG_HID_FF is not set
832# CONFIG_USB_HIDDEV is not set
833# CONFIG_USB_AIPTEK is not set
834# CONFIG_USB_WACOM is not set
835# CONFIG_USB_ACECAD is not set
836# CONFIG_USB_KBTAB is not set
837# CONFIG_USB_POWERMATE is not set
838# CONFIG_USB_TOUCHSCREEN is not set
839# CONFIG_USB_YEALINK is not set
840# CONFIG_USB_XPAD is not set
841# CONFIG_USB_ATI_REMOTE is not set
842# CONFIG_USB_ATI_REMOTE2 is not set
843# CONFIG_USB_KEYSPAN_REMOTE is not set
844# CONFIG_USB_APPLETOUCH is not set
845
846#
847# USB Imaging devices 829# USB Imaging devices
848# 830#
849# CONFIG_USB_MDC800 is not set 831# CONFIG_USB_MDC800 is not set
850
851#
852# USB Network Adapters
853#
854# CONFIG_USB_CATC is not set
855# CONFIG_USB_KAWETH is not set
856CONFIG_USB_PEGASUS=y
857# CONFIG_USB_RTL8150 is not set
858# CONFIG_USB_USBNET_MII is not set
859# CONFIG_USB_USBNET is not set
860CONFIG_USB_MON=y 832CONFIG_USB_MON=y
861 833
862# 834#
@@ -929,6 +901,7 @@ CONFIG_USB_EZUSB=y
929# CONFIG_USB_RIO500 is not set 901# CONFIG_USB_RIO500 is not set
930# CONFIG_USB_LEGOTOWER is not set 902# CONFIG_USB_LEGOTOWER is not set
931# CONFIG_USB_LCD is not set 903# CONFIG_USB_LCD is not set
904# CONFIG_USB_BERRY_CHARGE is not set
932# CONFIG_USB_LED is not set 905# CONFIG_USB_LED is not set
933# CONFIG_USB_CYPRESS_CY7C63 is not set 906# CONFIG_USB_CYPRESS_CY7C63 is not set
934# CONFIG_USB_CYTHERM is not set 907# CONFIG_USB_CYTHERM is not set
@@ -939,6 +912,7 @@ CONFIG_USB_EZUSB=y
939# CONFIG_USB_SISUSBVGA is not set 912# CONFIG_USB_SISUSBVGA is not set
940# CONFIG_USB_LD is not set 913# CONFIG_USB_LD is not set
941# CONFIG_USB_TRANCEVIBRATOR is not set 914# CONFIG_USB_TRANCEVIBRATOR is not set
915# CONFIG_USB_IOWARRIOR is not set
942# CONFIG_USB_TEST is not set 916# CONFIG_USB_TEST is not set
943 917
944# 918#
@@ -949,10 +923,6 @@ CONFIG_USB_EZUSB=y
949# USB Gadget Support 923# USB Gadget Support
950# 924#
951# CONFIG_USB_GADGET is not set 925# CONFIG_USB_GADGET is not set
952
953#
954# MMC/SD Card support
955#
956# CONFIG_MMC is not set 926# CONFIG_MMC is not set
957 927
958# 928#
@@ -996,10 +966,6 @@ CONFIG_USB_EZUSB=y
996# 966#
997 967
998# 968#
999# Virtualization
1000#
1001
1002#
1003# File systems 969# File systems
1004# 970#
1005CONFIG_EXT2_FS=y 971CONFIG_EXT2_FS=y
@@ -1090,6 +1056,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1090CONFIG_NFS_COMMON=y 1056CONFIG_NFS_COMMON=y
1091CONFIG_SUNRPC=y 1057CONFIG_SUNRPC=y
1092CONFIG_SUNRPC_GSS=y 1058CONFIG_SUNRPC_GSS=y
1059# CONFIG_SUNRPC_BIND34 is not set
1093CONFIG_RPCSEC_GSS_KRB5=y 1060CONFIG_RPCSEC_GSS_KRB5=y
1094# CONFIG_RPCSEC_GSS_SPKM3 is not set 1061# CONFIG_RPCSEC_GSS_SPKM3 is not set
1095# CONFIG_SMB_FS is not set 1062# CONFIG_SMB_FS is not set
@@ -1119,6 +1086,7 @@ CONFIG_MSDOS_PARTITION=y
1119# CONFIG_SUN_PARTITION is not set 1086# CONFIG_SUN_PARTITION is not set
1120# CONFIG_KARMA_PARTITION is not set 1087# CONFIG_KARMA_PARTITION is not set
1121# CONFIG_EFI_PARTITION is not set 1088# CONFIG_EFI_PARTITION is not set
1089# CONFIG_SYSV68_PARTITION is not set
1122 1090
1123# 1091#
1124# Native Language Support 1092# Native Language Support
@@ -1168,6 +1136,7 @@ CONFIG_NLS_UTF8=y
1168# Distributed Lock Manager 1136# Distributed Lock Manager
1169# 1137#
1170# CONFIG_DLM is not set 1138# CONFIG_DLM is not set
1139# CONFIG_UCC_SLOW is not set
1171 1140
1172# 1141#
1173# Library routines 1142# Library routines
@@ -1175,11 +1144,14 @@ CONFIG_NLS_UTF8=y
1175CONFIG_BITREVERSE=y 1144CONFIG_BITREVERSE=y
1176CONFIG_CRC_CCITT=y 1145CONFIG_CRC_CCITT=y
1177# CONFIG_CRC16 is not set 1146# CONFIG_CRC16 is not set
1147# CONFIG_CRC_ITU_T is not set
1178CONFIG_CRC32=y 1148CONFIG_CRC32=y
1179# CONFIG_LIBCRC32C is not set 1149# CONFIG_LIBCRC32C is not set
1180CONFIG_ZLIB_INFLATE=y 1150CONFIG_ZLIB_INFLATE=y
1181CONFIG_PLIST=y 1151CONFIG_PLIST=y
1182CONFIG_IOMAP_COPY=y 1152CONFIG_HAS_IOMEM=y
1153CONFIG_HAS_IOPORT=y
1154CONFIG_HAS_DMA=y
1183 1155
1184# 1156#
1185# Instrumentation Support 1157# Instrumentation Support
@@ -1197,16 +1169,16 @@ CONFIG_MAGIC_SYSRQ=y
1197CONFIG_DEBUG_FS=y 1169CONFIG_DEBUG_FS=y
1198# CONFIG_HEADERS_CHECK is not set 1170# CONFIG_HEADERS_CHECK is not set
1199CONFIG_DEBUG_KERNEL=y 1171CONFIG_DEBUG_KERNEL=y
1200CONFIG_LOG_BUF_SHIFT=17 1172# CONFIG_DEBUG_SHIRQ is not set
1201CONFIG_DETECT_SOFTLOCKUP=y 1173CONFIG_DETECT_SOFTLOCKUP=y
1202# CONFIG_SCHEDSTATS is not set 1174# CONFIG_SCHEDSTATS is not set
1175# CONFIG_TIMER_STATS is not set
1203CONFIG_DEBUG_SLAB=y 1176CONFIG_DEBUG_SLAB=y
1204# CONFIG_DEBUG_SLAB_LEAK is not set 1177# CONFIG_DEBUG_SLAB_LEAK is not set
1205# CONFIG_DEBUG_RT_MUTEXES is not set 1178# CONFIG_DEBUG_RT_MUTEXES is not set
1206# CONFIG_RT_MUTEX_TESTER is not set 1179# CONFIG_RT_MUTEX_TESTER is not set
1207# CONFIG_DEBUG_SPINLOCK is not set 1180# CONFIG_DEBUG_SPINLOCK is not set
1208# CONFIG_DEBUG_MUTEXES is not set 1181# CONFIG_DEBUG_MUTEXES is not set
1209# CONFIG_DEBUG_RWSEMS is not set
1210CONFIG_DEBUG_SPINLOCK_SLEEP=y 1182CONFIG_DEBUG_SPINLOCK_SLEEP=y
1211# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1183# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1212# CONFIG_DEBUG_KOBJECT is not set 1184# CONFIG_DEBUG_KOBJECT is not set
@@ -1216,8 +1188,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1216# CONFIG_DEBUG_LIST is not set 1188# CONFIG_DEBUG_LIST is not set
1217# CONFIG_FORCED_INLINING is not set 1189# CONFIG_FORCED_INLINING is not set
1218# CONFIG_RCU_TORTURE_TEST is not set 1190# CONFIG_RCU_TORTURE_TEST is not set
1191# CONFIG_FAULT_INJECTION is not set
1219CONFIG_DEBUG_STACKOVERFLOW=y 1192CONFIG_DEBUG_STACKOVERFLOW=y
1220CONFIG_DEBUG_STACK_USAGE=y 1193CONFIG_DEBUG_STACK_USAGE=y
1194# CONFIG_DEBUG_PAGEALLOC is not set
1221CONFIG_DEBUGGER=y 1195CONFIG_DEBUGGER=y
1222CONFIG_XMON=y 1196CONFIG_XMON=y
1223CONFIG_XMON_DEFAULT=y 1197CONFIG_XMON_DEFAULT=y
@@ -1252,8 +1226,11 @@ CONFIG_CRYPTO_MD5=y
1252# CONFIG_CRYPTO_GF128MUL is not set 1226# CONFIG_CRYPTO_GF128MUL is not set
1253CONFIG_CRYPTO_ECB=m 1227CONFIG_CRYPTO_ECB=m
1254CONFIG_CRYPTO_CBC=y 1228CONFIG_CRYPTO_CBC=y
1229CONFIG_CRYPTO_PCBC=m
1255# CONFIG_CRYPTO_LRW is not set 1230# CONFIG_CRYPTO_LRW is not set
1231# CONFIG_CRYPTO_CRYPTD is not set
1256CONFIG_CRYPTO_DES=y 1232CONFIG_CRYPTO_DES=y
1233# CONFIG_CRYPTO_FCRYPT is not set
1257# CONFIG_CRYPTO_BLOWFISH is not set 1234# CONFIG_CRYPTO_BLOWFISH is not set
1258# CONFIG_CRYPTO_TWOFISH is not set 1235# CONFIG_CRYPTO_TWOFISH is not set
1259# CONFIG_CRYPTO_SERPENT is not set 1236# CONFIG_CRYPTO_SERPENT is not set
@@ -1267,6 +1244,7 @@ CONFIG_CRYPTO_DES=y
1267# CONFIG_CRYPTO_DEFLATE is not set 1244# CONFIG_CRYPTO_DEFLATE is not set
1268# CONFIG_CRYPTO_MICHAEL_MIC is not set 1245# CONFIG_CRYPTO_MICHAEL_MIC is not set
1269# CONFIG_CRYPTO_CRC32C is not set 1246# CONFIG_CRYPTO_CRC32C is not set
1247# CONFIG_CRYPTO_CAMELLIA is not set
1270# CONFIG_CRYPTO_TEST is not set 1248# CONFIG_CRYPTO_TEST is not set
1271 1249
1272# 1250#
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 0507c8f7bfbc..905998b925ea 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.22-rc6
4# Mon May 14 12:55:04 2007 4# Tue Jun 26 13:51:39 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -295,20 +295,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
295# CONFIG_INET6_TUNNEL is not set 295# CONFIG_INET6_TUNNEL is not set
296# CONFIG_NETWORK_SECMARK is not set 296# CONFIG_NETWORK_SECMARK is not set
297# CONFIG_NETFILTER is not set 297# CONFIG_NETFILTER is not set
298
299#
300# DCCP Configuration (EXPERIMENTAL)
301#
302# CONFIG_IP_DCCP is not set 298# CONFIG_IP_DCCP is not set
303
304#
305# SCTP Configuration (EXPERIMENTAL)
306#
307# CONFIG_IP_SCTP is not set 299# CONFIG_IP_SCTP is not set
308
309#
310# TIPC Configuration (EXPERIMENTAL)
311#
312# CONFIG_TIPC is not set 300# CONFIG_TIPC is not set
313# CONFIG_ATM is not set 301# CONFIG_ATM is not set
314# CONFIG_BRIDGE is not set 302# CONFIG_BRIDGE is not set
@@ -466,10 +454,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
466# CONFIG_SGI_IOC4 is not set 454# CONFIG_SGI_IOC4 is not set
467# CONFIG_TIFM_CORE is not set 455# CONFIG_TIFM_CORE is not set
468# CONFIG_BLINK is not set 456# CONFIG_BLINK is not set
469
470#
471# ATA/ATAPI/MFM/RLL support
472#
473CONFIG_IDE=y 457CONFIG_IDE=y
474CONFIG_BLK_DEV_IDE=y 458CONFIG_BLK_DEV_IDE=y
475 459
@@ -571,7 +555,6 @@ CONFIG_SCSI_3W_9XXX=y
571# CONFIG_SCSI_DC395x is not set 555# CONFIG_SCSI_DC395x is not set
572# CONFIG_SCSI_DC390T is not set 556# CONFIG_SCSI_DC390T is not set
573# CONFIG_SCSI_DEBUG is not set 557# CONFIG_SCSI_DEBUG is not set
574# CONFIG_SCSI_ESP_CORE is not set
575# CONFIG_SCSI_SRP is not set 558# CONFIG_SCSI_SRP is not set
576 559
577# 560#
@@ -580,10 +563,6 @@ CONFIG_SCSI_3W_9XXX=y
580# CONFIG_PCMCIA_FDOMAIN is not set 563# CONFIG_PCMCIA_FDOMAIN is not set
581# CONFIG_PCMCIA_QLOGIC is not set 564# CONFIG_PCMCIA_QLOGIC is not set
582# CONFIG_PCMCIA_SYM53C500 is not set 565# CONFIG_PCMCIA_SYM53C500 is not set
583
584#
585# Serial ATA (prod) and Parallel ATA (experimental) drivers
586#
587CONFIG_ATA=y 566CONFIG_ATA=y
588# CONFIG_ATA_NONSTANDARD is not set 567# CONFIG_ATA_NONSTANDARD is not set
589# CONFIG_SATA_AHCI is not set 568# CONFIG_SATA_AHCI is not set
@@ -694,15 +673,7 @@ CONFIG_DUMMY=y
694# CONFIG_BONDING is not set 673# CONFIG_BONDING is not set
695# CONFIG_EQUALIZER is not set 674# CONFIG_EQUALIZER is not set
696# CONFIG_TUN is not set 675# CONFIG_TUN is not set
697
698#
699# ARCnet devices
700#
701# CONFIG_ARCNET is not set 676# CONFIG_ARCNET is not set
702
703#
704# PHY device support
705#
706CONFIG_PHYLIB=y 677CONFIG_PHYLIB=y
707 678
708# 679#
@@ -752,10 +723,7 @@ CONFIG_NET_PCI=y
752# CONFIG_SUNDANCE is not set 723# CONFIG_SUNDANCE is not set
753# CONFIG_VIA_RHINE is not set 724# CONFIG_VIA_RHINE is not set
754# CONFIG_SC92031 is not set 725# CONFIG_SC92031 is not set
755 726CONFIG_NETDEV_1000=y
756#
757# Ethernet (1000 Mbit)
758#
759# CONFIG_ACENIC is not set 727# CONFIG_ACENIC is not set
760# CONFIG_DL2K is not set 728# CONFIG_DL2K is not set
761CONFIG_E1000=y 729CONFIG_E1000=y
@@ -774,10 +742,7 @@ CONFIG_TIGON3=y
774# CONFIG_BNX2 is not set 742# CONFIG_BNX2 is not set
775# CONFIG_QLA3XXX is not set 743# CONFIG_QLA3XXX is not set
776# CONFIG_ATL1 is not set 744# CONFIG_ATL1 is not set
777 745CONFIG_NETDEV_10000=y
778#
779# Ethernet (10000 Mbit)
780#
781# CONFIG_CHELSIO_T1 is not set 746# CONFIG_CHELSIO_T1 is not set
782# CONFIG_CHELSIO_T3 is not set 747# CONFIG_CHELSIO_T3 is not set
783# CONFIG_IXGB is not set 748# CONFIG_IXGB is not set
@@ -786,11 +751,6 @@ CONFIG_TIGON3=y
786# CONFIG_NETXEN_NIC is not set 751# CONFIG_NETXEN_NIC is not set
787CONFIG_PASEMI_MAC=y 752CONFIG_PASEMI_MAC=y
788# CONFIG_MLX4_CORE is not set 753# CONFIG_MLX4_CORE is not set
789CONFIG_MLX4_DEBUG=y
790
791#
792# Token Ring devices
793#
794# CONFIG_TR is not set 754# CONFIG_TR is not set
795 755
796# 756#
@@ -808,15 +768,7 @@ CONFIG_MLX4_DEBUG=y
808# CONFIG_USB_RTL8150 is not set 768# CONFIG_USB_RTL8150 is not set
809# CONFIG_USB_USBNET_MII is not set 769# CONFIG_USB_USBNET_MII is not set
810# CONFIG_USB_USBNET is not set 770# CONFIG_USB_USBNET is not set
811
812#
813# PCMCIA network device support
814#
815# CONFIG_NET_PCMCIA is not set 771# CONFIG_NET_PCMCIA is not set
816
817#
818# Wan interfaces
819#
820# CONFIG_WAN is not set 772# CONFIG_WAN is not set
821# CONFIG_FDDI is not set 773# CONFIG_FDDI is not set
822# CONFIG_HIPPI is not set 774# CONFIG_HIPPI is not set
@@ -843,6 +795,7 @@ CONFIG_MLX4_DEBUG=y
843# 795#
844CONFIG_INPUT=y 796CONFIG_INPUT=y
845# CONFIG_INPUT_FF_MEMLESS is not set 797# CONFIG_INPUT_FF_MEMLESS is not set
798# CONFIG_INPUT_POLLDEV is not set
846 799
847# 800#
848# Userland interfaces 801# Userland interfaces
@@ -1661,7 +1614,6 @@ CONFIG_NLS_ISO8859_1=y
1661# 1614#
1662# CONFIG_DLM is not set 1615# CONFIG_DLM is not set
1663# CONFIG_UCC_SLOW is not set 1616# CONFIG_UCC_SLOW is not set
1664# CONFIG_UCC_FAST is not set
1665 1617
1666# 1618#
1667# Library routines 1619# Library routines
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index f611df480fd9..0d8ba623e29a 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,9 +1,10 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:28:56 2007 4# Tue Jun 26 14:11:36 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC_PM_NEEDS_RTC_LIB=y
7CONFIG_PPC32=y 8CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 9CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 10CONFIG_MMU=y
@@ -24,6 +25,7 @@ CONFIG_PPC_OF=y
24# CONFIG_GENERIC_TBSYNC is not set 25# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 26CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 27CONFIG_GENERIC_BUG=y
28CONFIG_SYS_SUPPORTS_APM_EMULATION=y
27# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
28 30
29# 31#
@@ -34,9 +36,9 @@ CONFIG_CLASSIC32=y
34# CONFIG_PPC_83xx is not set 36# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set 37# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set 38# CONFIG_PPC_86xx is not set
39# CONFIG_PPC_8xx is not set
37# CONFIG_40x is not set 40# CONFIG_40x is not set
38# CONFIG_44x is not set 41# CONFIG_44x is not set
39# CONFIG_8xx is not set
40# CONFIG_E200 is not set 42# CONFIG_E200 is not set
41CONFIG_6xx=y 43CONFIG_6xx=y
42CONFIG_PPC_FPU=y 44CONFIG_PPC_FPU=y
@@ -45,6 +47,7 @@ CONFIG_PPC_FPU=y
45CONFIG_ALTIVEC=y 47CONFIG_ALTIVEC=y
46CONFIG_PPC_STD_MMU=y 48CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y 49CONFIG_PPC_STD_MMU_32=y
50# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set 51# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 52CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 53
@@ -63,6 +66,7 @@ CONFIG_LOCALVERSION=""
63CONFIG_SWAP=y 66CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 67CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set 68# CONFIG_IPC_NS is not set
69CONFIG_SYSVIPC_SYSCTL=y
66CONFIG_POSIX_MQUEUE=y 70CONFIG_POSIX_MQUEUE=y
67# CONFIG_BSD_PROCESS_ACCT is not set 71# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 72# CONFIG_TASKSTATS is not set
@@ -70,8 +74,10 @@ CONFIG_POSIX_MQUEUE=y
70# CONFIG_AUDIT is not set 74# CONFIG_AUDIT is not set
71CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
77CONFIG_LOG_BUF_SHIFT=14
73CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
74# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
80CONFIG_BLK_DEV_INITRD=y
75CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
76# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
77CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
@@ -86,14 +92,19 @@ CONFIG_BUG=y
86CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
87CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
88CONFIG_FUTEX=y 94CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y
89CONFIG_EPOLL=y 96CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 100CONFIG_SHMEM=y
91CONFIG_SLAB=y
92CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y
103# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set
93CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
94# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
95CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
96# CONFIG_SLOB is not set
97 108
98# 109#
99# Loadable module support 110# Loadable module support
@@ -134,12 +145,17 @@ CONFIG_PPC_MULTIPLATFORM=y
134# CONFIG_APUS is not set 145# CONFIG_APUS is not set
135# CONFIG_PPC_CHRP is not set 146# CONFIG_PPC_CHRP is not set
136# CONFIG_PPC_MPC52xx is not set 147# CONFIG_PPC_MPC52xx is not set
148# CONFIG_PPC_MPC5200 is not set
137# CONFIG_PPC_EFIKA is not set 149# CONFIG_PPC_EFIKA is not set
138# CONFIG_PPC_LITE5200 is not set 150# CONFIG_PPC_LITE5200 is not set
139CONFIG_PPC_PMAC=y 151CONFIG_PPC_PMAC=y
140# CONFIG_PPC_CELL is not set 152# CONFIG_PPC_CELL is not set
141# CONFIG_PPC_CELL_NATIVE is not set 153# CONFIG_PPC_CELL_NATIVE is not set
154# CONFIG_PQ2ADS is not set
142CONFIG_PPC_NATIVE=y 155CONFIG_PPC_NATIVE=y
156CONFIG_MPIC=y
157# CONFIG_MPIC_WEIRD is not set
158# CONFIG_PPC_I8259 is not set
143# CONFIG_PPC_RTAS is not set 159# CONFIG_PPC_RTAS is not set
144# CONFIG_MMIO_NVRAM is not set 160# CONFIG_MMIO_NVRAM is not set
145CONFIG_PPC_MPC106=y 161CONFIG_PPC_MPC106=y
@@ -158,11 +174,14 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
158CONFIG_CPU_FREQ_GOV_USERSPACE=y 174CONFIG_CPU_FREQ_GOV_USERSPACE=y
159# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set 175# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
160# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 176# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
177
178#
179# CPU Frequency drivers
180#
161CONFIG_CPU_FREQ_PMAC=y 181CONFIG_CPU_FREQ_PMAC=y
162CONFIG_PPC601_SYNC_FIX=y 182CONFIG_PPC601_SYNC_FIX=y
163# CONFIG_TAU is not set 183# CONFIG_TAU is not set
164# CONFIG_WANT_EARLY_SERIAL is not set 184# CONFIG_CPM2 is not set
165CONFIG_MPIC=y
166 185
167# 186#
168# Kernel options 187# Kernel options
@@ -191,6 +210,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
191# CONFIG_SPARSEMEM_STATIC is not set 210# CONFIG_SPARSEMEM_STATIC is not set
192CONFIG_SPLIT_PTLOCK_CPUS=4 211CONFIG_SPLIT_PTLOCK_CPUS=4
193# CONFIG_RESOURCES_64BIT is not set 212# CONFIG_RESOURCES_64BIT is not set
213CONFIG_ZONE_DMA_FLAG=1
194CONFIG_PROC_DEVICETREE=y 214CONFIG_PROC_DEVICETREE=y
195# CONFIG_CMDLINE_BOOL is not set 215# CONFIG_CMDLINE_BOOL is not set
196CONFIG_PM=y 216CONFIG_PM=y
@@ -200,19 +220,23 @@ CONFIG_PM_DEBUG=y
200CONFIG_PM_SYSFS_DEPRECATED=y 220CONFIG_PM_SYSFS_DEPRECATED=y
201CONFIG_SOFTWARE_SUSPEND=y 221CONFIG_SOFTWARE_SUSPEND=y
202CONFIG_PM_STD_PARTITION="" 222CONFIG_PM_STD_PARTITION=""
223CONFIG_APM_EMULATION=y
203CONFIG_SECCOMP=y 224CONFIG_SECCOMP=y
225# CONFIG_WANT_DEVICE_TREE is not set
204CONFIG_ISA_DMA_API=y 226CONFIG_ISA_DMA_API=y
205 227
206# 228#
207# Bus options 229# Bus options
208# 230#
231CONFIG_ZONE_DMA=y
209CONFIG_GENERIC_ISA_DMA=y 232CONFIG_GENERIC_ISA_DMA=y
210# CONFIG_MPIC_WEIRD is not set
211# CONFIG_PPC_I8259 is not set
212CONFIG_PPC_INDIRECT_PCI=y 233CONFIG_PPC_INDIRECT_PCI=y
234# CONFIG_PPC_INDIRECT_PCI_BE is not set
213CONFIG_PCI=y 235CONFIG_PCI=y
214CONFIG_PCI_DOMAINS=y 236CONFIG_PCI_DOMAINS=y
215# CONFIG_PCIEPORTBUS is not set 237# CONFIG_PCIEPORTBUS is not set
238CONFIG_ARCH_SUPPORTS_MSI=y
239# CONFIG_PCI_MSI is not set
216# CONFIG_PCI_DEBUG is not set 240# CONFIG_PCI_DEBUG is not set
217 241
218# 242#
@@ -237,10 +261,6 @@ CONFIG_YENTA_TOSHIBA=y
237# CONFIG_PD6729 is not set 261# CONFIG_PD6729 is not set
238# CONFIG_I82092 is not set 262# CONFIG_I82092 is not set
239CONFIG_PCCARD_NONSTATIC=m 263CONFIG_PCCARD_NONSTATIC=m
240
241#
242# PCI Hotplug Support
243#
244# CONFIG_HOTPLUG_PCI is not set 264# CONFIG_HOTPLUG_PCI is not set
245 265
246# 266#
@@ -265,14 +285,15 @@ CONFIG_NET=y
265# 285#
266# Networking options 286# Networking options
267# 287#
268# CONFIG_NETDEBUG is not set
269CONFIG_PACKET=y 288CONFIG_PACKET=y
270# CONFIG_PACKET_MMAP is not set 289# CONFIG_PACKET_MMAP is not set
271CONFIG_UNIX=y 290CONFIG_UNIX=y
272CONFIG_XFRM=y 291CONFIG_XFRM=y
273CONFIG_XFRM_USER=y 292CONFIG_XFRM_USER=y
274# CONFIG_XFRM_SUB_POLICY is not set 293# CONFIG_XFRM_SUB_POLICY is not set
294# CONFIG_XFRM_MIGRATE is not set
275CONFIG_NET_KEY=y 295CONFIG_NET_KEY=y
296# CONFIG_NET_KEY_MIGRATE is not set
276CONFIG_INET=y 297CONFIG_INET=y
277CONFIG_IP_MULTICAST=y 298CONFIG_IP_MULTICAST=y
278# CONFIG_IP_ADVANCED_ROUTER is not set 299# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -297,10 +318,6 @@ CONFIG_INET_TCP_DIAG=y
297CONFIG_TCP_CONG_CUBIC=y 318CONFIG_TCP_CONG_CUBIC=y
298CONFIG_DEFAULT_TCP_CONG="cubic" 319CONFIG_DEFAULT_TCP_CONG="cubic"
299# CONFIG_TCP_MD5SIG is not set 320# CONFIG_TCP_MD5SIG is not set
300
301#
302# IP: Virtual Server Configuration
303#
304# CONFIG_IP_VS is not set 321# CONFIG_IP_VS is not set
305# CONFIG_IPV6 is not set 322# CONFIG_IPV6 is not set
306# CONFIG_INET6_XFRM_TUNNEL is not set 323# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -314,8 +331,6 @@ CONFIG_NETFILTER=y
314# 331#
315# CONFIG_NETFILTER_NETLINK is not set 332# CONFIG_NETFILTER_NETLINK is not set
316CONFIG_NF_CONNTRACK_ENABLED=m 333CONFIG_NF_CONNTRACK_ENABLED=m
317CONFIG_NF_CONNTRACK_SUPPORT=y
318# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
319CONFIG_NF_CONNTRACK=m 334CONFIG_NF_CONNTRACK=m
320# CONFIG_NF_CT_ACCT is not set 335# CONFIG_NF_CT_ACCT is not set
321# CONFIG_NF_CONNTRACK_MARK is not set 336# CONFIG_NF_CONNTRACK_MARK is not set
@@ -327,16 +342,21 @@ CONFIG_NF_CONNTRACK_FTP=m
327CONFIG_NF_CONNTRACK_IRC=m 342CONFIG_NF_CONNTRACK_IRC=m
328# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set 343# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
329# CONFIG_NF_CONNTRACK_PPTP is not set 344# CONFIG_NF_CONNTRACK_PPTP is not set
345# CONFIG_NF_CONNTRACK_SANE is not set
330# CONFIG_NF_CONNTRACK_SIP is not set 346# CONFIG_NF_CONNTRACK_SIP is not set
331CONFIG_NF_CONNTRACK_TFTP=m 347CONFIG_NF_CONNTRACK_TFTP=m
332CONFIG_NETFILTER_XTABLES=m 348CONFIG_NETFILTER_XTABLES=m
333CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 349CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
350# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
334# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 351# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
335CONFIG_NETFILTER_XT_TARGET_MARK=m 352CONFIG_NETFILTER_XT_TARGET_MARK=m
336CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
337CONFIG_NETFILTER_XT_TARGET_NFLOG=m 354CONFIG_NETFILTER_XT_TARGET_NFLOG=m
338CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 355CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
356CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
339CONFIG_NETFILTER_XT_MATCH_COMMENT=m 357CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
359# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
340CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
341CONFIG_NETFILTER_XT_MATCH_DCCP=m 361CONFIG_NETFILTER_XT_MATCH_DCCP=m
342CONFIG_NETFILTER_XT_MATCH_DSCP=m 362CONFIG_NETFILTER_XT_MATCH_DSCP=m
@@ -377,7 +397,6 @@ CONFIG_IP_NF_FILTER=m
377CONFIG_IP_NF_TARGET_REJECT=m 397CONFIG_IP_NF_TARGET_REJECT=m
378CONFIG_IP_NF_TARGET_LOG=m 398CONFIG_IP_NF_TARGET_LOG=m
379CONFIG_IP_NF_TARGET_ULOG=m 399CONFIG_IP_NF_TARGET_ULOG=m
380CONFIG_IP_NF_TARGET_TCPMSS=m
381CONFIG_NF_NAT=m 400CONFIG_NF_NAT=m
382CONFIG_NF_NAT_NEEDED=y 401CONFIG_NF_NAT_NEEDED=y
383CONFIG_IP_NF_TARGET_MASQUERADE=m 402CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -396,14 +415,11 @@ CONFIG_IP_NF_MANGLE=m
396CONFIG_IP_NF_TARGET_TOS=m 415CONFIG_IP_NF_TARGET_TOS=m
397CONFIG_IP_NF_TARGET_ECN=m 416CONFIG_IP_NF_TARGET_ECN=m
398CONFIG_IP_NF_TARGET_TTL=m 417CONFIG_IP_NF_TARGET_TTL=m
418# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
399CONFIG_IP_NF_RAW=m 419CONFIG_IP_NF_RAW=m
400CONFIG_IP_NF_ARPTABLES=m 420CONFIG_IP_NF_ARPTABLES=m
401CONFIG_IP_NF_ARPFILTER=m 421CONFIG_IP_NF_ARPFILTER=m
402CONFIG_IP_NF_ARP_MANGLE=m 422CONFIG_IP_NF_ARP_MANGLE=m
403
404#
405# DCCP Configuration (EXPERIMENTAL)
406#
407CONFIG_IP_DCCP=m 423CONFIG_IP_DCCP=m
408CONFIG_INET_DCCP_DIAG=m 424CONFIG_INET_DCCP_DIAG=m
409CONFIG_IP_DCCP_ACKVEC=y 425CONFIG_IP_DCCP_ACKVEC=y
@@ -422,15 +438,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
422# DCCP Kernel Hacking 438# DCCP Kernel Hacking
423# 439#
424# CONFIG_IP_DCCP_DEBUG is not set 440# CONFIG_IP_DCCP_DEBUG is not set
425
426#
427# SCTP Configuration (EXPERIMENTAL)
428#
429# CONFIG_IP_SCTP is not set 441# CONFIG_IP_SCTP is not set
430
431#
432# TIPC Configuration (EXPERIMENTAL)
433#
434# CONFIG_TIPC is not set 442# CONFIG_TIPC is not set
435# CONFIG_ATM is not set 443# CONFIG_ATM is not set
436# CONFIG_BRIDGE is not set 444# CONFIG_BRIDGE is not set
@@ -448,6 +456,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100
448# QoS and/or fair queueing 456# QoS and/or fair queueing
449# 457#
450# CONFIG_NET_SCHED is not set 458# CONFIG_NET_SCHED is not set
459CONFIG_NET_SCH_FIFO=y
451CONFIG_NET_CLS_ROUTE=y 460CONFIG_NET_CLS_ROUTE=y
452 461
453# 462#
@@ -485,6 +494,7 @@ CONFIG_IRTTY_SIR=m
485# Dongle support 494# Dongle support
486# 495#
487# CONFIG_DONGLE is not set 496# CONFIG_DONGLE is not set
497# CONFIG_KINGSUN_DONGLE is not set
488 498
489# 499#
490# Old SIR device drivers 500# Old SIR device drivers
@@ -532,13 +542,23 @@ CONFIG_BT_HCIBFUSB=m
532# CONFIG_BT_HCIBLUECARD is not set 542# CONFIG_BT_HCIBLUECARD is not set
533# CONFIG_BT_HCIBTUART is not set 543# CONFIG_BT_HCIBTUART is not set
534# CONFIG_BT_HCIVHCI is not set 544# CONFIG_BT_HCIVHCI is not set
545# CONFIG_AF_RXRPC is not set
546
547#
548# Wireless
549#
550CONFIG_CFG80211=m
551CONFIG_WIRELESS_EXT=y
552CONFIG_MAC80211=m
553CONFIG_MAC80211_LEDS=y
554# CONFIG_MAC80211_DEBUG is not set
535CONFIG_IEEE80211=m 555CONFIG_IEEE80211=m
536# CONFIG_IEEE80211_DEBUG is not set 556# CONFIG_IEEE80211_DEBUG is not set
537CONFIG_IEEE80211_CRYPT_WEP=m 557CONFIG_IEEE80211_CRYPT_WEP=m
538CONFIG_IEEE80211_CRYPT_CCMP=m 558CONFIG_IEEE80211_CRYPT_CCMP=m
539CONFIG_IEEE80211_CRYPT_TKIP=m 559CONFIG_IEEE80211_CRYPT_TKIP=m
540# CONFIG_IEEE80211_SOFTMAC is not set 560# CONFIG_IEEE80211_SOFTMAC is not set
541CONFIG_WIRELESS_EXT=y 561# CONFIG_RFKILL is not set
542 562
543# 563#
544# Device Drivers 564# Device Drivers
@@ -551,6 +571,7 @@ CONFIG_WIRELESS_EXT=y
551CONFIG_PREVENT_FIRMWARE_BUILD=y 571CONFIG_PREVENT_FIRMWARE_BUILD=y
552CONFIG_FW_LOADER=y 572CONFIG_FW_LOADER=y
553# CONFIG_DEBUG_DRIVER is not set 573# CONFIG_DEBUG_DRIVER is not set
574# CONFIG_DEBUG_DEVRES is not set
554# CONFIG_SYS_HYPERVISOR is not set 575# CONFIG_SYS_HYPERVISOR is not set
555 576
556# 577#
@@ -558,10 +579,6 @@ CONFIG_FW_LOADER=y
558# 579#
559CONFIG_CONNECTOR=y 580CONFIG_CONNECTOR=y
560CONFIG_PROC_EVENTS=y 581CONFIG_PROC_EVENTS=y
561
562#
563# Memory Technology Devices (MTD)
564#
565# CONFIG_MTD is not set 582# CONFIG_MTD is not set
566 583
567# 584#
@@ -572,6 +589,7 @@ CONFIG_PROC_EVENTS=y
572# 589#
573# Plug and Play support 590# Plug and Play support
574# 591#
592# CONFIG_PNPACPI is not set
575 593
576# 594#
577# Block devices 595# Block devices
@@ -592,19 +610,16 @@ CONFIG_BLK_DEV_RAM=y
592CONFIG_BLK_DEV_RAM_COUNT=16 610CONFIG_BLK_DEV_RAM_COUNT=16
593CONFIG_BLK_DEV_RAM_SIZE=4096 611CONFIG_BLK_DEV_RAM_SIZE=4096
594CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 612CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
595CONFIG_BLK_DEV_INITRD=y
596# CONFIG_CDROM_PKTCDVD is not set 613# CONFIG_CDROM_PKTCDVD is not set
597# CONFIG_ATA_OVER_ETH is not set 614# CONFIG_ATA_OVER_ETH is not set
598 615
599# 616#
600# Misc devices 617# Misc devices
601# 618#
619# CONFIG_PHANTOM is not set
602# CONFIG_SGI_IOC4 is not set 620# CONFIG_SGI_IOC4 is not set
603# CONFIG_TIFM_CORE is not set 621# CONFIG_TIFM_CORE is not set
604 622# CONFIG_BLINK is not set
605#
606# ATA/ATAPI/MFM/RLL support
607#
608CONFIG_IDE=y 623CONFIG_IDE=y
609CONFIG_BLK_DEV_IDE=y 624CONFIG_BLK_DEV_IDE=y
610 625
@@ -615,11 +630,13 @@ CONFIG_BLK_DEV_IDE=y
615CONFIG_BLK_DEV_IDEDISK=y 630CONFIG_BLK_DEV_IDEDISK=y
616# CONFIG_IDEDISK_MULTI_MODE is not set 631# CONFIG_IDEDISK_MULTI_MODE is not set
617CONFIG_BLK_DEV_IDECS=m 632CONFIG_BLK_DEV_IDECS=m
633# CONFIG_BLK_DEV_DELKIN is not set
618CONFIG_BLK_DEV_IDECD=y 634CONFIG_BLK_DEV_IDECD=y
619# CONFIG_BLK_DEV_IDETAPE is not set 635# CONFIG_BLK_DEV_IDETAPE is not set
620CONFIG_BLK_DEV_IDEFLOPPY=y 636CONFIG_BLK_DEV_IDEFLOPPY=y
621CONFIG_BLK_DEV_IDESCSI=y 637CONFIG_BLK_DEV_IDESCSI=y
622# CONFIG_IDE_TASK_IOCTL is not set 638# CONFIG_IDE_TASK_IOCTL is not set
639CONFIG_IDE_PROC_FS=y
623 640
624# 641#
625# IDE chipset support/bugfixes 642# IDE chipset support/bugfixes
@@ -627,12 +644,12 @@ CONFIG_BLK_DEV_IDESCSI=y
627# CONFIG_IDE_GENERIC is not set 644# CONFIG_IDE_GENERIC is not set
628CONFIG_BLK_DEV_IDEPCI=y 645CONFIG_BLK_DEV_IDEPCI=y
629CONFIG_IDEPCI_SHARE_IRQ=y 646CONFIG_IDEPCI_SHARE_IRQ=y
647CONFIG_IDEPCI_PCIBUS_ORDER=y
630# CONFIG_BLK_DEV_OFFBOARD is not set 648# CONFIG_BLK_DEV_OFFBOARD is not set
631CONFIG_BLK_DEV_GENERIC=y 649CONFIG_BLK_DEV_GENERIC=y
632# CONFIG_BLK_DEV_OPTI621 is not set 650# CONFIG_BLK_DEV_OPTI621 is not set
633CONFIG_BLK_DEV_IDEDMA_PCI=y 651CONFIG_BLK_DEV_IDEDMA_PCI=y
634# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 652# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
635CONFIG_IDEDMA_PCI_AUTO=y
636# CONFIG_IDEDMA_ONLYDISK is not set 653# CONFIG_IDEDMA_ONLYDISK is not set
637# CONFIG_BLK_DEV_AEC62XX is not set 654# CONFIG_BLK_DEV_AEC62XX is not set
638# CONFIG_BLK_DEV_ALI15X3 is not set 655# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -647,6 +664,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
647# CONFIG_BLK_DEV_JMICRON is not set 664# CONFIG_BLK_DEV_JMICRON is not set
648# CONFIG_BLK_DEV_SC1200 is not set 665# CONFIG_BLK_DEV_SC1200 is not set
649# CONFIG_BLK_DEV_PIIX is not set 666# CONFIG_BLK_DEV_PIIX is not set
667# CONFIG_BLK_DEV_IT8213 is not set
650# CONFIG_BLK_DEV_IT821X is not set 668# CONFIG_BLK_DEV_IT821X is not set
651# CONFIG_BLK_DEV_NS87415 is not set 669# CONFIG_BLK_DEV_NS87415 is not set
652# CONFIG_BLK_DEV_PDC202XX_OLD is not set 670# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -657,13 +675,13 @@ CONFIG_BLK_DEV_SL82C105=y
657# CONFIG_BLK_DEV_SLC90E66 is not set 675# CONFIG_BLK_DEV_SLC90E66 is not set
658# CONFIG_BLK_DEV_TRM290 is not set 676# CONFIG_BLK_DEV_TRM290 is not set
659# CONFIG_BLK_DEV_VIA82CXXX is not set 677# CONFIG_BLK_DEV_VIA82CXXX is not set
678# CONFIG_BLK_DEV_TC86C001 is not set
660CONFIG_BLK_DEV_IDE_PMAC=y 679CONFIG_BLK_DEV_IDE_PMAC=y
661CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 680CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
662CONFIG_BLK_DEV_IDEDMA_PMAC=y 681CONFIG_BLK_DEV_IDEDMA_PMAC=y
663# CONFIG_IDE_ARM is not set 682# CONFIG_IDE_ARM is not set
664CONFIG_BLK_DEV_IDEDMA=y 683CONFIG_BLK_DEV_IDEDMA=y
665# CONFIG_IDEDMA_IVB is not set 684# CONFIG_IDEDMA_IVB is not set
666CONFIG_IDEDMA_AUTO=y
667# CONFIG_BLK_DEV_HD is not set 685# CONFIG_BLK_DEV_HD is not set
668 686
669# 687#
@@ -693,6 +711,7 @@ CONFIG_CHR_DEV_SG=y
693CONFIG_SCSI_CONSTANTS=y 711CONFIG_SCSI_CONSTANTS=y
694# CONFIG_SCSI_LOGGING is not set 712# CONFIG_SCSI_LOGGING is not set
695# CONFIG_SCSI_SCAN_ASYNC is not set 713# CONFIG_SCSI_SCAN_ASYNC is not set
714CONFIG_SCSI_WAIT_SCAN=m
696 715
697# 716#
698# SCSI Transports 717# SCSI Transports
@@ -762,10 +781,6 @@ CONFIG_SCSI_MAC53C94=y
762# CONFIG_PCMCIA_NINJA_SCSI is not set 781# CONFIG_PCMCIA_NINJA_SCSI is not set
763# CONFIG_PCMCIA_QLOGIC is not set 782# CONFIG_PCMCIA_QLOGIC is not set
764# CONFIG_PCMCIA_SYM53C500 is not set 783# CONFIG_PCMCIA_SYM53C500 is not set
765
766#
767# Serial ATA (prod) and Parallel ATA (experimental) drivers
768#
769# CONFIG_ATA is not set 784# CONFIG_ATA is not set
770 785
771# 786#
@@ -787,6 +802,7 @@ CONFIG_DM_SNAPSHOT=m
787CONFIG_DM_MIRROR=m 802CONFIG_DM_MIRROR=m
788CONFIG_DM_ZERO=m 803CONFIG_DM_ZERO=m
789# CONFIG_DM_MULTIPATH is not set 804# CONFIG_DM_MULTIPATH is not set
805# CONFIG_DM_DELAY is not set
790 806
791# 807#
792# Fusion MPT device support 808# Fusion MPT device support
@@ -799,28 +815,26 @@ CONFIG_DM_ZERO=m
799# 815#
800# IEEE 1394 (FireWire) support 816# IEEE 1394 (FireWire) support
801# 817#
818# CONFIG_FIREWIRE is not set
802CONFIG_IEEE1394=m 819CONFIG_IEEE1394=m
803 820
804# 821#
805# Subsystem Options 822# Subsystem Options
806# 823#
807# CONFIG_IEEE1394_VERBOSEDEBUG is not set 824# CONFIG_IEEE1394_VERBOSEDEBUG is not set
808# CONFIG_IEEE1394_OUI_DB is not set
809CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
810CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
811# CONFIG_IEEE1394_EXPORT_FULL_API is not set
812 825
813# 826#
814# Device Drivers 827# Controllers
815# 828#
816# CONFIG_IEEE1394_PCILYNX is not set 829# CONFIG_IEEE1394_PCILYNX is not set
817CONFIG_IEEE1394_OHCI1394=m 830CONFIG_IEEE1394_OHCI1394=m
818 831
819# 832#
820# Protocol Drivers 833# Protocols
821# 834#
822CONFIG_IEEE1394_VIDEO1394=m 835CONFIG_IEEE1394_VIDEO1394=m
823CONFIG_IEEE1394_SBP2=m 836CONFIG_IEEE1394_SBP2=m
837# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
824# CONFIG_IEEE1394_ETH1394 is not set 838# CONFIG_IEEE1394_ETH1394 is not set
825CONFIG_IEEE1394_DV1394=m 839CONFIG_IEEE1394_DV1394=m
826CONFIG_IEEE1394_RAWIO=m 840CONFIG_IEEE1394_RAWIO=m
@@ -829,10 +843,7 @@ CONFIG_IEEE1394_RAWIO=m
829# I2O device support 843# I2O device support
830# 844#
831# CONFIG_I2O is not set 845# CONFIG_I2O is not set
832 846CONFIG_MACINTOSH_DRIVERS=y
833#
834# Macintosh device drivers
835#
836CONFIG_ADB=y 847CONFIG_ADB=y
837CONFIG_ADB_CUDA=y 848CONFIG_ADB_CUDA=y
838CONFIG_ADB_PMU=y 849CONFIG_ADB_PMU=y
@@ -858,15 +869,7 @@ CONFIG_DUMMY=m
858# CONFIG_BONDING is not set 869# CONFIG_BONDING is not set
859# CONFIG_EQUALIZER is not set 870# CONFIG_EQUALIZER is not set
860CONFIG_TUN=m 871CONFIG_TUN=m
861
862#
863# ARCnet devices
864#
865# CONFIG_ARCNET is not set 872# CONFIG_ARCNET is not set
866
867#
868# PHY device support
869#
870# CONFIG_PHYLIB is not set 873# CONFIG_PHYLIB is not set
871 874
872# 875#
@@ -907,10 +910,8 @@ CONFIG_PCNET32=y
907# CONFIG_SUNDANCE is not set 910# CONFIG_SUNDANCE is not set
908# CONFIG_TLAN is not set 911# CONFIG_TLAN is not set
909# CONFIG_VIA_RHINE is not set 912# CONFIG_VIA_RHINE is not set
910 913# CONFIG_SC92031 is not set
911# 914CONFIG_NETDEV_1000=y
912# Ethernet (1000 Mbit)
913#
914# CONFIG_ACENIC is not set 915# CONFIG_ACENIC is not set
915# CONFIG_DL2K is not set 916# CONFIG_DL2K is not set
916# CONFIG_E1000 is not set 917# CONFIG_E1000 is not set
@@ -927,77 +928,62 @@ CONFIG_PCNET32=y
927# CONFIG_BNX2 is not set 928# CONFIG_BNX2 is not set
928# CONFIG_MV643XX_ETH is not set 929# CONFIG_MV643XX_ETH is not set
929# CONFIG_QLA3XXX is not set 930# CONFIG_QLA3XXX is not set
930 931# CONFIG_ATL1 is not set
931# 932CONFIG_NETDEV_10000=y
932# Ethernet (10000 Mbit)
933#
934# CONFIG_CHELSIO_T1 is not set 933# CONFIG_CHELSIO_T1 is not set
934# CONFIG_CHELSIO_T3 is not set
935# CONFIG_IXGB is not set 935# CONFIG_IXGB is not set
936# CONFIG_S2IO is not set 936# CONFIG_S2IO is not set
937# CONFIG_MYRI10GE is not set 937# CONFIG_MYRI10GE is not set
938# CONFIG_NETXEN_NIC is not set 938# CONFIG_NETXEN_NIC is not set
939 939# CONFIG_MLX4_CORE is not set
940#
941# Token Ring devices
942#
943# CONFIG_TR is not set 940# CONFIG_TR is not set
944 941
945# 942#
946# Wireless LAN (non-hamradio) 943# Wireless LAN
947#
948CONFIG_NET_RADIO=y
949# CONFIG_NET_WIRELESS_RTNETLINK is not set
950
951#
952# Obsolete Wireless cards support (pre-802.11)
953#
954# CONFIG_STRIP is not set
955# CONFIG_PCMCIA_WAVELAN is not set
956# CONFIG_PCMCIA_NETWAVE is not set
957
958#
959# Wireless 802.11 Frequency Hopping cards support
960# 944#
945# CONFIG_WLAN_PRE80211 is not set
946CONFIG_WLAN_80211=y
961# CONFIG_PCMCIA_RAYCS is not set 947# CONFIG_PCMCIA_RAYCS is not set
962
963#
964# Wireless 802.11b ISA/PCI cards support
965#
966# CONFIG_IPW2100 is not set 948# CONFIG_IPW2100 is not set
967# CONFIG_IPW2200 is not set 949# CONFIG_IPW2200 is not set
950# CONFIG_LIBERTAS is not set
968# CONFIG_AIRO is not set 951# CONFIG_AIRO is not set
969CONFIG_HERMES=m 952CONFIG_HERMES=m
970CONFIG_APPLE_AIRPORT=m 953CONFIG_APPLE_AIRPORT=m
971# CONFIG_PLX_HERMES is not set 954# CONFIG_PLX_HERMES is not set
972# CONFIG_TMD_HERMES is not set 955# CONFIG_TMD_HERMES is not set
973# CONFIG_NORTEL_HERMES is not set 956# CONFIG_NORTEL_HERMES is not set
974# CONFIG_PCI_HERMES is not set 957CONFIG_PCI_HERMES=m
975# CONFIG_ATMEL is not set 958# CONFIG_ATMEL is not set
976 959CONFIG_PCMCIA_HERMES=m
977#
978# Wireless 802.11b Pcmcia/Cardbus cards support
979#
980# CONFIG_PCMCIA_HERMES is not set
981# CONFIG_PCMCIA_SPECTRUM is not set 960# CONFIG_PCMCIA_SPECTRUM is not set
982# CONFIG_AIRO_CS is not set 961# CONFIG_AIRO_CS is not set
983# CONFIG_PCMCIA_WL3501 is not set 962# CONFIG_PCMCIA_WL3501 is not set
984
985#
986# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
987#
988CONFIG_PRISM54=m 963CONFIG_PRISM54=m
989# CONFIG_USB_ZD1201 is not set 964# CONFIG_USB_ZD1201 is not set
990# CONFIG_HOSTAP is not set 965# CONFIG_HOSTAP is not set
991CONFIG_NET_WIRELESS=y
992 966
993# 967#
994# PCMCIA network device support 968# USB Network Adapters
995# 969#
970# CONFIG_USB_CATC is not set
971# CONFIG_USB_KAWETH is not set
972# CONFIG_USB_PEGASUS is not set
973# CONFIG_USB_RTL8150 is not set
974CONFIG_USB_USBNET_MII=m
975CONFIG_USB_USBNET=m
976CONFIG_USB_NET_AX8817X=m
977CONFIG_USB_NET_CDCETHER=m
978# CONFIG_USB_NET_DM9601 is not set
979# CONFIG_USB_NET_GL620A is not set
980CONFIG_USB_NET_NET1080=m
981# CONFIG_USB_NET_PLUSB is not set
982# CONFIG_USB_NET_MCS7830 is not set
983# CONFIG_USB_NET_RNDIS_HOST is not set
984# CONFIG_USB_NET_CDC_SUBSET is not set
985CONFIG_USB_NET_ZAURUS=m
996# CONFIG_NET_PCMCIA is not set 986# CONFIG_NET_PCMCIA is not set
997
998#
999# Wan interfaces
1000#
1001# CONFIG_WAN is not set 987# CONFIG_WAN is not set
1002# CONFIG_FDDI is not set 988# CONFIG_FDDI is not set
1003# CONFIG_HIPPI is not set 989# CONFIG_HIPPI is not set
@@ -1033,6 +1019,7 @@ CONFIG_SLHC=y
1033# 1019#
1034CONFIG_INPUT=y 1020CONFIG_INPUT=y
1035# CONFIG_INPUT_FF_MEMLESS is not set 1021# CONFIG_INPUT_FF_MEMLESS is not set
1022# CONFIG_INPUT_POLLDEV is not set
1036 1023
1037# 1024#
1038# Userland interfaces 1025# Userland interfaces
@@ -1059,8 +1046,10 @@ CONFIG_INPUT_KEYBOARD=y
1059CONFIG_INPUT_MOUSE=y 1046CONFIG_INPUT_MOUSE=y
1060# CONFIG_MOUSE_PS2 is not set 1047# CONFIG_MOUSE_PS2 is not set
1061# CONFIG_MOUSE_SERIAL is not set 1048# CONFIG_MOUSE_SERIAL is not set
1049# CONFIG_MOUSE_APPLETOUCH is not set
1062# CONFIG_MOUSE_VSXXXAA is not set 1050# CONFIG_MOUSE_VSXXXAA is not set
1063# CONFIG_INPUT_JOYSTICK is not set 1051# CONFIG_INPUT_JOYSTICK is not set
1052# CONFIG_INPUT_TABLET is not set
1064# CONFIG_INPUT_TOUCHSCREEN is not set 1053# CONFIG_INPUT_TOUCHSCREEN is not set
1065# CONFIG_INPUT_MISC is not set 1054# CONFIG_INPUT_MISC is not set
1066 1055
@@ -1100,6 +1089,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
1100CONFIG_SERIAL_CORE=m 1089CONFIG_SERIAL_CORE=m
1101CONFIG_SERIAL_PMACZILOG=m 1090CONFIG_SERIAL_PMACZILOG=m
1102# CONFIG_SERIAL_JSM is not set 1091# CONFIG_SERIAL_JSM is not set
1092# CONFIG_SERIAL_OF_PLATFORM is not set
1103CONFIG_UNIX98_PTYS=y 1093CONFIG_UNIX98_PTYS=y
1104CONFIG_LEGACY_PTYS=y 1094CONFIG_LEGACY_PTYS=y
1105CONFIG_LEGACY_PTY_COUNT=256 1095CONFIG_LEGACY_PTY_COUNT=256
@@ -1108,16 +1098,11 @@ CONFIG_LEGACY_PTY_COUNT=256
1108# IPMI 1098# IPMI
1109# 1099#
1110# CONFIG_IPMI_HANDLER is not set 1100# CONFIG_IPMI_HANDLER is not set
1111
1112#
1113# Watchdog Cards
1114#
1115# CONFIG_WATCHDOG is not set 1101# CONFIG_WATCHDOG is not set
1116# CONFIG_HW_RANDOM is not set 1102# CONFIG_HW_RANDOM is not set
1117CONFIG_NVRAM=y 1103CONFIG_NVRAM=y
1118CONFIG_GEN_RTC=y 1104CONFIG_GEN_RTC=y
1119# CONFIG_GEN_RTC_X is not set 1105# CONFIG_GEN_RTC_X is not set
1120# CONFIG_DTLK is not set
1121# CONFIG_R3964 is not set 1106# CONFIG_R3964 is not set
1122# CONFIG_APPLICOM is not set 1107# CONFIG_APPLICOM is not set
1123CONFIG_AGP=m 1108CONFIG_AGP=m
@@ -1143,11 +1128,9 @@ CONFIG_DRM_RADEON=m
1143# TPM devices 1128# TPM devices
1144# 1129#
1145# CONFIG_TCG_TPM is not set 1130# CONFIG_TCG_TPM is not set
1146 1131CONFIG_DEVPORT=y
1147#
1148# I2C support
1149#
1150CONFIG_I2C=y 1132CONFIG_I2C=y
1133CONFIG_I2C_BOARDINFO=y
1151CONFIG_I2C_CHARDEV=m 1134CONFIG_I2C_CHARDEV=m
1152 1135
1153# 1136#
@@ -1175,14 +1158,15 @@ CONFIG_I2C_POWERMAC=y
1175# CONFIG_I2C_PARPORT_LIGHT is not set 1158# CONFIG_I2C_PARPORT_LIGHT is not set
1176# CONFIG_I2C_PROSAVAGE is not set 1159# CONFIG_I2C_PROSAVAGE is not set
1177# CONFIG_I2C_SAVAGE4 is not set 1160# CONFIG_I2C_SAVAGE4 is not set
1161# CONFIG_I2C_SIMTEC is not set
1178# CONFIG_I2C_SIS5595 is not set 1162# CONFIG_I2C_SIS5595 is not set
1179# CONFIG_I2C_SIS630 is not set 1163# CONFIG_I2C_SIS630 is not set
1180# CONFIG_I2C_SIS96X is not set 1164# CONFIG_I2C_SIS96X is not set
1181# CONFIG_I2C_STUB is not set 1165# CONFIG_I2C_STUB is not set
1166# CONFIG_I2C_TINY_USB is not set
1182# CONFIG_I2C_VIA is not set 1167# CONFIG_I2C_VIA is not set
1183# CONFIG_I2C_VIAPRO is not set 1168# CONFIG_I2C_VIAPRO is not set
1184# CONFIG_I2C_VOODOO3 is not set 1169# CONFIG_I2C_VOODOO3 is not set
1185# CONFIG_I2C_PCA_ISA is not set
1186 1170
1187# 1171#
1188# Miscellaneous I2C Chip support 1172# Miscellaneous I2C Chip support
@@ -1210,37 +1194,56 @@ CONFIG_I2C_POWERMAC=y
1210# Dallas's 1-wire bus 1194# Dallas's 1-wire bus
1211# 1195#
1212# CONFIG_W1 is not set 1196# CONFIG_W1 is not set
1197# CONFIG_HWMON is not set
1213 1198
1214# 1199#
1215# Hardware Monitoring support 1200# Multifunction device drivers
1216# 1201#
1217# CONFIG_HWMON is not set 1202# CONFIG_MFD_SM501 is not set
1218# CONFIG_HWMON_VID is not set
1219 1203
1220# 1204#
1221# Multimedia devices 1205# Multimedia devices
1222# 1206#
1223# CONFIG_VIDEO_DEV is not set 1207# CONFIG_VIDEO_DEV is not set
1208# CONFIG_DVB_CORE is not set
1209# CONFIG_DAB is not set
1224 1210
1225# 1211#
1226# Digital Video Broadcasting Devices 1212# Graphics support
1227# 1213#
1228# CONFIG_DVB is not set 1214CONFIG_BACKLIGHT_LCD_SUPPORT=y
1229# CONFIG_USB_DABUSB is not set 1215CONFIG_BACKLIGHT_CLASS_DEVICE=y
1216CONFIG_LCD_CLASS_DEVICE=m
1230 1217
1231# 1218#
1232# Graphics support 1219# Display device support
1233# 1220#
1234# CONFIG_FIRMWARE_EDID is not set 1221CONFIG_DISPLAY_SUPPORT=y
1222
1223#
1224# Display hardware drivers
1225#
1226CONFIG_VGASTATE=y
1235CONFIG_FB=y 1227CONFIG_FB=y
1228# CONFIG_FIRMWARE_EDID is not set
1236CONFIG_FB_DDC=y 1229CONFIG_FB_DDC=y
1237CONFIG_FB_CFB_FILLRECT=y 1230CONFIG_FB_CFB_FILLRECT=y
1238CONFIG_FB_CFB_COPYAREA=y 1231CONFIG_FB_CFB_COPYAREA=y
1239CONFIG_FB_CFB_IMAGEBLIT=y 1232CONFIG_FB_CFB_IMAGEBLIT=y
1233# CONFIG_FB_SYS_FILLRECT is not set
1234# CONFIG_FB_SYS_COPYAREA is not set
1235# CONFIG_FB_SYS_IMAGEBLIT is not set
1236# CONFIG_FB_SYS_FOPS is not set
1237CONFIG_FB_DEFERRED_IO=y
1238# CONFIG_FB_SVGALIB is not set
1240CONFIG_FB_MACMODES=y 1239CONFIG_FB_MACMODES=y
1241CONFIG_FB_BACKLIGHT=y 1240CONFIG_FB_BACKLIGHT=y
1242CONFIG_FB_MODE_HELPERS=y 1241CONFIG_FB_MODE_HELPERS=y
1243CONFIG_FB_TILEBLITTING=y 1242CONFIG_FB_TILEBLITTING=y
1243
1244#
1245# Frame buffer hardware drivers
1246#
1244# CONFIG_FB_CIRRUS is not set 1247# CONFIG_FB_CIRRUS is not set
1245# CONFIG_FB_PM2 is not set 1248# CONFIG_FB_PM2 is not set
1246# CONFIG_FB_CYBER2000 is not set 1249# CONFIG_FB_CYBER2000 is not set
@@ -1255,6 +1258,7 @@ CONFIG_FB_IMSTT=y
1255# CONFIG_FB_S1D13XXX is not set 1258# CONFIG_FB_S1D13XXX is not set
1256CONFIG_FB_NVIDIA=y 1259CONFIG_FB_NVIDIA=y
1257CONFIG_FB_NVIDIA_I2C=y 1260CONFIG_FB_NVIDIA_I2C=y
1261# CONFIG_FB_NVIDIA_DEBUG is not set
1258CONFIG_FB_NVIDIA_BACKLIGHT=y 1262CONFIG_FB_NVIDIA_BACKLIGHT=y
1259# CONFIG_FB_RIVA is not set 1263# CONFIG_FB_RIVA is not set
1260CONFIG_FB_MATROX=y 1264CONFIG_FB_MATROX=y
@@ -1274,6 +1278,7 @@ CONFIG_FB_ATY_CT=y
1274# CONFIG_FB_ATY_GENERIC_LCD is not set 1278# CONFIG_FB_ATY_GENERIC_LCD is not set
1275CONFIG_FB_ATY_GX=y 1279CONFIG_FB_ATY_GX=y
1276CONFIG_FB_ATY_BACKLIGHT=y 1280CONFIG_FB_ATY_BACKLIGHT=y
1281# CONFIG_FB_S3 is not set
1277# CONFIG_FB_SAVAGE is not set 1282# CONFIG_FB_SAVAGE is not set
1278# CONFIG_FB_SIS is not set 1283# CONFIG_FB_SIS is not set
1279# CONFIG_FB_NEOMAGIC is not set 1284# CONFIG_FB_NEOMAGIC is not set
@@ -1281,7 +1286,10 @@ CONFIG_FB_ATY_BACKLIGHT=y
1281CONFIG_FB_3DFX=y 1286CONFIG_FB_3DFX=y
1282# CONFIG_FB_3DFX_ACCEL is not set 1287# CONFIG_FB_3DFX_ACCEL is not set
1283# CONFIG_FB_VOODOO1 is not set 1288# CONFIG_FB_VOODOO1 is not set
1289# CONFIG_FB_VT8623 is not set
1284# CONFIG_FB_TRIDENT is not set 1290# CONFIG_FB_TRIDENT is not set
1291# CONFIG_FB_ARK is not set
1292# CONFIG_FB_PM3 is not set
1285# CONFIG_FB_IBM_GXT4500 is not set 1293# CONFIG_FB_IBM_GXT4500 is not set
1286# CONFIG_FB_VIRTUAL is not set 1294# CONFIG_FB_VIRTUAL is not set
1287 1295
@@ -1295,26 +1303,15 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
1295# CONFIG_FONTS is not set 1303# CONFIG_FONTS is not set
1296CONFIG_FONT_8x8=y 1304CONFIG_FONT_8x8=y
1297CONFIG_FONT_8x16=y 1305CONFIG_FONT_8x16=y
1298
1299#
1300# Logo configuration
1301#
1302CONFIG_LOGO=y 1306CONFIG_LOGO=y
1303CONFIG_LOGO_LINUX_MONO=y 1307CONFIG_LOGO_LINUX_MONO=y
1304CONFIG_LOGO_LINUX_VGA16=y 1308CONFIG_LOGO_LINUX_VGA16=y
1305CONFIG_LOGO_LINUX_CLUT224=y 1309CONFIG_LOGO_LINUX_CLUT224=y
1306CONFIG_BACKLIGHT_LCD_SUPPORT=y
1307CONFIG_BACKLIGHT_CLASS_DEVICE=y
1308CONFIG_BACKLIGHT_DEVICE=y
1309CONFIG_LCD_CLASS_DEVICE=m
1310CONFIG_LCD_DEVICE=y
1311 1310
1312# 1311#
1313# Sound 1312# Sound
1314# 1313#
1315CONFIG_SOUND=m 1314CONFIG_SOUND=m
1316CONFIG_DMASOUND_PMAC=m
1317CONFIG_DMASOUND=m
1318 1315
1319# 1316#
1320# Advanced Linux Sound Architecture 1317# Advanced Linux Sound Architecture
@@ -1428,6 +1425,7 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
1428# 1425#
1429CONFIG_SND_USB_AUDIO=m 1426CONFIG_SND_USB_AUDIO=m
1430# CONFIG_SND_USB_USX2Y is not set 1427# CONFIG_SND_USB_USX2Y is not set
1428# CONFIG_SND_USB_CAIAQ is not set
1431 1429
1432# 1430#
1433# PCMCIA devices 1431# PCMCIA devices
@@ -1436,6 +1434,11 @@ CONFIG_SND_USB_AUDIO=m
1436# CONFIG_SND_PDAUDIOCF is not set 1434# CONFIG_SND_PDAUDIOCF is not set
1437 1435
1438# 1436#
1437# System on Chip audio support
1438#
1439# CONFIG_SND_SOC is not set
1440
1441#
1439# Open Sound System 1442# Open Sound System
1440# 1443#
1441# CONFIG_SOUND_PRIME is not set 1444# CONFIG_SOUND_PRIME is not set
@@ -1444,6 +1447,15 @@ CONFIG_SND_USB_AUDIO=m
1444# HID Devices 1447# HID Devices
1445# 1448#
1446CONFIG_HID=y 1449CONFIG_HID=y
1450# CONFIG_HID_DEBUG is not set
1451
1452#
1453# USB Input Devices
1454#
1455CONFIG_USB_HID=y
1456CONFIG_USB_HIDINPUT_POWERBOOK=y
1457# CONFIG_HID_FF is not set
1458# CONFIG_USB_HIDDEV is not set
1447 1459
1448# 1460#
1449# USB support 1461# USB support
@@ -1458,10 +1470,9 @@ CONFIG_USB=y
1458# Miscellaneous USB options 1470# Miscellaneous USB options
1459# 1471#
1460CONFIG_USB_DEVICEFS=y 1472CONFIG_USB_DEVICEFS=y
1461# CONFIG_USB_BANDWIDTH is not set 1473CONFIG_USB_DEVICE_CLASS=y
1462CONFIG_USB_DYNAMIC_MINORS=y 1474CONFIG_USB_DYNAMIC_MINORS=y
1463# CONFIG_USB_SUSPEND is not set 1475# CONFIG_USB_SUSPEND is not set
1464# CONFIG_USB_MULTITHREAD_PROBE is not set
1465# CONFIG_USB_OTG is not set 1476# CONFIG_USB_OTG is not set
1466 1477
1467# 1478#
@@ -1471,9 +1482,12 @@ CONFIG_USB_EHCI_HCD=m
1471CONFIG_USB_EHCI_SPLIT_ISO=y 1482CONFIG_USB_EHCI_SPLIT_ISO=y
1472CONFIG_USB_EHCI_ROOT_HUB_TT=y 1483CONFIG_USB_EHCI_ROOT_HUB_TT=y
1473# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1484# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1485# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1474# CONFIG_USB_ISP116X_HCD is not set 1486# CONFIG_USB_ISP116X_HCD is not set
1475CONFIG_USB_OHCI_HCD=y 1487CONFIG_USB_OHCI_HCD=y
1476# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1488# CONFIG_USB_OHCI_HCD_PPC_OF is not set
1489# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1490# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1477CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1491CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1478# CONFIG_USB_UHCI_HCD is not set 1492# CONFIG_USB_UHCI_HCD is not set
1479# CONFIG_USB_SL811_HCD is not set 1493# CONFIG_USB_SL811_HCD is not set
@@ -1506,49 +1520,10 @@ CONFIG_USB_STORAGE=m
1506# CONFIG_USB_LIBUSUAL is not set 1520# CONFIG_USB_LIBUSUAL is not set
1507 1521
1508# 1522#
1509# USB Input Devices
1510#
1511CONFIG_USB_HID=y
1512CONFIG_USB_HIDINPUT_POWERBOOK=y
1513# CONFIG_HID_FF is not set
1514# CONFIG_USB_HIDDEV is not set
1515# CONFIG_USB_AIPTEK is not set
1516# CONFIG_USB_WACOM is not set
1517# CONFIG_USB_ACECAD is not set
1518# CONFIG_USB_KBTAB is not set
1519# CONFIG_USB_POWERMATE is not set
1520# CONFIG_USB_TOUCHSCREEN is not set
1521# CONFIG_USB_YEALINK is not set
1522# CONFIG_USB_XPAD is not set
1523# CONFIG_USB_ATI_REMOTE is not set
1524# CONFIG_USB_ATI_REMOTE2 is not set
1525# CONFIG_USB_KEYSPAN_REMOTE is not set
1526CONFIG_USB_APPLETOUCH=y
1527
1528#
1529# USB Imaging devices 1523# USB Imaging devices
1530# 1524#
1531# CONFIG_USB_MDC800 is not set 1525# CONFIG_USB_MDC800 is not set
1532# CONFIG_USB_MICROTEK is not set 1526# CONFIG_USB_MICROTEK is not set
1533
1534#
1535# USB Network Adapters
1536#
1537# CONFIG_USB_CATC is not set
1538# CONFIG_USB_KAWETH is not set
1539# CONFIG_USB_PEGASUS is not set
1540# CONFIG_USB_RTL8150 is not set
1541CONFIG_USB_USBNET_MII=m
1542CONFIG_USB_USBNET=m
1543CONFIG_USB_NET_AX8817X=m
1544CONFIG_USB_NET_CDCETHER=m
1545# CONFIG_USB_NET_GL620A is not set
1546CONFIG_USB_NET_NET1080=m
1547# CONFIG_USB_NET_PLUSB is not set
1548# CONFIG_USB_NET_MCS7830 is not set
1549# CONFIG_USB_NET_RNDIS_HOST is not set
1550# CONFIG_USB_NET_CDC_SUBSET is not set
1551CONFIG_USB_NET_ZAURUS=m
1552CONFIG_USB_MON=y 1527CONFIG_USB_MON=y
1553 1528
1554# 1529#
@@ -1620,6 +1595,7 @@ CONFIG_USB_EZUSB=y
1620# CONFIG_USB_RIO500 is not set 1595# CONFIG_USB_RIO500 is not set
1621# CONFIG_USB_LEGOTOWER is not set 1596# CONFIG_USB_LEGOTOWER is not set
1622# CONFIG_USB_LCD is not set 1597# CONFIG_USB_LCD is not set
1598# CONFIG_USB_BERRY_CHARGE is not set
1623# CONFIG_USB_LED is not set 1599# CONFIG_USB_LED is not set
1624# CONFIG_USB_CYPRESS_CY7C63 is not set 1600# CONFIG_USB_CYPRESS_CY7C63 is not set
1625# CONFIG_USB_CYTHERM is not set 1601# CONFIG_USB_CYTHERM is not set
@@ -1630,6 +1606,7 @@ CONFIG_USB_APPLEDISPLAY=m
1630# CONFIG_USB_SISUSBVGA is not set 1606# CONFIG_USB_SISUSBVGA is not set
1631# CONFIG_USB_LD is not set 1607# CONFIG_USB_LD is not set
1632# CONFIG_USB_TRANCEVIBRATOR is not set 1608# CONFIG_USB_TRANCEVIBRATOR is not set
1609# CONFIG_USB_IOWARRIOR is not set
1633# CONFIG_USB_TEST is not set 1610# CONFIG_USB_TEST is not set
1634 1611
1635# 1612#
@@ -1640,10 +1617,6 @@ CONFIG_USB_APPLEDISPLAY=m
1640# USB Gadget Support 1617# USB Gadget Support
1641# 1618#
1642# CONFIG_USB_GADGET is not set 1619# CONFIG_USB_GADGET is not set
1643
1644#
1645# MMC/SD Card support
1646#
1647# CONFIG_MMC is not set 1620# CONFIG_MMC is not set
1648 1621
1649# 1622#
@@ -1676,6 +1649,7 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
1676# 1649#
1677# Real Time Clock 1650# Real Time Clock
1678# 1651#
1652CONFIG_RTC_LIB=y
1679# CONFIG_RTC_CLASS is not set 1653# CONFIG_RTC_CLASS is not set
1680 1654
1681# 1655#
@@ -1692,10 +1666,6 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y
1692# 1666#
1693 1667
1694# 1668#
1695# Virtualization
1696#
1697
1698#
1699# File systems 1669# File systems
1700# 1670#
1701CONFIG_EXT2_FS=y 1671CONFIG_EXT2_FS=y
@@ -1731,7 +1701,6 @@ CONFIG_FUSE_FS=m
1731CONFIG_ISO9660_FS=y 1701CONFIG_ISO9660_FS=y
1732CONFIG_JOLIET=y 1702CONFIG_JOLIET=y
1733CONFIG_ZISOFS=y 1703CONFIG_ZISOFS=y
1734CONFIG_ZISOFS_FS=y
1735CONFIG_UDF_FS=m 1704CONFIG_UDF_FS=m
1736CONFIG_UDF_NLS=y 1705CONFIG_UDF_NLS=y
1737 1706
@@ -1796,6 +1765,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1796CONFIG_NFS_COMMON=y 1765CONFIG_NFS_COMMON=y
1797CONFIG_SUNRPC=y 1766CONFIG_SUNRPC=y
1798CONFIG_SUNRPC_GSS=y 1767CONFIG_SUNRPC_GSS=y
1768# CONFIG_SUNRPC_BIND34 is not set
1799CONFIG_RPCSEC_GSS_KRB5=y 1769CONFIG_RPCSEC_GSS_KRB5=y
1800# CONFIG_RPCSEC_GSS_SPKM3 is not set 1770# CONFIG_RPCSEC_GSS_SPKM3 is not set
1801CONFIG_SMB_FS=m 1771CONFIG_SMB_FS=m
@@ -1826,6 +1796,7 @@ CONFIG_MSDOS_PARTITION=y
1826# CONFIG_SUN_PARTITION is not set 1796# CONFIG_SUN_PARTITION is not set
1827# CONFIG_KARMA_PARTITION is not set 1797# CONFIG_KARMA_PARTITION is not set
1828# CONFIG_EFI_PARTITION is not set 1798# CONFIG_EFI_PARTITION is not set
1799# CONFIG_SYSV68_PARTITION is not set
1829 1800
1830# 1801#
1831# Native Language Support 1802# Native Language Support
@@ -1875,6 +1846,7 @@ CONFIG_NLS_UTF8=m
1875# Distributed Lock Manager 1846# Distributed Lock Manager
1876# 1847#
1877# CONFIG_DLM is not set 1848# CONFIG_DLM is not set
1849# CONFIG_UCC_SLOW is not set
1878 1850
1879# 1851#
1880# Library routines 1852# Library routines
@@ -1882,6 +1854,7 @@ CONFIG_NLS_UTF8=m
1882CONFIG_BITREVERSE=y 1854CONFIG_BITREVERSE=y
1883CONFIG_CRC_CCITT=y 1855CONFIG_CRC_CCITT=y
1884CONFIG_CRC16=y 1856CONFIG_CRC16=y
1857# CONFIG_CRC_ITU_T is not set
1885CONFIG_CRC32=y 1858CONFIG_CRC32=y
1886CONFIG_LIBCRC32C=m 1859CONFIG_LIBCRC32C=m
1887CONFIG_ZLIB_INFLATE=y 1860CONFIG_ZLIB_INFLATE=y
@@ -1891,13 +1864,16 @@ CONFIG_TEXTSEARCH_KMP=m
1891CONFIG_TEXTSEARCH_BM=m 1864CONFIG_TEXTSEARCH_BM=m
1892CONFIG_TEXTSEARCH_FSM=m 1865CONFIG_TEXTSEARCH_FSM=m
1893CONFIG_PLIST=y 1866CONFIG_PLIST=y
1894CONFIG_IOMAP_COPY=y 1867CONFIG_HAS_IOMEM=y
1868CONFIG_HAS_IOPORT=y
1869CONFIG_HAS_DMA=y
1895 1870
1896# 1871#
1897# Instrumentation Support 1872# Instrumentation Support
1898# 1873#
1899CONFIG_PROFILING=y 1874CONFIG_PROFILING=y
1900CONFIG_OPROFILE=y 1875CONFIG_OPROFILE=y
1876# CONFIG_KPROBES is not set
1901 1877
1902# 1878#
1903# Kernel hacking 1879# Kernel hacking
@@ -1909,15 +1885,15 @@ CONFIG_MAGIC_SYSRQ=y
1909# CONFIG_DEBUG_FS is not set 1885# CONFIG_DEBUG_FS is not set
1910# CONFIG_HEADERS_CHECK is not set 1886# CONFIG_HEADERS_CHECK is not set
1911CONFIG_DEBUG_KERNEL=y 1887CONFIG_DEBUG_KERNEL=y
1912CONFIG_LOG_BUF_SHIFT=14 1888# CONFIG_DEBUG_SHIRQ is not set
1913CONFIG_DETECT_SOFTLOCKUP=y 1889CONFIG_DETECT_SOFTLOCKUP=y
1914# CONFIG_SCHEDSTATS is not set 1890# CONFIG_SCHEDSTATS is not set
1891# CONFIG_TIMER_STATS is not set
1915# CONFIG_DEBUG_SLAB is not set 1892# CONFIG_DEBUG_SLAB is not set
1916# CONFIG_DEBUG_RT_MUTEXES is not set 1893# CONFIG_DEBUG_RT_MUTEXES is not set
1917# CONFIG_RT_MUTEX_TESTER is not set 1894# CONFIG_RT_MUTEX_TESTER is not set
1918# CONFIG_DEBUG_SPINLOCK is not set 1895# CONFIG_DEBUG_SPINLOCK is not set
1919# CONFIG_DEBUG_MUTEXES is not set 1896# CONFIG_DEBUG_MUTEXES is not set
1920# CONFIG_DEBUG_RWSEMS is not set
1921# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1897# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1922# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1898# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1923# CONFIG_DEBUG_KOBJECT is not set 1899# CONFIG_DEBUG_KOBJECT is not set
@@ -1927,6 +1903,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
1927# CONFIG_DEBUG_LIST is not set 1903# CONFIG_DEBUG_LIST is not set
1928# CONFIG_FORCED_INLINING is not set 1904# CONFIG_FORCED_INLINING is not set
1929# CONFIG_RCU_TORTURE_TEST is not set 1905# CONFIG_RCU_TORTURE_TEST is not set
1906# CONFIG_FAULT_INJECTION is not set
1907# CONFIG_DEBUG_STACKOVERFLOW is not set
1908# CONFIG_DEBUG_STACK_USAGE is not set
1930CONFIG_DEBUGGER=y 1909CONFIG_DEBUGGER=y
1931CONFIG_XMON=y 1910CONFIG_XMON=y
1932CONFIG_XMON_DEFAULT=y 1911CONFIG_XMON_DEFAULT=y
@@ -1962,8 +1941,11 @@ CONFIG_CRYPTO_TGR192=m
1962# CONFIG_CRYPTO_GF128MUL is not set 1941# CONFIG_CRYPTO_GF128MUL is not set
1963CONFIG_CRYPTO_ECB=m 1942CONFIG_CRYPTO_ECB=m
1964CONFIG_CRYPTO_CBC=y 1943CONFIG_CRYPTO_CBC=y
1944CONFIG_CRYPTO_PCBC=m
1965# CONFIG_CRYPTO_LRW is not set 1945# CONFIG_CRYPTO_LRW is not set
1946# CONFIG_CRYPTO_CRYPTD is not set
1966CONFIG_CRYPTO_DES=y 1947CONFIG_CRYPTO_DES=y
1948# CONFIG_CRYPTO_FCRYPT is not set
1967CONFIG_CRYPTO_BLOWFISH=m 1949CONFIG_CRYPTO_BLOWFISH=m
1968CONFIG_CRYPTO_TWOFISH=m 1950CONFIG_CRYPTO_TWOFISH=m
1969CONFIG_CRYPTO_TWOFISH_COMMON=m 1951CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1978,6 +1960,7 @@ CONFIG_CRYPTO_ANUBIS=m
1978CONFIG_CRYPTO_DEFLATE=m 1960CONFIG_CRYPTO_DEFLATE=m
1979CONFIG_CRYPTO_MICHAEL_MIC=m 1961CONFIG_CRYPTO_MICHAEL_MIC=m
1980CONFIG_CRYPTO_CRC32C=m 1962CONFIG_CRYPTO_CRC32C=m
1963# CONFIG_CRYPTO_CAMELLIA is not set
1981# CONFIG_CRYPTO_TEST is not set 1964# CONFIG_CRYPTO_TEST is not set
1982 1965
1983# 1966#
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 126b9f87df25..6e503d98daba 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:28:58 2007 4# Tue Jun 26 14:15:02 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -27,6 +27,7 @@ CONFIG_GENERIC_TBSYNC=y
27CONFIG_AUDIT_ARCH=y 27CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 28CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 29# CONFIG_DEFAULT_UIMAGE is not set
30CONFIG_PPC64_SWSUSP=y
30 31
31# 32#
32# Processor support 33# Processor support
@@ -41,6 +42,7 @@ CONFIG_PPC_DCR=y
41CONFIG_PPC_OF_PLATFORM_PCI=y 42CONFIG_PPC_OF_PLATFORM_PCI=y
42CONFIG_ALTIVEC=y 43CONFIG_ALTIVEC=y
43CONFIG_PPC_STD_MMU=y 44CONFIG_PPC_STD_MMU=y
45CONFIG_PPC_MM_SLICES=y
44CONFIG_VIRT_CPU_ACCOUNTING=y 46CONFIG_VIRT_CPU_ACCOUNTING=y
45CONFIG_SMP=y 47CONFIG_SMP=y
46CONFIG_NR_CPUS=32 48CONFIG_NR_CPUS=32
@@ -61,20 +63,23 @@ CONFIG_LOCALVERSION_AUTO=y
61CONFIG_SWAP=y 63CONFIG_SWAP=y
62CONFIG_SYSVIPC=y 64CONFIG_SYSVIPC=y
63# CONFIG_IPC_NS is not set 65# CONFIG_IPC_NS is not set
66CONFIG_SYSVIPC_SYSCTL=y
64CONFIG_POSIX_MQUEUE=y 67CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 68# CONFIG_BSD_PROCESS_ACCT is not set
66CONFIG_TASKSTATS=y 69CONFIG_TASKSTATS=y
67CONFIG_TASK_DELAY_ACCT=y 70CONFIG_TASK_DELAY_ACCT=y
71# CONFIG_TASK_XACCT is not set
68# CONFIG_UTS_NS is not set 72# CONFIG_UTS_NS is not set
69# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
70CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=17
72CONFIG_CPUSETS=y 77CONFIG_CPUSETS=y
73CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
74CONFIG_RELAY=y 79CONFIG_RELAY=y
80CONFIG_BLK_DEV_INITRD=y
75CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
76CONFIG_CC_OPTIMIZE_FOR_SIZE=y 82CONFIG_CC_OPTIMIZE_FOR_SIZE=y
77# CONFIG_TASK_XACCT is not set
78CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
79# CONFIG_EMBEDDED is not set 84# CONFIG_EMBEDDED is not set
80CONFIG_SYSCTL_SYSCALL=y 85CONFIG_SYSCTL_SYSCALL=y
@@ -87,14 +92,19 @@ CONFIG_BUG=y
87CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
88CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 94CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 96CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 100CONFIG_SHMEM=y
92CONFIG_SLAB=y
93CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y
103# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set
94CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
95# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
96CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
97# CONFIG_SLOB is not set
98 108
99# 109#
100# Loadable module support 110# Loadable module support
@@ -133,24 +143,54 @@ CONFIG_PPC_MULTIPLATFORM=y
133# CONFIG_EMBEDDED6xx is not set 143# CONFIG_EMBEDDED6xx is not set
134# CONFIG_APUS is not set 144# CONFIG_APUS is not set
135CONFIG_PPC_PSERIES=y 145CONFIG_PPC_PSERIES=y
146CONFIG_PPC_SPLPAR=y
147CONFIG_EEH=y
148CONFIG_SCANLOG=m
149CONFIG_LPARCFG=y
136CONFIG_PPC_ISERIES=y 150CONFIG_PPC_ISERIES=y
151
152#
153# iSeries device drivers
154#
155CONFIG_VIODASD=y
156CONFIG_VIOCD=m
157CONFIG_VIOTAPE=m
158CONFIG_VIOPATH=y
137# CONFIG_PPC_MPC52xx is not set 159# CONFIG_PPC_MPC52xx is not set
160# CONFIG_PPC_MPC5200 is not set
138CONFIG_PPC_PMAC=y 161CONFIG_PPC_PMAC=y
139CONFIG_PPC_PMAC64=y 162CONFIG_PPC_PMAC64=y
140CONFIG_PPC_MAPLE=y 163CONFIG_PPC_MAPLE=y
141# CONFIG_PPC_PASEMI is not set 164# CONFIG_PPC_PASEMI is not set
165CONFIG_PPC_CELLEB=y
166# CONFIG_PPC_PS3 is not set
142CONFIG_PPC_CELL=y 167CONFIG_PPC_CELL=y
143CONFIG_PPC_CELL_NATIVE=y 168CONFIG_PPC_CELL_NATIVE=y
144CONFIG_PPC_IBM_CELL_BLADE=y 169CONFIG_PPC_IBM_CELL_BLADE=y
145# CONFIG_PPC_PS3 is not set 170
171#
172# Cell Broadband Engine options
173#
174CONFIG_SPU_FS=m
175CONFIG_SPU_FS_64K_LS=y
176CONFIG_SPU_BASE=y
177CONFIG_CBE_RAS=y
178CONFIG_CBE_THERM=m
179CONFIG_CBE_CPUFREQ=m
180# CONFIG_PQ2ADS is not set
146CONFIG_PPC_NATIVE=y 181CONFIG_PPC_NATIVE=y
147CONFIG_UDBG_RTAS_CONSOLE=y 182CONFIG_UDBG_RTAS_CONSOLE=y
183CONFIG_PPC_UDBG_BEAT=y
148CONFIG_XICS=y 184CONFIG_XICS=y
185CONFIG_MPIC=y
186# CONFIG_MPIC_WEIRD is not set
187CONFIG_PPC_I8259=y
149CONFIG_U3_DART=y 188CONFIG_U3_DART=y
150CONFIG_PPC_RTAS=y 189CONFIG_PPC_RTAS=y
151CONFIG_RTAS_ERROR_LOGGING=y 190CONFIG_RTAS_ERROR_LOGGING=y
152CONFIG_RTAS_PROC=y 191CONFIG_RTAS_PROC=y
153CONFIG_RTAS_FLASH=m 192CONFIG_RTAS_FLASH=m
193CONFIG_PPC_PMI=m
154CONFIG_MMIO_NVRAM=y 194CONFIG_MMIO_NVRAM=y
155CONFIG_MPIC_U3_HT_IRQS=y 195CONFIG_MPIC_U3_HT_IRQS=y
156CONFIG_IBMVIO=y 196CONFIG_IBMVIO=y
@@ -171,18 +211,12 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
171CONFIG_CPU_FREQ_GOV_USERSPACE=y 211CONFIG_CPU_FREQ_GOV_USERSPACE=y
172# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set 212# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
173# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set 213# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
174CONFIG_CPU_FREQ_PMAC64=y
175# CONFIG_WANT_EARLY_SERIAL is not set
176CONFIG_MPIC=y
177 214
178# 215#
179# Cell Broadband Engine options 216# CPU Frequency drivers
180# 217#
181CONFIG_SPU_FS=m 218CONFIG_CPU_FREQ_PMAC64=y
182CONFIG_SPU_BASE=y 219# CONFIG_CPM2 is not set
183CONFIG_CBE_RAS=y
184CONFIG_CBE_THERM=m
185CONFIG_CBE_CPUFREQ=m
186 220
187# 221#
188# Kernel options 222# Kernel options
@@ -205,10 +239,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
205CONFIG_KEXEC=y 239CONFIG_KEXEC=y
206# CONFIG_CRASH_DUMP is not set 240# CONFIG_CRASH_DUMP is not set
207CONFIG_IRQ_ALL_CPUS=y 241CONFIG_IRQ_ALL_CPUS=y
208CONFIG_PPC_SPLPAR=y
209CONFIG_EEH=y
210CONFIG_SCANLOG=m
211CONFIG_LPARCFG=y
212# CONFIG_NUMA is not set 242# CONFIG_NUMA is not set
213CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
214CONFIG_ARCH_FLATMEM_ENABLE=y 244CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -227,35 +257,35 @@ CONFIG_MEMORY_HOTPLUG=y
227CONFIG_MEMORY_HOTPLUG_SPARSE=y 257CONFIG_MEMORY_HOTPLUG_SPARSE=y
228CONFIG_SPLIT_PTLOCK_CPUS=4 258CONFIG_SPLIT_PTLOCK_CPUS=4
229CONFIG_RESOURCES_64BIT=y 259CONFIG_RESOURCES_64BIT=y
260CONFIG_ZONE_DMA_FLAG=1
230CONFIG_ARCH_MEMORY_PROBE=y 261CONFIG_ARCH_MEMORY_PROBE=y
262CONFIG_PPC_HAS_HASH_64K=y
231# CONFIG_PPC_64K_PAGES is not set 263# CONFIG_PPC_64K_PAGES is not set
232# CONFIG_SCHED_SMT is not set 264# CONFIG_SCHED_SMT is not set
233CONFIG_PROC_DEVICETREE=y 265CONFIG_PROC_DEVICETREE=y
234# CONFIG_CMDLINE_BOOL is not set 266# CONFIG_CMDLINE_BOOL is not set
235# CONFIG_PM is not set 267# CONFIG_PM is not set
236CONFIG_SECCOMP=y 268CONFIG_SECCOMP=y
269# CONFIG_WANT_DEVICE_TREE is not set
237CONFIG_ISA_DMA_API=y 270CONFIG_ISA_DMA_API=y
238 271
239# 272#
240# Bus options 273# Bus options
241# 274#
275CONFIG_ZONE_DMA=y
242CONFIG_GENERIC_ISA_DMA=y 276CONFIG_GENERIC_ISA_DMA=y
243# CONFIG_MPIC_WEIRD is not set
244CONFIG_PPC_I8259=y
245# CONFIG_PPC_INDIRECT_PCI is not set 277# CONFIG_PPC_INDIRECT_PCI is not set
246CONFIG_PCI=y 278CONFIG_PCI=y
247CONFIG_PCI_DOMAINS=y 279CONFIG_PCI_DOMAINS=y
248# CONFIG_PCIEPORTBUS is not set 280# CONFIG_PCIEPORTBUS is not set
281CONFIG_ARCH_SUPPORTS_MSI=y
282CONFIG_PCI_MSI=y
249# CONFIG_PCI_DEBUG is not set 283# CONFIG_PCI_DEBUG is not set
250 284
251# 285#
252# PCCARD (PCMCIA/CardBus) support 286# PCCARD (PCMCIA/CardBus) support
253# 287#
254# CONFIG_PCCARD is not set 288# CONFIG_PCCARD is not set
255
256#
257# PCI Hotplug Support
258#
259CONFIG_HOTPLUG_PCI=m 289CONFIG_HOTPLUG_PCI=m
260# CONFIG_HOTPLUG_PCI_FAKE is not set 290# CONFIG_HOTPLUG_PCI_FAKE is not set
261# CONFIG_HOTPLUG_PCI_CPCI is not set 291# CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -272,14 +302,15 @@ CONFIG_NET=y
272# 302#
273# Networking options 303# Networking options
274# 304#
275# CONFIG_NETDEBUG is not set
276CONFIG_PACKET=y 305CONFIG_PACKET=y
277# CONFIG_PACKET_MMAP is not set 306# CONFIG_PACKET_MMAP is not set
278CONFIG_UNIX=y 307CONFIG_UNIX=y
279CONFIG_XFRM=y 308CONFIG_XFRM=y
280CONFIG_XFRM_USER=m 309CONFIG_XFRM_USER=m
281# CONFIG_XFRM_SUB_POLICY is not set 310# CONFIG_XFRM_SUB_POLICY is not set
311# CONFIG_XFRM_MIGRATE is not set
282CONFIG_NET_KEY=m 312CONFIG_NET_KEY=m
313# CONFIG_NET_KEY_MIGRATE is not set
283CONFIG_INET=y 314CONFIG_INET=y
284CONFIG_IP_MULTICAST=y 315CONFIG_IP_MULTICAST=y
285# CONFIG_IP_ADVANCED_ROUTER is not set 316# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -304,10 +335,6 @@ CONFIG_INET_TCP_DIAG=y
304CONFIG_TCP_CONG_CUBIC=y 335CONFIG_TCP_CONG_CUBIC=y
305CONFIG_DEFAULT_TCP_CONG="cubic" 336CONFIG_DEFAULT_TCP_CONG="cubic"
306# CONFIG_TCP_MD5SIG is not set 337# CONFIG_TCP_MD5SIG is not set
307
308#
309# IP: Virtual Server Configuration
310#
311# CONFIG_IP_VS is not set 338# CONFIG_IP_VS is not set
312# CONFIG_IPV6 is not set 339# CONFIG_IPV6 is not set
313# CONFIG_INET6_XFRM_TUNNEL is not set 340# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -323,8 +350,6 @@ CONFIG_NETFILTER_NETLINK=y
323CONFIG_NETFILTER_NETLINK_QUEUE=m 350CONFIG_NETFILTER_NETLINK_QUEUE=m
324CONFIG_NETFILTER_NETLINK_LOG=m 351CONFIG_NETFILTER_NETLINK_LOG=m
325CONFIG_NF_CONNTRACK_ENABLED=m 352CONFIG_NF_CONNTRACK_ENABLED=m
326CONFIG_NF_CONNTRACK_SUPPORT=y
327# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
328CONFIG_NF_CONNTRACK=m 353CONFIG_NF_CONNTRACK=m
329CONFIG_NF_CT_ACCT=y 354CONFIG_NF_CT_ACCT=y
330CONFIG_NF_CONNTRACK_MARK=y 355CONFIG_NF_CONNTRACK_MARK=y
@@ -337,10 +362,42 @@ CONFIG_NF_CONNTRACK_H323=m
337CONFIG_NF_CONNTRACK_IRC=m 362CONFIG_NF_CONNTRACK_IRC=m
338CONFIG_NF_CONNTRACK_NETBIOS_NS=m 363CONFIG_NF_CONNTRACK_NETBIOS_NS=m
339CONFIG_NF_CONNTRACK_PPTP=m 364CONFIG_NF_CONNTRACK_PPTP=m
365# CONFIG_NF_CONNTRACK_SANE is not set
340CONFIG_NF_CONNTRACK_SIP=m 366CONFIG_NF_CONNTRACK_SIP=m
341CONFIG_NF_CONNTRACK_TFTP=m 367CONFIG_NF_CONNTRACK_TFTP=m
342CONFIG_NF_CT_NETLINK=m 368CONFIG_NF_CT_NETLINK=m
343# CONFIG_NETFILTER_XTABLES is not set 369CONFIG_NETFILTER_XTABLES=m
370CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
371CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
372CONFIG_NETFILTER_XT_TARGET_DSCP=m
373CONFIG_NETFILTER_XT_TARGET_MARK=m
374CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
375CONFIG_NETFILTER_XT_TARGET_NFLOG=m
376CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
377CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
378CONFIG_NETFILTER_XT_MATCH_COMMENT=m
379CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
380CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
381CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
382CONFIG_NETFILTER_XT_MATCH_DCCP=m
383CONFIG_NETFILTER_XT_MATCH_DSCP=m
384CONFIG_NETFILTER_XT_MATCH_ESP=m
385CONFIG_NETFILTER_XT_MATCH_HELPER=m
386CONFIG_NETFILTER_XT_MATCH_LENGTH=m
387CONFIG_NETFILTER_XT_MATCH_LIMIT=m
388CONFIG_NETFILTER_XT_MATCH_MAC=m
389CONFIG_NETFILTER_XT_MATCH_MARK=m
390CONFIG_NETFILTER_XT_MATCH_POLICY=m
391CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
392CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
393CONFIG_NETFILTER_XT_MATCH_QUOTA=m
394CONFIG_NETFILTER_XT_MATCH_REALM=m
395CONFIG_NETFILTER_XT_MATCH_SCTP=m
396CONFIG_NETFILTER_XT_MATCH_STATE=m
397CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
398CONFIG_NETFILTER_XT_MATCH_STRING=m
399CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
400CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
344 401
345# 402#
346# IP: Netfilter Configuration 403# IP: Netfilter Configuration
@@ -348,20 +405,45 @@ CONFIG_NF_CT_NETLINK=m
348CONFIG_NF_CONNTRACK_IPV4=m 405CONFIG_NF_CONNTRACK_IPV4=m
349CONFIG_NF_CONNTRACK_PROC_COMPAT=y 406CONFIG_NF_CONNTRACK_PROC_COMPAT=y
350CONFIG_IP_NF_QUEUE=m 407CONFIG_IP_NF_QUEUE=m
351 408CONFIG_IP_NF_IPTABLES=m
352# 409CONFIG_IP_NF_MATCH_IPRANGE=m
353# DCCP Configuration (EXPERIMENTAL) 410CONFIG_IP_NF_MATCH_TOS=m
354# 411CONFIG_IP_NF_MATCH_RECENT=m
412CONFIG_IP_NF_MATCH_ECN=m
413CONFIG_IP_NF_MATCH_AH=m
414CONFIG_IP_NF_MATCH_TTL=m
415CONFIG_IP_NF_MATCH_OWNER=m
416CONFIG_IP_NF_MATCH_ADDRTYPE=m
417CONFIG_IP_NF_FILTER=m
418CONFIG_IP_NF_TARGET_REJECT=m
419CONFIG_IP_NF_TARGET_LOG=m
420CONFIG_IP_NF_TARGET_ULOG=m
421CONFIG_NF_NAT=m
422CONFIG_NF_NAT_NEEDED=y
423CONFIG_IP_NF_TARGET_MASQUERADE=m
424CONFIG_IP_NF_TARGET_REDIRECT=m
425CONFIG_IP_NF_TARGET_NETMAP=m
426CONFIG_IP_NF_TARGET_SAME=m
427CONFIG_NF_NAT_SNMP_BASIC=m
428CONFIG_NF_NAT_PROTO_GRE=m
429CONFIG_NF_NAT_FTP=m
430CONFIG_NF_NAT_IRC=m
431CONFIG_NF_NAT_TFTP=m
432CONFIG_NF_NAT_AMANDA=m
433CONFIG_NF_NAT_PPTP=m
434CONFIG_NF_NAT_H323=m
435CONFIG_NF_NAT_SIP=m
436CONFIG_IP_NF_MANGLE=m
437CONFIG_IP_NF_TARGET_TOS=m
438CONFIG_IP_NF_TARGET_ECN=m
439CONFIG_IP_NF_TARGET_TTL=m
440CONFIG_IP_NF_TARGET_CLUSTERIP=m
441CONFIG_IP_NF_RAW=m
442CONFIG_IP_NF_ARPTABLES=m
443CONFIG_IP_NF_ARPFILTER=m
444CONFIG_IP_NF_ARP_MANGLE=m
355# CONFIG_IP_DCCP is not set 445# CONFIG_IP_DCCP is not set
356
357#
358# SCTP Configuration (EXPERIMENTAL)
359#
360# CONFIG_IP_SCTP is not set 446# CONFIG_IP_SCTP is not set
361
362#
363# TIPC Configuration (EXPERIMENTAL)
364#
365# CONFIG_TIPC is not set 447# CONFIG_TIPC is not set
366# CONFIG_ATM is not set 448# CONFIG_ATM is not set
367# CONFIG_BRIDGE is not set 449# CONFIG_BRIDGE is not set
@@ -380,6 +462,7 @@ CONFIG_LLC=y
380# QoS and/or fair queueing 462# QoS and/or fair queueing
381# 463#
382# CONFIG_NET_SCHED is not set 464# CONFIG_NET_SCHED is not set
465CONFIG_NET_CLS_ROUTE=y
383 466
384# 467#
385# Network testing 468# Network testing
@@ -388,7 +471,16 @@ CONFIG_LLC=y
388# CONFIG_HAMRADIO is not set 471# CONFIG_HAMRADIO is not set
389# CONFIG_IRDA is not set 472# CONFIG_IRDA is not set
390# CONFIG_BT is not set 473# CONFIG_BT is not set
474# CONFIG_AF_RXRPC is not set
475
476#
477# Wireless
478#
479# CONFIG_CFG80211 is not set
480# CONFIG_WIRELESS_EXT is not set
481# CONFIG_MAC80211 is not set
391# CONFIG_IEEE80211 is not set 482# CONFIG_IEEE80211 is not set
483# CONFIG_RFKILL is not set
392 484
393# 485#
394# Device Drivers 486# Device Drivers
@@ -401,16 +493,13 @@ CONFIG_STANDALONE=y
401CONFIG_PREVENT_FIRMWARE_BUILD=y 493CONFIG_PREVENT_FIRMWARE_BUILD=y
402CONFIG_FW_LOADER=y 494CONFIG_FW_LOADER=y
403# CONFIG_DEBUG_DRIVER is not set 495# CONFIG_DEBUG_DRIVER is not set
496# CONFIG_DEBUG_DEVRES is not set
404# CONFIG_SYS_HYPERVISOR is not set 497# CONFIG_SYS_HYPERVISOR is not set
405 498
406# 499#
407# Connector - unified userspace <-> kernelspace linker 500# Connector - unified userspace <-> kernelspace linker
408# 501#
409# CONFIG_CONNECTOR is not set 502# CONFIG_CONNECTOR is not set
410
411#
412# Memory Technology Devices (MTD)
413#
414# CONFIG_MTD is not set 503# CONFIG_MTD is not set
415 504
416# 505#
@@ -421,6 +510,7 @@ CONFIG_FW_LOADER=y
421# 510#
422# Plug and Play support 511# Plug and Play support
423# 512#
513# CONFIG_PNPACPI is not set
424 514
425# 515#
426# Block devices 516# Block devices
@@ -440,19 +530,16 @@ CONFIG_BLK_DEV_RAM=y
440CONFIG_BLK_DEV_RAM_COUNT=16 530CONFIG_BLK_DEV_RAM_COUNT=16
441CONFIG_BLK_DEV_RAM_SIZE=65536 531CONFIG_BLK_DEV_RAM_SIZE=65536
442CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 532CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
443CONFIG_BLK_DEV_INITRD=y
444# CONFIG_CDROM_PKTCDVD is not set 533# CONFIG_CDROM_PKTCDVD is not set
445# CONFIG_ATA_OVER_ETH is not set 534# CONFIG_ATA_OVER_ETH is not set
446 535
447# 536#
448# Misc devices 537# Misc devices
449# 538#
539# CONFIG_PHANTOM is not set
450# CONFIG_SGI_IOC4 is not set 540# CONFIG_SGI_IOC4 is not set
451# CONFIG_TIFM_CORE is not set 541# CONFIG_TIFM_CORE is not set
452 542# CONFIG_BLINK is not set
453#
454# ATA/ATAPI/MFM/RLL support
455#
456CONFIG_IDE=y 543CONFIG_IDE=y
457CONFIG_BLK_DEV_IDE=y 544CONFIG_BLK_DEV_IDE=y
458 545
@@ -467,6 +554,7 @@ CONFIG_BLK_DEV_IDECD=y
467# CONFIG_BLK_DEV_IDEFLOPPY is not set 554# CONFIG_BLK_DEV_IDEFLOPPY is not set
468# CONFIG_BLK_DEV_IDESCSI is not set 555# CONFIG_BLK_DEV_IDESCSI is not set
469# CONFIG_IDE_TASK_IOCTL is not set 556# CONFIG_IDE_TASK_IOCTL is not set
557CONFIG_IDE_PROC_FS=y
470 558
471# 559#
472# IDE chipset support/bugfixes 560# IDE chipset support/bugfixes
@@ -474,12 +562,12 @@ CONFIG_BLK_DEV_IDECD=y
474CONFIG_IDE_GENERIC=y 562CONFIG_IDE_GENERIC=y
475CONFIG_BLK_DEV_IDEPCI=y 563CONFIG_BLK_DEV_IDEPCI=y
476CONFIG_IDEPCI_SHARE_IRQ=y 564CONFIG_IDEPCI_SHARE_IRQ=y
565CONFIG_IDEPCI_PCIBUS_ORDER=y
477# CONFIG_BLK_DEV_OFFBOARD is not set 566# CONFIG_BLK_DEV_OFFBOARD is not set
478CONFIG_BLK_DEV_GENERIC=y 567CONFIG_BLK_DEV_GENERIC=y
479# CONFIG_BLK_DEV_OPTI621 is not set 568# CONFIG_BLK_DEV_OPTI621 is not set
480CONFIG_BLK_DEV_IDEDMA_PCI=y 569CONFIG_BLK_DEV_IDEDMA_PCI=y
481# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 570# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
482CONFIG_IDEDMA_PCI_AUTO=y
483# CONFIG_IDEDMA_ONLYDISK is not set 571# CONFIG_IDEDMA_ONLYDISK is not set
484# CONFIG_BLK_DEV_AEC62XX is not set 572# CONFIG_BLK_DEV_AEC62XX is not set
485# CONFIG_BLK_DEV_ALI15X3 is not set 573# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -494,6 +582,7 @@ CONFIG_BLK_DEV_AMD74XX=y
494# CONFIG_BLK_DEV_JMICRON is not set 582# CONFIG_BLK_DEV_JMICRON is not set
495# CONFIG_BLK_DEV_SC1200 is not set 583# CONFIG_BLK_DEV_SC1200 is not set
496# CONFIG_BLK_DEV_PIIX is not set 584# CONFIG_BLK_DEV_PIIX is not set
585# CONFIG_BLK_DEV_IT8213 is not set
497# CONFIG_BLK_DEV_IT821X is not set 586# CONFIG_BLK_DEV_IT821X is not set
498# CONFIG_BLK_DEV_NS87415 is not set 587# CONFIG_BLK_DEV_NS87415 is not set
499# CONFIG_BLK_DEV_PDC202XX_OLD is not set 588# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -504,13 +593,14 @@ CONFIG_BLK_DEV_AMD74XX=y
504# CONFIG_BLK_DEV_SLC90E66 is not set 593# CONFIG_BLK_DEV_SLC90E66 is not set
505# CONFIG_BLK_DEV_TRM290 is not set 594# CONFIG_BLK_DEV_TRM290 is not set
506# CONFIG_BLK_DEV_VIA82CXXX is not set 595# CONFIG_BLK_DEV_VIA82CXXX is not set
596# CONFIG_BLK_DEV_TC86C001 is not set
597CONFIG_BLK_DEV_CELLEB=y
507CONFIG_BLK_DEV_IDE_PMAC=y 598CONFIG_BLK_DEV_IDE_PMAC=y
508CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y 599CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
509CONFIG_BLK_DEV_IDEDMA_PMAC=y 600CONFIG_BLK_DEV_IDEDMA_PMAC=y
510# CONFIG_IDE_ARM is not set 601# CONFIG_IDE_ARM is not set
511CONFIG_BLK_DEV_IDEDMA=y 602CONFIG_BLK_DEV_IDEDMA=y
512# CONFIG_IDEDMA_IVB is not set 603# CONFIG_IDEDMA_IVB is not set
513CONFIG_IDEDMA_AUTO=y
514# CONFIG_BLK_DEV_HD is not set 604# CONFIG_BLK_DEV_HD is not set
515 605
516# 606#
@@ -540,6 +630,7 @@ CONFIG_SCSI_MULTI_LUN=y
540CONFIG_SCSI_CONSTANTS=y 630CONFIG_SCSI_CONSTANTS=y
541# CONFIG_SCSI_LOGGING is not set 631# CONFIG_SCSI_LOGGING is not set
542# CONFIG_SCSI_SCAN_ASYNC is not set 632# CONFIG_SCSI_SCAN_ASYNC is not set
633CONFIG_SCSI_WAIT_SCAN=m
543 634
544# 635#
545# SCSI Transports 636# SCSI Transports
@@ -593,11 +684,8 @@ CONFIG_SCSI_LPFC=m
593# CONFIG_SCSI_DC390T is not set 684# CONFIG_SCSI_DC390T is not set
594CONFIG_SCSI_DEBUG=m 685CONFIG_SCSI_DEBUG=m
595# CONFIG_SCSI_SRP is not set 686# CONFIG_SCSI_SRP is not set
596
597#
598# Serial ATA (prod) and Parallel ATA (experimental) drivers
599#
600CONFIG_ATA=y 687CONFIG_ATA=y
688CONFIG_ATA_NONSTANDARD=y
601# CONFIG_SATA_AHCI is not set 689# CONFIG_SATA_AHCI is not set
602CONFIG_SATA_SVW=y 690CONFIG_SATA_SVW=y
603# CONFIG_ATA_PIIX is not set 691# CONFIG_ATA_PIIX is not set
@@ -613,10 +701,12 @@ CONFIG_SATA_SVW=y
613# CONFIG_SATA_ULI is not set 701# CONFIG_SATA_ULI is not set
614# CONFIG_SATA_VIA is not set 702# CONFIG_SATA_VIA is not set
615# CONFIG_SATA_VITESSE is not set 703# CONFIG_SATA_VITESSE is not set
704# CONFIG_SATA_INIC162X is not set
616# CONFIG_PATA_ALI is not set 705# CONFIG_PATA_ALI is not set
617# CONFIG_PATA_AMD is not set 706# CONFIG_PATA_AMD is not set
618# CONFIG_PATA_ARTOP is not set 707# CONFIG_PATA_ARTOP is not set
619# CONFIG_PATA_ATIIXP is not set 708# CONFIG_PATA_ATIIXP is not set
709# CONFIG_PATA_CMD640_PCI is not set
620# CONFIG_PATA_CMD64X is not set 710# CONFIG_PATA_CMD64X is not set
621# CONFIG_PATA_CS5520 is not set 711# CONFIG_PATA_CS5520 is not set
622# CONFIG_PATA_CS5530 is not set 712# CONFIG_PATA_CS5530 is not set
@@ -628,6 +718,7 @@ CONFIG_SATA_SVW=y
628# CONFIG_PATA_HPT3X2N is not set 718# CONFIG_PATA_HPT3X2N is not set
629# CONFIG_PATA_HPT3X3 is not set 719# CONFIG_PATA_HPT3X3 is not set
630# CONFIG_PATA_IT821X is not set 720# CONFIG_PATA_IT821X is not set
721# CONFIG_PATA_IT8213 is not set
631# CONFIG_PATA_JMICRON is not set 722# CONFIG_PATA_JMICRON is not set
632# CONFIG_PATA_TRIFLEX is not set 723# CONFIG_PATA_TRIFLEX is not set
633# CONFIG_PATA_MARVELL is not set 724# CONFIG_PATA_MARVELL is not set
@@ -647,6 +738,7 @@ CONFIG_SATA_SVW=y
647# CONFIG_PATA_SIS is not set 738# CONFIG_PATA_SIS is not set
648# CONFIG_PATA_VIA is not set 739# CONFIG_PATA_VIA is not set
649CONFIG_PATA_WINBOND=y 740CONFIG_PATA_WINBOND=y
741CONFIG_PATA_SCC=y
650 742
651# 743#
652# Multi-device support (RAID and LVM) 744# Multi-device support (RAID and LVM)
@@ -669,6 +761,7 @@ CONFIG_DM_MIRROR=m
669CONFIG_DM_ZERO=m 761CONFIG_DM_ZERO=m
670CONFIG_DM_MULTIPATH=m 762CONFIG_DM_MULTIPATH=m
671CONFIG_DM_MULTIPATH_EMC=m 763CONFIG_DM_MULTIPATH_EMC=m
764# CONFIG_DM_DELAY is not set
672 765
673# 766#
674# Fusion MPT device support 767# Fusion MPT device support
@@ -681,28 +774,26 @@ CONFIG_DM_MULTIPATH_EMC=m
681# 774#
682# IEEE 1394 (FireWire) support 775# IEEE 1394 (FireWire) support
683# 776#
777# CONFIG_FIREWIRE is not set
684CONFIG_IEEE1394=y 778CONFIG_IEEE1394=y
685 779
686# 780#
687# Subsystem Options 781# Subsystem Options
688# 782#
689# CONFIG_IEEE1394_VERBOSEDEBUG is not set 783# CONFIG_IEEE1394_VERBOSEDEBUG is not set
690# CONFIG_IEEE1394_OUI_DB is not set
691CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
692CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
693# CONFIG_IEEE1394_EXPORT_FULL_API is not set
694 784
695# 785#
696# Device Drivers 786# Controllers
697# 787#
698# CONFIG_IEEE1394_PCILYNX is not set 788# CONFIG_IEEE1394_PCILYNX is not set
699CONFIG_IEEE1394_OHCI1394=y 789CONFIG_IEEE1394_OHCI1394=y
700 790
701# 791#
702# Protocol Drivers 792# Protocols
703# 793#
704CONFIG_IEEE1394_VIDEO1394=m 794CONFIG_IEEE1394_VIDEO1394=m
705CONFIG_IEEE1394_SBP2=m 795CONFIG_IEEE1394_SBP2=m
796CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
706CONFIG_IEEE1394_ETH1394=m 797CONFIG_IEEE1394_ETH1394=m
707CONFIG_IEEE1394_DV1394=m 798CONFIG_IEEE1394_DV1394=m
708CONFIG_IEEE1394_RAWIO=y 799CONFIG_IEEE1394_RAWIO=y
@@ -711,10 +802,7 @@ CONFIG_IEEE1394_RAWIO=y
711# I2O device support 802# I2O device support
712# 803#
713# CONFIG_I2O is not set 804# CONFIG_I2O is not set
714 805CONFIG_MACINTOSH_DRIVERS=y
715#
716# Macintosh device drivers
717#
718CONFIG_ADB_PMU=y 806CONFIG_ADB_PMU=y
719# CONFIG_ADB_PMU_LED is not set 807# CONFIG_ADB_PMU_LED is not set
720CONFIG_PMAC_SMU=y 808CONFIG_PMAC_SMU=y
@@ -734,16 +822,23 @@ CONFIG_DUMMY=m
734CONFIG_BONDING=m 822CONFIG_BONDING=m
735# CONFIG_EQUALIZER is not set 823# CONFIG_EQUALIZER is not set
736CONFIG_TUN=m 824CONFIG_TUN=m
737
738#
739# ARCnet devices
740#
741# CONFIG_ARCNET is not set 825# CONFIG_ARCNET is not set
826CONFIG_PHYLIB=m
742 827
743# 828#
744# PHY device support 829# MII PHY device drivers
745# 830#
746# CONFIG_PHYLIB is not set 831CONFIG_MARVELL_PHY=m
832# CONFIG_DAVICOM_PHY is not set
833# CONFIG_QSEMI_PHY is not set
834# CONFIG_LXT_PHY is not set
835# CONFIG_CICADA_PHY is not set
836# CONFIG_VITESSE_PHY is not set
837# CONFIG_SMSC_PHY is not set
838CONFIG_BROADCOM_PHY=m
839CONFIG_FIXED_PHY=m
840CONFIG_FIXED_MII_10_FDX=y
841CONFIG_FIXED_MII_100_FDX=y
747 842
748# 843#
749# Ethernet (10 or 100Mbit) 844# Ethernet (10 or 100Mbit)
@@ -782,10 +877,8 @@ CONFIG_E100=y
782# CONFIG_EPIC100 is not set 877# CONFIG_EPIC100 is not set
783# CONFIG_SUNDANCE is not set 878# CONFIG_SUNDANCE is not set
784# CONFIG_VIA_RHINE is not set 879# CONFIG_VIA_RHINE is not set
785 880# CONFIG_SC92031 is not set
786# 881CONFIG_NETDEV_1000=y
787# Ethernet (1000 Mbit)
788#
789CONFIG_ACENIC=y 882CONFIG_ACENIC=y
790CONFIG_ACENIC_OMIT_TIGON_I=y 883CONFIG_ACENIC_OMIT_TIGON_I=y
791# CONFIG_DL2K is not set 884# CONFIG_DL2K is not set
@@ -805,33 +898,37 @@ CONFIG_TIGON3=y
805# CONFIG_BNX2 is not set 898# CONFIG_BNX2 is not set
806CONFIG_SPIDER_NET=m 899CONFIG_SPIDER_NET=m
807# CONFIG_QLA3XXX is not set 900# CONFIG_QLA3XXX is not set
808 901# CONFIG_ATL1 is not set
809# 902CONFIG_NETDEV_10000=y
810# Ethernet (10000 Mbit)
811#
812# CONFIG_CHELSIO_T1 is not set 903# CONFIG_CHELSIO_T1 is not set
904# CONFIG_CHELSIO_T3 is not set
813CONFIG_IXGB=m 905CONFIG_IXGB=m
814# CONFIG_IXGB_NAPI is not set 906# CONFIG_IXGB_NAPI is not set
815# CONFIG_S2IO is not set 907# CONFIG_S2IO is not set
816# CONFIG_MYRI10GE is not set 908# CONFIG_MYRI10GE is not set
817# CONFIG_NETXEN_NIC is not set 909# CONFIG_NETXEN_NIC is not set
818 910CONFIG_PASEMI_MAC=m
819# 911# CONFIG_MLX4_CORE is not set
820# Token Ring devices
821#
822CONFIG_TR=y 912CONFIG_TR=y
823CONFIG_IBMOL=y 913CONFIG_IBMOL=y
824# CONFIG_3C359 is not set 914# CONFIG_3C359 is not set
825# CONFIG_TMS380TR is not set 915# CONFIG_TMS380TR is not set
826 916
827# 917#
828# Wireless LAN (non-hamradio) 918# Wireless LAN
829# 919#
830# CONFIG_NET_RADIO is not set 920# CONFIG_WLAN_PRE80211 is not set
921# CONFIG_WLAN_80211 is not set
831 922
832# 923#
833# Wan interfaces 924# USB Network Adapters
834# 925#
926# CONFIG_USB_CATC is not set
927# CONFIG_USB_KAWETH is not set
928# CONFIG_USB_PEGASUS is not set
929# CONFIG_USB_RTL8150 is not set
930# CONFIG_USB_USBNET_MII is not set
931# CONFIG_USB_USBNET is not set
835# CONFIG_WAN is not set 932# CONFIG_WAN is not set
836CONFIG_ISERIES_VETH=m 933CONFIG_ISERIES_VETH=m
837# CONFIG_FDDI is not set 934# CONFIG_FDDI is not set
@@ -851,7 +948,6 @@ CONFIG_SLHC=m
851# CONFIG_SHAPER is not set 948# CONFIG_SHAPER is not set
852CONFIG_NETCONSOLE=y 949CONFIG_NETCONSOLE=y
853CONFIG_NETPOLL=y 950CONFIG_NETPOLL=y
854CONFIG_NETPOLL_RX=y
855CONFIG_NETPOLL_TRAP=y 951CONFIG_NETPOLL_TRAP=y
856CONFIG_NET_POLL_CONTROLLER=y 952CONFIG_NET_POLL_CONTROLLER=y
857 953
@@ -870,6 +966,7 @@ CONFIG_NET_POLL_CONTROLLER=y
870# 966#
871CONFIG_INPUT=y 967CONFIG_INPUT=y
872# CONFIG_INPUT_FF_MEMLESS is not set 968# CONFIG_INPUT_FF_MEMLESS is not set
969# CONFIG_INPUT_POLLDEV is not set
873 970
874# 971#
875# Userland interfaces 972# Userland interfaces
@@ -895,12 +992,25 @@ CONFIG_KEYBOARD_ATKBD=y
895# CONFIG_KEYBOARD_STOWAWAY is not set 992# CONFIG_KEYBOARD_STOWAWAY is not set
896CONFIG_INPUT_MOUSE=y 993CONFIG_INPUT_MOUSE=y
897CONFIG_MOUSE_PS2=y 994CONFIG_MOUSE_PS2=y
995CONFIG_MOUSE_PS2_ALPS=y
996CONFIG_MOUSE_PS2_LOGIPS2PP=y
997CONFIG_MOUSE_PS2_SYNAPTICS=y
998CONFIG_MOUSE_PS2_LIFEBOOK=y
999CONFIG_MOUSE_PS2_TRACKPOINT=y
1000# CONFIG_MOUSE_PS2_TOUCHKIT is not set
898# CONFIG_MOUSE_SERIAL is not set 1001# CONFIG_MOUSE_SERIAL is not set
1002# CONFIG_MOUSE_APPLETOUCH is not set
899# CONFIG_MOUSE_VSXXXAA is not set 1003# CONFIG_MOUSE_VSXXXAA is not set
900# CONFIG_INPUT_JOYSTICK is not set 1004# CONFIG_INPUT_JOYSTICK is not set
1005# CONFIG_INPUT_TABLET is not set
901# CONFIG_INPUT_TOUCHSCREEN is not set 1006# CONFIG_INPUT_TOUCHSCREEN is not set
902CONFIG_INPUT_MISC=y 1007CONFIG_INPUT_MISC=y
903CONFIG_INPUT_PCSPKR=m 1008CONFIG_INPUT_PCSPKR=m
1009# CONFIG_INPUT_ATI_REMOTE is not set
1010# CONFIG_INPUT_ATI_REMOTE2 is not set
1011# CONFIG_INPUT_KEYSPAN_REMOTE is not set
1012# CONFIG_INPUT_POWERMATE is not set
1013# CONFIG_INPUT_YEALINK is not set
904# CONFIG_INPUT_UINPUT is not set 1014# CONFIG_INPUT_UINPUT is not set
905 1015
906# 1016#
@@ -940,7 +1050,12 @@ CONFIG_SERIAL_CORE=y
940CONFIG_SERIAL_CORE_CONSOLE=y 1050CONFIG_SERIAL_CORE_CONSOLE=y
941# CONFIG_SERIAL_PMACZILOG is not set 1051# CONFIG_SERIAL_PMACZILOG is not set
942CONFIG_SERIAL_ICOM=m 1052CONFIG_SERIAL_ICOM=m
1053CONFIG_SERIAL_TXX9=y
1054CONFIG_HAS_TXX9_SERIAL=y
1055CONFIG_SERIAL_TXX9_NR_UARTS=6
1056CONFIG_SERIAL_TXX9_CONSOLE=y
943# CONFIG_SERIAL_JSM is not set 1057# CONFIG_SERIAL_JSM is not set
1058# CONFIG_SERIAL_OF_PLATFORM is not set
944CONFIG_UNIX98_PTYS=y 1059CONFIG_UNIX98_PTYS=y
945CONFIG_LEGACY_PTYS=y 1060CONFIG_LEGACY_PTYS=y
946CONFIG_LEGACY_PTY_COUNT=256 1061CONFIG_LEGACY_PTY_COUNT=256
@@ -948,21 +1063,17 @@ CONFIG_HVC_DRIVER=y
948CONFIG_HVC_CONSOLE=y 1063CONFIG_HVC_CONSOLE=y
949CONFIG_HVC_ISERIES=y 1064CONFIG_HVC_ISERIES=y
950CONFIG_HVC_RTAS=y 1065CONFIG_HVC_RTAS=y
1066CONFIG_HVC_BEAT=y
951CONFIG_HVCS=m 1067CONFIG_HVCS=m
952 1068
953# 1069#
954# IPMI 1070# IPMI
955# 1071#
956# CONFIG_IPMI_HANDLER is not set 1072# CONFIG_IPMI_HANDLER is not set
957
958#
959# Watchdog Cards
960#
961# CONFIG_WATCHDOG is not set 1073# CONFIG_WATCHDOG is not set
962# CONFIG_HW_RANDOM is not set 1074# CONFIG_HW_RANDOM is not set
963CONFIG_GEN_RTC=y 1075CONFIG_GEN_RTC=y
964# CONFIG_GEN_RTC_X is not set 1076# CONFIG_GEN_RTC_X is not set
965# CONFIG_DTLK is not set
966# CONFIG_R3964 is not set 1077# CONFIG_R3964 is not set
967# CONFIG_APPLICOM is not set 1078# CONFIG_APPLICOM is not set
968# CONFIG_AGP is not set 1079# CONFIG_AGP is not set
@@ -975,11 +1086,9 @@ CONFIG_MAX_RAW_DEVS=256
975# TPM devices 1086# TPM devices
976# 1087#
977# CONFIG_TCG_TPM is not set 1088# CONFIG_TCG_TPM is not set
978 1089CONFIG_DEVPORT=y
979#
980# I2C support
981#
982CONFIG_I2C=y 1090CONFIG_I2C=y
1091CONFIG_I2C_BOARDINFO=y
983CONFIG_I2C_CHARDEV=y 1092CONFIG_I2C_CHARDEV=y
984 1093
985# 1094#
@@ -1006,14 +1115,15 @@ CONFIG_I2C_POWERMAC=y
1006# CONFIG_I2C_PARPORT_LIGHT is not set 1115# CONFIG_I2C_PARPORT_LIGHT is not set
1007# CONFIG_I2C_PROSAVAGE is not set 1116# CONFIG_I2C_PROSAVAGE is not set
1008# CONFIG_I2C_SAVAGE4 is not set 1117# CONFIG_I2C_SAVAGE4 is not set
1118# CONFIG_I2C_SIMTEC is not set
1009# CONFIG_I2C_SIS5595 is not set 1119# CONFIG_I2C_SIS5595 is not set
1010# CONFIG_I2C_SIS630 is not set 1120# CONFIG_I2C_SIS630 is not set
1011# CONFIG_I2C_SIS96X is not set 1121# CONFIG_I2C_SIS96X is not set
1012# CONFIG_I2C_STUB is not set 1122# CONFIG_I2C_STUB is not set
1123# CONFIG_I2C_TINY_USB is not set
1013# CONFIG_I2C_VIA is not set 1124# CONFIG_I2C_VIA is not set
1014# CONFIG_I2C_VIAPRO is not set 1125# CONFIG_I2C_VIAPRO is not set
1015# CONFIG_I2C_VOODOO3 is not set 1126# CONFIG_I2C_VOODOO3 is not set
1016# CONFIG_I2C_PCA_ISA is not set
1017 1127
1018# 1128#
1019# Miscellaneous I2C Chip support 1129# Miscellaneous I2C Chip support
@@ -1040,37 +1150,56 @@ CONFIG_I2C_POWERMAC=y
1040# Dallas's 1-wire bus 1150# Dallas's 1-wire bus
1041# 1151#
1042# CONFIG_W1 is not set 1152# CONFIG_W1 is not set
1153# CONFIG_HWMON is not set
1043 1154
1044# 1155#
1045# Hardware Monitoring support 1156# Multifunction device drivers
1046# 1157#
1047# CONFIG_HWMON is not set 1158# CONFIG_MFD_SM501 is not set
1048# CONFIG_HWMON_VID is not set
1049 1159
1050# 1160#
1051# Multimedia devices 1161# Multimedia devices
1052# 1162#
1053# CONFIG_VIDEO_DEV is not set 1163# CONFIG_VIDEO_DEV is not set
1164# CONFIG_DVB_CORE is not set
1165# CONFIG_DAB is not set
1054 1166
1055# 1167#
1056# Digital Video Broadcasting Devices 1168# Graphics support
1057# 1169#
1058# CONFIG_DVB is not set 1170CONFIG_BACKLIGHT_LCD_SUPPORT=y
1059# CONFIG_USB_DABUSB is not set 1171CONFIG_BACKLIGHT_CLASS_DEVICE=y
1172CONFIG_LCD_CLASS_DEVICE=y
1060 1173
1061# 1174#
1062# Graphics support 1175# Display device support
1063# 1176#
1064CONFIG_FIRMWARE_EDID=y 1177CONFIG_DISPLAY_SUPPORT=y
1178
1179#
1180# Display hardware drivers
1181#
1182# CONFIG_VGASTATE is not set
1065CONFIG_FB=y 1183CONFIG_FB=y
1184CONFIG_FIRMWARE_EDID=y
1066CONFIG_FB_DDC=y 1185CONFIG_FB_DDC=y
1067CONFIG_FB_CFB_FILLRECT=y 1186CONFIG_FB_CFB_FILLRECT=y
1068CONFIG_FB_CFB_COPYAREA=y 1187CONFIG_FB_CFB_COPYAREA=y
1069CONFIG_FB_CFB_IMAGEBLIT=y 1188CONFIG_FB_CFB_IMAGEBLIT=y
1189# CONFIG_FB_SYS_FILLRECT is not set
1190# CONFIG_FB_SYS_COPYAREA is not set
1191# CONFIG_FB_SYS_IMAGEBLIT is not set
1192# CONFIG_FB_SYS_FOPS is not set
1193CONFIG_FB_DEFERRED_IO=y
1194# CONFIG_FB_SVGALIB is not set
1070CONFIG_FB_MACMODES=y 1195CONFIG_FB_MACMODES=y
1071# CONFIG_FB_BACKLIGHT is not set 1196CONFIG_FB_BACKLIGHT=y
1072CONFIG_FB_MODE_HELPERS=y 1197CONFIG_FB_MODE_HELPERS=y
1073CONFIG_FB_TILEBLITTING=y 1198CONFIG_FB_TILEBLITTING=y
1199
1200#
1201# Frame buffer hardware drivers
1202#
1074# CONFIG_FB_CIRRUS is not set 1203# CONFIG_FB_CIRRUS is not set
1075# CONFIG_FB_PM2 is not set 1204# CONFIG_FB_PM2 is not set
1076# CONFIG_FB_CYBER2000 is not set 1205# CONFIG_FB_CYBER2000 is not set
@@ -1090,16 +1219,21 @@ CONFIG_FB_MATROX_MAVEN=m
1090CONFIG_FB_MATROX_MULTIHEAD=y 1219CONFIG_FB_MATROX_MULTIHEAD=y
1091CONFIG_FB_RADEON=y 1220CONFIG_FB_RADEON=y
1092CONFIG_FB_RADEON_I2C=y 1221CONFIG_FB_RADEON_I2C=y
1222CONFIG_FB_RADEON_BACKLIGHT=y
1093# CONFIG_FB_RADEON_DEBUG is not set 1223# CONFIG_FB_RADEON_DEBUG is not set
1094# CONFIG_FB_ATY128 is not set 1224# CONFIG_FB_ATY128 is not set
1095# CONFIG_FB_ATY is not set 1225# CONFIG_FB_ATY is not set
1226# CONFIG_FB_S3 is not set
1096# CONFIG_FB_SAVAGE is not set 1227# CONFIG_FB_SAVAGE is not set
1097# CONFIG_FB_SIS is not set 1228# CONFIG_FB_SIS is not set
1098# CONFIG_FB_NEOMAGIC is not set 1229# CONFIG_FB_NEOMAGIC is not set
1099# CONFIG_FB_KYRO is not set 1230# CONFIG_FB_KYRO is not set
1100# CONFIG_FB_3DFX is not set 1231# CONFIG_FB_3DFX is not set
1101# CONFIG_FB_VOODOO1 is not set 1232# CONFIG_FB_VOODOO1 is not set
1233# CONFIG_FB_VT8623 is not set
1102# CONFIG_FB_TRIDENT is not set 1234# CONFIG_FB_TRIDENT is not set
1235# CONFIG_FB_ARK is not set
1236# CONFIG_FB_PM3 is not set
1103CONFIG_FB_IBM_GXT4500=y 1237CONFIG_FB_IBM_GXT4500=y
1104# CONFIG_FB_VIRTUAL is not set 1238# CONFIG_FB_VIRTUAL is not set
1105 1239
@@ -1113,19 +1247,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
1113# CONFIG_FONTS is not set 1247# CONFIG_FONTS is not set
1114CONFIG_FONT_8x8=y 1248CONFIG_FONT_8x8=y
1115CONFIG_FONT_8x16=y 1249CONFIG_FONT_8x16=y
1116
1117#
1118# Logo configuration
1119#
1120CONFIG_LOGO=y 1250CONFIG_LOGO=y
1121CONFIG_LOGO_LINUX_MONO=y 1251CONFIG_LOGO_LINUX_MONO=y
1122CONFIG_LOGO_LINUX_VGA16=y 1252CONFIG_LOGO_LINUX_VGA16=y
1123CONFIG_LOGO_LINUX_CLUT224=y 1253CONFIG_LOGO_LINUX_CLUT224=y
1124CONFIG_BACKLIGHT_LCD_SUPPORT=y
1125CONFIG_BACKLIGHT_CLASS_DEVICE=y
1126CONFIG_BACKLIGHT_DEVICE=y
1127CONFIG_LCD_CLASS_DEVICE=y
1128CONFIG_LCD_DEVICE=y
1129 1254
1130# 1255#
1131# Sound 1256# Sound
@@ -1242,6 +1367,12 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
1242# 1367#
1243# CONFIG_SND_USB_AUDIO is not set 1368# CONFIG_SND_USB_AUDIO is not set
1244# CONFIG_SND_USB_USX2Y is not set 1369# CONFIG_SND_USB_USX2Y is not set
1370# CONFIG_SND_USB_CAIAQ is not set
1371
1372#
1373# System on Chip audio support
1374#
1375# CONFIG_SND_SOC is not set
1245 1376
1246# 1377#
1247# Open Sound System 1378# Open Sound System
@@ -1252,6 +1383,15 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
1252# HID Devices 1383# HID Devices
1253# 1384#
1254CONFIG_HID=y 1385CONFIG_HID=y
1386# CONFIG_HID_DEBUG is not set
1387
1388#
1389# USB Input Devices
1390#
1391CONFIG_USB_HID=y
1392# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1393# CONFIG_HID_FF is not set
1394CONFIG_USB_HIDDEV=y
1255 1395
1256# 1396#
1257# USB support 1397# USB support
@@ -1266,9 +1406,8 @@ CONFIG_USB=y
1266# Miscellaneous USB options 1406# Miscellaneous USB options
1267# 1407#
1268CONFIG_USB_DEVICEFS=y 1408CONFIG_USB_DEVICEFS=y
1269# CONFIG_USB_BANDWIDTH is not set 1409CONFIG_USB_DEVICE_CLASS=y
1270# CONFIG_USB_DYNAMIC_MINORS is not set 1410# CONFIG_USB_DYNAMIC_MINORS is not set
1271# CONFIG_USB_MULTITHREAD_PROBE is not set
1272# CONFIG_USB_OTG is not set 1411# CONFIG_USB_OTG is not set
1273 1412
1274# 1413#
@@ -1278,9 +1417,12 @@ CONFIG_USB_EHCI_HCD=y
1278# CONFIG_USB_EHCI_SPLIT_ISO is not set 1417# CONFIG_USB_EHCI_SPLIT_ISO is not set
1279# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1418# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1280CONFIG_USB_EHCI_TT_NEWSCHED=y 1419CONFIG_USB_EHCI_TT_NEWSCHED=y
1420CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
1281# CONFIG_USB_ISP116X_HCD is not set 1421# CONFIG_USB_ISP116X_HCD is not set
1282CONFIG_USB_OHCI_HCD=y 1422CONFIG_USB_OHCI_HCD=y
1283# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1423# CONFIG_USB_OHCI_HCD_PPC_OF is not set
1424# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1425CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1284CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1426CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1285# CONFIG_USB_UHCI_HCD is not set 1427# CONFIG_USB_UHCI_HCD is not set
1286# CONFIG_USB_SL811_HCD is not set 1428# CONFIG_USB_SL811_HCD is not set
@@ -1314,40 +1456,10 @@ CONFIG_USB_STORAGE=m
1314# CONFIG_USB_LIBUSUAL is not set 1456# CONFIG_USB_LIBUSUAL is not set
1315 1457
1316# 1458#
1317# USB Input Devices
1318#
1319CONFIG_USB_HID=y
1320# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1321# CONFIG_HID_FF is not set
1322CONFIG_USB_HIDDEV=y
1323# CONFIG_USB_AIPTEK is not set
1324# CONFIG_USB_WACOM is not set
1325# CONFIG_USB_ACECAD is not set
1326# CONFIG_USB_KBTAB is not set
1327# CONFIG_USB_POWERMATE is not set
1328# CONFIG_USB_TOUCHSCREEN is not set
1329# CONFIG_USB_YEALINK is not set
1330# CONFIG_USB_XPAD is not set
1331# CONFIG_USB_ATI_REMOTE is not set
1332# CONFIG_USB_ATI_REMOTE2 is not set
1333# CONFIG_USB_KEYSPAN_REMOTE is not set
1334# CONFIG_USB_APPLETOUCH is not set
1335
1336#
1337# USB Imaging devices 1459# USB Imaging devices
1338# 1460#
1339# CONFIG_USB_MDC800 is not set 1461# CONFIG_USB_MDC800 is not set
1340# CONFIG_USB_MICROTEK is not set 1462# CONFIG_USB_MICROTEK is not set
1341
1342#
1343# USB Network Adapters
1344#
1345# CONFIG_USB_CATC is not set
1346# CONFIG_USB_KAWETH is not set
1347# CONFIG_USB_PEGASUS is not set
1348# CONFIG_USB_RTL8150 is not set
1349# CONFIG_USB_USBNET_MII is not set
1350# CONFIG_USB_USBNET is not set
1351# CONFIG_USB_MON is not set 1463# CONFIG_USB_MON is not set
1352 1464
1353# 1465#
@@ -1369,6 +1481,7 @@ CONFIG_USB_HIDDEV=y
1369# CONFIG_USB_RIO500 is not set 1481# CONFIG_USB_RIO500 is not set
1370# CONFIG_USB_LEGOTOWER is not set 1482# CONFIG_USB_LEGOTOWER is not set
1371# CONFIG_USB_LCD is not set 1483# CONFIG_USB_LCD is not set
1484# CONFIG_USB_BERRY_CHARGE is not set
1372# CONFIG_USB_LED is not set 1485# CONFIG_USB_LED is not set
1373# CONFIG_USB_CYPRESS_CY7C63 is not set 1486# CONFIG_USB_CYPRESS_CY7C63 is not set
1374# CONFIG_USB_CYTHERM is not set 1487# CONFIG_USB_CYTHERM is not set
@@ -1379,6 +1492,7 @@ CONFIG_USB_APPLEDISPLAY=m
1379# CONFIG_USB_SISUSBVGA is not set 1492# CONFIG_USB_SISUSBVGA is not set
1380# CONFIG_USB_LD is not set 1493# CONFIG_USB_LD is not set
1381# CONFIG_USB_TRANCEVIBRATOR is not set 1494# CONFIG_USB_TRANCEVIBRATOR is not set
1495# CONFIG_USB_IOWARRIOR is not set
1382# CONFIG_USB_TEST is not set 1496# CONFIG_USB_TEST is not set
1383 1497
1384# 1498#
@@ -1389,10 +1503,6 @@ CONFIG_USB_APPLEDISPLAY=m
1389# USB Gadget Support 1503# USB Gadget Support
1390# 1504#
1391# CONFIG_USB_GADGET is not set 1505# CONFIG_USB_GADGET is not set
1392
1393#
1394# MMC/SD Card support
1395#
1396# CONFIG_MMC is not set 1506# CONFIG_MMC is not set
1397 1507
1398# 1508#
@@ -1417,8 +1527,11 @@ CONFIG_INFINIBAND=m
1417CONFIG_INFINIBAND_ADDR_TRANS=y 1527CONFIG_INFINIBAND_ADDR_TRANS=y
1418CONFIG_INFINIBAND_MTHCA=m 1528CONFIG_INFINIBAND_MTHCA=m
1419CONFIG_INFINIBAND_MTHCA_DEBUG=y 1529CONFIG_INFINIBAND_MTHCA_DEBUG=y
1530# CONFIG_INFINIBAND_IPATH is not set
1420# CONFIG_INFINIBAND_AMSO1100 is not set 1531# CONFIG_INFINIBAND_AMSO1100 is not set
1532# CONFIG_MLX4_INFINIBAND is not set
1421CONFIG_INFINIBAND_IPOIB=m 1533CONFIG_INFINIBAND_IPOIB=m
1534# CONFIG_INFINIBAND_IPOIB_CM is not set
1422CONFIG_INFINIBAND_IPOIB_DEBUG=y 1535CONFIG_INFINIBAND_IPOIB_DEBUG=y
1423# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set 1536# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1424# CONFIG_INFINIBAND_SRP is not set 1537# CONFIG_INFINIBAND_SRP is not set
@@ -1447,10 +1560,6 @@ CONFIG_INFINIBAND_ISER=m
1447# 1560#
1448 1561
1449# 1562#
1450# Virtualization
1451#
1452
1453#
1454# File systems 1563# File systems
1455# 1564#
1456CONFIG_EXT2_FS=y 1565CONFIG_EXT2_FS=y
@@ -1567,6 +1676,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1567CONFIG_NFS_COMMON=y 1676CONFIG_NFS_COMMON=y
1568CONFIG_SUNRPC=y 1677CONFIG_SUNRPC=y
1569CONFIG_SUNRPC_GSS=y 1678CONFIG_SUNRPC_GSS=y
1679# CONFIG_SUNRPC_BIND34 is not set
1570CONFIG_RPCSEC_GSS_KRB5=y 1680CONFIG_RPCSEC_GSS_KRB5=y
1571CONFIG_RPCSEC_GSS_SPKM3=m 1681CONFIG_RPCSEC_GSS_SPKM3=m
1572# CONFIG_SMB_FS is not set 1682# CONFIG_SMB_FS is not set
@@ -1602,6 +1712,7 @@ CONFIG_MSDOS_PARTITION=y
1602# CONFIG_SUN_PARTITION is not set 1712# CONFIG_SUN_PARTITION is not set
1603# CONFIG_KARMA_PARTITION is not set 1713# CONFIG_KARMA_PARTITION is not set
1604# CONFIG_EFI_PARTITION is not set 1714# CONFIG_EFI_PARTITION is not set
1715# CONFIG_SYSV68_PARTITION is not set
1605 1716
1606# 1717#
1607# Native Language Support 1718# Native Language Support
@@ -1651,15 +1762,7 @@ CONFIG_NLS_UTF8=m
1651# Distributed Lock Manager 1762# Distributed Lock Manager
1652# 1763#
1653# CONFIG_DLM is not set 1764# CONFIG_DLM is not set
1654 1765# CONFIG_UCC_SLOW is not set
1655#
1656# iSeries device drivers
1657#
1658# CONFIG_VIOCONS is not set
1659CONFIG_VIODASD=y
1660CONFIG_VIOCD=m
1661CONFIG_VIOTAPE=m
1662CONFIG_VIOPATH=y
1663 1766
1664# 1767#
1665# Library routines 1768# Library routines
@@ -1667,14 +1770,19 @@ CONFIG_VIOPATH=y
1667CONFIG_BITREVERSE=y 1770CONFIG_BITREVERSE=y
1668CONFIG_CRC_CCITT=m 1771CONFIG_CRC_CCITT=m
1669# CONFIG_CRC16 is not set 1772# CONFIG_CRC16 is not set
1773# CONFIG_CRC_ITU_T is not set
1670CONFIG_CRC32=y 1774CONFIG_CRC32=y
1671CONFIG_LIBCRC32C=m 1775CONFIG_LIBCRC32C=m
1672CONFIG_ZLIB_INFLATE=y 1776CONFIG_ZLIB_INFLATE=y
1673CONFIG_ZLIB_DEFLATE=m 1777CONFIG_ZLIB_DEFLATE=m
1674CONFIG_TEXTSEARCH=y 1778CONFIG_TEXTSEARCH=y
1675CONFIG_TEXTSEARCH_KMP=m 1779CONFIG_TEXTSEARCH_KMP=m
1780CONFIG_TEXTSEARCH_BM=m
1781CONFIG_TEXTSEARCH_FSM=m
1676CONFIG_PLIST=y 1782CONFIG_PLIST=y
1677CONFIG_IOMAP_COPY=y 1783CONFIG_HAS_IOMEM=y
1784CONFIG_HAS_IOPORT=y
1785CONFIG_HAS_DMA=y
1678 1786
1679# 1787#
1680# Instrumentation Support 1788# Instrumentation Support
@@ -1693,15 +1801,15 @@ CONFIG_MAGIC_SYSRQ=y
1693CONFIG_DEBUG_FS=y 1801CONFIG_DEBUG_FS=y
1694# CONFIG_HEADERS_CHECK is not set 1802# CONFIG_HEADERS_CHECK is not set
1695CONFIG_DEBUG_KERNEL=y 1803CONFIG_DEBUG_KERNEL=y
1696CONFIG_LOG_BUF_SHIFT=17 1804# CONFIG_DEBUG_SHIRQ is not set
1697CONFIG_DETECT_SOFTLOCKUP=y 1805CONFIG_DETECT_SOFTLOCKUP=y
1698# CONFIG_SCHEDSTATS is not set 1806# CONFIG_SCHEDSTATS is not set
1807# CONFIG_TIMER_STATS is not set
1699# CONFIG_DEBUG_SLAB is not set 1808# CONFIG_DEBUG_SLAB is not set
1700# CONFIG_DEBUG_RT_MUTEXES is not set 1809# CONFIG_DEBUG_RT_MUTEXES is not set
1701# CONFIG_RT_MUTEX_TESTER is not set 1810# CONFIG_RT_MUTEX_TESTER is not set
1702# CONFIG_DEBUG_SPINLOCK is not set 1811# CONFIG_DEBUG_SPINLOCK is not set
1703CONFIG_DEBUG_MUTEXES=y 1812CONFIG_DEBUG_MUTEXES=y
1704# CONFIG_DEBUG_RWSEMS is not set
1705# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1813# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1706# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1814# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1707# CONFIG_DEBUG_KOBJECT is not set 1815# CONFIG_DEBUG_KOBJECT is not set
@@ -1711,8 +1819,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1711# CONFIG_DEBUG_LIST is not set 1819# CONFIG_DEBUG_LIST is not set
1712CONFIG_FORCED_INLINING=y 1820CONFIG_FORCED_INLINING=y
1713# CONFIG_RCU_TORTURE_TEST is not set 1821# CONFIG_RCU_TORTURE_TEST is not set
1822# CONFIG_FAULT_INJECTION is not set
1714CONFIG_DEBUG_STACKOVERFLOW=y 1823CONFIG_DEBUG_STACKOVERFLOW=y
1715CONFIG_DEBUG_STACK_USAGE=y 1824CONFIG_DEBUG_STACK_USAGE=y
1825# CONFIG_DEBUG_PAGEALLOC is not set
1716# CONFIG_HCALL_STATS is not set 1826# CONFIG_HCALL_STATS is not set
1717CONFIG_DEBUGGER=y 1827CONFIG_DEBUGGER=y
1718CONFIG_XMON=y 1828CONFIG_XMON=y
@@ -1749,8 +1859,11 @@ CONFIG_CRYPTO_TGR192=m
1749# CONFIG_CRYPTO_GF128MUL is not set 1859# CONFIG_CRYPTO_GF128MUL is not set
1750CONFIG_CRYPTO_ECB=m 1860CONFIG_CRYPTO_ECB=m
1751CONFIG_CRYPTO_CBC=y 1861CONFIG_CRYPTO_CBC=y
1862CONFIG_CRYPTO_PCBC=m
1752# CONFIG_CRYPTO_LRW is not set 1863# CONFIG_CRYPTO_LRW is not set
1864# CONFIG_CRYPTO_CRYPTD is not set
1753CONFIG_CRYPTO_DES=y 1865CONFIG_CRYPTO_DES=y
1866# CONFIG_CRYPTO_FCRYPT is not set
1754CONFIG_CRYPTO_BLOWFISH=m 1867CONFIG_CRYPTO_BLOWFISH=m
1755CONFIG_CRYPTO_TWOFISH=m 1868CONFIG_CRYPTO_TWOFISH=m
1756CONFIG_CRYPTO_TWOFISH_COMMON=m 1869CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1765,6 +1878,7 @@ CONFIG_CRYPTO_ANUBIS=m
1765CONFIG_CRYPTO_DEFLATE=m 1878CONFIG_CRYPTO_DEFLATE=m
1766CONFIG_CRYPTO_MICHAEL_MIC=m 1879CONFIG_CRYPTO_MICHAEL_MIC=m
1767CONFIG_CRYPTO_CRC32C=m 1880CONFIG_CRYPTO_CRC32C=m
1881# CONFIG_CRYPTO_CAMELLIA is not set
1768CONFIG_CRYPTO_TEST=m 1882CONFIG_CRYPTO_TEST=m
1769 1883
1770# 1884#
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index c70a73082007..fb504a714625 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.22-rc6
4# Wed May 9 09:42:46 2007 4# Tue Jun 26 14:15:11 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC32=y 7CONFIG_PPC32=y
@@ -90,7 +90,11 @@ CONFIG_BUG=y
90CONFIG_ELF_CORE=y 90CONFIG_ELF_CORE=y
91CONFIG_BASE_FULL=y 91CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 92CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y
93CONFIG_EPOLL=y 94CONFIG_EPOLL=y
95CONFIG_SIGNALFD=y
96CONFIG_TIMERFD=y
97CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 98CONFIG_SHMEM=y
95CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_SLAB=y 100CONFIG_SLAB=y
@@ -274,20 +278,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
274# CONFIG_INET6_TUNNEL is not set 278# CONFIG_INET6_TUNNEL is not set
275# CONFIG_NETWORK_SECMARK is not set 279# CONFIG_NETWORK_SECMARK is not set
276# CONFIG_NETFILTER is not set 280# CONFIG_NETFILTER is not set
277
278#
279# DCCP Configuration (EXPERIMENTAL)
280#
281# CONFIG_IP_DCCP is not set 281# CONFIG_IP_DCCP is not set
282
283#
284# SCTP Configuration (EXPERIMENTAL)
285#
286# CONFIG_IP_SCTP is not set 282# CONFIG_IP_SCTP is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set 283# CONFIG_TIPC is not set
292# CONFIG_ATM is not set 284# CONFIG_ATM is not set
293# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
@@ -383,7 +375,6 @@ CONFIG_MTD_CFI_UTIL=y
383# CONFIG_MTD_RAM is not set 375# CONFIG_MTD_RAM is not set
384# CONFIG_MTD_ROM is not set 376# CONFIG_MTD_ROM is not set
385# CONFIG_MTD_ABSENT is not set 377# CONFIG_MTD_ABSENT is not set
386# CONFIG_MTD_OBSOLETE_CHIPS is not set
387 378
388# 379#
389# Mapping drivers for chip access 380# Mapping drivers for chip access
@@ -454,10 +445,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
454# CONFIG_SGI_IOC4 is not set 445# CONFIG_SGI_IOC4 is not set
455# CONFIG_TIFM_CORE is not set 446# CONFIG_TIFM_CORE is not set
456# CONFIG_BLINK is not set 447# CONFIG_BLINK is not set
457
458#
459# ATA/ATAPI/MFM/RLL support
460#
461CONFIG_IDE=y 448CONFIG_IDE=y
462CONFIG_BLK_DEV_IDE=y 449CONFIG_BLK_DEV_IDE=y
463 450
@@ -472,6 +459,7 @@ CONFIG_BLK_DEV_IDEDISK=y
472# CONFIG_BLK_DEV_IDEFLOPPY is not set 459# CONFIG_BLK_DEV_IDEFLOPPY is not set
473# CONFIG_BLK_DEV_IDESCSI is not set 460# CONFIG_BLK_DEV_IDESCSI is not set
474# CONFIG_IDE_TASK_IOCTL is not set 461# CONFIG_IDE_TASK_IOCTL is not set
462CONFIG_IDE_PROC_FS=y
475 463
476# 464#
477# IDE chipset support/bugfixes 465# IDE chipset support/bugfixes
@@ -479,6 +467,7 @@ CONFIG_BLK_DEV_IDEDISK=y
479CONFIG_IDE_GENERIC=y 467CONFIG_IDE_GENERIC=y
480CONFIG_BLK_DEV_IDEPCI=y 468CONFIG_BLK_DEV_IDEPCI=y
481# CONFIG_IDEPCI_SHARE_IRQ is not set 469# CONFIG_IDEPCI_SHARE_IRQ is not set
470CONFIG_IDEPCI_PCIBUS_ORDER=y
482# CONFIG_BLK_DEV_OFFBOARD is not set 471# CONFIG_BLK_DEV_OFFBOARD is not set
483CONFIG_BLK_DEV_GENERIC=y 472CONFIG_BLK_DEV_GENERIC=y
484# CONFIG_BLK_DEV_OPTI621 is not set 473# CONFIG_BLK_DEV_OPTI621 is not set
@@ -588,12 +577,7 @@ CONFIG_BLK_DEV_SD=y
588# CONFIG_SCSI_DC390T is not set 577# CONFIG_SCSI_DC390T is not set
589# CONFIG_SCSI_NSP32 is not set 578# CONFIG_SCSI_NSP32 is not set
590# CONFIG_SCSI_DEBUG is not set 579# CONFIG_SCSI_DEBUG is not set
591# CONFIG_SCSI_ESP_CORE is not set
592# CONFIG_SCSI_SRP is not set 580# CONFIG_SCSI_SRP is not set
593
594#
595# Serial ATA (prod) and Parallel ATA (experimental) drivers
596#
597CONFIG_ATA=y 581CONFIG_ATA=y
598# CONFIG_ATA_NONSTANDARD is not set 582# CONFIG_ATA_NONSTANDARD is not set
599# CONFIG_SATA_AHCI is not set 583# CONFIG_SATA_AHCI is not set
@@ -665,6 +649,7 @@ CONFIG_SATA_MV=y
665# 649#
666# IEEE 1394 (FireWire) support 650# IEEE 1394 (FireWire) support
667# 651#
652# CONFIG_FIREWIRE is not set
668# CONFIG_IEEE1394 is not set 653# CONFIG_IEEE1394 is not set
669 654
670# 655#
@@ -683,15 +668,7 @@ CONFIG_NETDEVICES=y
683# CONFIG_BONDING is not set 668# CONFIG_BONDING is not set
684# CONFIG_EQUALIZER is not set 669# CONFIG_EQUALIZER is not set
685# CONFIG_TUN is not set 670# CONFIG_TUN is not set
686
687#
688# ARCnet devices
689#
690# CONFIG_ARCNET is not set 671# CONFIG_ARCNET is not set
691
692#
693# PHY device support
694#
695CONFIG_PHYLIB=y 672CONFIG_PHYLIB=y
696 673
697# 674#
@@ -746,10 +723,7 @@ CONFIG_8139TOO=y
746# CONFIG_TLAN is not set 723# CONFIG_TLAN is not set
747# CONFIG_VIA_RHINE is not set 724# CONFIG_VIA_RHINE is not set
748# CONFIG_SC92031 is not set 725# CONFIG_SC92031 is not set
749 726CONFIG_NETDEV_1000=y
750#
751# Ethernet (1000 Mbit)
752#
753# CONFIG_ACENIC is not set 727# CONFIG_ACENIC is not set
754# CONFIG_DL2K is not set 728# CONFIG_DL2K is not set
755CONFIG_E1000=y 729CONFIG_E1000=y
@@ -769,20 +743,14 @@ CONFIG_E1000=y
769CONFIG_MV643XX_ETH=y 743CONFIG_MV643XX_ETH=y
770# CONFIG_QLA3XXX is not set 744# CONFIG_QLA3XXX is not set
771# CONFIG_ATL1 is not set 745# CONFIG_ATL1 is not set
772 746CONFIG_NETDEV_10000=y
773#
774# Ethernet (10000 Mbit)
775#
776# CONFIG_CHELSIO_T1 is not set 747# CONFIG_CHELSIO_T1 is not set
777# CONFIG_CHELSIO_T3 is not set 748# CONFIG_CHELSIO_T3 is not set
778# CONFIG_IXGB is not set 749# CONFIG_IXGB is not set
779# CONFIG_S2IO is not set 750# CONFIG_S2IO is not set
780# CONFIG_MYRI10GE is not set 751# CONFIG_MYRI10GE is not set
781# CONFIG_NETXEN_NIC is not set 752# CONFIG_NETXEN_NIC is not set
782 753# CONFIG_MLX4_CORE is not set
783#
784# Token Ring devices
785#
786# CONFIG_TR is not set 754# CONFIG_TR is not set
787 755
788# 756#
@@ -792,8 +760,14 @@ CONFIG_MV643XX_ETH=y
792# CONFIG_WLAN_80211 is not set 760# CONFIG_WLAN_80211 is not set
793 761
794# 762#
795# Wan interfaces 763# USB Network Adapters
796# 764#
765# CONFIG_USB_CATC is not set
766# CONFIG_USB_KAWETH is not set
767# CONFIG_USB_PEGASUS is not set
768# CONFIG_USB_RTL8150 is not set
769# CONFIG_USB_USBNET_MII is not set
770# CONFIG_USB_USBNET is not set
797# CONFIG_WAN is not set 771# CONFIG_WAN is not set
798# CONFIG_FDDI is not set 772# CONFIG_FDDI is not set
799# CONFIG_HIPPI is not set 773# CONFIG_HIPPI is not set
@@ -820,6 +794,7 @@ CONFIG_MV643XX_ETH=y
820# 794#
821CONFIG_INPUT=y 795CONFIG_INPUT=y
822# CONFIG_INPUT_FF_MEMLESS is not set 796# CONFIG_INPUT_FF_MEMLESS is not set
797# CONFIG_INPUT_POLLDEV is not set
823 798
824# 799#
825# Userland interfaces 800# Userland interfaces
@@ -880,16 +855,11 @@ CONFIG_LEGACY_PTY_COUNT=256
880# IPMI 855# IPMI
881# 856#
882# CONFIG_IPMI_HANDLER is not set 857# CONFIG_IPMI_HANDLER is not set
883
884#
885# Watchdog Cards
886#
887# CONFIG_WATCHDOG is not set 858# CONFIG_WATCHDOG is not set
888# CONFIG_HW_RANDOM is not set 859# CONFIG_HW_RANDOM is not set
889# CONFIG_NVRAM is not set 860# CONFIG_NVRAM is not set
890CONFIG_GEN_RTC=y 861CONFIG_GEN_RTC=y
891# CONFIG_GEN_RTC_X is not set 862# CONFIG_GEN_RTC_X is not set
892# CONFIG_DTLK is not set
893# CONFIG_R3964 is not set 863# CONFIG_R3964 is not set
894# CONFIG_APPLICOM is not set 864# CONFIG_APPLICOM is not set
895# CONFIG_AGP is not set 865# CONFIG_AGP is not set
@@ -1023,12 +993,8 @@ CONFIG_HWMON=y
1023# Multimedia devices 993# Multimedia devices
1024# 994#
1025# CONFIG_VIDEO_DEV is not set 995# CONFIG_VIDEO_DEV is not set
1026 996# CONFIG_DVB_CORE is not set
1027# 997# CONFIG_DAB is not set
1028# Digital Video Broadcasting Devices
1029#
1030# CONFIG_DVB is not set
1031# CONFIG_USB_DABUSB is not set
1032 998
1033# 999#
1034# Graphics support 1000# Graphics support
@@ -1124,16 +1090,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1124# 1090#
1125# CONFIG_USB_MDC800 is not set 1091# CONFIG_USB_MDC800 is not set
1126# CONFIG_USB_MICROTEK is not set 1092# CONFIG_USB_MICROTEK is not set
1127
1128#
1129# USB Network Adapters
1130#
1131# CONFIG_USB_CATC is not set
1132# CONFIG_USB_KAWETH is not set
1133# CONFIG_USB_PEGASUS is not set
1134# CONFIG_USB_RTL8150 is not set
1135# CONFIG_USB_USBNET_MII is not set
1136# CONFIG_USB_USBNET is not set
1137CONFIG_USB_MON=y 1093CONFIG_USB_MON=y
1138 1094
1139# 1095#
@@ -1261,14 +1217,6 @@ CONFIG_RTC_DRV_MAX6900=y
1261# 1217#
1262 1218
1263# 1219#
1264# Auxiliary Display support
1265#
1266
1267#
1268# Virtualization
1269#
1270
1271#
1272# File systems 1220# File systems
1273# 1221#
1274CONFIG_EXT2_FS=y 1222CONFIG_EXT2_FS=y
@@ -1396,7 +1344,6 @@ CONFIG_MSDOS_PARTITION=y
1396# 1344#
1397# CONFIG_DLM is not set 1345# CONFIG_DLM is not set
1398# CONFIG_UCC_SLOW is not set 1346# CONFIG_UCC_SLOW is not set
1399# CONFIG_UCC_FAST is not set
1400 1347
1401# 1348#
1402# Library routines 1349# Library routines
@@ -1404,6 +1351,7 @@ CONFIG_MSDOS_PARTITION=y
1404CONFIG_BITREVERSE=y 1351CONFIG_BITREVERSE=y
1405# CONFIG_CRC_CCITT is not set 1352# CONFIG_CRC_CCITT is not set
1406# CONFIG_CRC16 is not set 1353# CONFIG_CRC16 is not set
1354# CONFIG_CRC_ITU_T is not set
1407CONFIG_CRC32=y 1355CONFIG_CRC32=y
1408# CONFIG_LIBCRC32C is not set 1356# CONFIG_LIBCRC32C is not set
1409CONFIG_PLIST=y 1357CONFIG_PLIST=y
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 477934558f06..956d1df61e0f 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.22-rc6
4# Fri May 11 10:16:27 2007 4# Tue Jun 26 14:15:19 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -87,7 +87,11 @@ CONFIG_BUG=y
87CONFIG_ELF_CORE=y 87CONFIG_ELF_CORE=y
88CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
89CONFIG_FUTEX=y 89CONFIG_FUTEX=y
90CONFIG_ANON_INODES=y
90CONFIG_EPOLL=y 91CONFIG_EPOLL=y
92CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 95CONFIG_SHMEM=y
92CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
93CONFIG_SLAB=y 97CONFIG_SLAB=y
@@ -301,20 +305,8 @@ CONFIG_IPV6_SIT=y
301# CONFIG_IPV6_MULTIPLE_TABLES is not set 305# CONFIG_IPV6_MULTIPLE_TABLES is not set
302# CONFIG_NETWORK_SECMARK is not set 306# CONFIG_NETWORK_SECMARK is not set
303# CONFIG_NETFILTER is not set 307# CONFIG_NETFILTER is not set
304
305#
306# DCCP Configuration (EXPERIMENTAL)
307#
308# CONFIG_IP_DCCP is not set 308# CONFIG_IP_DCCP is not set
309
310#
311# SCTP Configuration (EXPERIMENTAL)
312#
313# CONFIG_IP_SCTP is not set 309# CONFIG_IP_SCTP is not set
314
315#
316# TIPC Configuration (EXPERIMENTAL)
317#
318# CONFIG_TIPC is not set 310# CONFIG_TIPC is not set
319# CONFIG_ATM is not set 311# CONFIG_ATM is not set
320# CONFIG_BRIDGE is not set 312# CONFIG_BRIDGE is not set
@@ -418,10 +410,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
418# Misc devices 410# Misc devices
419# 411#
420# CONFIG_BLINK is not set 412# CONFIG_BLINK is not set
421
422#
423# ATA/ATAPI/MFM/RLL support
424#
425# CONFIG_IDE is not set 413# CONFIG_IDE is not set
426 414
427# 415#
@@ -467,11 +455,6 @@ CONFIG_SCSI_WAIT_SCAN=m
467# 455#
468# CONFIG_ISCSI_TCP is not set 456# CONFIG_ISCSI_TCP is not set
469# CONFIG_SCSI_DEBUG is not set 457# CONFIG_SCSI_DEBUG is not set
470# CONFIG_SCSI_ESP_CORE is not set
471
472#
473# Serial ATA (prod) and Parallel ATA (experimental) drivers
474#
475# CONFIG_ATA is not set 458# CONFIG_ATA is not set
476 459
477# 460#
@@ -490,27 +473,12 @@ CONFIG_NETDEVICES=y
490# CONFIG_TUN is not set 473# CONFIG_TUN is not set
491 474
492# 475#
493# PHY device support
494#
495
496#
497# Ethernet (10 or 100Mbit) 476# Ethernet (10 or 100Mbit)
498# 477#
499# CONFIG_NET_ETHERNET is not set 478# CONFIG_NET_ETHERNET is not set
500CONFIG_MII=m 479CONFIG_MII=m
501 480CONFIG_NETDEV_1000=y
502# 481CONFIG_NETDEV_10000=y
503# Ethernet (1000 Mbit)
504#
505
506#
507# Ethernet (10000 Mbit)
508#
509CONFIG_MLX4_DEBUG=y
510
511#
512# Token Ring devices
513#
514 482
515# 483#
516# Wireless LAN 484# Wireless LAN
@@ -536,10 +504,6 @@ CONFIG_USB_NET_MCS7830=m
536# CONFIG_USB_NET_RNDIS_HOST is not set 504# CONFIG_USB_NET_RNDIS_HOST is not set
537# CONFIG_USB_NET_CDC_SUBSET is not set 505# CONFIG_USB_NET_CDC_SUBSET is not set
538# CONFIG_USB_NET_ZAURUS is not set 506# CONFIG_USB_NET_ZAURUS is not set
539
540#
541# Wan interfaces
542#
543# CONFIG_WAN is not set 507# CONFIG_WAN is not set
544# CONFIG_PPP is not set 508# CONFIG_PPP is not set
545# CONFIG_SLIP is not set 509# CONFIG_SLIP is not set
@@ -563,6 +527,7 @@ CONFIG_USB_NET_MCS7830=m
563# 527#
564CONFIG_INPUT=y 528CONFIG_INPUT=y
565# CONFIG_INPUT_FF_MEMLESS is not set 529# CONFIG_INPUT_FF_MEMLESS is not set
530# CONFIG_INPUT_POLLDEV is not set
566 531
567# 532#
568# Userland interfaces 533# Userland interfaces
@@ -652,12 +617,8 @@ CONFIG_GEN_RTC=y
652# Multimedia devices 617# Multimedia devices
653# 618#
654# CONFIG_VIDEO_DEV is not set 619# CONFIG_VIDEO_DEV is not set
655 620# CONFIG_DVB_CORE is not set
656# 621# CONFIG_DAB is not set
657# Digital Video Broadcasting Devices
658#
659# CONFIG_DVB is not set
660# CONFIG_USB_DABUSB is not set
661 622
662# 623#
663# Graphics support 624# Graphics support
@@ -672,13 +633,13 @@ CONFIG_GEN_RTC=y
672CONFIG_FB=y 633CONFIG_FB=y
673# CONFIG_FIRMWARE_EDID is not set 634# CONFIG_FIRMWARE_EDID is not set
674# CONFIG_FB_DDC is not set 635# CONFIG_FB_DDC is not set
675CONFIG_FB_CFB_FILLRECT=y 636# CONFIG_FB_CFB_FILLRECT is not set
676CONFIG_FB_CFB_COPYAREA=y 637# CONFIG_FB_CFB_COPYAREA is not set
677CONFIG_FB_CFB_IMAGEBLIT=y 638# CONFIG_FB_CFB_IMAGEBLIT is not set
678# CONFIG_FB_SYS_FILLRECT is not set 639CONFIG_FB_SYS_FILLRECT=y
679# CONFIG_FB_SYS_COPYAREA is not set 640CONFIG_FB_SYS_COPYAREA=y
680# CONFIG_FB_SYS_IMAGEBLIT is not set 641CONFIG_FB_SYS_IMAGEBLIT=y
681# CONFIG_FB_SYS_FOPS is not set 642CONFIG_FB_SYS_FOPS=y
682CONFIG_FB_DEFERRED_IO=y 643CONFIG_FB_DEFERRED_IO=y
683# CONFIG_FB_SVGALIB is not set 644# CONFIG_FB_SVGALIB is not set
684# CONFIG_FB_MACMODES is not set 645# CONFIG_FB_MACMODES is not set
@@ -751,9 +712,10 @@ CONFIG_SND_VERBOSE_PROCFS=y
751# 712#
752# CONFIG_SND_USB_AUDIO is not set 713# CONFIG_SND_USB_AUDIO is not set
753# CONFIG_SND_USB_USX2Y is not set 714# CONFIG_SND_USB_USX2Y is not set
715# CONFIG_SND_USB_CAIAQ is not set
754 716
755# 717#
756# SoC audio support 718# System on Chip audio support
757# 719#
758# CONFIG_SND_SOC is not set 720# CONFIG_SND_SOC is not set
759 721
@@ -1098,7 +1060,6 @@ CONFIG_NLS_ISO8859_1=y
1098# 1060#
1099# CONFIG_DLM is not set 1061# CONFIG_DLM is not set
1100# CONFIG_UCC_SLOW is not set 1062# CONFIG_UCC_SLOW is not set
1101# CONFIG_UCC_FAST is not set
1102 1063
1103# 1064#
1104# Library routines 1065# Library routines
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 6e96e50c362d..0caf0dd5ea87 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc5 3# Linux kernel version: 2.6.22-rc6
4# Mon Jan 22 22:31:27 2007 4# Tue Jun 26 14:17:45 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -40,6 +40,7 @@ CONFIG_PPC_FPU=y
40# CONFIG_PPC_OF_PLATFORM_PCI is not set 40# CONFIG_PPC_OF_PLATFORM_PCI is not set
41CONFIG_ALTIVEC=y 41CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y 42CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_MM_SLICES=y
43CONFIG_VIRT_CPU_ACCOUNTING=y 44CONFIG_VIRT_CPU_ACCOUNTING=y
44CONFIG_SMP=y 45CONFIG_SMP=y
45CONFIG_NR_CPUS=128 46CONFIG_NR_CPUS=128
@@ -60,16 +61,23 @@ CONFIG_LOCALVERSION_AUTO=y
60CONFIG_SWAP=y 61CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 62CONFIG_SYSVIPC=y
62# CONFIG_IPC_NS is not set 63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y
63CONFIG_POSIX_MQUEUE=y 65CONFIG_POSIX_MQUEUE=y
64# CONFIG_BSD_PROCESS_ACCT is not set 66# CONFIG_BSD_PROCESS_ACCT is not set
67CONFIG_TASKSTATS=y
68CONFIG_TASK_DELAY_ACCT=y
69CONFIG_TASK_XACCT=y
70CONFIG_TASK_IO_ACCOUNTING=y
65# CONFIG_UTS_NS is not set 71# CONFIG_UTS_NS is not set
66CONFIG_AUDIT=y 72CONFIG_AUDIT=y
67CONFIG_AUDITSYSCALL=y 73CONFIG_AUDITSYSCALL=y
68CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
69CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=17
70CONFIG_CPUSETS=y 77CONFIG_CPUSETS=y
71CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
72# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
80CONFIG_BLK_DEV_INITRD=y
73CONFIG_INITRAMFS_SOURCE="" 81CONFIG_INITRAMFS_SOURCE=""
74CONFIG_CC_OPTIMIZE_FOR_SIZE=y 82CONFIG_CC_OPTIMIZE_FOR_SIZE=y
75CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
@@ -84,14 +92,19 @@ CONFIG_BUG=y
84CONFIG_ELF_CORE=y 92CONFIG_ELF_CORE=y
85CONFIG_BASE_FULL=y 93CONFIG_BASE_FULL=y
86CONFIG_FUTEX=y 94CONFIG_FUTEX=y
95CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 96CONFIG_EPOLL=y
97CONFIG_SIGNALFD=y
98CONFIG_TIMERFD=y
99CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 100CONFIG_SHMEM=y
89CONFIG_SLAB=y
90CONFIG_VM_EVENT_COUNTERS=y 101CONFIG_VM_EVENT_COUNTERS=y
102CONFIG_SLAB=y
103# CONFIG_SLUB is not set
104# CONFIG_SLOB is not set
91CONFIG_RT_MUTEXES=y 105CONFIG_RT_MUTEXES=y
92# CONFIG_TINY_SHMEM is not set 106# CONFIG_TINY_SHMEM is not set
93CONFIG_BASE_SMALL=0 107CONFIG_BASE_SMALL=0
94# CONFIG_SLOB is not set
95 108
96# 109#
97# Loadable module support 110# Loadable module support
@@ -130,18 +143,28 @@ CONFIG_PPC_MULTIPLATFORM=y
130# CONFIG_EMBEDDED6xx is not set 143# CONFIG_EMBEDDED6xx is not set
131# CONFIG_APUS is not set 144# CONFIG_APUS is not set
132CONFIG_PPC_PSERIES=y 145CONFIG_PPC_PSERIES=y
146CONFIG_PPC_SPLPAR=y
147CONFIG_EEH=y
148CONFIG_SCANLOG=m
149CONFIG_LPARCFG=y
133# CONFIG_PPC_ISERIES is not set 150# CONFIG_PPC_ISERIES is not set
134# CONFIG_PPC_MPC52xx is not set 151# CONFIG_PPC_MPC52xx is not set
152# CONFIG_PPC_MPC5200 is not set
135# CONFIG_PPC_PMAC is not set 153# CONFIG_PPC_PMAC is not set
136# CONFIG_PPC_MAPLE is not set 154# CONFIG_PPC_MAPLE is not set
137# CONFIG_PPC_PASEMI is not set 155# CONFIG_PPC_PASEMI is not set
156# CONFIG_PPC_CELLEB is not set
157# CONFIG_PPC_PS3 is not set
138# CONFIG_PPC_CELL is not set 158# CONFIG_PPC_CELL is not set
139# CONFIG_PPC_CELL_NATIVE is not set 159# CONFIG_PPC_CELL_NATIVE is not set
140# CONFIG_PPC_IBM_CELL_BLADE is not set 160# CONFIG_PPC_IBM_CELL_BLADE is not set
141# CONFIG_PPC_PS3 is not set 161# CONFIG_PQ2ADS is not set
142CONFIG_PPC_NATIVE=y 162CONFIG_PPC_NATIVE=y
143# CONFIG_UDBG_RTAS_CONSOLE is not set 163# CONFIG_UDBG_RTAS_CONSOLE is not set
144CONFIG_XICS=y 164CONFIG_XICS=y
165CONFIG_MPIC=y
166# CONFIG_MPIC_WEIRD is not set
167CONFIG_PPC_I8259=y
145# CONFIG_U3_DART is not set 168# CONFIG_U3_DART is not set
146CONFIG_PPC_RTAS=y 169CONFIG_PPC_RTAS=y
147CONFIG_RTAS_ERROR_LOGGING=y 170CONFIG_RTAS_ERROR_LOGGING=y
@@ -155,8 +178,7 @@ CONFIG_IBMEBUS=y
155# CONFIG_PPC_INDIRECT_IO is not set 178# CONFIG_PPC_INDIRECT_IO is not set
156# CONFIG_GENERIC_IOMAP is not set 179# CONFIG_GENERIC_IOMAP is not set
157# CONFIG_CPU_FREQ is not set 180# CONFIG_CPU_FREQ is not set
158# CONFIG_WANT_EARLY_SERIAL is not set 181# CONFIG_CPM2 is not set
159CONFIG_MPIC=y
160 182
161# 183#
162# Kernel options 184# Kernel options
@@ -179,10 +201,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
179CONFIG_KEXEC=y 201CONFIG_KEXEC=y
180# CONFIG_CRASH_DUMP is not set 202# CONFIG_CRASH_DUMP is not set
181CONFIG_IRQ_ALL_CPUS=y 203CONFIG_IRQ_ALL_CPUS=y
182CONFIG_PPC_SPLPAR=y
183CONFIG_EEH=y
184CONFIG_SCANLOG=m
185CONFIG_LPARCFG=y
186CONFIG_NUMA=y 204CONFIG_NUMA=y
187CONFIG_NODES_SHIFT=4 205CONFIG_NODES_SHIFT=4
188CONFIG_ARCH_SELECT_MEMORY_MODEL=y 206CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -202,35 +220,35 @@ CONFIG_SPARSEMEM_EXTREME=y
202CONFIG_SPLIT_PTLOCK_CPUS=4 220CONFIG_SPLIT_PTLOCK_CPUS=4
203CONFIG_MIGRATION=y 221CONFIG_MIGRATION=y
204CONFIG_RESOURCES_64BIT=y 222CONFIG_RESOURCES_64BIT=y
223CONFIG_ZONE_DMA_FLAG=1
205CONFIG_NODES_SPAN_OTHER_NODES=y 224CONFIG_NODES_SPAN_OTHER_NODES=y
225# CONFIG_PPC_HAS_HASH_64K is not set
206# CONFIG_PPC_64K_PAGES is not set 226# CONFIG_PPC_64K_PAGES is not set
207CONFIG_SCHED_SMT=y 227CONFIG_SCHED_SMT=y
208CONFIG_PROC_DEVICETREE=y 228CONFIG_PROC_DEVICETREE=y
209# CONFIG_CMDLINE_BOOL is not set 229# CONFIG_CMDLINE_BOOL is not set
210# CONFIG_PM is not set 230# CONFIG_PM is not set
211CONFIG_SECCOMP=y 231CONFIG_SECCOMP=y
232# CONFIG_WANT_DEVICE_TREE is not set
212CONFIG_ISA_DMA_API=y 233CONFIG_ISA_DMA_API=y
213 234
214# 235#
215# Bus options 236# Bus options
216# 237#
238CONFIG_ZONE_DMA=y
217CONFIG_GENERIC_ISA_DMA=y 239CONFIG_GENERIC_ISA_DMA=y
218# CONFIG_MPIC_WEIRD is not set
219CONFIG_PPC_I8259=y
220# CONFIG_PPC_INDIRECT_PCI is not set 240# CONFIG_PPC_INDIRECT_PCI is not set
221CONFIG_PCI=y 241CONFIG_PCI=y
222CONFIG_PCI_DOMAINS=y 242CONFIG_PCI_DOMAINS=y
223# CONFIG_PCIEPORTBUS is not set 243# CONFIG_PCIEPORTBUS is not set
244CONFIG_ARCH_SUPPORTS_MSI=y
245CONFIG_PCI_MSI=y
224# CONFIG_PCI_DEBUG is not set 246# CONFIG_PCI_DEBUG is not set
225 247
226# 248#
227# PCCARD (PCMCIA/CardBus) support 249# PCCARD (PCMCIA/CardBus) support
228# 250#
229# CONFIG_PCCARD is not set 251# CONFIG_PCCARD is not set
230
231#
232# PCI Hotplug Support
233#
234CONFIG_HOTPLUG_PCI=m 252CONFIG_HOTPLUG_PCI=m
235# CONFIG_HOTPLUG_PCI_FAKE is not set 253# CONFIG_HOTPLUG_PCI_FAKE is not set
236# CONFIG_HOTPLUG_PCI_CPCI is not set 254# CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -247,14 +265,15 @@ CONFIG_NET=y
247# 265#
248# Networking options 266# Networking options
249# 267#
250# CONFIG_NETDEBUG is not set
251CONFIG_PACKET=y 268CONFIG_PACKET=y
252# CONFIG_PACKET_MMAP is not set 269# CONFIG_PACKET_MMAP is not set
253CONFIG_UNIX=y 270CONFIG_UNIX=y
254CONFIG_XFRM=y 271CONFIG_XFRM=y
255CONFIG_XFRM_USER=m 272CONFIG_XFRM_USER=m
256# CONFIG_XFRM_SUB_POLICY is not set 273# CONFIG_XFRM_SUB_POLICY is not set
274# CONFIG_XFRM_MIGRATE is not set
257CONFIG_NET_KEY=m 275CONFIG_NET_KEY=m
276# CONFIG_NET_KEY_MIGRATE is not set
258CONFIG_INET=y 277CONFIG_INET=y
259CONFIG_IP_MULTICAST=y 278CONFIG_IP_MULTICAST=y
260# CONFIG_IP_ADVANCED_ROUTER is not set 279# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +298,6 @@ CONFIG_INET_TCP_DIAG=y
279CONFIG_TCP_CONG_CUBIC=y 298CONFIG_TCP_CONG_CUBIC=y
280CONFIG_DEFAULT_TCP_CONG="cubic" 299CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_TCP_MD5SIG is not set 300# CONFIG_TCP_MD5SIG is not set
282
283#
284# IP: Virtual Server Configuration
285#
286# CONFIG_IP_VS is not set 301# CONFIG_IP_VS is not set
287# CONFIG_IPV6 is not set 302# CONFIG_IPV6 is not set
288# CONFIG_INET6_XFRM_TUNNEL is not set 303# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -298,10 +313,8 @@ CONFIG_NETFILTER_NETLINK=y
298CONFIG_NETFILTER_NETLINK_QUEUE=m 313CONFIG_NETFILTER_NETLINK_QUEUE=m
299CONFIG_NETFILTER_NETLINK_LOG=m 314CONFIG_NETFILTER_NETLINK_LOG=m
300CONFIG_NF_CONNTRACK_ENABLED=m 315CONFIG_NF_CONNTRACK_ENABLED=m
301CONFIG_NF_CONNTRACK_SUPPORT=y
302# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
303CONFIG_NF_CONNTRACK=m 316CONFIG_NF_CONNTRACK=m
304# CONFIG_NF_CT_ACCT is not set 317CONFIG_NF_CT_ACCT=y
305CONFIG_NF_CONNTRACK_MARK=y 318CONFIG_NF_CONNTRACK_MARK=y
306CONFIG_NF_CONNTRACK_EVENTS=y 319CONFIG_NF_CONNTRACK_EVENTS=y
307# CONFIG_NF_CT_PROTO_SCTP is not set 320# CONFIG_NF_CT_PROTO_SCTP is not set
@@ -311,10 +324,39 @@ CONFIG_NF_CONNTRACK_FTP=m
311CONFIG_NF_CONNTRACK_IRC=m 324CONFIG_NF_CONNTRACK_IRC=m
312# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set 325# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
313# CONFIG_NF_CONNTRACK_PPTP is not set 326# CONFIG_NF_CONNTRACK_PPTP is not set
327# CONFIG_NF_CONNTRACK_SANE is not set
314# CONFIG_NF_CONNTRACK_SIP is not set 328# CONFIG_NF_CONNTRACK_SIP is not set
315CONFIG_NF_CONNTRACK_TFTP=m 329CONFIG_NF_CONNTRACK_TFTP=m
316CONFIG_NF_CT_NETLINK=m 330CONFIG_NF_CT_NETLINK=m
317# CONFIG_NETFILTER_XTABLES is not set 331CONFIG_NETFILTER_XTABLES=m
332CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
333CONFIG_NETFILTER_XT_TARGET_MARK=m
334CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
335CONFIG_NETFILTER_XT_TARGET_NFLOG=m
336CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
337CONFIG_NETFILTER_XT_MATCH_COMMENT=m
338CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
339CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
340CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
341CONFIG_NETFILTER_XT_MATCH_DCCP=m
342CONFIG_NETFILTER_XT_MATCH_DSCP=m
343CONFIG_NETFILTER_XT_MATCH_ESP=m
344CONFIG_NETFILTER_XT_MATCH_HELPER=m
345CONFIG_NETFILTER_XT_MATCH_LENGTH=m
346CONFIG_NETFILTER_XT_MATCH_LIMIT=m
347CONFIG_NETFILTER_XT_MATCH_MAC=m
348CONFIG_NETFILTER_XT_MATCH_MARK=m
349CONFIG_NETFILTER_XT_MATCH_POLICY=m
350CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
351CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
352CONFIG_NETFILTER_XT_MATCH_QUOTA=m
353CONFIG_NETFILTER_XT_MATCH_REALM=m
354CONFIG_NETFILTER_XT_MATCH_SCTP=m
355CONFIG_NETFILTER_XT_MATCH_STATE=m
356CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
357CONFIG_NETFILTER_XT_MATCH_STRING=m
358CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
359CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
318 360
319# 361#
320# IP: Netfilter Configuration 362# IP: Netfilter Configuration
@@ -322,20 +364,38 @@ CONFIG_NF_CT_NETLINK=m
322CONFIG_NF_CONNTRACK_IPV4=m 364CONFIG_NF_CONNTRACK_IPV4=m
323CONFIG_NF_CONNTRACK_PROC_COMPAT=y 365CONFIG_NF_CONNTRACK_PROC_COMPAT=y
324CONFIG_IP_NF_QUEUE=m 366CONFIG_IP_NF_QUEUE=m
325 367CONFIG_IP_NF_IPTABLES=m
326# 368CONFIG_IP_NF_MATCH_IPRANGE=m
327# DCCP Configuration (EXPERIMENTAL) 369CONFIG_IP_NF_MATCH_TOS=m
328# 370CONFIG_IP_NF_MATCH_RECENT=m
371CONFIG_IP_NF_MATCH_ECN=m
372CONFIG_IP_NF_MATCH_AH=m
373CONFIG_IP_NF_MATCH_TTL=m
374CONFIG_IP_NF_MATCH_OWNER=m
375CONFIG_IP_NF_MATCH_ADDRTYPE=m
376CONFIG_IP_NF_FILTER=m
377CONFIG_IP_NF_TARGET_REJECT=m
378CONFIG_IP_NF_TARGET_LOG=m
379CONFIG_IP_NF_TARGET_ULOG=m
380CONFIG_NF_NAT=m
381CONFIG_NF_NAT_NEEDED=y
382CONFIG_IP_NF_TARGET_MASQUERADE=m
383CONFIG_IP_NF_TARGET_REDIRECT=m
384CONFIG_IP_NF_TARGET_NETMAP=m
385CONFIG_IP_NF_TARGET_SAME=m
386CONFIG_NF_NAT_SNMP_BASIC=m
387CONFIG_NF_NAT_FTP=m
388CONFIG_NF_NAT_IRC=m
389CONFIG_NF_NAT_TFTP=m
390# CONFIG_NF_NAT_AMANDA is not set
391# CONFIG_NF_NAT_PPTP is not set
392# CONFIG_NF_NAT_H323 is not set
393# CONFIG_NF_NAT_SIP is not set
394# CONFIG_IP_NF_MANGLE is not set
395# CONFIG_IP_NF_RAW is not set
396# CONFIG_IP_NF_ARPTABLES is not set
329# CONFIG_IP_DCCP is not set 397# CONFIG_IP_DCCP is not set
330
331#
332# SCTP Configuration (EXPERIMENTAL)
333#
334# CONFIG_IP_SCTP is not set 398# CONFIG_IP_SCTP is not set
335
336#
337# TIPC Configuration (EXPERIMENTAL)
338#
339# CONFIG_TIPC is not set 399# CONFIG_TIPC is not set
340# CONFIG_ATM is not set 400# CONFIG_ATM is not set
341# CONFIG_BRIDGE is not set 401# CONFIG_BRIDGE is not set
@@ -354,6 +414,7 @@ CONFIG_LLC=y
354# QoS and/or fair queueing 414# QoS and/or fair queueing
355# 415#
356# CONFIG_NET_SCHED is not set 416# CONFIG_NET_SCHED is not set
417CONFIG_NET_CLS_ROUTE=y
357 418
358# 419#
359# Network testing 420# Network testing
@@ -363,7 +424,16 @@ CONFIG_LLC=y
363# CONFIG_HAMRADIO is not set 424# CONFIG_HAMRADIO is not set
364# CONFIG_IRDA is not set 425# CONFIG_IRDA is not set
365# CONFIG_BT is not set 426# CONFIG_BT is not set
427# CONFIG_AF_RXRPC is not set
428
429#
430# Wireless
431#
432# CONFIG_CFG80211 is not set
433# CONFIG_WIRELESS_EXT is not set
434# CONFIG_MAC80211 is not set
366# CONFIG_IEEE80211 is not set 435# CONFIG_IEEE80211 is not set
436# CONFIG_RFKILL is not set
367 437
368# 438#
369# Device Drivers 439# Device Drivers
@@ -376,16 +446,13 @@ CONFIG_STANDALONE=y
376CONFIG_PREVENT_FIRMWARE_BUILD=y 446CONFIG_PREVENT_FIRMWARE_BUILD=y
377CONFIG_FW_LOADER=y 447CONFIG_FW_LOADER=y
378# CONFIG_DEBUG_DRIVER is not set 448# CONFIG_DEBUG_DRIVER is not set
449# CONFIG_DEBUG_DEVRES is not set
379# CONFIG_SYS_HYPERVISOR is not set 450# CONFIG_SYS_HYPERVISOR is not set
380 451
381# 452#
382# Connector - unified userspace <-> kernelspace linker 453# Connector - unified userspace <-> kernelspace linker
383# 454#
384# CONFIG_CONNECTOR is not set 455# CONFIG_CONNECTOR is not set
385
386#
387# Memory Technology Devices (MTD)
388#
389# CONFIG_MTD is not set 456# CONFIG_MTD is not set
390 457
391# 458#
@@ -403,6 +470,7 @@ CONFIG_PARPORT_PC=m
403# 470#
404# Plug and Play support 471# Plug and Play support
405# 472#
473# CONFIG_PNPACPI is not set
406 474
407# 475#
408# Block devices 476# Block devices
@@ -423,19 +491,16 @@ CONFIG_BLK_DEV_RAM=y
423CONFIG_BLK_DEV_RAM_COUNT=16 491CONFIG_BLK_DEV_RAM_COUNT=16
424CONFIG_BLK_DEV_RAM_SIZE=65536 492CONFIG_BLK_DEV_RAM_SIZE=65536
425CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 493CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
426CONFIG_BLK_DEV_INITRD=y
427# CONFIG_CDROM_PKTCDVD is not set 494# CONFIG_CDROM_PKTCDVD is not set
428# CONFIG_ATA_OVER_ETH is not set 495# CONFIG_ATA_OVER_ETH is not set
429 496
430# 497#
431# Misc devices 498# Misc devices
432# 499#
500# CONFIG_PHANTOM is not set
433# CONFIG_SGI_IOC4 is not set 501# CONFIG_SGI_IOC4 is not set
434# CONFIG_TIFM_CORE is not set 502# CONFIG_TIFM_CORE is not set
435 503# CONFIG_BLINK is not set
436#
437# ATA/ATAPI/MFM/RLL support
438#
439CONFIG_IDE=y 504CONFIG_IDE=y
440CONFIG_BLK_DEV_IDE=y 505CONFIG_BLK_DEV_IDE=y
441 506
@@ -450,6 +515,7 @@ CONFIG_BLK_DEV_IDECD=y
450# CONFIG_BLK_DEV_IDEFLOPPY is not set 515# CONFIG_BLK_DEV_IDEFLOPPY is not set
451# CONFIG_BLK_DEV_IDESCSI is not set 516# CONFIG_BLK_DEV_IDESCSI is not set
452# CONFIG_IDE_TASK_IOCTL is not set 517# CONFIG_IDE_TASK_IOCTL is not set
518CONFIG_IDE_PROC_FS=y
453 519
454# 520#
455# IDE chipset support/bugfixes 521# IDE chipset support/bugfixes
@@ -457,12 +523,12 @@ CONFIG_BLK_DEV_IDECD=y
457CONFIG_IDE_GENERIC=y 523CONFIG_IDE_GENERIC=y
458CONFIG_BLK_DEV_IDEPCI=y 524CONFIG_BLK_DEV_IDEPCI=y
459CONFIG_IDEPCI_SHARE_IRQ=y 525CONFIG_IDEPCI_SHARE_IRQ=y
526CONFIG_IDEPCI_PCIBUS_ORDER=y
460# CONFIG_BLK_DEV_OFFBOARD is not set 527# CONFIG_BLK_DEV_OFFBOARD is not set
461CONFIG_BLK_DEV_GENERIC=y 528CONFIG_BLK_DEV_GENERIC=y
462# CONFIG_BLK_DEV_OPTI621 is not set 529# CONFIG_BLK_DEV_OPTI621 is not set
463CONFIG_BLK_DEV_IDEDMA_PCI=y 530CONFIG_BLK_DEV_IDEDMA_PCI=y
464# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 531# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
465CONFIG_IDEDMA_PCI_AUTO=y
466# CONFIG_IDEDMA_ONLYDISK is not set 532# CONFIG_IDEDMA_ONLYDISK is not set
467# CONFIG_BLK_DEV_AEC62XX is not set 533# CONFIG_BLK_DEV_AEC62XX is not set
468# CONFIG_BLK_DEV_ALI15X3 is not set 534# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -477,6 +543,7 @@ CONFIG_BLK_DEV_AMD74XX=y
477# CONFIG_BLK_DEV_JMICRON is not set 543# CONFIG_BLK_DEV_JMICRON is not set
478# CONFIG_BLK_DEV_SC1200 is not set 544# CONFIG_BLK_DEV_SC1200 is not set
479# CONFIG_BLK_DEV_PIIX is not set 545# CONFIG_BLK_DEV_PIIX is not set
546# CONFIG_BLK_DEV_IT8213 is not set
480# CONFIG_BLK_DEV_IT821X is not set 547# CONFIG_BLK_DEV_IT821X is not set
481# CONFIG_BLK_DEV_NS87415 is not set 548# CONFIG_BLK_DEV_NS87415 is not set
482# CONFIG_BLK_DEV_PDC202XX_OLD is not set 549# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -487,10 +554,10 @@ CONFIG_BLK_DEV_AMD74XX=y
487# CONFIG_BLK_DEV_SLC90E66 is not set 554# CONFIG_BLK_DEV_SLC90E66 is not set
488# CONFIG_BLK_DEV_TRM290 is not set 555# CONFIG_BLK_DEV_TRM290 is not set
489# CONFIG_BLK_DEV_VIA82CXXX is not set 556# CONFIG_BLK_DEV_VIA82CXXX is not set
557# CONFIG_BLK_DEV_TC86C001 is not set
490# CONFIG_IDE_ARM is not set 558# CONFIG_IDE_ARM is not set
491CONFIG_BLK_DEV_IDEDMA=y 559CONFIG_BLK_DEV_IDEDMA=y
492# CONFIG_IDEDMA_IVB is not set 560# CONFIG_IDEDMA_IVB is not set
493CONFIG_IDEDMA_AUTO=y
494# CONFIG_BLK_DEV_HD is not set 561# CONFIG_BLK_DEV_HD is not set
495 562
496# 563#
@@ -520,6 +587,7 @@ CONFIG_SCSI_MULTI_LUN=y
520CONFIG_SCSI_CONSTANTS=y 587CONFIG_SCSI_CONSTANTS=y
521# CONFIG_SCSI_LOGGING is not set 588# CONFIG_SCSI_LOGGING is not set
522# CONFIG_SCSI_SCAN_ASYNC is not set 589# CONFIG_SCSI_SCAN_ASYNC is not set
590CONFIG_SCSI_WAIT_SCAN=m
523 591
524# 592#
525# SCSI Transports 593# SCSI Transports
@@ -575,11 +643,8 @@ CONFIG_SCSI_LPFC=m
575# CONFIG_SCSI_DC390T is not set 643# CONFIG_SCSI_DC390T is not set
576# CONFIG_SCSI_DEBUG is not set 644# CONFIG_SCSI_DEBUG is not set
577# CONFIG_SCSI_SRP is not set 645# CONFIG_SCSI_SRP is not set
578
579#
580# Serial ATA (prod) and Parallel ATA (experimental) drivers
581#
582CONFIG_ATA=y 646CONFIG_ATA=y
647# CONFIG_ATA_NONSTANDARD is not set
583# CONFIG_SATA_AHCI is not set 648# CONFIG_SATA_AHCI is not set
584# CONFIG_SATA_SVW is not set 649# CONFIG_SATA_SVW is not set
585# CONFIG_ATA_PIIX is not set 650# CONFIG_ATA_PIIX is not set
@@ -595,10 +660,12 @@ CONFIG_ATA=y
595# CONFIG_SATA_ULI is not set 660# CONFIG_SATA_ULI is not set
596# CONFIG_SATA_VIA is not set 661# CONFIG_SATA_VIA is not set
597# CONFIG_SATA_VITESSE is not set 662# CONFIG_SATA_VITESSE is not set
663# CONFIG_SATA_INIC162X is not set
598# CONFIG_PATA_ALI is not set 664# CONFIG_PATA_ALI is not set
599# CONFIG_PATA_AMD is not set 665# CONFIG_PATA_AMD is not set
600# CONFIG_PATA_ARTOP is not set 666# CONFIG_PATA_ARTOP is not set
601# CONFIG_PATA_ATIIXP is not set 667# CONFIG_PATA_ATIIXP is not set
668# CONFIG_PATA_CMD640_PCI is not set
602# CONFIG_PATA_CMD64X is not set 669# CONFIG_PATA_CMD64X is not set
603# CONFIG_PATA_CS5520 is not set 670# CONFIG_PATA_CS5520 is not set
604# CONFIG_PATA_CS5530 is not set 671# CONFIG_PATA_CS5530 is not set
@@ -610,6 +677,7 @@ CONFIG_ATA=y
610# CONFIG_PATA_HPT3X2N is not set 677# CONFIG_PATA_HPT3X2N is not set
611# CONFIG_PATA_HPT3X3 is not set 678# CONFIG_PATA_HPT3X3 is not set
612# CONFIG_PATA_IT821X is not set 679# CONFIG_PATA_IT821X is not set
680# CONFIG_PATA_IT8213 is not set
613# CONFIG_PATA_JMICRON is not set 681# CONFIG_PATA_JMICRON is not set
614# CONFIG_PATA_TRIFLEX is not set 682# CONFIG_PATA_TRIFLEX is not set
615# CONFIG_PATA_MARVELL is not set 683# CONFIG_PATA_MARVELL is not set
@@ -650,6 +718,7 @@ CONFIG_DM_MIRROR=m
650CONFIG_DM_ZERO=m 718CONFIG_DM_ZERO=m
651CONFIG_DM_MULTIPATH=m 719CONFIG_DM_MULTIPATH=m
652CONFIG_DM_MULTIPATH_EMC=m 720CONFIG_DM_MULTIPATH_EMC=m
721# CONFIG_DM_DELAY is not set
653 722
654# 723#
655# Fusion MPT device support 724# Fusion MPT device support
@@ -662,18 +731,14 @@ CONFIG_DM_MULTIPATH_EMC=m
662# 731#
663# IEEE 1394 (FireWire) support 732# IEEE 1394 (FireWire) support
664# 733#
734# CONFIG_FIREWIRE is not set
665# CONFIG_IEEE1394 is not set 735# CONFIG_IEEE1394 is not set
666 736
667# 737#
668# I2O device support 738# I2O device support
669# 739#
670# CONFIG_I2O is not set 740# CONFIG_I2O is not set
671 741# CONFIG_MACINTOSH_DRIVERS is not set
672#
673# Macintosh device drivers
674#
675# CONFIG_MAC_EMUMOUSEBTN is not set
676# CONFIG_WINDFARM is not set
677 742
678# 743#
679# Network device support 744# Network device support
@@ -683,15 +748,7 @@ CONFIG_DUMMY=m
683CONFIG_BONDING=m 748CONFIG_BONDING=m
684# CONFIG_EQUALIZER is not set 749# CONFIG_EQUALIZER is not set
685CONFIG_TUN=m 750CONFIG_TUN=m
686
687#
688# ARCnet devices
689#
690# CONFIG_ARCNET is not set 751# CONFIG_ARCNET is not set
691
692#
693# PHY device support
694#
695# CONFIG_PHYLIB is not set 752# CONFIG_PHYLIB is not set
696 753
697# 754#
@@ -731,11 +788,9 @@ CONFIG_E100=y
731# CONFIG_EPIC100 is not set 788# CONFIG_EPIC100 is not set
732# CONFIG_SUNDANCE is not set 789# CONFIG_SUNDANCE is not set
733# CONFIG_VIA_RHINE is not set 790# CONFIG_VIA_RHINE is not set
791# CONFIG_SC92031 is not set
734# CONFIG_NET_POCKET is not set 792# CONFIG_NET_POCKET is not set
735 793CONFIG_NETDEV_1000=y
736#
737# Ethernet (1000 Mbit)
738#
739CONFIG_ACENIC=y 794CONFIG_ACENIC=y
740CONFIG_ACENIC_OMIT_TIGON_I=y 795CONFIG_ACENIC_OMIT_TIGON_I=y
741# CONFIG_DL2K is not set 796# CONFIG_DL2K is not set
@@ -754,11 +809,10 @@ CONFIG_E1000=y
754CONFIG_TIGON3=y 809CONFIG_TIGON3=y
755# CONFIG_BNX2 is not set 810# CONFIG_BNX2 is not set
756# CONFIG_QLA3XXX is not set 811# CONFIG_QLA3XXX is not set
757 812# CONFIG_ATL1 is not set
758# 813CONFIG_NETDEV_10000=y
759# Ethernet (10000 Mbit)
760#
761# CONFIG_CHELSIO_T1 is not set 814# CONFIG_CHELSIO_T1 is not set
815# CONFIG_CHELSIO_T3 is not set
762CONFIG_EHEA=m 816CONFIG_EHEA=m
763CONFIG_IXGB=m 817CONFIG_IXGB=m
764# CONFIG_IXGB_NAPI is not set 818# CONFIG_IXGB_NAPI is not set
@@ -766,23 +820,28 @@ CONFIG_S2IO=m
766# CONFIG_S2IO_NAPI is not set 820# CONFIG_S2IO_NAPI is not set
767# CONFIG_MYRI10GE is not set 821# CONFIG_MYRI10GE is not set
768# CONFIG_NETXEN_NIC is not set 822# CONFIG_NETXEN_NIC is not set
769 823# CONFIG_PASEMI_MAC is not set
770# 824# CONFIG_MLX4_CORE is not set
771# Token Ring devices
772#
773CONFIG_TR=y 825CONFIG_TR=y
774CONFIG_IBMOL=y 826CONFIG_IBMOL=y
775# CONFIG_3C359 is not set 827# CONFIG_3C359 is not set
776# CONFIG_TMS380TR is not set 828# CONFIG_TMS380TR is not set
777 829
778# 830#
779# Wireless LAN (non-hamradio) 831# Wireless LAN
780# 832#
781# CONFIG_NET_RADIO is not set 833# CONFIG_WLAN_PRE80211 is not set
834# CONFIG_WLAN_80211 is not set
782 835
783# 836#
784# Wan interfaces 837# USB Network Adapters
785# 838#
839# CONFIG_USB_CATC is not set
840# CONFIG_USB_KAWETH is not set
841# CONFIG_USB_PEGASUS is not set
842# CONFIG_USB_RTL8150 is not set
843# CONFIG_USB_USBNET_MII is not set
844# CONFIG_USB_USBNET is not set
786# CONFIG_WAN is not set 845# CONFIG_WAN is not set
787# CONFIG_FDDI is not set 846# CONFIG_FDDI is not set
788# CONFIG_HIPPI is not set 847# CONFIG_HIPPI is not set
@@ -802,7 +861,6 @@ CONFIG_SLHC=m
802# CONFIG_SHAPER is not set 861# CONFIG_SHAPER is not set
803CONFIG_NETCONSOLE=y 862CONFIG_NETCONSOLE=y
804CONFIG_NETPOLL=y 863CONFIG_NETPOLL=y
805CONFIG_NETPOLL_RX=y
806CONFIG_NETPOLL_TRAP=y 864CONFIG_NETPOLL_TRAP=y
807CONFIG_NET_POLL_CONTROLLER=y 865CONFIG_NET_POLL_CONTROLLER=y
808 866
@@ -821,6 +879,7 @@ CONFIG_NET_POLL_CONTROLLER=y
821# 879#
822CONFIG_INPUT=y 880CONFIG_INPUT=y
823# CONFIG_INPUT_FF_MEMLESS is not set 881# CONFIG_INPUT_FF_MEMLESS is not set
882# CONFIG_INPUT_POLLDEV is not set
824 883
825# 884#
826# Userland interfaces 885# Userland interfaces
@@ -846,12 +905,25 @@ CONFIG_KEYBOARD_ATKBD=y
846# CONFIG_KEYBOARD_STOWAWAY is not set 905# CONFIG_KEYBOARD_STOWAWAY is not set
847CONFIG_INPUT_MOUSE=y 906CONFIG_INPUT_MOUSE=y
848CONFIG_MOUSE_PS2=y 907CONFIG_MOUSE_PS2=y
908CONFIG_MOUSE_PS2_ALPS=y
909CONFIG_MOUSE_PS2_LOGIPS2PP=y
910CONFIG_MOUSE_PS2_SYNAPTICS=y
911CONFIG_MOUSE_PS2_LIFEBOOK=y
912CONFIG_MOUSE_PS2_TRACKPOINT=y
913# CONFIG_MOUSE_PS2_TOUCHKIT is not set
849# CONFIG_MOUSE_SERIAL is not set 914# CONFIG_MOUSE_SERIAL is not set
915# CONFIG_MOUSE_APPLETOUCH is not set
850# CONFIG_MOUSE_VSXXXAA is not set 916# CONFIG_MOUSE_VSXXXAA is not set
851# CONFIG_INPUT_JOYSTICK is not set 917# CONFIG_INPUT_JOYSTICK is not set
918# CONFIG_INPUT_TABLET is not set
852# CONFIG_INPUT_TOUCHSCREEN is not set 919# CONFIG_INPUT_TOUCHSCREEN is not set
853CONFIG_INPUT_MISC=y 920CONFIG_INPUT_MISC=y
854CONFIG_INPUT_PCSPKR=m 921CONFIG_INPUT_PCSPKR=m
922# CONFIG_INPUT_ATI_REMOTE is not set
923# CONFIG_INPUT_ATI_REMOTE2 is not set
924# CONFIG_INPUT_KEYSPAN_REMOTE is not set
925# CONFIG_INPUT_POWERMATE is not set
926# CONFIG_INPUT_YEALINK is not set
855# CONFIG_INPUT_UINPUT is not set 927# CONFIG_INPUT_UINPUT is not set
856 928
857# 929#
@@ -892,6 +964,7 @@ CONFIG_SERIAL_CORE=y
892CONFIG_SERIAL_CORE_CONSOLE=y 964CONFIG_SERIAL_CORE_CONSOLE=y
893CONFIG_SERIAL_ICOM=m 965CONFIG_SERIAL_ICOM=m
894CONFIG_SERIAL_JSM=m 966CONFIG_SERIAL_JSM=m
967# CONFIG_SERIAL_OF_PLATFORM is not set
895CONFIG_UNIX98_PTYS=y 968CONFIG_UNIX98_PTYS=y
896CONFIG_LEGACY_PTYS=y 969CONFIG_LEGACY_PTYS=y
897CONFIG_LEGACY_PTY_COUNT=256 970CONFIG_LEGACY_PTY_COUNT=256
@@ -907,15 +980,10 @@ CONFIG_HVCS=m
907# IPMI 980# IPMI
908# 981#
909# CONFIG_IPMI_HANDLER is not set 982# CONFIG_IPMI_HANDLER is not set
910
911#
912# Watchdog Cards
913#
914# CONFIG_WATCHDOG is not set 983# CONFIG_WATCHDOG is not set
915# CONFIG_HW_RANDOM is not set 984# CONFIG_HW_RANDOM is not set
916CONFIG_GEN_RTC=y 985CONFIG_GEN_RTC=y
917# CONFIG_GEN_RTC_X is not set 986# CONFIG_GEN_RTC_X is not set
918# CONFIG_DTLK is not set
919# CONFIG_R3964 is not set 987# CONFIG_R3964 is not set
920# CONFIG_APPLICOM is not set 988# CONFIG_APPLICOM is not set
921# CONFIG_AGP is not set 989# CONFIG_AGP is not set
@@ -928,11 +996,9 @@ CONFIG_MAX_RAW_DEVS=1024
928# TPM devices 996# TPM devices
929# 997#
930# CONFIG_TCG_TPM is not set 998# CONFIG_TCG_TPM is not set
931 999CONFIG_DEVPORT=y
932#
933# I2C support
934#
935CONFIG_I2C=y 1000CONFIG_I2C=y
1001CONFIG_I2C_BOARDINFO=y
936# CONFIG_I2C_CHARDEV is not set 1002# CONFIG_I2C_CHARDEV is not set
937 1003
938# 1004#
@@ -959,14 +1025,15 @@ CONFIG_I2C_ALGOBIT=y
959# CONFIG_I2C_PARPORT_LIGHT is not set 1025# CONFIG_I2C_PARPORT_LIGHT is not set
960# CONFIG_I2C_PROSAVAGE is not set 1026# CONFIG_I2C_PROSAVAGE is not set
961# CONFIG_I2C_SAVAGE4 is not set 1027# CONFIG_I2C_SAVAGE4 is not set
1028# CONFIG_I2C_SIMTEC is not set
962# CONFIG_I2C_SIS5595 is not set 1029# CONFIG_I2C_SIS5595 is not set
963# CONFIG_I2C_SIS630 is not set 1030# CONFIG_I2C_SIS630 is not set
964# CONFIG_I2C_SIS96X is not set 1031# CONFIG_I2C_SIS96X is not set
965# CONFIG_I2C_STUB is not set 1032# CONFIG_I2C_STUB is not set
1033# CONFIG_I2C_TINY_USB is not set
966# CONFIG_I2C_VIA is not set 1034# CONFIG_I2C_VIA is not set
967# CONFIG_I2C_VIAPRO is not set 1035# CONFIG_I2C_VIAPRO is not set
968# CONFIG_I2C_VOODOO3 is not set 1036# CONFIG_I2C_VOODOO3 is not set
969# CONFIG_I2C_PCA_ISA is not set
970 1037
971# 1038#
972# Miscellaneous I2C Chip support 1039# Miscellaneous I2C Chip support
@@ -993,37 +1060,56 @@ CONFIG_I2C_ALGOBIT=y
993# Dallas's 1-wire bus 1060# Dallas's 1-wire bus
994# 1061#
995# CONFIG_W1 is not set 1062# CONFIG_W1 is not set
1063# CONFIG_HWMON is not set
996 1064
997# 1065#
998# Hardware Monitoring support 1066# Multifunction device drivers
999# 1067#
1000# CONFIG_HWMON is not set 1068# CONFIG_MFD_SM501 is not set
1001# CONFIG_HWMON_VID is not set
1002 1069
1003# 1070#
1004# Multimedia devices 1071# Multimedia devices
1005# 1072#
1006# CONFIG_VIDEO_DEV is not set 1073# CONFIG_VIDEO_DEV is not set
1074# CONFIG_DVB_CORE is not set
1075# CONFIG_DAB is not set
1007 1076
1008# 1077#
1009# Digital Video Broadcasting Devices 1078# Graphics support
1010# 1079#
1011# CONFIG_DVB is not set 1080CONFIG_BACKLIGHT_LCD_SUPPORT=y
1012# CONFIG_USB_DABUSB is not set 1081CONFIG_BACKLIGHT_CLASS_DEVICE=y
1082CONFIG_LCD_CLASS_DEVICE=m
1013 1083
1014# 1084#
1015# Graphics support 1085# Display device support
1016# 1086#
1017CONFIG_FIRMWARE_EDID=y 1087CONFIG_DISPLAY_SUPPORT=y
1088
1089#
1090# Display hardware drivers
1091#
1092# CONFIG_VGASTATE is not set
1018CONFIG_FB=y 1093CONFIG_FB=y
1094CONFIG_FIRMWARE_EDID=y
1019CONFIG_FB_DDC=y 1095CONFIG_FB_DDC=y
1020CONFIG_FB_CFB_FILLRECT=y 1096CONFIG_FB_CFB_FILLRECT=y
1021CONFIG_FB_CFB_COPYAREA=y 1097CONFIG_FB_CFB_COPYAREA=y
1022CONFIG_FB_CFB_IMAGEBLIT=y 1098CONFIG_FB_CFB_IMAGEBLIT=y
1099# CONFIG_FB_SYS_FILLRECT is not set
1100# CONFIG_FB_SYS_COPYAREA is not set
1101# CONFIG_FB_SYS_IMAGEBLIT is not set
1102# CONFIG_FB_SYS_FOPS is not set
1103CONFIG_FB_DEFERRED_IO=y
1104# CONFIG_FB_SVGALIB is not set
1023CONFIG_FB_MACMODES=y 1105CONFIG_FB_MACMODES=y
1024# CONFIG_FB_BACKLIGHT is not set 1106CONFIG_FB_BACKLIGHT=y
1025CONFIG_FB_MODE_HELPERS=y 1107CONFIG_FB_MODE_HELPERS=y
1026CONFIG_FB_TILEBLITTING=y 1108CONFIG_FB_TILEBLITTING=y
1109
1110#
1111# Frame buffer hardware drivers
1112#
1027# CONFIG_FB_CIRRUS is not set 1113# CONFIG_FB_CIRRUS is not set
1028# CONFIG_FB_PM2 is not set 1114# CONFIG_FB_PM2 is not set
1029# CONFIG_FB_CYBER2000 is not set 1115# CONFIG_FB_CYBER2000 is not set
@@ -1042,16 +1128,21 @@ CONFIG_FB_MATROX_G=y
1042CONFIG_FB_MATROX_MULTIHEAD=y 1128CONFIG_FB_MATROX_MULTIHEAD=y
1043CONFIG_FB_RADEON=y 1129CONFIG_FB_RADEON=y
1044CONFIG_FB_RADEON_I2C=y 1130CONFIG_FB_RADEON_I2C=y
1131CONFIG_FB_RADEON_BACKLIGHT=y
1045# CONFIG_FB_RADEON_DEBUG is not set 1132# CONFIG_FB_RADEON_DEBUG is not set
1046# CONFIG_FB_ATY128 is not set 1133# CONFIG_FB_ATY128 is not set
1047# CONFIG_FB_ATY is not set 1134# CONFIG_FB_ATY is not set
1135# CONFIG_FB_S3 is not set
1048# CONFIG_FB_SAVAGE is not set 1136# CONFIG_FB_SAVAGE is not set
1049# CONFIG_FB_SIS is not set 1137# CONFIG_FB_SIS is not set
1050# CONFIG_FB_NEOMAGIC is not set 1138# CONFIG_FB_NEOMAGIC is not set
1051# CONFIG_FB_KYRO is not set 1139# CONFIG_FB_KYRO is not set
1052# CONFIG_FB_3DFX is not set 1140# CONFIG_FB_3DFX is not set
1053# CONFIG_FB_VOODOO1 is not set 1141# CONFIG_FB_VOODOO1 is not set
1142# CONFIG_FB_VT8623 is not set
1054# CONFIG_FB_TRIDENT is not set 1143# CONFIG_FB_TRIDENT is not set
1144# CONFIG_FB_ARK is not set
1145# CONFIG_FB_PM3 is not set
1055CONFIG_FB_IBM_GXT4500=y 1146CONFIG_FB_IBM_GXT4500=y
1056# CONFIG_FB_VIRTUAL is not set 1147# CONFIG_FB_VIRTUAL is not set
1057 1148
@@ -1065,19 +1156,10 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
1065# CONFIG_FONTS is not set 1156# CONFIG_FONTS is not set
1066CONFIG_FONT_8x8=y 1157CONFIG_FONT_8x8=y
1067CONFIG_FONT_8x16=y 1158CONFIG_FONT_8x16=y
1068
1069#
1070# Logo configuration
1071#
1072CONFIG_LOGO=y 1159CONFIG_LOGO=y
1073CONFIG_LOGO_LINUX_MONO=y 1160CONFIG_LOGO_LINUX_MONO=y
1074CONFIG_LOGO_LINUX_VGA16=y 1161CONFIG_LOGO_LINUX_VGA16=y
1075CONFIG_LOGO_LINUX_CLUT224=y 1162CONFIG_LOGO_LINUX_CLUT224=y
1076CONFIG_BACKLIGHT_LCD_SUPPORT=y
1077CONFIG_BACKLIGHT_CLASS_DEVICE=m
1078CONFIG_BACKLIGHT_DEVICE=y
1079CONFIG_LCD_CLASS_DEVICE=m
1080CONFIG_LCD_DEVICE=y
1081 1163
1082# 1164#
1083# Sound 1165# Sound
@@ -1088,6 +1170,15 @@ CONFIG_LCD_DEVICE=y
1088# HID Devices 1170# HID Devices
1089# 1171#
1090CONFIG_HID=y 1172CONFIG_HID=y
1173# CONFIG_HID_DEBUG is not set
1174
1175#
1176# USB Input Devices
1177#
1178CONFIG_USB_HID=y
1179# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1180# CONFIG_HID_FF is not set
1181CONFIG_USB_HIDDEV=y
1091 1182
1092# 1183#
1093# USB support 1184# USB support
@@ -1102,9 +1193,8 @@ CONFIG_USB=y
1102# Miscellaneous USB options 1193# Miscellaneous USB options
1103# 1194#
1104CONFIG_USB_DEVICEFS=y 1195CONFIG_USB_DEVICEFS=y
1105# CONFIG_USB_BANDWIDTH is not set 1196CONFIG_USB_DEVICE_CLASS=y
1106# CONFIG_USB_DYNAMIC_MINORS is not set 1197# CONFIG_USB_DYNAMIC_MINORS is not set
1107# CONFIG_USB_MULTITHREAD_PROBE is not set
1108# CONFIG_USB_OTG is not set 1198# CONFIG_USB_OTG is not set
1109 1199
1110# 1200#
@@ -1114,9 +1204,12 @@ CONFIG_USB_EHCI_HCD=y
1114# CONFIG_USB_EHCI_SPLIT_ISO is not set 1204# CONFIG_USB_EHCI_SPLIT_ISO is not set
1115# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1205# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1116# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1206# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1207# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1117# CONFIG_USB_ISP116X_HCD is not set 1208# CONFIG_USB_ISP116X_HCD is not set
1118CONFIG_USB_OHCI_HCD=y 1209CONFIG_USB_OHCI_HCD=y
1119# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1210# CONFIG_USB_OHCI_HCD_PPC_OF is not set
1211# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1212# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1120CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1213CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1121# CONFIG_USB_UHCI_HCD is not set 1214# CONFIG_USB_UHCI_HCD is not set
1122# CONFIG_USB_SL811_HCD is not set 1215# CONFIG_USB_SL811_HCD is not set
@@ -1149,40 +1242,10 @@ CONFIG_USB_STORAGE=y
1149# CONFIG_USB_LIBUSUAL is not set 1242# CONFIG_USB_LIBUSUAL is not set
1150 1243
1151# 1244#
1152# USB Input Devices
1153#
1154CONFIG_USB_HID=y
1155# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1156# CONFIG_HID_FF is not set
1157CONFIG_USB_HIDDEV=y
1158# CONFIG_USB_AIPTEK is not set
1159# CONFIG_USB_WACOM is not set
1160# CONFIG_USB_ACECAD is not set
1161# CONFIG_USB_KBTAB is not set
1162# CONFIG_USB_POWERMATE is not set
1163# CONFIG_USB_TOUCHSCREEN is not set
1164# CONFIG_USB_YEALINK is not set
1165# CONFIG_USB_XPAD is not set
1166# CONFIG_USB_ATI_REMOTE is not set
1167# CONFIG_USB_ATI_REMOTE2 is not set
1168# CONFIG_USB_KEYSPAN_REMOTE is not set
1169# CONFIG_USB_APPLETOUCH is not set
1170
1171#
1172# USB Imaging devices 1245# USB Imaging devices
1173# 1246#
1174# CONFIG_USB_MDC800 is not set 1247# CONFIG_USB_MDC800 is not set
1175# CONFIG_USB_MICROTEK is not set 1248# CONFIG_USB_MICROTEK is not set
1176
1177#
1178# USB Network Adapters
1179#
1180# CONFIG_USB_CATC is not set
1181# CONFIG_USB_KAWETH is not set
1182# CONFIG_USB_PEGASUS is not set
1183# CONFIG_USB_RTL8150 is not set
1184# CONFIG_USB_USBNET_MII is not set
1185# CONFIG_USB_USBNET is not set
1186CONFIG_USB_MON=y 1249CONFIG_USB_MON=y
1187 1250
1188# 1251#
@@ -1205,6 +1268,7 @@ CONFIG_USB_MON=y
1205# CONFIG_USB_RIO500 is not set 1268# CONFIG_USB_RIO500 is not set
1206# CONFIG_USB_LEGOTOWER is not set 1269# CONFIG_USB_LEGOTOWER is not set
1207# CONFIG_USB_LCD is not set 1270# CONFIG_USB_LCD is not set
1271# CONFIG_USB_BERRY_CHARGE is not set
1208# CONFIG_USB_LED is not set 1272# CONFIG_USB_LED is not set
1209# CONFIG_USB_CYPRESS_CY7C63 is not set 1273# CONFIG_USB_CYPRESS_CY7C63 is not set
1210# CONFIG_USB_CYTHERM is not set 1274# CONFIG_USB_CYTHERM is not set
@@ -1215,6 +1279,7 @@ CONFIG_USB_MON=y
1215# CONFIG_USB_SISUSBVGA is not set 1279# CONFIG_USB_SISUSBVGA is not set
1216# CONFIG_USB_LD is not set 1280# CONFIG_USB_LD is not set
1217# CONFIG_USB_TRANCEVIBRATOR is not set 1281# CONFIG_USB_TRANCEVIBRATOR is not set
1282# CONFIG_USB_IOWARRIOR is not set
1218# CONFIG_USB_TEST is not set 1283# CONFIG_USB_TEST is not set
1219 1284
1220# 1285#
@@ -1225,10 +1290,6 @@ CONFIG_USB_MON=y
1225# USB Gadget Support 1290# USB Gadget Support
1226# 1291#
1227# CONFIG_USB_GADGET is not set 1292# CONFIG_USB_GADGET is not set
1228
1229#
1230# MMC/SD Card support
1231#
1232# CONFIG_MMC is not set 1293# CONFIG_MMC is not set
1233 1294
1234# 1295#
@@ -1250,13 +1311,16 @@ CONFIG_USB_MON=y
1250CONFIG_INFINIBAND=m 1311CONFIG_INFINIBAND=m
1251CONFIG_INFINIBAND_USER_MAD=m 1312CONFIG_INFINIBAND_USER_MAD=m
1252CONFIG_INFINIBAND_USER_ACCESS=m 1313CONFIG_INFINIBAND_USER_ACCESS=m
1314CONFIG_INFINIBAND_USER_MEM=y
1253CONFIG_INFINIBAND_ADDR_TRANS=y 1315CONFIG_INFINIBAND_ADDR_TRANS=y
1254CONFIG_INFINIBAND_MTHCA=m 1316CONFIG_INFINIBAND_MTHCA=m
1255CONFIG_INFINIBAND_MTHCA_DEBUG=y 1317CONFIG_INFINIBAND_MTHCA_DEBUG=y
1318# CONFIG_INFINIBAND_IPATH is not set
1256CONFIG_INFINIBAND_EHCA=m 1319CONFIG_INFINIBAND_EHCA=m
1257CONFIG_INFINIBAND_EHCA_SCALING=y
1258# CONFIG_INFINIBAND_AMSO1100 is not set 1320# CONFIG_INFINIBAND_AMSO1100 is not set
1321# CONFIG_MLX4_INFINIBAND is not set
1259CONFIG_INFINIBAND_IPOIB=m 1322CONFIG_INFINIBAND_IPOIB=m
1323# CONFIG_INFINIBAND_IPOIB_CM is not set
1260CONFIG_INFINIBAND_IPOIB_DEBUG=y 1324CONFIG_INFINIBAND_IPOIB_DEBUG=y
1261# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set 1325# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1262CONFIG_INFINIBAND_SRP=m 1326CONFIG_INFINIBAND_SRP=m
@@ -1285,8 +1349,9 @@ CONFIG_INFINIBAND_SRP=m
1285# 1349#
1286 1350
1287# 1351#
1288# Virtualization 1352# Auxiliary Display support
1289# 1353#
1354# CONFIG_KS0108 is not set
1290 1355
1291# 1356#
1292# File systems 1357# File systems
@@ -1341,7 +1406,6 @@ CONFIG_FUSE_FS=m
1341CONFIG_ISO9660_FS=y 1406CONFIG_ISO9660_FS=y
1342CONFIG_JOLIET=y 1407CONFIG_JOLIET=y
1343CONFIG_ZISOFS=y 1408CONFIG_ZISOFS=y
1344CONFIG_ZISOFS_FS=y
1345CONFIG_UDF_FS=m 1409CONFIG_UDF_FS=m
1346CONFIG_UDF_NLS=y 1410CONFIG_UDF_NLS=y
1347 1411
@@ -1407,6 +1471,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1407CONFIG_NFS_COMMON=y 1471CONFIG_NFS_COMMON=y
1408CONFIG_SUNRPC=y 1472CONFIG_SUNRPC=y
1409CONFIG_SUNRPC_GSS=y 1473CONFIG_SUNRPC_GSS=y
1474# CONFIG_SUNRPC_BIND34 is not set
1410CONFIG_RPCSEC_GSS_KRB5=y 1475CONFIG_RPCSEC_GSS_KRB5=y
1411CONFIG_RPCSEC_GSS_SPKM3=m 1476CONFIG_RPCSEC_GSS_SPKM3=m
1412# CONFIG_SMB_FS is not set 1477# CONFIG_SMB_FS is not set
@@ -1476,6 +1541,7 @@ CONFIG_NLS_ISO8859_1=y
1476# Distributed Lock Manager 1541# Distributed Lock Manager
1477# 1542#
1478# CONFIG_DLM is not set 1543# CONFIG_DLM is not set
1544# CONFIG_UCC_SLOW is not set
1479 1545
1480# 1546#
1481# Library routines 1547# Library routines
@@ -1483,12 +1549,19 @@ CONFIG_NLS_ISO8859_1=y
1483CONFIG_BITREVERSE=y 1549CONFIG_BITREVERSE=y
1484CONFIG_CRC_CCITT=m 1550CONFIG_CRC_CCITT=m
1485# CONFIG_CRC16 is not set 1551# CONFIG_CRC16 is not set
1552# CONFIG_CRC_ITU_T is not set
1486CONFIG_CRC32=y 1553CONFIG_CRC32=y
1487CONFIG_LIBCRC32C=m 1554CONFIG_LIBCRC32C=m
1488CONFIG_ZLIB_INFLATE=y 1555CONFIG_ZLIB_INFLATE=y
1489CONFIG_ZLIB_DEFLATE=m 1556CONFIG_ZLIB_DEFLATE=m
1557CONFIG_TEXTSEARCH=y
1558CONFIG_TEXTSEARCH_KMP=m
1559CONFIG_TEXTSEARCH_BM=m
1560CONFIG_TEXTSEARCH_FSM=m
1490CONFIG_PLIST=y 1561CONFIG_PLIST=y
1491CONFIG_IOMAP_COPY=y 1562CONFIG_HAS_IOMEM=y
1563CONFIG_HAS_IOPORT=y
1564CONFIG_HAS_DMA=y
1492 1565
1493# 1566#
1494# Instrumentation Support 1567# Instrumentation Support
@@ -1507,15 +1580,15 @@ CONFIG_MAGIC_SYSRQ=y
1507CONFIG_DEBUG_FS=y 1580CONFIG_DEBUG_FS=y
1508# CONFIG_HEADERS_CHECK is not set 1581# CONFIG_HEADERS_CHECK is not set
1509CONFIG_DEBUG_KERNEL=y 1582CONFIG_DEBUG_KERNEL=y
1510CONFIG_LOG_BUF_SHIFT=17 1583# CONFIG_DEBUG_SHIRQ is not set
1511CONFIG_DETECT_SOFTLOCKUP=y 1584CONFIG_DETECT_SOFTLOCKUP=y
1512# CONFIG_SCHEDSTATS is not set 1585# CONFIG_SCHEDSTATS is not set
1586# CONFIG_TIMER_STATS is not set
1513# CONFIG_DEBUG_SLAB is not set 1587# CONFIG_DEBUG_SLAB is not set
1514# CONFIG_DEBUG_RT_MUTEXES is not set 1588# CONFIG_DEBUG_RT_MUTEXES is not set
1515# CONFIG_RT_MUTEX_TESTER is not set 1589# CONFIG_RT_MUTEX_TESTER is not set
1516# CONFIG_DEBUG_SPINLOCK is not set 1590# CONFIG_DEBUG_SPINLOCK is not set
1517# CONFIG_DEBUG_MUTEXES is not set 1591# CONFIG_DEBUG_MUTEXES is not set
1518# CONFIG_DEBUG_RWSEMS is not set
1519# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1592# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1520# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1593# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1521# CONFIG_DEBUG_KOBJECT is not set 1594# CONFIG_DEBUG_KOBJECT is not set
@@ -1526,8 +1599,10 @@ CONFIG_DEBUG_BUGVERBOSE=y
1526CONFIG_FORCED_INLINING=y 1599CONFIG_FORCED_INLINING=y
1527# CONFIG_RCU_TORTURE_TEST is not set 1600# CONFIG_RCU_TORTURE_TEST is not set
1528# CONFIG_LKDTM is not set 1601# CONFIG_LKDTM is not set
1602# CONFIG_FAULT_INJECTION is not set
1529CONFIG_DEBUG_STACKOVERFLOW=y 1603CONFIG_DEBUG_STACKOVERFLOW=y
1530# CONFIG_DEBUG_STACK_USAGE is not set 1604# CONFIG_DEBUG_STACK_USAGE is not set
1605# CONFIG_DEBUG_PAGEALLOC is not set
1531CONFIG_HCALL_STATS=y 1606CONFIG_HCALL_STATS=y
1532CONFIG_DEBUGGER=y 1607CONFIG_DEBUGGER=y
1533CONFIG_XMON=y 1608CONFIG_XMON=y
@@ -1564,8 +1639,11 @@ CONFIG_CRYPTO_TGR192=m
1564# CONFIG_CRYPTO_GF128MUL is not set 1639# CONFIG_CRYPTO_GF128MUL is not set
1565CONFIG_CRYPTO_ECB=m 1640CONFIG_CRYPTO_ECB=m
1566CONFIG_CRYPTO_CBC=y 1641CONFIG_CRYPTO_CBC=y
1642CONFIG_CRYPTO_PCBC=m
1567# CONFIG_CRYPTO_LRW is not set 1643# CONFIG_CRYPTO_LRW is not set
1644# CONFIG_CRYPTO_CRYPTD is not set
1568CONFIG_CRYPTO_DES=y 1645CONFIG_CRYPTO_DES=y
1646# CONFIG_CRYPTO_FCRYPT is not set
1569CONFIG_CRYPTO_BLOWFISH=m 1647CONFIG_CRYPTO_BLOWFISH=m
1570CONFIG_CRYPTO_TWOFISH=m 1648CONFIG_CRYPTO_TWOFISH=m
1571CONFIG_CRYPTO_TWOFISH_COMMON=m 1649CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1580,6 +1658,7 @@ CONFIG_CRYPTO_ANUBIS=m
1580CONFIG_CRYPTO_DEFLATE=m 1658CONFIG_CRYPTO_DEFLATE=m
1581CONFIG_CRYPTO_MICHAEL_MIC=m 1659CONFIG_CRYPTO_MICHAEL_MIC=m
1582CONFIG_CRYPTO_CRC32C=m 1660CONFIG_CRYPTO_CRC32C=m
1661# CONFIG_CRYPTO_CAMELLIA is not set
1583CONFIG_CRYPTO_TEST=m 1662CONFIG_CRYPTO_TEST=m
1584 1663
1585# 1664#
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 1ce0ae3f6ffc..b27e26852fdb 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -176,6 +176,13 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
176 */ 176 */
177 discard_lazy_cpu_state(); 177 discard_lazy_cpu_state();
178 178
179 /*
180 * Force reload of FP/VEC.
181 * This has to be done before copying stuff into current->thread.fpr/vr
182 * for the reasons explained in the previous comment.
183 */
184 regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
185
179 err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE); 186 err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE);
180 187
181#ifdef CONFIG_ALTIVEC 188#ifdef CONFIG_ALTIVEC
@@ -197,9 +204,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
197 current->thread.vrsave = 0; 204 current->thread.vrsave = 0;
198#endif /* CONFIG_ALTIVEC */ 205#endif /* CONFIG_ALTIVEC */
199 206
200 /* Force reload of FP/VEC */
201 regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
202
203 return err; 207 return err;
204} 208}
205 209
diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S
index 05909f754307..72ca26df457e 100644
--- a/arch/powerpc/kernel/vdso32/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso32/gettimeofday.S
@@ -32,6 +32,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
32 mr r11,r4 /* r11 saves tz */ 32 mr r11,r4 /* r11 saves tz */
33 bl __get_datapage@local /* get data page */ 33 bl __get_datapage@local /* get data page */
34 mr r9, r3 /* datapage ptr in r9 */ 34 mr r9, r3 /* datapage ptr in r9 */
35 cmplwi r10,0 /* check if tv is NULL */
36 beq 3f
35 bl __do_get_xsec@local /* get xsec from tb & kernel */ 37 bl __do_get_xsec@local /* get xsec from tb & kernel */
36 bne- 2f /* out of line -> do syscall */ 38 bne- 2f /* out of line -> do syscall */
37 39
@@ -50,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
50 mulhwu r5,r5,r6 52 mulhwu r5,r5,r6
51 stw r5,TVAL32_TV_USEC(r10) 53 stw r5,TVAL32_TV_USEC(r10)
52 54
53 cmpli cr0,r11,0 /* check if tz is NULL */ 553: cmplwi r11,0 /* check if tz is NULL */
54 beq 1f 56 beq 1f
55 lwz r4,CFG_TZ_MINUTEWEST(r9)/* fill tz */ 57 lwz r4,CFG_TZ_MINUTEWEST(r9)/* fill tz */
56 lwz r5,CFG_TZ_DSTTIME(r9) 58 lwz r5,CFG_TZ_DSTTIME(r9)
diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S
index 40ffd9b6cef7..2d7a5104c666 100644
--- a/arch/powerpc/kernel/vdso64/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso64/gettimeofday.S
@@ -1,5 +1,4 @@
1 1/*
2 /*
3 * Userland implementation of gettimeofday() for 64 bits processes in a 2 * Userland implementation of gettimeofday() for 64 bits processes in a
4 * ppc64 kernel for use in the vDSO 3 * ppc64 kernel for use in the vDSO
5 * 4 *
@@ -32,6 +31,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
32 mr r11,r3 /* r11 holds tv */ 31 mr r11,r3 /* r11 holds tv */
33 mr r10,r4 /* r10 holds tz */ 32 mr r10,r4 /* r10 holds tz */
34 bl V_LOCAL_FUNC(__get_datapage) /* get data page */ 33 bl V_LOCAL_FUNC(__get_datapage) /* get data page */
34 cmpldi r10,0 /* check if tv is NULL */
35 beq 2f
35 bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */ 36 bl V_LOCAL_FUNC(__do_get_xsec) /* get xsec from tb & kernel */
36 lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */ 37 lis r7,15 /* r7 = 1000000 = USEC_PER_SEC */
37 ori r7,r7,16960 38 ori r7,r7,16960
@@ -43,8 +44,8 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
43 * XSEC_PER_SEC 44 * XSEC_PER_SEC
44 */ 45 */
45 rldicl r0,r0,44,20 46 rldicl r0,r0,44,20
46 cmpldi cr0,r10,0 /* check if tz is NULL */
47 std r0,TVAL64_TV_USEC(r11) /* store usec in tv */ 47 std r0,TVAL64_TV_USEC(r11) /* store usec in tv */
482: cmpldi r10,0 /* check if tz is NULL */
48 beq 1f 49 beq 1f
49 lwz r4,CFG_TZ_MINUTEWEST(r3)/* fill tz */ 50 lwz r4,CFG_TZ_MINUTEWEST(r3)/* fill tz */
50 lwz r5,CFG_TZ_DSTTIME(r3) 51 lwz r5,CFG_TZ_DSTTIME(r3)
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index 180ee2933ab9..2f24ea0d723a 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -437,27 +437,26 @@ unsigned long rh_alloc_align(rh_info_t * info, int size, int alignment, const ch
437 struct list_head *l; 437 struct list_head *l;
438 rh_block_t *blk; 438 rh_block_t *blk;
439 rh_block_t *newblk; 439 rh_block_t *newblk;
440 unsigned long start; 440 unsigned long start, sp_size;
441 441
442 /* Validate size, and alignment must be power of two */ 442 /* Validate size, and alignment must be power of two */
443 if (size <= 0 || (alignment & (alignment - 1)) != 0) 443 if (size <= 0 || (alignment & (alignment - 1)) != 0)
444 return (unsigned long) -EINVAL; 444 return (unsigned long) -EINVAL;
445 445
446 /* given alignment larger that default rheap alignment */
447 if (alignment > info->alignment)
448 size += alignment - 1;
449
450 /* Align to configured alignment */ 446 /* Align to configured alignment */
451 size = (size + (info->alignment - 1)) & ~(info->alignment - 1); 447 size = (size + (info->alignment - 1)) & ~(info->alignment - 1);
452 448
453 if (assure_empty(info, 1) < 0) 449 if (assure_empty(info, 2) < 0)
454 return (unsigned long) -ENOMEM; 450 return (unsigned long) -ENOMEM;
455 451
456 blk = NULL; 452 blk = NULL;
457 list_for_each(l, &info->free_list) { 453 list_for_each(l, &info->free_list) {
458 blk = list_entry(l, rh_block_t, list); 454 blk = list_entry(l, rh_block_t, list);
459 if (size <= blk->size) 455 if (size <= blk->size) {
460 break; 456 start = (blk->start + alignment - 1) & ~(alignment - 1);
457 if (start + size <= blk->start + blk->size)
458 break;
459 }
461 blk = NULL; 460 blk = NULL;
462 } 461 }
463 462
@@ -470,25 +469,36 @@ unsigned long rh_alloc_align(rh_info_t * info, int size, int alignment, const ch
470 list_del(&blk->list); 469 list_del(&blk->list);
471 newblk = blk; 470 newblk = blk;
472 } else { 471 } else {
472 /* Fragment caused, split if needed */
473 /* Create block for fragment in the beginning */
474 sp_size = start - blk->start;
475 if (sp_size) {
476 rh_block_t *spblk;
477
478 spblk = get_slot(info);
479 spblk->start = blk->start;
480 spblk->size = sp_size;
481 /* add before the blk */
482 list_add(&spblk->list, blk->list.prev);
483 }
473 newblk = get_slot(info); 484 newblk = get_slot(info);
474 newblk->start = blk->start; 485 newblk->start = start;
475 newblk->size = size; 486 newblk->size = size;
476 487
477 /* blk still in free list, with updated start, size */ 488 /* blk still in free list, with updated start and size
478 blk->start += size; 489 * for fragment in the end */
479 blk->size -= size; 490 blk->start = start + size;
491 blk->size -= sp_size + size;
492 /* No fragment in the end, remove blk */
493 if (blk->size == 0) {
494 list_del(&blk->list);
495 release_slot(info, blk);
496 }
480 } 497 }
481 498
482 newblk->owner = owner; 499 newblk->owner = owner;
483 start = newblk->start;
484 attach_taken_block(info, newblk); 500 attach_taken_block(info, newblk);
485 501
486 /* for larger alignment return fixed up pointer */
487 /* this is no problem with the deallocator since */
488 /* we scan for pointers that lie in the blocks */
489 if (alignment > info->alignment)
490 start = (start + alignment - 1) & ~(alignment - 1);
491
492 return start; 502 return start;
493} 503}
494 504
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index bfe901353142..115b25f50bf8 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -279,14 +279,13 @@ good_area:
279#endif /* CONFIG_8xx */ 279#endif /* CONFIG_8xx */
280 280
281 if (is_exec) { 281 if (is_exec) {
282#ifdef CONFIG_PPC64 282#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
283 /* protection fault */ 283 /* protection fault */
284 if (error_code & DSISR_PROTFAULT) 284 if (error_code & DSISR_PROTFAULT)
285 goto bad_area; 285 goto bad_area;
286 if (!(vma->vm_flags & VM_EXEC)) 286 if (!(vma->vm_flags & VM_EXEC))
287 goto bad_area; 287 goto bad_area;
288#endif 288#else
289#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
290 pte_t *ptep; 289 pte_t *ptep;
291 pmd_t *pmdp; 290 pmd_t *pmdp;
292 291
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 956571526a57..7ccb9236e8b4 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -454,6 +454,9 @@ static int initializing = 1;
454 454
455static int pmac_late_init(void) 455static int pmac_late_init(void)
456{ 456{
457 if (!machine_is(powermac))
458 return -ENODEV;
459
457 initializing = 0; 460 initializing = 0;
458 /* this is udbg (which is __init) and we can later use it during 461 /* this is udbg (which is __init) and we can later use it during
459 * cpu hotplug (in smp_core99_kick_cpu) */ 462 * cpu hotplug (in smp_core99_kick_cpu) */
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 81a2b92ab0c2..6ffbab77ae4d 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -535,8 +535,7 @@ void appldata_unregister_ops(struct appldata_ops *ops)
535 535
536/******************************* init / exit *********************************/ 536/******************************* init / exit *********************************/
537 537
538static void 538static void __cpuinit appldata_online_cpu(int cpu)
539appldata_online_cpu(int cpu)
540{ 539{
541 init_virt_timer(&per_cpu(appldata_timer, cpu)); 540 init_virt_timer(&per_cpu(appldata_timer, cpu));
542 per_cpu(appldata_timer, cpu).function = appldata_timer_function; 541 per_cpu(appldata_timer, cpu).function = appldata_timer_function;
@@ -580,7 +579,7 @@ appldata_cpu_notify(struct notifier_block *self,
580 return NOTIFY_OK; 579 return NOTIFY_OK;
581} 580}
582 581
583static struct notifier_block appldata_nb = { 582static struct notifier_block __cpuinitdata appldata_nb = {
584 .notifier_call = appldata_cpu_notify, 583 .notifier_call = appldata_cpu_notify,
585}; 584};
586 585
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index c8a2212014e0..6234c6978a1f 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -769,10 +769,13 @@ mcck_return:
769 769
770 RESTORE_ALL __LC_RETURN_MCCK_PSW,0 770 RESTORE_ALL __LC_RETURN_MCCK_PSW,0
771 771
772#ifdef CONFIG_SMP
773/* 772/*
774 * Restart interruption handler, kick starter for additional CPUs 773 * Restart interruption handler, kick starter for additional CPUs
775 */ 774 */
775#ifdef CONFIG_SMP
776#ifndef CONFIG_HOTPLUG_CPU
777 .section .init.text,"ax"
778#endif
776 .globl restart_int_handler 779 .globl restart_int_handler
777restart_int_handler: 780restart_int_handler:
778 l %r15,__LC_SAVE_AREA+60 # load ksp 781 l %r15,__LC_SAVE_AREA+60 # load ksp
@@ -785,6 +788,9 @@ restart_int_handler:
785 br %r14 # branch to start_secondary 788 br %r14 # branch to start_secondary
786restart_addr: 789restart_addr:
787 .long start_secondary 790 .long start_secondary
791#ifndef CONFIG_HOTPLUG_CPU
792 .previous
793#endif
788#else 794#else
789/* 795/*
790 * If we do not run with SMP enabled, let the new CPU crash ... 796 * If we do not run with SMP enabled, let the new CPU crash ...
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 93745fd8f555..685f11faa4bc 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -745,10 +745,13 @@ mcck_return:
745#endif 745#endif
746 lpswe __LC_RETURN_MCCK_PSW # back to caller 746 lpswe __LC_RETURN_MCCK_PSW # back to caller
747 747
748#ifdef CONFIG_SMP
749/* 748/*
750 * Restart interruption handler, kick starter for additional CPUs 749 * Restart interruption handler, kick starter for additional CPUs
751 */ 750 */
751#ifdef CONFIG_SMP
752#ifndef CONFIG_HOTPLUG_CPU
753 .section .init.text,"ax"
754#endif
752 .globl restart_int_handler 755 .globl restart_int_handler
753restart_int_handler: 756restart_int_handler:
754 lg %r15,__LC_SAVE_AREA+120 # load ksp 757 lg %r15,__LC_SAVE_AREA+120 # load ksp
@@ -759,6 +762,9 @@ restart_int_handler:
759 lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone 762 lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone
760 stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on 763 stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on
761 jg start_secondary 764 jg start_secondary
765#ifndef CONFIG_HOTPLUG_CPU
766 .previous
767#endif
762#else 768#else
763/* 769/*
764 * If we do not run with SMP enabled, let the new CPU crash ... 770 * If we do not run with SMP enabled, let the new CPU crash ...
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 51d6309e7f3b..7e1bfb984064 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -300,6 +300,7 @@ static void __init setup_zfcpdump(unsigned int console_devno)
300 else 300 else
301 sprintf(str, "cio_ignore=all,!0.0.%04x", 301 sprintf(str, "cio_ignore=all,!0.0.%04x",
302 ipl_info.data.fcp.dev_id.devno); 302 ipl_info.data.fcp.dev_id.devno);
303 strcat(COMMAND_LINE, " ");
303 strcat(COMMAND_LINE, str); 304 strcat(COMMAND_LINE, str);
304 console_loglevel = 2; 305 console_loglevel = 2;
305} 306}
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index cbfe73034c30..ee9186f8fb08 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -253,19 +253,22 @@ void die(const char * str, struct pt_regs * regs, long err)
253{ 253{
254 static int die_counter; 254 static int die_counter;
255 255
256 oops_enter();
256 debug_stop_all(); 257 debug_stop_all();
257 console_verbose(); 258 console_verbose();
258 spin_lock_irq(&die_lock); 259 spin_lock_irq(&die_lock);
259 bust_spinlocks(1); 260 bust_spinlocks(1);
260 printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); 261 printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
261 show_regs(regs); 262 print_modules();
263 show_regs(regs);
262 bust_spinlocks(0); 264 bust_spinlocks(0);
263 spin_unlock_irq(&die_lock); 265 spin_unlock_irq(&die_lock);
264 if (in_interrupt()) 266 if (in_interrupt())
265 panic("Fatal exception in interrupt"); 267 panic("Fatal exception in interrupt");
266 if (panic_on_oops) 268 if (panic_on_oops)
267 panic("Fatal exception: panic_on_oops"); 269 panic("Fatal exception: panic_on_oops");
268 do_exit(SIGSEGV); 270 oops_exit();
271 do_exit(SIGSEGV);
269} 272}
270 273
271static void inline 274static void inline
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c
index b32c35a7c0a3..e323e299878b 100644
--- a/arch/sh/kernel/signal.c
+++ b/arch/sh/kernel/signal.c
@@ -268,7 +268,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
268badframe: 268badframe:
269 force_sig(SIGSEGV, current); 269 force_sig(SIGSEGV, current);
270 return 0; 270 return 0;
271} 271}
272 272
273/* 273/*
274 * Set up a signal frame. 274 * Set up a signal frame.
@@ -481,7 +481,7 @@ give_sigsegv:
481 481
482static int 482static int
483handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, 483handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
484 sigset_t *oldset, struct pt_regs *regs) 484 sigset_t *oldset, struct pt_regs *regs, unsigned int save_r0)
485{ 485{
486 int ret; 486 int ret;
487 487
@@ -489,6 +489,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
489 if (regs->tra >= 0) { 489 if (regs->tra >= 0) {
490 /* If so, check system call restarting.. */ 490 /* If so, check system call restarting.. */
491 switch (regs->regs[0]) { 491 switch (regs->regs[0]) {
492 case -ERESTART_RESTARTBLOCK:
492 case -ERESTARTNOHAND: 493 case -ERESTARTNOHAND:
493 regs->regs[0] = -EINTR; 494 regs->regs[0] = -EINTR;
494 break; 495 break;
@@ -500,6 +501,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
500 } 501 }
501 /* fallthrough */ 502 /* fallthrough */
502 case -ERESTARTNOINTR: 503 case -ERESTARTNOINTR:
504 regs->regs[0] = save_r0;
503 regs->pc -= instruction_size( 505 regs->pc -= instruction_size(
504 ctrl_inw(regs->pc - 4)); 506 ctrl_inw(regs->pc - 4));
505 break; 507 break;
@@ -583,7 +585,8 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
583 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 585 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
584 if (signr > 0) { 586 if (signr > 0) {
585 /* Whee! Actually deliver the signal. */ 587 /* Whee! Actually deliver the signal. */
586 if (handle_signal(signr, &ka, &info, oldset, regs) == 0) { 588 if (handle_signal(signr, &ka, &info, oldset,
589 regs, save_r0) == 0) {
587 /* a signal was successfully delivered; the saved 590 /* a signal was successfully delivered; the saved
588 * sigmask will have been stored in the signal frame, 591 * sigmask will have been stored in the signal frame,
589 * and will be restored by sigreturn, so we can simply 592 * and will be restored by sigreturn, so we can simply
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 5b75cb6f8f9b..8f18930d5bf8 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -83,6 +83,8 @@ void die(const char * str, struct pt_regs * regs, long err)
83{ 83{
84 static int die_counter; 84 static int die_counter;
85 85
86 oops_enter();
87
86 console_verbose(); 88 console_verbose();
87 spin_lock_irq(&die_lock); 89 spin_lock_irq(&die_lock);
88 bust_spinlocks(1); 90 bust_spinlocks(1);
@@ -112,6 +114,7 @@ void die(const char * str, struct pt_regs * regs, long err)
112 if (panic_on_oops) 114 if (panic_on_oops)
113 panic("Fatal exception"); 115 panic("Fatal exception");
114 116
117 oops_exit();
115 do_exit(SIGSEGV); 118 do_exit(SIGSEGV);
116} 119}
117 120
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c
index c8525ade0564..0bb4a8f94276 100644
--- a/arch/sh64/kernel/signal.c
+++ b/arch/sh64/kernel/signal.c
@@ -640,6 +640,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
640 if (regs->syscall_nr >= 0) { 640 if (regs->syscall_nr >= 0) {
641 /* If so, check system call restarting.. */ 641 /* If so, check system call restarting.. */
642 switch (regs->regs[REG_RET]) { 642 switch (regs->regs[REG_RET]) {
643 case -ERESTART_RESTARTBLOCK:
643 case -ERESTARTNOHAND: 644 case -ERESTARTNOHAND:
644 regs->regs[REG_RET] = -EINTR; 645 regs->regs[REG_RET] = -EINTR;
645 break; 646 break;
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 21868f9bed7c..47565c3345d2 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -620,7 +620,7 @@ ia32_sys_call_table:
620 .quad quiet_ni_syscall /* tux */ 620 .quad quiet_ni_syscall /* tux */
621 .quad quiet_ni_syscall /* security */ 621 .quad quiet_ni_syscall /* security */
622 .quad sys_gettid 622 .quad sys_gettid
623 .quad sys_readahead /* 225 */ 623 .quad sys32_readahead /* 225 */
624 .quad sys_setxattr 624 .quad sys_setxattr
625 .quad sys_lsetxattr 625 .quad sys_lsetxattr
626 .quad sys_fsetxattr 626 .quad sys_fsetxattr
@@ -645,7 +645,7 @@ ia32_sys_call_table:
645 .quad compat_sys_io_getevents 645 .quad compat_sys_io_getevents
646 .quad compat_sys_io_submit 646 .quad compat_sys_io_submit
647 .quad sys_io_cancel 647 .quad sys_io_cancel
648 .quad sys_fadvise64 /* 250 */ 648 .quad sys32_fadvise64 /* 250 */
649 .quad quiet_ni_syscall /* free_huge_pages */ 649 .quad quiet_ni_syscall /* free_huge_pages */
650 .quad sys_exit_group 650 .quad sys_exit_group
651 .quad sys32_lookup_dcookie 651 .quad sys32_lookup_dcookie
@@ -709,7 +709,7 @@ ia32_sys_call_table:
709 .quad compat_sys_set_robust_list 709 .quad compat_sys_set_robust_list
710 .quad compat_sys_get_robust_list 710 .quad compat_sys_get_robust_list
711 .quad sys_splice 711 .quad sys_splice
712 .quad sys_sync_file_range 712 .quad sys32_sync_file_range
713 .quad sys_tee /* 315 */ 713 .quad sys_tee /* 315 */
714 .quad compat_sys_vmsplice 714 .quad compat_sys_vmsplice
715 .quad compat_sys_move_pages 715 .quad compat_sys_move_pages
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 200fdde18d96..99a78a3cce7c 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -860,3 +860,22 @@ long sys32_lookup_dcookie(u32 addr_low, u32 addr_high,
860 return sys_lookup_dcookie(((u64)addr_high << 32) | addr_low, buf, len); 860 return sys_lookup_dcookie(((u64)addr_high << 32) | addr_low, buf, len);
861} 861}
862 862
863asmlinkage ssize_t sys32_readahead(int fd, unsigned off_lo, unsigned off_hi, size_t count)
864{
865 return sys_readahead(fd, ((u64)off_hi << 32) | off_lo, count);
866}
867
868asmlinkage long sys32_sync_file_range(int fd, unsigned off_low, unsigned off_hi,
869 unsigned n_low, unsigned n_hi, int flags)
870{
871 return sys_sync_file_range(fd,
872 ((u64)off_hi << 32) | off_low,
873 ((u64)n_hi << 32) | n_low, flags);
874}
875
876asmlinkage long sys32_fadvise64(int fd, unsigned offset_lo, unsigned offset_hi, size_t len,
877 int advice)
878{
879 return sys_fadvise64_64(fd, ((u64)offset_hi << 32) | offset_lo,
880 len, advice);
881}
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index fa984b53e7e6..a67f87bf4015 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -1163,3 +1163,10 @@ ENTRY(call_softirq)
1163 ret 1163 ret
1164 CFI_ENDPROC 1164 CFI_ENDPROC
1165ENDPROC(call_softirq) 1165ENDPROC(call_softirq)
1166
1167KPROBE_ENTRY(ignore_sysret)
1168 CFI_STARTPROC
1169 mov $-ENOSYS,%eax
1170 sysret
1171 CFI_ENDPROC
1172ENDPROC(ignore_sysret)
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index a14375dd5425..aa1d15991794 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -497,15 +497,17 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize, loff
497 for (i = 0; i < next; i++) { 497 for (i = 0; i < next; i++) {
498 unsigned long start = jiffies; 498 unsigned long start = jiffies;
499 while (!mcelog.entry[i].finished) { 499 while (!mcelog.entry[i].finished) {
500 if (!time_before(jiffies, start + 2)) { 500 if (time_after_eq(jiffies, start + 2)) {
501 memset(mcelog.entry + i,0, sizeof(struct mce)); 501 memset(mcelog.entry + i,0, sizeof(struct mce));
502 continue; 502 goto timeout;
503 } 503 }
504 cpu_relax(); 504 cpu_relax();
505 } 505 }
506 smp_rmb(); 506 smp_rmb();
507 err |= copy_to_user(buf, mcelog.entry + i, sizeof(struct mce)); 507 err |= copy_to_user(buf, mcelog.entry + i, sizeof(struct mce));
508 buf += sizeof(struct mce); 508 buf += sizeof(struct mce);
509 timeout:
510 ;
509 } 511 }
510 512
511 memset(mcelog.entry, 0, next * sizeof(struct mce)); 513 memset(mcelog.entry, 0, next * sizeof(struct mce));
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index 651ccfb06697..9f80aad3fe2d 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -322,5 +322,17 @@ static int __init pci_iommu_init(void)
322 return 0; 322 return 0;
323} 323}
324 324
325#ifdef CONFIG_PCI
326/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
327
328static __devinit void via_no_dac(struct pci_dev *dev)
329{
330 if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
331 printk(KERN_INFO "PCI: VIA PCI bridge detected. Disabling DAC.\n");
332 forbid_dac = 1;
333 }
334}
335DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
336#endif
325/* Must execute after PCI subsystem */ 337/* Must execute after PCI subsystem */
326fs_initcall(pci_iommu_init); 338fs_initcall(pci_iommu_init);
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 64379a80d763..1200aaac403e 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -150,6 +150,8 @@ void pda_init(int cpu)
150char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + DEBUG_STKSZ] 150char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + DEBUG_STKSZ]
151__attribute__((section(".bss.page_aligned"))); 151__attribute__((section(".bss.page_aligned")));
152 152
153extern asmlinkage void ignore_sysret(void);
154
153/* May not be marked __init: used by software suspend */ 155/* May not be marked __init: used by software suspend */
154void syscall_init(void) 156void syscall_init(void)
155{ 157{
@@ -160,6 +162,7 @@ void syscall_init(void)
160 */ 162 */
161 wrmsrl(MSR_STAR, ((u64)__USER32_CS)<<48 | ((u64)__KERNEL_CS)<<32); 163 wrmsrl(MSR_STAR, ((u64)__USER32_CS)<<48 | ((u64)__KERNEL_CS)<<32);
162 wrmsrl(MSR_LSTAR, system_call); 164 wrmsrl(MSR_LSTAR, system_call);
165 wrmsrl(MSR_CSTAR, ignore_sysret);
163 166
164#ifdef CONFIG_IA32_EMULATION 167#ifdef CONFIG_IA32_EMULATION
165 syscall32_cpu_init (); 168 syscall32_cpu_init ();
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index efb6e845114e..9a0e98accf04 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -605,6 +605,11 @@ void mark_rodata_ro(void)
605 if (num_possible_cpus() > 1) 605 if (num_possible_cpus() > 1)
606 start = (unsigned long)_etext; 606 start = (unsigned long)_etext;
607#endif 607#endif
608
609#ifdef CONFIG_KPROBES
610 start = (unsigned long)__start_rodata;
611#endif
612
608 end = (unsigned long)__end_rodata; 613 end = (unsigned long)__end_rodata;
609 start = (start + PAGE_SIZE - 1) & PAGE_MASK; 614 start = (start + PAGE_SIZE - 1) & PAGE_MASK;
610 end &= PAGE_MASK; 615 end &= PAGE_MASK;
diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c
index d653d0bf3df6..9148f4a4cec6 100644
--- a/arch/x86_64/mm/pageattr.c
+++ b/arch/x86_64/mm/pageattr.c
@@ -74,10 +74,11 @@ static void flush_kernel_map(void *arg)
74 struct page *pg; 74 struct page *pg;
75 75
76 /* When clflush is available always use it because it is 76 /* When clflush is available always use it because it is
77 much cheaper than WBINVD */ 77 much cheaper than WBINVD. Disable clflush for now because
78 if (!cpu_has_clflush) 78 the high level code is not ready yet */
79 if (1 || !cpu_has_clflush)
79 asm volatile("wbinvd" ::: "memory"); 80 asm volatile("wbinvd" ::: "memory");
80 list_for_each_entry(pg, l, lru) { 81 else list_for_each_entry(pg, l, lru) {
81 void *adr = page_address(pg); 82 void *adr = page_address(pg);
82 if (cpu_has_clflush) 83 if (cpu_has_clflush)
83 cache_flush_page(adr); 84 cache_flush_page(adr);
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-06 21:39:33 -0500