aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-11-11 03:39:26 -0500
committerPaul Mackerras <paulus@samba.org>2008-11-11 03:42:30 -0500
commitcb8fdc69a2a80e81e1280ec58afd2c3217ac8a7f (patch)
treedd1707ffda0c12c7e98b6bfc02d44a7cd2cb47a8 /arch/powerpc
parent77eb50aefa5dd2337246dce8b66e18e837c1a8bc (diff)
powerpc: Update desktop/server defconfigs
Turned off CONFIG_PCI_LEGACY and turned on EXT4, and otherwise mostly took the defaults. This also updates ppc6xx_defconfig, which covers the 6xx/7xx/7xxx-based embedded boards. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/chrp32_defconfig159
-rw-r--r--arch/powerpc/configs/g5_defconfig142
-rw-r--r--arch/powerpc/configs/iseries_defconfig114
-rw-r--r--arch/powerpc/configs/maple_defconfig142
-rw-r--r--arch/powerpc/configs/pmac32_defconfig160
-rw-r--r--arch/powerpc/configs/ppc64_defconfig174
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig286
-rw-r--r--arch/powerpc/configs/pseries_defconfig169
8 files changed, 1033 insertions, 313 deletions
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 2e0ef8c18227..63b3c2372ce8 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:12:40 2008 4# Tue Nov 11 19:35:37 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_SMP=y
23CONFIG_NR_CPUS=4 23CONFIG_NR_CPUS=4
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -108,7 +108,9 @@ CONFIG_SIGNALFD=y
108CONFIG_TIMERFD=y 108CONFIG_TIMERFD=y
109CONFIG_EVENTFD=y 109CONFIG_EVENTFD=y
110CONFIG_SHMEM=y 110CONFIG_SHMEM=y
111CONFIG_AIO=y
111CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y
112CONFIG_SLUB_DEBUG=y 114CONFIG_SLUB_DEBUG=y
113# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
114CONFIG_SLUB=y 116CONFIG_SLUB=y
@@ -122,10 +124,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
122CONFIG_HAVE_KPROBES=y 124CONFIG_HAVE_KPROBES=y
123CONFIG_HAVE_KRETPROBES=y 125CONFIG_HAVE_KRETPROBES=y
124CONFIG_HAVE_ARCH_TRACEHOOK=y 126CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_DMA_ATTRS is not set
126CONFIG_USE_GENERIC_SMP_HELPERS=y 127CONFIG_USE_GENERIC_SMP_HELPERS=y
127# CONFIG_HAVE_CLK is not set
128CONFIG_PROC_PAGE_MONITOR=y
129# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
130CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
131CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -159,6 +158,7 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 158# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 159CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 160CONFIG_CLASSIC_RCU=y
161# CONFIG_FREEZER is not set
162 162
163# 163#
164# Platform support 164# Platform support
@@ -212,6 +212,8 @@ CONFIG_PREEMPT_NONE=y
212# CONFIG_PREEMPT_VOLUNTARY is not set 212# CONFIG_PREEMPT_VOLUNTARY is not set
213# CONFIG_PREEMPT is not set 213# CONFIG_PREEMPT is not set
214CONFIG_BINFMT_ELF=y 214CONFIG_BINFMT_ELF=y
215# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
216# CONFIG_HAVE_AOUT is not set
215CONFIG_BINFMT_MISC=y 217CONFIG_BINFMT_MISC=y
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -227,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y
227# CONFIG_SPARSEMEM_MANUAL is not set 229# CONFIG_SPARSEMEM_MANUAL is not set
228CONFIG_FLATMEM=y 230CONFIG_FLATMEM=y
229CONFIG_FLAT_NODE_MEM_MAP=y 231CONFIG_FLAT_NODE_MEM_MAP=y
230# CONFIG_SPARSEMEM_STATIC is not set
231# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
232CONFIG_PAGEFLAGS_EXTENDED=y 232CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 233CONFIG_SPLIT_PTLOCK_CPUS=4
234# CONFIG_MIGRATION is not set 234# CONFIG_MIGRATION is not set
235# CONFIG_RESOURCES_64BIT is not set 235# CONFIG_RESOURCES_64BIT is not set
236# CONFIG_PHYS_ADDR_T_64BIT is not set
236CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
237CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
238CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y
239CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
241# CONFIG_CMDLINE_BOOL is not set 243# CONFIG_CMDLINE_BOOL is not set
@@ -310,7 +312,6 @@ CONFIG_INET_TCP_DIAG=y
310CONFIG_TCP_CONG_CUBIC=y 312CONFIG_TCP_CONG_CUBIC=y
311CONFIG_DEFAULT_TCP_CONG="cubic" 313CONFIG_DEFAULT_TCP_CONG="cubic"
312# CONFIG_TCP_MD5SIG is not set 314# CONFIG_TCP_MD5SIG is not set
313# CONFIG_IP_VS is not set
314# CONFIG_IPV6 is not set 315# CONFIG_IPV6 is not set
315# CONFIG_NETWORK_SECMARK is not set 316# CONFIG_NETWORK_SECMARK is not set
316CONFIG_NETFILTER=y 317CONFIG_NETFILTER=y
@@ -334,10 +335,12 @@ CONFIG_NETFILTER_XTABLES=m
334# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 335# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
335# CONFIG_NETFILTER_XT_MATCH_MARK is not set 336# CONFIG_NETFILTER_XT_MATCH_MARK is not set
336# CONFIG_NETFILTER_XT_MATCH_STATE is not set 337# CONFIG_NETFILTER_XT_MATCH_STATE is not set
338# CONFIG_IP_VS is not set
337 339
338# 340#
339# IP: Netfilter Configuration 341# IP: Netfilter Configuration
340# 342#
343CONFIG_NF_DEFRAG_IPV4=m
341CONFIG_NF_CONNTRACK_IPV4=m 344CONFIG_NF_CONNTRACK_IPV4=m
342CONFIG_NF_CONNTRACK_PROC_COMPAT=y 345CONFIG_NF_CONNTRACK_PROC_COMPAT=y
343CONFIG_IP_NF_IPTABLES=m 346CONFIG_IP_NF_IPTABLES=m
@@ -361,6 +364,7 @@ CONFIG_NF_NAT_SIP=m
361# CONFIG_TIPC is not set 364# CONFIG_TIPC is not set
362# CONFIG_ATM is not set 365# CONFIG_ATM is not set
363# CONFIG_BRIDGE is not set 366# CONFIG_BRIDGE is not set
367# CONFIG_NET_DSA is not set
364# CONFIG_VLAN_8021Q is not set 368# CONFIG_VLAN_8021Q is not set
365# CONFIG_DECNET is not set 369# CONFIG_DECNET is not set
366# CONFIG_LLC2 is not set 370# CONFIG_LLC2 is not set
@@ -381,14 +385,8 @@ CONFIG_NF_NAT_SIP=m
381# CONFIG_IRDA is not set 385# CONFIG_IRDA is not set
382# CONFIG_BT is not set 386# CONFIG_BT is not set
383# CONFIG_AF_RXRPC is not set 387# CONFIG_AF_RXRPC is not set
384 388# CONFIG_PHONET is not set
385# 389# CONFIG_WIRELESS is not set
386# Wireless
387#
388# CONFIG_CFG80211 is not set
389# CONFIG_WIRELESS_EXT is not set
390# CONFIG_MAC80211 is not set
391# CONFIG_IEEE80211 is not set
392# CONFIG_RFKILL is not set 390# CONFIG_RFKILL is not set
393# CONFIG_NET_9P is not set 391# CONFIG_NET_9P is not set
394 392
@@ -443,19 +441,18 @@ CONFIG_MISC_DEVICES=y
443# CONFIG_HP_ILO is not set 441# CONFIG_HP_ILO is not set
444CONFIG_HAVE_IDE=y 442CONFIG_HAVE_IDE=y
445CONFIG_IDE=y 443CONFIG_IDE=y
446CONFIG_BLK_DEV_IDE=y
447 444
448# 445#
449# Please see Documentation/ide/ide.txt for help/info on IDE drives 446# Please see Documentation/ide/ide.txt for help/info on IDE drives
450# 447#
451CONFIG_IDE_TIMINGS=y 448CONFIG_IDE_TIMINGS=y
452# CONFIG_BLK_DEV_IDE_SATA is not set 449# CONFIG_BLK_DEV_IDE_SATA is not set
453CONFIG_BLK_DEV_IDEDISK=y 450CONFIG_IDE_GD=y
454CONFIG_IDEDISK_MULTI_MODE=y 451CONFIG_IDE_GD_ATA=y
452# CONFIG_IDE_GD_ATAPI is not set
455CONFIG_BLK_DEV_IDECD=y 453CONFIG_BLK_DEV_IDECD=y
456CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 454CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
457# CONFIG_BLK_DEV_IDETAPE is not set 455# CONFIG_BLK_DEV_IDETAPE is not set
458# CONFIG_BLK_DEV_IDEFLOPPY is not set
459# CONFIG_BLK_DEV_IDESCSI is not set 456# CONFIG_BLK_DEV_IDESCSI is not set
460# CONFIG_IDE_TASK_IOCTL is not set 457# CONFIG_IDE_TASK_IOCTL is not set
461CONFIG_IDE_PROC_FS=y 458CONFIG_IDE_PROC_FS=y
@@ -616,7 +613,23 @@ CONFIG_NETDEVICES=y
616# CONFIG_TUN is not set 613# CONFIG_TUN is not set
617# CONFIG_VETH is not set 614# CONFIG_VETH is not set
618# CONFIG_ARCNET is not set 615# CONFIG_ARCNET is not set
619# CONFIG_PHYLIB is not set 616CONFIG_PHYLIB=y
617
618#
619# MII PHY device drivers
620#
621# CONFIG_MARVELL_PHY is not set
622# CONFIG_DAVICOM_PHY is not set
623# CONFIG_QSEMI_PHY is not set
624# CONFIG_LXT_PHY is not set
625# CONFIG_CICADA_PHY is not set
626# CONFIG_VITESSE_PHY is not set
627# CONFIG_SMSC_PHY is not set
628# CONFIG_BROADCOM_PHY is not set
629# CONFIG_ICPLUS_PHY is not set
630# CONFIG_REALTEK_PHY is not set
631# CONFIG_FIXED_PHY is not set
632# CONFIG_MDIO_BITBANG is not set
620CONFIG_NET_ETHERNET=y 633CONFIG_NET_ETHERNET=y
621CONFIG_MII=y 634CONFIG_MII=y
622# CONFIG_HAPPYMEAL is not set 635# CONFIG_HAPPYMEAL is not set
@@ -641,6 +654,9 @@ CONFIG_DE4X5=y
641# CONFIG_IBM_NEW_EMAC_RGMII is not set 654# CONFIG_IBM_NEW_EMAC_RGMII is not set
642# CONFIG_IBM_NEW_EMAC_TAH is not set 655# CONFIG_IBM_NEW_EMAC_TAH is not set
643# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 656# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
657# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
658# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
659# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
644CONFIG_NET_PCI=y 660CONFIG_NET_PCI=y
645CONFIG_PCNET32=y 661CONFIG_PCNET32=y
646# CONFIG_AMD8111_ETH is not set 662# CONFIG_AMD8111_ETH is not set
@@ -669,6 +685,7 @@ CONFIG_8139TOO=y
669CONFIG_VIA_RHINE=y 685CONFIG_VIA_RHINE=y
670# CONFIG_VIA_RHINE_MMIO is not set 686# CONFIG_VIA_RHINE_MMIO is not set
671# CONFIG_SC92031 is not set 687# CONFIG_SC92031 is not set
688# CONFIG_ATL2 is not set
672CONFIG_NETDEV_1000=y 689CONFIG_NETDEV_1000=y
673# CONFIG_ACENIC is not set 690# CONFIG_ACENIC is not set
674# CONFIG_DL2K is not set 691# CONFIG_DL2K is not set
@@ -690,18 +707,22 @@ CONFIG_MV643XX_ETH=y
690# CONFIG_QLA3XXX is not set 707# CONFIG_QLA3XXX is not set
691# CONFIG_ATL1 is not set 708# CONFIG_ATL1 is not set
692# CONFIG_ATL1E is not set 709# CONFIG_ATL1E is not set
710# CONFIG_JME is not set
693CONFIG_NETDEV_10000=y 711CONFIG_NETDEV_10000=y
694# CONFIG_CHELSIO_T1 is not set 712# CONFIG_CHELSIO_T1 is not set
695# CONFIG_CHELSIO_T3 is not set 713# CONFIG_CHELSIO_T3 is not set
714# CONFIG_ENIC is not set
696# CONFIG_IXGBE is not set 715# CONFIG_IXGBE is not set
697# CONFIG_IXGB is not set 716# CONFIG_IXGB is not set
698# CONFIG_S2IO is not set 717# CONFIG_S2IO is not set
699# CONFIG_MYRI10GE is not set 718# CONFIG_MYRI10GE is not set
700# CONFIG_NETXEN_NIC is not set 719# CONFIG_NETXEN_NIC is not set
701# CONFIG_NIU is not set 720# CONFIG_NIU is not set
721# CONFIG_MLX4_EN is not set
702# CONFIG_MLX4_CORE is not set 722# CONFIG_MLX4_CORE is not set
703# CONFIG_TEHUTI is not set 723# CONFIG_TEHUTI is not set
704# CONFIG_BNX2X is not set 724# CONFIG_BNX2X is not set
725# CONFIG_QLGE is not set
705# CONFIG_SFC is not set 726# CONFIG_SFC is not set
706# CONFIG_TR is not set 727# CONFIG_TR is not set
707 728
@@ -777,6 +798,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
777CONFIG_MOUSE_PS2_SYNAPTICS=y 798CONFIG_MOUSE_PS2_SYNAPTICS=y
778CONFIG_MOUSE_PS2_LIFEBOOK=y 799CONFIG_MOUSE_PS2_LIFEBOOK=y
779CONFIG_MOUSE_PS2_TRACKPOINT=y 800CONFIG_MOUSE_PS2_TRACKPOINT=y
801# CONFIG_MOUSE_PS2_ELANTECH is not set
780# CONFIG_MOUSE_PS2_TOUCHKIT is not set 802# CONFIG_MOUSE_PS2_TOUCHKIT is not set
781# CONFIG_MOUSE_SERIAL is not set 803# CONFIG_MOUSE_SERIAL is not set
782# CONFIG_MOUSE_APPLETOUCH is not set 804# CONFIG_MOUSE_APPLETOUCH is not set
@@ -795,6 +817,7 @@ CONFIG_INPUT_MISC=y
795# CONFIG_INPUT_KEYSPAN_REMOTE is not set 817# CONFIG_INPUT_KEYSPAN_REMOTE is not set
796# CONFIG_INPUT_POWERMATE is not set 818# CONFIG_INPUT_POWERMATE is not set
797# CONFIG_INPUT_YEALINK is not set 819# CONFIG_INPUT_YEALINK is not set
820# CONFIG_INPUT_CM109 is not set
798CONFIG_INPUT_UINPUT=y 821CONFIG_INPUT_UINPUT=y
799 822
800# 823#
@@ -953,6 +976,17 @@ CONFIG_SSB_POSSIBLE=y
953# CONFIG_MFD_SM501 is not set 976# CONFIG_MFD_SM501 is not set
954# CONFIG_HTC_PASIC3 is not set 977# CONFIG_HTC_PASIC3 is not set
955# CONFIG_MFD_TMIO is not set 978# CONFIG_MFD_TMIO is not set
979# CONFIG_PMIC_DA903X is not set
980# CONFIG_MFD_WM8400 is not set
981# CONFIG_MFD_WM8350_I2C is not set
982
983#
984# Voltage and Current regulators
985#
986# CONFIG_REGULATOR is not set
987# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
988# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
989# CONFIG_REGULATOR_BQ24022 is not set
956 990
957# 991#
958# Multimedia devices 992# Multimedia devices
@@ -980,6 +1014,7 @@ CONFIG_SSB_POSSIBLE=y
980CONFIG_FB=y 1014CONFIG_FB=y
981CONFIG_FIRMWARE_EDID=y 1015CONFIG_FIRMWARE_EDID=y
982CONFIG_FB_DDC=y 1016CONFIG_FB_DDC=y
1017# CONFIG_FB_BOOT_VESA_SUPPORT is not set
983CONFIG_FB_CFB_FILLRECT=y 1018CONFIG_FB_CFB_FILLRECT=y
984CONFIG_FB_CFB_COPYAREA=y 1019CONFIG_FB_CFB_COPYAREA=y
985CONFIG_FB_CFB_IMAGEBLIT=y 1020CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1028,6 +1063,7 @@ CONFIG_FB_ATY_BACKLIGHT=y
1028# CONFIG_FB_S3 is not set 1063# CONFIG_FB_S3 is not set
1029# CONFIG_FB_SAVAGE is not set 1064# CONFIG_FB_SAVAGE is not set
1030# CONFIG_FB_SIS is not set 1065# CONFIG_FB_SIS is not set
1066# CONFIG_FB_VIA is not set
1031# CONFIG_FB_NEOMAGIC is not set 1067# CONFIG_FB_NEOMAGIC is not set
1032# CONFIG_FB_KYRO is not set 1068# CONFIG_FB_KYRO is not set
1033CONFIG_FB_3DFX=y 1069CONFIG_FB_3DFX=y
@@ -1040,6 +1076,7 @@ CONFIG_FB_3DFX=y
1040# CONFIG_FB_CARMINE is not set 1076# CONFIG_FB_CARMINE is not set
1041# CONFIG_FB_IBM_GXT4500 is not set 1077# CONFIG_FB_IBM_GXT4500 is not set
1042# CONFIG_FB_VIRTUAL is not set 1078# CONFIG_FB_VIRTUAL is not set
1079# CONFIG_FB_METRONOME is not set
1043CONFIG_BACKLIGHT_LCD_SUPPORT=y 1080CONFIG_BACKLIGHT_LCD_SUPPORT=y
1044CONFIG_LCD_CLASS_DEVICE=m 1081CONFIG_LCD_CLASS_DEVICE=m
1045# CONFIG_LCD_ILI9320 is not set 1082# CONFIG_LCD_ILI9320 is not set
@@ -1083,9 +1120,36 @@ CONFIG_HID=y
1083# USB Input Devices 1120# USB Input Devices
1084# 1121#
1085CONFIG_USB_HID=y 1122CONFIG_USB_HID=y
1086# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1123# CONFIG_HID_PID is not set
1087# CONFIG_HID_FF is not set
1088# CONFIG_USB_HIDDEV is not set 1124# CONFIG_USB_HIDDEV is not set
1125
1126#
1127# Special HID drivers
1128#
1129CONFIG_HID_COMPAT=y
1130CONFIG_HID_A4TECH=y
1131CONFIG_HID_APPLE=y
1132CONFIG_HID_BELKIN=y
1133CONFIG_HID_BRIGHT=y
1134CONFIG_HID_CHERRY=y
1135CONFIG_HID_CHICONY=y
1136CONFIG_HID_CYPRESS=y
1137CONFIG_HID_DELL=y
1138CONFIG_HID_EZKEY=y
1139CONFIG_HID_GYRATION=y
1140CONFIG_HID_LOGITECH=y
1141# CONFIG_LOGITECH_FF is not set
1142# CONFIG_LOGIRUMBLEPAD2_FF is not set
1143CONFIG_HID_MICROSOFT=y
1144CONFIG_HID_MONTEREY=y
1145CONFIG_HID_PANTHERLORD=y
1146# CONFIG_PANTHERLORD_FF is not set
1147CONFIG_HID_PETALYNX=y
1148CONFIG_HID_SAMSUNG=y
1149CONFIG_HID_SONY=y
1150CONFIG_HID_SUNPLUS=y
1151# CONFIG_THRUSTMASTER_FF is not set
1152# CONFIG_ZEROPLUS_FF is not set
1089CONFIG_USB_SUPPORT=y 1153CONFIG_USB_SUPPORT=y
1090CONFIG_USB_ARCH_HAS_HCD=y 1154CONFIG_USB_ARCH_HAS_HCD=y
1091CONFIG_USB_ARCH_HAS_OHCI=y 1155CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1102,6 +1166,8 @@ CONFIG_USB_DEVICE_CLASS=y
1102# CONFIG_USB_DYNAMIC_MINORS is not set 1166# CONFIG_USB_DYNAMIC_MINORS is not set
1103# CONFIG_USB_OTG is not set 1167# CONFIG_USB_OTG is not set
1104CONFIG_USB_MON=y 1168CONFIG_USB_MON=y
1169# CONFIG_USB_WUSB is not set
1170# CONFIG_USB_WUSB_CBAF is not set
1105 1171
1106# 1172#
1107# USB Host Controller Drivers 1173# USB Host Controller Drivers
@@ -1121,6 +1187,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1121CONFIG_USB_UHCI_HCD=y 1187CONFIG_USB_UHCI_HCD=y
1122# CONFIG_USB_SL811_HCD is not set 1188# CONFIG_USB_SL811_HCD is not set
1123# CONFIG_USB_R8A66597_HCD is not set 1189# CONFIG_USB_R8A66597_HCD is not set
1190# CONFIG_USB_WHCI_HCD is not set
1191# CONFIG_USB_HWA_HCD is not set
1124 1192
1125# 1193#
1126# USB Device Class drivers 1194# USB Device Class drivers
@@ -1128,6 +1196,7 @@ CONFIG_USB_UHCI_HCD=y
1128# CONFIG_USB_ACM is not set 1196# CONFIG_USB_ACM is not set
1129# CONFIG_USB_PRINTER is not set 1197# CONFIG_USB_PRINTER is not set
1130# CONFIG_USB_WDM is not set 1198# CONFIG_USB_WDM is not set
1199# CONFIG_USB_TMC is not set
1131 1200
1132# 1201#
1133# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1202# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1149,7 +1218,6 @@ CONFIG_USB_STORAGE=m
1149# CONFIG_USB_STORAGE_ALAUDA is not set 1218# CONFIG_USB_STORAGE_ALAUDA is not set
1150# CONFIG_USB_STORAGE_ONETOUCH is not set 1219# CONFIG_USB_STORAGE_ONETOUCH is not set
1151# CONFIG_USB_STORAGE_KARMA is not set 1220# CONFIG_USB_STORAGE_KARMA is not set
1152# CONFIG_USB_STORAGE_SIERRA is not set
1153# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1221# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1154# CONFIG_USB_LIBUSUAL is not set 1222# CONFIG_USB_LIBUSUAL is not set
1155 1223
@@ -1170,6 +1238,7 @@ CONFIG_USB_STORAGE=m
1170# CONFIG_USB_EMI62 is not set 1238# CONFIG_USB_EMI62 is not set
1171# CONFIG_USB_EMI26 is not set 1239# CONFIG_USB_EMI26 is not set
1172# CONFIG_USB_ADUTUX is not set 1240# CONFIG_USB_ADUTUX is not set
1241# CONFIG_USB_SEVSEG is not set
1173# CONFIG_USB_RIO500 is not set 1242# CONFIG_USB_RIO500 is not set
1174# CONFIG_USB_LEGOTOWER is not set 1243# CONFIG_USB_LEGOTOWER is not set
1175# CONFIG_USB_LCD is not set 1244# CONFIG_USB_LCD is not set
@@ -1187,7 +1256,9 @@ CONFIG_USB_STORAGE=m
1187# CONFIG_USB_IOWARRIOR is not set 1256# CONFIG_USB_IOWARRIOR is not set
1188# CONFIG_USB_TEST is not set 1257# CONFIG_USB_TEST is not set
1189# CONFIG_USB_ISIGHTFW is not set 1258# CONFIG_USB_ISIGHTFW is not set
1259# CONFIG_USB_VST is not set
1190# CONFIG_USB_GADGET is not set 1260# CONFIG_USB_GADGET is not set
1261# CONFIG_UWB is not set
1191# CONFIG_MMC is not set 1262# CONFIG_MMC is not set
1192# CONFIG_MEMSTICK is not set 1263# CONFIG_MEMSTICK is not set
1193# CONFIG_NEW_LEDS is not set 1264# CONFIG_NEW_LEDS is not set
@@ -1197,6 +1268,7 @@ CONFIG_USB_STORAGE=m
1197# CONFIG_RTC_CLASS is not set 1268# CONFIG_RTC_CLASS is not set
1198# CONFIG_DMADEVICES is not set 1269# CONFIG_DMADEVICES is not set
1199# CONFIG_UIO is not set 1270# CONFIG_UIO is not set
1271# CONFIG_STAGING is not set
1200 1272
1201# 1273#
1202# File systems 1274# File systems
@@ -1208,12 +1280,18 @@ CONFIG_EXT3_FS=y
1208CONFIG_EXT3_FS_XATTR=y 1280CONFIG_EXT3_FS_XATTR=y
1209# CONFIG_EXT3_FS_POSIX_ACL is not set 1281# CONFIG_EXT3_FS_POSIX_ACL is not set
1210# CONFIG_EXT3_FS_SECURITY is not set 1282# CONFIG_EXT3_FS_SECURITY is not set
1211# CONFIG_EXT4DEV_FS is not set 1283CONFIG_EXT4_FS=y
1284# CONFIG_EXT4DEV_COMPAT is not set
1285CONFIG_EXT4_FS_XATTR=y
1286# CONFIG_EXT4_FS_POSIX_ACL is not set
1287# CONFIG_EXT4_FS_SECURITY is not set
1212CONFIG_JBD=y 1288CONFIG_JBD=y
1289CONFIG_JBD2=y
1213CONFIG_FS_MBCACHE=y 1290CONFIG_FS_MBCACHE=y
1214# CONFIG_REISERFS_FS is not set 1291# CONFIG_REISERFS_FS is not set
1215# CONFIG_JFS_FS is not set 1292# CONFIG_JFS_FS is not set
1216# CONFIG_FS_POSIX_ACL is not set 1293# CONFIG_FS_POSIX_ACL is not set
1294CONFIG_FILE_LOCKING=y
1217# CONFIG_XFS_FS is not set 1295# CONFIG_XFS_FS is not set
1218# CONFIG_OCFS2_FS is not set 1296# CONFIG_OCFS2_FS is not set
1219CONFIG_DNOTIFY=y 1297CONFIG_DNOTIFY=y
@@ -1248,6 +1326,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1248CONFIG_PROC_FS=y 1326CONFIG_PROC_FS=y
1249CONFIG_PROC_KCORE=y 1327CONFIG_PROC_KCORE=y
1250CONFIG_PROC_SYSCTL=y 1328CONFIG_PROC_SYSCTL=y
1329CONFIG_PROC_PAGE_MONITOR=y
1251CONFIG_SYSFS=y 1330CONFIG_SYSFS=y
1252CONFIG_TMPFS=y 1331CONFIG_TMPFS=y
1253# CONFIG_TMPFS_POSIX_ACL is not set 1332# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1349,9 +1428,8 @@ CONFIG_NLS_ISO8859_1=m
1349# Library routines 1428# Library routines
1350# 1429#
1351CONFIG_BITREVERSE=y 1430CONFIG_BITREVERSE=y
1352# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1353CONFIG_CRC_CCITT=m 1431CONFIG_CRC_CCITT=m
1354# CONFIG_CRC16 is not set 1432CONFIG_CRC16=y
1355CONFIG_CRC_T10DIF=y 1433CONFIG_CRC_T10DIF=y
1356# CONFIG_CRC_ITU_T is not set 1434# CONFIG_CRC_ITU_T is not set
1357CONFIG_CRC32=y 1435CONFIG_CRC32=y
@@ -1404,15 +1482,23 @@ CONFIG_DEBUG_MEMORY_INIT=y
1404# CONFIG_DEBUG_SG is not set 1482# CONFIG_DEBUG_SG is not set
1405# CONFIG_BOOT_PRINTK_DELAY is not set 1483# CONFIG_BOOT_PRINTK_DELAY is not set
1406# CONFIG_RCU_TORTURE_TEST is not set 1484# CONFIG_RCU_TORTURE_TEST is not set
1485# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1407# CONFIG_BACKTRACE_SELF_TEST is not set 1486# CONFIG_BACKTRACE_SELF_TEST is not set
1487# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1408# CONFIG_FAULT_INJECTION is not set 1488# CONFIG_FAULT_INJECTION is not set
1409# CONFIG_LATENCYTOP is not set 1489# CONFIG_LATENCYTOP is not set
1410CONFIG_SYSCTL_SYSCALL_CHECK=y 1490CONFIG_SYSCTL_SYSCALL_CHECK=y
1411CONFIG_HAVE_FTRACE=y 1491CONFIG_HAVE_FUNCTION_TRACER=y
1412CONFIG_HAVE_DYNAMIC_FTRACE=y 1492
1413# CONFIG_FTRACE is not set 1493#
1494# Tracers
1495#
1496# CONFIG_FUNCTION_TRACER is not set
1414# CONFIG_SCHED_TRACER is not set 1497# CONFIG_SCHED_TRACER is not set
1415# CONFIG_CONTEXT_SWITCH_TRACER is not set 1498# CONFIG_CONTEXT_SWITCH_TRACER is not set
1499# CONFIG_BOOT_TRACER is not set
1500# CONFIG_STACK_TRACER is not set
1501# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1416# CONFIG_SAMPLES is not set 1502# CONFIG_SAMPLES is not set
1417CONFIG_HAVE_ARCH_KGDB=y 1503CONFIG_HAVE_ARCH_KGDB=y
1418# CONFIG_KGDB is not set 1504# CONFIG_KGDB is not set
@@ -1421,6 +1507,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1421# CONFIG_DEBUG_PAGEALLOC is not set 1507# CONFIG_DEBUG_PAGEALLOC is not set
1422# CONFIG_CODE_PATCHING_SELFTEST is not set 1508# CONFIG_CODE_PATCHING_SELFTEST is not set
1423# CONFIG_FTR_FIXUP_SELFTEST is not set 1509# CONFIG_FTR_FIXUP_SELFTEST is not set
1510# CONFIG_MSI_BITMAP_SELFTEST is not set
1424CONFIG_XMON=y 1511CONFIG_XMON=y
1425CONFIG_XMON_DEFAULT=y 1512CONFIG_XMON_DEFAULT=y
1426CONFIG_XMON_DISASSEMBLY=y 1513CONFIG_XMON_DISASSEMBLY=y
@@ -1435,14 +1522,19 @@ CONFIG_IRQSTACKS=y
1435# 1522#
1436# CONFIG_KEYS is not set 1523# CONFIG_KEYS is not set
1437# CONFIG_SECURITY is not set 1524# CONFIG_SECURITY is not set
1525# CONFIG_SECURITYFS is not set
1438# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1526# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1439CONFIG_CRYPTO=y 1527CONFIG_CRYPTO=y
1440 1528
1441# 1529#
1442# Crypto core or helper 1530# Crypto core or helper
1443# 1531#
1532# CONFIG_CRYPTO_FIPS is not set
1444CONFIG_CRYPTO_ALGAPI=m 1533CONFIG_CRYPTO_ALGAPI=m
1534CONFIG_CRYPTO_AEAD=m
1445CONFIG_CRYPTO_BLKCIPHER=m 1535CONFIG_CRYPTO_BLKCIPHER=m
1536CONFIG_CRYPTO_HASH=m
1537CONFIG_CRYPTO_RNG=m
1446CONFIG_CRYPTO_MANAGER=m 1538CONFIG_CRYPTO_MANAGER=m
1447# CONFIG_CRYPTO_GF128MUL is not set 1539# CONFIG_CRYPTO_GF128MUL is not set
1448# CONFIG_CRYPTO_NULL is not set 1540# CONFIG_CRYPTO_NULL is not set
@@ -1515,6 +1607,11 @@ CONFIG_CRYPTO_ARC4=m
1515# 1607#
1516# CONFIG_CRYPTO_DEFLATE is not set 1608# CONFIG_CRYPTO_DEFLATE is not set
1517# CONFIG_CRYPTO_LZO is not set 1609# CONFIG_CRYPTO_LZO is not set
1610
1611#
1612# Random Number Generation
1613#
1614# CONFIG_CRYPTO_ANSI_CPRNG is not set
1518# CONFIG_CRYPTO_HW is not set 1615# CONFIG_CRYPTO_HW is not set
1519# CONFIG_PPC_CLOCK is not set 1616# CONFIG_PPC_CLOCK is not set
1520# CONFIG_VIRTUALIZATION is not set 1617# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index cfa5d053ee5e..f85e71ccb989 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:15:06 2008 4# Tue Nov 11 19:36:30 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -21,7 +21,7 @@ CONFIG_SMP=y
21CONFIG_NR_CPUS=4 21CONFIG_NR_CPUS=4
22CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64 23CONFIG_WORD_SIZE=64
24CONFIG_PPC_MERGE=y 24CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
25CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y 26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y 27CONFIG_GENERIC_TIME=y
@@ -112,7 +112,9 @@ CONFIG_SIGNALFD=y
112CONFIG_TIMERFD=y 112CONFIG_TIMERFD=y
113CONFIG_EVENTFD=y 113CONFIG_EVENTFD=y
114CONFIG_SHMEM=y 114CONFIG_SHMEM=y
115CONFIG_AIO=y
115CONFIG_VM_EVENT_COUNTERS=y 116CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_PCI_QUIRKS=y
116CONFIG_SLUB_DEBUG=y 118CONFIG_SLUB_DEBUG=y
117# CONFIG_SLAB is not set 119# CONFIG_SLAB is not set
118CONFIG_SLUB=y 120CONFIG_SLUB=y
@@ -129,8 +131,6 @@ CONFIG_HAVE_KRETPROBES=y
129CONFIG_HAVE_ARCH_TRACEHOOK=y 131CONFIG_HAVE_ARCH_TRACEHOOK=y
130CONFIG_HAVE_DMA_ATTRS=y 132CONFIG_HAVE_DMA_ATTRS=y
131CONFIG_USE_GENERIC_SMP_HELPERS=y 133CONFIG_USE_GENERIC_SMP_HELPERS=y
132# CONFIG_HAVE_CLK is not set
133CONFIG_PROC_PAGE_MONITOR=y
134# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 134# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
135CONFIG_SLABINFO=y 135CONFIG_SLABINFO=y
136CONFIG_RT_MUTEXES=y 136CONFIG_RT_MUTEXES=y
@@ -163,6 +163,8 @@ CONFIG_DEFAULT_AS=y
163# CONFIG_DEFAULT_NOOP is not set 163# CONFIG_DEFAULT_NOOP is not set
164CONFIG_DEFAULT_IOSCHED="anticipatory" 164CONFIG_DEFAULT_IOSCHED="anticipatory"
165CONFIG_CLASSIC_RCU=y 165CONFIG_CLASSIC_RCU=y
166# CONFIG_FREEZER is not set
167CONFIG_PPC_MSI_BITMAP=y
166 168
167# 169#
168# Platform support 170# Platform support
@@ -233,6 +235,8 @@ CONFIG_PREEMPT_NONE=y
233# CONFIG_PREEMPT is not set 235# CONFIG_PREEMPT is not set
234CONFIG_BINFMT_ELF=y 236CONFIG_BINFMT_ELF=y
235CONFIG_COMPAT_BINFMT_ELF=y 237CONFIG_COMPAT_BINFMT_ELF=y
238# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
239# CONFIG_HAVE_AOUT is not set
236# CONFIG_BINFMT_MISC is not set 240# CONFIG_BINFMT_MISC is not set
237CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 241CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
238CONFIG_IOMMU_VMERGE=y 242CONFIG_IOMMU_VMERGE=y
@@ -242,7 +246,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
242CONFIG_ARCH_HAS_WALK_MEMORY=y 246CONFIG_ARCH_HAS_WALK_MEMORY=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 247CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244CONFIG_KEXEC=y 248CONFIG_KEXEC=y
245# CONFIG_CRASH_DUMP is not set
246CONFIG_IRQ_ALL_CPUS=y 249CONFIG_IRQ_ALL_CPUS=y
247# CONFIG_NUMA is not set 250# CONFIG_NUMA is not set
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 251CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -255,14 +258,15 @@ CONFIG_FLATMEM_MANUAL=y
255# CONFIG_SPARSEMEM_MANUAL is not set 258# CONFIG_SPARSEMEM_MANUAL is not set
256CONFIG_FLATMEM=y 259CONFIG_FLATMEM=y
257CONFIG_FLAT_NODE_MEM_MAP=y 260CONFIG_FLAT_NODE_MEM_MAP=y
258# CONFIG_SPARSEMEM_STATIC is not set
259CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 261CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
260CONFIG_PAGEFLAGS_EXTENDED=y 262CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 263CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_MIGRATION is not set 264# CONFIG_MIGRATION is not set
263CONFIG_RESOURCES_64BIT=y 265CONFIG_RESOURCES_64BIT=y
266CONFIG_PHYS_ADDR_T_64BIT=y
264CONFIG_ZONE_DMA_FLAG=1 267CONFIG_ZONE_DMA_FLAG=1
265CONFIG_BOUNCE=y 268CONFIG_BOUNCE=y
269CONFIG_UNEVICTABLE_LRU=y
266# CONFIG_PPC_HAS_HASH_64K is not set 270# CONFIG_PPC_HAS_HASH_64K is not set
267# CONFIG_PPC_64K_PAGES is not set 271# CONFIG_PPC_64K_PAGES is not set
268CONFIG_FORCE_MAX_ZONEORDER=13 272CONFIG_FORCE_MAX_ZONEORDER=13
@@ -292,6 +296,7 @@ CONFIG_PCI_MSI=y
292# CONFIG_PCCARD is not set 296# CONFIG_PCCARD is not set
293# CONFIG_HOTPLUG_PCI is not set 297# CONFIG_HOTPLUG_PCI is not set
294# CONFIG_HAS_RAPIDIO is not set 298# CONFIG_HAS_RAPIDIO is not set
299# CONFIG_RELOCATABLE is not set
295CONFIG_PAGE_OFFSET=0xc000000000000000 300CONFIG_PAGE_OFFSET=0xc000000000000000
296CONFIG_KERNEL_START=0xc000000000000000 301CONFIG_KERNEL_START=0xc000000000000000
297CONFIG_PHYSICAL_START=0x00000000 302CONFIG_PHYSICAL_START=0x00000000
@@ -336,7 +341,6 @@ CONFIG_INET_TCP_DIAG=y
336CONFIG_TCP_CONG_CUBIC=y 341CONFIG_TCP_CONG_CUBIC=y
337CONFIG_DEFAULT_TCP_CONG="cubic" 342CONFIG_DEFAULT_TCP_CONG="cubic"
338# CONFIG_TCP_MD5SIG is not set 343# CONFIG_TCP_MD5SIG is not set
339# CONFIG_IP_VS is not set
340# CONFIG_IPV6 is not set 344# CONFIG_IPV6 is not set
341# CONFIG_NETWORK_SECMARK is not set 345# CONFIG_NETWORK_SECMARK is not set
342CONFIG_NETFILTER=y 346CONFIG_NETFILTER=y
@@ -367,10 +371,12 @@ CONFIG_NF_CONNTRACK_IRC=m
367CONFIG_NF_CONNTRACK_TFTP=m 371CONFIG_NF_CONNTRACK_TFTP=m
368CONFIG_NF_CT_NETLINK=m 372CONFIG_NF_CT_NETLINK=m
369# CONFIG_NETFILTER_XTABLES is not set 373# CONFIG_NETFILTER_XTABLES is not set
374# CONFIG_IP_VS is not set
370 375
371# 376#
372# IP: Netfilter Configuration 377# IP: Netfilter Configuration
373# 378#
379CONFIG_NF_DEFRAG_IPV4=m
374CONFIG_NF_CONNTRACK_IPV4=m 380CONFIG_NF_CONNTRACK_IPV4=m
375CONFIG_NF_CONNTRACK_PROC_COMPAT=y 381CONFIG_NF_CONNTRACK_PROC_COMPAT=y
376CONFIG_IP_NF_QUEUE=m 382CONFIG_IP_NF_QUEUE=m
@@ -381,6 +387,7 @@ CONFIG_IP_NF_QUEUE=m
381# CONFIG_TIPC is not set 387# CONFIG_TIPC is not set
382# CONFIG_ATM is not set 388# CONFIG_ATM is not set
383# CONFIG_BRIDGE is not set 389# CONFIG_BRIDGE is not set
390# CONFIG_NET_DSA is not set
384# CONFIG_VLAN_8021Q is not set 391# CONFIG_VLAN_8021Q is not set
385# CONFIG_DECNET is not set 392# CONFIG_DECNET is not set
386CONFIG_LLC=y 393CONFIG_LLC=y
@@ -402,11 +409,10 @@ CONFIG_LLC=y
402# CONFIG_IRDA is not set 409# CONFIG_IRDA is not set
403# CONFIG_BT is not set 410# CONFIG_BT is not set
404# CONFIG_AF_RXRPC is not set 411# CONFIG_AF_RXRPC is not set
405 412# CONFIG_PHONET is not set
406# 413CONFIG_WIRELESS=y
407# Wireless
408#
409# CONFIG_CFG80211 is not set 414# CONFIG_CFG80211 is not set
415CONFIG_WIRELESS_OLD_REGULATORY=y
410# CONFIG_WIRELESS_EXT is not set 416# CONFIG_WIRELESS_EXT is not set
411# CONFIG_MAC80211 is not set 417# CONFIG_MAC80211 is not set
412# CONFIG_IEEE80211 is not set 418# CONFIG_IEEE80211 is not set
@@ -463,19 +469,18 @@ CONFIG_MISC_DEVICES=y
463# CONFIG_HP_ILO is not set 469# CONFIG_HP_ILO is not set
464CONFIG_HAVE_IDE=y 470CONFIG_HAVE_IDE=y
465CONFIG_IDE=y 471CONFIG_IDE=y
466CONFIG_BLK_DEV_IDE=y
467 472
468# 473#
469# Please see Documentation/ide/ide.txt for help/info on IDE drives 474# Please see Documentation/ide/ide.txt for help/info on IDE drives
470# 475#
471CONFIG_IDE_TIMINGS=y 476CONFIG_IDE_TIMINGS=y
472# CONFIG_BLK_DEV_IDE_SATA is not set 477# CONFIG_BLK_DEV_IDE_SATA is not set
473CONFIG_BLK_DEV_IDEDISK=y 478CONFIG_IDE_GD=y
474# CONFIG_IDEDISK_MULTI_MODE is not set 479CONFIG_IDE_GD_ATA=y
480# CONFIG_IDE_GD_ATAPI is not set
475CONFIG_BLK_DEV_IDECD=y 481CONFIG_BLK_DEV_IDECD=y
476CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 482CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
477# CONFIG_BLK_DEV_IDETAPE is not set 483# CONFIG_BLK_DEV_IDETAPE is not set
478# CONFIG_BLK_DEV_IDEFLOPPY is not set
479# CONFIG_BLK_DEV_IDESCSI is not set 484# CONFIG_BLK_DEV_IDESCSI is not set
480# CONFIG_IDE_TASK_IOCTL is not set 485# CONFIG_IDE_TASK_IOCTL is not set
481CONFIG_IDE_PROC_FS=y 486CONFIG_IDE_PROC_FS=y
@@ -658,6 +663,7 @@ CONFIG_SATA_SVW=y
658# CONFIG_PATA_SCH is not set 663# CONFIG_PATA_SCH is not set
659CONFIG_MD=y 664CONFIG_MD=y
660CONFIG_BLK_DEV_MD=y 665CONFIG_BLK_DEV_MD=y
666CONFIG_MD_AUTODETECT=y
661CONFIG_MD_LINEAR=y 667CONFIG_MD_LINEAR=y
662CONFIG_MD_RAID0=y 668CONFIG_MD_RAID0=y
663CONFIG_MD_RAID1=y 669CONFIG_MD_RAID1=y
@@ -744,14 +750,17 @@ CONFIG_SUNGEM=y
744# CONFIG_IBM_NEW_EMAC_RGMII is not set 750# CONFIG_IBM_NEW_EMAC_RGMII is not set
745# CONFIG_IBM_NEW_EMAC_TAH is not set 751# CONFIG_IBM_NEW_EMAC_TAH is not set
746# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 752# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
753# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
754# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
755# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
747# CONFIG_NET_PCI is not set 756# CONFIG_NET_PCI is not set
748# CONFIG_B44 is not set 757# CONFIG_B44 is not set
758# CONFIG_ATL2 is not set
749CONFIG_NETDEV_1000=y 759CONFIG_NETDEV_1000=y
750CONFIG_ACENIC=y 760CONFIG_ACENIC=y
751CONFIG_ACENIC_OMIT_TIGON_I=y 761CONFIG_ACENIC_OMIT_TIGON_I=y
752# CONFIG_DL2K is not set 762# CONFIG_DL2K is not set
753CONFIG_E1000=y 763CONFIG_E1000=y
754# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
755# CONFIG_E1000E is not set 764# CONFIG_E1000E is not set
756# CONFIG_IP1000 is not set 765# CONFIG_IP1000 is not set
757# CONFIG_IGB is not set 766# CONFIG_IGB is not set
@@ -768,18 +777,22 @@ CONFIG_TIGON3=y
768# CONFIG_QLA3XXX is not set 777# CONFIG_QLA3XXX is not set
769# CONFIG_ATL1 is not set 778# CONFIG_ATL1 is not set
770# CONFIG_ATL1E is not set 779# CONFIG_ATL1E is not set
780# CONFIG_JME is not set
771CONFIG_NETDEV_10000=y 781CONFIG_NETDEV_10000=y
772# CONFIG_CHELSIO_T1 is not set 782# CONFIG_CHELSIO_T1 is not set
773# CONFIG_CHELSIO_T3 is not set 783# CONFIG_CHELSIO_T3 is not set
784# CONFIG_ENIC is not set
774# CONFIG_IXGBE is not set 785# CONFIG_IXGBE is not set
775# CONFIG_IXGB is not set 786# CONFIG_IXGB is not set
776# CONFIG_S2IO is not set 787# CONFIG_S2IO is not set
777# CONFIG_MYRI10GE is not set 788# CONFIG_MYRI10GE is not set
778# CONFIG_NETXEN_NIC is not set 789# CONFIG_NETXEN_NIC is not set
779# CONFIG_NIU is not set 790# CONFIG_NIU is not set
791# CONFIG_MLX4_EN is not set
780# CONFIG_MLX4_CORE is not set 792# CONFIG_MLX4_CORE is not set
781# CONFIG_TEHUTI is not set 793# CONFIG_TEHUTI is not set
782# CONFIG_BNX2X is not set 794# CONFIG_BNX2X is not set
795# CONFIG_QLGE is not set
783# CONFIG_SFC is not set 796# CONFIG_SFC is not set
784CONFIG_TR=y 797CONFIG_TR=y
785CONFIG_IBMOL=y 798CONFIG_IBMOL=y
@@ -804,6 +817,7 @@ CONFIG_USB_USBNET=m
804# CONFIG_USB_NET_AX8817X is not set 817# CONFIG_USB_NET_AX8817X is not set
805CONFIG_USB_NET_CDCETHER=m 818CONFIG_USB_NET_CDCETHER=m
806# CONFIG_USB_NET_DM9601 is not set 819# CONFIG_USB_NET_DM9601 is not set
820# CONFIG_USB_NET_SMSC95XX is not set
807# CONFIG_USB_NET_GL620A is not set 821# CONFIG_USB_NET_GL620A is not set
808# CONFIG_USB_NET_NET1080 is not set 822# CONFIG_USB_NET_NET1080 is not set
809# CONFIG_USB_NET_PLUSB is not set 823# CONFIG_USB_NET_PLUSB is not set
@@ -1015,6 +1029,17 @@ CONFIG_SSB_POSSIBLE=y
1015# CONFIG_MFD_SM501 is not set 1029# CONFIG_MFD_SM501 is not set
1016# CONFIG_HTC_PASIC3 is not set 1030# CONFIG_HTC_PASIC3 is not set
1017# CONFIG_MFD_TMIO is not set 1031# CONFIG_MFD_TMIO is not set
1032# CONFIG_PMIC_DA903X is not set
1033# CONFIG_MFD_WM8400 is not set
1034# CONFIG_MFD_WM8350_I2C is not set
1035
1036#
1037# Voltage and Current regulators
1038#
1039# CONFIG_REGULATOR is not set
1040# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1041# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1042# CONFIG_REGULATOR_BQ24022 is not set
1018 1043
1019# 1044#
1020# Multimedia devices 1045# Multimedia devices
@@ -1044,6 +1069,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1044CONFIG_FB=y 1069CONFIG_FB=y
1045CONFIG_FIRMWARE_EDID=y 1070CONFIG_FIRMWARE_EDID=y
1046CONFIG_FB_DDC=y 1071CONFIG_FB_DDC=y
1072# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1047CONFIG_FB_CFB_FILLRECT=y 1073CONFIG_FB_CFB_FILLRECT=y
1048CONFIG_FB_CFB_COPYAREA=y 1074CONFIG_FB_CFB_COPYAREA=y
1049CONFIG_FB_CFB_IMAGEBLIT=y 1075CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1085,6 +1111,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1085# CONFIG_FB_S3 is not set 1111# CONFIG_FB_S3 is not set
1086# CONFIG_FB_SAVAGE is not set 1112# CONFIG_FB_SAVAGE is not set
1087# CONFIG_FB_SIS is not set 1113# CONFIG_FB_SIS is not set
1114# CONFIG_FB_VIA is not set
1088# CONFIG_FB_NEOMAGIC is not set 1115# CONFIG_FB_NEOMAGIC is not set
1089# CONFIG_FB_KYRO is not set 1116# CONFIG_FB_KYRO is not set
1090# CONFIG_FB_3DFX is not set 1117# CONFIG_FB_3DFX is not set
@@ -1096,6 +1123,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1096# CONFIG_FB_CARMINE is not set 1123# CONFIG_FB_CARMINE is not set
1097# CONFIG_FB_IBM_GXT4500 is not set 1124# CONFIG_FB_IBM_GXT4500 is not set
1098# CONFIG_FB_VIRTUAL is not set 1125# CONFIG_FB_VIRTUAL is not set
1126# CONFIG_FB_METRONOME is not set
1099CONFIG_BACKLIGHT_LCD_SUPPORT=y 1127CONFIG_BACKLIGHT_LCD_SUPPORT=y
1100CONFIG_LCD_CLASS_DEVICE=m 1128CONFIG_LCD_CLASS_DEVICE=m
1101# CONFIG_LCD_ILI9320 is not set 1129# CONFIG_LCD_ILI9320 is not set
@@ -1124,6 +1152,7 @@ CONFIG_LOGO_LINUX_MONO=y
1124CONFIG_LOGO_LINUX_VGA16=y 1152CONFIG_LOGO_LINUX_VGA16=y
1125CONFIG_LOGO_LINUX_CLUT224=y 1153CONFIG_LOGO_LINUX_CLUT224=y
1126CONFIG_SOUND=m 1154CONFIG_SOUND=m
1155CONFIG_SOUND_OSS_CORE=y
1127CONFIG_SND=m 1156CONFIG_SND=m
1128CONFIG_SND_TIMER=m 1157CONFIG_SND_TIMER=m
1129CONFIG_SND_PCM=m 1158CONFIG_SND_PCM=m
@@ -1234,15 +1263,36 @@ CONFIG_HID=y
1234# USB Input Devices 1263# USB Input Devices
1235# 1264#
1236CONFIG_USB_HID=y 1265CONFIG_USB_HID=y
1237# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1238CONFIG_HID_FF=y
1239CONFIG_HID_PID=y 1266CONFIG_HID_PID=y
1267CONFIG_USB_HIDDEV=y
1268
1269#
1270# Special HID drivers
1271#
1272CONFIG_HID_COMPAT=y
1273CONFIG_HID_A4TECH=y
1274CONFIG_HID_APPLE=y
1275CONFIG_HID_BELKIN=y
1276CONFIG_HID_BRIGHT=y
1277CONFIG_HID_CHERRY=y
1278CONFIG_HID_CHICONY=y
1279CONFIG_HID_CYPRESS=y
1280CONFIG_HID_DELL=y
1281CONFIG_HID_EZKEY=y
1282CONFIG_HID_GYRATION=y
1283CONFIG_HID_LOGITECH=y
1240CONFIG_LOGITECH_FF=y 1284CONFIG_LOGITECH_FF=y
1241# CONFIG_LOGIRUMBLEPAD2_FF is not set 1285# CONFIG_LOGIRUMBLEPAD2_FF is not set
1286CONFIG_HID_MICROSOFT=y
1287CONFIG_HID_MONTEREY=y
1288CONFIG_HID_PANTHERLORD=y
1242# CONFIG_PANTHERLORD_FF is not set 1289# CONFIG_PANTHERLORD_FF is not set
1290CONFIG_HID_PETALYNX=y
1291CONFIG_HID_SAMSUNG=y
1292CONFIG_HID_SONY=y
1293CONFIG_HID_SUNPLUS=y
1243CONFIG_THRUSTMASTER_FF=y 1294CONFIG_THRUSTMASTER_FF=y
1244# CONFIG_ZEROPLUS_FF is not set 1295# CONFIG_ZEROPLUS_FF is not set
1245CONFIG_USB_HIDDEV=y
1246CONFIG_USB_SUPPORT=y 1296CONFIG_USB_SUPPORT=y
1247CONFIG_USB_ARCH_HAS_HCD=y 1297CONFIG_USB_ARCH_HAS_HCD=y
1248CONFIG_USB_ARCH_HAS_OHCI=y 1298CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1259,6 +1309,8 @@ CONFIG_USB_DEVICE_CLASS=y
1259# CONFIG_USB_DYNAMIC_MINORS is not set 1309# CONFIG_USB_DYNAMIC_MINORS is not set
1260# CONFIG_USB_OTG is not set 1310# CONFIG_USB_OTG is not set
1261CONFIG_USB_MON=y 1311CONFIG_USB_MON=y
1312# CONFIG_USB_WUSB is not set
1313# CONFIG_USB_WUSB_CBAF is not set
1262 1314
1263# 1315#
1264# USB Host Controller Drivers 1316# USB Host Controller Drivers
@@ -1281,6 +1333,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1281# CONFIG_USB_UHCI_HCD is not set 1333# CONFIG_USB_UHCI_HCD is not set
1282# CONFIG_USB_SL811_HCD is not set 1334# CONFIG_USB_SL811_HCD is not set
1283# CONFIG_USB_R8A66597_HCD is not set 1335# CONFIG_USB_R8A66597_HCD is not set
1336# CONFIG_USB_WHCI_HCD is not set
1337# CONFIG_USB_HWA_HCD is not set
1284 1338
1285# 1339#
1286# USB Device Class drivers 1340# USB Device Class drivers
@@ -1288,6 +1342,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1288CONFIG_USB_ACM=m 1342CONFIG_USB_ACM=m
1289CONFIG_USB_PRINTER=y 1343CONFIG_USB_PRINTER=y
1290# CONFIG_USB_WDM is not set 1344# CONFIG_USB_WDM is not set
1345# CONFIG_USB_TMC is not set
1291 1346
1292# 1347#
1293# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1348# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1309,7 +1364,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
1309# CONFIG_USB_STORAGE_ALAUDA is not set 1364# CONFIG_USB_STORAGE_ALAUDA is not set
1310# CONFIG_USB_STORAGE_ONETOUCH is not set 1365# CONFIG_USB_STORAGE_ONETOUCH is not set
1311# CONFIG_USB_STORAGE_KARMA is not set 1366# CONFIG_USB_STORAGE_KARMA is not set
1312# CONFIG_USB_STORAGE_SIERRA is not set
1313# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1367# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1314# CONFIG_USB_LIBUSUAL is not set 1368# CONFIG_USB_LIBUSUAL is not set
1315 1369
@@ -1385,6 +1439,7 @@ CONFIG_USB_SERIAL_OMNINET=m
1385# CONFIG_USB_EMI62 is not set 1439# CONFIG_USB_EMI62 is not set
1386# CONFIG_USB_EMI26 is not set 1440# CONFIG_USB_EMI26 is not set
1387# CONFIG_USB_ADUTUX is not set 1441# CONFIG_USB_ADUTUX is not set
1442# CONFIG_USB_SEVSEG is not set
1388# CONFIG_USB_RIO500 is not set 1443# CONFIG_USB_RIO500 is not set
1389# CONFIG_USB_LEGOTOWER is not set 1444# CONFIG_USB_LEGOTOWER is not set
1390# CONFIG_USB_LCD is not set 1445# CONFIG_USB_LCD is not set
@@ -1402,7 +1457,9 @@ CONFIG_USB_APPLEDISPLAY=m
1402# CONFIG_USB_IOWARRIOR is not set 1457# CONFIG_USB_IOWARRIOR is not set
1403# CONFIG_USB_TEST is not set 1458# CONFIG_USB_TEST is not set
1404# CONFIG_USB_ISIGHTFW is not set 1459# CONFIG_USB_ISIGHTFW is not set
1460# CONFIG_USB_VST is not set
1405# CONFIG_USB_GADGET is not set 1461# CONFIG_USB_GADGET is not set
1462# CONFIG_UWB is not set
1406# CONFIG_MMC is not set 1463# CONFIG_MMC is not set
1407# CONFIG_MEMSTICK is not set 1464# CONFIG_MEMSTICK is not set
1408# CONFIG_NEW_LEDS is not set 1465# CONFIG_NEW_LEDS is not set
@@ -1412,6 +1469,7 @@ CONFIG_USB_APPLEDISPLAY=m
1412# CONFIG_RTC_CLASS is not set 1469# CONFIG_RTC_CLASS is not set
1413# CONFIG_DMADEVICES is not set 1470# CONFIG_DMADEVICES is not set
1414# CONFIG_UIO is not set 1471# CONFIG_UIO is not set
1472# CONFIG_STAGING is not set
1415 1473
1416# 1474#
1417# File systems 1475# File systems
@@ -1421,14 +1479,20 @@ CONFIG_EXT2_FS_XATTR=y
1421CONFIG_EXT2_FS_POSIX_ACL=y 1479CONFIG_EXT2_FS_POSIX_ACL=y
1422CONFIG_EXT2_FS_SECURITY=y 1480CONFIG_EXT2_FS_SECURITY=y
1423CONFIG_EXT2_FS_XIP=y 1481CONFIG_EXT2_FS_XIP=y
1424CONFIG_FS_XIP=y
1425CONFIG_EXT3_FS=y 1482CONFIG_EXT3_FS=y
1426CONFIG_EXT3_FS_XATTR=y 1483CONFIG_EXT3_FS_XATTR=y
1427CONFIG_EXT3_FS_POSIX_ACL=y 1484CONFIG_EXT3_FS_POSIX_ACL=y
1428CONFIG_EXT3_FS_SECURITY=y 1485CONFIG_EXT3_FS_SECURITY=y
1429# CONFIG_EXT4DEV_FS is not set 1486CONFIG_EXT4_FS=y
1487# CONFIG_EXT4DEV_COMPAT is not set
1488CONFIG_EXT4_FS_XATTR=y
1489# CONFIG_EXT4_FS_POSIX_ACL is not set
1490# CONFIG_EXT4_FS_SECURITY is not set
1491CONFIG_FS_XIP=y
1430CONFIG_JBD=y 1492CONFIG_JBD=y
1431# CONFIG_JBD_DEBUG is not set 1493# CONFIG_JBD_DEBUG is not set
1494CONFIG_JBD2=y
1495# CONFIG_JBD2_DEBUG is not set
1432CONFIG_FS_MBCACHE=y 1496CONFIG_FS_MBCACHE=y
1433CONFIG_REISERFS_FS=y 1497CONFIG_REISERFS_FS=y
1434# CONFIG_REISERFS_CHECK is not set 1498# CONFIG_REISERFS_CHECK is not set
@@ -1438,6 +1502,7 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
1438CONFIG_REISERFS_FS_SECURITY=y 1502CONFIG_REISERFS_FS_SECURITY=y
1439# CONFIG_JFS_FS is not set 1503# CONFIG_JFS_FS is not set
1440CONFIG_FS_POSIX_ACL=y 1504CONFIG_FS_POSIX_ACL=y
1505CONFIG_FILE_LOCKING=y
1441CONFIG_XFS_FS=m 1506CONFIG_XFS_FS=m
1442# CONFIG_XFS_QUOTA is not set 1507# CONFIG_XFS_QUOTA is not set
1443CONFIG_XFS_POSIX_ACL=y 1508CONFIG_XFS_POSIX_ACL=y
@@ -1478,6 +1543,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1478CONFIG_PROC_FS=y 1543CONFIG_PROC_FS=y
1479CONFIG_PROC_KCORE=y 1544CONFIG_PROC_KCORE=y
1480CONFIG_PROC_SYSCTL=y 1545CONFIG_PROC_SYSCTL=y
1546CONFIG_PROC_PAGE_MONITOR=y
1481CONFIG_SYSFS=y 1547CONFIG_SYSFS=y
1482CONFIG_TMPFS=y 1548CONFIG_TMPFS=y
1483# CONFIG_TMPFS_POSIX_ACL is not set 1549# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1521,6 +1587,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1521CONFIG_NFS_COMMON=y 1587CONFIG_NFS_COMMON=y
1522CONFIG_SUNRPC=y 1588CONFIG_SUNRPC=y
1523CONFIG_SUNRPC_GSS=y 1589CONFIG_SUNRPC_GSS=y
1590# CONFIG_SUNRPC_REGISTER_V4 is not set
1524CONFIG_RPCSEC_GSS_KRB5=y 1591CONFIG_RPCSEC_GSS_KRB5=y
1525# CONFIG_RPCSEC_GSS_SPKM3 is not set 1592# CONFIG_RPCSEC_GSS_SPKM3 is not set
1526# CONFIG_SMB_FS is not set 1593# CONFIG_SMB_FS is not set
@@ -1601,9 +1668,8 @@ CONFIG_NLS_UTF8=y
1601# Library routines 1668# Library routines
1602# 1669#
1603CONFIG_BITREVERSE=y 1670CONFIG_BITREVERSE=y
1604# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1605CONFIG_CRC_CCITT=m 1671CONFIG_CRC_CCITT=m
1606# CONFIG_CRC16 is not set 1672CONFIG_CRC16=y
1607CONFIG_CRC_T10DIF=y 1673CONFIG_CRC_T10DIF=y
1608CONFIG_CRC_ITU_T=m 1674CONFIG_CRC_ITU_T=m
1609CONFIG_CRC32=y 1675CONFIG_CRC32=y
@@ -1657,19 +1723,26 @@ CONFIG_DEBUG_BUGVERBOSE=y
1657CONFIG_DEBUG_MEMORY_INIT=y 1723CONFIG_DEBUG_MEMORY_INIT=y
1658# CONFIG_DEBUG_LIST is not set 1724# CONFIG_DEBUG_LIST is not set
1659# CONFIG_DEBUG_SG is not set 1725# CONFIG_DEBUG_SG is not set
1660CONFIG_FRAME_POINTER=y
1661# CONFIG_BOOT_PRINTK_DELAY is not set 1726# CONFIG_BOOT_PRINTK_DELAY is not set
1662# CONFIG_RCU_TORTURE_TEST is not set 1727# CONFIG_RCU_TORTURE_TEST is not set
1728# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1663# CONFIG_BACKTRACE_SELF_TEST is not set 1729# CONFIG_BACKTRACE_SELF_TEST is not set
1730# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1664# CONFIG_FAULT_INJECTION is not set 1731# CONFIG_FAULT_INJECTION is not set
1665CONFIG_LATENCYTOP=y 1732CONFIG_LATENCYTOP=y
1666CONFIG_SYSCTL_SYSCALL_CHECK=y 1733CONFIG_SYSCTL_SYSCALL_CHECK=y
1667CONFIG_HAVE_FTRACE=y 1734CONFIG_HAVE_FUNCTION_TRACER=y
1668CONFIG_HAVE_DYNAMIC_FTRACE=y 1735
1669# CONFIG_FTRACE is not set 1736#
1737# Tracers
1738#
1739# CONFIG_FUNCTION_TRACER is not set
1670# CONFIG_IRQSOFF_TRACER is not set 1740# CONFIG_IRQSOFF_TRACER is not set
1671# CONFIG_SCHED_TRACER is not set 1741# CONFIG_SCHED_TRACER is not set
1672# CONFIG_CONTEXT_SWITCH_TRACER is not set 1742# CONFIG_CONTEXT_SWITCH_TRACER is not set
1743# CONFIG_BOOT_TRACER is not set
1744# CONFIG_STACK_TRACER is not set
1745CONFIG_DYNAMIC_PRINTK_DEBUG=y
1673# CONFIG_SAMPLES is not set 1746# CONFIG_SAMPLES is not set
1674CONFIG_HAVE_ARCH_KGDB=y 1747CONFIG_HAVE_ARCH_KGDB=y
1675# CONFIG_KGDB is not set 1748# CONFIG_KGDB is not set
@@ -1678,6 +1751,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1678# CONFIG_DEBUG_PAGEALLOC is not set 1751# CONFIG_DEBUG_PAGEALLOC is not set
1679# CONFIG_CODE_PATCHING_SELFTEST is not set 1752# CONFIG_CODE_PATCHING_SELFTEST is not set
1680# CONFIG_FTR_FIXUP_SELFTEST is not set 1753# CONFIG_FTR_FIXUP_SELFTEST is not set
1754# CONFIG_MSI_BITMAP_SELFTEST is not set
1681# CONFIG_XMON is not set 1755# CONFIG_XMON is not set
1682CONFIG_IRQSTACKS=y 1756CONFIG_IRQSTACKS=y
1683# CONFIG_VIRQ_DEBUG is not set 1757# CONFIG_VIRQ_DEBUG is not set
@@ -1689,16 +1763,19 @@ CONFIG_BOOTX_TEXT=y
1689# 1763#
1690# CONFIG_KEYS is not set 1764# CONFIG_KEYS is not set
1691# CONFIG_SECURITY is not set 1765# CONFIG_SECURITY is not set
1766# CONFIG_SECURITYFS is not set
1692# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1767# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1693CONFIG_CRYPTO=y 1768CONFIG_CRYPTO=y
1694 1769
1695# 1770#
1696# Crypto core or helper 1771# Crypto core or helper
1697# 1772#
1773# CONFIG_CRYPTO_FIPS is not set
1698CONFIG_CRYPTO_ALGAPI=y 1774CONFIG_CRYPTO_ALGAPI=y
1699CONFIG_CRYPTO_AEAD=m 1775CONFIG_CRYPTO_AEAD=y
1700CONFIG_CRYPTO_BLKCIPHER=y 1776CONFIG_CRYPTO_BLKCIPHER=y
1701CONFIG_CRYPTO_HASH=y 1777CONFIG_CRYPTO_HASH=y
1778CONFIG_CRYPTO_RNG=y
1702CONFIG_CRYPTO_MANAGER=y 1779CONFIG_CRYPTO_MANAGER=y
1703# CONFIG_CRYPTO_GF128MUL is not set 1780# CONFIG_CRYPTO_GF128MUL is not set
1704CONFIG_CRYPTO_NULL=m 1781CONFIG_CRYPTO_NULL=m
@@ -1772,6 +1849,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1772# 1849#
1773CONFIG_CRYPTO_DEFLATE=m 1850CONFIG_CRYPTO_DEFLATE=m
1774# CONFIG_CRYPTO_LZO is not set 1851# CONFIG_CRYPTO_LZO is not set
1852
1853#
1854# Random Number Generation
1855#
1856# CONFIG_CRYPTO_ANSI_CPRNG is not set
1775# CONFIG_CRYPTO_HW is not set 1857# CONFIG_CRYPTO_HW is not set
1776# CONFIG_PPC_CLOCK is not set 1858# CONFIG_PPC_CLOCK is not set
1777# CONFIG_VIRTUALIZATION is not set 1859# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 2c3f13577f4b..f925c555508e 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:15:49 2008 4# Tue Nov 11 19:36:38 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -21,7 +21,7 @@ CONFIG_SMP=y
21CONFIG_NR_CPUS=32 21CONFIG_NR_CPUS=32
22CONFIG_64BIT=y 22CONFIG_64BIT=y
23CONFIG_WORD_SIZE=64 23CONFIG_WORD_SIZE=64
24CONFIG_PPC_MERGE=y 24CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
25CONFIG_MMU=y 25CONFIG_MMU=y
26CONFIG_GENERIC_CMOS_UPDATE=y 26CONFIG_GENERIC_CMOS_UPDATE=y
27CONFIG_GENERIC_TIME=y 27CONFIG_GENERIC_TIME=y
@@ -111,7 +111,9 @@ CONFIG_SIGNALFD=y
111CONFIG_TIMERFD=y 111CONFIG_TIMERFD=y
112CONFIG_EVENTFD=y 112CONFIG_EVENTFD=y
113CONFIG_SHMEM=y 113CONFIG_SHMEM=y
114CONFIG_AIO=y
114CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_PCI_QUIRKS=y
115CONFIG_SLUB_DEBUG=y 117CONFIG_SLUB_DEBUG=y
116# CONFIG_SLAB is not set 118# CONFIG_SLAB is not set
117CONFIG_SLUB=y 119CONFIG_SLUB=y
@@ -127,8 +129,6 @@ CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 129CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 130CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_USE_GENERIC_SMP_HELPERS=y 131CONFIG_USE_GENERIC_SMP_HELPERS=y
130# CONFIG_HAVE_CLK is not set
131CONFIG_PROC_PAGE_MONITOR=y
132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
133CONFIG_SLABINFO=y 133CONFIG_SLABINFO=y
134CONFIG_RT_MUTEXES=y 134CONFIG_RT_MUTEXES=y
@@ -161,6 +161,7 @@ CONFIG_DEFAULT_AS=y
161# CONFIG_DEFAULT_NOOP is not set 161# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="anticipatory" 162CONFIG_DEFAULT_IOSCHED="anticipatory"
163CONFIG_CLASSIC_RCU=y 163CONFIG_CLASSIC_RCU=y
164# CONFIG_FREEZER is not set
164 165
165# 166#
166# Platform support 167# Platform support
@@ -219,6 +220,8 @@ CONFIG_PREEMPT_NONE=y
219# CONFIG_PREEMPT is not set 220# CONFIG_PREEMPT is not set
220CONFIG_BINFMT_ELF=y 221CONFIG_BINFMT_ELF=y
221CONFIG_COMPAT_BINFMT_ELF=y 222CONFIG_COMPAT_BINFMT_ELF=y
223# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
224# CONFIG_HAVE_AOUT is not set
222# CONFIG_BINFMT_MISC is not set 225# CONFIG_BINFMT_MISC is not set
223CONFIG_IOMMU_VMERGE=y 226CONFIG_IOMMU_VMERGE=y
224CONFIG_IOMMU_HELPER=y 227CONFIG_IOMMU_HELPER=y
@@ -226,7 +229,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
226CONFIG_ARCH_HAS_WALK_MEMORY=y 229CONFIG_ARCH_HAS_WALK_MEMORY=y
227CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 230CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
228# CONFIG_KEXEC is not set 231# CONFIG_KEXEC is not set
229# CONFIG_CRASH_DUMP is not set
230CONFIG_IRQ_ALL_CPUS=y 232CONFIG_IRQ_ALL_CPUS=y
231# CONFIG_NUMA is not set 233# CONFIG_NUMA is not set
232CONFIG_ARCH_SELECT_MEMORY_MODEL=y 234CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -239,14 +241,15 @@ CONFIG_FLATMEM_MANUAL=y
239# CONFIG_SPARSEMEM_MANUAL is not set 241# CONFIG_SPARSEMEM_MANUAL is not set
240CONFIG_FLATMEM=y 242CONFIG_FLATMEM=y
241CONFIG_FLAT_NODE_MEM_MAP=y 243CONFIG_FLAT_NODE_MEM_MAP=y
242# CONFIG_SPARSEMEM_STATIC is not set
243CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 244CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
244CONFIG_PAGEFLAGS_EXTENDED=y 245CONFIG_PAGEFLAGS_EXTENDED=y
245CONFIG_SPLIT_PTLOCK_CPUS=4 246CONFIG_SPLIT_PTLOCK_CPUS=4
246# CONFIG_MIGRATION is not set 247# CONFIG_MIGRATION is not set
247CONFIG_RESOURCES_64BIT=y 248CONFIG_RESOURCES_64BIT=y
249CONFIG_PHYS_ADDR_T_64BIT=y
248CONFIG_ZONE_DMA_FLAG=1 250CONFIG_ZONE_DMA_FLAG=1
249CONFIG_BOUNCE=y 251CONFIG_BOUNCE=y
252CONFIG_UNEVICTABLE_LRU=y
250# CONFIG_PPC_HAS_HASH_64K is not set 253# CONFIG_PPC_HAS_HASH_64K is not set
251# CONFIG_PPC_64K_PAGES is not set 254# CONFIG_PPC_64K_PAGES is not set
252CONFIG_FORCE_MAX_ZONEORDER=13 255CONFIG_FORCE_MAX_ZONEORDER=13
@@ -275,6 +278,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
275# CONFIG_PCCARD is not set 278# CONFIG_PCCARD is not set
276# CONFIG_HOTPLUG_PCI is not set 279# CONFIG_HOTPLUG_PCI is not set
277# CONFIG_HAS_RAPIDIO is not set 280# CONFIG_HAS_RAPIDIO is not set
281# CONFIG_RELOCATABLE is not set
278CONFIG_PAGE_OFFSET=0xc000000000000000 282CONFIG_PAGE_OFFSET=0xc000000000000000
279CONFIG_KERNEL_START=0xc000000000000000 283CONFIG_KERNEL_START=0xc000000000000000
280CONFIG_PHYSICAL_START=0x00000000 284CONFIG_PHYSICAL_START=0x00000000
@@ -319,7 +323,6 @@ CONFIG_INET_TCP_DIAG=y
319CONFIG_TCP_CONG_CUBIC=y 323CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic" 324CONFIG_DEFAULT_TCP_CONG="cubic"
321# CONFIG_TCP_MD5SIG is not set 325# CONFIG_TCP_MD5SIG is not set
322# CONFIG_IP_VS is not set
323# CONFIG_IPV6 is not set 326# CONFIG_IPV6 is not set
324# CONFIG_NETWORK_SECMARK is not set 327# CONFIG_NETWORK_SECMARK is not set
325CONFIG_NETFILTER=y 328CONFIG_NETFILTER=y
@@ -349,15 +352,17 @@ CONFIG_NF_CONNTRACK_IRC=m
349# CONFIG_NF_CONNTRACK_SIP is not set 352# CONFIG_NF_CONNTRACK_SIP is not set
350CONFIG_NF_CONNTRACK_TFTP=m 353CONFIG_NF_CONNTRACK_TFTP=m
351CONFIG_NF_CT_NETLINK=m 354CONFIG_NF_CT_NETLINK=m
355CONFIG_NETFILTER_TPROXY=m
352CONFIG_NETFILTER_XTABLES=m 356CONFIG_NETFILTER_XTABLES=m
353CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 357CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
354CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 358CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
355CONFIG_NETFILTER_XT_TARGET_DSCP=m 359CONFIG_NETFILTER_XT_TARGET_DSCP=m
356CONFIG_NETFILTER_XT_TARGET_MARK=m 360CONFIG_NETFILTER_XT_TARGET_MARK=m
357CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
358# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 361# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
362CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
359# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 363# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
360CONFIG_NETFILTER_XT_TARGET_RATEEST=m 364CONFIG_NETFILTER_XT_TARGET_RATEEST=m
365CONFIG_NETFILTER_XT_TARGET_TPROXY=m
361# CONFIG_NETFILTER_XT_TARGET_TRACE is not set 366# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
362# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 367# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
363CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 368CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -369,40 +374,44 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
369# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 374# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
370CONFIG_NETFILTER_XT_MATCH_DSCP=m 375CONFIG_NETFILTER_XT_MATCH_DSCP=m
371# CONFIG_NETFILTER_XT_MATCH_ESP is not set 376# CONFIG_NETFILTER_XT_MATCH_ESP is not set
377# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
372# CONFIG_NETFILTER_XT_MATCH_HELPER is not set 378# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
373CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 379CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
374CONFIG_NETFILTER_XT_MATCH_LENGTH=m 380CONFIG_NETFILTER_XT_MATCH_LENGTH=m
375CONFIG_NETFILTER_XT_MATCH_LIMIT=m 381CONFIG_NETFILTER_XT_MATCH_LIMIT=m
376CONFIG_NETFILTER_XT_MATCH_MAC=m 382CONFIG_NETFILTER_XT_MATCH_MAC=m
377CONFIG_NETFILTER_XT_MATCH_MARK=m 383CONFIG_NETFILTER_XT_MATCH_MARK=m
384# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
378CONFIG_NETFILTER_XT_MATCH_OWNER=m 385CONFIG_NETFILTER_XT_MATCH_OWNER=m
379# CONFIG_NETFILTER_XT_MATCH_POLICY is not set 386# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
380# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
381CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 387CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
382# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 388# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
383CONFIG_NETFILTER_XT_MATCH_RATEEST=m 389CONFIG_NETFILTER_XT_MATCH_RATEEST=m
384CONFIG_NETFILTER_XT_MATCH_REALM=m 390CONFIG_NETFILTER_XT_MATCH_REALM=m
391CONFIG_NETFILTER_XT_MATCH_RECENT=m
392# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
385CONFIG_NETFILTER_XT_MATCH_SCTP=m 393CONFIG_NETFILTER_XT_MATCH_SCTP=m
394# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
386# CONFIG_NETFILTER_XT_MATCH_STATE is not set 395# CONFIG_NETFILTER_XT_MATCH_STATE is not set
387# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 396# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
388CONFIG_NETFILTER_XT_MATCH_STRING=m 397CONFIG_NETFILTER_XT_MATCH_STRING=m
389CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 398CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
390CONFIG_NETFILTER_XT_MATCH_TIME=m 399CONFIG_NETFILTER_XT_MATCH_TIME=m
391# CONFIG_NETFILTER_XT_MATCH_U32 is not set 400# CONFIG_NETFILTER_XT_MATCH_U32 is not set
392# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 401# CONFIG_IP_VS is not set
393 402
394# 403#
395# IP: Netfilter Configuration 404# IP: Netfilter Configuration
396# 405#
406CONFIG_NF_DEFRAG_IPV4=m
397CONFIG_NF_CONNTRACK_IPV4=m 407CONFIG_NF_CONNTRACK_IPV4=m
398CONFIG_NF_CONNTRACK_PROC_COMPAT=y 408CONFIG_NF_CONNTRACK_PROC_COMPAT=y
399CONFIG_IP_NF_QUEUE=m 409CONFIG_IP_NF_QUEUE=m
400CONFIG_IP_NF_IPTABLES=m 410CONFIG_IP_NF_IPTABLES=m
401CONFIG_IP_NF_MATCH_RECENT=m 411CONFIG_IP_NF_MATCH_ADDRTYPE=m
402CONFIG_IP_NF_MATCH_ECN=m
403# CONFIG_IP_NF_MATCH_AH is not set 412# CONFIG_IP_NF_MATCH_AH is not set
413CONFIG_IP_NF_MATCH_ECN=m
404CONFIG_IP_NF_MATCH_TTL=m 414CONFIG_IP_NF_MATCH_TTL=m
405CONFIG_IP_NF_MATCH_ADDRTYPE=m
406CONFIG_IP_NF_FILTER=m 415CONFIG_IP_NF_FILTER=m
407CONFIG_IP_NF_TARGET_REJECT=m 416CONFIG_IP_NF_TARGET_REJECT=m
408CONFIG_IP_NF_TARGET_LOG=m 417CONFIG_IP_NF_TARGET_LOG=m
@@ -410,8 +419,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
410CONFIG_NF_NAT=m 419CONFIG_NF_NAT=m
411CONFIG_NF_NAT_NEEDED=y 420CONFIG_NF_NAT_NEEDED=y
412CONFIG_IP_NF_TARGET_MASQUERADE=m 421CONFIG_IP_NF_TARGET_MASQUERADE=m
413CONFIG_IP_NF_TARGET_REDIRECT=m
414CONFIG_IP_NF_TARGET_NETMAP=m 422CONFIG_IP_NF_TARGET_NETMAP=m
423CONFIG_IP_NF_TARGET_REDIRECT=m
415# CONFIG_NF_NAT_SNMP_BASIC is not set 424# CONFIG_NF_NAT_SNMP_BASIC is not set
416CONFIG_NF_NAT_FTP=m 425CONFIG_NF_NAT_FTP=m
417CONFIG_NF_NAT_IRC=m 426CONFIG_NF_NAT_IRC=m
@@ -421,9 +430,9 @@ CONFIG_NF_NAT_TFTP=m
421# CONFIG_NF_NAT_H323 is not set 430# CONFIG_NF_NAT_H323 is not set
422# CONFIG_NF_NAT_SIP is not set 431# CONFIG_NF_NAT_SIP is not set
423CONFIG_IP_NF_MANGLE=m 432CONFIG_IP_NF_MANGLE=m
433CONFIG_IP_NF_TARGET_CLUSTERIP=m
424CONFIG_IP_NF_TARGET_ECN=m 434CONFIG_IP_NF_TARGET_ECN=m
425CONFIG_IP_NF_TARGET_TTL=m 435CONFIG_IP_NF_TARGET_TTL=m
426CONFIG_IP_NF_TARGET_CLUSTERIP=m
427CONFIG_IP_NF_RAW=m 436CONFIG_IP_NF_RAW=m
428CONFIG_IP_NF_ARPTABLES=m 437CONFIG_IP_NF_ARPTABLES=m
429CONFIG_IP_NF_ARPFILTER=m 438CONFIG_IP_NF_ARPFILTER=m
@@ -438,6 +447,7 @@ CONFIG_SCTP_HMAC_MD5=y
438# CONFIG_TIPC is not set 447# CONFIG_TIPC is not set
439# CONFIG_ATM is not set 448# CONFIG_ATM is not set
440# CONFIG_BRIDGE is not set 449# CONFIG_BRIDGE is not set
450# CONFIG_NET_DSA is not set
441# CONFIG_VLAN_8021Q is not set 451# CONFIG_VLAN_8021Q is not set
442# CONFIG_DECNET is not set 452# CONFIG_DECNET is not set
443CONFIG_LLC=y 453CONFIG_LLC=y
@@ -460,14 +470,8 @@ CONFIG_NET_CLS_ROUTE=y
460# CONFIG_IRDA is not set 470# CONFIG_IRDA is not set
461# CONFIG_BT is not set 471# CONFIG_BT is not set
462# CONFIG_AF_RXRPC is not set 472# CONFIG_AF_RXRPC is not set
463 473# CONFIG_PHONET is not set
464# 474# CONFIG_WIRELESS is not set
465# Wireless
466#
467# CONFIG_CFG80211 is not set
468# CONFIG_WIRELESS_EXT is not set
469# CONFIG_MAC80211 is not set
470# CONFIG_IEEE80211 is not set
471# CONFIG_RFKILL is not set 475# CONFIG_RFKILL is not set
472# CONFIG_NET_9P is not set 476# CONFIG_NET_9P is not set
473 477
@@ -597,6 +601,7 @@ CONFIG_SCSI_IBMVSCSI=m
597# CONFIG_ATA is not set 601# CONFIG_ATA is not set
598CONFIG_MD=y 602CONFIG_MD=y
599CONFIG_BLK_DEV_MD=y 603CONFIG_BLK_DEV_MD=y
604CONFIG_MD_AUTODETECT=y
600CONFIG_MD_LINEAR=y 605CONFIG_MD_LINEAR=y
601CONFIG_MD_RAID0=y 606CONFIG_MD_RAID0=y
602CONFIG_MD_RAID1=y 607CONFIG_MD_RAID1=y
@@ -647,6 +652,9 @@ CONFIG_MII=y
647# CONFIG_IBM_NEW_EMAC_RGMII is not set 652# CONFIG_IBM_NEW_EMAC_RGMII is not set
648# CONFIG_IBM_NEW_EMAC_TAH is not set 653# CONFIG_IBM_NEW_EMAC_TAH is not set
649# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 654# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
655# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
656# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
657# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
650CONFIG_NET_PCI=y 658CONFIG_NET_PCI=y
651CONFIG_PCNET32=y 659CONFIG_PCNET32=y
652# CONFIG_AMD8111_ETH is not set 660# CONFIG_AMD8111_ETH is not set
@@ -667,12 +675,12 @@ CONFIG_E100=y
667# CONFIG_TLAN is not set 675# CONFIG_TLAN is not set
668# CONFIG_VIA_RHINE is not set 676# CONFIG_VIA_RHINE is not set
669# CONFIG_SC92031 is not set 677# CONFIG_SC92031 is not set
678# CONFIG_ATL2 is not set
670CONFIG_NETDEV_1000=y 679CONFIG_NETDEV_1000=y
671CONFIG_ACENIC=m 680CONFIG_ACENIC=m
672# CONFIG_ACENIC_OMIT_TIGON_I is not set 681# CONFIG_ACENIC_OMIT_TIGON_I is not set
673# CONFIG_DL2K is not set 682# CONFIG_DL2K is not set
674CONFIG_E1000=m 683CONFIG_E1000=m
675# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
676# CONFIG_E1000E is not set 684# CONFIG_E1000E is not set
677# CONFIG_IP1000 is not set 685# CONFIG_IP1000 is not set
678# CONFIG_IGB is not set 686# CONFIG_IGB is not set
@@ -689,18 +697,22 @@ CONFIG_E1000=m
689# CONFIG_QLA3XXX is not set 697# CONFIG_QLA3XXX is not set
690# CONFIG_ATL1 is not set 698# CONFIG_ATL1 is not set
691# CONFIG_ATL1E is not set 699# CONFIG_ATL1E is not set
700# CONFIG_JME is not set
692CONFIG_NETDEV_10000=y 701CONFIG_NETDEV_10000=y
693# CONFIG_CHELSIO_T1 is not set 702# CONFIG_CHELSIO_T1 is not set
694# CONFIG_CHELSIO_T3 is not set 703# CONFIG_CHELSIO_T3 is not set
704# CONFIG_ENIC is not set
695# CONFIG_IXGBE is not set 705# CONFIG_IXGBE is not set
696# CONFIG_IXGB is not set 706# CONFIG_IXGB is not set
697# CONFIG_S2IO is not set 707# CONFIG_S2IO is not set
698# CONFIG_MYRI10GE is not set 708# CONFIG_MYRI10GE is not set
699# CONFIG_NETXEN_NIC is not set 709# CONFIG_NETXEN_NIC is not set
700# CONFIG_NIU is not set 710# CONFIG_NIU is not set
711# CONFIG_MLX4_EN is not set
701# CONFIG_MLX4_CORE is not set 712# CONFIG_MLX4_CORE is not set
702# CONFIG_TEHUTI is not set 713# CONFIG_TEHUTI is not set
703# CONFIG_BNX2X is not set 714# CONFIG_BNX2X is not set
715# CONFIG_QLGE is not set
704# CONFIG_SFC is not set 716# CONFIG_SFC is not set
705CONFIG_TR=y 717CONFIG_TR=y
706CONFIG_IBMOL=y 718CONFIG_IBMOL=y
@@ -838,6 +850,14 @@ CONFIG_SSB_POSSIBLE=y
838# CONFIG_MFD_TMIO is not set 850# CONFIG_MFD_TMIO is not set
839 851
840# 852#
853# Voltage and Current regulators
854#
855# CONFIG_REGULATOR is not set
856# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
857# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
858# CONFIG_REGULATOR_BQ24022 is not set
859
860#
841# Multimedia devices 861# Multimedia devices
842# 862#
843 863
@@ -877,6 +897,7 @@ CONFIG_DUMMY_CONSOLE=y
877# CONFIG_SOUND is not set 897# CONFIG_SOUND is not set
878# CONFIG_HID_SUPPORT is not set 898# CONFIG_HID_SUPPORT is not set
879# CONFIG_USB_SUPPORT is not set 899# CONFIG_USB_SUPPORT is not set
900# CONFIG_UWB is not set
880# CONFIG_MMC is not set 901# CONFIG_MMC is not set
881# CONFIG_MEMSTICK is not set 902# CONFIG_MEMSTICK is not set
882# CONFIG_NEW_LEDS is not set 903# CONFIG_NEW_LEDS is not set
@@ -886,6 +907,7 @@ CONFIG_DUMMY_CONSOLE=y
886# CONFIG_RTC_CLASS is not set 907# CONFIG_RTC_CLASS is not set
887# CONFIG_DMADEVICES is not set 908# CONFIG_DMADEVICES is not set
888# CONFIG_UIO is not set 909# CONFIG_UIO is not set
910# CONFIG_STAGING is not set
889 911
890# 912#
891# File systems 913# File systems
@@ -895,14 +917,20 @@ CONFIG_EXT2_FS_XATTR=y
895CONFIG_EXT2_FS_POSIX_ACL=y 917CONFIG_EXT2_FS_POSIX_ACL=y
896CONFIG_EXT2_FS_SECURITY=y 918CONFIG_EXT2_FS_SECURITY=y
897CONFIG_EXT2_FS_XIP=y 919CONFIG_EXT2_FS_XIP=y
898CONFIG_FS_XIP=y
899CONFIG_EXT3_FS=y 920CONFIG_EXT3_FS=y
900CONFIG_EXT3_FS_XATTR=y 921CONFIG_EXT3_FS_XATTR=y
901CONFIG_EXT3_FS_POSIX_ACL=y 922CONFIG_EXT3_FS_POSIX_ACL=y
902CONFIG_EXT3_FS_SECURITY=y 923CONFIG_EXT3_FS_SECURITY=y
903# CONFIG_EXT4DEV_FS is not set 924CONFIG_EXT4_FS=y
925# CONFIG_EXT4DEV_COMPAT is not set
926CONFIG_EXT4_FS_XATTR=y
927# CONFIG_EXT4_FS_POSIX_ACL is not set
928# CONFIG_EXT4_FS_SECURITY is not set
929CONFIG_FS_XIP=y
904CONFIG_JBD=y 930CONFIG_JBD=y
905# CONFIG_JBD_DEBUG is not set 931# CONFIG_JBD_DEBUG is not set
932CONFIG_JBD2=y
933# CONFIG_JBD2_DEBUG is not set
906CONFIG_FS_MBCACHE=y 934CONFIG_FS_MBCACHE=y
907CONFIG_REISERFS_FS=y 935CONFIG_REISERFS_FS=y
908# CONFIG_REISERFS_CHECK is not set 936# CONFIG_REISERFS_CHECK is not set
@@ -916,6 +944,7 @@ CONFIG_JFS_SECURITY=y
916# CONFIG_JFS_DEBUG is not set 944# CONFIG_JFS_DEBUG is not set
917# CONFIG_JFS_STATISTICS is not set 945# CONFIG_JFS_STATISTICS is not set
918CONFIG_FS_POSIX_ACL=y 946CONFIG_FS_POSIX_ACL=y
947CONFIG_FILE_LOCKING=y
919CONFIG_XFS_FS=m 948CONFIG_XFS_FS=m
920# CONFIG_XFS_QUOTA is not set 949# CONFIG_XFS_QUOTA is not set
921CONFIG_XFS_POSIX_ACL=y 950CONFIG_XFS_POSIX_ACL=y
@@ -958,6 +987,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
958CONFIG_PROC_FS=y 987CONFIG_PROC_FS=y
959CONFIG_PROC_KCORE=y 988CONFIG_PROC_KCORE=y
960CONFIG_PROC_SYSCTL=y 989CONFIG_PROC_SYSCTL=y
990CONFIG_PROC_PAGE_MONITOR=y
961CONFIG_SYSFS=y 991CONFIG_SYSFS=y
962CONFIG_TMPFS=y 992CONFIG_TMPFS=y
963CONFIG_TMPFS_POSIX_ACL=y 993CONFIG_TMPFS_POSIX_ACL=y
@@ -1001,6 +1031,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1001CONFIG_NFS_COMMON=y 1031CONFIG_NFS_COMMON=y
1002CONFIG_SUNRPC=y 1032CONFIG_SUNRPC=y
1003CONFIG_SUNRPC_GSS=y 1033CONFIG_SUNRPC_GSS=y
1034# CONFIG_SUNRPC_REGISTER_V4 is not set
1004CONFIG_RPCSEC_GSS_KRB5=y 1035CONFIG_RPCSEC_GSS_KRB5=y
1005CONFIG_RPCSEC_GSS_SPKM3=m 1036CONFIG_RPCSEC_GSS_SPKM3=m
1006# CONFIG_SMB_FS is not set 1037# CONFIG_SMB_FS is not set
@@ -1067,9 +1098,8 @@ CONFIG_DLM=m
1067# Library routines 1098# Library routines
1068# 1099#
1069CONFIG_BITREVERSE=y 1100CONFIG_BITREVERSE=y
1070# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1071CONFIG_CRC_CCITT=m 1101CONFIG_CRC_CCITT=m
1072# CONFIG_CRC16 is not set 1102CONFIG_CRC16=y
1073CONFIG_CRC_T10DIF=y 1103CONFIG_CRC_T10DIF=y
1074CONFIG_CRC_ITU_T=m 1104CONFIG_CRC_ITU_T=m
1075CONFIG_CRC32=y 1105CONFIG_CRC32=y
@@ -1127,19 +1157,26 @@ CONFIG_DEBUG_BUGVERBOSE=y
1127CONFIG_DEBUG_MEMORY_INIT=y 1157CONFIG_DEBUG_MEMORY_INIT=y
1128# CONFIG_DEBUG_LIST is not set 1158# CONFIG_DEBUG_LIST is not set
1129# CONFIG_DEBUG_SG is not set 1159# CONFIG_DEBUG_SG is not set
1130CONFIG_FRAME_POINTER=y
1131# CONFIG_BOOT_PRINTK_DELAY is not set 1160# CONFIG_BOOT_PRINTK_DELAY is not set
1132# CONFIG_RCU_TORTURE_TEST is not set 1161# CONFIG_RCU_TORTURE_TEST is not set
1162# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1133# CONFIG_BACKTRACE_SELF_TEST is not set 1163# CONFIG_BACKTRACE_SELF_TEST is not set
1164# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1134# CONFIG_FAULT_INJECTION is not set 1165# CONFIG_FAULT_INJECTION is not set
1135CONFIG_LATENCYTOP=y 1166CONFIG_LATENCYTOP=y
1136CONFIG_SYSCTL_SYSCALL_CHECK=y 1167CONFIG_SYSCTL_SYSCALL_CHECK=y
1137CONFIG_HAVE_FTRACE=y 1168CONFIG_HAVE_FUNCTION_TRACER=y
1138CONFIG_HAVE_DYNAMIC_FTRACE=y 1169
1139# CONFIG_FTRACE is not set 1170#
1171# Tracers
1172#
1173# CONFIG_FUNCTION_TRACER is not set
1140# CONFIG_IRQSOFF_TRACER is not set 1174# CONFIG_IRQSOFF_TRACER is not set
1141# CONFIG_SCHED_TRACER is not set 1175# CONFIG_SCHED_TRACER is not set
1142# CONFIG_CONTEXT_SWITCH_TRACER is not set 1176# CONFIG_CONTEXT_SWITCH_TRACER is not set
1177# CONFIG_BOOT_TRACER is not set
1178# CONFIG_STACK_TRACER is not set
1179CONFIG_DYNAMIC_PRINTK_DEBUG=y
1143# CONFIG_SAMPLES is not set 1180# CONFIG_SAMPLES is not set
1144CONFIG_HAVE_ARCH_KGDB=y 1181CONFIG_HAVE_ARCH_KGDB=y
1145# CONFIG_KGDB is not set 1182# CONFIG_KGDB is not set
@@ -1148,6 +1185,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1148# CONFIG_DEBUG_PAGEALLOC is not set 1185# CONFIG_DEBUG_PAGEALLOC is not set
1149# CONFIG_CODE_PATCHING_SELFTEST is not set 1186# CONFIG_CODE_PATCHING_SELFTEST is not set
1150# CONFIG_FTR_FIXUP_SELFTEST is not set 1187# CONFIG_FTR_FIXUP_SELFTEST is not set
1188# CONFIG_MSI_BITMAP_SELFTEST is not set
1151# CONFIG_XMON is not set 1189# CONFIG_XMON is not set
1152CONFIG_IRQSTACKS=y 1190CONFIG_IRQSTACKS=y
1153# CONFIG_VIRQ_DEBUG is not set 1191# CONFIG_VIRQ_DEBUG is not set
@@ -1159,16 +1197,19 @@ CONFIG_IRQSTACKS=y
1159# 1197#
1160# CONFIG_KEYS is not set 1198# CONFIG_KEYS is not set
1161# CONFIG_SECURITY is not set 1199# CONFIG_SECURITY is not set
1200# CONFIG_SECURITYFS is not set
1162# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1201# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1163CONFIG_CRYPTO=y 1202CONFIG_CRYPTO=y
1164 1203
1165# 1204#
1166# Crypto core or helper 1205# Crypto core or helper
1167# 1206#
1207# CONFIG_CRYPTO_FIPS is not set
1168CONFIG_CRYPTO_ALGAPI=y 1208CONFIG_CRYPTO_ALGAPI=y
1169CONFIG_CRYPTO_AEAD=m 1209CONFIG_CRYPTO_AEAD=y
1170CONFIG_CRYPTO_BLKCIPHER=y 1210CONFIG_CRYPTO_BLKCIPHER=y
1171CONFIG_CRYPTO_HASH=y 1211CONFIG_CRYPTO_HASH=y
1212CONFIG_CRYPTO_RNG=y
1172CONFIG_CRYPTO_MANAGER=y 1213CONFIG_CRYPTO_MANAGER=y
1173# CONFIG_CRYPTO_GF128MUL is not set 1214# CONFIG_CRYPTO_GF128MUL is not set
1174CONFIG_CRYPTO_NULL=m 1215CONFIG_CRYPTO_NULL=m
@@ -1242,6 +1283,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1242# 1283#
1243CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1244# CONFIG_CRYPTO_LZO is not set 1285# CONFIG_CRYPTO_LZO is not set
1286
1287#
1288# Random Number Generation
1289#
1290# CONFIG_CRYPTO_ANSI_CPRNG is not set
1245# CONFIG_CRYPTO_HW is not set 1291# CONFIG_CRYPTO_HW is not set
1246# CONFIG_PPC_CLOCK is not set 1292# CONFIG_PPC_CLOCK is not set
1247# CONFIG_VIRTUALIZATION is not set 1293# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 1a3b6423222b..045f1b008ce5 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:18:58 2008 4# Tue Nov 11 19:36:45 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -20,7 +20,7 @@ CONFIG_SMP=y
20CONFIG_NR_CPUS=4 20CONFIG_NR_CPUS=4
21CONFIG_64BIT=y 21CONFIG_64BIT=y
22CONFIG_WORD_SIZE=64 22CONFIG_WORD_SIZE=64
23CONFIG_PPC_MERGE=y 23CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
24CONFIG_MMU=y 24CONFIG_MMU=y
25CONFIG_GENERIC_CMOS_UPDATE=y 25CONFIG_GENERIC_CMOS_UPDATE=y
26CONFIG_GENERIC_TIME=y 26CONFIG_GENERIC_TIME=y
@@ -107,7 +107,9 @@ CONFIG_SIGNALFD=y
107CONFIG_TIMERFD=y 107CONFIG_TIMERFD=y
108CONFIG_EVENTFD=y 108CONFIG_EVENTFD=y
109CONFIG_SHMEM=y 109CONFIG_SHMEM=y
110CONFIG_AIO=y
110CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_PCI_QUIRKS=y
111CONFIG_SLUB_DEBUG=y 113CONFIG_SLUB_DEBUG=y
112# CONFIG_SLAB is not set 114# CONFIG_SLAB is not set
113CONFIG_SLUB=y 115CONFIG_SLUB=y
@@ -125,8 +127,6 @@ CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 128CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_USE_GENERIC_SMP_HELPERS=y 129CONFIG_USE_GENERIC_SMP_HELPERS=y
128# CONFIG_HAVE_CLK is not set
129CONFIG_PROC_PAGE_MONITOR=y
130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
131CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
132CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
@@ -159,6 +159,8 @@ CONFIG_DEFAULT_AS=y
159# CONFIG_DEFAULT_NOOP is not set 159# CONFIG_DEFAULT_NOOP is not set
160CONFIG_DEFAULT_IOSCHED="anticipatory" 160CONFIG_DEFAULT_IOSCHED="anticipatory"
161CONFIG_CLASSIC_RCU=y 161CONFIG_CLASSIC_RCU=y
162# CONFIG_FREEZER is not set
163CONFIG_PPC_MSI_BITMAP=y
162 164
163# 165#
164# Platform support 166# Platform support
@@ -213,6 +215,8 @@ CONFIG_PREEMPT_NONE=y
213# CONFIG_PREEMPT is not set 215# CONFIG_PREEMPT is not set
214CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
215CONFIG_COMPAT_BINFMT_ELF=y 217CONFIG_COMPAT_BINFMT_ELF=y
218# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
219# CONFIG_HAVE_AOUT is not set
216# CONFIG_BINFMT_MISC is not set 220# CONFIG_BINFMT_MISC is not set
217CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 221CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
218CONFIG_IOMMU_VMERGE=y 222CONFIG_IOMMU_VMERGE=y
@@ -221,7 +225,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
221CONFIG_ARCH_HAS_WALK_MEMORY=y 225CONFIG_ARCH_HAS_WALK_MEMORY=y
222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 226CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
223CONFIG_KEXEC=y 227CONFIG_KEXEC=y
224# CONFIG_CRASH_DUMP is not set
225CONFIG_IRQ_ALL_CPUS=y 228CONFIG_IRQ_ALL_CPUS=y
226# CONFIG_NUMA is not set 229# CONFIG_NUMA is not set
227CONFIG_ARCH_SELECT_MEMORY_MODEL=y 230CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -234,14 +237,15 @@ CONFIG_FLATMEM_MANUAL=y
234# CONFIG_SPARSEMEM_MANUAL is not set 237# CONFIG_SPARSEMEM_MANUAL is not set
235CONFIG_FLATMEM=y 238CONFIG_FLATMEM=y
236CONFIG_FLAT_NODE_MEM_MAP=y 239CONFIG_FLAT_NODE_MEM_MAP=y
237# CONFIG_SPARSEMEM_STATIC is not set
238CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 240CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
239CONFIG_PAGEFLAGS_EXTENDED=y 241CONFIG_PAGEFLAGS_EXTENDED=y
240CONFIG_SPLIT_PTLOCK_CPUS=4 242CONFIG_SPLIT_PTLOCK_CPUS=4
241# CONFIG_MIGRATION is not set 243# CONFIG_MIGRATION is not set
242CONFIG_RESOURCES_64BIT=y 244CONFIG_RESOURCES_64BIT=y
245CONFIG_PHYS_ADDR_T_64BIT=y
243CONFIG_ZONE_DMA_FLAG=1 246CONFIG_ZONE_DMA_FLAG=1
244CONFIG_BOUNCE=y 247CONFIG_BOUNCE=y
248CONFIG_UNEVICTABLE_LRU=y
245# CONFIG_PPC_HAS_HASH_64K is not set 249# CONFIG_PPC_HAS_HASH_64K is not set
246# CONFIG_PPC_64K_PAGES is not set 250# CONFIG_PPC_64K_PAGES is not set
247CONFIG_FORCE_MAX_ZONEORDER=13 251CONFIG_FORCE_MAX_ZONEORDER=13
@@ -265,11 +269,12 @@ CONFIG_PCI_SYSCALL=y
265# CONFIG_PCIEPORTBUS is not set 269# CONFIG_PCIEPORTBUS is not set
266CONFIG_ARCH_SUPPORTS_MSI=y 270CONFIG_ARCH_SUPPORTS_MSI=y
267CONFIG_PCI_MSI=y 271CONFIG_PCI_MSI=y
268CONFIG_PCI_LEGACY=y 272# CONFIG_PCI_LEGACY is not set
269# CONFIG_PCI_DEBUG is not set 273# CONFIG_PCI_DEBUG is not set
270# CONFIG_PCCARD is not set 274# CONFIG_PCCARD is not set
271# CONFIG_HOTPLUG_PCI is not set 275# CONFIG_HOTPLUG_PCI is not set
272# CONFIG_HAS_RAPIDIO is not set 276# CONFIG_HAS_RAPIDIO is not set
277# CONFIG_RELOCATABLE is not set
273CONFIG_PAGE_OFFSET=0xc000000000000000 278CONFIG_PAGE_OFFSET=0xc000000000000000
274CONFIG_KERNEL_START=0xc000000000000000 279CONFIG_KERNEL_START=0xc000000000000000
275CONFIG_PHYSICAL_START=0x00000000 280CONFIG_PHYSICAL_START=0x00000000
@@ -323,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
323# CONFIG_TIPC is not set 328# CONFIG_TIPC is not set
324# CONFIG_ATM is not set 329# CONFIG_ATM is not set
325# CONFIG_BRIDGE is not set 330# CONFIG_BRIDGE is not set
331# CONFIG_NET_DSA is not set
326# CONFIG_VLAN_8021Q is not set 332# CONFIG_VLAN_8021Q is not set
327# CONFIG_DECNET is not set 333# CONFIG_DECNET is not set
328# CONFIG_LLC2 is not set 334# CONFIG_LLC2 is not set
@@ -344,14 +350,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_IRDA is not set 350# CONFIG_IRDA is not set
345# CONFIG_BT is not set 351# CONFIG_BT is not set
346# CONFIG_AF_RXRPC is not set 352# CONFIG_AF_RXRPC is not set
347 353# CONFIG_PHONET is not set
348# 354# CONFIG_WIRELESS is not set
349# Wireless
350#
351# CONFIG_CFG80211 is not set
352# CONFIG_WIRELESS_EXT is not set
353# CONFIG_MAC80211 is not set
354# CONFIG_IEEE80211 is not set
355# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
356# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
357 357
@@ -402,19 +402,18 @@ CONFIG_MISC_DEVICES=y
402# CONFIG_HP_ILO is not set 402# CONFIG_HP_ILO is not set
403CONFIG_HAVE_IDE=y 403CONFIG_HAVE_IDE=y
404CONFIG_IDE=y 404CONFIG_IDE=y
405CONFIG_BLK_DEV_IDE=y
406 405
407# 406#
408# Please see Documentation/ide/ide.txt for help/info on IDE drives 407# Please see Documentation/ide/ide.txt for help/info on IDE drives
409# 408#
410CONFIG_IDE_TIMINGS=y 409CONFIG_IDE_TIMINGS=y
411# CONFIG_BLK_DEV_IDE_SATA is not set 410# CONFIG_BLK_DEV_IDE_SATA is not set
412CONFIG_BLK_DEV_IDEDISK=y 411CONFIG_IDE_GD=y
413# CONFIG_IDEDISK_MULTI_MODE is not set 412CONFIG_IDE_GD_ATA=y
413# CONFIG_IDE_GD_ATAPI is not set
414CONFIG_BLK_DEV_IDECD=y 414CONFIG_BLK_DEV_IDECD=y
415CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 415CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
416# CONFIG_BLK_DEV_IDETAPE is not set 416# CONFIG_BLK_DEV_IDETAPE is not set
417# CONFIG_BLK_DEV_IDEFLOPPY is not set
418# CONFIG_BLK_DEV_IDESCSI is not set 417# CONFIG_BLK_DEV_IDESCSI is not set
419CONFIG_IDE_TASK_IOCTL=y 418CONFIG_IDE_TASK_IOCTL=y
420CONFIG_IDE_PROC_FS=y 419CONFIG_IDE_PROC_FS=y
@@ -644,6 +643,9 @@ CONFIG_MII=y
644# CONFIG_IBM_NEW_EMAC_RGMII is not set 643# CONFIG_IBM_NEW_EMAC_RGMII is not set
645# CONFIG_IBM_NEW_EMAC_TAH is not set 644# CONFIG_IBM_NEW_EMAC_TAH is not set
646# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 645# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
646# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
647# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
648# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
647CONFIG_NET_PCI=y 649CONFIG_NET_PCI=y
648# CONFIG_PCNET32 is not set 650# CONFIG_PCNET32 is not set
649CONFIG_AMD8111_ETH=y 651CONFIG_AMD8111_ETH=y
@@ -664,11 +666,11 @@ CONFIG_AMD8111_ETH=y
664# CONFIG_TLAN is not set 666# CONFIG_TLAN is not set
665# CONFIG_VIA_RHINE is not set 667# CONFIG_VIA_RHINE is not set
666# CONFIG_SC92031 is not set 668# CONFIG_SC92031 is not set
669# CONFIG_ATL2 is not set
667CONFIG_NETDEV_1000=y 670CONFIG_NETDEV_1000=y
668# CONFIG_ACENIC is not set 671# CONFIG_ACENIC is not set
669# CONFIG_DL2K is not set 672# CONFIG_DL2K is not set
670CONFIG_E1000=y 673CONFIG_E1000=y
671# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
672# CONFIG_E1000E is not set 674# CONFIG_E1000E is not set
673# CONFIG_IP1000 is not set 675# CONFIG_IP1000 is not set
674# CONFIG_IGB is not set 676# CONFIG_IGB is not set
@@ -685,18 +687,22 @@ CONFIG_TIGON3=y
685# CONFIG_QLA3XXX is not set 687# CONFIG_QLA3XXX is not set
686# CONFIG_ATL1 is not set 688# CONFIG_ATL1 is not set
687# CONFIG_ATL1E is not set 689# CONFIG_ATL1E is not set
690# CONFIG_JME is not set
688CONFIG_NETDEV_10000=y 691CONFIG_NETDEV_10000=y
689# CONFIG_CHELSIO_T1 is not set 692# CONFIG_CHELSIO_T1 is not set
690# CONFIG_CHELSIO_T3 is not set 693# CONFIG_CHELSIO_T3 is not set
694# CONFIG_ENIC is not set
691# CONFIG_IXGBE is not set 695# CONFIG_IXGBE is not set
692# CONFIG_IXGB is not set 696# CONFIG_IXGB is not set
693# CONFIG_S2IO is not set 697# CONFIG_S2IO is not set
694# CONFIG_MYRI10GE is not set 698# CONFIG_MYRI10GE is not set
695# CONFIG_NETXEN_NIC is not set 699# CONFIG_NETXEN_NIC is not set
696# CONFIG_NIU is not set 700# CONFIG_NIU is not set
701# CONFIG_MLX4_EN is not set
697# CONFIG_MLX4_CORE is not set 702# CONFIG_MLX4_CORE is not set
698# CONFIG_TEHUTI is not set 703# CONFIG_TEHUTI is not set
699# CONFIG_BNX2X is not set 704# CONFIG_BNX2X is not set
705# CONFIG_QLGE is not set
700# CONFIG_SFC is not set 706# CONFIG_SFC is not set
701# CONFIG_TR is not set 707# CONFIG_TR is not set
702 708
@@ -895,6 +901,17 @@ CONFIG_SSB_POSSIBLE=y
895# CONFIG_MFD_SM501 is not set 901# CONFIG_MFD_SM501 is not set
896# CONFIG_HTC_PASIC3 is not set 902# CONFIG_HTC_PASIC3 is not set
897# CONFIG_MFD_TMIO is not set 903# CONFIG_MFD_TMIO is not set
904# CONFIG_PMIC_DA903X is not set
905# CONFIG_MFD_WM8400 is not set
906# CONFIG_MFD_WM8350_I2C is not set
907
908#
909# Voltage and Current regulators
910#
911# CONFIG_REGULATOR is not set
912# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
913# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
914# CONFIG_REGULATOR_BQ24022 is not set
898 915
899# 916#
900# Multimedia devices 917# Multimedia devices
@@ -942,9 +959,36 @@ CONFIG_HID=y
942# USB Input Devices 959# USB Input Devices
943# 960#
944CONFIG_USB_HID=y 961CONFIG_USB_HID=y
945# CONFIG_USB_HIDINPUT_POWERBOOK is not set 962# CONFIG_HID_PID is not set
946# CONFIG_HID_FF is not set
947# CONFIG_USB_HIDDEV is not set 963# CONFIG_USB_HIDDEV is not set
964
965#
966# Special HID drivers
967#
968CONFIG_HID_COMPAT=y
969CONFIG_HID_A4TECH=y
970CONFIG_HID_APPLE=y
971CONFIG_HID_BELKIN=y
972CONFIG_HID_BRIGHT=y
973CONFIG_HID_CHERRY=y
974CONFIG_HID_CHICONY=y
975CONFIG_HID_CYPRESS=y
976CONFIG_HID_DELL=y
977CONFIG_HID_EZKEY=y
978CONFIG_HID_GYRATION=y
979CONFIG_HID_LOGITECH=y
980# CONFIG_LOGITECH_FF is not set
981# CONFIG_LOGIRUMBLEPAD2_FF is not set
982CONFIG_HID_MICROSOFT=y
983CONFIG_HID_MONTEREY=y
984CONFIG_HID_PANTHERLORD=y
985# CONFIG_PANTHERLORD_FF is not set
986CONFIG_HID_PETALYNX=y
987CONFIG_HID_SAMSUNG=y
988CONFIG_HID_SONY=y
989CONFIG_HID_SUNPLUS=y
990# CONFIG_THRUSTMASTER_FF is not set
991# CONFIG_ZEROPLUS_FF is not set
948CONFIG_USB_SUPPORT=y 992CONFIG_USB_SUPPORT=y
949CONFIG_USB_ARCH_HAS_HCD=y 993CONFIG_USB_ARCH_HAS_HCD=y
950CONFIG_USB_ARCH_HAS_OHCI=y 994CONFIG_USB_ARCH_HAS_OHCI=y
@@ -961,6 +1005,8 @@ CONFIG_USB_DEVICE_CLASS=y
961# CONFIG_USB_DYNAMIC_MINORS is not set 1005# CONFIG_USB_DYNAMIC_MINORS is not set
962# CONFIG_USB_OTG is not set 1006# CONFIG_USB_OTG is not set
963CONFIG_USB_MON=y 1007CONFIG_USB_MON=y
1008# CONFIG_USB_WUSB is not set
1009# CONFIG_USB_WUSB_CBAF is not set
964 1010
965# 1011#
966# USB Host Controller Drivers 1012# USB Host Controller Drivers
@@ -980,6 +1026,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
980CONFIG_USB_UHCI_HCD=y 1026CONFIG_USB_UHCI_HCD=y
981# CONFIG_USB_SL811_HCD is not set 1027# CONFIG_USB_SL811_HCD is not set
982# CONFIG_USB_R8A66597_HCD is not set 1028# CONFIG_USB_R8A66597_HCD is not set
1029# CONFIG_USB_WHCI_HCD is not set
1030# CONFIG_USB_HWA_HCD is not set
983 1031
984# 1032#
985# USB Device Class drivers 1033# USB Device Class drivers
@@ -987,6 +1035,7 @@ CONFIG_USB_UHCI_HCD=y
987# CONFIG_USB_ACM is not set 1035# CONFIG_USB_ACM is not set
988# CONFIG_USB_PRINTER is not set 1036# CONFIG_USB_PRINTER is not set
989# CONFIG_USB_WDM is not set 1037# CONFIG_USB_WDM is not set
1038# CONFIG_USB_TMC is not set
990 1039
991# 1040#
992# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1041# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1070,6 +1119,7 @@ CONFIG_USB_SERIAL_TI=m
1070# CONFIG_USB_EMI62 is not set 1119# CONFIG_USB_EMI62 is not set
1071# CONFIG_USB_EMI26 is not set 1120# CONFIG_USB_EMI26 is not set
1072# CONFIG_USB_ADUTUX is not set 1121# CONFIG_USB_ADUTUX is not set
1122# CONFIG_USB_SEVSEG is not set
1073# CONFIG_USB_RIO500 is not set 1123# CONFIG_USB_RIO500 is not set
1074# CONFIG_USB_LEGOTOWER is not set 1124# CONFIG_USB_LEGOTOWER is not set
1075# CONFIG_USB_LCD is not set 1125# CONFIG_USB_LCD is not set
@@ -1087,7 +1137,9 @@ CONFIG_USB_SERIAL_TI=m
1087# CONFIG_USB_IOWARRIOR is not set 1137# CONFIG_USB_IOWARRIOR is not set
1088# CONFIG_USB_TEST is not set 1138# CONFIG_USB_TEST is not set
1089# CONFIG_USB_ISIGHTFW is not set 1139# CONFIG_USB_ISIGHTFW is not set
1140# CONFIG_USB_VST is not set
1090# CONFIG_USB_GADGET is not set 1141# CONFIG_USB_GADGET is not set
1142# CONFIG_UWB is not set
1091# CONFIG_MMC is not set 1143# CONFIG_MMC is not set
1092# CONFIG_MEMSTICK is not set 1144# CONFIG_MEMSTICK is not set
1093# CONFIG_NEW_LEDS is not set 1145# CONFIG_NEW_LEDS is not set
@@ -1097,6 +1149,7 @@ CONFIG_USB_SERIAL_TI=m
1097# CONFIG_RTC_CLASS is not set 1149# CONFIG_RTC_CLASS is not set
1098# CONFIG_DMADEVICES is not set 1150# CONFIG_DMADEVICES is not set
1099# CONFIG_UIO is not set 1151# CONFIG_UIO is not set
1152# CONFIG_STAGING is not set
1100 1153
1101# 1154#
1102# File systems 1155# File systems
@@ -1104,15 +1157,23 @@ CONFIG_USB_SERIAL_TI=m
1104CONFIG_EXT2_FS=y 1157CONFIG_EXT2_FS=y
1105# CONFIG_EXT2_FS_XATTR is not set 1158# CONFIG_EXT2_FS_XATTR is not set
1106CONFIG_EXT2_FS_XIP=y 1159CONFIG_EXT2_FS_XIP=y
1107CONFIG_FS_XIP=y
1108CONFIG_EXT3_FS=y 1160CONFIG_EXT3_FS=y
1109# CONFIG_EXT3_FS_XATTR is not set 1161# CONFIG_EXT3_FS_XATTR is not set
1110# CONFIG_EXT4DEV_FS is not set 1162CONFIG_EXT4_FS=y
1163# CONFIG_EXT4DEV_COMPAT is not set
1164CONFIG_EXT4_FS_XATTR=y
1165# CONFIG_EXT4_FS_POSIX_ACL is not set
1166# CONFIG_EXT4_FS_SECURITY is not set
1167CONFIG_FS_XIP=y
1111CONFIG_JBD=y 1168CONFIG_JBD=y
1112# CONFIG_JBD_DEBUG is not set 1169# CONFIG_JBD_DEBUG is not set
1170CONFIG_JBD2=y
1171# CONFIG_JBD2_DEBUG is not set
1172CONFIG_FS_MBCACHE=y
1113# CONFIG_REISERFS_FS is not set 1173# CONFIG_REISERFS_FS is not set
1114# CONFIG_JFS_FS is not set 1174# CONFIG_JFS_FS is not set
1115CONFIG_FS_POSIX_ACL=y 1175CONFIG_FS_POSIX_ACL=y
1176CONFIG_FILE_LOCKING=y
1116# CONFIG_XFS_FS is not set 1177# CONFIG_XFS_FS is not set
1117# CONFIG_GFS2_FS is not set 1178# CONFIG_GFS2_FS is not set
1118# CONFIG_OCFS2_FS is not set 1179# CONFIG_OCFS2_FS is not set
@@ -1146,6 +1207,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1146CONFIG_PROC_FS=y 1207CONFIG_PROC_FS=y
1147CONFIG_PROC_KCORE=y 1208CONFIG_PROC_KCORE=y
1148CONFIG_PROC_SYSCTL=y 1209CONFIG_PROC_SYSCTL=y
1210CONFIG_PROC_PAGE_MONITOR=y
1149CONFIG_SYSFS=y 1211CONFIG_SYSFS=y
1150CONFIG_TMPFS=y 1212CONFIG_TMPFS=y
1151# CONFIG_TMPFS_POSIX_ACL is not set 1213# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1185,6 +1247,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1185CONFIG_NFS_COMMON=y 1247CONFIG_NFS_COMMON=y
1186CONFIG_SUNRPC=y 1248CONFIG_SUNRPC=y
1187CONFIG_SUNRPC_GSS=y 1249CONFIG_SUNRPC_GSS=y
1250# CONFIG_SUNRPC_REGISTER_V4 is not set
1188CONFIG_RPCSEC_GSS_KRB5=y 1251CONFIG_RPCSEC_GSS_KRB5=y
1189# CONFIG_RPCSEC_GSS_SPKM3 is not set 1252# CONFIG_RPCSEC_GSS_SPKM3 is not set
1190# CONFIG_SMB_FS is not set 1253# CONFIG_SMB_FS is not set
@@ -1260,9 +1323,8 @@ CONFIG_NLS_UTF8=y
1260# Library routines 1323# Library routines
1261# 1324#
1262CONFIG_BITREVERSE=y 1325CONFIG_BITREVERSE=y
1263# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1264CONFIG_CRC_CCITT=y 1326CONFIG_CRC_CCITT=y
1265# CONFIG_CRC16 is not set 1327CONFIG_CRC16=y
1266CONFIG_CRC_T10DIF=y 1328CONFIG_CRC_T10DIF=y
1267# CONFIG_CRC_ITU_T is not set 1329# CONFIG_CRC_ITU_T is not set
1268CONFIG_CRC32=y 1330CONFIG_CRC32=y
@@ -1315,21 +1377,28 @@ CONFIG_DEBUG_BUGVERBOSE=y
1315CONFIG_DEBUG_MEMORY_INIT=y 1377CONFIG_DEBUG_MEMORY_INIT=y
1316# CONFIG_DEBUG_LIST is not set 1378# CONFIG_DEBUG_LIST is not set
1317# CONFIG_DEBUG_SG is not set 1379# CONFIG_DEBUG_SG is not set
1318CONFIG_FRAME_POINTER=y
1319# CONFIG_BOOT_PRINTK_DELAY is not set 1380# CONFIG_BOOT_PRINTK_DELAY is not set
1320# CONFIG_RCU_TORTURE_TEST is not set 1381# CONFIG_RCU_TORTURE_TEST is not set
1382# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1321# CONFIG_KPROBES_SANITY_TEST is not set 1383# CONFIG_KPROBES_SANITY_TEST is not set
1322# CONFIG_BACKTRACE_SELF_TEST is not set 1384# CONFIG_BACKTRACE_SELF_TEST is not set
1385# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1323# CONFIG_LKDTM is not set 1386# CONFIG_LKDTM is not set
1324# CONFIG_FAULT_INJECTION is not set 1387# CONFIG_FAULT_INJECTION is not set
1325CONFIG_LATENCYTOP=y 1388CONFIG_LATENCYTOP=y
1326# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1389# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1327CONFIG_HAVE_FTRACE=y 1390CONFIG_HAVE_FUNCTION_TRACER=y
1328CONFIG_HAVE_DYNAMIC_FTRACE=y 1391
1329# CONFIG_FTRACE is not set 1392#
1393# Tracers
1394#
1395# CONFIG_FUNCTION_TRACER is not set
1330# CONFIG_IRQSOFF_TRACER is not set 1396# CONFIG_IRQSOFF_TRACER is not set
1331# CONFIG_SCHED_TRACER is not set 1397# CONFIG_SCHED_TRACER is not set
1332# CONFIG_CONTEXT_SWITCH_TRACER is not set 1398# CONFIG_CONTEXT_SWITCH_TRACER is not set
1399# CONFIG_BOOT_TRACER is not set
1400# CONFIG_STACK_TRACER is not set
1401CONFIG_DYNAMIC_PRINTK_DEBUG=y
1333# CONFIG_SAMPLES is not set 1402# CONFIG_SAMPLES is not set
1334CONFIG_HAVE_ARCH_KGDB=y 1403CONFIG_HAVE_ARCH_KGDB=y
1335# CONFIG_KGDB is not set 1404# CONFIG_KGDB is not set
@@ -1338,6 +1407,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1338# CONFIG_DEBUG_PAGEALLOC is not set 1407# CONFIG_DEBUG_PAGEALLOC is not set
1339# CONFIG_CODE_PATCHING_SELFTEST is not set 1408# CONFIG_CODE_PATCHING_SELFTEST is not set
1340# CONFIG_FTR_FIXUP_SELFTEST is not set 1409# CONFIG_FTR_FIXUP_SELFTEST is not set
1410# CONFIG_MSI_BITMAP_SELFTEST is not set
1341CONFIG_XMON=y 1411CONFIG_XMON=y
1342CONFIG_XMON_DEFAULT=y 1412CONFIG_XMON_DEFAULT=y
1343CONFIG_XMON_DISASSEMBLY=y 1413CONFIG_XMON_DISASSEMBLY=y
@@ -1352,14 +1422,19 @@ CONFIG_BOOTX_TEXT=y
1352# 1422#
1353# CONFIG_KEYS is not set 1423# CONFIG_KEYS is not set
1354# CONFIG_SECURITY is not set 1424# CONFIG_SECURITY is not set
1425# CONFIG_SECURITYFS is not set
1355# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1426# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1356CONFIG_CRYPTO=y 1427CONFIG_CRYPTO=y
1357 1428
1358# 1429#
1359# Crypto core or helper 1430# Crypto core or helper
1360# 1431#
1432# CONFIG_CRYPTO_FIPS is not set
1361CONFIG_CRYPTO_ALGAPI=y 1433CONFIG_CRYPTO_ALGAPI=y
1434CONFIG_CRYPTO_AEAD=y
1362CONFIG_CRYPTO_BLKCIPHER=y 1435CONFIG_CRYPTO_BLKCIPHER=y
1436CONFIG_CRYPTO_HASH=y
1437CONFIG_CRYPTO_RNG=y
1363CONFIG_CRYPTO_MANAGER=y 1438CONFIG_CRYPTO_MANAGER=y
1364# CONFIG_CRYPTO_GF128MUL is not set 1439# CONFIG_CRYPTO_GF128MUL is not set
1365# CONFIG_CRYPTO_NULL is not set 1440# CONFIG_CRYPTO_NULL is not set
@@ -1432,6 +1507,11 @@ CONFIG_CRYPTO_DES=y
1432# 1507#
1433# CONFIG_CRYPTO_DEFLATE is not set 1508# CONFIG_CRYPTO_DEFLATE is not set
1434# CONFIG_CRYPTO_LZO is not set 1509# CONFIG_CRYPTO_LZO is not set
1510
1511#
1512# Random Number Generation
1513#
1514# CONFIG_CRYPTO_ANSI_CPRNG is not set
1435# CONFIG_CRYPTO_HW is not set 1515# CONFIG_CRYPTO_HW is not set
1436# CONFIG_PPC_CLOCK is not set 1516# CONFIG_PPC_CLOCK is not set
1437# CONFIG_VIRTUALIZATION is not set 1517# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 80481f270133..de9b121820a6 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:20:26 2008 4# Tue Nov 11 19:36:51 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y
22# CONFIG_SMP is not set 22# CONFIG_SMP is not set
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32 24CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 25# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -110,7 +110,9 @@ CONFIG_SIGNALFD=y
110CONFIG_TIMERFD=y 110CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y
113CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 116CONFIG_SLUB_DEBUG=y
115# CONFIG_SLAB is not set 117# CONFIG_SLAB is not set
116CONFIG_SLUB=y 118CONFIG_SLUB=y
@@ -125,10 +127,6 @@ CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 127CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 128CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 129CONFIG_HAVE_ARCH_TRACEHOOK=y
128# CONFIG_HAVE_DMA_ATTRS is not set
129# CONFIG_USE_GENERIC_SMP_HELPERS is not set
130# CONFIG_HAVE_CLK is not set
131CONFIG_PROC_PAGE_MONITOR=y
132# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 130# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
133CONFIG_SLABINFO=y 131CONFIG_SLABINFO=y
134CONFIG_RT_MUTEXES=y 132CONFIG_RT_MUTEXES=y
@@ -161,6 +159,7 @@ CONFIG_DEFAULT_AS=y
161# CONFIG_DEFAULT_NOOP is not set 159# CONFIG_DEFAULT_NOOP is not set
162CONFIG_DEFAULT_IOSCHED="anticipatory" 160CONFIG_DEFAULT_IOSCHED="anticipatory"
163CONFIG_CLASSIC_RCU=y 161CONFIG_CLASSIC_RCU=y
162CONFIG_FREEZER=y
164 163
165# 164#
166# Platform support 165# Platform support
@@ -232,6 +231,8 @@ CONFIG_PREEMPT_NONE=y
232# CONFIG_PREEMPT_VOLUNTARY is not set 231# CONFIG_PREEMPT_VOLUNTARY is not set
233# CONFIG_PREEMPT is not set 232# CONFIG_PREEMPT is not set
234CONFIG_BINFMT_ELF=y 233CONFIG_BINFMT_ELF=y
234# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
235# CONFIG_HAVE_AOUT is not set
235CONFIG_BINFMT_MISC=m 236CONFIG_BINFMT_MISC=m
236# CONFIG_IOMMU_HELPER is not set 237# CONFIG_IOMMU_HELPER is not set
237CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 238CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -246,15 +247,15 @@ CONFIG_FLATMEM_MANUAL=y
246# CONFIG_SPARSEMEM_MANUAL is not set 247# CONFIG_SPARSEMEM_MANUAL is not set
247CONFIG_FLATMEM=y 248CONFIG_FLATMEM=y
248CONFIG_FLAT_NODE_MEM_MAP=y 249CONFIG_FLAT_NODE_MEM_MAP=y
249# CONFIG_SPARSEMEM_STATIC is not set
250# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
251CONFIG_PAGEFLAGS_EXTENDED=y 250CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 251CONFIG_SPLIT_PTLOCK_CPUS=4
253# CONFIG_MIGRATION is not set 252# CONFIG_MIGRATION is not set
254# CONFIG_RESOURCES_64BIT is not set 253# CONFIG_RESOURCES_64BIT is not set
254# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=1 255CONFIG_ZONE_DMA_FLAG=1
256CONFIG_BOUNCE=y 256CONFIG_BOUNCE=y
257CONFIG_VIRT_TO_BUS=y 257CONFIG_VIRT_TO_BUS=y
258CONFIG_UNEVICTABLE_LRU=y
258CONFIG_FORCE_MAX_ZONEORDER=11 259CONFIG_FORCE_MAX_ZONEORDER=11
259CONFIG_PROC_DEVICETREE=y 260CONFIG_PROC_DEVICETREE=y
260# CONFIG_CMDLINE_BOOL is not set 261# CONFIG_CMDLINE_BOOL is not set
@@ -362,7 +363,6 @@ CONFIG_INET_TCP_DIAG=y
362CONFIG_TCP_CONG_CUBIC=y 363CONFIG_TCP_CONG_CUBIC=y
363CONFIG_DEFAULT_TCP_CONG="cubic" 364CONFIG_DEFAULT_TCP_CONG="cubic"
364# CONFIG_TCP_MD5SIG is not set 365# CONFIG_TCP_MD5SIG is not set
365# CONFIG_IP_VS is not set
366# CONFIG_IPV6 is not set 366# CONFIG_IPV6 is not set
367# CONFIG_NETWORK_SECMARK is not set 367# CONFIG_NETWORK_SECMARK is not set
368CONFIG_NETFILTER=y 368CONFIG_NETFILTER=y
@@ -392,13 +392,14 @@ CONFIG_NF_CONNTRACK_IRC=m
392# CONFIG_NF_CONNTRACK_SIP is not set 392# CONFIG_NF_CONNTRACK_SIP is not set
393CONFIG_NF_CONNTRACK_TFTP=m 393CONFIG_NF_CONNTRACK_TFTP=m
394CONFIG_NF_CT_NETLINK=m 394CONFIG_NF_CT_NETLINK=m
395# CONFIG_NETFILTER_TPROXY is not set
395CONFIG_NETFILTER_XTABLES=m 396CONFIG_NETFILTER_XTABLES=m
396CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 397CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
397# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set 398# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
398# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 399# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
399CONFIG_NETFILTER_XT_TARGET_MARK=m 400CONFIG_NETFILTER_XT_TARGET_MARK=m
400CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
401CONFIG_NETFILTER_XT_TARGET_NFLOG=m 401CONFIG_NETFILTER_XT_TARGET_NFLOG=m
402CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
402CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 403CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
403CONFIG_NETFILTER_XT_TARGET_RATEEST=m 404CONFIG_NETFILTER_XT_TARGET_RATEEST=m
404CONFIG_NETFILTER_XT_TARGET_TRACE=m 405CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -412,19 +413,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
412CONFIG_NETFILTER_XT_MATCH_DCCP=m 413CONFIG_NETFILTER_XT_MATCH_DCCP=m
413CONFIG_NETFILTER_XT_MATCH_DSCP=m 414CONFIG_NETFILTER_XT_MATCH_DSCP=m
414CONFIG_NETFILTER_XT_MATCH_ESP=m 415CONFIG_NETFILTER_XT_MATCH_ESP=m
416# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
415CONFIG_NETFILTER_XT_MATCH_HELPER=m 417CONFIG_NETFILTER_XT_MATCH_HELPER=m
416CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 418CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
417CONFIG_NETFILTER_XT_MATCH_LENGTH=m 419CONFIG_NETFILTER_XT_MATCH_LENGTH=m
418CONFIG_NETFILTER_XT_MATCH_LIMIT=m 420CONFIG_NETFILTER_XT_MATCH_LIMIT=m
419CONFIG_NETFILTER_XT_MATCH_MAC=m 421CONFIG_NETFILTER_XT_MATCH_MAC=m
420CONFIG_NETFILTER_XT_MATCH_MARK=m 422CONFIG_NETFILTER_XT_MATCH_MARK=m
423CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
421CONFIG_NETFILTER_XT_MATCH_OWNER=m 424CONFIG_NETFILTER_XT_MATCH_OWNER=m
422CONFIG_NETFILTER_XT_MATCH_POLICY=m 425CONFIG_NETFILTER_XT_MATCH_POLICY=m
423CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
424CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 426CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
425# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 427# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
426CONFIG_NETFILTER_XT_MATCH_RATEEST=m 428CONFIG_NETFILTER_XT_MATCH_RATEEST=m
427CONFIG_NETFILTER_XT_MATCH_REALM=m 429CONFIG_NETFILTER_XT_MATCH_REALM=m
430CONFIG_NETFILTER_XT_MATCH_RECENT=m
431# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
428CONFIG_NETFILTER_XT_MATCH_SCTP=m 432CONFIG_NETFILTER_XT_MATCH_SCTP=m
429# CONFIG_NETFILTER_XT_MATCH_STATE is not set 433# CONFIG_NETFILTER_XT_MATCH_STATE is not set
430# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 434# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
@@ -432,20 +436,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
432CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 436CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
433CONFIG_NETFILTER_XT_MATCH_TIME=m 437CONFIG_NETFILTER_XT_MATCH_TIME=m
434CONFIG_NETFILTER_XT_MATCH_U32=m 438CONFIG_NETFILTER_XT_MATCH_U32=m
435# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 439# CONFIG_IP_VS is not set
436 440
437# 441#
438# IP: Netfilter Configuration 442# IP: Netfilter Configuration
439# 443#
444CONFIG_NF_DEFRAG_IPV4=m
440CONFIG_NF_CONNTRACK_IPV4=m 445CONFIG_NF_CONNTRACK_IPV4=m
441CONFIG_NF_CONNTRACK_PROC_COMPAT=y 446CONFIG_NF_CONNTRACK_PROC_COMPAT=y
442# CONFIG_IP_NF_QUEUE is not set 447# CONFIG_IP_NF_QUEUE is not set
443CONFIG_IP_NF_IPTABLES=m 448CONFIG_IP_NF_IPTABLES=m
444CONFIG_IP_NF_MATCH_RECENT=m 449CONFIG_IP_NF_MATCH_ADDRTYPE=m
445CONFIG_IP_NF_MATCH_ECN=m
446CONFIG_IP_NF_MATCH_AH=m 450CONFIG_IP_NF_MATCH_AH=m
451CONFIG_IP_NF_MATCH_ECN=m
447CONFIG_IP_NF_MATCH_TTL=m 452CONFIG_IP_NF_MATCH_TTL=m
448CONFIG_IP_NF_MATCH_ADDRTYPE=m
449CONFIG_IP_NF_FILTER=m 453CONFIG_IP_NF_FILTER=m
450CONFIG_IP_NF_TARGET_REJECT=m 454CONFIG_IP_NF_TARGET_REJECT=m
451CONFIG_IP_NF_TARGET_LOG=m 455CONFIG_IP_NF_TARGET_LOG=m
@@ -453,8 +457,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
453CONFIG_NF_NAT=m 457CONFIG_NF_NAT=m
454CONFIG_NF_NAT_NEEDED=y 458CONFIG_NF_NAT_NEEDED=y
455CONFIG_IP_NF_TARGET_MASQUERADE=m 459CONFIG_IP_NF_TARGET_MASQUERADE=m
456CONFIG_IP_NF_TARGET_REDIRECT=m
457CONFIG_IP_NF_TARGET_NETMAP=m 460CONFIG_IP_NF_TARGET_NETMAP=m
461CONFIG_IP_NF_TARGET_REDIRECT=m
458# CONFIG_NF_NAT_SNMP_BASIC is not set 462# CONFIG_NF_NAT_SNMP_BASIC is not set
459CONFIG_NF_NAT_PROTO_DCCP=m 463CONFIG_NF_NAT_PROTO_DCCP=m
460CONFIG_NF_NAT_FTP=m 464CONFIG_NF_NAT_FTP=m
@@ -465,9 +469,9 @@ CONFIG_NF_NAT_TFTP=m
465# CONFIG_NF_NAT_H323 is not set 469# CONFIG_NF_NAT_H323 is not set
466# CONFIG_NF_NAT_SIP is not set 470# CONFIG_NF_NAT_SIP is not set
467CONFIG_IP_NF_MANGLE=m 471CONFIG_IP_NF_MANGLE=m
472# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
468CONFIG_IP_NF_TARGET_ECN=m 473CONFIG_IP_NF_TARGET_ECN=m
469CONFIG_IP_NF_TARGET_TTL=m 474CONFIG_IP_NF_TARGET_TTL=m
470# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
471CONFIG_IP_NF_RAW=m 475CONFIG_IP_NF_RAW=m
472CONFIG_IP_NF_ARPTABLES=m 476CONFIG_IP_NF_ARPTABLES=m
473CONFIG_IP_NF_ARPFILTER=m 477CONFIG_IP_NF_ARPFILTER=m
@@ -494,6 +498,7 @@ CONFIG_IP_DCCP_TFRC_LIB=m
494# CONFIG_TIPC is not set 498# CONFIG_TIPC is not set
495# CONFIG_ATM is not set 499# CONFIG_ATM is not set
496# CONFIG_BRIDGE is not set 500# CONFIG_BRIDGE is not set
501# CONFIG_NET_DSA is not set
497# CONFIG_VLAN_8021Q is not set 502# CONFIG_VLAN_8021Q is not set
498# CONFIG_DECNET is not set 503# CONFIG_DECNET is not set
499# CONFIG_LLC2 is not set 504# CONFIG_LLC2 is not set
@@ -585,12 +590,11 @@ CONFIG_BT_HCIBFUSB=m
585# CONFIG_BT_HCIBTUART is not set 590# CONFIG_BT_HCIBTUART is not set
586# CONFIG_BT_HCIVHCI is not set 591# CONFIG_BT_HCIVHCI is not set
587# CONFIG_AF_RXRPC is not set 592# CONFIG_AF_RXRPC is not set
588 593# CONFIG_PHONET is not set
589# 594CONFIG_WIRELESS=y
590# Wireless
591#
592CONFIG_CFG80211=m 595CONFIG_CFG80211=m
593CONFIG_NL80211=y 596CONFIG_NL80211=y
597CONFIG_WIRELESS_OLD_REGULATORY=y
594CONFIG_WIRELESS_EXT=y 598CONFIG_WIRELESS_EXT=y
595CONFIG_WIRELESS_EXT_SYSFS=y 599CONFIG_WIRELESS_EXT_SYSFS=y
596CONFIG_MAC80211=m 600CONFIG_MAC80211=m
@@ -599,7 +603,9 @@ CONFIG_MAC80211=m
599# Rate control algorithm selection 603# Rate control algorithm selection
600# 604#
601CONFIG_MAC80211_RC_PID=y 605CONFIG_MAC80211_RC_PID=y
606# CONFIG_MAC80211_RC_MINSTREL is not set
602CONFIG_MAC80211_RC_DEFAULT_PID=y 607CONFIG_MAC80211_RC_DEFAULT_PID=y
608# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
603CONFIG_MAC80211_RC_DEFAULT="pid" 609CONFIG_MAC80211_RC_DEFAULT="pid"
604# CONFIG_MAC80211_MESH is not set 610# CONFIG_MAC80211_MESH is not set
605CONFIG_MAC80211_LEDS=y 611CONFIG_MAC80211_LEDS=y
@@ -663,7 +669,6 @@ CONFIG_MISC_DEVICES=y
663# CONFIG_HP_ILO is not set 669# CONFIG_HP_ILO is not set
664CONFIG_HAVE_IDE=y 670CONFIG_HAVE_IDE=y
665CONFIG_IDE=y 671CONFIG_IDE=y
666CONFIG_BLK_DEV_IDE=y
667 672
668# 673#
669# Please see Documentation/ide/ide.txt for help/info on IDE drives 674# Please see Documentation/ide/ide.txt for help/info on IDE drives
@@ -671,14 +676,14 @@ CONFIG_BLK_DEV_IDE=y
671CONFIG_IDE_TIMINGS=y 676CONFIG_IDE_TIMINGS=y
672CONFIG_IDE_ATAPI=y 677CONFIG_IDE_ATAPI=y
673# CONFIG_BLK_DEV_IDE_SATA is not set 678# CONFIG_BLK_DEV_IDE_SATA is not set
674CONFIG_BLK_DEV_IDEDISK=y 679CONFIG_IDE_GD=y
675# CONFIG_IDEDISK_MULTI_MODE is not set 680CONFIG_IDE_GD_ATA=y
681# CONFIG_IDE_GD_ATAPI is not set
676CONFIG_BLK_DEV_IDECS=m 682CONFIG_BLK_DEV_IDECS=m
677# CONFIG_BLK_DEV_DELKIN is not set 683# CONFIG_BLK_DEV_DELKIN is not set
678CONFIG_BLK_DEV_IDECD=y 684CONFIG_BLK_DEV_IDECD=y
679CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 685CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
680# CONFIG_BLK_DEV_IDETAPE is not set 686# CONFIG_BLK_DEV_IDETAPE is not set
681CONFIG_BLK_DEV_IDEFLOPPY=y
682CONFIG_BLK_DEV_IDESCSI=y 687CONFIG_BLK_DEV_IDESCSI=y
683# CONFIG_IDE_TASK_IOCTL is not set 688# CONFIG_IDE_TASK_IOCTL is not set
684CONFIG_IDE_PROC_FS=y 689CONFIG_IDE_PROC_FS=y
@@ -899,6 +904,9 @@ CONFIG_SUNGEM=y
899# CONFIG_IBM_NEW_EMAC_RGMII is not set 904# CONFIG_IBM_NEW_EMAC_RGMII is not set
900# CONFIG_IBM_NEW_EMAC_TAH is not set 905# CONFIG_IBM_NEW_EMAC_TAH is not set
901# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 906# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
907# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
908# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
909# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
902CONFIG_NET_PCI=y 910CONFIG_NET_PCI=y
903CONFIG_PCNET32=y 911CONFIG_PCNET32=y
904# CONFIG_AMD8111_ETH is not set 912# CONFIG_AMD8111_ETH is not set
@@ -919,6 +927,7 @@ CONFIG_PCNET32=y
919# CONFIG_TLAN is not set 927# CONFIG_TLAN is not set
920# CONFIG_VIA_RHINE is not set 928# CONFIG_VIA_RHINE is not set
921# CONFIG_SC92031 is not set 929# CONFIG_SC92031 is not set
930# CONFIG_ATL2 is not set
922CONFIG_NETDEV_1000=y 931CONFIG_NETDEV_1000=y
923# CONFIG_ACENIC is not set 932# CONFIG_ACENIC is not set
924# CONFIG_DL2K is not set 933# CONFIG_DL2K is not set
@@ -940,18 +949,22 @@ CONFIG_NETDEV_1000=y
940# CONFIG_QLA3XXX is not set 949# CONFIG_QLA3XXX is not set
941# CONFIG_ATL1 is not set 950# CONFIG_ATL1 is not set
942# CONFIG_ATL1E is not set 951# CONFIG_ATL1E is not set
952# CONFIG_JME is not set
943CONFIG_NETDEV_10000=y 953CONFIG_NETDEV_10000=y
944# CONFIG_CHELSIO_T1 is not set 954# CONFIG_CHELSIO_T1 is not set
945# CONFIG_CHELSIO_T3 is not set 955# CONFIG_CHELSIO_T3 is not set
956# CONFIG_ENIC is not set
946# CONFIG_IXGBE is not set 957# CONFIG_IXGBE is not set
947# CONFIG_IXGB is not set 958# CONFIG_IXGB is not set
948# CONFIG_S2IO is not set 959# CONFIG_S2IO is not set
949# CONFIG_MYRI10GE is not set 960# CONFIG_MYRI10GE is not set
950# CONFIG_NETXEN_NIC is not set 961# CONFIG_NETXEN_NIC is not set
951# CONFIG_NIU is not set 962# CONFIG_NIU is not set
963# CONFIG_MLX4_EN is not set
952# CONFIG_MLX4_CORE is not set 964# CONFIG_MLX4_CORE is not set
953# CONFIG_TEHUTI is not set 965# CONFIG_TEHUTI is not set
954# CONFIG_BNX2X is not set 966# CONFIG_BNX2X is not set
967# CONFIG_QLGE is not set
955# CONFIG_SFC is not set 968# CONFIG_SFC is not set
956# CONFIG_TR is not set 969# CONFIG_TR is not set
957 970
@@ -964,6 +977,7 @@ CONFIG_WLAN_80211=y
964# CONFIG_IPW2100 is not set 977# CONFIG_IPW2100 is not set
965# CONFIG_IPW2200 is not set 978# CONFIG_IPW2200 is not set
966# CONFIG_LIBERTAS is not set 979# CONFIG_LIBERTAS is not set
980# CONFIG_LIBERTAS_THINFIRM is not set
967# CONFIG_AIRO is not set 981# CONFIG_AIRO is not set
968CONFIG_HERMES=m 982CONFIG_HERMES=m
969CONFIG_APPLE_AIRPORT=m 983CONFIG_APPLE_AIRPORT=m
@@ -1023,6 +1037,7 @@ CONFIG_USB_USBNET=m
1023CONFIG_USB_NET_AX8817X=m 1037CONFIG_USB_NET_AX8817X=m
1024CONFIG_USB_NET_CDCETHER=m 1038CONFIG_USB_NET_CDCETHER=m
1025# CONFIG_USB_NET_DM9601 is not set 1039# CONFIG_USB_NET_DM9601 is not set
1040# CONFIG_USB_NET_SMSC95XX is not set
1026# CONFIG_USB_NET_GL620A is not set 1041# CONFIG_USB_NET_GL620A is not set
1027CONFIG_USB_NET_NET1080=m 1042CONFIG_USB_NET_NET1080=m
1028# CONFIG_USB_NET_PLUSB is not set 1043# CONFIG_USB_NET_PLUSB is not set
@@ -1239,6 +1254,7 @@ CONFIG_POWER_SUPPLY=y
1239CONFIG_APM_POWER=y 1254CONFIG_APM_POWER=y
1240# CONFIG_BATTERY_DS2760 is not set 1255# CONFIG_BATTERY_DS2760 is not set
1241CONFIG_BATTERY_PMU=y 1256CONFIG_BATTERY_PMU=y
1257# CONFIG_BATTERY_BQ27x00 is not set
1242# CONFIG_HWMON is not set 1258# CONFIG_HWMON is not set
1243# CONFIG_THERMAL is not set 1259# CONFIG_THERMAL is not set
1244# CONFIG_THERMAL_HWMON is not set 1260# CONFIG_THERMAL_HWMON is not set
@@ -1266,6 +1282,17 @@ CONFIG_SSB_DRIVER_PCICORE=y
1266# CONFIG_MFD_SM501 is not set 1282# CONFIG_MFD_SM501 is not set
1267# CONFIG_HTC_PASIC3 is not set 1283# CONFIG_HTC_PASIC3 is not set
1268# CONFIG_MFD_TMIO is not set 1284# CONFIG_MFD_TMIO is not set
1285# CONFIG_PMIC_DA903X is not set
1286# CONFIG_MFD_WM8400 is not set
1287# CONFIG_MFD_WM8350_I2C is not set
1288
1289#
1290# Voltage and Current regulators
1291#
1292# CONFIG_REGULATOR is not set
1293# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1294# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1295# CONFIG_REGULATOR_BQ24022 is not set
1269 1296
1270# 1297#
1271# Multimedia devices 1298# Multimedia devices
@@ -1301,6 +1328,7 @@ CONFIG_VGASTATE=y
1301CONFIG_FB=y 1328CONFIG_FB=y
1302# CONFIG_FIRMWARE_EDID is not set 1329# CONFIG_FIRMWARE_EDID is not set
1303CONFIG_FB_DDC=y 1330CONFIG_FB_DDC=y
1331# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1304CONFIG_FB_CFB_FILLRECT=y 1332CONFIG_FB_CFB_FILLRECT=y
1305CONFIG_FB_CFB_COPYAREA=y 1333CONFIG_FB_CFB_COPYAREA=y
1306CONFIG_FB_CFB_IMAGEBLIT=y 1334CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1357,6 +1385,7 @@ CONFIG_FB_ATY_BACKLIGHT=y
1357# CONFIG_FB_S3 is not set 1385# CONFIG_FB_S3 is not set
1358# CONFIG_FB_SAVAGE is not set 1386# CONFIG_FB_SAVAGE is not set
1359# CONFIG_FB_SIS is not set 1387# CONFIG_FB_SIS is not set
1388# CONFIG_FB_VIA is not set
1360# CONFIG_FB_NEOMAGIC is not set 1389# CONFIG_FB_NEOMAGIC is not set
1361# CONFIG_FB_KYRO is not set 1390# CONFIG_FB_KYRO is not set
1362CONFIG_FB_3DFX=y 1391CONFIG_FB_3DFX=y
@@ -1369,6 +1398,7 @@ CONFIG_FB_3DFX=y
1369# CONFIG_FB_CARMINE is not set 1398# CONFIG_FB_CARMINE is not set
1370# CONFIG_FB_IBM_GXT4500 is not set 1399# CONFIG_FB_IBM_GXT4500 is not set
1371# CONFIG_FB_VIRTUAL is not set 1400# CONFIG_FB_VIRTUAL is not set
1401# CONFIG_FB_METRONOME is not set
1372CONFIG_BACKLIGHT_LCD_SUPPORT=y 1402CONFIG_BACKLIGHT_LCD_SUPPORT=y
1373CONFIG_LCD_CLASS_DEVICE=m 1403CONFIG_LCD_CLASS_DEVICE=m
1374# CONFIG_LCD_ILI9320 is not set 1404# CONFIG_LCD_ILI9320 is not set
@@ -1401,6 +1431,7 @@ CONFIG_LOGO_LINUX_MONO=y
1401CONFIG_LOGO_LINUX_VGA16=y 1431CONFIG_LOGO_LINUX_VGA16=y
1402CONFIG_LOGO_LINUX_CLUT224=y 1432CONFIG_LOGO_LINUX_CLUT224=y
1403CONFIG_SOUND=m 1433CONFIG_SOUND=m
1434CONFIG_SOUND_OSS_CORE=y
1404CONFIG_SND=m 1435CONFIG_SND=m
1405CONFIG_SND_TIMER=m 1436CONFIG_SND_TIMER=m
1406CONFIG_SND_PCM=m 1437CONFIG_SND_PCM=m
@@ -1514,9 +1545,36 @@ CONFIG_HID=y
1514# USB Input Devices 1545# USB Input Devices
1515# 1546#
1516CONFIG_USB_HID=y 1547CONFIG_USB_HID=y
1517CONFIG_USB_HIDINPUT_POWERBOOK=y 1548# CONFIG_HID_PID is not set
1518# CONFIG_HID_FF is not set
1519# CONFIG_USB_HIDDEV is not set 1549# CONFIG_USB_HIDDEV is not set
1550
1551#
1552# Special HID drivers
1553#
1554CONFIG_HID_COMPAT=y
1555CONFIG_HID_A4TECH=y
1556CONFIG_HID_APPLE=y
1557CONFIG_HID_BELKIN=y
1558CONFIG_HID_BRIGHT=y
1559CONFIG_HID_CHERRY=y
1560CONFIG_HID_CHICONY=y
1561CONFIG_HID_CYPRESS=y
1562CONFIG_HID_DELL=y
1563CONFIG_HID_EZKEY=y
1564CONFIG_HID_GYRATION=y
1565CONFIG_HID_LOGITECH=y
1566# CONFIG_LOGITECH_FF is not set
1567# CONFIG_LOGIRUMBLEPAD2_FF is not set
1568CONFIG_HID_MICROSOFT=y
1569CONFIG_HID_MONTEREY=y
1570CONFIG_HID_PANTHERLORD=y
1571# CONFIG_PANTHERLORD_FF is not set
1572CONFIG_HID_PETALYNX=y
1573CONFIG_HID_SAMSUNG=y
1574CONFIG_HID_SONY=y
1575CONFIG_HID_SUNPLUS=y
1576# CONFIG_THRUSTMASTER_FF is not set
1577# CONFIG_ZEROPLUS_FF is not set
1520CONFIG_USB_SUPPORT=y 1578CONFIG_USB_SUPPORT=y
1521CONFIG_USB_ARCH_HAS_HCD=y 1579CONFIG_USB_ARCH_HAS_HCD=y
1522CONFIG_USB_ARCH_HAS_OHCI=y 1580CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1534,6 +1592,8 @@ CONFIG_USB_DYNAMIC_MINORS=y
1534# CONFIG_USB_SUSPEND is not set 1592# CONFIG_USB_SUSPEND is not set
1535# CONFIG_USB_OTG is not set 1593# CONFIG_USB_OTG is not set
1536CONFIG_USB_MON=y 1594CONFIG_USB_MON=y
1595# CONFIG_USB_WUSB is not set
1596# CONFIG_USB_WUSB_CBAF is not set
1537 1597
1538# 1598#
1539# USB Host Controller Drivers 1599# USB Host Controller Drivers
@@ -1553,6 +1613,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1553# CONFIG_USB_UHCI_HCD is not set 1613# CONFIG_USB_UHCI_HCD is not set
1554# CONFIG_USB_SL811_HCD is not set 1614# CONFIG_USB_SL811_HCD is not set
1555# CONFIG_USB_R8A66597_HCD is not set 1615# CONFIG_USB_R8A66597_HCD is not set
1616# CONFIG_USB_WHCI_HCD is not set
1617# CONFIG_USB_HWA_HCD is not set
1556 1618
1557# 1619#
1558# USB Device Class drivers 1620# USB Device Class drivers
@@ -1560,6 +1622,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1560CONFIG_USB_ACM=m 1622CONFIG_USB_ACM=m
1561CONFIG_USB_PRINTER=m 1623CONFIG_USB_PRINTER=m
1562# CONFIG_USB_WDM is not set 1624# CONFIG_USB_WDM is not set
1625# CONFIG_USB_TMC is not set
1563 1626
1564# 1627#
1565# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1628# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1581,7 +1644,6 @@ CONFIG_USB_STORAGE=m
1581# CONFIG_USB_STORAGE_ALAUDA is not set 1644# CONFIG_USB_STORAGE_ALAUDA is not set
1582CONFIG_USB_STORAGE_ONETOUCH=y 1645CONFIG_USB_STORAGE_ONETOUCH=y
1583# CONFIG_USB_STORAGE_KARMA is not set 1646# CONFIG_USB_STORAGE_KARMA is not set
1584# CONFIG_USB_STORAGE_SIERRA is not set
1585# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1647# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1586# CONFIG_USB_LIBUSUAL is not set 1648# CONFIG_USB_LIBUSUAL is not set
1587 1649
@@ -1656,6 +1718,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1656# CONFIG_USB_EMI62 is not set 1718# CONFIG_USB_EMI62 is not set
1657# CONFIG_USB_EMI26 is not set 1719# CONFIG_USB_EMI26 is not set
1658# CONFIG_USB_ADUTUX is not set 1720# CONFIG_USB_ADUTUX is not set
1721# CONFIG_USB_SEVSEG is not set
1659# CONFIG_USB_RIO500 is not set 1722# CONFIG_USB_RIO500 is not set
1660# CONFIG_USB_LEGOTOWER is not set 1723# CONFIG_USB_LEGOTOWER is not set
1661# CONFIG_USB_LCD is not set 1724# CONFIG_USB_LCD is not set
@@ -1673,7 +1736,9 @@ CONFIG_USB_APPLEDISPLAY=m
1673# CONFIG_USB_IOWARRIOR is not set 1736# CONFIG_USB_IOWARRIOR is not set
1674# CONFIG_USB_TEST is not set 1737# CONFIG_USB_TEST is not set
1675# CONFIG_USB_ISIGHTFW is not set 1738# CONFIG_USB_ISIGHTFW is not set
1739# CONFIG_USB_VST is not set
1676# CONFIG_USB_GADGET is not set 1740# CONFIG_USB_GADGET is not set
1741# CONFIG_UWB is not set
1677# CONFIG_MMC is not set 1742# CONFIG_MMC is not set
1678# CONFIG_MEMSTICK is not set 1743# CONFIG_MEMSTICK is not set
1679CONFIG_NEW_LEDS=y 1744CONFIG_NEW_LEDS=y
@@ -1692,6 +1757,7 @@ CONFIG_LEDS_TRIGGERS=y
1692# CONFIG_LEDS_TRIGGER_TIMER is not set 1757# CONFIG_LEDS_TRIGGER_TIMER is not set
1693CONFIG_LEDS_TRIGGER_IDE_DISK=y 1758CONFIG_LEDS_TRIGGER_IDE_DISK=y
1694# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 1759# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
1760# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
1695CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 1761CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1696# CONFIG_ACCESSIBILITY is not set 1762# CONFIG_ACCESSIBILITY is not set
1697# CONFIG_INFINIBAND is not set 1763# CONFIG_INFINIBAND is not set
@@ -1699,6 +1765,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1699# CONFIG_RTC_CLASS is not set 1765# CONFIG_RTC_CLASS is not set
1700# CONFIG_DMADEVICES is not set 1766# CONFIG_DMADEVICES is not set
1701# CONFIG_UIO is not set 1767# CONFIG_UIO is not set
1768# CONFIG_STAGING is not set
1702 1769
1703# 1770#
1704# File systems 1771# File systems
@@ -1710,12 +1777,18 @@ CONFIG_EXT3_FS=y
1710CONFIG_EXT3_FS_XATTR=y 1777CONFIG_EXT3_FS_XATTR=y
1711CONFIG_EXT3_FS_POSIX_ACL=y 1778CONFIG_EXT3_FS_POSIX_ACL=y
1712# CONFIG_EXT3_FS_SECURITY is not set 1779# CONFIG_EXT3_FS_SECURITY is not set
1713# CONFIG_EXT4DEV_FS is not set 1780CONFIG_EXT4_FS=y
1781# CONFIG_EXT4DEV_COMPAT is not set
1782CONFIG_EXT4_FS_XATTR=y
1783# CONFIG_EXT4_FS_POSIX_ACL is not set
1784# CONFIG_EXT4_FS_SECURITY is not set
1714CONFIG_JBD=y 1785CONFIG_JBD=y
1786CONFIG_JBD2=y
1715CONFIG_FS_MBCACHE=y 1787CONFIG_FS_MBCACHE=y
1716# CONFIG_REISERFS_FS is not set 1788# CONFIG_REISERFS_FS is not set
1717# CONFIG_JFS_FS is not set 1789# CONFIG_JFS_FS is not set
1718CONFIG_FS_POSIX_ACL=y 1790CONFIG_FS_POSIX_ACL=y
1791CONFIG_FILE_LOCKING=y
1719# CONFIG_XFS_FS is not set 1792# CONFIG_XFS_FS is not set
1720# CONFIG_GFS2_FS is not set 1793# CONFIG_GFS2_FS is not set
1721# CONFIG_OCFS2_FS is not set 1794# CONFIG_OCFS2_FS is not set
@@ -1752,6 +1825,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1752CONFIG_PROC_FS=y 1825CONFIG_PROC_FS=y
1753CONFIG_PROC_KCORE=y 1826CONFIG_PROC_KCORE=y
1754CONFIG_PROC_SYSCTL=y 1827CONFIG_PROC_SYSCTL=y
1828CONFIG_PROC_PAGE_MONITOR=y
1755CONFIG_SYSFS=y 1829CONFIG_SYSFS=y
1756CONFIG_TMPFS=y 1830CONFIG_TMPFS=y
1757# CONFIG_TMPFS_POSIX_ACL is not set 1831# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1794,6 +1868,7 @@ CONFIG_NFS_ACL_SUPPORT=y
1794CONFIG_NFS_COMMON=y 1868CONFIG_NFS_COMMON=y
1795CONFIG_SUNRPC=y 1869CONFIG_SUNRPC=y
1796CONFIG_SUNRPC_GSS=y 1870CONFIG_SUNRPC_GSS=y
1871# CONFIG_SUNRPC_REGISTER_V4 is not set
1797CONFIG_RPCSEC_GSS_KRB5=y 1872CONFIG_RPCSEC_GSS_KRB5=y
1798# CONFIG_RPCSEC_GSS_SPKM3 is not set 1873# CONFIG_RPCSEC_GSS_SPKM3 is not set
1799CONFIG_SMB_FS=m 1874CONFIG_SMB_FS=m
@@ -1870,7 +1945,6 @@ CONFIG_NLS_UTF8=m
1870# Library routines 1945# Library routines
1871# 1946#
1872CONFIG_BITREVERSE=y 1947CONFIG_BITREVERSE=y
1873# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1874CONFIG_CRC_CCITT=y 1948CONFIG_CRC_CCITT=y
1875CONFIG_CRC16=y 1949CONFIG_CRC16=y
1876CONFIG_CRC_T10DIF=y 1950CONFIG_CRC_T10DIF=y
@@ -1927,18 +2001,25 @@ CONFIG_DEBUG_BUGVERBOSE=y
1927CONFIG_DEBUG_MEMORY_INIT=y 2001CONFIG_DEBUG_MEMORY_INIT=y
1928# CONFIG_DEBUG_LIST is not set 2002# CONFIG_DEBUG_LIST is not set
1929# CONFIG_DEBUG_SG is not set 2003# CONFIG_DEBUG_SG is not set
1930CONFIG_FRAME_POINTER=y
1931# CONFIG_BOOT_PRINTK_DELAY is not set 2004# CONFIG_BOOT_PRINTK_DELAY is not set
1932# CONFIG_RCU_TORTURE_TEST is not set 2005# CONFIG_RCU_TORTURE_TEST is not set
2006# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1933# CONFIG_BACKTRACE_SELF_TEST is not set 2007# CONFIG_BACKTRACE_SELF_TEST is not set
2008# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1934# CONFIG_FAULT_INJECTION is not set 2009# CONFIG_FAULT_INJECTION is not set
1935CONFIG_LATENCYTOP=y 2010CONFIG_LATENCYTOP=y
1936CONFIG_SYSCTL_SYSCALL_CHECK=y 2011CONFIG_SYSCTL_SYSCALL_CHECK=y
1937CONFIG_HAVE_FTRACE=y 2012CONFIG_HAVE_FUNCTION_TRACER=y
1938CONFIG_HAVE_DYNAMIC_FTRACE=y 2013
1939# CONFIG_FTRACE is not set 2014#
2015# Tracers
2016#
2017# CONFIG_FUNCTION_TRACER is not set
1940# CONFIG_SCHED_TRACER is not set 2018# CONFIG_SCHED_TRACER is not set
1941# CONFIG_CONTEXT_SWITCH_TRACER is not set 2019# CONFIG_CONTEXT_SWITCH_TRACER is not set
2020# CONFIG_BOOT_TRACER is not set
2021# CONFIG_STACK_TRACER is not set
2022# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1942# CONFIG_SAMPLES is not set 2023# CONFIG_SAMPLES is not set
1943CONFIG_HAVE_ARCH_KGDB=y 2024CONFIG_HAVE_ARCH_KGDB=y
1944# CONFIG_KGDB is not set 2025# CONFIG_KGDB is not set
@@ -1946,6 +2027,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1946# CONFIG_DEBUG_STACK_USAGE is not set 2027# CONFIG_DEBUG_STACK_USAGE is not set
1947# CONFIG_CODE_PATCHING_SELFTEST is not set 2028# CONFIG_CODE_PATCHING_SELFTEST is not set
1948# CONFIG_FTR_FIXUP_SELFTEST is not set 2029# CONFIG_FTR_FIXUP_SELFTEST is not set
2030# CONFIG_MSI_BITMAP_SELFTEST is not set
1949CONFIG_XMON=y 2031CONFIG_XMON=y
1950CONFIG_XMON_DEFAULT=y 2032CONFIG_XMON_DEFAULT=y
1951CONFIG_XMON_DISASSEMBLY=y 2033CONFIG_XMON_DISASSEMBLY=y
@@ -1960,16 +2042,19 @@ CONFIG_BOOTX_TEXT=y
1960# 2042#
1961# CONFIG_KEYS is not set 2043# CONFIG_KEYS is not set
1962# CONFIG_SECURITY is not set 2044# CONFIG_SECURITY is not set
2045# CONFIG_SECURITYFS is not set
1963# CONFIG_SECURITY_FILE_CAPABILITIES is not set 2046# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1964CONFIG_CRYPTO=y 2047CONFIG_CRYPTO=y
1965 2048
1966# 2049#
1967# Crypto core or helper 2050# Crypto core or helper
1968# 2051#
2052# CONFIG_CRYPTO_FIPS is not set
1969CONFIG_CRYPTO_ALGAPI=y 2053CONFIG_CRYPTO_ALGAPI=y
1970CONFIG_CRYPTO_AEAD=y 2054CONFIG_CRYPTO_AEAD=y
1971CONFIG_CRYPTO_BLKCIPHER=y 2055CONFIG_CRYPTO_BLKCIPHER=y
1972CONFIG_CRYPTO_HASH=y 2056CONFIG_CRYPTO_HASH=y
2057CONFIG_CRYPTO_RNG=y
1973CONFIG_CRYPTO_MANAGER=y 2058CONFIG_CRYPTO_MANAGER=y
1974# CONFIG_CRYPTO_GF128MUL is not set 2059# CONFIG_CRYPTO_GF128MUL is not set
1975CONFIG_CRYPTO_NULL=m 2060CONFIG_CRYPTO_NULL=m
@@ -2043,6 +2128,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
2043# 2128#
2044CONFIG_CRYPTO_DEFLATE=m 2129CONFIG_CRYPTO_DEFLATE=m
2045# CONFIG_CRYPTO_LZO is not set 2130# CONFIG_CRYPTO_LZO is not set
2131
2132#
2133# Random Number Generation
2134#
2135# CONFIG_CRYPTO_ANSI_CPRNG is not set
2046CONFIG_CRYPTO_HW=y 2136CONFIG_CRYPTO_HW=y
2047# CONFIG_CRYPTO_DEV_HIFN_795X is not set 2137# CONFIG_CRYPTO_DEV_HIFN_795X is not set
2048# CONFIG_PPC_CLOCK is not set 2138# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index fc5930caeb5f..069ae1bbac29 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:22:03 2008 4# Tue Nov 11 19:36:56 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -22,7 +22,7 @@ CONFIG_SMP=y
22CONFIG_NR_CPUS=32 22CONFIG_NR_CPUS=32
23CONFIG_64BIT=y 23CONFIG_64BIT=y
24CONFIG_WORD_SIZE=64 24CONFIG_WORD_SIZE=64
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -87,6 +87,7 @@ CONFIG_LOG_BUF_SHIFT=17
87CONFIG_CGROUPS=y 87CONFIG_CGROUPS=y
88# CONFIG_CGROUP_DEBUG is not set 88# CONFIG_CGROUP_DEBUG is not set
89# CONFIG_CGROUP_NS is not set 89# CONFIG_CGROUP_NS is not set
90# CONFIG_CGROUP_FREEZER is not set
90# CONFIG_CGROUP_DEVICE is not set 91# CONFIG_CGROUP_DEVICE is not set
91CONFIG_CPUSETS=y 92CONFIG_CPUSETS=y
92# CONFIG_GROUP_SCHED is not set 93# CONFIG_GROUP_SCHED is not set
@@ -124,12 +125,15 @@ CONFIG_SIGNALFD=y
124CONFIG_TIMERFD=y 125CONFIG_TIMERFD=y
125CONFIG_EVENTFD=y 126CONFIG_EVENTFD=y
126CONFIG_SHMEM=y 127CONFIG_SHMEM=y
128CONFIG_AIO=y
127CONFIG_VM_EVENT_COUNTERS=y 129CONFIG_VM_EVENT_COUNTERS=y
130CONFIG_PCI_QUIRKS=y
128CONFIG_SLUB_DEBUG=y 131CONFIG_SLUB_DEBUG=y
129# CONFIG_SLAB is not set 132# CONFIG_SLAB is not set
130CONFIG_SLUB=y 133CONFIG_SLUB=y
131# CONFIG_SLOB is not set 134# CONFIG_SLOB is not set
132CONFIG_PROFILING=y 135CONFIG_PROFILING=y
136CONFIG_TRACEPOINTS=y
133CONFIG_MARKERS=y 137CONFIG_MARKERS=y
134CONFIG_OPROFILE=y 138CONFIG_OPROFILE=y
135CONFIG_HAVE_OPROFILE=y 139CONFIG_HAVE_OPROFILE=y
@@ -141,8 +145,6 @@ CONFIG_HAVE_KRETPROBES=y
141CONFIG_HAVE_ARCH_TRACEHOOK=y 145CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y 146CONFIG_HAVE_DMA_ATTRS=y
143CONFIG_USE_GENERIC_SMP_HELPERS=y 147CONFIG_USE_GENERIC_SMP_HELPERS=y
144# CONFIG_HAVE_CLK is not set
145CONFIG_PROC_PAGE_MONITOR=y
146# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 148# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
147CONFIG_SLABINFO=y 149CONFIG_SLABINFO=y
148CONFIG_RT_MUTEXES=y 150CONFIG_RT_MUTEXES=y
@@ -175,6 +177,8 @@ CONFIG_DEFAULT_AS=y
175# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 178CONFIG_DEFAULT_IOSCHED="anticipatory"
177CONFIG_CLASSIC_RCU=y 179CONFIG_CLASSIC_RCU=y
180# CONFIG_FREEZER is not set
181CONFIG_PPC_MSI_BITMAP=y
178 182
179# 183#
180# Platform support 184# Platform support
@@ -294,6 +298,8 @@ CONFIG_PREEMPT_NONE=y
294# CONFIG_PREEMPT is not set 298# CONFIG_PREEMPT is not set
295CONFIG_BINFMT_ELF=y 299CONFIG_BINFMT_ELF=y
296CONFIG_COMPAT_BINFMT_ELF=y 300CONFIG_COMPAT_BINFMT_ELF=y
301# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
302# CONFIG_HAVE_AOUT is not set
297CONFIG_BINFMT_MISC=m 303CONFIG_BINFMT_MISC=m
298CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 304CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
299CONFIG_IOMMU_VMERGE=y 305CONFIG_IOMMU_VMERGE=y
@@ -303,7 +309,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
303CONFIG_ARCH_HAS_WALK_MEMORY=y 309CONFIG_ARCH_HAS_WALK_MEMORY=y
304CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 310CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
305CONFIG_KEXEC=y 311CONFIG_KEXEC=y
306# CONFIG_CRASH_DUMP is not set
307# CONFIG_PHYP_DUMP is not set 312# CONFIG_PHYP_DUMP is not set
308CONFIG_IRQ_ALL_CPUS=y 313CONFIG_IRQ_ALL_CPUS=y
309# CONFIG_NUMA is not set 314# CONFIG_NUMA is not set
@@ -318,7 +323,6 @@ CONFIG_SELECT_MEMORY_MODEL=y
318CONFIG_SPARSEMEM_MANUAL=y 323CONFIG_SPARSEMEM_MANUAL=y
319CONFIG_SPARSEMEM=y 324CONFIG_SPARSEMEM=y
320CONFIG_HAVE_MEMORY_PRESENT=y 325CONFIG_HAVE_MEMORY_PRESENT=y
321# CONFIG_SPARSEMEM_STATIC is not set
322CONFIG_SPARSEMEM_EXTREME=y 326CONFIG_SPARSEMEM_EXTREME=y
323CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 327CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
324CONFIG_SPARSEMEM_VMEMMAP=y 328CONFIG_SPARSEMEM_VMEMMAP=y
@@ -329,8 +333,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
329CONFIG_SPLIT_PTLOCK_CPUS=4 333CONFIG_SPLIT_PTLOCK_CPUS=4
330CONFIG_MIGRATION=y 334CONFIG_MIGRATION=y
331CONFIG_RESOURCES_64BIT=y 335CONFIG_RESOURCES_64BIT=y
336CONFIG_PHYS_ADDR_T_64BIT=y
332CONFIG_ZONE_DMA_FLAG=1 337CONFIG_ZONE_DMA_FLAG=1
333CONFIG_BOUNCE=y 338CONFIG_BOUNCE=y
339CONFIG_UNEVICTABLE_LRU=y
334CONFIG_ARCH_MEMORY_PROBE=y 340CONFIG_ARCH_MEMORY_PROBE=y
335CONFIG_PPC_HAS_HASH_64K=y 341CONFIG_PPC_HAS_HASH_64K=y
336# CONFIG_PPC_64K_PAGES is not set 342# CONFIG_PPC_64K_PAGES is not set
@@ -379,6 +385,7 @@ CONFIG_HOTPLUG_PCI=m
379CONFIG_HOTPLUG_PCI_RPA=m 385CONFIG_HOTPLUG_PCI_RPA=m
380CONFIG_HOTPLUG_PCI_RPA_DLPAR=m 386CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
381# CONFIG_HAS_RAPIDIO is not set 387# CONFIG_HAS_RAPIDIO is not set
388# CONFIG_RELOCATABLE is not set
382CONFIG_PAGE_OFFSET=0xc000000000000000 389CONFIG_PAGE_OFFSET=0xc000000000000000
383CONFIG_KERNEL_START=0xc000000000000000 390CONFIG_KERNEL_START=0xc000000000000000
384CONFIG_PHYSICAL_START=0x00000000 391CONFIG_PHYSICAL_START=0x00000000
@@ -426,7 +433,6 @@ CONFIG_INET_TCP_DIAG=y
426CONFIG_TCP_CONG_CUBIC=y 433CONFIG_TCP_CONG_CUBIC=y
427CONFIG_DEFAULT_TCP_CONG="cubic" 434CONFIG_DEFAULT_TCP_CONG="cubic"
428# CONFIG_TCP_MD5SIG is not set 435# CONFIG_TCP_MD5SIG is not set
429# CONFIG_IP_VS is not set
430# CONFIG_IPV6 is not set 436# CONFIG_IPV6 is not set
431# CONFIG_NETWORK_SECMARK is not set 437# CONFIG_NETWORK_SECMARK is not set
432CONFIG_NETFILTER=y 438CONFIG_NETFILTER=y
@@ -457,15 +463,17 @@ CONFIG_NF_CONNTRACK_PPTP=m
457CONFIG_NF_CONNTRACK_SIP=m 463CONFIG_NF_CONNTRACK_SIP=m
458CONFIG_NF_CONNTRACK_TFTP=m 464CONFIG_NF_CONNTRACK_TFTP=m
459CONFIG_NF_CT_NETLINK=m 465CONFIG_NF_CT_NETLINK=m
466CONFIG_NETFILTER_TPROXY=m
460CONFIG_NETFILTER_XTABLES=m 467CONFIG_NETFILTER_XTABLES=m
461CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 468CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
462CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 469CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
463CONFIG_NETFILTER_XT_TARGET_DSCP=m 470CONFIG_NETFILTER_XT_TARGET_DSCP=m
464CONFIG_NETFILTER_XT_TARGET_MARK=m 471CONFIG_NETFILTER_XT_TARGET_MARK=m
465CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
466CONFIG_NETFILTER_XT_TARGET_NFLOG=m 472CONFIG_NETFILTER_XT_TARGET_NFLOG=m
473CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
467CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 474CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
468CONFIG_NETFILTER_XT_TARGET_RATEEST=m 475CONFIG_NETFILTER_XT_TARGET_RATEEST=m
476CONFIG_NETFILTER_XT_TARGET_TPROXY=m
469CONFIG_NETFILTER_XT_TARGET_TRACE=m 477CONFIG_NETFILTER_XT_TARGET_TRACE=m
470CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 478CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
471CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 479CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -477,40 +485,44 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
477CONFIG_NETFILTER_XT_MATCH_DCCP=m 485CONFIG_NETFILTER_XT_MATCH_DCCP=m
478CONFIG_NETFILTER_XT_MATCH_DSCP=m 486CONFIG_NETFILTER_XT_MATCH_DSCP=m
479CONFIG_NETFILTER_XT_MATCH_ESP=m 487CONFIG_NETFILTER_XT_MATCH_ESP=m
488CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
480CONFIG_NETFILTER_XT_MATCH_HELPER=m 489CONFIG_NETFILTER_XT_MATCH_HELPER=m
481CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 490CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
482CONFIG_NETFILTER_XT_MATCH_LENGTH=m 491CONFIG_NETFILTER_XT_MATCH_LENGTH=m
483CONFIG_NETFILTER_XT_MATCH_LIMIT=m 492CONFIG_NETFILTER_XT_MATCH_LIMIT=m
484CONFIG_NETFILTER_XT_MATCH_MAC=m 493CONFIG_NETFILTER_XT_MATCH_MAC=m
485CONFIG_NETFILTER_XT_MATCH_MARK=m 494CONFIG_NETFILTER_XT_MATCH_MARK=m
495CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
486CONFIG_NETFILTER_XT_MATCH_OWNER=m 496CONFIG_NETFILTER_XT_MATCH_OWNER=m
487CONFIG_NETFILTER_XT_MATCH_POLICY=m 497CONFIG_NETFILTER_XT_MATCH_POLICY=m
488CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
489CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 498CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
490CONFIG_NETFILTER_XT_MATCH_QUOTA=m 499CONFIG_NETFILTER_XT_MATCH_QUOTA=m
491CONFIG_NETFILTER_XT_MATCH_RATEEST=m 500CONFIG_NETFILTER_XT_MATCH_RATEEST=m
492CONFIG_NETFILTER_XT_MATCH_REALM=m 501CONFIG_NETFILTER_XT_MATCH_REALM=m
502CONFIG_NETFILTER_XT_MATCH_RECENT=m
503# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
493CONFIG_NETFILTER_XT_MATCH_SCTP=m 504CONFIG_NETFILTER_XT_MATCH_SCTP=m
505CONFIG_NETFILTER_XT_MATCH_SOCKET=m
494CONFIG_NETFILTER_XT_MATCH_STATE=m 506CONFIG_NETFILTER_XT_MATCH_STATE=m
495CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 507CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
496CONFIG_NETFILTER_XT_MATCH_STRING=m 508CONFIG_NETFILTER_XT_MATCH_STRING=m
497CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 509CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
498# CONFIG_NETFILTER_XT_MATCH_TIME is not set 510# CONFIG_NETFILTER_XT_MATCH_TIME is not set
499CONFIG_NETFILTER_XT_MATCH_U32=m 511CONFIG_NETFILTER_XT_MATCH_U32=m
500CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 512# CONFIG_IP_VS is not set
501 513
502# 514#
503# IP: Netfilter Configuration 515# IP: Netfilter Configuration
504# 516#
517CONFIG_NF_DEFRAG_IPV4=m
505CONFIG_NF_CONNTRACK_IPV4=m 518CONFIG_NF_CONNTRACK_IPV4=m
506CONFIG_NF_CONNTRACK_PROC_COMPAT=y 519CONFIG_NF_CONNTRACK_PROC_COMPAT=y
507CONFIG_IP_NF_QUEUE=m 520CONFIG_IP_NF_QUEUE=m
508CONFIG_IP_NF_IPTABLES=m 521CONFIG_IP_NF_IPTABLES=m
509CONFIG_IP_NF_MATCH_RECENT=m 522CONFIG_IP_NF_MATCH_ADDRTYPE=m
510CONFIG_IP_NF_MATCH_ECN=m
511CONFIG_IP_NF_MATCH_AH=m 523CONFIG_IP_NF_MATCH_AH=m
524CONFIG_IP_NF_MATCH_ECN=m
512CONFIG_IP_NF_MATCH_TTL=m 525CONFIG_IP_NF_MATCH_TTL=m
513CONFIG_IP_NF_MATCH_ADDRTYPE=m
514CONFIG_IP_NF_FILTER=m 526CONFIG_IP_NF_FILTER=m
515CONFIG_IP_NF_TARGET_REJECT=m 527CONFIG_IP_NF_TARGET_REJECT=m
516CONFIG_IP_NF_TARGET_LOG=m 528CONFIG_IP_NF_TARGET_LOG=m
@@ -518,8 +530,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
518CONFIG_NF_NAT=m 530CONFIG_NF_NAT=m
519CONFIG_NF_NAT_NEEDED=y 531CONFIG_NF_NAT_NEEDED=y
520CONFIG_IP_NF_TARGET_MASQUERADE=m 532CONFIG_IP_NF_TARGET_MASQUERADE=m
521CONFIG_IP_NF_TARGET_REDIRECT=m
522CONFIG_IP_NF_TARGET_NETMAP=m 533CONFIG_IP_NF_TARGET_NETMAP=m
534CONFIG_IP_NF_TARGET_REDIRECT=m
523CONFIG_NF_NAT_SNMP_BASIC=m 535CONFIG_NF_NAT_SNMP_BASIC=m
524CONFIG_NF_NAT_PROTO_GRE=m 536CONFIG_NF_NAT_PROTO_GRE=m
525CONFIG_NF_NAT_PROTO_SCTP=m 537CONFIG_NF_NAT_PROTO_SCTP=m
@@ -531,9 +543,9 @@ CONFIG_NF_NAT_PPTP=m
531CONFIG_NF_NAT_H323=m 543CONFIG_NF_NAT_H323=m
532CONFIG_NF_NAT_SIP=m 544CONFIG_NF_NAT_SIP=m
533CONFIG_IP_NF_MANGLE=m 545CONFIG_IP_NF_MANGLE=m
546CONFIG_IP_NF_TARGET_CLUSTERIP=m
534CONFIG_IP_NF_TARGET_ECN=m 547CONFIG_IP_NF_TARGET_ECN=m
535CONFIG_IP_NF_TARGET_TTL=m 548CONFIG_IP_NF_TARGET_TTL=m
536CONFIG_IP_NF_TARGET_CLUSTERIP=m
537CONFIG_IP_NF_RAW=m 549CONFIG_IP_NF_RAW=m
538CONFIG_IP_NF_ARPTABLES=m 550CONFIG_IP_NF_ARPTABLES=m
539CONFIG_IP_NF_ARPFILTER=m 551CONFIG_IP_NF_ARPFILTER=m
@@ -543,6 +555,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
543# CONFIG_TIPC is not set 555# CONFIG_TIPC is not set
544# CONFIG_ATM is not set 556# CONFIG_ATM is not set
545# CONFIG_BRIDGE is not set 557# CONFIG_BRIDGE is not set
558# CONFIG_NET_DSA is not set
546# CONFIG_VLAN_8021Q is not set 559# CONFIG_VLAN_8021Q is not set
547# CONFIG_DECNET is not set 560# CONFIG_DECNET is not set
548CONFIG_LLC=y 561CONFIG_LLC=y
@@ -565,11 +578,10 @@ CONFIG_NET_CLS_ROUTE=y
565# CONFIG_IRDA is not set 578# CONFIG_IRDA is not set
566# CONFIG_BT is not set 579# CONFIG_BT is not set
567# CONFIG_AF_RXRPC is not set 580# CONFIG_AF_RXRPC is not set
568 581# CONFIG_PHONET is not set
569# 582CONFIG_WIRELESS=y
570# Wireless
571#
572# CONFIG_CFG80211 is not set 583# CONFIG_CFG80211 is not set
584CONFIG_WIRELESS_OLD_REGULATORY=y
573# CONFIG_WIRELESS_EXT is not set 585# CONFIG_WIRELESS_EXT is not set
574# CONFIG_MAC80211 is not set 586# CONFIG_MAC80211 is not set
575# CONFIG_IEEE80211 is not set 587# CONFIG_IEEE80211 is not set
@@ -624,21 +636,20 @@ CONFIG_MISC_DEVICES=y
624# CONFIG_HP_ILO is not set 636# CONFIG_HP_ILO is not set
625CONFIG_HAVE_IDE=y 637CONFIG_HAVE_IDE=y
626CONFIG_IDE=y 638CONFIG_IDE=y
627CONFIG_BLK_DEV_IDE=y
628 639
629# 640#
630# Please see Documentation/ide/ide.txt for help/info on IDE drives 641# Please see Documentation/ide/ide.txt for help/info on IDE drives
631# 642#
632CONFIG_IDE_TIMINGS=y 643CONFIG_IDE_TIMINGS=y
633# CONFIG_BLK_DEV_IDE_SATA is not set 644# CONFIG_BLK_DEV_IDE_SATA is not set
634CONFIG_BLK_DEV_IDEDISK=y 645CONFIG_IDE_GD=y
635# CONFIG_IDEDISK_MULTI_MODE is not set 646CONFIG_IDE_GD_ATA=y
647# CONFIG_IDE_GD_ATAPI is not set
636# CONFIG_BLK_DEV_IDECS is not set 648# CONFIG_BLK_DEV_IDECS is not set
637# CONFIG_BLK_DEV_DELKIN is not set 649# CONFIG_BLK_DEV_DELKIN is not set
638CONFIG_BLK_DEV_IDECD=y 650CONFIG_BLK_DEV_IDECD=y
639CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 651CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
640# CONFIG_BLK_DEV_IDETAPE is not set 652# CONFIG_BLK_DEV_IDETAPE is not set
641# CONFIG_BLK_DEV_IDEFLOPPY is not set
642# CONFIG_BLK_DEV_IDESCSI is not set 653# CONFIG_BLK_DEV_IDESCSI is not set
643# CONFIG_IDE_TASK_IOCTL is not set 654# CONFIG_IDE_TASK_IOCTL is not set
644CONFIG_IDE_PROC_FS=y 655CONFIG_IDE_PROC_FS=y
@@ -835,6 +846,7 @@ CONFIG_SATA_SVW=y
835# CONFIG_PATA_SCH is not set 846# CONFIG_PATA_SCH is not set
836CONFIG_MD=y 847CONFIG_MD=y
837CONFIG_BLK_DEV_MD=y 848CONFIG_BLK_DEV_MD=y
849CONFIG_MD_AUTODETECT=y
838CONFIG_MD_LINEAR=y 850CONFIG_MD_LINEAR=y
839CONFIG_MD_RAID0=y 851CONFIG_MD_RAID0=y
840CONFIG_MD_RAID1=y 852CONFIG_MD_RAID1=y
@@ -926,6 +938,9 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
926CONFIG_IBM_NEW_EMAC_RGMII=y 938CONFIG_IBM_NEW_EMAC_RGMII=y
927CONFIG_IBM_NEW_EMAC_TAH=y 939CONFIG_IBM_NEW_EMAC_TAH=y
928CONFIG_IBM_NEW_EMAC_EMAC4=y 940CONFIG_IBM_NEW_EMAC_EMAC4=y
941# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
942# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
943# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
929CONFIG_NET_PCI=y 944CONFIG_NET_PCI=y
930CONFIG_PCNET32=y 945CONFIG_PCNET32=y
931# CONFIG_AMD8111_ETH is not set 946# CONFIG_AMD8111_ETH is not set
@@ -946,12 +961,12 @@ CONFIG_E100=y
946# CONFIG_TLAN is not set 961# CONFIG_TLAN is not set
947# CONFIG_VIA_RHINE is not set 962# CONFIG_VIA_RHINE is not set
948# CONFIG_SC92031 is not set 963# CONFIG_SC92031 is not set
964# CONFIG_ATL2 is not set
949CONFIG_NETDEV_1000=y 965CONFIG_NETDEV_1000=y
950CONFIG_ACENIC=y 966CONFIG_ACENIC=y
951CONFIG_ACENIC_OMIT_TIGON_I=y 967CONFIG_ACENIC_OMIT_TIGON_I=y
952# CONFIG_DL2K is not set 968# CONFIG_DL2K is not set
953CONFIG_E1000=y 969CONFIG_E1000=y
954# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
955# CONFIG_E1000E is not set 970# CONFIG_E1000E is not set
956# CONFIG_IP1000 is not set 971# CONFIG_IP1000 is not set
957# CONFIG_IGB is not set 972# CONFIG_IGB is not set
@@ -969,10 +984,12 @@ CONFIG_SPIDER_NET=m
969# CONFIG_QLA3XXX is not set 984# CONFIG_QLA3XXX is not set
970# CONFIG_ATL1 is not set 985# CONFIG_ATL1 is not set
971# CONFIG_ATL1E is not set 986# CONFIG_ATL1E is not set
987# CONFIG_JME is not set
972CONFIG_NETDEV_10000=y 988CONFIG_NETDEV_10000=y
973# CONFIG_CHELSIO_T1 is not set 989# CONFIG_CHELSIO_T1 is not set
974# CONFIG_CHELSIO_T3 is not set 990# CONFIG_CHELSIO_T3 is not set
975CONFIG_EHEA=m 991CONFIG_EHEA=m
992# CONFIG_ENIC is not set
976# CONFIG_IXGBE is not set 993# CONFIG_IXGBE is not set
977CONFIG_IXGB=m 994CONFIG_IXGB=m
978# CONFIG_S2IO is not set 995# CONFIG_S2IO is not set
@@ -980,9 +997,11 @@ CONFIG_IXGB=m
980# CONFIG_NETXEN_NIC is not set 997# CONFIG_NETXEN_NIC is not set
981# CONFIG_NIU is not set 998# CONFIG_NIU is not set
982CONFIG_PASEMI_MAC=y 999CONFIG_PASEMI_MAC=y
1000# CONFIG_MLX4_EN is not set
983# CONFIG_MLX4_CORE is not set 1001# CONFIG_MLX4_CORE is not set
984# CONFIG_TEHUTI is not set 1002# CONFIG_TEHUTI is not set
985# CONFIG_BNX2X is not set 1003# CONFIG_BNX2X is not set
1004# CONFIG_QLGE is not set
986# CONFIG_SFC is not set 1005# CONFIG_SFC is not set
987CONFIG_TR=y 1006CONFIG_TR=y
988CONFIG_IBMOL=y 1007CONFIG_IBMOL=y
@@ -1065,6 +1084,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
1065CONFIG_MOUSE_PS2_SYNAPTICS=y 1084CONFIG_MOUSE_PS2_SYNAPTICS=y
1066CONFIG_MOUSE_PS2_LIFEBOOK=y 1085CONFIG_MOUSE_PS2_LIFEBOOK=y
1067CONFIG_MOUSE_PS2_TRACKPOINT=y 1086CONFIG_MOUSE_PS2_TRACKPOINT=y
1087# CONFIG_MOUSE_PS2_ELANTECH is not set
1068# CONFIG_MOUSE_PS2_TOUCHKIT is not set 1088# CONFIG_MOUSE_PS2_TOUCHKIT is not set
1069# CONFIG_MOUSE_SERIAL is not set 1089# CONFIG_MOUSE_SERIAL is not set
1070# CONFIG_MOUSE_APPLETOUCH is not set 1090# CONFIG_MOUSE_APPLETOUCH is not set
@@ -1080,6 +1100,7 @@ CONFIG_INPUT_PCSPKR=m
1080# CONFIG_INPUT_KEYSPAN_REMOTE is not set 1100# CONFIG_INPUT_KEYSPAN_REMOTE is not set
1081# CONFIG_INPUT_POWERMATE is not set 1101# CONFIG_INPUT_POWERMATE is not set
1082# CONFIG_INPUT_YEALINK is not set 1102# CONFIG_INPUT_YEALINK is not set
1103# CONFIG_INPUT_CM109 is not set
1083# CONFIG_INPUT_UINPUT is not set 1104# CONFIG_INPUT_UINPUT is not set
1084 1105
1085# 1106#
@@ -1255,6 +1276,17 @@ CONFIG_SSB_POSSIBLE=y
1255# CONFIG_MFD_SM501 is not set 1276# CONFIG_MFD_SM501 is not set
1256# CONFIG_HTC_PASIC3 is not set 1277# CONFIG_HTC_PASIC3 is not set
1257# CONFIG_MFD_TMIO is not set 1278# CONFIG_MFD_TMIO is not set
1279# CONFIG_PMIC_DA903X is not set
1280# CONFIG_MFD_WM8400 is not set
1281# CONFIG_MFD_WM8350_I2C is not set
1282
1283#
1284# Voltage and Current regulators
1285#
1286# CONFIG_REGULATOR is not set
1287# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1288# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1289# CONFIG_REGULATOR_BQ24022 is not set
1258 1290
1259# 1291#
1260# Multimedia devices 1292# Multimedia devices
@@ -1282,6 +1314,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
1282CONFIG_FB=y 1314CONFIG_FB=y
1283CONFIG_FIRMWARE_EDID=y 1315CONFIG_FIRMWARE_EDID=y
1284CONFIG_FB_DDC=y 1316CONFIG_FB_DDC=y
1317# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1285CONFIG_FB_CFB_FILLRECT=y 1318CONFIG_FB_CFB_FILLRECT=y
1286CONFIG_FB_CFB_COPYAREA=y 1319CONFIG_FB_CFB_COPYAREA=y
1287CONFIG_FB_CFB_IMAGEBLIT=y 1320CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1326,6 +1359,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1326# CONFIG_FB_S3 is not set 1359# CONFIG_FB_S3 is not set
1327# CONFIG_FB_SAVAGE is not set 1360# CONFIG_FB_SAVAGE is not set
1328# CONFIG_FB_SIS is not set 1361# CONFIG_FB_SIS is not set
1362# CONFIG_FB_VIA is not set
1329# CONFIG_FB_NEOMAGIC is not set 1363# CONFIG_FB_NEOMAGIC is not set
1330# CONFIG_FB_KYRO is not set 1364# CONFIG_FB_KYRO is not set
1331# CONFIG_FB_3DFX is not set 1365# CONFIG_FB_3DFX is not set
@@ -1337,6 +1371,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1337# CONFIG_FB_CARMINE is not set 1371# CONFIG_FB_CARMINE is not set
1338CONFIG_FB_IBM_GXT4500=y 1372CONFIG_FB_IBM_GXT4500=y
1339# CONFIG_FB_VIRTUAL is not set 1373# CONFIG_FB_VIRTUAL is not set
1374# CONFIG_FB_METRONOME is not set
1340CONFIG_BACKLIGHT_LCD_SUPPORT=y 1375CONFIG_BACKLIGHT_LCD_SUPPORT=y
1341CONFIG_LCD_CLASS_DEVICE=y 1376CONFIG_LCD_CLASS_DEVICE=y
1342# CONFIG_LCD_ILI9320 is not set 1377# CONFIG_LCD_ILI9320 is not set
@@ -1370,6 +1405,7 @@ CONFIG_LOGO_LINUX_MONO=y
1370CONFIG_LOGO_LINUX_VGA16=y 1405CONFIG_LOGO_LINUX_VGA16=y
1371CONFIG_LOGO_LINUX_CLUT224=y 1406CONFIG_LOGO_LINUX_CLUT224=y
1372CONFIG_SOUND=m 1407CONFIG_SOUND=m
1408CONFIG_SOUND_OSS_CORE=y
1373CONFIG_SND=m 1409CONFIG_SND=m
1374CONFIG_SND_TIMER=m 1410CONFIG_SND_TIMER=m
1375CONFIG_SND_PCM=m 1411CONFIG_SND_PCM=m
@@ -1481,9 +1517,36 @@ CONFIG_HID=y
1481# USB Input Devices 1517# USB Input Devices
1482# 1518#
1483CONFIG_USB_HID=y 1519CONFIG_USB_HID=y
1484# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1520# CONFIG_HID_PID is not set
1485# CONFIG_HID_FF is not set
1486CONFIG_USB_HIDDEV=y 1521CONFIG_USB_HIDDEV=y
1522
1523#
1524# Special HID drivers
1525#
1526CONFIG_HID_COMPAT=y
1527CONFIG_HID_A4TECH=y
1528CONFIG_HID_APPLE=y
1529CONFIG_HID_BELKIN=y
1530CONFIG_HID_BRIGHT=y
1531CONFIG_HID_CHERRY=y
1532CONFIG_HID_CHICONY=y
1533CONFIG_HID_CYPRESS=y
1534CONFIG_HID_DELL=y
1535CONFIG_HID_EZKEY=y
1536CONFIG_HID_GYRATION=y
1537CONFIG_HID_LOGITECH=y
1538# CONFIG_LOGITECH_FF is not set
1539# CONFIG_LOGIRUMBLEPAD2_FF is not set
1540CONFIG_HID_MICROSOFT=y
1541CONFIG_HID_MONTEREY=y
1542CONFIG_HID_PANTHERLORD=y
1543# CONFIG_PANTHERLORD_FF is not set
1544CONFIG_HID_PETALYNX=y
1545CONFIG_HID_SAMSUNG=y
1546CONFIG_HID_SONY=y
1547CONFIG_HID_SUNPLUS=y
1548# CONFIG_THRUSTMASTER_FF is not set
1549# CONFIG_ZEROPLUS_FF is not set
1487CONFIG_USB_SUPPORT=y 1550CONFIG_USB_SUPPORT=y
1488CONFIG_USB_ARCH_HAS_HCD=y 1551CONFIG_USB_ARCH_HAS_HCD=y
1489CONFIG_USB_ARCH_HAS_OHCI=y 1552CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1500,6 +1563,8 @@ CONFIG_USB_DEVICE_CLASS=y
1500# CONFIG_USB_DYNAMIC_MINORS is not set 1563# CONFIG_USB_DYNAMIC_MINORS is not set
1501# CONFIG_USB_OTG is not set 1564# CONFIG_USB_OTG is not set
1502# CONFIG_USB_MON is not set 1565# CONFIG_USB_MON is not set
1566# CONFIG_USB_WUSB is not set
1567# CONFIG_USB_WUSB_CBAF is not set
1503 1568
1504# 1569#
1505# USB Host Controller Drivers 1570# USB Host Controller Drivers
@@ -1520,6 +1585,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1520# CONFIG_USB_UHCI_HCD is not set 1585# CONFIG_USB_UHCI_HCD is not set
1521# CONFIG_USB_SL811_HCD is not set 1586# CONFIG_USB_SL811_HCD is not set
1522# CONFIG_USB_R8A66597_HCD is not set 1587# CONFIG_USB_R8A66597_HCD is not set
1588# CONFIG_USB_WHCI_HCD is not set
1589# CONFIG_USB_HWA_HCD is not set
1523 1590
1524# 1591#
1525# USB Device Class drivers 1592# USB Device Class drivers
@@ -1527,6 +1594,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1527# CONFIG_USB_ACM is not set 1594# CONFIG_USB_ACM is not set
1528# CONFIG_USB_PRINTER is not set 1595# CONFIG_USB_PRINTER is not set
1529# CONFIG_USB_WDM is not set 1596# CONFIG_USB_WDM is not set
1597# CONFIG_USB_TMC is not set
1530 1598
1531# 1599#
1532# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1600# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1548,7 +1616,6 @@ CONFIG_USB_STORAGE=m
1548# CONFIG_USB_STORAGE_ALAUDA is not set 1616# CONFIG_USB_STORAGE_ALAUDA is not set
1549# CONFIG_USB_STORAGE_ONETOUCH is not set 1617# CONFIG_USB_STORAGE_ONETOUCH is not set
1550# CONFIG_USB_STORAGE_KARMA is not set 1618# CONFIG_USB_STORAGE_KARMA is not set
1551# CONFIG_USB_STORAGE_SIERRA is not set
1552# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1619# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1553# CONFIG_USB_LIBUSUAL is not set 1620# CONFIG_USB_LIBUSUAL is not set
1554 1621
@@ -1569,6 +1636,7 @@ CONFIG_USB_STORAGE=m
1569# CONFIG_USB_EMI62 is not set 1636# CONFIG_USB_EMI62 is not set
1570# CONFIG_USB_EMI26 is not set 1637# CONFIG_USB_EMI26 is not set
1571# CONFIG_USB_ADUTUX is not set 1638# CONFIG_USB_ADUTUX is not set
1639# CONFIG_USB_SEVSEG is not set
1572# CONFIG_USB_RIO500 is not set 1640# CONFIG_USB_RIO500 is not set
1573# CONFIG_USB_LEGOTOWER is not set 1641# CONFIG_USB_LEGOTOWER is not set
1574# CONFIG_USB_LCD is not set 1642# CONFIG_USB_LCD is not set
@@ -1586,7 +1654,9 @@ CONFIG_USB_APPLEDISPLAY=m
1586# CONFIG_USB_IOWARRIOR is not set 1654# CONFIG_USB_IOWARRIOR is not set
1587# CONFIG_USB_TEST is not set 1655# CONFIG_USB_TEST is not set
1588# CONFIG_USB_ISIGHTFW is not set 1656# CONFIG_USB_ISIGHTFW is not set
1657# CONFIG_USB_VST is not set
1589# CONFIG_USB_GADGET is not set 1658# CONFIG_USB_GADGET is not set
1659# CONFIG_UWB is not set
1590# CONFIG_MMC is not set 1660# CONFIG_MMC is not set
1591# CONFIG_MEMSTICK is not set 1661# CONFIG_MEMSTICK is not set
1592# CONFIG_NEW_LEDS is not set 1662# CONFIG_NEW_LEDS is not set
@@ -1656,12 +1726,15 @@ CONFIG_RTC_DRV_DS1307=y
1656# Platform RTC drivers 1726# Platform RTC drivers
1657# 1727#
1658# CONFIG_RTC_DRV_CMOS is not set 1728# CONFIG_RTC_DRV_CMOS is not set
1729# CONFIG_RTC_DRV_DS1286 is not set
1659# CONFIG_RTC_DRV_DS1511 is not set 1730# CONFIG_RTC_DRV_DS1511 is not set
1660# CONFIG_RTC_DRV_DS1553 is not set 1731# CONFIG_RTC_DRV_DS1553 is not set
1661# CONFIG_RTC_DRV_DS1742 is not set 1732# CONFIG_RTC_DRV_DS1742 is not set
1662# CONFIG_RTC_DRV_STK17TA8 is not set 1733# CONFIG_RTC_DRV_STK17TA8 is not set
1663# CONFIG_RTC_DRV_M48T86 is not set 1734# CONFIG_RTC_DRV_M48T86 is not set
1735# CONFIG_RTC_DRV_M48T35 is not set
1664# CONFIG_RTC_DRV_M48T59 is not set 1736# CONFIG_RTC_DRV_M48T59 is not set
1737# CONFIG_RTC_DRV_BQ4802 is not set
1665# CONFIG_RTC_DRV_V3020 is not set 1738# CONFIG_RTC_DRV_V3020 is not set
1666 1739
1667# 1740#
@@ -1670,6 +1743,7 @@ CONFIG_RTC_DRV_DS1307=y
1670CONFIG_RTC_DRV_PPC=y 1743CONFIG_RTC_DRV_PPC=y
1671# CONFIG_DMADEVICES is not set 1744# CONFIG_DMADEVICES is not set
1672# CONFIG_UIO is not set 1745# CONFIG_UIO is not set
1746# CONFIG_STAGING is not set
1673 1747
1674# 1748#
1675# File systems 1749# File systems
@@ -1679,14 +1753,20 @@ CONFIG_EXT2_FS_XATTR=y
1679CONFIG_EXT2_FS_POSIX_ACL=y 1753CONFIG_EXT2_FS_POSIX_ACL=y
1680CONFIG_EXT2_FS_SECURITY=y 1754CONFIG_EXT2_FS_SECURITY=y
1681CONFIG_EXT2_FS_XIP=y 1755CONFIG_EXT2_FS_XIP=y
1682CONFIG_FS_XIP=y
1683CONFIG_EXT3_FS=y 1756CONFIG_EXT3_FS=y
1684CONFIG_EXT3_FS_XATTR=y 1757CONFIG_EXT3_FS_XATTR=y
1685CONFIG_EXT3_FS_POSIX_ACL=y 1758CONFIG_EXT3_FS_POSIX_ACL=y
1686CONFIG_EXT3_FS_SECURITY=y 1759CONFIG_EXT3_FS_SECURITY=y
1687# CONFIG_EXT4DEV_FS is not set 1760CONFIG_EXT4_FS=y
1761# CONFIG_EXT4DEV_COMPAT is not set
1762CONFIG_EXT4_FS_XATTR=y
1763CONFIG_EXT4_FS_POSIX_ACL=y
1764CONFIG_EXT4_FS_SECURITY=y
1765CONFIG_FS_XIP=y
1688CONFIG_JBD=y 1766CONFIG_JBD=y
1689# CONFIG_JBD_DEBUG is not set 1767# CONFIG_JBD_DEBUG is not set
1768CONFIG_JBD2=y
1769# CONFIG_JBD2_DEBUG is not set
1690CONFIG_FS_MBCACHE=y 1770CONFIG_FS_MBCACHE=y
1691CONFIG_REISERFS_FS=y 1771CONFIG_REISERFS_FS=y
1692# CONFIG_REISERFS_CHECK is not set 1772# CONFIG_REISERFS_CHECK is not set
@@ -1700,6 +1780,7 @@ CONFIG_JFS_SECURITY=y
1700# CONFIG_JFS_DEBUG is not set 1780# CONFIG_JFS_DEBUG is not set
1701# CONFIG_JFS_STATISTICS is not set 1781# CONFIG_JFS_STATISTICS is not set
1702CONFIG_FS_POSIX_ACL=y 1782CONFIG_FS_POSIX_ACL=y
1783CONFIG_FILE_LOCKING=y
1703CONFIG_XFS_FS=m 1784CONFIG_XFS_FS=m
1704# CONFIG_XFS_QUOTA is not set 1785# CONFIG_XFS_QUOTA is not set
1705CONFIG_XFS_POSIX_ACL=y 1786CONFIG_XFS_POSIX_ACL=y
@@ -1740,6 +1821,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1740CONFIG_PROC_FS=y 1821CONFIG_PROC_FS=y
1741CONFIG_PROC_KCORE=y 1822CONFIG_PROC_KCORE=y
1742CONFIG_PROC_SYSCTL=y 1823CONFIG_PROC_SYSCTL=y
1824CONFIG_PROC_PAGE_MONITOR=y
1743CONFIG_SYSFS=y 1825CONFIG_SYSFS=y
1744CONFIG_TMPFS=y 1826CONFIG_TMPFS=y
1745# CONFIG_TMPFS_POSIX_ACL is not set 1827# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1785,6 +1867,7 @@ CONFIG_NFS_COMMON=y
1785CONFIG_SUNRPC=y 1867CONFIG_SUNRPC=y
1786CONFIG_SUNRPC_GSS=y 1868CONFIG_SUNRPC_GSS=y
1787CONFIG_SUNRPC_XPRT_RDMA=m 1869CONFIG_SUNRPC_XPRT_RDMA=m
1870# CONFIG_SUNRPC_REGISTER_V4 is not set
1788CONFIG_RPCSEC_GSS_KRB5=y 1871CONFIG_RPCSEC_GSS_KRB5=y
1789CONFIG_RPCSEC_GSS_SPKM3=m 1872CONFIG_RPCSEC_GSS_SPKM3=m
1790# CONFIG_SMB_FS is not set 1873# CONFIG_SMB_FS is not set
@@ -1866,9 +1949,8 @@ CONFIG_NLS_UTF8=m
1866# Library routines 1949# Library routines
1867# 1950#
1868CONFIG_BITREVERSE=y 1951CONFIG_BITREVERSE=y
1869# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1870CONFIG_CRC_CCITT=m 1952CONFIG_CRC_CCITT=m
1871# CONFIG_CRC16 is not set 1953CONFIG_CRC16=y
1872CONFIG_CRC_T10DIF=y 1954CONFIG_CRC_T10DIF=y
1873CONFIG_CRC_ITU_T=m 1955CONFIG_CRC_ITU_T=m
1874CONFIG_CRC32=y 1956CONFIG_CRC32=y
@@ -1929,22 +2011,31 @@ CONFIG_DEBUG_BUGVERBOSE=y
1929CONFIG_DEBUG_MEMORY_INIT=y 2011CONFIG_DEBUG_MEMORY_INIT=y
1930# CONFIG_DEBUG_LIST is not set 2012# CONFIG_DEBUG_LIST is not set
1931# CONFIG_DEBUG_SG is not set 2013# CONFIG_DEBUG_SG is not set
1932CONFIG_FRAME_POINTER=y
1933# CONFIG_BOOT_PRINTK_DELAY is not set 2014# CONFIG_BOOT_PRINTK_DELAY is not set
1934# CONFIG_RCU_TORTURE_TEST is not set 2015# CONFIG_RCU_TORTURE_TEST is not set
2016# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1935# CONFIG_BACKTRACE_SELF_TEST is not set 2017# CONFIG_BACKTRACE_SELF_TEST is not set
2018# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1936# CONFIG_FAULT_INJECTION is not set 2019# CONFIG_FAULT_INJECTION is not set
1937CONFIG_LATENCYTOP=y 2020CONFIG_LATENCYTOP=y
1938CONFIG_SYSCTL_SYSCALL_CHECK=y 2021CONFIG_SYSCTL_SYSCALL_CHECK=y
1939CONFIG_HAVE_FTRACE=y 2022CONFIG_NOP_TRACER=y
1940CONFIG_HAVE_DYNAMIC_FTRACE=y 2023CONFIG_HAVE_FUNCTION_TRACER=y
1941CONFIG_TRACER_MAX_TRACE=y 2024CONFIG_TRACER_MAX_TRACE=y
2025CONFIG_RING_BUFFER=y
1942CONFIG_TRACING=y 2026CONFIG_TRACING=y
1943# CONFIG_FTRACE is not set 2027
2028#
2029# Tracers
2030#
2031# CONFIG_FUNCTION_TRACER is not set
1944CONFIG_IRQSOFF_TRACER=y 2032CONFIG_IRQSOFF_TRACER=y
1945CONFIG_SCHED_TRACER=y 2033CONFIG_SCHED_TRACER=y
1946CONFIG_CONTEXT_SWITCH_TRACER=y 2034CONFIG_CONTEXT_SWITCH_TRACER=y
2035# CONFIG_BOOT_TRACER is not set
2036# CONFIG_STACK_TRACER is not set
1947# CONFIG_FTRACE_STARTUP_TEST is not set 2037# CONFIG_FTRACE_STARTUP_TEST is not set
2038CONFIG_DYNAMIC_PRINTK_DEBUG=y
1948# CONFIG_SAMPLES is not set 2039# CONFIG_SAMPLES is not set
1949CONFIG_HAVE_ARCH_KGDB=y 2040CONFIG_HAVE_ARCH_KGDB=y
1950# CONFIG_KGDB is not set 2041# CONFIG_KGDB is not set
@@ -1954,6 +2045,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1954# CONFIG_HCALL_STATS is not set 2045# CONFIG_HCALL_STATS is not set
1955# CONFIG_CODE_PATCHING_SELFTEST is not set 2046# CONFIG_CODE_PATCHING_SELFTEST is not set
1956# CONFIG_FTR_FIXUP_SELFTEST is not set 2047# CONFIG_FTR_FIXUP_SELFTEST is not set
2048# CONFIG_MSI_BITMAP_SELFTEST is not set
1957CONFIG_XMON=y 2049CONFIG_XMON=y
1958# CONFIG_XMON_DEFAULT is not set 2050# CONFIG_XMON_DEFAULT is not set
1959CONFIG_XMON_DISASSEMBLY=y 2051CONFIG_XMON_DISASSEMBLY=y
@@ -1968,6 +2060,7 @@ CONFIG_BOOTX_TEXT=y
1968# 2060#
1969# CONFIG_KEYS is not set 2061# CONFIG_KEYS is not set
1970# CONFIG_SECURITY is not set 2062# CONFIG_SECURITY is not set
2063# CONFIG_SECURITYFS is not set
1971# CONFIG_SECURITY_FILE_CAPABILITIES is not set 2064# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1972CONFIG_XOR_BLOCKS=y 2065CONFIG_XOR_BLOCKS=y
1973CONFIG_ASYNC_CORE=y 2066CONFIG_ASYNC_CORE=y
@@ -1978,10 +2071,12 @@ CONFIG_CRYPTO=y
1978# 2071#
1979# Crypto core or helper 2072# Crypto core or helper
1980# 2073#
2074# CONFIG_CRYPTO_FIPS is not set
1981CONFIG_CRYPTO_ALGAPI=y 2075CONFIG_CRYPTO_ALGAPI=y
1982CONFIG_CRYPTO_AEAD=m 2076CONFIG_CRYPTO_AEAD=y
1983CONFIG_CRYPTO_BLKCIPHER=y 2077CONFIG_CRYPTO_BLKCIPHER=y
1984CONFIG_CRYPTO_HASH=y 2078CONFIG_CRYPTO_HASH=y
2079CONFIG_CRYPTO_RNG=y
1985CONFIG_CRYPTO_MANAGER=y 2080CONFIG_CRYPTO_MANAGER=y
1986CONFIG_CRYPTO_GF128MUL=m 2081CONFIG_CRYPTO_GF128MUL=m
1987CONFIG_CRYPTO_NULL=m 2082CONFIG_CRYPTO_NULL=m
@@ -2055,6 +2150,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
2055# 2150#
2056CONFIG_CRYPTO_DEFLATE=m 2151CONFIG_CRYPTO_DEFLATE=m
2057CONFIG_CRYPTO_LZO=m 2152CONFIG_CRYPTO_LZO=m
2153
2154#
2155# Random Number Generation
2156#
2157# CONFIG_CRYPTO_ANSI_CPRNG is not set
2058# CONFIG_CRYPTO_HW is not set 2158# CONFIG_CRYPTO_HW is not set
2059# CONFIG_PPC_CLOCK is not set 2159# CONFIG_PPC_CLOCK is not set
2060# CONFIG_VIRTUALIZATION is not set 2160# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 3c6dbdef56eb..01f05ec5abf3 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:29:50 2008 4# Tue Nov 11 19:37:01 2008
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -23,7 +23,7 @@ CONFIG_PPC_STD_MMU_32=y
23# CONFIG_SMP is not set 23# CONFIG_SMP is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32 25CONFIG_WORD_SIZE=32
26CONFIG_PPC_MERGE=y 26# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
27CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y 28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y 29CONFIG_GENERIC_TIME=y
@@ -89,6 +89,7 @@ CONFIG_LOG_BUF_SHIFT=17
89CONFIG_CGROUPS=y 89CONFIG_CGROUPS=y
90# CONFIG_CGROUP_DEBUG is not set 90# CONFIG_CGROUP_DEBUG is not set
91CONFIG_CGROUP_NS=y 91CONFIG_CGROUP_NS=y
92# CONFIG_CGROUP_FREEZER is not set
92CONFIG_CGROUP_DEVICE=y 93CONFIG_CGROUP_DEVICE=y
93CONFIG_GROUP_SCHED=y 94CONFIG_GROUP_SCHED=y
94CONFIG_FAIR_GROUP_SCHED=y 95CONFIG_FAIR_GROUP_SCHED=y
@@ -128,12 +129,15 @@ CONFIG_SIGNALFD=y
128CONFIG_TIMERFD=y 129CONFIG_TIMERFD=y
129CONFIG_EVENTFD=y 130CONFIG_EVENTFD=y
130CONFIG_SHMEM=y 131CONFIG_SHMEM=y
132CONFIG_AIO=y
131CONFIG_VM_EVENT_COUNTERS=y 133CONFIG_VM_EVENT_COUNTERS=y
134CONFIG_PCI_QUIRKS=y
132CONFIG_SLUB_DEBUG=y 135CONFIG_SLUB_DEBUG=y
133# CONFIG_SLAB is not set 136# CONFIG_SLAB is not set
134CONFIG_SLUB=y 137CONFIG_SLUB=y
135# CONFIG_SLOB is not set 138# CONFIG_SLOB is not set
136CONFIG_PROFILING=y 139CONFIG_PROFILING=y
140CONFIG_TRACEPOINTS=y
137CONFIG_MARKERS=y 141CONFIG_MARKERS=y
138CONFIG_OPROFILE=m 142CONFIG_OPROFILE=m
139CONFIG_HAVE_OPROFILE=y 143CONFIG_HAVE_OPROFILE=y
@@ -144,10 +148,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
144CONFIG_HAVE_KPROBES=y 148CONFIG_HAVE_KPROBES=y
145CONFIG_HAVE_KRETPROBES=y 149CONFIG_HAVE_KRETPROBES=y
146CONFIG_HAVE_ARCH_TRACEHOOK=y 150CONFIG_HAVE_ARCH_TRACEHOOK=y
147# CONFIG_HAVE_DMA_ATTRS is not set
148# CONFIG_USE_GENERIC_SMP_HELPERS is not set
149CONFIG_HAVE_CLK=y 151CONFIG_HAVE_CLK=y
150CONFIG_PROC_PAGE_MONITOR=y
151# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 152# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
152CONFIG_SLABINFO=y 153CONFIG_SLABINFO=y
153CONFIG_RT_MUTEXES=y 154CONFIG_RT_MUTEXES=y
@@ -180,6 +181,8 @@ CONFIG_DEFAULT_CFQ=y
180# CONFIG_DEFAULT_NOOP is not set 181# CONFIG_DEFAULT_NOOP is not set
181CONFIG_DEFAULT_IOSCHED="cfq" 182CONFIG_DEFAULT_IOSCHED="cfq"
182CONFIG_CLASSIC_RCU=y 183CONFIG_CLASSIC_RCU=y
184CONFIG_FREEZER=y
185CONFIG_PPC_MSI_BITMAP=y
183 186
184# 187#
185# Platform support 188# Platform support
@@ -202,6 +205,7 @@ CONFIG_PPC_82xx=y
202CONFIG_MPC8272_ADS=y 205CONFIG_MPC8272_ADS=y
203CONFIG_PQ2FADS=y 206CONFIG_PQ2FADS=y
204CONFIG_EP8248E=y 207CONFIG_EP8248E=y
208CONFIG_MGCOGE=y
205CONFIG_PQ2ADS=y 209CONFIG_PQ2ADS=y
206CONFIG_8260=y 210CONFIG_8260=y
207CONFIG_8272=y 211CONFIG_8272=y
@@ -226,6 +230,7 @@ CONFIG_PPC_86xx=y
226CONFIG_MPC8641_HPCN=y 230CONFIG_MPC8641_HPCN=y
227CONFIG_SBC8641D=y 231CONFIG_SBC8641D=y
228CONFIG_MPC8610_HPCD=y 232CONFIG_MPC8610_HPCD=y
233CONFIG_GEF_SBC610=y
229CONFIG_MPC8641=y 234CONFIG_MPC8641=y
230CONFIG_MPC8610=y 235CONFIG_MPC8610=y
231# CONFIG_EMBEDDED6xx is not set 236# CONFIG_EMBEDDED6xx is not set
@@ -268,6 +273,7 @@ CONFIG_TAU=y
268# CONFIG_TAU_INT is not set 273# CONFIG_TAU_INT is not set
269CONFIG_TAU_AVERAGE=y 274CONFIG_TAU_AVERAGE=y
270CONFIG_QUICC_ENGINE=y 275CONFIG_QUICC_ENGINE=y
276CONFIG_QE_GPIO=y
271CONFIG_CPM2=y 277CONFIG_CPM2=y
272CONFIG_FSL_ULI1575=y 278CONFIG_FSL_ULI1575=y
273CONFIG_CPM=y 279CONFIG_CPM=y
@@ -275,6 +281,7 @@ CONFIG_PPC_BESTCOMM=y
275CONFIG_PPC_BESTCOMM_ATA=m 281CONFIG_PPC_BESTCOMM_ATA=m
276CONFIG_PPC_BESTCOMM_FEC=m 282CONFIG_PPC_BESTCOMM_FEC=m
277CONFIG_PPC_BESTCOMM_GEN_BD=m 283CONFIG_PPC_BESTCOMM_GEN_BD=m
284CONFIG_MPC8xxx_GPIO=y
278 285
279# 286#
280# Kernel options 287# Kernel options
@@ -294,6 +301,8 @@ CONFIG_SCHED_HRTICK=y
294CONFIG_PREEMPT_VOLUNTARY=y 301CONFIG_PREEMPT_VOLUNTARY=y
295# CONFIG_PREEMPT is not set 302# CONFIG_PREEMPT is not set
296CONFIG_BINFMT_ELF=y 303CONFIG_BINFMT_ELF=y
304# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
305# CONFIG_HAVE_AOUT is not set
297CONFIG_BINFMT_MISC=y 306CONFIG_BINFMT_MISC=y
298# CONFIG_MATH_EMULATION is not set 307# CONFIG_MATH_EMULATION is not set
299# CONFIG_IOMMU_HELPER is not set 308# CONFIG_IOMMU_HELPER is not set
@@ -309,15 +318,15 @@ CONFIG_FLATMEM_MANUAL=y
309# CONFIG_SPARSEMEM_MANUAL is not set 318# CONFIG_SPARSEMEM_MANUAL is not set
310CONFIG_FLATMEM=y 319CONFIG_FLATMEM=y
311CONFIG_FLAT_NODE_MEM_MAP=y 320CONFIG_FLAT_NODE_MEM_MAP=y
312# CONFIG_SPARSEMEM_STATIC is not set
313# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
314CONFIG_PAGEFLAGS_EXTENDED=y 321CONFIG_PAGEFLAGS_EXTENDED=y
315CONFIG_SPLIT_PTLOCK_CPUS=4 322CONFIG_SPLIT_PTLOCK_CPUS=4
316# CONFIG_MIGRATION is not set 323# CONFIG_MIGRATION is not set
317CONFIG_RESOURCES_64BIT=y 324CONFIG_RESOURCES_64BIT=y
325# CONFIG_PHYS_ADDR_T_64BIT is not set
318CONFIG_ZONE_DMA_FLAG=1 326CONFIG_ZONE_DMA_FLAG=1
319CONFIG_BOUNCE=y 327CONFIG_BOUNCE=y
320CONFIG_VIRT_TO_BUS=y 328CONFIG_VIRT_TO_BUS=y
329CONFIG_UNEVICTABLE_LRU=y
321CONFIG_FORCE_MAX_ZONEORDER=11 330CONFIG_FORCE_MAX_ZONEORDER=11
322CONFIG_PROC_DEVICETREE=y 331CONFIG_PROC_DEVICETREE=y
323# CONFIG_CMDLINE_BOOL is not set 332# CONFIG_CMDLINE_BOOL is not set
@@ -359,7 +368,7 @@ CONFIG_PCIEASPM=y
359# CONFIG_PCIEASPM_DEBUG is not set 368# CONFIG_PCIEASPM_DEBUG is not set
360CONFIG_ARCH_SUPPORTS_MSI=y 369CONFIG_ARCH_SUPPORTS_MSI=y
361CONFIG_PCI_MSI=y 370CONFIG_PCI_MSI=y
362CONFIG_PCI_LEGACY=y 371# CONFIG_PCI_LEGACY is not set
363# CONFIG_PCI_DEBUG is not set 372# CONFIG_PCI_DEBUG is not set
364CONFIG_PCCARD=y 373CONFIG_PCCARD=y
365# CONFIG_PCMCIA_DEBUG is not set 374# CONFIG_PCMCIA_DEBUG is not set
@@ -466,7 +475,6 @@ CONFIG_DEFAULT_CUBIC=y
466# CONFIG_DEFAULT_RENO is not set 475# CONFIG_DEFAULT_RENO is not set
467CONFIG_DEFAULT_TCP_CONG="cubic" 476CONFIG_DEFAULT_TCP_CONG="cubic"
468CONFIG_TCP_MD5SIG=y 477CONFIG_TCP_MD5SIG=y
469# CONFIG_IP_VS is not set
470CONFIG_IPV6=m 478CONFIG_IPV6=m
471CONFIG_IPV6_PRIVACY=y 479CONFIG_IPV6_PRIVACY=y
472CONFIG_IPV6_ROUTER_PREF=y 480CONFIG_IPV6_ROUTER_PREF=y
@@ -521,18 +529,20 @@ CONFIG_NF_CONNTRACK_SANE=m
521CONFIG_NF_CONNTRACK_SIP=m 529CONFIG_NF_CONNTRACK_SIP=m
522CONFIG_NF_CONNTRACK_TFTP=m 530CONFIG_NF_CONNTRACK_TFTP=m
523CONFIG_NF_CT_NETLINK=m 531CONFIG_NF_CT_NETLINK=m
532CONFIG_NETFILTER_TPROXY=m
524CONFIG_NETFILTER_XTABLES=m 533CONFIG_NETFILTER_XTABLES=m
525CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 534CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
526CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 535CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
536CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
527CONFIG_NETFILTER_XT_TARGET_DSCP=m 537CONFIG_NETFILTER_XT_TARGET_DSCP=m
528CONFIG_NETFILTER_XT_TARGET_MARK=m 538CONFIG_NETFILTER_XT_TARGET_MARK=m
529CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
530CONFIG_NETFILTER_XT_TARGET_NFLOG=m 539CONFIG_NETFILTER_XT_TARGET_NFLOG=m
540CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
531CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 541CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
532CONFIG_NETFILTER_XT_TARGET_RATEEST=m 542CONFIG_NETFILTER_XT_TARGET_RATEEST=m
543CONFIG_NETFILTER_XT_TARGET_TPROXY=m
533CONFIG_NETFILTER_XT_TARGET_TRACE=m 544CONFIG_NETFILTER_XT_TARGET_TRACE=m
534CONFIG_NETFILTER_XT_TARGET_SECMARK=m 545CONFIG_NETFILTER_XT_TARGET_SECMARK=m
535CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
536CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 546CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
537CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m 547CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
538CONFIG_NETFILTER_XT_MATCH_COMMENT=m 548CONFIG_NETFILTER_XT_MATCH_COMMENT=m
@@ -543,41 +553,45 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
543CONFIG_NETFILTER_XT_MATCH_DCCP=m 553CONFIG_NETFILTER_XT_MATCH_DCCP=m
544CONFIG_NETFILTER_XT_MATCH_DSCP=m 554CONFIG_NETFILTER_XT_MATCH_DSCP=m
545CONFIG_NETFILTER_XT_MATCH_ESP=m 555CONFIG_NETFILTER_XT_MATCH_ESP=m
556CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
546CONFIG_NETFILTER_XT_MATCH_HELPER=m 557CONFIG_NETFILTER_XT_MATCH_HELPER=m
547CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 558CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
548CONFIG_NETFILTER_XT_MATCH_LENGTH=m 559CONFIG_NETFILTER_XT_MATCH_LENGTH=m
549CONFIG_NETFILTER_XT_MATCH_LIMIT=m 560CONFIG_NETFILTER_XT_MATCH_LIMIT=m
550CONFIG_NETFILTER_XT_MATCH_MAC=m 561CONFIG_NETFILTER_XT_MATCH_MAC=m
551CONFIG_NETFILTER_XT_MATCH_MARK=m 562CONFIG_NETFILTER_XT_MATCH_MARK=m
563CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
552CONFIG_NETFILTER_XT_MATCH_OWNER=m 564CONFIG_NETFILTER_XT_MATCH_OWNER=m
553CONFIG_NETFILTER_XT_MATCH_POLICY=m 565CONFIG_NETFILTER_XT_MATCH_POLICY=m
554CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
555CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m 566CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
556CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 567CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
557CONFIG_NETFILTER_XT_MATCH_QUOTA=m 568CONFIG_NETFILTER_XT_MATCH_QUOTA=m
558CONFIG_NETFILTER_XT_MATCH_RATEEST=m 569CONFIG_NETFILTER_XT_MATCH_RATEEST=m
559CONFIG_NETFILTER_XT_MATCH_REALM=m 570CONFIG_NETFILTER_XT_MATCH_REALM=m
571CONFIG_NETFILTER_XT_MATCH_RECENT=m
572# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
560CONFIG_NETFILTER_XT_MATCH_SCTP=m 573CONFIG_NETFILTER_XT_MATCH_SCTP=m
574CONFIG_NETFILTER_XT_MATCH_SOCKET=m
561CONFIG_NETFILTER_XT_MATCH_STATE=m 575CONFIG_NETFILTER_XT_MATCH_STATE=m
562CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 576CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
563CONFIG_NETFILTER_XT_MATCH_STRING=m 577CONFIG_NETFILTER_XT_MATCH_STRING=m
564CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 578CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
565CONFIG_NETFILTER_XT_MATCH_TIME=m 579CONFIG_NETFILTER_XT_MATCH_TIME=m
566CONFIG_NETFILTER_XT_MATCH_U32=m 580CONFIG_NETFILTER_XT_MATCH_U32=m
567CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 581# CONFIG_IP_VS is not set
568 582
569# 583#
570# IP: Netfilter Configuration 584# IP: Netfilter Configuration
571# 585#
586CONFIG_NF_DEFRAG_IPV4=m
572CONFIG_NF_CONNTRACK_IPV4=m 587CONFIG_NF_CONNTRACK_IPV4=m
573# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 588# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
574CONFIG_IP_NF_QUEUE=m 589CONFIG_IP_NF_QUEUE=m
575CONFIG_IP_NF_IPTABLES=m 590CONFIG_IP_NF_IPTABLES=m
576CONFIG_IP_NF_MATCH_RECENT=m 591CONFIG_IP_NF_MATCH_ADDRTYPE=m
577CONFIG_IP_NF_MATCH_ECN=m
578CONFIG_IP_NF_MATCH_AH=m 592CONFIG_IP_NF_MATCH_AH=m
593CONFIG_IP_NF_MATCH_ECN=m
579CONFIG_IP_NF_MATCH_TTL=m 594CONFIG_IP_NF_MATCH_TTL=m
580CONFIG_IP_NF_MATCH_ADDRTYPE=m
581CONFIG_IP_NF_FILTER=m 595CONFIG_IP_NF_FILTER=m
582CONFIG_IP_NF_TARGET_REJECT=m 596CONFIG_IP_NF_TARGET_REJECT=m
583CONFIG_IP_NF_TARGET_LOG=m 597CONFIG_IP_NF_TARGET_LOG=m
@@ -585,8 +599,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
585CONFIG_NF_NAT=m 599CONFIG_NF_NAT=m
586CONFIG_NF_NAT_NEEDED=y 600CONFIG_NF_NAT_NEEDED=y
587CONFIG_IP_NF_TARGET_MASQUERADE=m 601CONFIG_IP_NF_TARGET_MASQUERADE=m
588CONFIG_IP_NF_TARGET_REDIRECT=m
589CONFIG_IP_NF_TARGET_NETMAP=m 602CONFIG_IP_NF_TARGET_NETMAP=m
603CONFIG_IP_NF_TARGET_REDIRECT=m
590CONFIG_NF_NAT_SNMP_BASIC=m 604CONFIG_NF_NAT_SNMP_BASIC=m
591CONFIG_NF_NAT_PROTO_DCCP=m 605CONFIG_NF_NAT_PROTO_DCCP=m
592CONFIG_NF_NAT_PROTO_GRE=m 606CONFIG_NF_NAT_PROTO_GRE=m
@@ -600,9 +614,9 @@ CONFIG_NF_NAT_PPTP=m
600CONFIG_NF_NAT_H323=m 614CONFIG_NF_NAT_H323=m
601CONFIG_NF_NAT_SIP=m 615CONFIG_NF_NAT_SIP=m
602CONFIG_IP_NF_MANGLE=m 616CONFIG_IP_NF_MANGLE=m
617CONFIG_IP_NF_TARGET_CLUSTERIP=m
603CONFIG_IP_NF_TARGET_ECN=m 618CONFIG_IP_NF_TARGET_ECN=m
604CONFIG_IP_NF_TARGET_TTL=m 619CONFIG_IP_NF_TARGET_TTL=m
605CONFIG_IP_NF_TARGET_CLUSTERIP=m
606CONFIG_IP_NF_RAW=m 620CONFIG_IP_NF_RAW=m
607CONFIG_IP_NF_SECURITY=m 621CONFIG_IP_NF_SECURITY=m
608CONFIG_IP_NF_ARPTABLES=m 622CONFIG_IP_NF_ARPTABLES=m
@@ -615,16 +629,16 @@ CONFIG_IP_NF_ARP_MANGLE=m
615CONFIG_NF_CONNTRACK_IPV6=m 629CONFIG_NF_CONNTRACK_IPV6=m
616CONFIG_IP6_NF_QUEUE=m 630CONFIG_IP6_NF_QUEUE=m
617CONFIG_IP6_NF_IPTABLES=m 631CONFIG_IP6_NF_IPTABLES=m
618CONFIG_IP6_NF_MATCH_RT=m 632CONFIG_IP6_NF_MATCH_AH=m
619CONFIG_IP6_NF_MATCH_OPTS=m 633CONFIG_IP6_NF_MATCH_EUI64=m
620CONFIG_IP6_NF_MATCH_FRAG=m 634CONFIG_IP6_NF_MATCH_FRAG=m
635CONFIG_IP6_NF_MATCH_OPTS=m
621CONFIG_IP6_NF_MATCH_HL=m 636CONFIG_IP6_NF_MATCH_HL=m
622CONFIG_IP6_NF_MATCH_IPV6HEADER=m 637CONFIG_IP6_NF_MATCH_IPV6HEADER=m
623CONFIG_IP6_NF_MATCH_AH=m
624CONFIG_IP6_NF_MATCH_MH=m 638CONFIG_IP6_NF_MATCH_MH=m
625CONFIG_IP6_NF_MATCH_EUI64=m 639CONFIG_IP6_NF_MATCH_RT=m
626CONFIG_IP6_NF_FILTER=m
627CONFIG_IP6_NF_TARGET_LOG=m 640CONFIG_IP6_NF_TARGET_LOG=m
641CONFIG_IP6_NF_FILTER=m
628CONFIG_IP6_NF_TARGET_REJECT=m 642CONFIG_IP6_NF_TARGET_REJECT=m
629CONFIG_IP6_NF_MANGLE=m 643CONFIG_IP6_NF_MANGLE=m
630CONFIG_IP6_NF_TARGET_HL=m 644CONFIG_IP6_NF_TARGET_HL=m
@@ -635,10 +649,6 @@ CONFIG_IP6_NF_SECURITY=m
635# DECnet: Netfilter Configuration 649# DECnet: Netfilter Configuration
636# 650#
637# CONFIG_DECNET_NF_GRABULATOR is not set 651# CONFIG_DECNET_NF_GRABULATOR is not set
638
639#
640# Bridge: Netfilter Configuration
641#
642CONFIG_BRIDGE_NF_EBTABLES=m 652CONFIG_BRIDGE_NF_EBTABLES=m
643CONFIG_BRIDGE_EBT_BROUTE=m 653CONFIG_BRIDGE_EBT_BROUTE=m
644CONFIG_BRIDGE_EBT_T_FILTER=m 654CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -698,6 +708,7 @@ CONFIG_ATM_BR2684=m
698# CONFIG_ATM_BR2684_IPFILTER is not set 708# CONFIG_ATM_BR2684_IPFILTER is not set
699CONFIG_STP=m 709CONFIG_STP=m
700CONFIG_BRIDGE=m 710CONFIG_BRIDGE=m
711# CONFIG_NET_DSA is not set
701CONFIG_VLAN_8021Q=m 712CONFIG_VLAN_8021Q=m
702# CONFIG_VLAN_8021Q_GVRP is not set 713# CONFIG_VLAN_8021Q_GVRP is not set
703CONFIG_DECNET=m 714CONFIG_DECNET=m
@@ -727,6 +738,7 @@ CONFIG_NET_SCH_HTB=m
727CONFIG_NET_SCH_HFSC=m 738CONFIG_NET_SCH_HFSC=m
728CONFIG_NET_SCH_ATM=m 739CONFIG_NET_SCH_ATM=m
729CONFIG_NET_SCH_PRIO=m 740CONFIG_NET_SCH_PRIO=m
741CONFIG_NET_SCH_MULTIQ=m
730CONFIG_NET_SCH_RED=m 742CONFIG_NET_SCH_RED=m
731CONFIG_NET_SCH_SFQ=m 743CONFIG_NET_SCH_SFQ=m
732CONFIG_NET_SCH_TEQL=m 744CONFIG_NET_SCH_TEQL=m
@@ -767,6 +779,7 @@ CONFIG_NET_ACT_IPT=m
767CONFIG_NET_ACT_NAT=m 779CONFIG_NET_ACT_NAT=m
768CONFIG_NET_ACT_PEDIT=m 780CONFIG_NET_ACT_PEDIT=m
769CONFIG_NET_ACT_SIMP=m 781CONFIG_NET_ACT_SIMP=m
782CONFIG_NET_ACT_SKBEDIT=m
770CONFIG_NET_CLS_IND=y 783CONFIG_NET_CLS_IND=y
771CONFIG_NET_SCH_FIFO=y 784CONFIG_NET_SCH_FIFO=y
772 785
@@ -853,13 +866,12 @@ CONFIG_BT_HCIBLUECARD=m
853CONFIG_BT_HCIBTUART=m 866CONFIG_BT_HCIBTUART=m
854CONFIG_BT_HCIVHCI=m 867CONFIG_BT_HCIVHCI=m
855# CONFIG_AF_RXRPC is not set 868# CONFIG_AF_RXRPC is not set
869# CONFIG_PHONET is not set
856CONFIG_FIB_RULES=y 870CONFIG_FIB_RULES=y
857 871CONFIG_WIRELESS=y
858#
859# Wireless
860#
861CONFIG_CFG80211=m 872CONFIG_CFG80211=m
862CONFIG_NL80211=y 873CONFIG_NL80211=y
874CONFIG_WIRELESS_OLD_REGULATORY=y
863CONFIG_WIRELESS_EXT=y 875CONFIG_WIRELESS_EXT=y
864CONFIG_WIRELESS_EXT_SYSFS=y 876CONFIG_WIRELESS_EXT_SYSFS=y
865CONFIG_MAC80211=m 877CONFIG_MAC80211=m
@@ -868,7 +880,9 @@ CONFIG_MAC80211=m
868# Rate control algorithm selection 880# Rate control algorithm selection
869# 881#
870CONFIG_MAC80211_RC_PID=y 882CONFIG_MAC80211_RC_PID=y
883# CONFIG_MAC80211_RC_MINSTREL is not set
871CONFIG_MAC80211_RC_DEFAULT_PID=y 884CONFIG_MAC80211_RC_DEFAULT_PID=y
885# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
872CONFIG_MAC80211_RC_DEFAULT="pid" 886CONFIG_MAC80211_RC_DEFAULT="pid"
873CONFIG_MAC80211_MESH=y 887CONFIG_MAC80211_MESH=y
874CONFIG_MAC80211_LEDS=y 888CONFIG_MAC80211_LEDS=y
@@ -917,7 +931,7 @@ CONFIG_PARPORT_SERIAL=m
917CONFIG_PARPORT_1284=y 931CONFIG_PARPORT_1284=y
918CONFIG_PARPORT_NOT_PC=y 932CONFIG_PARPORT_NOT_PC=y
919CONFIG_PNP=y 933CONFIG_PNP=y
920# CONFIG_PNP_DEBUG is not set 934CONFIG_PNP_DEBUG_MESSAGES=y
921 935
922# 936#
923# Protocols 937# Protocols
@@ -958,22 +972,20 @@ CONFIG_ENCLOSURE_SERVICES=m
958# CONFIG_HP_ILO is not set 972# CONFIG_HP_ILO is not set
959CONFIG_HAVE_IDE=y 973CONFIG_HAVE_IDE=y
960CONFIG_IDE=y 974CONFIG_IDE=y
961CONFIG_BLK_DEV_IDE=y
962 975
963# 976#
964# Please see Documentation/ide/ide.txt for help/info on IDE drives 977# Please see Documentation/ide/ide.txt for help/info on IDE drives
965# 978#
966CONFIG_IDE_TIMINGS=y 979CONFIG_IDE_TIMINGS=y
967CONFIG_IDE_ATAPI=y
968# CONFIG_BLK_DEV_IDE_SATA is not set 980# CONFIG_BLK_DEV_IDE_SATA is not set
969CONFIG_BLK_DEV_IDEDISK=y 981CONFIG_IDE_GD=y
970CONFIG_IDEDISK_MULTI_MODE=y 982CONFIG_IDE_GD_ATA=y
983# CONFIG_IDE_GD_ATAPI is not set
971# CONFIG_BLK_DEV_IDECS is not set 984# CONFIG_BLK_DEV_IDECS is not set
972# CONFIG_BLK_DEV_DELKIN is not set 985# CONFIG_BLK_DEV_DELKIN is not set
973CONFIG_BLK_DEV_IDECD=m 986CONFIG_BLK_DEV_IDECD=m
974CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 987CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
975# CONFIG_BLK_DEV_IDETAPE is not set 988# CONFIG_BLK_DEV_IDETAPE is not set
976CONFIG_BLK_DEV_IDEFLOPPY=m
977# CONFIG_BLK_DEV_IDESCSI is not set 989# CONFIG_BLK_DEV_IDESCSI is not set
978CONFIG_IDE_TASK_IOCTL=y 990CONFIG_IDE_TASK_IOCTL=y
979CONFIG_IDE_PROC_FS=y 991CONFIG_IDE_PROC_FS=y
@@ -1201,6 +1213,7 @@ CONFIG_PATA_OF_PLATFORM=m
1201CONFIG_PATA_SCH=m 1213CONFIG_PATA_SCH=m
1202CONFIG_MD=y 1214CONFIG_MD=y
1203CONFIG_BLK_DEV_MD=y 1215CONFIG_BLK_DEV_MD=y
1216CONFIG_MD_AUTODETECT=y
1204CONFIG_MD_LINEAR=m 1217CONFIG_MD_LINEAR=m
1205CONFIG_MD_RAID0=m 1218CONFIG_MD_RAID0=m
1206CONFIG_MD_RAID1=m 1219CONFIG_MD_RAID1=m
@@ -1332,6 +1345,9 @@ CONFIG_NE2000=m
1332# CONFIG_IBM_NEW_EMAC_RGMII is not set 1345# CONFIG_IBM_NEW_EMAC_RGMII is not set
1333# CONFIG_IBM_NEW_EMAC_TAH is not set 1346# CONFIG_IBM_NEW_EMAC_TAH is not set
1334# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 1347# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
1348# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
1349# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
1350# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
1335CONFIG_NET_PCI=y 1351CONFIG_NET_PCI=y
1336CONFIG_PCNET32=m 1352CONFIG_PCNET32=m
1337CONFIG_AMD8111_ETH=m 1353CONFIG_AMD8111_ETH=m
@@ -1370,13 +1386,13 @@ CONFIG_DE600=m
1370CONFIG_DE620=m 1386CONFIG_DE620=m
1371CONFIG_FEC_MPC52xx=m 1387CONFIG_FEC_MPC52xx=m
1372CONFIG_FEC_MPC52xx_MDIO=y 1388CONFIG_FEC_MPC52xx_MDIO=y
1389# CONFIG_ATL2 is not set
1373# CONFIG_FS_ENET is not set 1390# CONFIG_FS_ENET is not set
1374CONFIG_NETDEV_1000=y 1391CONFIG_NETDEV_1000=y
1375CONFIG_ACENIC=m 1392CONFIG_ACENIC=m
1376# CONFIG_ACENIC_OMIT_TIGON_I is not set 1393# CONFIG_ACENIC_OMIT_TIGON_I is not set
1377CONFIG_DL2K=m 1394CONFIG_DL2K=m
1378CONFIG_E1000=m 1395CONFIG_E1000=m
1379# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
1380CONFIG_E1000E=m 1396CONFIG_E1000E=m
1381CONFIG_IP1000=m 1397CONFIG_IP1000=m
1382CONFIG_IGB=m 1398CONFIG_IGB=m
@@ -1400,19 +1416,23 @@ CONFIG_MV643XX_ETH=m
1400CONFIG_QLA3XXX=m 1416CONFIG_QLA3XXX=m
1401CONFIG_ATL1=m 1417CONFIG_ATL1=m
1402# CONFIG_ATL1E is not set 1418# CONFIG_ATL1E is not set
1419# CONFIG_JME is not set
1403CONFIG_NETDEV_10000=y 1420CONFIG_NETDEV_10000=y
1404CONFIG_CHELSIO_T1=m 1421CONFIG_CHELSIO_T1=m
1405CONFIG_CHELSIO_T1_1G=y 1422CONFIG_CHELSIO_T1_1G=y
1406CONFIG_CHELSIO_T3=m 1423CONFIG_CHELSIO_T3=m
1424# CONFIG_ENIC is not set
1407CONFIG_IXGBE=m 1425CONFIG_IXGBE=m
1408CONFIG_IXGB=m 1426CONFIG_IXGB=m
1409CONFIG_S2IO=m 1427CONFIG_S2IO=m
1410CONFIG_MYRI10GE=m 1428CONFIG_MYRI10GE=m
1411CONFIG_NETXEN_NIC=m 1429CONFIG_NETXEN_NIC=m
1412CONFIG_NIU=m 1430CONFIG_NIU=m
1431# CONFIG_MLX4_EN is not set
1413# CONFIG_MLX4_CORE is not set 1432# CONFIG_MLX4_CORE is not set
1414CONFIG_TEHUTI=m 1433CONFIG_TEHUTI=m
1415CONFIG_BNX2X=m 1434CONFIG_BNX2X=m
1435CONFIG_QLGE=m
1416CONFIG_SFC=m 1436CONFIG_SFC=m
1417# CONFIG_TR is not set 1437# CONFIG_TR is not set
1418 1438
@@ -1434,6 +1454,7 @@ CONFIG_USB_USBNET=m
1434CONFIG_USB_NET_AX8817X=m 1454CONFIG_USB_NET_AX8817X=m
1435CONFIG_USB_NET_CDCETHER=m 1455CONFIG_USB_NET_CDCETHER=m
1436CONFIG_USB_NET_DM9601=m 1456CONFIG_USB_NET_DM9601=m
1457CONFIG_USB_NET_SMSC95XX=m
1437CONFIG_USB_NET_GL620A=m 1458CONFIG_USB_NET_GL620A=m
1438CONFIG_USB_NET_NET1080=m 1459CONFIG_USB_NET_NET1080=m
1439CONFIG_USB_NET_PLUSB=m 1460CONFIG_USB_NET_PLUSB=m
@@ -1546,6 +1567,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
1546CONFIG_MOUSE_PS2_SYNAPTICS=y 1567CONFIG_MOUSE_PS2_SYNAPTICS=y
1547CONFIG_MOUSE_PS2_LIFEBOOK=y 1568CONFIG_MOUSE_PS2_LIFEBOOK=y
1548CONFIG_MOUSE_PS2_TRACKPOINT=y 1569CONFIG_MOUSE_PS2_TRACKPOINT=y
1570# CONFIG_MOUSE_PS2_ELANTECH is not set
1549# CONFIG_MOUSE_PS2_TOUCHKIT is not set 1571# CONFIG_MOUSE_PS2_TOUCHKIT is not set
1550CONFIG_MOUSE_SERIAL=m 1572CONFIG_MOUSE_SERIAL=m
1551CONFIG_MOUSE_APPLETOUCH=m 1573CONFIG_MOUSE_APPLETOUCH=m
@@ -1598,6 +1620,7 @@ CONFIG_INPUT_ATI_REMOTE2=m
1598CONFIG_INPUT_KEYSPAN_REMOTE=m 1620CONFIG_INPUT_KEYSPAN_REMOTE=m
1599CONFIG_INPUT_POWERMATE=m 1621CONFIG_INPUT_POWERMATE=m
1600CONFIG_INPUT_YEALINK=m 1622CONFIG_INPUT_YEALINK=m
1623CONFIG_INPUT_CM109=m
1601CONFIG_INPUT_UINPUT=m 1624CONFIG_INPUT_UINPUT=m
1602 1625
1603# 1626#
@@ -1787,6 +1810,7 @@ CONFIG_SENSORS_PCF8591=m
1787# CONFIG_TPS65010 is not set 1810# CONFIG_TPS65010 is not set
1788CONFIG_SENSORS_MAX6875=m 1811CONFIG_SENSORS_MAX6875=m
1789CONFIG_SENSORS_TSL2550=m 1812CONFIG_SENSORS_TSL2550=m
1813CONFIG_MCU_MPC8349EMITX=m
1790# CONFIG_I2C_DEBUG_CORE is not set 1814# CONFIG_I2C_DEBUG_CORE is not set
1791# CONFIG_I2C_DEBUG_ALGO is not set 1815# CONFIG_I2C_DEBUG_ALGO is not set
1792# CONFIG_I2C_DEBUG_BUS is not set 1816# CONFIG_I2C_DEBUG_BUS is not set
@@ -1837,6 +1861,7 @@ CONFIG_POWER_SUPPLY=m
1837CONFIG_APM_POWER=m 1861CONFIG_APM_POWER=m
1838# CONFIG_BATTERY_DS2760 is not set 1862# CONFIG_BATTERY_DS2760 is not set
1839CONFIG_BATTERY_PMU=m 1863CONFIG_BATTERY_PMU=m
1864# CONFIG_BATTERY_BQ27x00 is not set
1840CONFIG_HWMON=m 1865CONFIG_HWMON=m
1841CONFIG_HWMON_VID=m 1866CONFIG_HWMON_VID=m
1842# CONFIG_SENSORS_AD7414 is not set 1867# CONFIG_SENSORS_AD7414 is not set
@@ -1946,8 +1971,21 @@ CONFIG_SSB_DRIVER_PCICORE=y
1946# 1971#
1947# CONFIG_MFD_CORE is not set 1972# CONFIG_MFD_CORE is not set
1948CONFIG_MFD_SM501=m 1973CONFIG_MFD_SM501=m
1974CONFIG_MFD_SM501_GPIO=y
1949# CONFIG_HTC_PASIC3 is not set 1975# CONFIG_HTC_PASIC3 is not set
1976# CONFIG_UCB1400_CORE is not set
1950# CONFIG_MFD_TMIO is not set 1977# CONFIG_MFD_TMIO is not set
1978# CONFIG_PMIC_DA903X is not set
1979# CONFIG_MFD_WM8400 is not set
1980# CONFIG_MFD_WM8350_I2C is not set
1981
1982#
1983# Voltage and Current regulators
1984#
1985# CONFIG_REGULATOR is not set
1986# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1987# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1988# CONFIG_REGULATOR_BQ24022 is not set
1951 1989
1952# 1990#
1953# Multimedia devices 1991# Multimedia devices
@@ -1999,6 +2037,7 @@ CONFIG_VIDEO_TVEEPROM=m
1999CONFIG_VIDEO_TUNER=m 2037CONFIG_VIDEO_TUNER=m
2000CONFIG_VIDEO_CAPTURE_DRIVERS=y 2038CONFIG_VIDEO_CAPTURE_DRIVERS=y
2001# CONFIG_VIDEO_ADV_DEBUG is not set 2039# CONFIG_VIDEO_ADV_DEBUG is not set
2040# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
2002# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set 2041# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
2003CONFIG_VIDEO_IR_I2C=m 2042CONFIG_VIDEO_IR_I2C=m
2004 2043
@@ -2079,14 +2118,12 @@ CONFIG_VIDEO_CPIA_USB=m
2079CONFIG_VIDEO_CPIA2=m 2118CONFIG_VIDEO_CPIA2=m
2080CONFIG_VIDEO_SAA5246A=m 2119CONFIG_VIDEO_SAA5246A=m
2081CONFIG_VIDEO_SAA5249=m 2120CONFIG_VIDEO_SAA5249=m
2082CONFIG_TUNER_3036=m
2083# CONFIG_VIDEO_STRADIS is not set 2121# CONFIG_VIDEO_STRADIS is not set
2084# CONFIG_VIDEO_ZORAN is not set 2122# CONFIG_VIDEO_ZORAN is not set
2085CONFIG_VIDEO_SAA7134=m 2123CONFIG_VIDEO_SAA7134=m
2086CONFIG_VIDEO_SAA7134_ALSA=m 2124CONFIG_VIDEO_SAA7134_ALSA=m
2087CONFIG_VIDEO_SAA7134_DVB=m 2125CONFIG_VIDEO_SAA7134_DVB=m
2088CONFIG_VIDEO_MXB=m 2126CONFIG_VIDEO_MXB=m
2089CONFIG_VIDEO_DPC=m
2090CONFIG_VIDEO_HEXIUM_ORION=m 2127CONFIG_VIDEO_HEXIUM_ORION=m
2091CONFIG_VIDEO_HEXIUM_GEMINI=m 2128CONFIG_VIDEO_HEXIUM_GEMINI=m
2092CONFIG_VIDEO_CX88=m 2129CONFIG_VIDEO_CX88=m
@@ -2100,10 +2137,40 @@ CONFIG_VIDEO_IVTV=m
2100CONFIG_VIDEO_FB_IVTV=m 2137CONFIG_VIDEO_FB_IVTV=m
2101CONFIG_VIDEO_CX18=m 2138CONFIG_VIDEO_CX18=m
2102# CONFIG_VIDEO_CAFE_CCIC is not set 2139# CONFIG_VIDEO_CAFE_CCIC is not set
2140CONFIG_SOC_CAMERA=m
2141CONFIG_SOC_CAMERA_MT9M001=m
2142# CONFIG_MT9M001_PCA9536_SWITCH is not set
2143# CONFIG_SOC_CAMERA_MT9M111 is not set
2144CONFIG_SOC_CAMERA_MT9V022=m
2145# CONFIG_MT9V022_PCA9536_SWITCH is not set
2146# CONFIG_SOC_CAMERA_PLATFORM is not set
2147# CONFIG_VIDEO_SH_MOBILE_CEU is not set
2103CONFIG_V4L_USB_DRIVERS=y 2148CONFIG_V4L_USB_DRIVERS=y
2104CONFIG_USB_VIDEO_CLASS=m 2149CONFIG_USB_VIDEO_CLASS=m
2105CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y 2150CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
2106CONFIG_USB_GSPCA=m 2151CONFIG_USB_GSPCA=m
2152# CONFIG_USB_M5602 is not set
2153# CONFIG_USB_GSPCA_CONEX is not set
2154# CONFIG_USB_GSPCA_ETOMS is not set
2155# CONFIG_USB_GSPCA_FINEPIX is not set
2156# CONFIG_USB_GSPCA_MARS is not set
2157# CONFIG_USB_GSPCA_OV519 is not set
2158# CONFIG_USB_GSPCA_PAC207 is not set
2159# CONFIG_USB_GSPCA_PAC7311 is not set
2160# CONFIG_USB_GSPCA_SONIXB is not set
2161# CONFIG_USB_GSPCA_SONIXJ is not set
2162# CONFIG_USB_GSPCA_SPCA500 is not set
2163# CONFIG_USB_GSPCA_SPCA501 is not set
2164# CONFIG_USB_GSPCA_SPCA505 is not set
2165# CONFIG_USB_GSPCA_SPCA506 is not set
2166# CONFIG_USB_GSPCA_SPCA508 is not set
2167# CONFIG_USB_GSPCA_SPCA561 is not set
2168# CONFIG_USB_GSPCA_STK014 is not set
2169# CONFIG_USB_GSPCA_SUNPLUS is not set
2170# CONFIG_USB_GSPCA_T613 is not set
2171# CONFIG_USB_GSPCA_TV8532 is not set
2172# CONFIG_USB_GSPCA_VC032X is not set
2173# CONFIG_USB_GSPCA_ZC3XX is not set
2107CONFIG_VIDEO_PVRUSB2=m 2174CONFIG_VIDEO_PVRUSB2=m
2108CONFIG_VIDEO_PVRUSB2_SYSFS=y 2175CONFIG_VIDEO_PVRUSB2_SYSFS=y
2109CONFIG_VIDEO_PVRUSB2_DVB=y 2176CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -2130,13 +2197,6 @@ CONFIG_USB_PWC=m
2130CONFIG_USB_ZR364XX=m 2197CONFIG_USB_ZR364XX=m
2131CONFIG_USB_STKWEBCAM=m 2198CONFIG_USB_STKWEBCAM=m
2132# CONFIG_USB_S2255 is not set 2199# CONFIG_USB_S2255 is not set
2133CONFIG_SOC_CAMERA=m
2134CONFIG_SOC_CAMERA_MT9M001=m
2135# CONFIG_MT9M001_PCA9536_SWITCH is not set
2136CONFIG_SOC_CAMERA_MT9V022=m
2137# CONFIG_MT9V022_PCA9536_SWITCH is not set
2138# CONFIG_SOC_CAMERA_PLATFORM is not set
2139# CONFIG_VIDEO_SH_MOBILE_CEU is not set
2140CONFIG_RADIO_ADAPTERS=y 2200CONFIG_RADIO_ADAPTERS=y
2141# CONFIG_RADIO_CADET is not set 2201# CONFIG_RADIO_CADET is not set
2142# CONFIG_RADIO_RTRACK is not set 2202# CONFIG_RADIO_RTRACK is not set
@@ -2154,6 +2214,7 @@ CONFIG_RADIO_MAESTRO=m
2154# CONFIG_RADIO_ZOLTRIX is not set 2214# CONFIG_RADIO_ZOLTRIX is not set
2155CONFIG_USB_DSBR=m 2215CONFIG_USB_DSBR=m
2156CONFIG_USB_SI470X=m 2216CONFIG_USB_SI470X=m
2217CONFIG_USB_MR800=m
2157CONFIG_DVB_CAPTURE_DRIVERS=y 2218CONFIG_DVB_CAPTURE_DRIVERS=y
2158 2219
2159# 2220#
@@ -2194,16 +2255,12 @@ CONFIG_DVB_USB_OPERA1=m
2194CONFIG_DVB_USB_AF9005=m 2255CONFIG_DVB_USB_AF9005=m
2195CONFIG_DVB_USB_AF9005_REMOTE=m 2256CONFIG_DVB_USB_AF9005_REMOTE=m
2196# CONFIG_DVB_USB_DW2102 is not set 2257# CONFIG_DVB_USB_DW2102 is not set
2258# CONFIG_DVB_USB_CINERGY_T2 is not set
2197# CONFIG_DVB_USB_ANYSEE is not set 2259# CONFIG_DVB_USB_ANYSEE is not set
2260# CONFIG_DVB_USB_DTV5100 is not set
2261# CONFIG_DVB_USB_AF9015 is not set
2198CONFIG_DVB_TTUSB_BUDGET=m 2262CONFIG_DVB_TTUSB_BUDGET=m
2199CONFIG_DVB_TTUSB_DEC=m 2263CONFIG_DVB_TTUSB_DEC=m
2200CONFIG_DVB_CINERGYT2=m
2201CONFIG_DVB_CINERGYT2_TUNING=y
2202CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32
2203CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512
2204CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250
2205CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y
2206CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100
2207# CONFIG_DVB_SIANO_SMS1XXX is not set 2264# CONFIG_DVB_SIANO_SMS1XXX is not set
2208 2265
2209# 2266#
@@ -2225,6 +2282,11 @@ CONFIG_DVB_BT8XX=m
2225CONFIG_DVB_PLUTO2=m 2282CONFIG_DVB_PLUTO2=m
2226 2283
2227# 2284#
2285# Supported SDMC DM1105 Adapters
2286#
2287CONFIG_DVB_DM1105=m
2288
2289#
2228# Supported DVB Frontends 2290# Supported DVB Frontends
2229# 2291#
2230 2292
@@ -2240,6 +2302,8 @@ CONFIG_DVB_CX24110=m
2240CONFIG_DVB_CX24123=m 2302CONFIG_DVB_CX24123=m
2241CONFIG_DVB_MT312=m 2303CONFIG_DVB_MT312=m
2242CONFIG_DVB_S5H1420=m 2304CONFIG_DVB_S5H1420=m
2305CONFIG_DVB_STV0288=m
2306CONFIG_DVB_STB6000=m
2243CONFIG_DVB_STV0299=m 2307CONFIG_DVB_STV0299=m
2244CONFIG_DVB_TDA8083=m 2308CONFIG_DVB_TDA8083=m
2245CONFIG_DVB_TDA10086=m 2309CONFIG_DVB_TDA10086=m
@@ -2247,6 +2311,8 @@ CONFIG_DVB_VES1X93=m
2247CONFIG_DVB_TUNER_ITD1000=m 2311CONFIG_DVB_TUNER_ITD1000=m
2248CONFIG_DVB_TDA826X=m 2312CONFIG_DVB_TDA826X=m
2249CONFIG_DVB_TUA6100=m 2313CONFIG_DVB_TUA6100=m
2314CONFIG_DVB_CX24116=m
2315CONFIG_DVB_SI21XX=m
2250 2316
2251# 2317#
2252# DVB-T (terrestrial) frontends 2318# DVB-T (terrestrial) frontends
@@ -2299,6 +2365,13 @@ CONFIG_DVB_TUNER_DIB0070=m
2299CONFIG_DVB_LNBP21=m 2365CONFIG_DVB_LNBP21=m
2300CONFIG_DVB_ISL6405=m 2366CONFIG_DVB_ISL6405=m
2301CONFIG_DVB_ISL6421=m 2367CONFIG_DVB_ISL6421=m
2368CONFIG_DVB_LGS8GL5=m
2369
2370#
2371# Tools to develop new frontends
2372#
2373# CONFIG_DVB_DUMMY_FE is not set
2374# CONFIG_DVB_AF9013 is not set
2302CONFIG_DAB=y 2375CONFIG_DAB=y
2303CONFIG_USB_DABUSB=m 2376CONFIG_USB_DABUSB=m
2304 2377
@@ -2320,6 +2393,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
2320CONFIG_FB=y 2393CONFIG_FB=y
2321# CONFIG_FIRMWARE_EDID is not set 2394# CONFIG_FIRMWARE_EDID is not set
2322CONFIG_FB_DDC=y 2395CONFIG_FB_DDC=y
2396# CONFIG_FB_BOOT_VESA_SUPPORT is not set
2323CONFIG_FB_CFB_FILLRECT=y 2397CONFIG_FB_CFB_FILLRECT=y
2324CONFIG_FB_CFB_COPYAREA=y 2398CONFIG_FB_CFB_COPYAREA=y
2325CONFIG_FB_CFB_IMAGEBLIT=y 2399CONFIG_FB_CFB_IMAGEBLIT=y
@@ -2382,6 +2456,7 @@ CONFIG_FB_SAVAGE=m
2382CONFIG_FB_SAVAGE_I2C=y 2456CONFIG_FB_SAVAGE_I2C=y
2383CONFIG_FB_SAVAGE_ACCEL=y 2457CONFIG_FB_SAVAGE_ACCEL=y
2384# CONFIG_FB_SIS is not set 2458# CONFIG_FB_SIS is not set
2459# CONFIG_FB_VIA is not set
2385CONFIG_FB_NEOMAGIC=m 2460CONFIG_FB_NEOMAGIC=m
2386CONFIG_FB_KYRO=m 2461CONFIG_FB_KYRO=m
2387CONFIG_FB_3DFX=m 2462CONFIG_FB_3DFX=m
@@ -2397,6 +2472,7 @@ CONFIG_FB_TRIDENT_ACCEL=y
2397CONFIG_FB_SM501=m 2472CONFIG_FB_SM501=m
2398CONFIG_FB_IBM_GXT4500=y 2473CONFIG_FB_IBM_GXT4500=y
2399# CONFIG_FB_VIRTUAL is not set 2474# CONFIG_FB_VIRTUAL is not set
2475# CONFIG_FB_METRONOME is not set
2400CONFIG_BACKLIGHT_LCD_SUPPORT=y 2476CONFIG_BACKLIGHT_LCD_SUPPORT=y
2401CONFIG_LCD_CLASS_DEVICE=m 2477CONFIG_LCD_CLASS_DEVICE=m
2402# CONFIG_LCD_ILI9320 is not set 2478# CONFIG_LCD_ILI9320 is not set
@@ -2432,6 +2508,7 @@ CONFIG_LOGO=y
2432# CONFIG_LOGO_LINUX_VGA16 is not set 2508# CONFIG_LOGO_LINUX_VGA16 is not set
2433CONFIG_LOGO_LINUX_CLUT224=y 2509CONFIG_LOGO_LINUX_CLUT224=y
2434CONFIG_SOUND=m 2510CONFIG_SOUND=m
2511CONFIG_SOUND_OSS_CORE=y
2435CONFIG_SND=m 2512CONFIG_SND=m
2436CONFIG_SND_TIMER=m 2513CONFIG_SND_TIMER=m
2437CONFIG_SND_PCM=m 2514CONFIG_SND_PCM=m
@@ -2594,15 +2671,36 @@ CONFIG_HIDRAW=y
2594# USB Input Devices 2671# USB Input Devices
2595# 2672#
2596CONFIG_USB_HID=y 2673CONFIG_USB_HID=y
2597CONFIG_USB_HIDINPUT_POWERBOOK=y
2598CONFIG_HID_FF=y
2599CONFIG_HID_PID=y 2674CONFIG_HID_PID=y
2675CONFIG_USB_HIDDEV=y
2676
2677#
2678# Special HID drivers
2679#
2680CONFIG_HID_COMPAT=y
2681CONFIG_HID_A4TECH=y
2682CONFIG_HID_APPLE=y
2683CONFIG_HID_BELKIN=y
2684CONFIG_HID_BRIGHT=y
2685CONFIG_HID_CHERRY=y
2686CONFIG_HID_CHICONY=y
2687CONFIG_HID_CYPRESS=y
2688CONFIG_HID_DELL=y
2689CONFIG_HID_EZKEY=y
2690CONFIG_HID_GYRATION=y
2691CONFIG_HID_LOGITECH=y
2600CONFIG_LOGITECH_FF=y 2692CONFIG_LOGITECH_FF=y
2601CONFIG_LOGIRUMBLEPAD2_FF=y 2693CONFIG_LOGIRUMBLEPAD2_FF=y
2694CONFIG_HID_MICROSOFT=y
2695CONFIG_HID_MONTEREY=y
2696CONFIG_HID_PANTHERLORD=y
2602CONFIG_PANTHERLORD_FF=y 2697CONFIG_PANTHERLORD_FF=y
2698CONFIG_HID_PETALYNX=y
2699CONFIG_HID_SAMSUNG=y
2700CONFIG_HID_SONY=y
2701CONFIG_HID_SUNPLUS=y
2603CONFIG_THRUSTMASTER_FF=y 2702CONFIG_THRUSTMASTER_FF=y
2604CONFIG_ZEROPLUS_FF=y 2703CONFIG_ZEROPLUS_FF=y
2605CONFIG_USB_HIDDEV=y
2606CONFIG_USB_SUPPORT=y 2704CONFIG_USB_SUPPORT=y
2607CONFIG_USB_ARCH_HAS_HCD=y 2705CONFIG_USB_ARCH_HAS_HCD=y
2608CONFIG_USB_ARCH_HAS_OHCI=y 2706CONFIG_USB_ARCH_HAS_OHCI=y
@@ -2620,6 +2718,8 @@ CONFIG_USB_DEVICEFS=y
2620CONFIG_USB_SUSPEND=y 2718CONFIG_USB_SUSPEND=y
2621# CONFIG_USB_OTG is not set 2719# CONFIG_USB_OTG is not set
2622CONFIG_USB_MON=y 2720CONFIG_USB_MON=y
2721# CONFIG_USB_WUSB is not set
2722# CONFIG_USB_WUSB_CBAF is not set
2623 2723
2624# 2724#
2625# USB Host Controller Drivers 2725# USB Host Controller Drivers
@@ -2647,6 +2747,8 @@ CONFIG_USB_U132_HCD=m
2647CONFIG_USB_SL811_HCD=m 2747CONFIG_USB_SL811_HCD=m
2648# CONFIG_USB_SL811_CS is not set 2748# CONFIG_USB_SL811_CS is not set
2649# CONFIG_USB_R8A66597_HCD is not set 2749# CONFIG_USB_R8A66597_HCD is not set
2750# CONFIG_USB_WHCI_HCD is not set
2751# CONFIG_USB_HWA_HCD is not set
2650# CONFIG_USB_MUSB_HDRC is not set 2752# CONFIG_USB_MUSB_HDRC is not set
2651 2753
2652# 2754#
@@ -2655,6 +2757,7 @@ CONFIG_USB_SL811_HCD=m
2655CONFIG_USB_ACM=m 2757CONFIG_USB_ACM=m
2656CONFIG_USB_PRINTER=m 2758CONFIG_USB_PRINTER=m
2657CONFIG_USB_WDM=m 2759CONFIG_USB_WDM=m
2760# CONFIG_USB_TMC is not set
2658 2761
2659# 2762#
2660# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 2763# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -2676,7 +2779,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
2676CONFIG_USB_STORAGE_ALAUDA=y 2779CONFIG_USB_STORAGE_ALAUDA=y
2677CONFIG_USB_STORAGE_ONETOUCH=y 2780CONFIG_USB_STORAGE_ONETOUCH=y
2678CONFIG_USB_STORAGE_KARMA=y 2781CONFIG_USB_STORAGE_KARMA=y
2679# CONFIG_USB_STORAGE_SIERRA is not set
2680CONFIG_USB_STORAGE_CYPRESS_ATACB=y 2782CONFIG_USB_STORAGE_CYPRESS_ATACB=y
2681# CONFIG_USB_LIBUSUAL is not set 2783# CONFIG_USB_LIBUSUAL is not set
2682 2784
@@ -2741,6 +2843,7 @@ CONFIG_USB_SERIAL_DEBUG=m
2741CONFIG_USB_EMI62=m 2843CONFIG_USB_EMI62=m
2742CONFIG_USB_EMI26=m 2844CONFIG_USB_EMI26=m
2743CONFIG_USB_ADUTUX=m 2845CONFIG_USB_ADUTUX=m
2846CONFIG_USB_SEVSEG=m
2744# CONFIG_USB_RIO500 is not set 2847# CONFIG_USB_RIO500 is not set
2745CONFIG_USB_LEGOTOWER=m 2848CONFIG_USB_LEGOTOWER=m
2746CONFIG_USB_LCD=m 2849CONFIG_USB_LCD=m
@@ -2762,12 +2865,14 @@ CONFIG_USB_TRANCEVIBRATOR=m
2762CONFIG_USB_IOWARRIOR=m 2865CONFIG_USB_IOWARRIOR=m
2763# CONFIG_USB_TEST is not set 2866# CONFIG_USB_TEST is not set
2764CONFIG_USB_ISIGHTFW=m 2867CONFIG_USB_ISIGHTFW=m
2868CONFIG_USB_VST=m
2765CONFIG_USB_ATM=m 2869CONFIG_USB_ATM=m
2766CONFIG_USB_SPEEDTOUCH=m 2870CONFIG_USB_SPEEDTOUCH=m
2767CONFIG_USB_CXACRU=m 2871CONFIG_USB_CXACRU=m
2768CONFIG_USB_UEAGLEATM=m 2872CONFIG_USB_UEAGLEATM=m
2769CONFIG_USB_XUSBATM=m 2873CONFIG_USB_XUSBATM=m
2770# CONFIG_USB_GADGET is not set 2874# CONFIG_USB_GADGET is not set
2875# CONFIG_UWB is not set
2771# CONFIG_MMC is not set 2876# CONFIG_MMC is not set
2772# CONFIG_MEMSTICK is not set 2877# CONFIG_MEMSTICK is not set
2773CONFIG_NEW_LEDS=y 2878CONFIG_NEW_LEDS=y
@@ -2787,6 +2892,7 @@ CONFIG_LEDS_TRIGGERS=y
2787CONFIG_LEDS_TRIGGER_TIMER=m 2892CONFIG_LEDS_TRIGGER_TIMER=m
2788CONFIG_LEDS_TRIGGER_IDE_DISK=y 2893CONFIG_LEDS_TRIGGER_IDE_DISK=y
2789CONFIG_LEDS_TRIGGER_HEARTBEAT=m 2894CONFIG_LEDS_TRIGGER_HEARTBEAT=m
2895CONFIG_LEDS_TRIGGER_BACKLIGHT=m
2790CONFIG_LEDS_TRIGGER_DEFAULT_ON=m 2896CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
2791CONFIG_ACCESSIBILITY=y 2897CONFIG_ACCESSIBILITY=y
2792CONFIG_A11Y_BRAILLE_CONSOLE=y 2898CONFIG_A11Y_BRAILLE_CONSOLE=y
@@ -2837,12 +2943,15 @@ CONFIG_RTC_DRV_FM3130=m
2837# Platform RTC drivers 2943# Platform RTC drivers
2838# 2944#
2839CONFIG_RTC_DRV_CMOS=y 2945CONFIG_RTC_DRV_CMOS=y
2946# CONFIG_RTC_DRV_DS1286 is not set
2840CONFIG_RTC_DRV_DS1511=m 2947CONFIG_RTC_DRV_DS1511=m
2841CONFIG_RTC_DRV_DS1553=m 2948CONFIG_RTC_DRV_DS1553=m
2842CONFIG_RTC_DRV_DS1742=m 2949CONFIG_RTC_DRV_DS1742=m
2843CONFIG_RTC_DRV_STK17TA8=m 2950CONFIG_RTC_DRV_STK17TA8=m
2844# CONFIG_RTC_DRV_M48T86 is not set 2951# CONFIG_RTC_DRV_M48T86 is not set
2952CONFIG_RTC_DRV_M48T35=m
2845CONFIG_RTC_DRV_M48T59=m 2953CONFIG_RTC_DRV_M48T59=m
2954# CONFIG_RTC_DRV_BQ4802 is not set
2846CONFIG_RTC_DRV_V3020=m 2955CONFIG_RTC_DRV_V3020=m
2847 2956
2848# 2957#
@@ -2862,7 +2971,10 @@ CONFIG_KS0108_DELAY=2
2862CONFIG_UIO=m 2971CONFIG_UIO=m
2863CONFIG_UIO_CIF=m 2972CONFIG_UIO_CIF=m
2864CONFIG_UIO_PDRV=m 2973CONFIG_UIO_PDRV=m
2974CONFIG_UIO_PDRV_GENIRQ=m
2865CONFIG_UIO_SMX=m 2975CONFIG_UIO_SMX=m
2976# CONFIG_UIO_SERCOS3 is not set
2977# CONFIG_STAGING is not set
2866 2978
2867# 2979#
2868# File systems 2980# File systems
@@ -2872,20 +2984,21 @@ CONFIG_EXT2_FS_XATTR=y
2872CONFIG_EXT2_FS_POSIX_ACL=y 2984CONFIG_EXT2_FS_POSIX_ACL=y
2873CONFIG_EXT2_FS_SECURITY=y 2985CONFIG_EXT2_FS_SECURITY=y
2874CONFIG_EXT2_FS_XIP=y 2986CONFIG_EXT2_FS_XIP=y
2875CONFIG_FS_XIP=y
2876CONFIG_EXT3_FS=m 2987CONFIG_EXT3_FS=m
2877CONFIG_EXT3_FS_XATTR=y 2988CONFIG_EXT3_FS_XATTR=y
2878CONFIG_EXT3_FS_POSIX_ACL=y 2989CONFIG_EXT3_FS_POSIX_ACL=y
2879CONFIG_EXT3_FS_SECURITY=y 2990CONFIG_EXT3_FS_SECURITY=y
2880CONFIG_EXT4DEV_FS=m 2991CONFIG_EXT4_FS=y
2881CONFIG_EXT4DEV_FS_XATTR=y 2992# CONFIG_EXT4DEV_COMPAT is not set
2882CONFIG_EXT4DEV_FS_POSIX_ACL=y 2993CONFIG_EXT4_FS_XATTR=y
2883CONFIG_EXT4DEV_FS_SECURITY=y 2994# CONFIG_EXT4_FS_POSIX_ACL is not set
2995# CONFIG_EXT4_FS_SECURITY is not set
2996CONFIG_FS_XIP=y
2884CONFIG_JBD=m 2997CONFIG_JBD=m
2885# CONFIG_JBD_DEBUG is not set 2998# CONFIG_JBD_DEBUG is not set
2886CONFIG_JBD2=m 2999CONFIG_JBD2=y
2887CONFIG_JBD2_DEBUG=y 3000CONFIG_JBD2_DEBUG=y
2888CONFIG_FS_MBCACHE=m 3001CONFIG_FS_MBCACHE=y
2889CONFIG_REISERFS_FS=m 3002CONFIG_REISERFS_FS=m
2890# CONFIG_REISERFS_CHECK is not set 3003# CONFIG_REISERFS_CHECK is not set
2891CONFIG_REISERFS_PROC_INFO=y 3004CONFIG_REISERFS_PROC_INFO=y
@@ -2898,6 +3011,7 @@ CONFIG_JFS_SECURITY=y
2898# CONFIG_JFS_DEBUG is not set 3011# CONFIG_JFS_DEBUG is not set
2899# CONFIG_JFS_STATISTICS is not set 3012# CONFIG_JFS_STATISTICS is not set
2900CONFIG_FS_POSIX_ACL=y 3013CONFIG_FS_POSIX_ACL=y
3014CONFIG_FILE_LOCKING=y
2901CONFIG_XFS_FS=m 3015CONFIG_XFS_FS=m
2902CONFIG_XFS_QUOTA=y 3016CONFIG_XFS_QUOTA=y
2903CONFIG_XFS_POSIX_ACL=y 3017CONFIG_XFS_POSIX_ACL=y
@@ -2911,6 +3025,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
2911CONFIG_OCFS2_FS_STATS=y 3025CONFIG_OCFS2_FS_STATS=y
2912# CONFIG_OCFS2_DEBUG_MASKLOG is not set 3026# CONFIG_OCFS2_DEBUG_MASKLOG is not set
2913# CONFIG_OCFS2_DEBUG_FS is not set 3027# CONFIG_OCFS2_DEBUG_FS is not set
3028# CONFIG_OCFS2_COMPAT_JBD is not set
2914CONFIG_DNOTIFY=y 3029CONFIG_DNOTIFY=y
2915CONFIG_INOTIFY=y 3030CONFIG_INOTIFY=y
2916CONFIG_INOTIFY_USER=y 3031CONFIG_INOTIFY_USER=y
@@ -2950,6 +3065,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
2950CONFIG_PROC_FS=y 3065CONFIG_PROC_FS=y
2951CONFIG_PROC_KCORE=y 3066CONFIG_PROC_KCORE=y
2952CONFIG_PROC_SYSCTL=y 3067CONFIG_PROC_SYSCTL=y
3068CONFIG_PROC_PAGE_MONITOR=y
2953CONFIG_SYSFS=y 3069CONFIG_SYSFS=y
2954CONFIG_TMPFS=y 3070CONFIG_TMPFS=y
2955CONFIG_TMPFS_POSIX_ACL=y 3071CONFIG_TMPFS_POSIX_ACL=y
@@ -2996,17 +3112,18 @@ CONFIG_NFS_ACL_SUPPORT=m
2996CONFIG_NFS_COMMON=y 3112CONFIG_NFS_COMMON=y
2997CONFIG_SUNRPC=m 3113CONFIG_SUNRPC=m
2998CONFIG_SUNRPC_GSS=m 3114CONFIG_SUNRPC_GSS=m
3115# CONFIG_SUNRPC_REGISTER_V4 is not set
2999CONFIG_RPCSEC_GSS_KRB5=m 3116CONFIG_RPCSEC_GSS_KRB5=m
3000CONFIG_RPCSEC_GSS_SPKM3=m 3117CONFIG_RPCSEC_GSS_SPKM3=m
3001# CONFIG_SMB_FS is not set 3118# CONFIG_SMB_FS is not set
3002CONFIG_CIFS=m 3119CONFIG_CIFS=m
3003# CONFIG_CIFS_STATS is not set 3120# CONFIG_CIFS_STATS is not set
3004CONFIG_CIFS_WEAK_PW_HASH=y 3121CONFIG_CIFS_WEAK_PW_HASH=y
3122CONFIG_CIFS_UPCALL=y
3005CONFIG_CIFS_XATTR=y 3123CONFIG_CIFS_XATTR=y
3006CONFIG_CIFS_POSIX=y 3124CONFIG_CIFS_POSIX=y
3007# CONFIG_CIFS_DEBUG2 is not set 3125# CONFIG_CIFS_DEBUG2 is not set
3008CONFIG_CIFS_EXPERIMENTAL=y 3126CONFIG_CIFS_EXPERIMENTAL=y
3009CONFIG_CIFS_UPCALL=y
3010CONFIG_CIFS_DFS_UPCALL=y 3127CONFIG_CIFS_DFS_UPCALL=y
3011CONFIG_NCP_FS=m 3128CONFIG_NCP_FS=m
3012CONFIG_NCPFS_PACKET_SIGNING=y 3129CONFIG_NCPFS_PACKET_SIGNING=y
@@ -3084,15 +3201,13 @@ CONFIG_NLS_KOI8_U=m
3084CONFIG_NLS_UTF8=m 3201CONFIG_NLS_UTF8=m
3085CONFIG_DLM=m 3202CONFIG_DLM=m
3086CONFIG_DLM_DEBUG=y 3203CONFIG_DLM_DEBUG=y
3087CONFIG_QE_GPIO=y
3088 3204
3089# 3205#
3090# Library routines 3206# Library routines
3091# 3207#
3092CONFIG_BITREVERSE=y 3208CONFIG_BITREVERSE=y
3093# CONFIG_GENERIC_FIND_FIRST_BIT is not set
3094CONFIG_CRC_CCITT=m 3209CONFIG_CRC_CCITT=m
3095CONFIG_CRC16=m 3210CONFIG_CRC16=y
3096CONFIG_CRC_T10DIF=y 3211CONFIG_CRC_T10DIF=y
3097CONFIG_CRC_ITU_T=m 3212CONFIG_CRC_ITU_T=m
3098CONFIG_CRC32=y 3213CONFIG_CRC32=y
@@ -3157,28 +3272,38 @@ CONFIG_DEBUG_SG=y
3157CONFIG_FRAME_POINTER=y 3272CONFIG_FRAME_POINTER=y
3158CONFIG_BOOT_PRINTK_DELAY=y 3273CONFIG_BOOT_PRINTK_DELAY=y
3159# CONFIG_RCU_TORTURE_TEST is not set 3274# CONFIG_RCU_TORTURE_TEST is not set
3275# CONFIG_RCU_CPU_STALL_DETECTOR is not set
3160# CONFIG_KPROBES_SANITY_TEST is not set 3276# CONFIG_KPROBES_SANITY_TEST is not set
3161# CONFIG_BACKTRACE_SELF_TEST is not set 3277# CONFIG_BACKTRACE_SELF_TEST is not set
3278# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
3162# CONFIG_LKDTM is not set 3279# CONFIG_LKDTM is not set
3163CONFIG_FAULT_INJECTION=y 3280CONFIG_FAULT_INJECTION=y
3164CONFIG_FAILSLAB=y 3281CONFIG_FAILSLAB=y
3165CONFIG_FAIL_PAGE_ALLOC=y 3282CONFIG_FAIL_PAGE_ALLOC=y
3166CONFIG_FAIL_MAKE_REQUEST=y 3283CONFIG_FAIL_MAKE_REQUEST=y
3284CONFIG_FAIL_IO_TIMEOUT=y
3167CONFIG_FAULT_INJECTION_DEBUG_FS=y 3285CONFIG_FAULT_INJECTION_DEBUG_FS=y
3168CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 3286CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
3169CONFIG_LATENCYTOP=y 3287CONFIG_LATENCYTOP=y
3170CONFIG_SYSCTL_SYSCALL_CHECK=y 3288CONFIG_SYSCTL_SYSCALL_CHECK=y
3171CONFIG_HAVE_FTRACE=y 3289CONFIG_NOP_TRACER=y
3172CONFIG_HAVE_DYNAMIC_FTRACE=y 3290CONFIG_HAVE_FUNCTION_TRACER=y
3173CONFIG_TRACER_MAX_TRACE=y 3291CONFIG_TRACER_MAX_TRACE=y
3292CONFIG_RING_BUFFER=y
3174CONFIG_TRACING=y 3293CONFIG_TRACING=y
3175CONFIG_FTRACE=y 3294
3295#
3296# Tracers
3297#
3298CONFIG_FUNCTION_TRACER=y
3176CONFIG_SCHED_TRACER=y 3299CONFIG_SCHED_TRACER=y
3177CONFIG_CONTEXT_SWITCH_TRACER=y 3300CONFIG_CONTEXT_SWITCH_TRACER=y
3178CONFIG_DYNAMIC_FTRACE=y 3301# CONFIG_BOOT_TRACER is not set
3302CONFIG_STACK_TRACER=y
3179# CONFIG_FTRACE_STARTUP_TEST is not set 3303# CONFIG_FTRACE_STARTUP_TEST is not set
3180# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set 3304# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
3181# CONFIG_BUILD_DOCSRC is not set 3305# CONFIG_BUILD_DOCSRC is not set
3306CONFIG_DYNAMIC_PRINTK_DEBUG=y
3182# CONFIG_SAMPLES is not set 3307# CONFIG_SAMPLES is not set
3183CONFIG_HAVE_ARCH_KGDB=y 3308CONFIG_HAVE_ARCH_KGDB=y
3184# CONFIG_KGDB is not set 3309# CONFIG_KGDB is not set
@@ -3186,6 +3311,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
3186CONFIG_DEBUG_STACK_USAGE=y 3311CONFIG_DEBUG_STACK_USAGE=y
3187# CONFIG_CODE_PATCHING_SELFTEST is not set 3312# CONFIG_CODE_PATCHING_SELFTEST is not set
3188# CONFIG_FTR_FIXUP_SELFTEST is not set 3313# CONFIG_FTR_FIXUP_SELFTEST is not set
3314# CONFIG_MSI_BITMAP_SELFTEST is not set
3189CONFIG_XMON=y 3315CONFIG_XMON=y
3190# CONFIG_XMON_DEFAULT is not set 3316# CONFIG_XMON_DEFAULT is not set
3191CONFIG_XMON_DISASSEMBLY=y 3317CONFIG_XMON_DISASSEMBLY=y
@@ -3202,6 +3328,7 @@ CONFIG_BOOTX_TEXT=y
3202CONFIG_KEYS=y 3328CONFIG_KEYS=y
3203CONFIG_KEYS_DEBUG_PROC_KEYS=y 3329CONFIG_KEYS_DEBUG_PROC_KEYS=y
3204CONFIG_SECURITY=y 3330CONFIG_SECURITY=y
3331# CONFIG_SECURITYFS is not set
3205CONFIG_SECURITY_NETWORK=y 3332CONFIG_SECURITY_NETWORK=y
3206CONFIG_SECURITY_NETWORK_XFRM=y 3333CONFIG_SECURITY_NETWORK_XFRM=y
3207CONFIG_SECURITY_FILE_CAPABILITIES=y 3334CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -3226,10 +3353,12 @@ CONFIG_CRYPTO=y
3226# 3353#
3227# Crypto core or helper 3354# Crypto core or helper
3228# 3355#
3356# CONFIG_CRYPTO_FIPS is not set
3229CONFIG_CRYPTO_ALGAPI=y 3357CONFIG_CRYPTO_ALGAPI=y
3230CONFIG_CRYPTO_AEAD=m 3358CONFIG_CRYPTO_AEAD=y
3231CONFIG_CRYPTO_BLKCIPHER=m 3359CONFIG_CRYPTO_BLKCIPHER=y
3232CONFIG_CRYPTO_HASH=y 3360CONFIG_CRYPTO_HASH=y
3361CONFIG_CRYPTO_RNG=y
3233CONFIG_CRYPTO_MANAGER=y 3362CONFIG_CRYPTO_MANAGER=y
3234CONFIG_CRYPTO_GF128MUL=m 3363CONFIG_CRYPTO_GF128MUL=m
3235CONFIG_CRYPTO_NULL=m 3364CONFIG_CRYPTO_NULL=m
@@ -3303,6 +3432,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
3303# 3432#
3304CONFIG_CRYPTO_DEFLATE=m 3433CONFIG_CRYPTO_DEFLATE=m
3305CONFIG_CRYPTO_LZO=m 3434CONFIG_CRYPTO_LZO=m
3435
3436#
3437# Random Number Generation
3438#
3439# CONFIG_CRYPTO_ANSI_CPRNG is not set
3306CONFIG_CRYPTO_HW=y 3440CONFIG_CRYPTO_HW=y
3307CONFIG_CRYPTO_DEV_HIFN_795X=m 3441CONFIG_CRYPTO_DEV_HIFN_795X=m
3308CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y 3442CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index e77c5e7a0be2..1e520ab65118 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.27-rc4 3# Linux kernel version: 2.6.28-rc3
4# Tue Aug 26 13:31:07 2008 4# Tue Nov 11 19:37:06 2008
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7 7
@@ -22,7 +22,7 @@ CONFIG_SMP=y
22CONFIG_NR_CPUS=128 22CONFIG_NR_CPUS=128
23CONFIG_64BIT=y 23CONFIG_64BIT=y
24CONFIG_WORD_SIZE=64 24CONFIG_WORD_SIZE=64
25CONFIG_PPC_MERGE=y 25CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
26CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y 27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y 28CONFIG_GENERIC_TIME=y
@@ -86,6 +86,7 @@ CONFIG_LOG_BUF_SHIFT=17
86CONFIG_CGROUPS=y 86CONFIG_CGROUPS=y
87# CONFIG_CGROUP_DEBUG is not set 87# CONFIG_CGROUP_DEBUG is not set
88CONFIG_CGROUP_NS=y 88CONFIG_CGROUP_NS=y
89CONFIG_CGROUP_FREEZER=y
89CONFIG_CGROUP_DEVICE=y 90CONFIG_CGROUP_DEVICE=y
90CONFIG_CPUSETS=y 91CONFIG_CPUSETS=y
91# CONFIG_GROUP_SCHED is not set 92# CONFIG_GROUP_SCHED is not set
@@ -123,12 +124,15 @@ CONFIG_SIGNALFD=y
123CONFIG_TIMERFD=y 124CONFIG_TIMERFD=y
124CONFIG_EVENTFD=y 125CONFIG_EVENTFD=y
125CONFIG_SHMEM=y 126CONFIG_SHMEM=y
127CONFIG_AIO=y
126CONFIG_VM_EVENT_COUNTERS=y 128CONFIG_VM_EVENT_COUNTERS=y
129CONFIG_PCI_QUIRKS=y
127CONFIG_SLUB_DEBUG=y 130CONFIG_SLUB_DEBUG=y
128# CONFIG_SLAB is not set 131# CONFIG_SLAB is not set
129CONFIG_SLUB=y 132CONFIG_SLUB=y
130# CONFIG_SLOB is not set 133# CONFIG_SLOB is not set
131CONFIG_PROFILING=y 134CONFIG_PROFILING=y
135CONFIG_TRACEPOINTS=y
132CONFIG_MARKERS=y 136CONFIG_MARKERS=y
133CONFIG_OPROFILE=y 137CONFIG_OPROFILE=y
134CONFIG_HAVE_OPROFILE=y 138CONFIG_HAVE_OPROFILE=y
@@ -141,8 +145,6 @@ CONFIG_HAVE_KRETPROBES=y
141CONFIG_HAVE_ARCH_TRACEHOOK=y 145CONFIG_HAVE_ARCH_TRACEHOOK=y
142CONFIG_HAVE_DMA_ATTRS=y 146CONFIG_HAVE_DMA_ATTRS=y
143CONFIG_USE_GENERIC_SMP_HELPERS=y 147CONFIG_USE_GENERIC_SMP_HELPERS=y
144# CONFIG_HAVE_CLK is not set
145CONFIG_PROC_PAGE_MONITOR=y
146# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 148# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
147CONFIG_SLABINFO=y 149CONFIG_SLABINFO=y
148CONFIG_RT_MUTEXES=y 150CONFIG_RT_MUTEXES=y
@@ -175,6 +177,8 @@ CONFIG_DEFAULT_AS=y
175# CONFIG_DEFAULT_NOOP is not set 177# CONFIG_DEFAULT_NOOP is not set
176CONFIG_DEFAULT_IOSCHED="anticipatory" 178CONFIG_DEFAULT_IOSCHED="anticipatory"
177CONFIG_CLASSIC_RCU=y 179CONFIG_CLASSIC_RCU=y
180CONFIG_FREEZER=y
181CONFIG_PPC_MSI_BITMAP=y
178 182
179# 183#
180# Platform support 184# Platform support
@@ -237,6 +241,8 @@ CONFIG_PREEMPT_NONE=y
237# CONFIG_PREEMPT is not set 241# CONFIG_PREEMPT is not set
238CONFIG_BINFMT_ELF=y 242CONFIG_BINFMT_ELF=y
239CONFIG_COMPAT_BINFMT_ELF=y 243CONFIG_COMPAT_BINFMT_ELF=y
244# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
245# CONFIG_HAVE_AOUT is not set
240CONFIG_BINFMT_MISC=m 246CONFIG_BINFMT_MISC=m
241CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y 247CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
242CONFIG_IOMMU_VMERGE=y 248CONFIG_IOMMU_VMERGE=y
@@ -246,7 +252,6 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
246CONFIG_ARCH_HAS_WALK_MEMORY=y 252CONFIG_ARCH_HAS_WALK_MEMORY=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 253CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
248CONFIG_KEXEC=y 254CONFIG_KEXEC=y
249# CONFIG_CRASH_DUMP is not set
250# CONFIG_PHYP_DUMP is not set 255# CONFIG_PHYP_DUMP is not set
251CONFIG_IRQ_ALL_CPUS=y 256CONFIG_IRQ_ALL_CPUS=y
252CONFIG_NUMA=y 257CONFIG_NUMA=y
@@ -262,7 +267,6 @@ CONFIG_SPARSEMEM_MANUAL=y
262CONFIG_SPARSEMEM=y 267CONFIG_SPARSEMEM=y
263CONFIG_NEED_MULTIPLE_NODES=y 268CONFIG_NEED_MULTIPLE_NODES=y
264CONFIG_HAVE_MEMORY_PRESENT=y 269CONFIG_HAVE_MEMORY_PRESENT=y
265# CONFIG_SPARSEMEM_STATIC is not set
266CONFIG_SPARSEMEM_EXTREME=y 270CONFIG_SPARSEMEM_EXTREME=y
267CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 271CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
268CONFIG_SPARSEMEM_VMEMMAP=y 272CONFIG_SPARSEMEM_VMEMMAP=y
@@ -271,8 +275,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
271CONFIG_SPLIT_PTLOCK_CPUS=4 275CONFIG_SPLIT_PTLOCK_CPUS=4
272CONFIG_MIGRATION=y 276CONFIG_MIGRATION=y
273CONFIG_RESOURCES_64BIT=y 277CONFIG_RESOURCES_64BIT=y
278CONFIG_PHYS_ADDR_T_64BIT=y
274CONFIG_ZONE_DMA_FLAG=1 279CONFIG_ZONE_DMA_FLAG=1
275CONFIG_BOUNCE=y 280CONFIG_BOUNCE=y
281CONFIG_UNEVICTABLE_LRU=y
276CONFIG_NODES_SPAN_OTHER_NODES=y 282CONFIG_NODES_SPAN_OTHER_NODES=y
277# CONFIG_PPC_HAS_HASH_64K is not set 283# CONFIG_PPC_HAS_HASH_64K is not set
278# CONFIG_PPC_64K_PAGES is not set 284# CONFIG_PPC_64K_PAGES is not set
@@ -307,6 +313,7 @@ CONFIG_HOTPLUG_PCI=m
307CONFIG_HOTPLUG_PCI_RPA=m 313CONFIG_HOTPLUG_PCI_RPA=m
308CONFIG_HOTPLUG_PCI_RPA_DLPAR=m 314CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
309# CONFIG_HAS_RAPIDIO is not set 315# CONFIG_HAS_RAPIDIO is not set
316# CONFIG_RELOCATABLE is not set
310CONFIG_PAGE_OFFSET=0xc000000000000000 317CONFIG_PAGE_OFFSET=0xc000000000000000
311CONFIG_KERNEL_START=0xc000000000000000 318CONFIG_KERNEL_START=0xc000000000000000
312CONFIG_PHYSICAL_START=0x00000000 319CONFIG_PHYSICAL_START=0x00000000
@@ -351,7 +358,6 @@ CONFIG_INET_TCP_DIAG=y
351CONFIG_TCP_CONG_CUBIC=y 358CONFIG_TCP_CONG_CUBIC=y
352CONFIG_DEFAULT_TCP_CONG="cubic" 359CONFIG_DEFAULT_TCP_CONG="cubic"
353# CONFIG_TCP_MD5SIG is not set 360# CONFIG_TCP_MD5SIG is not set
354# CONFIG_IP_VS is not set
355# CONFIG_IPV6 is not set 361# CONFIG_IPV6 is not set
356# CONFIG_NETWORK_SECMARK is not set 362# CONFIG_NETWORK_SECMARK is not set
357CONFIG_NETFILTER=y 363CONFIG_NETFILTER=y
@@ -383,9 +389,10 @@ CONFIG_NF_CONNTRACK_TFTP=m
383CONFIG_NF_CT_NETLINK=m 389CONFIG_NF_CT_NETLINK=m
384CONFIG_NETFILTER_XTABLES=m 390CONFIG_NETFILTER_XTABLES=m
385CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 391CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
392CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
386CONFIG_NETFILTER_XT_TARGET_MARK=m 393CONFIG_NETFILTER_XT_TARGET_MARK=m
387CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
388CONFIG_NETFILTER_XT_TARGET_NFLOG=m 394CONFIG_NETFILTER_XT_TARGET_NFLOG=m
395CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
389CONFIG_NETFILTER_XT_TARGET_RATEEST=m 396CONFIG_NETFILTER_XT_TARGET_RATEEST=m
390CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 397CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
391CONFIG_NETFILTER_XT_MATCH_COMMENT=m 398CONFIG_NETFILTER_XT_MATCH_COMMENT=m
@@ -396,19 +403,22 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
396CONFIG_NETFILTER_XT_MATCH_DCCP=m 403CONFIG_NETFILTER_XT_MATCH_DCCP=m
397CONFIG_NETFILTER_XT_MATCH_DSCP=m 404CONFIG_NETFILTER_XT_MATCH_DSCP=m
398CONFIG_NETFILTER_XT_MATCH_ESP=m 405CONFIG_NETFILTER_XT_MATCH_ESP=m
406CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
399CONFIG_NETFILTER_XT_MATCH_HELPER=m 407CONFIG_NETFILTER_XT_MATCH_HELPER=m
400CONFIG_NETFILTER_XT_MATCH_IPRANGE=m 408CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
401CONFIG_NETFILTER_XT_MATCH_LENGTH=m 409CONFIG_NETFILTER_XT_MATCH_LENGTH=m
402CONFIG_NETFILTER_XT_MATCH_LIMIT=m 410CONFIG_NETFILTER_XT_MATCH_LIMIT=m
403CONFIG_NETFILTER_XT_MATCH_MAC=m 411CONFIG_NETFILTER_XT_MATCH_MAC=m
404CONFIG_NETFILTER_XT_MATCH_MARK=m 412CONFIG_NETFILTER_XT_MATCH_MARK=m
413CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
405CONFIG_NETFILTER_XT_MATCH_OWNER=m 414CONFIG_NETFILTER_XT_MATCH_OWNER=m
406CONFIG_NETFILTER_XT_MATCH_POLICY=m 415CONFIG_NETFILTER_XT_MATCH_POLICY=m
407CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
408CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 416CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
409CONFIG_NETFILTER_XT_MATCH_QUOTA=m 417CONFIG_NETFILTER_XT_MATCH_QUOTA=m
410CONFIG_NETFILTER_XT_MATCH_RATEEST=m 418CONFIG_NETFILTER_XT_MATCH_RATEEST=m
411CONFIG_NETFILTER_XT_MATCH_REALM=m 419CONFIG_NETFILTER_XT_MATCH_REALM=m
420CONFIG_NETFILTER_XT_MATCH_RECENT=m
421# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
412CONFIG_NETFILTER_XT_MATCH_SCTP=m 422CONFIG_NETFILTER_XT_MATCH_SCTP=m
413CONFIG_NETFILTER_XT_MATCH_STATE=m 423CONFIG_NETFILTER_XT_MATCH_STATE=m
414CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 424CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -416,20 +426,20 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
416CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 426CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
417CONFIG_NETFILTER_XT_MATCH_TIME=m 427CONFIG_NETFILTER_XT_MATCH_TIME=m
418CONFIG_NETFILTER_XT_MATCH_U32=m 428CONFIG_NETFILTER_XT_MATCH_U32=m
419CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 429# CONFIG_IP_VS is not set
420 430
421# 431#
422# IP: Netfilter Configuration 432# IP: Netfilter Configuration
423# 433#
434CONFIG_NF_DEFRAG_IPV4=m
424CONFIG_NF_CONNTRACK_IPV4=m 435CONFIG_NF_CONNTRACK_IPV4=m
425CONFIG_NF_CONNTRACK_PROC_COMPAT=y 436CONFIG_NF_CONNTRACK_PROC_COMPAT=y
426CONFIG_IP_NF_QUEUE=m 437CONFIG_IP_NF_QUEUE=m
427CONFIG_IP_NF_IPTABLES=m 438CONFIG_IP_NF_IPTABLES=m
428CONFIG_IP_NF_MATCH_RECENT=m 439CONFIG_IP_NF_MATCH_ADDRTYPE=m
429CONFIG_IP_NF_MATCH_ECN=m
430CONFIG_IP_NF_MATCH_AH=m 440CONFIG_IP_NF_MATCH_AH=m
441CONFIG_IP_NF_MATCH_ECN=m
431CONFIG_IP_NF_MATCH_TTL=m 442CONFIG_IP_NF_MATCH_TTL=m
432CONFIG_IP_NF_MATCH_ADDRTYPE=m
433CONFIG_IP_NF_FILTER=m 443CONFIG_IP_NF_FILTER=m
434CONFIG_IP_NF_TARGET_REJECT=m 444CONFIG_IP_NF_TARGET_REJECT=m
435CONFIG_IP_NF_TARGET_LOG=m 445CONFIG_IP_NF_TARGET_LOG=m
@@ -437,8 +447,8 @@ CONFIG_IP_NF_TARGET_ULOG=m
437CONFIG_NF_NAT=m 447CONFIG_NF_NAT=m
438CONFIG_NF_NAT_NEEDED=y 448CONFIG_NF_NAT_NEEDED=y
439CONFIG_IP_NF_TARGET_MASQUERADE=m 449CONFIG_IP_NF_TARGET_MASQUERADE=m
440CONFIG_IP_NF_TARGET_REDIRECT=m
441CONFIG_IP_NF_TARGET_NETMAP=m 450CONFIG_IP_NF_TARGET_NETMAP=m
451CONFIG_IP_NF_TARGET_REDIRECT=m
442CONFIG_NF_NAT_SNMP_BASIC=m 452CONFIG_NF_NAT_SNMP_BASIC=m
443CONFIG_NF_NAT_PROTO_UDPLITE=m 453CONFIG_NF_NAT_PROTO_UDPLITE=m
444CONFIG_NF_NAT_FTP=m 454CONFIG_NF_NAT_FTP=m
@@ -456,6 +466,7 @@ CONFIG_NF_NAT_TFTP=m
456# CONFIG_TIPC is not set 466# CONFIG_TIPC is not set
457# CONFIG_ATM is not set 467# CONFIG_ATM is not set
458# CONFIG_BRIDGE is not set 468# CONFIG_BRIDGE is not set
469# CONFIG_NET_DSA is not set
459# CONFIG_VLAN_8021Q is not set 470# CONFIG_VLAN_8021Q is not set
460# CONFIG_DECNET is not set 471# CONFIG_DECNET is not set
461CONFIG_LLC=y 472CONFIG_LLC=y
@@ -479,14 +490,8 @@ CONFIG_NET_CLS_ROUTE=y
479# CONFIG_IRDA is not set 490# CONFIG_IRDA is not set
480# CONFIG_BT is not set 491# CONFIG_BT is not set
481# CONFIG_AF_RXRPC is not set 492# CONFIG_AF_RXRPC is not set
482 493# CONFIG_PHONET is not set
483# 494# CONFIG_WIRELESS is not set
484# Wireless
485#
486# CONFIG_CFG80211 is not set
487# CONFIG_WIRELESS_EXT is not set
488# CONFIG_MAC80211 is not set
489# CONFIG_IEEE80211 is not set
490# CONFIG_RFKILL is not set 495# CONFIG_RFKILL is not set
491# CONFIG_NET_9P is not set 496# CONFIG_NET_9P is not set
492 497
@@ -546,19 +551,18 @@ CONFIG_MISC_DEVICES=y
546# CONFIG_HP_ILO is not set 551# CONFIG_HP_ILO is not set
547CONFIG_HAVE_IDE=y 552CONFIG_HAVE_IDE=y
548CONFIG_IDE=y 553CONFIG_IDE=y
549CONFIG_BLK_DEV_IDE=y
550 554
551# 555#
552# Please see Documentation/ide/ide.txt for help/info on IDE drives 556# Please see Documentation/ide/ide.txt for help/info on IDE drives
553# 557#
554CONFIG_IDE_TIMINGS=y 558CONFIG_IDE_TIMINGS=y
555# CONFIG_BLK_DEV_IDE_SATA is not set 559# CONFIG_BLK_DEV_IDE_SATA is not set
556CONFIG_BLK_DEV_IDEDISK=y 560CONFIG_IDE_GD=y
557# CONFIG_IDEDISK_MULTI_MODE is not set 561CONFIG_IDE_GD_ATA=y
562# CONFIG_IDE_GD_ATAPI is not set
558CONFIG_BLK_DEV_IDECD=y 563CONFIG_BLK_DEV_IDECD=y
559CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y 564CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
560# CONFIG_BLK_DEV_IDETAPE is not set 565# CONFIG_BLK_DEV_IDETAPE is not set
561# CONFIG_BLK_DEV_IDEFLOPPY is not set
562# CONFIG_BLK_DEV_IDESCSI is not set 566# CONFIG_BLK_DEV_IDESCSI is not set
563# CONFIG_IDE_TASK_IOCTL is not set 567# CONFIG_IDE_TASK_IOCTL is not set
564CONFIG_IDE_PROC_FS=y 568CONFIG_IDE_PROC_FS=y
@@ -696,6 +700,7 @@ CONFIG_SATA_PMP=y
696# CONFIG_ATA_SFF is not set 700# CONFIG_ATA_SFF is not set
697CONFIG_MD=y 701CONFIG_MD=y
698CONFIG_BLK_DEV_MD=y 702CONFIG_BLK_DEV_MD=y
703CONFIG_MD_AUTODETECT=y
699CONFIG_MD_LINEAR=y 704CONFIG_MD_LINEAR=y
700CONFIG_MD_RAID0=y 705CONFIG_MD_RAID0=y
701CONFIG_MD_RAID1=y 706CONFIG_MD_RAID1=y
@@ -765,6 +770,9 @@ CONFIG_IBMVETH=y
765# CONFIG_IBM_NEW_EMAC_RGMII is not set 770# CONFIG_IBM_NEW_EMAC_RGMII is not set
766# CONFIG_IBM_NEW_EMAC_TAH is not set 771# CONFIG_IBM_NEW_EMAC_TAH is not set
767# CONFIG_IBM_NEW_EMAC_EMAC4 is not set 772# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
773# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
774# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
775# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
768CONFIG_NET_PCI=y 776CONFIG_NET_PCI=y
769CONFIG_PCNET32=y 777CONFIG_PCNET32=y
770# CONFIG_AMD8111_ETH is not set 778# CONFIG_AMD8111_ETH is not set
@@ -786,12 +794,12 @@ CONFIG_E100=y
786# CONFIG_VIA_RHINE is not set 794# CONFIG_VIA_RHINE is not set
787# CONFIG_SC92031 is not set 795# CONFIG_SC92031 is not set
788# CONFIG_NET_POCKET is not set 796# CONFIG_NET_POCKET is not set
797# CONFIG_ATL2 is not set
789CONFIG_NETDEV_1000=y 798CONFIG_NETDEV_1000=y
790CONFIG_ACENIC=y 799CONFIG_ACENIC=y
791CONFIG_ACENIC_OMIT_TIGON_I=y 800CONFIG_ACENIC_OMIT_TIGON_I=y
792# CONFIG_DL2K is not set 801# CONFIG_DL2K is not set
793CONFIG_E1000=y 802CONFIG_E1000=y
794# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
795# CONFIG_E1000E is not set 803# CONFIG_E1000E is not set
796# CONFIG_IP1000 is not set 804# CONFIG_IP1000 is not set
797# CONFIG_IGB is not set 805# CONFIG_IGB is not set
@@ -808,19 +816,23 @@ CONFIG_TIGON3=y
808# CONFIG_QLA3XXX is not set 816# CONFIG_QLA3XXX is not set
809# CONFIG_ATL1 is not set 817# CONFIG_ATL1 is not set
810# CONFIG_ATL1E is not set 818# CONFIG_ATL1E is not set
819# CONFIG_JME is not set
811CONFIG_NETDEV_10000=y 820CONFIG_NETDEV_10000=y
812# CONFIG_CHELSIO_T1 is not set 821# CONFIG_CHELSIO_T1 is not set
813# CONFIG_CHELSIO_T3 is not set 822# CONFIG_CHELSIO_T3 is not set
814CONFIG_EHEA=y 823CONFIG_EHEA=y
824# CONFIG_ENIC is not set
815# CONFIG_IXGBE is not set 825# CONFIG_IXGBE is not set
816CONFIG_IXGB=m 826CONFIG_IXGB=m
817CONFIG_S2IO=m 827CONFIG_S2IO=m
818# CONFIG_MYRI10GE is not set 828# CONFIG_MYRI10GE is not set
819# CONFIG_NETXEN_NIC is not set 829# CONFIG_NETXEN_NIC is not set
820# CONFIG_NIU is not set 830# CONFIG_NIU is not set
831# CONFIG_MLX4_EN is not set
821# CONFIG_MLX4_CORE is not set 832# CONFIG_MLX4_CORE is not set
822# CONFIG_TEHUTI is not set 833# CONFIG_TEHUTI is not set
823# CONFIG_BNX2X is not set 834# CONFIG_BNX2X is not set
835# CONFIG_QLGE is not set
824# CONFIG_SFC is not set 836# CONFIG_SFC is not set
825CONFIG_TR=y 837CONFIG_TR=y
826CONFIG_IBMOL=y 838CONFIG_IBMOL=y
@@ -902,6 +914,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
902CONFIG_MOUSE_PS2_SYNAPTICS=y 914CONFIG_MOUSE_PS2_SYNAPTICS=y
903CONFIG_MOUSE_PS2_LIFEBOOK=y 915CONFIG_MOUSE_PS2_LIFEBOOK=y
904CONFIG_MOUSE_PS2_TRACKPOINT=y 916CONFIG_MOUSE_PS2_TRACKPOINT=y
917# CONFIG_MOUSE_PS2_ELANTECH is not set
905# CONFIG_MOUSE_PS2_TOUCHKIT is not set 918# CONFIG_MOUSE_PS2_TOUCHKIT is not set
906# CONFIG_MOUSE_SERIAL is not set 919# CONFIG_MOUSE_SERIAL is not set
907# CONFIG_MOUSE_APPLETOUCH is not set 920# CONFIG_MOUSE_APPLETOUCH is not set
@@ -917,6 +930,7 @@ CONFIG_INPUT_PCSPKR=m
917# CONFIG_INPUT_KEYSPAN_REMOTE is not set 930# CONFIG_INPUT_KEYSPAN_REMOTE is not set
918# CONFIG_INPUT_POWERMATE is not set 931# CONFIG_INPUT_POWERMATE is not set
919# CONFIG_INPUT_YEALINK is not set 932# CONFIG_INPUT_YEALINK is not set
933# CONFIG_INPUT_CM109 is not set
920# CONFIG_INPUT_UINPUT is not set 934# CONFIG_INPUT_UINPUT is not set
921 935
922# 936#
@@ -1076,6 +1090,17 @@ CONFIG_SSB_POSSIBLE=y
1076# CONFIG_MFD_SM501 is not set 1090# CONFIG_MFD_SM501 is not set
1077# CONFIG_HTC_PASIC3 is not set 1091# CONFIG_HTC_PASIC3 is not set
1078# CONFIG_MFD_TMIO is not set 1092# CONFIG_MFD_TMIO is not set
1093# CONFIG_PMIC_DA903X is not set
1094# CONFIG_MFD_WM8400 is not set
1095# CONFIG_MFD_WM8350_I2C is not set
1096
1097#
1098# Voltage and Current regulators
1099#
1100# CONFIG_REGULATOR is not set
1101# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1102# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1103# CONFIG_REGULATOR_BQ24022 is not set
1079 1104
1080# 1105#
1081# Multimedia devices 1106# Multimedia devices
@@ -1103,6 +1128,7 @@ CONFIG_SSB_POSSIBLE=y
1103CONFIG_FB=y 1128CONFIG_FB=y
1104CONFIG_FIRMWARE_EDID=y 1129CONFIG_FIRMWARE_EDID=y
1105CONFIG_FB_DDC=y 1130CONFIG_FB_DDC=y
1131# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1106CONFIG_FB_CFB_FILLRECT=y 1132CONFIG_FB_CFB_FILLRECT=y
1107CONFIG_FB_CFB_COPYAREA=y 1133CONFIG_FB_CFB_COPYAREA=y
1108CONFIG_FB_CFB_IMAGEBLIT=y 1134CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1146,6 +1172,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1146# CONFIG_FB_S3 is not set 1172# CONFIG_FB_S3 is not set
1147# CONFIG_FB_SAVAGE is not set 1173# CONFIG_FB_SAVAGE is not set
1148# CONFIG_FB_SIS is not set 1174# CONFIG_FB_SIS is not set
1175# CONFIG_FB_VIA is not set
1149# CONFIG_FB_NEOMAGIC is not set 1176# CONFIG_FB_NEOMAGIC is not set
1150# CONFIG_FB_KYRO is not set 1177# CONFIG_FB_KYRO is not set
1151# CONFIG_FB_3DFX is not set 1178# CONFIG_FB_3DFX is not set
@@ -1157,6 +1184,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1157# CONFIG_FB_CARMINE is not set 1184# CONFIG_FB_CARMINE is not set
1158CONFIG_FB_IBM_GXT4500=y 1185CONFIG_FB_IBM_GXT4500=y
1159# CONFIG_FB_VIRTUAL is not set 1186# CONFIG_FB_VIRTUAL is not set
1187# CONFIG_FB_METRONOME is not set
1160CONFIG_BACKLIGHT_LCD_SUPPORT=y 1188CONFIG_BACKLIGHT_LCD_SUPPORT=y
1161CONFIG_LCD_CLASS_DEVICE=m 1189CONFIG_LCD_CLASS_DEVICE=m
1162# CONFIG_LCD_ILI9320 is not set 1190# CONFIG_LCD_ILI9320 is not set
@@ -1198,9 +1226,36 @@ CONFIG_HID=y
1198# USB Input Devices 1226# USB Input Devices
1199# 1227#
1200CONFIG_USB_HID=y 1228CONFIG_USB_HID=y
1201# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1229# CONFIG_HID_PID is not set
1202# CONFIG_HID_FF is not set
1203CONFIG_USB_HIDDEV=y 1230CONFIG_USB_HIDDEV=y
1231
1232#
1233# Special HID drivers
1234#
1235CONFIG_HID_COMPAT=y
1236CONFIG_HID_A4TECH=y
1237CONFIG_HID_APPLE=y
1238CONFIG_HID_BELKIN=y
1239CONFIG_HID_BRIGHT=y
1240CONFIG_HID_CHERRY=y
1241CONFIG_HID_CHICONY=y
1242CONFIG_HID_CYPRESS=y
1243CONFIG_HID_DELL=y
1244CONFIG_HID_EZKEY=y
1245CONFIG_HID_GYRATION=y
1246CONFIG_HID_LOGITECH=y
1247# CONFIG_LOGITECH_FF is not set
1248# CONFIG_LOGIRUMBLEPAD2_FF is not set
1249CONFIG_HID_MICROSOFT=y
1250CONFIG_HID_MONTEREY=y
1251CONFIG_HID_PANTHERLORD=y
1252# CONFIG_PANTHERLORD_FF is not set
1253CONFIG_HID_PETALYNX=y
1254CONFIG_HID_SAMSUNG=y
1255CONFIG_HID_SONY=y
1256CONFIG_HID_SUNPLUS=y
1257# CONFIG_THRUSTMASTER_FF is not set
1258# CONFIG_ZEROPLUS_FF is not set
1204CONFIG_USB_SUPPORT=y 1259CONFIG_USB_SUPPORT=y
1205CONFIG_USB_ARCH_HAS_HCD=y 1260CONFIG_USB_ARCH_HAS_HCD=y
1206CONFIG_USB_ARCH_HAS_OHCI=y 1261CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1217,6 +1272,8 @@ CONFIG_USB_DEVICE_CLASS=y
1217# CONFIG_USB_DYNAMIC_MINORS is not set 1272# CONFIG_USB_DYNAMIC_MINORS is not set
1218# CONFIG_USB_OTG is not set 1273# CONFIG_USB_OTG is not set
1219CONFIG_USB_MON=y 1274CONFIG_USB_MON=y
1275# CONFIG_USB_WUSB is not set
1276# CONFIG_USB_WUSB_CBAF is not set
1220 1277
1221# 1278#
1222# USB Host Controller Drivers 1279# USB Host Controller Drivers
@@ -1236,6 +1293,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1236# CONFIG_USB_UHCI_HCD is not set 1293# CONFIG_USB_UHCI_HCD is not set
1237# CONFIG_USB_SL811_HCD is not set 1294# CONFIG_USB_SL811_HCD is not set
1238# CONFIG_USB_R8A66597_HCD is not set 1295# CONFIG_USB_R8A66597_HCD is not set
1296# CONFIG_USB_WHCI_HCD is not set
1297# CONFIG_USB_HWA_HCD is not set
1239 1298
1240# 1299#
1241# USB Device Class drivers 1300# USB Device Class drivers
@@ -1243,6 +1302,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1243# CONFIG_USB_ACM is not set 1302# CONFIG_USB_ACM is not set
1244# CONFIG_USB_PRINTER is not set 1303# CONFIG_USB_PRINTER is not set
1245# CONFIG_USB_WDM is not set 1304# CONFIG_USB_WDM is not set
1305# CONFIG_USB_TMC is not set
1246 1306
1247# 1307#
1248# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1308# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1264,7 +1324,6 @@ CONFIG_USB_STORAGE=y
1264# CONFIG_USB_STORAGE_ALAUDA is not set 1324# CONFIG_USB_STORAGE_ALAUDA is not set
1265CONFIG_USB_STORAGE_ONETOUCH=y 1325CONFIG_USB_STORAGE_ONETOUCH=y
1266# CONFIG_USB_STORAGE_KARMA is not set 1326# CONFIG_USB_STORAGE_KARMA is not set
1267# CONFIG_USB_STORAGE_SIERRA is not set
1268# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1327# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1269# CONFIG_USB_LIBUSUAL is not set 1328# CONFIG_USB_LIBUSUAL is not set
1270 1329
@@ -1286,6 +1345,7 @@ CONFIG_USB_STORAGE_ONETOUCH=y
1286# CONFIG_USB_EMI62 is not set 1345# CONFIG_USB_EMI62 is not set
1287# CONFIG_USB_EMI26 is not set 1346# CONFIG_USB_EMI26 is not set
1288# CONFIG_USB_ADUTUX is not set 1347# CONFIG_USB_ADUTUX is not set
1348# CONFIG_USB_SEVSEG is not set
1289# CONFIG_USB_RIO500 is not set 1349# CONFIG_USB_RIO500 is not set
1290# CONFIG_USB_LEGOTOWER is not set 1350# CONFIG_USB_LEGOTOWER is not set
1291# CONFIG_USB_LCD is not set 1351# CONFIG_USB_LCD is not set
@@ -1303,7 +1363,9 @@ CONFIG_USB_STORAGE_ONETOUCH=y
1303# CONFIG_USB_IOWARRIOR is not set 1363# CONFIG_USB_IOWARRIOR is not set
1304# CONFIG_USB_TEST is not set 1364# CONFIG_USB_TEST is not set
1305# CONFIG_USB_ISIGHTFW is not set 1365# CONFIG_USB_ISIGHTFW is not set
1366# CONFIG_USB_VST is not set
1306# CONFIG_USB_GADGET is not set 1367# CONFIG_USB_GADGET is not set
1368# CONFIG_UWB is not set
1307# CONFIG_MMC is not set 1369# CONFIG_MMC is not set
1308# CONFIG_MEMSTICK is not set 1370# CONFIG_MEMSTICK is not set
1309# CONFIG_NEW_LEDS is not set 1371# CONFIG_NEW_LEDS is not set
@@ -1331,6 +1393,7 @@ CONFIG_INFINIBAND_SRP=m
1331# CONFIG_DMADEVICES is not set 1393# CONFIG_DMADEVICES is not set
1332# CONFIG_AUXDISPLAY is not set 1394# CONFIG_AUXDISPLAY is not set
1333# CONFIG_UIO is not set 1395# CONFIG_UIO is not set
1396# CONFIG_STAGING is not set
1334 1397
1335# 1398#
1336# File systems 1399# File systems
@@ -1340,14 +1403,20 @@ CONFIG_EXT2_FS_XATTR=y
1340CONFIG_EXT2_FS_POSIX_ACL=y 1403CONFIG_EXT2_FS_POSIX_ACL=y
1341CONFIG_EXT2_FS_SECURITY=y 1404CONFIG_EXT2_FS_SECURITY=y
1342CONFIG_EXT2_FS_XIP=y 1405CONFIG_EXT2_FS_XIP=y
1343CONFIG_FS_XIP=y
1344CONFIG_EXT3_FS=y 1406CONFIG_EXT3_FS=y
1345CONFIG_EXT3_FS_XATTR=y 1407CONFIG_EXT3_FS_XATTR=y
1346CONFIG_EXT3_FS_POSIX_ACL=y 1408CONFIG_EXT3_FS_POSIX_ACL=y
1347CONFIG_EXT3_FS_SECURITY=y 1409CONFIG_EXT3_FS_SECURITY=y
1348# CONFIG_EXT4DEV_FS is not set 1410CONFIG_EXT4_FS=y
1411# CONFIG_EXT4DEV_COMPAT is not set
1412CONFIG_EXT4_FS_XATTR=y
1413CONFIG_EXT4_FS_POSIX_ACL=y
1414CONFIG_EXT4_FS_SECURITY=y
1415CONFIG_FS_XIP=y
1349CONFIG_JBD=y 1416CONFIG_JBD=y
1350# CONFIG_JBD_DEBUG is not set 1417# CONFIG_JBD_DEBUG is not set
1418CONFIG_JBD2=y
1419# CONFIG_JBD2_DEBUG is not set
1351CONFIG_FS_MBCACHE=y 1420CONFIG_FS_MBCACHE=y
1352CONFIG_REISERFS_FS=y 1421CONFIG_REISERFS_FS=y
1353# CONFIG_REISERFS_CHECK is not set 1422# CONFIG_REISERFS_CHECK is not set
@@ -1361,6 +1430,7 @@ CONFIG_JFS_SECURITY=y
1361# CONFIG_JFS_DEBUG is not set 1430# CONFIG_JFS_DEBUG is not set
1362# CONFIG_JFS_STATISTICS is not set 1431# CONFIG_JFS_STATISTICS is not set
1363CONFIG_FS_POSIX_ACL=y 1432CONFIG_FS_POSIX_ACL=y
1433CONFIG_FILE_LOCKING=y
1364CONFIG_XFS_FS=m 1434CONFIG_XFS_FS=m
1365# CONFIG_XFS_QUOTA is not set 1435# CONFIG_XFS_QUOTA is not set
1366CONFIG_XFS_POSIX_ACL=y 1436CONFIG_XFS_POSIX_ACL=y
@@ -1372,6 +1442,7 @@ CONFIG_OCFS2_FS_O2CB=m
1372CONFIG_OCFS2_FS_STATS=y 1442CONFIG_OCFS2_FS_STATS=y
1373CONFIG_OCFS2_DEBUG_MASKLOG=y 1443CONFIG_OCFS2_DEBUG_MASKLOG=y
1374# CONFIG_OCFS2_DEBUG_FS is not set 1444# CONFIG_OCFS2_DEBUG_FS is not set
1445# CONFIG_OCFS2_COMPAT_JBD is not set
1375CONFIG_DNOTIFY=y 1446CONFIG_DNOTIFY=y
1376CONFIG_INOTIFY=y 1447CONFIG_INOTIFY=y
1377CONFIG_INOTIFY_USER=y 1448CONFIG_INOTIFY_USER=y
@@ -1405,6 +1476,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1405CONFIG_PROC_FS=y 1476CONFIG_PROC_FS=y
1406CONFIG_PROC_KCORE=y 1477CONFIG_PROC_KCORE=y
1407CONFIG_PROC_SYSCTL=y 1478CONFIG_PROC_SYSCTL=y
1479CONFIG_PROC_PAGE_MONITOR=y
1408CONFIG_SYSFS=y 1480CONFIG_SYSFS=y
1409CONFIG_TMPFS=y 1481CONFIG_TMPFS=y
1410# CONFIG_TMPFS_POSIX_ACL is not set 1482# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1449,6 +1521,7 @@ CONFIG_NFS_COMMON=y
1449CONFIG_SUNRPC=y 1521CONFIG_SUNRPC=y
1450CONFIG_SUNRPC_GSS=y 1522CONFIG_SUNRPC_GSS=y
1451CONFIG_SUNRPC_XPRT_RDMA=m 1523CONFIG_SUNRPC_XPRT_RDMA=m
1524# CONFIG_SUNRPC_REGISTER_V4 is not set
1452CONFIG_RPCSEC_GSS_KRB5=y 1525CONFIG_RPCSEC_GSS_KRB5=y
1453CONFIG_RPCSEC_GSS_SPKM3=m 1526CONFIG_RPCSEC_GSS_SPKM3=m
1454# CONFIG_SMB_FS is not set 1527# CONFIG_SMB_FS is not set
@@ -1514,9 +1587,8 @@ CONFIG_NLS_ISO8859_1=y
1514# Library routines 1587# Library routines
1515# 1588#
1516CONFIG_BITREVERSE=y 1589CONFIG_BITREVERSE=y
1517# CONFIG_GENERIC_FIND_FIRST_BIT is not set
1518CONFIG_CRC_CCITT=m 1590CONFIG_CRC_CCITT=m
1519# CONFIG_CRC16 is not set 1591CONFIG_CRC16=y
1520CONFIG_CRC_T10DIF=y 1592CONFIG_CRC_T10DIF=y
1521CONFIG_CRC_ITU_T=m 1593CONFIG_CRC_ITU_T=m
1522CONFIG_CRC32=y 1594CONFIG_CRC32=y
@@ -1580,21 +1652,31 @@ CONFIG_DEBUG_MEMORY_INIT=y
1580CONFIG_FRAME_POINTER=y 1652CONFIG_FRAME_POINTER=y
1581# CONFIG_BOOT_PRINTK_DELAY is not set 1653# CONFIG_BOOT_PRINTK_DELAY is not set
1582# CONFIG_RCU_TORTURE_TEST is not set 1654# CONFIG_RCU_TORTURE_TEST is not set
1655# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1583# CONFIG_KPROBES_SANITY_TEST is not set 1656# CONFIG_KPROBES_SANITY_TEST is not set
1584# CONFIG_BACKTRACE_SELF_TEST is not set 1657# CONFIG_BACKTRACE_SELF_TEST is not set
1658# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1585# CONFIG_LKDTM is not set 1659# CONFIG_LKDTM is not set
1586# CONFIG_FAULT_INJECTION is not set 1660# CONFIG_FAULT_INJECTION is not set
1587CONFIG_LATENCYTOP=y 1661CONFIG_LATENCYTOP=y
1588CONFIG_SYSCTL_SYSCALL_CHECK=y 1662CONFIG_SYSCTL_SYSCALL_CHECK=y
1589CONFIG_HAVE_FTRACE=y 1663CONFIG_NOP_TRACER=y
1590CONFIG_HAVE_DYNAMIC_FTRACE=y 1664CONFIG_HAVE_FUNCTION_TRACER=y
1591CONFIG_TRACER_MAX_TRACE=y 1665CONFIG_TRACER_MAX_TRACE=y
1666CONFIG_RING_BUFFER=y
1592CONFIG_TRACING=y 1667CONFIG_TRACING=y
1593# CONFIG_FTRACE is not set 1668
1669#
1670# Tracers
1671#
1672CONFIG_FUNCTION_TRACER=y
1594CONFIG_IRQSOFF_TRACER=y 1673CONFIG_IRQSOFF_TRACER=y
1595CONFIG_SCHED_TRACER=y 1674CONFIG_SCHED_TRACER=y
1596CONFIG_CONTEXT_SWITCH_TRACER=y 1675CONFIG_CONTEXT_SWITCH_TRACER=y
1676# CONFIG_BOOT_TRACER is not set
1677CONFIG_STACK_TRACER=y
1597# CONFIG_FTRACE_STARTUP_TEST is not set 1678# CONFIG_FTRACE_STARTUP_TEST is not set
1679CONFIG_DYNAMIC_PRINTK_DEBUG=y
1598# CONFIG_SAMPLES is not set 1680# CONFIG_SAMPLES is not set
1599CONFIG_HAVE_ARCH_KGDB=y 1681CONFIG_HAVE_ARCH_KGDB=y
1600# CONFIG_KGDB is not set 1682# CONFIG_KGDB is not set
@@ -1604,6 +1686,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
1604CONFIG_HCALL_STATS=y 1686CONFIG_HCALL_STATS=y
1605# CONFIG_CODE_PATCHING_SELFTEST is not set 1687# CONFIG_CODE_PATCHING_SELFTEST is not set
1606# CONFIG_FTR_FIXUP_SELFTEST is not set 1688# CONFIG_FTR_FIXUP_SELFTEST is not set
1689# CONFIG_MSI_BITMAP_SELFTEST is not set
1607CONFIG_XMON=y 1690CONFIG_XMON=y
1608CONFIG_XMON_DEFAULT=y 1691CONFIG_XMON_DEFAULT=y
1609CONFIG_XMON_DISASSEMBLY=y 1692CONFIG_XMON_DISASSEMBLY=y
@@ -1618,16 +1701,19 @@ CONFIG_VIRQ_DEBUG=y
1618# 1701#
1619# CONFIG_KEYS is not set 1702# CONFIG_KEYS is not set
1620# CONFIG_SECURITY is not set 1703# CONFIG_SECURITY is not set
1704# CONFIG_SECURITYFS is not set
1621# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1705# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1622CONFIG_CRYPTO=y 1706CONFIG_CRYPTO=y
1623 1707
1624# 1708#
1625# Crypto core or helper 1709# Crypto core or helper
1626# 1710#
1711# CONFIG_CRYPTO_FIPS is not set
1627CONFIG_CRYPTO_ALGAPI=y 1712CONFIG_CRYPTO_ALGAPI=y
1628CONFIG_CRYPTO_AEAD=m 1713CONFIG_CRYPTO_AEAD=y
1629CONFIG_CRYPTO_BLKCIPHER=y 1714CONFIG_CRYPTO_BLKCIPHER=y
1630CONFIG_CRYPTO_HASH=y 1715CONFIG_CRYPTO_HASH=y
1716CONFIG_CRYPTO_RNG=y
1631CONFIG_CRYPTO_MANAGER=y 1717CONFIG_CRYPTO_MANAGER=y
1632CONFIG_CRYPTO_GF128MUL=m 1718CONFIG_CRYPTO_GF128MUL=m
1633CONFIG_CRYPTO_NULL=m 1719CONFIG_CRYPTO_NULL=m
@@ -1701,6 +1787,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
1701# 1787#
1702CONFIG_CRYPTO_DEFLATE=m 1788CONFIG_CRYPTO_DEFLATE=m
1703CONFIG_CRYPTO_LZO=m 1789CONFIG_CRYPTO_LZO=m
1790
1791#
1792# Random Number Generation
1793#
1794# CONFIG_CRYPTO_ANSI_CPRNG is not set
1704# CONFIG_CRYPTO_HW is not set 1795# CONFIG_CRYPTO_HW is not set
1705# CONFIG_PPC_CLOCK is not set 1796# CONFIG_PPC_CLOCK is not set
1706# CONFIG_VIRTUALIZATION is not set 1797# CONFIG_VIRTUALIZATION is not set