aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-08-30 02:51:51 -0400
committerPaul Mackerras <paulus@samba.org>2007-08-30 02:51:51 -0400
commit13a6976afdb10d54ac5ad344aa0c588bc0bd8b0a (patch)
tree379dde0aa5fca9bbf8df91d4f38abad6df6d79d5 /arch/powerpc/configs
parentada83daab31c3ec35845785482124373a62f430c (diff)
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/celleb_defconfig196
-rw-r--r--arch/powerpc/configs/chrp32_defconfig220
-rw-r--r--arch/powerpc/configs/ebony_defconfig190
-rw-r--r--arch/powerpc/configs/g5_defconfig208
-rw-r--r--arch/powerpc/configs/holly_defconfig203
-rw-r--r--arch/powerpc/configs/iseries_defconfig210
-rw-r--r--arch/powerpc/configs/maple_defconfig189
-rw-r--r--arch/powerpc/configs/pasemi_defconfig225
-rw-r--r--arch/powerpc/configs/pmac32_defconfig237
-rw-r--r--arch/powerpc/configs/ppc64_defconfig220
-rw-r--r--arch/powerpc/configs/pseries_defconfig205
11 files changed, 699 insertions, 1604 deletions
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index 0dc9874b46e3..b4ac498c3cce 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -1,9 +1,23 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 12:33:17 2007 4# Thu Aug 30 16:32:07 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y
13CONFIG_POWER4=y
14CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y
17CONFIG_PPC_MM_SLICES=y
18CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y
20CONFIG_NR_CPUS=4
7CONFIG_64BIT=y 21CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 23CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 29CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 30CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 31CONFIG_GENERIC_FIND_NEXT_BIT=y
32CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 33CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 34CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 35CONFIG_COMPAT=y
@@ -22,50 +37,32 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
25# CONFIG_PPC_UDBG_16550 is not set 41# CONFIG_PPC_UDBG_16550 is not set
26# CONFIG_GENERIC_TBSYNC is not set 42# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34# CONFIG_POWER4_ONLY is not set
35CONFIG_POWER3=y
36CONFIG_POWER4=y
37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
39# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO is not set
40CONFIG_PPC_OF_PLATFORM_PCI=y 48CONFIG_PPC_OF_PLATFORM_PCI=y
41CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_MM_SLICES=y
44CONFIG_VIRT_CPU_ACCOUNTING=y
45CONFIG_SMP=y
46CONFIG_NR_CPUS=4
47CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
48 50
49# 51#
50# Code maturity level options 52# General setup
51# 53#
52CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
53CONFIG_LOCK_KERNEL=y 55CONFIG_LOCK_KERNEL=y
54CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
55
56#
57# General setup
58#
59CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
60CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
61CONFIG_SWAP=y 59CONFIG_SWAP=y
62CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
65# CONFIG_POSIX_MQUEUE is not set 62# CONFIG_POSIX_MQUEUE is not set
66# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
67# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
68# CONFIG_UTS_NS is not set 65# CONFIG_USER_NS is not set
69# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
70CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
@@ -101,10 +98,6 @@ CONFIG_SLAB=y
101CONFIG_RT_MUTEXES=y 98CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 99# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 100CONFIG_BASE_SMALL=0
104
105#
106# Loadable module support
107#
108CONFIG_MODULES=y 101CONFIG_MODULES=y
109CONFIG_MODULE_UNLOAD=y 102CONFIG_MODULE_UNLOAD=y
110# CONFIG_MODULE_FORCE_UNLOAD is not set 103# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -112,12 +105,9 @@ CONFIG_MODVERSIONS=y
112CONFIG_MODULE_SRCVERSION_ALL=y 105CONFIG_MODULE_SRCVERSION_ALL=y
113CONFIG_KMOD=y 106CONFIG_KMOD=y
114CONFIG_STOP_MACHINE=y 107CONFIG_STOP_MACHINE=y
115
116#
117# Block layer
118#
119CONFIG_BLOCK=y 108CONFIG_BLOCK=y
120# CONFIG_BLK_DEV_IO_TRACE is not set 109# CONFIG_BLK_DEV_IO_TRACE is not set
110CONFIG_BLK_DEV_BSG=y
121 111
122# 112#
123# IO Schedulers 113# IO Schedulers
@@ -137,7 +127,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
137# 127#
138CONFIG_PPC_MULTIPLATFORM=y 128CONFIG_PPC_MULTIPLATFORM=y
139# CONFIG_EMBEDDED6xx is not set 129# CONFIG_EMBEDDED6xx is not set
140# CONFIG_APUS is not set 130# CONFIG_PPC_82xx is not set
131# CONFIG_PPC_83xx is not set
132# CONFIG_PPC_86xx is not set
141# CONFIG_PPC_PSERIES is not set 133# CONFIG_PPC_PSERIES is not set
142# CONFIG_PPC_ISERIES is not set 134# CONFIG_PPC_ISERIES is not set
143# CONFIG_PPC_MPC52xx is not set 135# CONFIG_PPC_MPC52xx is not set
@@ -171,6 +163,7 @@ CONFIG_PPC_UDBG_BEAT=y
171# CONFIG_GENERIC_IOMAP is not set 163# CONFIG_GENERIC_IOMAP is not set
172# CONFIG_CPU_FREQ is not set 164# CONFIG_CPU_FREQ is not set
173# CONFIG_CPM2 is not set 165# CONFIG_CPM2 is not set
166# CONFIG_FSL_ULI1575 is not set
174 167
175# 168#
176# Kernel options 169# Kernel options
@@ -212,6 +205,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
212CONFIG_MIGRATION=y 205CONFIG_MIGRATION=y
213CONFIG_RESOURCES_64BIT=y 206CONFIG_RESOURCES_64BIT=y
214CONFIG_ZONE_DMA_FLAG=1 207CONFIG_ZONE_DMA_FLAG=1
208CONFIG_BOUNCE=y
215CONFIG_ARCH_MEMORY_PROBE=y 209CONFIG_ARCH_MEMORY_PROBE=y
216CONFIG_NODES_SPAN_OTHER_NODES=y 210CONFIG_NODES_SPAN_OTHER_NODES=y
217CONFIG_PPC_HAS_HASH_64K=y 211CONFIG_PPC_HAS_HASH_64K=y
@@ -232,6 +226,7 @@ CONFIG_GENERIC_ISA_DMA=y
232# CONFIG_PPC_INDIRECT_PCI is not set 226# CONFIG_PPC_INDIRECT_PCI is not set
233CONFIG_PCI=y 227CONFIG_PCI=y
234CONFIG_PCI_DOMAINS=y 228CONFIG_PCI_DOMAINS=y
229CONFIG_PCI_SYSCALL=y
235# CONFIG_PCIEPORTBUS is not set 230# CONFIG_PCIEPORTBUS is not set
236CONFIG_ARCH_SUPPORTS_MSI=y 231CONFIG_ARCH_SUPPORTS_MSI=y
237# CONFIG_PCI_MSI is not set 232# CONFIG_PCI_MSI is not set
@@ -363,6 +358,7 @@ CONFIG_IP_NF_QUEUE=m
363# CONFIG_MAC80211 is not set 358# CONFIG_MAC80211 is not set
364# CONFIG_IEEE80211 is not set 359# CONFIG_IEEE80211 is not set
365# CONFIG_RFKILL is not set 360# CONFIG_RFKILL is not set
361# CONFIG_NET_9P is not set
366 362
367# 363#
368# Device Drivers 364# Device Drivers
@@ -377,28 +373,12 @@ CONFIG_FW_LOADER=y
377# CONFIG_DEBUG_DRIVER is not set 373# CONFIG_DEBUG_DRIVER is not set
378# CONFIG_DEBUG_DEVRES is not set 374# CONFIG_DEBUG_DEVRES is not set
379# CONFIG_SYS_HYPERVISOR is not set 375# CONFIG_SYS_HYPERVISOR is not set
380
381#
382# Connector - unified userspace <-> kernelspace linker
383#
384# CONFIG_CONNECTOR is not set 376# CONFIG_CONNECTOR is not set
385# CONFIG_MTD is not set 377# CONFIG_MTD is not set
386 378CONFIG_OF_DEVICE=y
387#
388# Parallel port support
389#
390# CONFIG_PARPORT is not set 379# CONFIG_PARPORT is not set
391 380CONFIG_BLK_DEV=y
392#
393# Plug and Play support
394#
395# CONFIG_PNPACPI is not set
396
397#
398# Block devices
399#
400# CONFIG_BLK_DEV_FD is not set 381# CONFIG_BLK_DEV_FD is not set
401# CONFIG_BLK_CPQ_DA is not set
402# CONFIG_BLK_CPQ_CISS_DA is not set 382# CONFIG_BLK_CPQ_CISS_DA is not set
403# CONFIG_BLK_DEV_DAC960 is not set 383# CONFIG_BLK_DEV_DAC960 is not set
404# CONFIG_BLK_DEV_UMEM is not set 384# CONFIG_BLK_DEV_UMEM is not set
@@ -414,14 +394,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
414CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 394CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
415# CONFIG_CDROM_PKTCDVD is not set 395# CONFIG_CDROM_PKTCDVD is not set
416# CONFIG_ATA_OVER_ETH is not set 396# CONFIG_ATA_OVER_ETH is not set
417 397CONFIG_MISC_DEVICES=y
418#
419# Misc devices
420#
421# CONFIG_PHANTOM is not set 398# CONFIG_PHANTOM is not set
399# CONFIG_EEPROM_93CX6 is not set
422# CONFIG_SGI_IOC4 is not set 400# CONFIG_SGI_IOC4 is not set
423# CONFIG_TIFM_CORE is not set 401# CONFIG_TIFM_CORE is not set
424# CONFIG_BLINK is not set
425CONFIG_IDE=y 402CONFIG_IDE=y
426CONFIG_BLK_DEV_IDE=y 403CONFIG_BLK_DEV_IDE=y
427 404
@@ -487,6 +464,7 @@ CONFIG_BLK_DEV_IDEDMA=y
487# 464#
488# CONFIG_RAID_ATTRS is not set 465# CONFIG_RAID_ATTRS is not set
489CONFIG_SCSI=m 466CONFIG_SCSI=m
467CONFIG_SCSI_DMA=y
490# CONFIG_SCSI_TGT is not set 468# CONFIG_SCSI_TGT is not set
491# CONFIG_SCSI_NETLINK is not set 469# CONFIG_SCSI_NETLINK is not set
492# CONFIG_SCSI_PROC_FS is not set 470# CONFIG_SCSI_PROC_FS is not set
@@ -519,10 +497,7 @@ CONFIG_SCSI_WAIT_SCAN=m
519# CONFIG_SCSI_ISCSI_ATTRS is not set 497# CONFIG_SCSI_ISCSI_ATTRS is not set
520# CONFIG_SCSI_SAS_ATTRS is not set 498# CONFIG_SCSI_SAS_ATTRS is not set
521# CONFIG_SCSI_SAS_LIBSAS is not set 499# CONFIG_SCSI_SAS_LIBSAS is not set
522 500CONFIG_SCSI_LOWLEVEL=y
523#
524# SCSI low-level drivers
525#
526# CONFIG_ISCSI_TCP is not set 501# CONFIG_ISCSI_TCP is not set
527# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 502# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
528# CONFIG_SCSI_3W_9XXX is not set 503# CONFIG_SCSI_3W_9XXX is not set
@@ -537,7 +512,6 @@ CONFIG_SCSI_WAIT_SCAN=m
537# CONFIG_MEGARAID_LEGACY is not set 512# CONFIG_MEGARAID_LEGACY is not set
538# CONFIG_MEGARAID_SAS is not set 513# CONFIG_MEGARAID_SAS is not set
539# CONFIG_SCSI_HPTIOP is not set 514# CONFIG_SCSI_HPTIOP is not set
540# CONFIG_SCSI_BUSLOGIC is not set
541# CONFIG_SCSI_DMX3191D is not set 515# CONFIG_SCSI_DMX3191D is not set
542# CONFIG_SCSI_EATA is not set 516# CONFIG_SCSI_EATA is not set
543# CONFIG_SCSI_FUTURE_DOMAIN is not set 517# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -556,10 +530,6 @@ CONFIG_SCSI_WAIT_SCAN=m
556# CONFIG_SCSI_DEBUG is not set 530# CONFIG_SCSI_DEBUG is not set
557# CONFIG_SCSI_SRP is not set 531# CONFIG_SCSI_SRP is not set
558# CONFIG_ATA is not set 532# CONFIG_ATA is not set
559
560#
561# Multi-device support (RAID and LVM)
562#
563CONFIG_MD=y 533CONFIG_MD=y
564CONFIG_BLK_DEV_MD=m 534CONFIG_BLK_DEV_MD=m
565CONFIG_MD_LINEAR=m 535CONFIG_MD_LINEAR=m
@@ -577,6 +547,7 @@ CONFIG_DM_MIRROR=m
577CONFIG_DM_ZERO=m 547CONFIG_DM_ZERO=m
578CONFIG_DM_MULTIPATH=m 548CONFIG_DM_MULTIPATH=m
579# CONFIG_DM_MULTIPATH_EMC is not set 549# CONFIG_DM_MULTIPATH_EMC is not set
550# CONFIG_DM_MULTIPATH_RDAC is not set
580# CONFIG_DM_DELAY is not set 551# CONFIG_DM_DELAY is not set
581 552
582# 553#
@@ -592,37 +563,23 @@ CONFIG_DM_MULTIPATH=m
592# 563#
593# CONFIG_FIREWIRE is not set 564# CONFIG_FIREWIRE is not set
594# CONFIG_IEEE1394 is not set 565# CONFIG_IEEE1394 is not set
595
596#
597# I2O device support
598#
599# CONFIG_I2O is not set 566# CONFIG_I2O is not set
600# CONFIG_MACINTOSH_DRIVERS is not set 567# CONFIG_MACINTOSH_DRIVERS is not set
601
602#
603# Network device support
604#
605CONFIG_NETDEVICES=y 568CONFIG_NETDEVICES=y
569# CONFIG_NETDEVICES_MULTIQUEUE is not set
606# CONFIG_DUMMY is not set 570# CONFIG_DUMMY is not set
607# CONFIG_BONDING is not set 571# CONFIG_BONDING is not set
572# CONFIG_MACVLAN is not set
608# CONFIG_EQUALIZER is not set 573# CONFIG_EQUALIZER is not set
609# CONFIG_TUN is not set 574# CONFIG_TUN is not set
610# CONFIG_ARCNET is not set 575# CONFIG_ARCNET is not set
611# CONFIG_PHYLIB is not set 576# CONFIG_PHYLIB is not set
612
613#
614# Ethernet (10 or 100Mbit)
615#
616CONFIG_NET_ETHERNET=y 577CONFIG_NET_ETHERNET=y
617CONFIG_MII=y 578CONFIG_MII=y
618# CONFIG_HAPPYMEAL is not set 579# CONFIG_HAPPYMEAL is not set
619# CONFIG_SUNGEM is not set 580# CONFIG_SUNGEM is not set
620# CONFIG_CASSINI is not set 581# CONFIG_CASSINI is not set
621# CONFIG_NET_VENDOR_3COM is not set 582# CONFIG_NET_VENDOR_3COM is not set
622
623#
624# Tulip family network device support
625#
626# CONFIG_NET_TULIP is not set 583# CONFIG_NET_TULIP is not set
627# CONFIG_HP100 is not set 584# CONFIG_HP100 is not set
628# CONFIG_NET_PCI is not set 585# CONFIG_NET_PCI is not set
@@ -637,7 +594,6 @@ CONFIG_NETDEV_1000=y
637# CONFIG_SIS190 is not set 594# CONFIG_SIS190 is not set
638# CONFIG_SKGE is not set 595# CONFIG_SKGE is not set
639# CONFIG_SKY2 is not set 596# CONFIG_SKY2 is not set
640# CONFIG_SK98LIN is not set
641# CONFIG_VIA_VELOCITY is not set 597# CONFIG_VIA_VELOCITY is not set
642# CONFIG_TIGON3 is not set 598# CONFIG_TIGON3 is not set
643# CONFIG_BNX2 is not set 599# CONFIG_BNX2 is not set
@@ -680,15 +636,7 @@ CONFIG_NETDEV_10000=y
680# CONFIG_NETCONSOLE is not set 636# CONFIG_NETCONSOLE is not set
681# CONFIG_NETPOLL is not set 637# CONFIG_NETPOLL is not set
682# CONFIG_NET_POLL_CONTROLLER is not set 638# CONFIG_NET_POLL_CONTROLLER is not set
683
684#
685# ISDN subsystem
686#
687# CONFIG_ISDN is not set 639# CONFIG_ISDN is not set
688
689#
690# Telephony Support
691#
692# CONFIG_PHONE is not set 640# CONFIG_PHONE is not set
693 641
694# 642#
@@ -775,10 +723,6 @@ CONFIG_UNIX98_PTYS=y
775# CONFIG_LEGACY_PTYS is not set 723# CONFIG_LEGACY_PTYS is not set
776CONFIG_HVC_DRIVER=y 724CONFIG_HVC_DRIVER=y
777CONFIG_HVC_BEAT=y 725CONFIG_HVC_BEAT=y
778
779#
780# IPMI
781#
782# CONFIG_IPMI_HANDLER is not set 726# CONFIG_IPMI_HANDLER is not set
783CONFIG_WATCHDOG=y 727CONFIG_WATCHDOG=y
784# CONFIG_WATCHDOG_NOWAYOUT is not set 728# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -807,10 +751,6 @@ CONFIG_GEN_RTC=y
807# CONFIG_DRM is not set 751# CONFIG_DRM is not set
808# CONFIG_RAW_DRIVER is not set 752# CONFIG_RAW_DRIVER is not set
809# CONFIG_HANGCHECK_TIMER is not set 753# CONFIG_HANGCHECK_TIMER is not set
810
811#
812# TPM devices
813#
814# CONFIG_TCG_TPM is not set 754# CONFIG_TCG_TPM is not set
815CONFIG_DEVPORT=y 755CONFIG_DEVPORT=y
816CONFIG_I2C=y 756CONFIG_I2C=y
@@ -844,6 +784,7 @@ CONFIG_I2C_ALGOBIT=y
844# CONFIG_I2C_SIS5595 is not set 784# CONFIG_I2C_SIS5595 is not set
845# CONFIG_I2C_SIS630 is not set 785# CONFIG_I2C_SIS630 is not set
846# CONFIG_I2C_SIS96X is not set 786# CONFIG_I2C_SIS96X is not set
787# CONFIG_I2C_TAOS_EVM is not set
847# CONFIG_I2C_STUB is not set 788# CONFIG_I2C_STUB is not set
848# CONFIG_I2C_TINY_USB is not set 789# CONFIG_I2C_TINY_USB is not set
849# CONFIG_I2C_VIA is not set 790# CONFIG_I2C_VIA is not set
@@ -855,11 +796,13 @@ CONFIG_I2C_ALGOBIT=y
855# 796#
856# CONFIG_SENSORS_DS1337 is not set 797# CONFIG_SENSORS_DS1337 is not set
857# CONFIG_SENSORS_DS1374 is not set 798# CONFIG_SENSORS_DS1374 is not set
799# CONFIG_DS1682 is not set
858# CONFIG_SENSORS_EEPROM is not set 800# CONFIG_SENSORS_EEPROM is not set
859# CONFIG_SENSORS_PCF8574 is not set 801# CONFIG_SENSORS_PCF8574 is not set
860# CONFIG_SENSORS_PCA9539 is not set 802# CONFIG_SENSORS_PCA9539 is not set
861# CONFIG_SENSORS_PCF8591 is not set 803# CONFIG_SENSORS_PCF8591 is not set
862# CONFIG_SENSORS_MAX6875 is not set 804# CONFIG_SENSORS_MAX6875 is not set
805# CONFIG_SENSORS_TSL2550 is not set
863# CONFIG_I2C_DEBUG_CORE is not set 806# CONFIG_I2C_DEBUG_CORE is not set
864# CONFIG_I2C_DEBUG_ALGO is not set 807# CONFIG_I2C_DEBUG_ALGO is not set
865# CONFIG_I2C_DEBUG_BUS is not set 808# CONFIG_I2C_DEBUG_BUS is not set
@@ -870,11 +813,8 @@ CONFIG_I2C_ALGOBIT=y
870# 813#
871# CONFIG_SPI is not set 814# CONFIG_SPI is not set
872# CONFIG_SPI_MASTER is not set 815# CONFIG_SPI_MASTER is not set
873
874#
875# Dallas's 1-wire bus
876#
877# CONFIG_W1 is not set 816# CONFIG_W1 is not set
817# CONFIG_POWER_SUPPLY is not set
878# CONFIG_HWMON is not set 818# CONFIG_HWMON is not set
879 819
880# 820#
@@ -899,6 +839,7 @@ CONFIG_I2C_ALGOBIT=y
899# 839#
900# CONFIG_DISPLAY_SUPPORT is not set 840# CONFIG_DISPLAY_SUPPORT is not set
901# CONFIG_VGASTATE is not set 841# CONFIG_VGASTATE is not set
842# CONFIG_VIDEO_OUTPUT_CONTROL is not set
902# CONFIG_FB is not set 843# CONFIG_FB is not set
903# CONFIG_FB_IBM_GXT4500 is not set 844# CONFIG_FB_IBM_GXT4500 is not set
904 845
@@ -912,10 +853,7 @@ CONFIG_DUMMY_CONSOLE=y
912# Sound 853# Sound
913# 854#
914# CONFIG_SOUND is not set 855# CONFIG_SOUND is not set
915 856CONFIG_HID_SUPPORT=y
916#
917# HID Devices
918#
919CONFIG_HID=y 857CONFIG_HID=y
920# CONFIG_HID_DEBUG is not set 858# CONFIG_HID_DEBUG is not set
921 859
@@ -926,10 +864,7 @@ CONFIG_USB_HID=y
926# CONFIG_USB_HIDINPUT_POWERBOOK is not set 864# CONFIG_USB_HIDINPUT_POWERBOOK is not set
927# CONFIG_HID_FF is not set 865# CONFIG_HID_FF is not set
928CONFIG_USB_HIDDEV=y 866CONFIG_USB_HIDDEV=y
929 867CONFIG_USB_SUPPORT=y
930#
931# USB support
932#
933CONFIG_USB_ARCH_HAS_HCD=y 868CONFIG_USB_ARCH_HAS_HCD=y
934CONFIG_USB_ARCH_HAS_OHCI=y 869CONFIG_USB_ARCH_HAS_OHCI=y
935CONFIG_USB_ARCH_HAS_EHCI=y 870CONFIG_USB_ARCH_HAS_EHCI=y
@@ -960,6 +895,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
960CONFIG_USB_OHCI_LITTLE_ENDIAN=y 895CONFIG_USB_OHCI_LITTLE_ENDIAN=y
961# CONFIG_USB_UHCI_HCD is not set 896# CONFIG_USB_UHCI_HCD is not set
962# CONFIG_USB_SL811_HCD is not set 897# CONFIG_USB_SL811_HCD is not set
898# CONFIG_USB_R8A66597_HCD is not set
963 899
964# 900#
965# USB Device Class drivers 901# USB Device Class drivers
@@ -1037,32 +973,9 @@ CONFIG_USB_MON=y
1037# 973#
1038# CONFIG_USB_GADGET is not set 974# CONFIG_USB_GADGET is not set
1039# CONFIG_MMC is not set 975# CONFIG_MMC is not set
1040
1041#
1042# LED devices
1043#
1044# CONFIG_NEW_LEDS is not set 976# CONFIG_NEW_LEDS is not set
1045
1046#
1047# LED drivers
1048#
1049
1050#
1051# LED Triggers
1052#
1053
1054#
1055# InfiniBand support
1056#
1057# CONFIG_INFINIBAND is not set 977# CONFIG_INFINIBAND is not set
1058 978# CONFIG_EDAC is not set
1059#
1060# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1061#
1062
1063#
1064# Real Time Clock
1065#
1066# CONFIG_RTC_CLASS is not set 979# CONFIG_RTC_CLASS is not set
1067 980
1068# 981#
@@ -1079,6 +992,11 @@ CONFIG_USB_MON=y
1079# 992#
1080 993
1081# 994#
995# Userspace I/O
996#
997# CONFIG_UIO is not set
998
999#
1082# File systems 1000# File systems
1083# 1001#
1084CONFIG_EXT2_FS=y 1002CONFIG_EXT2_FS=y
@@ -1189,7 +1107,6 @@ CONFIG_SUNRPC=m
1189# CONFIG_NCP_FS is not set 1107# CONFIG_NCP_FS is not set
1190# CONFIG_CODA_FS is not set 1108# CONFIG_CODA_FS is not set
1191# CONFIG_AFS_FS is not set 1109# CONFIG_AFS_FS is not set
1192# CONFIG_9P_FS is not set
1193 1110
1194# 1111#
1195# Partition Types 1112# Partition Types
@@ -1271,6 +1188,7 @@ CONFIG_BITREVERSE=y
1271# CONFIG_CRC16 is not set 1188# CONFIG_CRC16 is not set
1272# CONFIG_CRC_ITU_T is not set 1189# CONFIG_CRC_ITU_T is not set
1273CONFIG_CRC32=y 1190CONFIG_CRC32=y
1191# CONFIG_CRC7 is not set
1274CONFIG_LIBCRC32C=m 1192CONFIG_LIBCRC32C=m
1275CONFIG_ZLIB_INFLATE=m 1193CONFIG_ZLIB_INFLATE=m
1276CONFIG_ZLIB_DEFLATE=m 1194CONFIG_ZLIB_DEFLATE=m
@@ -1297,6 +1215,7 @@ CONFIG_DEBUG_FS=y
1297CONFIG_DEBUG_KERNEL=y 1215CONFIG_DEBUG_KERNEL=y
1298# CONFIG_DEBUG_SHIRQ is not set 1216# CONFIG_DEBUG_SHIRQ is not set
1299CONFIG_DETECT_SOFTLOCKUP=y 1217CONFIG_DETECT_SOFTLOCKUP=y
1218CONFIG_SCHED_DEBUG=y
1300# CONFIG_SCHEDSTATS is not set 1219# CONFIG_SCHEDSTATS is not set
1301# CONFIG_TIMER_STATS is not set 1220# CONFIG_TIMER_STATS is not set
1302# CONFIG_DEBUG_SLAB is not set 1221# CONFIG_DEBUG_SLAB is not set
@@ -1339,10 +1258,6 @@ CONFIG_PPC_EARLY_DEBUG_BEAT=y
1339# 1258#
1340# CONFIG_KEYS is not set 1259# CONFIG_KEYS is not set
1341# CONFIG_SECURITY is not set 1260# CONFIG_SECURITY is not set
1342
1343#
1344# Cryptographic options
1345#
1346CONFIG_CRYPTO=y 1261CONFIG_CRYPTO=y
1347CONFIG_CRYPTO_ALGAPI=y 1262CONFIG_CRYPTO_ALGAPI=y
1348CONFIG_CRYPTO_BLKCIPHER=m 1263CONFIG_CRYPTO_BLKCIPHER=m
@@ -1382,7 +1297,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1382CONFIG_CRYPTO_CRC32C=m 1297CONFIG_CRYPTO_CRC32C=m
1383# CONFIG_CRYPTO_CAMELLIA is not set 1298# CONFIG_CRYPTO_CAMELLIA is not set
1384CONFIG_CRYPTO_TEST=m 1299CONFIG_CRYPTO_TEST=m
1385 1300# CONFIG_CRYPTO_HW is not set
1386#
1387# Hardware crypto devices
1388#
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 7a747c438536..c3977e334b3b 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,9 +1,26 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 12:36:45 2007 4# Thu Aug 30 16:33:50 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y
18# CONFIG_ALTIVEC is not set
19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set
22CONFIG_SMP=y
23CONFIG_NR_CPUS=4
7CONFIG_PPC32=y 24CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 26CONFIG_MMU=y
@@ -14,62 +31,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_GENERIC_HWEIGHT=y 31CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 32CONFIG_GENERIC_CALIBRATE_DELAY=y
16CONFIG_GENERIC_FIND_NEXT_BIT=y 33CONFIG_GENERIC_FIND_NEXT_BIT=y
34# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
17CONFIG_PPC=y 35CONFIG_PPC=y
18CONFIG_EARLY_PRINTK=y 36CONFIG_EARLY_PRINTK=y
19CONFIG_GENERIC_NVRAM=y 37CONFIG_GENERIC_NVRAM=y
20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 38CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
21CONFIG_ARCH_MAY_HAVE_PC_FDC=y 39CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 40CONFIG_PPC_OF=y
41CONFIG_OF=y
23CONFIG_PPC_UDBG_16550=y 42CONFIG_PPC_UDBG_16550=y
24CONFIG_GENERIC_TBSYNC=y 43CONFIG_GENERIC_TBSYNC=y
25CONFIG_AUDIT_ARCH=y 44CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 45CONFIG_GENERIC_BUG=y
27# CONFIG_DEFAULT_UIMAGE is not set 46# CONFIG_DEFAULT_UIMAGE is not set
28
29#
30# Processor support
31#
32CONFIG_CLASSIC32=y
33# CONFIG_PPC_82xx is not set
34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
38# CONFIG_40x is not set
39# CONFIG_44x is not set
40# CONFIG_E200 is not set
41CONFIG_6xx=y
42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set 47# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set 48# CONFIG_PPC_DCR_MMIO is not set
45# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
49CONFIG_SMP=y
50CONFIG_NR_CPUS=4
51CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
52 50
53# 51#
54# Code maturity level options 52# General setup
55# 53#
56CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
57CONFIG_LOCK_KERNEL=y 55CONFIG_LOCK_KERNEL=y
58CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
59
60#
61# General setup
62#
63CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
64# CONFIG_LOCALVERSION_AUTO is not set 58# CONFIG_LOCALVERSION_AUTO is not set
65CONFIG_SWAP=y 59CONFIG_SWAP=y
66CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
67# CONFIG_IPC_NS is not set
68CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
69CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
70# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
71# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
72# CONFIG_UTS_NS is not set 65# CONFIG_USER_NS is not set
73# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
74CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
@@ -105,10 +98,6 @@ CONFIG_SLAB=y
105CONFIG_RT_MUTEXES=y 98CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 99# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 100CONFIG_BASE_SMALL=0
108
109#
110# Loadable module support
111#
112CONFIG_MODULES=y 101CONFIG_MODULES=y
113CONFIG_MODULE_UNLOAD=y 102CONFIG_MODULE_UNLOAD=y
114CONFIG_MODULE_FORCE_UNLOAD=y 103CONFIG_MODULE_FORCE_UNLOAD=y
@@ -116,14 +105,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y
116# CONFIG_MODULE_SRCVERSION_ALL is not set 105# CONFIG_MODULE_SRCVERSION_ALL is not set
117CONFIG_KMOD=y 106CONFIG_KMOD=y
118CONFIG_STOP_MACHINE=y 107CONFIG_STOP_MACHINE=y
119
120#
121# Block layer
122#
123CONFIG_BLOCK=y 108CONFIG_BLOCK=y
124CONFIG_LBD=y 109CONFIG_LBD=y
125# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_IO_TRACE is not set
126# CONFIG_LSF is not set 111# CONFIG_LSF is not set
112# CONFIG_BLK_DEV_BSG is not set
127 113
128# 114#
129# IO Schedulers 115# IO Schedulers
@@ -143,7 +129,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
143# 129#
144CONFIG_PPC_MULTIPLATFORM=y 130CONFIG_PPC_MULTIPLATFORM=y
145# CONFIG_EMBEDDED6xx is not set 131# CONFIG_EMBEDDED6xx is not set
146# CONFIG_APUS is not set 132# CONFIG_PPC_82xx is not set
133# CONFIG_PPC_83xx is not set
134# CONFIG_PPC_86xx is not set
135CONFIG_CLASSIC32=y
147CONFIG_PPC_CHRP=y 136CONFIG_PPC_CHRP=y
148# CONFIG_PPC_MPC52xx is not set 137# CONFIG_PPC_MPC52xx is not set
149# CONFIG_PPC_MPC5200 is not set 138# CONFIG_PPC_MPC5200 is not set
@@ -169,6 +158,7 @@ CONFIG_PPC_MPC106=y
169# CONFIG_CPU_FREQ is not set 158# CONFIG_CPU_FREQ is not set
170# CONFIG_TAU is not set 159# CONFIG_TAU is not set
171# CONFIG_CPM2 is not set 160# CONFIG_CPM2 is not set
161# CONFIG_FSL_ULI1575 is not set
172 162
173# 163#
174# Kernel options 164# Kernel options
@@ -200,6 +190,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
200CONFIG_SPLIT_PTLOCK_CPUS=4 190CONFIG_SPLIT_PTLOCK_CPUS=4
201# CONFIG_RESOURCES_64BIT is not set 191# CONFIG_RESOURCES_64BIT is not set
202CONFIG_ZONE_DMA_FLAG=1 192CONFIG_ZONE_DMA_FLAG=1
193CONFIG_BOUNCE=y
194CONFIG_VIRT_TO_BUS=y
203CONFIG_PROC_DEVICETREE=y 195CONFIG_PROC_DEVICETREE=y
204# CONFIG_CMDLINE_BOOL is not set 196# CONFIG_CMDLINE_BOOL is not set
205# CONFIG_PM is not set 197# CONFIG_PM is not set
@@ -214,9 +206,9 @@ CONFIG_ISA=y
214CONFIG_ZONE_DMA=y 206CONFIG_ZONE_DMA=y
215CONFIG_GENERIC_ISA_DMA=y 207CONFIG_GENERIC_ISA_DMA=y
216CONFIG_PPC_INDIRECT_PCI=y 208CONFIG_PPC_INDIRECT_PCI=y
217# CONFIG_PPC_INDIRECT_PCI_BE is not set
218CONFIG_PCI=y 209CONFIG_PCI=y
219CONFIG_PCI_DOMAINS=y 210CONFIG_PCI_DOMAINS=y
211CONFIG_PCI_SYSCALL=y
220# CONFIG_PCIEPORTBUS is not set 212# CONFIG_PCIEPORTBUS is not set
221CONFIG_ARCH_SUPPORTS_MSI=y 213CONFIG_ARCH_SUPPORTS_MSI=y
222# CONFIG_PCI_MSI is not set 214# CONFIG_PCI_MSI is not set
@@ -296,6 +288,7 @@ CONFIG_NF_CONNTRACK=m
296# CONFIG_NF_CONNTRACK_MARK is not set 288# CONFIG_NF_CONNTRACK_MARK is not set
297# CONFIG_NF_CONNTRACK_EVENTS is not set 289# CONFIG_NF_CONNTRACK_EVENTS is not set
298# CONFIG_NF_CT_PROTO_SCTP is not set 290# CONFIG_NF_CT_PROTO_SCTP is not set
291# CONFIG_NF_CT_PROTO_UDPLITE is not set
299# CONFIG_NF_CONNTRACK_AMANDA is not set 292# CONFIG_NF_CONNTRACK_AMANDA is not set
300CONFIG_NF_CONNTRACK_FTP=m 293CONFIG_NF_CONNTRACK_FTP=m
301# CONFIG_NF_CONNTRACK_H323 is not set 294# CONFIG_NF_CONNTRACK_H323 is not set
@@ -313,6 +306,7 @@ CONFIG_NETFILTER_XTABLES=m
313# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 306# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
314# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 307# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
315# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 308# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
309# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
316# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set 310# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
317# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 311# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
318# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 312# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -332,6 +326,7 @@ CONFIG_NETFILTER_XTABLES=m
332# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 326# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
333# CONFIG_NETFILTER_XT_MATCH_STRING is not set 327# CONFIG_NETFILTER_XT_MATCH_STRING is not set
334# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 328# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
329# CONFIG_NETFILTER_XT_MATCH_U32 is not set
335# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 330# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
336 331
337# 332#
@@ -407,6 +402,7 @@ CONFIG_NF_NAT_SIP=m
407# CONFIG_MAC80211 is not set 402# CONFIG_MAC80211 is not set
408# CONFIG_IEEE80211 is not set 403# CONFIG_IEEE80211 is not set
409# CONFIG_RFKILL is not set 404# CONFIG_RFKILL is not set
405# CONFIG_NET_9P is not set
410 406
411# 407#
412# Device Drivers 408# Device Drivers
@@ -421,27 +417,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
421# CONFIG_DEBUG_DRIVER is not set 417# CONFIG_DEBUG_DRIVER is not set
422# CONFIG_DEBUG_DEVRES is not set 418# CONFIG_DEBUG_DEVRES is not set
423# CONFIG_SYS_HYPERVISOR is not set 419# CONFIG_SYS_HYPERVISOR is not set
424
425#
426# Connector - unified userspace <-> kernelspace linker
427#
428# CONFIG_CONNECTOR is not set 420# CONFIG_CONNECTOR is not set
429# CONFIG_MTD is not set 421# CONFIG_MTD is not set
430 422CONFIG_OF_DEVICE=y
431#
432# Parallel port support
433#
434# CONFIG_PARPORT is not set 423# CONFIG_PARPORT is not set
435
436#
437# Plug and Play support
438#
439# CONFIG_PNP is not set 424# CONFIG_PNP is not set
440# CONFIG_PNPACPI is not set 425CONFIG_BLK_DEV=y
441
442#
443# Block devices
444#
445CONFIG_BLK_DEV_FD=y 426CONFIG_BLK_DEV_FD=y
446# CONFIG_BLK_DEV_XD is not set 427# CONFIG_BLK_DEV_XD is not set
447# CONFIG_BLK_CPQ_DA is not set 428# CONFIG_BLK_CPQ_DA is not set
@@ -460,14 +441,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
460CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 441CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
461# CONFIG_CDROM_PKTCDVD is not set 442# CONFIG_CDROM_PKTCDVD is not set
462# CONFIG_ATA_OVER_ETH is not set 443# CONFIG_ATA_OVER_ETH is not set
463 444CONFIG_MISC_DEVICES=y
464#
465# Misc devices
466#
467# CONFIG_PHANTOM is not set 445# CONFIG_PHANTOM is not set
446# CONFIG_EEPROM_93CX6 is not set
468# CONFIG_SGI_IOC4 is not set 447# CONFIG_SGI_IOC4 is not set
469# CONFIG_TIFM_CORE is not set 448# CONFIG_TIFM_CORE is not set
470# CONFIG_BLINK is not set
471CONFIG_IDE=y 449CONFIG_IDE=y
472CONFIG_BLK_DEV_IDE=y 450CONFIG_BLK_DEV_IDE=y
473 451
@@ -533,6 +511,7 @@ CONFIG_BLK_DEV_IDEDMA=y
533# 511#
534# CONFIG_RAID_ATTRS is not set 512# CONFIG_RAID_ATTRS is not set
535CONFIG_SCSI=y 513CONFIG_SCSI=y
514CONFIG_SCSI_DMA=y
536# CONFIG_SCSI_TGT is not set 515# CONFIG_SCSI_TGT is not set
537# CONFIG_SCSI_NETLINK is not set 516# CONFIG_SCSI_NETLINK is not set
538CONFIG_SCSI_PROC_FS=y 517CONFIG_SCSI_PROC_FS=y
@@ -563,12 +542,8 @@ CONFIG_SCSI_WAIT_SCAN=m
563CONFIG_SCSI_SPI_ATTRS=y 542CONFIG_SCSI_SPI_ATTRS=y
564# CONFIG_SCSI_FC_ATTRS is not set 543# CONFIG_SCSI_FC_ATTRS is not set
565# CONFIG_SCSI_ISCSI_ATTRS is not set 544# CONFIG_SCSI_ISCSI_ATTRS is not set
566# CONFIG_SCSI_SAS_ATTRS is not set
567# CONFIG_SCSI_SAS_LIBSAS is not set 545# CONFIG_SCSI_SAS_LIBSAS is not set
568 546CONFIG_SCSI_LOWLEVEL=y
569#
570# SCSI low-level drivers
571#
572# CONFIG_ISCSI_TCP is not set 547# CONFIG_ISCSI_TCP is not set
573# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 548# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
574# CONFIG_SCSI_3W_9XXX is not set 549# CONFIG_SCSI_3W_9XXX is not set
@@ -622,15 +597,6 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
622# CONFIG_SCSI_DEBUG is not set 597# CONFIG_SCSI_DEBUG is not set
623# CONFIG_SCSI_SRP is not set 598# CONFIG_SCSI_SRP is not set
624# CONFIG_ATA is not set 599# CONFIG_ATA is not set
625
626#
627# Old CD-ROM drivers (not SCSI, not IDE)
628#
629# CONFIG_CD_NO_IDESCSI is not set
630
631#
632# Multi-device support (RAID and LVM)
633#
634# CONFIG_MD is not set 600# CONFIG_MD is not set
635 601
636# 602#
@@ -646,27 +612,17 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
646# 612#
647# CONFIG_FIREWIRE is not set 613# CONFIG_FIREWIRE is not set
648# CONFIG_IEEE1394 is not set 614# CONFIG_IEEE1394 is not set
649
650#
651# I2O device support
652#
653# CONFIG_I2O is not set 615# CONFIG_I2O is not set
654# CONFIG_MACINTOSH_DRIVERS is not set 616# CONFIG_MACINTOSH_DRIVERS is not set
655
656#
657# Network device support
658#
659CONFIG_NETDEVICES=y 617CONFIG_NETDEVICES=y
618# CONFIG_NETDEVICES_MULTIQUEUE is not set
660# CONFIG_DUMMY is not set 619# CONFIG_DUMMY is not set
661# CONFIG_BONDING is not set 620# CONFIG_BONDING is not set
621# CONFIG_MACVLAN is not set
662# CONFIG_EQUALIZER is not set 622# CONFIG_EQUALIZER is not set
663# CONFIG_TUN is not set 623# CONFIG_TUN is not set
664# CONFIG_ARCNET is not set 624# CONFIG_ARCNET is not set
665# CONFIG_PHYLIB is not set 625# CONFIG_PHYLIB is not set
666
667#
668# Ethernet (10 or 100Mbit)
669#
670CONFIG_NET_ETHERNET=y 626CONFIG_NET_ETHERNET=y
671CONFIG_MII=y 627CONFIG_MII=y
672# CONFIG_HAPPYMEAL is not set 628# CONFIG_HAPPYMEAL is not set
@@ -676,10 +632,6 @@ CONFIG_MII=y
676# CONFIG_LANCE is not set 632# CONFIG_LANCE is not set
677# CONFIG_NET_VENDOR_SMC is not set 633# CONFIG_NET_VENDOR_SMC is not set
678# CONFIG_NET_VENDOR_RACAL is not set 634# CONFIG_NET_VENDOR_RACAL is not set
679
680#
681# Tulip family network device support
682#
683CONFIG_NET_TULIP=y 635CONFIG_NET_TULIP=y
684# CONFIG_DE2104X is not set 636# CONFIG_DE2104X is not set
685# CONFIG_TULIP is not set 637# CONFIG_TULIP is not set
@@ -732,7 +684,6 @@ CONFIG_NETDEV_1000=y
732# CONFIG_SIS190 is not set 684# CONFIG_SIS190 is not set
733# CONFIG_SKGE is not set 685# CONFIG_SKGE is not set
734# CONFIG_SKY2 is not set 686# CONFIG_SKY2 is not set
735# CONFIG_SK98LIN is not set
736# CONFIG_VIA_VELOCITY is not set 687# CONFIG_VIA_VELOCITY is not set
737# CONFIG_TIGON3 is not set 688# CONFIG_TIGON3 is not set
738# CONFIG_BNX2 is not set 689# CONFIG_BNX2 is not set
@@ -776,6 +727,7 @@ CONFIG_PPP_DEFLATE=m
776CONFIG_PPP_BSDCOMP=m 727CONFIG_PPP_BSDCOMP=m
777CONFIG_PPP_MPPE=m 728CONFIG_PPP_MPPE=m
778CONFIG_PPPOE=m 729CONFIG_PPPOE=m
730# CONFIG_PPPOL2TP is not set
779# CONFIG_SLIP is not set 731# CONFIG_SLIP is not set
780CONFIG_SLHC=m 732CONFIG_SLHC=m
781# CONFIG_NET_FC is not set 733# CONFIG_NET_FC is not set
@@ -783,15 +735,7 @@ CONFIG_SLHC=m
783# CONFIG_NETCONSOLE is not set 735# CONFIG_NETCONSOLE is not set
784# CONFIG_NETPOLL is not set 736# CONFIG_NETPOLL is not set
785# CONFIG_NET_POLL_CONTROLLER is not set 737# CONFIG_NET_POLL_CONTROLLER is not set
786
787#
788# ISDN subsystem
789#
790# CONFIG_ISDN is not set 738# CONFIG_ISDN is not set
791
792#
793# Telephony Support
794#
795# CONFIG_PHONE is not set 739# CONFIG_PHONE is not set
796 740
797# 741#
@@ -892,10 +836,6 @@ CONFIG_LEGACY_PTYS=y
892CONFIG_LEGACY_PTY_COUNT=256 836CONFIG_LEGACY_PTY_COUNT=256
893CONFIG_BRIQ_PANEL=m 837CONFIG_BRIQ_PANEL=m
894# CONFIG_HVC_RTAS is not set 838# CONFIG_HVC_RTAS is not set
895
896#
897# IPMI
898#
899# CONFIG_IPMI_HANDLER is not set 839# CONFIG_IPMI_HANDLER is not set
900# CONFIG_WATCHDOG is not set 840# CONFIG_WATCHDOG is not set
901# CONFIG_HW_RANDOM is not set 841# CONFIG_HW_RANDOM is not set
@@ -908,10 +848,6 @@ CONFIG_GEN_RTC=y
908# CONFIG_AGP is not set 848# CONFIG_AGP is not set
909# CONFIG_DRM is not set 849# CONFIG_DRM is not set
910# CONFIG_RAW_DRIVER is not set 850# CONFIG_RAW_DRIVER is not set
911
912#
913# TPM devices
914#
915# CONFIG_TCG_TPM is not set 851# CONFIG_TCG_TPM is not set
916CONFIG_DEVPORT=y 852CONFIG_DEVPORT=y
917CONFIG_I2C=y 853CONFIG_I2C=y
@@ -947,6 +883,7 @@ CONFIG_I2C_ALGOBIT=y
947# CONFIG_I2C_SIS5595 is not set 883# CONFIG_I2C_SIS5595 is not set
948# CONFIG_I2C_SIS630 is not set 884# CONFIG_I2C_SIS630 is not set
949# CONFIG_I2C_SIS96X is not set 885# CONFIG_I2C_SIS96X is not set
886# CONFIG_I2C_TAOS_EVM is not set
950# CONFIG_I2C_STUB is not set 887# CONFIG_I2C_STUB is not set
951# CONFIG_I2C_TINY_USB is not set 888# CONFIG_I2C_TINY_USB is not set
952# CONFIG_I2C_VIA is not set 889# CONFIG_I2C_VIA is not set
@@ -959,12 +896,14 @@ CONFIG_I2C_ALGOBIT=y
959# 896#
960# CONFIG_SENSORS_DS1337 is not set 897# CONFIG_SENSORS_DS1337 is not set
961# CONFIG_SENSORS_DS1374 is not set 898# CONFIG_SENSORS_DS1374 is not set
899# CONFIG_DS1682 is not set
962# CONFIG_SENSORS_EEPROM is not set 900# CONFIG_SENSORS_EEPROM is not set
963# CONFIG_SENSORS_PCF8574 is not set 901# CONFIG_SENSORS_PCF8574 is not set
964# CONFIG_SENSORS_PCA9539 is not set 902# CONFIG_SENSORS_PCA9539 is not set
965# CONFIG_SENSORS_PCF8591 is not set 903# CONFIG_SENSORS_PCF8591 is not set
966# CONFIG_SENSORS_M41T00 is not set 904# CONFIG_SENSORS_M41T00 is not set
967# CONFIG_SENSORS_MAX6875 is not set 905# CONFIG_SENSORS_MAX6875 is not set
906# CONFIG_SENSORS_TSL2550 is not set
968# CONFIG_I2C_DEBUG_CORE is not set 907# CONFIG_I2C_DEBUG_CORE is not set
969# CONFIG_I2C_DEBUG_ALGO is not set 908# CONFIG_I2C_DEBUG_ALGO is not set
970# CONFIG_I2C_DEBUG_BUS is not set 909# CONFIG_I2C_DEBUG_BUS is not set
@@ -975,11 +914,8 @@ CONFIG_I2C_ALGOBIT=y
975# 914#
976# CONFIG_SPI is not set 915# CONFIG_SPI is not set
977# CONFIG_SPI_MASTER is not set 916# CONFIG_SPI_MASTER is not set
978
979#
980# Dallas's 1-wire bus
981#
982# CONFIG_W1 is not set 917# CONFIG_W1 is not set
918# CONFIG_POWER_SUPPLY is not set
983# CONFIG_HWMON is not set 919# CONFIG_HWMON is not set
984 920
985# 921#
@@ -998,8 +934,8 @@ CONFIG_I2C_ALGOBIT=y
998# Graphics support 934# Graphics support
999# 935#
1000CONFIG_BACKLIGHT_LCD_SUPPORT=y 936CONFIG_BACKLIGHT_LCD_SUPPORT=y
1001CONFIG_BACKLIGHT_CLASS_DEVICE=y
1002CONFIG_LCD_CLASS_DEVICE=m 937CONFIG_LCD_CLASS_DEVICE=m
938CONFIG_BACKLIGHT_CLASS_DEVICE=y
1003 939
1004# 940#
1005# Display device support 941# Display device support
@@ -1010,6 +946,7 @@ CONFIG_DISPLAY_SUPPORT=m
1010# Display hardware drivers 946# Display hardware drivers
1011# 947#
1012# CONFIG_VGASTATE is not set 948# CONFIG_VGASTATE is not set
949# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1013CONFIG_FB=y 950CONFIG_FB=y
1014CONFIG_FIRMWARE_EDID=y 951CONFIG_FIRMWARE_EDID=y
1015CONFIG_FB_DDC=y 952CONFIG_FB_DDC=y
@@ -1080,6 +1017,7 @@ CONFIG_VGA_CONSOLE=y
1080# CONFIG_MDA_CONSOLE is not set 1017# CONFIG_MDA_CONSOLE is not set
1081CONFIG_DUMMY_CONSOLE=y 1018CONFIG_DUMMY_CONSOLE=y
1082CONFIG_FRAMEBUFFER_CONSOLE=y 1019CONFIG_FRAMEBUFFER_CONSOLE=y
1020# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1083# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1021# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1084# CONFIG_FONTS is not set 1022# CONFIG_FONTS is not set
1085CONFIG_FONT_8x8=y 1023CONFIG_FONT_8x8=y
@@ -1093,10 +1031,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
1093# Sound 1031# Sound
1094# 1032#
1095# CONFIG_SOUND is not set 1033# CONFIG_SOUND is not set
1096 1034CONFIG_HID_SUPPORT=y
1097#
1098# HID Devices
1099#
1100CONFIG_HID=y 1035CONFIG_HID=y
1101# CONFIG_HID_DEBUG is not set 1036# CONFIG_HID_DEBUG is not set
1102 1037
@@ -1107,10 +1042,7 @@ CONFIG_USB_HID=y
1107# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1042# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1108# CONFIG_HID_FF is not set 1043# CONFIG_HID_FF is not set
1109# CONFIG_USB_HIDDEV is not set 1044# CONFIG_USB_HIDDEV is not set
1110 1045CONFIG_USB_SUPPORT=y
1111#
1112# USB support
1113#
1114CONFIG_USB_ARCH_HAS_HCD=y 1046CONFIG_USB_ARCH_HAS_HCD=y
1115CONFIG_USB_ARCH_HAS_OHCI=y 1047CONFIG_USB_ARCH_HAS_OHCI=y
1116CONFIG_USB_ARCH_HAS_EHCI=y 1048CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1132,7 +1064,6 @@ CONFIG_USB_EHCI_HCD=m
1132# CONFIG_USB_EHCI_SPLIT_ISO is not set 1064# CONFIG_USB_EHCI_SPLIT_ISO is not set
1133# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1065# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1134# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1066# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1135# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1136# CONFIG_USB_ISP116X_HCD is not set 1067# CONFIG_USB_ISP116X_HCD is not set
1137CONFIG_USB_OHCI_HCD=y 1068CONFIG_USB_OHCI_HCD=y
1138# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1069# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1141,6 +1072,7 @@ CONFIG_USB_OHCI_HCD=y
1141CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1072CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1142CONFIG_USB_UHCI_HCD=y 1073CONFIG_USB_UHCI_HCD=y
1143# CONFIG_USB_SL811_HCD is not set 1074# CONFIG_USB_SL811_HCD is not set
1075# CONFIG_USB_R8A66597_HCD is not set
1144 1076
1145# 1077#
1146# USB Device Class drivers 1078# USB Device Class drivers
@@ -1219,32 +1151,9 @@ CONFIG_USB_MON=y
1219# 1151#
1220# CONFIG_USB_GADGET is not set 1152# CONFIG_USB_GADGET is not set
1221# CONFIG_MMC is not set 1153# CONFIG_MMC is not set
1222
1223#
1224# LED devices
1225#
1226# CONFIG_NEW_LEDS is not set 1154# CONFIG_NEW_LEDS is not set
1227
1228#
1229# LED drivers
1230#
1231
1232#
1233# LED Triggers
1234#
1235
1236#
1237# InfiniBand support
1238#
1239# CONFIG_INFINIBAND is not set 1155# CONFIG_INFINIBAND is not set
1240 1156# CONFIG_EDAC is not set
1241#
1242# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1243#
1244
1245#
1246# Real Time Clock
1247#
1248# CONFIG_RTC_CLASS is not set 1157# CONFIG_RTC_CLASS is not set
1249 1158
1250# 1159#
@@ -1261,6 +1170,11 @@ CONFIG_USB_MON=y
1261# 1170#
1262 1171
1263# 1172#
1173# Userspace I/O
1174#
1175# CONFIG_UIO is not set
1176
1177#
1264# File systems 1178# File systems
1265# 1179#
1266CONFIG_EXT2_FS=y 1180CONFIG_EXT2_FS=y
@@ -1348,7 +1262,6 @@ CONFIG_RAMFS=y
1348# CONFIG_NCP_FS is not set 1262# CONFIG_NCP_FS is not set
1349# CONFIG_CODA_FS is not set 1263# CONFIG_CODA_FS is not set
1350# CONFIG_AFS_FS is not set 1264# CONFIG_AFS_FS is not set
1351# CONFIG_9P_FS is not set
1352 1265
1353# 1266#
1354# Partition Types 1267# Partition Types
@@ -1430,6 +1343,7 @@ CONFIG_CRC_CCITT=m
1430# CONFIG_CRC16 is not set 1343# CONFIG_CRC16 is not set
1431# CONFIG_CRC_ITU_T is not set 1344# CONFIG_CRC_ITU_T is not set
1432CONFIG_CRC32=y 1345CONFIG_CRC32=y
1346# CONFIG_CRC7 is not set
1433# CONFIG_LIBCRC32C is not set 1347# CONFIG_LIBCRC32C is not set
1434CONFIG_ZLIB_INFLATE=m 1348CONFIG_ZLIB_INFLATE=m
1435CONFIG_ZLIB_DEFLATE=m 1349CONFIG_ZLIB_DEFLATE=m
@@ -1456,6 +1370,7 @@ CONFIG_MAGIC_SYSRQ=y
1456CONFIG_DEBUG_KERNEL=y 1370CONFIG_DEBUG_KERNEL=y
1457# CONFIG_DEBUG_SHIRQ is not set 1371# CONFIG_DEBUG_SHIRQ is not set
1458CONFIG_DETECT_SOFTLOCKUP=y 1372CONFIG_DETECT_SOFTLOCKUP=y
1373CONFIG_SCHED_DEBUG=y
1459# CONFIG_SCHEDSTATS is not set 1374# CONFIG_SCHEDSTATS is not set
1460# CONFIG_TIMER_STATS is not set 1375# CONFIG_TIMER_STATS is not set
1461# CONFIG_DEBUG_SLAB is not set 1376# CONFIG_DEBUG_SLAB is not set
@@ -1490,10 +1405,6 @@ CONFIG_XMON_DISASSEMBLY=y
1490# 1405#
1491# CONFIG_KEYS is not set 1406# CONFIG_KEYS is not set
1492# CONFIG_SECURITY is not set 1407# CONFIG_SECURITY is not set
1493
1494#
1495# Cryptographic options
1496#
1497CONFIG_CRYPTO=y 1408CONFIG_CRYPTO=y
1498CONFIG_CRYPTO_ALGAPI=m 1409CONFIG_CRYPTO_ALGAPI=m
1499CONFIG_CRYPTO_BLKCIPHER=m 1410CONFIG_CRYPTO_BLKCIPHER=m
@@ -1531,7 +1442,4 @@ CONFIG_CRYPTO_ARC4=m
1531# CONFIG_CRYPTO_CRC32C is not set 1442# CONFIG_CRYPTO_CRC32C is not set
1532# CONFIG_CRYPTO_CAMELLIA is not set 1443# CONFIG_CRYPTO_CAMELLIA is not set
1533# CONFIG_CRYPTO_TEST is not set 1444# CONFIG_CRYPTO_TEST is not set
1534 1445# CONFIG_CRYPTO_HW is not set
1535#
1536# Hardware crypto devices
1537#
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index 5762cddfc148..ebb8167608b8 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -1,9 +1,25 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 12:38:33 2007 4# Thu Aug 30 16:34:11 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11# CONFIG_6xx is not set
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15CONFIG_44x=y
16# CONFIG_E200 is not set
17CONFIG_4xx=y
18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y
21# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,39 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_GENERIC_HWEIGHT=y 30CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 31CONFIG_GENERIC_CALIBRATE_DELAY=y
16CONFIG_GENERIC_FIND_NEXT_BIT=y 32CONFIG_GENERIC_FIND_NEXT_BIT=y
33# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
17CONFIG_PPC=y 34CONFIG_PPC=y
18CONFIG_EARLY_PRINTK=y 35CONFIG_EARLY_PRINTK=y
19CONFIG_GENERIC_NVRAM=y 36CONFIG_GENERIC_NVRAM=y
20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
21CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 41# CONFIG_PPC_UDBG_16550 is not set
24# CONFIG_GENERIC_TBSYNC is not set 42# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
27# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
38# CONFIG_40x is not set
39CONFIG_44x=y
40# CONFIG_E200 is not set
41CONFIG_PPC_DCR_NATIVE=y 46CONFIG_PPC_DCR_NATIVE=y
42# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO is not set
43CONFIG_PPC_DCR=y 48CONFIG_PPC_DCR=y
44CONFIG_4xx=y
45CONFIG_BOOKE=y
46CONFIG_PTE_64BIT=y
47CONFIG_PHYS_64BIT=y
48# CONFIG_PPC_MM_SLICES is not set
49CONFIG_NOT_COHERENT_CACHE=y
50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 50
52# 51#
53# Code maturity level options 52# General setup
54# 53#
55CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 55CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 59CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
68CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
69# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 65# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
@@ -102,24 +96,17 @@ CONFIG_SLAB=y
102CONFIG_RT_MUTEXES=y 96CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 97# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 98CONFIG_BASE_SMALL=0
105
106#
107# Loadable module support
108#
109CONFIG_MODULES=y 99CONFIG_MODULES=y
110CONFIG_MODULE_UNLOAD=y 100CONFIG_MODULE_UNLOAD=y
111# CONFIG_MODULE_FORCE_UNLOAD is not set 101# CONFIG_MODULE_FORCE_UNLOAD is not set
112# CONFIG_MODVERSIONS is not set 102# CONFIG_MODVERSIONS is not set
113# CONFIG_MODULE_SRCVERSION_ALL is not set 103# CONFIG_MODULE_SRCVERSION_ALL is not set
114CONFIG_KMOD=y 104CONFIG_KMOD=y
115
116#
117# Block layer
118#
119CONFIG_BLOCK=y 105CONFIG_BLOCK=y
120CONFIG_LBD=y 106CONFIG_LBD=y
121# CONFIG_BLK_DEV_IO_TRACE is not set 107# CONFIG_BLK_DEV_IO_TRACE is not set
122# CONFIG_LSF is not set 108# CONFIG_LSF is not set
109# CONFIG_BLK_DEV_BSG is not set
123 110
124# 111#
125# IO Schedulers 112# IO Schedulers
@@ -155,6 +142,7 @@ CONFIG_440GP=y
155# CONFIG_GENERIC_IOMAP is not set 142# CONFIG_GENERIC_IOMAP is not set
156# CONFIG_CPU_FREQ is not set 143# CONFIG_CPU_FREQ is not set
157# CONFIG_CPM2 is not set 144# CONFIG_CPM2 is not set
145# CONFIG_FSL_ULI1575 is not set
158 146
159# 147#
160# Kernel options 148# Kernel options
@@ -184,6 +172,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
184CONFIG_SPLIT_PTLOCK_CPUS=4 172CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_RESOURCES_64BIT=y 173CONFIG_RESOURCES_64BIT=y
186CONFIG_ZONE_DMA_FLAG=1 174CONFIG_ZONE_DMA_FLAG=1
175CONFIG_BOUNCE=y
176CONFIG_VIRT_TO_BUS=y
187CONFIG_PROC_DEVICETREE=y 177CONFIG_PROC_DEVICETREE=y
188# CONFIG_CMDLINE_BOOL is not set 178# CONFIG_CMDLINE_BOOL is not set
189CONFIG_SECCOMP=y 179CONFIG_SECCOMP=y
@@ -196,9 +186,9 @@ CONFIG_ISA_DMA_API=y
196# 186#
197CONFIG_ZONE_DMA=y 187CONFIG_ZONE_DMA=y
198CONFIG_PPC_INDIRECT_PCI=y 188CONFIG_PPC_INDIRECT_PCI=y
199# CONFIG_PPC_INDIRECT_PCI_BE is not set
200CONFIG_PCI=y 189CONFIG_PCI=y
201CONFIG_PCI_DOMAINS=y 190CONFIG_PCI_DOMAINS=y
191CONFIG_PCI_SYSCALL=y
202# CONFIG_PCIEPORTBUS is not set 192# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y 193CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set 194# CONFIG_PCI_MSI is not set
@@ -306,6 +296,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
306# CONFIG_MAC80211 is not set 296# CONFIG_MAC80211 is not set
307# CONFIG_IEEE80211 is not set 297# CONFIG_IEEE80211 is not set
308# CONFIG_RFKILL is not set 298# CONFIG_RFKILL is not set
299# CONFIG_NET_9P is not set
309 300
310# 301#
311# Device Drivers 302# Device Drivers
@@ -320,27 +311,12 @@ CONFIG_FW_LOADER=y
320# CONFIG_DEBUG_DRIVER is not set 311# CONFIG_DEBUG_DRIVER is not set
321# CONFIG_DEBUG_DEVRES is not set 312# CONFIG_DEBUG_DEVRES is not set
322# CONFIG_SYS_HYPERVISOR is not set 313# CONFIG_SYS_HYPERVISOR is not set
323
324#
325# Connector - unified userspace <-> kernelspace linker
326#
327CONFIG_CONNECTOR=y 314CONFIG_CONNECTOR=y
328CONFIG_PROC_EVENTS=y 315CONFIG_PROC_EVENTS=y
329# CONFIG_MTD is not set 316# CONFIG_MTD is not set
330 317CONFIG_OF_DEVICE=y
331#
332# Parallel port support
333#
334# CONFIG_PARPORT is not set 318# CONFIG_PARPORT is not set
335 319CONFIG_BLK_DEV=y
336#
337# Plug and Play support
338#
339# CONFIG_PNPACPI is not set
340
341#
342# Block devices
343#
344# CONFIG_BLK_DEV_FD is not set 320# CONFIG_BLK_DEV_FD is not set
345# CONFIG_BLK_CPQ_DA is not set 321# CONFIG_BLK_CPQ_DA is not set
346# CONFIG_BLK_CPQ_CISS_DA is not set 322# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -356,14 +332,12 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
356CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 332CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
357# CONFIG_CDROM_PKTCDVD is not set 333# CONFIG_CDROM_PKTCDVD is not set
358# CONFIG_ATA_OVER_ETH is not set 334# CONFIG_ATA_OVER_ETH is not set
359 335# CONFIG_XILINX_SYSACE is not set
360# 336CONFIG_MISC_DEVICES=y
361# Misc devices
362#
363# CONFIG_PHANTOM is not set 337# CONFIG_PHANTOM is not set
338# CONFIG_EEPROM_93CX6 is not set
364# CONFIG_SGI_IOC4 is not set 339# CONFIG_SGI_IOC4 is not set
365# CONFIG_TIFM_CORE is not set 340# CONFIG_TIFM_CORE is not set
366# CONFIG_BLINK is not set
367# CONFIG_IDE is not set 341# CONFIG_IDE is not set
368 342
369# 343#
@@ -371,12 +345,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
371# 345#
372# CONFIG_RAID_ATTRS is not set 346# CONFIG_RAID_ATTRS is not set
373# CONFIG_SCSI is not set 347# CONFIG_SCSI is not set
348# CONFIG_SCSI_DMA is not set
374# CONFIG_SCSI_NETLINK is not set 349# CONFIG_SCSI_NETLINK is not set
375# CONFIG_ATA is not set 350# CONFIG_ATA is not set
376
377#
378# Multi-device support (RAID and LVM)
379#
380# CONFIG_MD is not set 351# CONFIG_MD is not set
381 352
382# 353#
@@ -389,35 +360,17 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
389# 360#
390# CONFIG_FIREWIRE is not set 361# CONFIG_FIREWIRE is not set
391# CONFIG_IEEE1394 is not set 362# CONFIG_IEEE1394 is not set
392
393#
394# I2O device support
395#
396# CONFIG_I2O is not set 363# CONFIG_I2O is not set
397# CONFIG_MACINTOSH_DRIVERS is not set 364# CONFIG_MACINTOSH_DRIVERS is not set
398
399#
400# Network device support
401#
402CONFIG_NETDEVICES=y 365CONFIG_NETDEVICES=y
366# CONFIG_NETDEVICES_MULTIQUEUE is not set
403# CONFIG_DUMMY is not set 367# CONFIG_DUMMY is not set
404# CONFIG_BONDING is not set 368# CONFIG_BONDING is not set
369# CONFIG_MACVLAN is not set
405# CONFIG_EQUALIZER is not set 370# CONFIG_EQUALIZER is not set
406# CONFIG_TUN is not set 371# CONFIG_TUN is not set
407# CONFIG_ARCNET is not set 372# CONFIG_ARCNET is not set
408
409#
410# Ethernet (10 or 100Mbit)
411#
412# CONFIG_NET_ETHERNET is not set 373# CONFIG_NET_ETHERNET is not set
413CONFIG_IBM_EMAC=y
414CONFIG_IBM_EMAC_RXB=128
415CONFIG_IBM_EMAC_TXB=64
416CONFIG_IBM_EMAC_POLL_WEIGHT=32
417CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
418CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
419# CONFIG_IBM_EMAC_DEBUG is not set
420CONFIG_IBM_EMAC_ZMII=y
421CONFIG_NETDEV_1000=y 374CONFIG_NETDEV_1000=y
422# CONFIG_ACENIC is not set 375# CONFIG_ACENIC is not set
423# CONFIG_DL2K is not set 376# CONFIG_DL2K is not set
@@ -429,7 +382,6 @@ CONFIG_NETDEV_1000=y
429# CONFIG_SIS190 is not set 382# CONFIG_SIS190 is not set
430# CONFIG_SKGE is not set 383# CONFIG_SKGE is not set
431# CONFIG_SKY2 is not set 384# CONFIG_SKY2 is not set
432# CONFIG_SK98LIN is not set
433# CONFIG_VIA_VELOCITY is not set 385# CONFIG_VIA_VELOCITY is not set
434# CONFIG_TIGON3 is not set 386# CONFIG_TIGON3 is not set
435# CONFIG_BNX2 is not set 387# CONFIG_BNX2 is not set
@@ -459,15 +411,7 @@ CONFIG_NETDEV_10000=y
459# CONFIG_NETCONSOLE is not set 411# CONFIG_NETCONSOLE is not set
460# CONFIG_NETPOLL is not set 412# CONFIG_NETPOLL is not set
461# CONFIG_NET_POLL_CONTROLLER is not set 413# CONFIG_NET_POLL_CONTROLLER is not set
462
463#
464# ISDN subsystem
465#
466# CONFIG_ISDN is not set 414# CONFIG_ISDN is not set
467
468#
469# Telephony Support
470#
471# CONFIG_PHONE is not set 415# CONFIG_PHONE is not set
472 416
473# 417#
@@ -512,10 +456,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
512CONFIG_UNIX98_PTYS=y 456CONFIG_UNIX98_PTYS=y
513CONFIG_LEGACY_PTYS=y 457CONFIG_LEGACY_PTYS=y
514CONFIG_LEGACY_PTY_COUNT=256 458CONFIG_LEGACY_PTY_COUNT=256
515
516#
517# IPMI
518#
519# CONFIG_IPMI_HANDLER is not set 459# CONFIG_IPMI_HANDLER is not set
520# CONFIG_WATCHDOG is not set 460# CONFIG_WATCHDOG is not set
521# CONFIG_HW_RANDOM is not set 461# CONFIG_HW_RANDOM is not set
@@ -526,10 +466,6 @@ CONFIG_LEGACY_PTY_COUNT=256
526# CONFIG_AGP is not set 466# CONFIG_AGP is not set
527# CONFIG_DRM is not set 467# CONFIG_DRM is not set
528# CONFIG_RAW_DRIVER is not set 468# CONFIG_RAW_DRIVER is not set
529
530#
531# TPM devices
532#
533# CONFIG_TCG_TPM is not set 469# CONFIG_TCG_TPM is not set
534CONFIG_DEVPORT=y 470CONFIG_DEVPORT=y
535# CONFIG_I2C is not set 471# CONFIG_I2C is not set
@@ -539,11 +475,8 @@ CONFIG_DEVPORT=y
539# 475#
540# CONFIG_SPI is not set 476# CONFIG_SPI is not set
541# CONFIG_SPI_MASTER is not set 477# CONFIG_SPI_MASTER is not set
542
543#
544# Dallas's 1-wire bus
545#
546# CONFIG_W1 is not set 478# CONFIG_W1 is not set
479# CONFIG_POWER_SUPPLY is not set
547# CONFIG_HWMON is not set 480# CONFIG_HWMON is not set
548 481
549# 482#
@@ -568,6 +501,7 @@ CONFIG_DEVPORT=y
568# 501#
569# CONFIG_DISPLAY_SUPPORT is not set 502# CONFIG_DISPLAY_SUPPORT is not set
570# CONFIG_VGASTATE is not set 503# CONFIG_VGASTATE is not set
504# CONFIG_VIDEO_OUTPUT_CONTROL is not set
571# CONFIG_FB is not set 505# CONFIG_FB is not set
572# CONFIG_FB_IBM_GXT4500 is not set 506# CONFIG_FB_IBM_GXT4500 is not set
573 507
@@ -575,10 +509,7 @@ CONFIG_DEVPORT=y
575# Sound 509# Sound
576# 510#
577# CONFIG_SOUND is not set 511# CONFIG_SOUND is not set
578 512CONFIG_USB_SUPPORT=y
579#
580# USB support
581#
582CONFIG_USB_ARCH_HAS_HCD=y 513CONFIG_USB_ARCH_HAS_HCD=y
583CONFIG_USB_ARCH_HAS_OHCI=y 514CONFIG_USB_ARCH_HAS_OHCI=y
584CONFIG_USB_ARCH_HAS_EHCI=y 515CONFIG_USB_ARCH_HAS_EHCI=y
@@ -593,32 +524,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
593# 524#
594# CONFIG_USB_GADGET is not set 525# CONFIG_USB_GADGET is not set
595# CONFIG_MMC is not set 526# CONFIG_MMC is not set
596
597#
598# LED devices
599#
600# CONFIG_NEW_LEDS is not set 527# CONFIG_NEW_LEDS is not set
601
602#
603# LED drivers
604#
605
606#
607# LED Triggers
608#
609
610#
611# InfiniBand support
612#
613# CONFIG_INFINIBAND is not set 528# CONFIG_INFINIBAND is not set
614 529# CONFIG_EDAC is not set
615#
616# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
617#
618
619#
620# Real Time Clock
621#
622# CONFIG_RTC_CLASS is not set 530# CONFIG_RTC_CLASS is not set
623 531
624# 532#
@@ -635,6 +543,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
635# 543#
636 544
637# 545#
546# Userspace I/O
547#
548# CONFIG_UIO is not set
549
550#
638# File systems 551# File systems
639# 552#
640CONFIG_EXT2_FS=y 553CONFIG_EXT2_FS=y
@@ -723,7 +636,6 @@ CONFIG_SUNRPC=y
723# CONFIG_NCP_FS is not set 636# CONFIG_NCP_FS is not set
724# CONFIG_CODA_FS is not set 637# CONFIG_CODA_FS is not set
725# CONFIG_AFS_FS is not set 638# CONFIG_AFS_FS is not set
726# CONFIG_9P_FS is not set
727 639
728# 640#
729# Partition Types 641# Partition Types
@@ -750,6 +662,7 @@ CONFIG_BITREVERSE=y
750# CONFIG_CRC16 is not set 662# CONFIG_CRC16 is not set
751# CONFIG_CRC_ITU_T is not set 663# CONFIG_CRC_ITU_T is not set
752CONFIG_CRC32=y 664CONFIG_CRC32=y
665# CONFIG_CRC7 is not set
753# CONFIG_LIBCRC32C is not set 666# CONFIG_LIBCRC32C is not set
754CONFIG_ZLIB_INFLATE=y 667CONFIG_ZLIB_INFLATE=y
755CONFIG_PLIST=y 668CONFIG_PLIST=y
@@ -774,6 +687,7 @@ CONFIG_MAGIC_SYSRQ=y
774CONFIG_DEBUG_KERNEL=y 687CONFIG_DEBUG_KERNEL=y
775# CONFIG_DEBUG_SHIRQ is not set 688# CONFIG_DEBUG_SHIRQ is not set
776CONFIG_DETECT_SOFTLOCKUP=y 689CONFIG_DETECT_SOFTLOCKUP=y
690CONFIG_SCHED_DEBUG=y
777# CONFIG_SCHEDSTATS is not set 691# CONFIG_SCHEDSTATS is not set
778# CONFIG_TIMER_STATS is not set 692# CONFIG_TIMER_STATS is not set
779# CONFIG_DEBUG_SLAB is not set 693# CONFIG_DEBUG_SLAB is not set
@@ -796,7 +710,6 @@ CONFIG_FORCED_INLINING=y
796# CONFIG_DEBUG_PAGEALLOC is not set 710# CONFIG_DEBUG_PAGEALLOC is not set
797# CONFIG_DEBUGGER is not set 711# CONFIG_DEBUGGER is not set
798# CONFIG_BDI_SWITCH is not set 712# CONFIG_BDI_SWITCH is not set
799# CONFIG_BOOTX_TEXT is not set
800# CONFIG_PPC_EARLY_DEBUG is not set 713# CONFIG_PPC_EARLY_DEBUG is not set
801 714
802# 715#
@@ -804,10 +717,6 @@ CONFIG_FORCED_INLINING=y
804# 717#
805# CONFIG_KEYS is not set 718# CONFIG_KEYS is not set
806# CONFIG_SECURITY is not set 719# CONFIG_SECURITY is not set
807
808#
809# Cryptographic options
810#
811CONFIG_CRYPTO=y 720CONFIG_CRYPTO=y
812CONFIG_CRYPTO_ALGAPI=y 721CONFIG_CRYPTO_ALGAPI=y
813CONFIG_CRYPTO_BLKCIPHER=y 722CONFIG_CRYPTO_BLKCIPHER=y
@@ -845,7 +754,4 @@ CONFIG_CRYPTO_DES=y
845# CONFIG_CRYPTO_CRC32C is not set 754# CONFIG_CRYPTO_CRC32C is not set
846# CONFIG_CRYPTO_CAMELLIA is not set 755# CONFIG_CRYPTO_CAMELLIA is not set
847# CONFIG_CRYPTO_TEST is not set 756# CONFIG_CRYPTO_TEST is not set
848 757# CONFIG_CRYPTO_HW is not set
849#
850# Hardware crypto devices
851#
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index a217f4ebcf71..a655d87b3f8b 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,9 +1,22 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 12:38:34 2007 4# Thu Aug 30 16:34:59 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11CONFIG_POWER4_ONLY=y
12CONFIG_POWER4=y
13CONFIG_PPC_FPU=y
14CONFIG_ALTIVEC=y
15CONFIG_PPC_STD_MMU=y
16CONFIG_PPC_MM_SLICES=y
17CONFIG_VIRT_CPU_ACCOUNTING=y
18CONFIG_SMP=y
19CONFIG_NR_CPUS=4
7CONFIG_64BIT=y 20CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 21CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 22CONFIG_MMU=y
@@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 28CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 29CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 30CONFIG_GENERIC_FIND_NEXT_BIT=y
31CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 32CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 33CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 34CONFIG_COMPAT=y
@@ -22,50 +36,33 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 36CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 37CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 38CONFIG_PPC_OF=y
39CONFIG_OF=y
25# CONFIG_PPC_UDBG_16550 is not set 40# CONFIG_PPC_UDBG_16550 is not set
26CONFIG_GENERIC_TBSYNC=y 41CONFIG_GENERIC_TBSYNC=y
27CONFIG_AUDIT_ARCH=y 42CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 43CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 44# CONFIG_DEFAULT_UIMAGE is not set
30CONFIG_PPC64_SWSUSP=y 45CONFIG_PPC64_SWSUSP=y
31
32#
33# Processor support
34#
35CONFIG_POWER4_ONLY=y
36CONFIG_POWER4=y
37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
39# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO is not set
40# CONFIG_PPC_OF_PLATFORM_PCI is not set 48# CONFIG_PPC_OF_PLATFORM_PCI is not set
41CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_MM_SLICES=y
44CONFIG_VIRT_CPU_ACCOUNTING=y
45CONFIG_SMP=y
46CONFIG_NR_CPUS=4
47CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
48 50
49# 51#
50# Code maturity level options 52# General setup
51# 53#
52CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
53CONFIG_LOCK_KERNEL=y 55CONFIG_LOCK_KERNEL=y
54CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
55
56#
57# General setup
58#
59CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
60CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
61CONFIG_SWAP=y 59CONFIG_SWAP=y
62CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
65CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
66# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
67# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
68# CONFIG_UTS_NS is not set 65# CONFIG_USER_NS is not set
69# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
70CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
@@ -101,10 +98,6 @@ CONFIG_SLAB=y
101CONFIG_RT_MUTEXES=y 98CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 99# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 100CONFIG_BASE_SMALL=0
104
105#
106# Loadable module support
107#
108CONFIG_MODULES=y 101CONFIG_MODULES=y
109CONFIG_MODULE_UNLOAD=y 102CONFIG_MODULE_UNLOAD=y
110# CONFIG_MODULE_FORCE_UNLOAD is not set 103# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -112,12 +105,9 @@ CONFIG_MODVERSIONS=y
112CONFIG_MODULE_SRCVERSION_ALL=y 105CONFIG_MODULE_SRCVERSION_ALL=y
113CONFIG_KMOD=y 106CONFIG_KMOD=y
114CONFIG_STOP_MACHINE=y 107CONFIG_STOP_MACHINE=y
115
116#
117# Block layer
118#
119CONFIG_BLOCK=y 108CONFIG_BLOCK=y
120# CONFIG_BLK_DEV_IO_TRACE is not set 109# CONFIG_BLK_DEV_IO_TRACE is not set
110CONFIG_BLK_DEV_BSG=y
121 111
122# 112#
123# IO Schedulers 113# IO Schedulers
@@ -137,7 +127,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
137# 127#
138CONFIG_PPC_MULTIPLATFORM=y 128CONFIG_PPC_MULTIPLATFORM=y
139# CONFIG_EMBEDDED6xx is not set 129# CONFIG_EMBEDDED6xx is not set
140# CONFIG_APUS is not set 130# CONFIG_PPC_82xx is not set
131# CONFIG_PPC_83xx is not set
132# CONFIG_PPC_86xx is not set
141# CONFIG_PPC_PSERIES is not set 133# CONFIG_PPC_PSERIES is not set
142# CONFIG_PPC_ISERIES is not set 134# CONFIG_PPC_ISERIES is not set
143# CONFIG_PPC_MPC52xx is not set 135# CONFIG_PPC_MPC52xx is not set
@@ -182,6 +174,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
182# 174#
183CONFIG_CPU_FREQ_PMAC64=y 175CONFIG_CPU_FREQ_PMAC64=y
184# CONFIG_CPM2 is not set 176# CONFIG_CPM2 is not set
177# CONFIG_FSL_ULI1575 is not set
185 178
186# 179#
187# Kernel options 180# Kernel options
@@ -219,12 +212,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_SPLIT_PTLOCK_CPUS=4 212CONFIG_SPLIT_PTLOCK_CPUS=4
220CONFIG_RESOURCES_64BIT=y 213CONFIG_RESOURCES_64BIT=y
221CONFIG_ZONE_DMA_FLAG=1 214CONFIG_ZONE_DMA_FLAG=1
215CONFIG_BOUNCE=y
222# CONFIG_PPC_HAS_HASH_64K is not set 216# CONFIG_PPC_HAS_HASH_64K is not set
223# CONFIG_PPC_64K_PAGES is not set 217# CONFIG_PPC_64K_PAGES is not set
224# CONFIG_SCHED_SMT is not set 218# CONFIG_SCHED_SMT is not set
225CONFIG_PROC_DEVICETREE=y 219CONFIG_PROC_DEVICETREE=y
226# CONFIG_CMDLINE_BOOL is not set 220# CONFIG_CMDLINE_BOOL is not set
227# CONFIG_PM is not set 221# CONFIG_PM is not set
222CONFIG_SUSPEND_SMP_POSSIBLE=y
228CONFIG_SECCOMP=y 223CONFIG_SECCOMP=y
229# CONFIG_WANT_DEVICE_TREE is not set 224# CONFIG_WANT_DEVICE_TREE is not set
230CONFIG_ISA_DMA_API=y 225CONFIG_ISA_DMA_API=y
@@ -237,6 +232,7 @@ CONFIG_GENERIC_ISA_DMA=y
237# CONFIG_PPC_INDIRECT_PCI is not set 232# CONFIG_PPC_INDIRECT_PCI is not set
238CONFIG_PCI=y 233CONFIG_PCI=y
239CONFIG_PCI_DOMAINS=y 234CONFIG_PCI_DOMAINS=y
235CONFIG_PCI_SYSCALL=y
240# CONFIG_PCIEPORTBUS is not set 236# CONFIG_PCIEPORTBUS is not set
241CONFIG_ARCH_SUPPORTS_MSI=y 237CONFIG_ARCH_SUPPORTS_MSI=y
242CONFIG_PCI_MSI=y 238CONFIG_PCI_MSI=y
@@ -308,6 +304,7 @@ CONFIG_NF_CONNTRACK=m
308CONFIG_NF_CONNTRACK_MARK=y 304CONFIG_NF_CONNTRACK_MARK=y
309CONFIG_NF_CONNTRACK_EVENTS=y 305CONFIG_NF_CONNTRACK_EVENTS=y
310# CONFIG_NF_CT_PROTO_SCTP is not set 306# CONFIG_NF_CT_PROTO_SCTP is not set
307# CONFIG_NF_CT_PROTO_UDPLITE is not set
311# CONFIG_NF_CONNTRACK_AMANDA is not set 308# CONFIG_NF_CONNTRACK_AMANDA is not set
312CONFIG_NF_CONNTRACK_FTP=m 309CONFIG_NF_CONNTRACK_FTP=m
313# CONFIG_NF_CONNTRACK_H323 is not set 310# CONFIG_NF_CONNTRACK_H323 is not set
@@ -365,6 +362,7 @@ CONFIG_LLC=y
365# CONFIG_MAC80211 is not set 362# CONFIG_MAC80211 is not set
366# CONFIG_IEEE80211 is not set 363# CONFIG_IEEE80211 is not set
367# CONFIG_RFKILL is not set 364# CONFIG_RFKILL is not set
365# CONFIG_NET_9P is not set
368 366
369# 367#
370# Device Drivers 368# Device Drivers
@@ -379,28 +377,12 @@ CONFIG_FW_LOADER=y
379# CONFIG_DEBUG_DRIVER is not set 377# CONFIG_DEBUG_DRIVER is not set
380# CONFIG_DEBUG_DEVRES is not set 378# CONFIG_DEBUG_DEVRES is not set
381# CONFIG_SYS_HYPERVISOR is not set 379# CONFIG_SYS_HYPERVISOR is not set
382
383#
384# Connector - unified userspace <-> kernelspace linker
385#
386# CONFIG_CONNECTOR is not set 380# CONFIG_CONNECTOR is not set
387# CONFIG_MTD is not set 381# CONFIG_MTD is not set
388 382CONFIG_OF_DEVICE=y
389#
390# Parallel port support
391#
392# CONFIG_PARPORT is not set 383# CONFIG_PARPORT is not set
393 384CONFIG_BLK_DEV=y
394#
395# Plug and Play support
396#
397# CONFIG_PNPACPI is not set
398
399#
400# Block devices
401#
402# CONFIG_BLK_DEV_FD is not set 385# CONFIG_BLK_DEV_FD is not set
403# CONFIG_BLK_CPQ_DA is not set
404# CONFIG_BLK_CPQ_CISS_DA is not set 386# CONFIG_BLK_CPQ_CISS_DA is not set
405# CONFIG_BLK_DEV_DAC960 is not set 387# CONFIG_BLK_DEV_DAC960 is not set
406# CONFIG_BLK_DEV_UMEM is not set 388# CONFIG_BLK_DEV_UMEM is not set
@@ -418,14 +400,11 @@ CONFIG_CDROM_PKTCDVD=m
418CONFIG_CDROM_PKTCDVD_BUFFERS=8 400CONFIG_CDROM_PKTCDVD_BUFFERS=8
419# CONFIG_CDROM_PKTCDVD_WCACHE is not set 401# CONFIG_CDROM_PKTCDVD_WCACHE is not set
420# CONFIG_ATA_OVER_ETH is not set 402# CONFIG_ATA_OVER_ETH is not set
421 403CONFIG_MISC_DEVICES=y
422#
423# Misc devices
424#
425# CONFIG_PHANTOM is not set 404# CONFIG_PHANTOM is not set
405# CONFIG_EEPROM_93CX6 is not set
426# CONFIG_SGI_IOC4 is not set 406# CONFIG_SGI_IOC4 is not set
427# CONFIG_TIFM_CORE is not set 407# CONFIG_TIFM_CORE is not set
428# CONFIG_BLINK is not set
429CONFIG_IDE=y 408CONFIG_IDE=y
430CONFIG_BLK_DEV_IDE=y 409CONFIG_BLK_DEV_IDE=y
431 410
@@ -493,6 +472,7 @@ CONFIG_BLK_DEV_IDEDMA=y
493# 472#
494# CONFIG_RAID_ATTRS is not set 473# CONFIG_RAID_ATTRS is not set
495CONFIG_SCSI=y 474CONFIG_SCSI=y
475CONFIG_SCSI_DMA=y
496# CONFIG_SCSI_TGT is not set 476# CONFIG_SCSI_TGT is not set
497# CONFIG_SCSI_NETLINK is not set 477# CONFIG_SCSI_NETLINK is not set
498CONFIG_SCSI_PROC_FS=y 478CONFIG_SCSI_PROC_FS=y
@@ -525,10 +505,7 @@ CONFIG_SCSI_SPI_ATTRS=y
525# CONFIG_SCSI_ISCSI_ATTRS is not set 505# CONFIG_SCSI_ISCSI_ATTRS is not set
526# CONFIG_SCSI_SAS_ATTRS is not set 506# CONFIG_SCSI_SAS_ATTRS is not set
527# CONFIG_SCSI_SAS_LIBSAS is not set 507# CONFIG_SCSI_SAS_LIBSAS is not set
528 508CONFIG_SCSI_LOWLEVEL=y
529#
530# SCSI low-level drivers
531#
532# CONFIG_ISCSI_TCP is not set 509# CONFIG_ISCSI_TCP is not set
533# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 510# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
534# CONFIG_SCSI_3W_9XXX is not set 511# CONFIG_SCSI_3W_9XXX is not set
@@ -543,7 +520,6 @@ CONFIG_SCSI_SPI_ATTRS=y
543# CONFIG_MEGARAID_LEGACY is not set 520# CONFIG_MEGARAID_LEGACY is not set
544# CONFIG_MEGARAID_SAS is not set 521# CONFIG_MEGARAID_SAS is not set
545# CONFIG_SCSI_HPTIOP is not set 522# CONFIG_SCSI_HPTIOP is not set
546# CONFIG_SCSI_BUSLOGIC is not set
547# CONFIG_SCSI_DMX3191D is not set 523# CONFIG_SCSI_DMX3191D is not set
548# CONFIG_SCSI_EATA is not set 524# CONFIG_SCSI_EATA is not set
549# CONFIG_SCSI_FUTURE_DOMAIN is not set 525# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -616,10 +592,6 @@ CONFIG_SATA_SVW=y
616# CONFIG_PATA_SIS is not set 592# CONFIG_PATA_SIS is not set
617# CONFIG_PATA_VIA is not set 593# CONFIG_PATA_VIA is not set
618# CONFIG_PATA_WINBOND is not set 594# CONFIG_PATA_WINBOND is not set
619
620#
621# Multi-device support (RAID and LVM)
622#
623CONFIG_MD=y 595CONFIG_MD=y
624CONFIG_BLK_DEV_MD=y 596CONFIG_BLK_DEV_MD=y
625CONFIG_MD_LINEAR=y 597CONFIG_MD_LINEAR=y
@@ -672,10 +644,6 @@ CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
672CONFIG_IEEE1394_ETH1394=m 644CONFIG_IEEE1394_ETH1394=m
673CONFIG_IEEE1394_DV1394=m 645CONFIG_IEEE1394_DV1394=m
674CONFIG_IEEE1394_RAWIO=y 646CONFIG_IEEE1394_RAWIO=y
675
676#
677# I2O device support
678#
679# CONFIG_I2O is not set 647# CONFIG_I2O is not set
680CONFIG_MACINTOSH_DRIVERS=y 648CONFIG_MACINTOSH_DRIVERS=y
681CONFIG_ADB_PMU=y 649CONFIG_ADB_PMU=y
@@ -688,31 +656,21 @@ CONFIG_WINDFARM_PM81=y
688CONFIG_WINDFARM_PM91=y 656CONFIG_WINDFARM_PM91=y
689CONFIG_WINDFARM_PM112=y 657CONFIG_WINDFARM_PM112=y
690# CONFIG_PMAC_RACKMETER is not set 658# CONFIG_PMAC_RACKMETER is not set
691
692#
693# Network device support
694#
695CONFIG_NETDEVICES=y 659CONFIG_NETDEVICES=y
660# CONFIG_NETDEVICES_MULTIQUEUE is not set
696CONFIG_DUMMY=m 661CONFIG_DUMMY=m
697CONFIG_BONDING=m 662CONFIG_BONDING=m
663# CONFIG_MACVLAN is not set
698# CONFIG_EQUALIZER is not set 664# CONFIG_EQUALIZER is not set
699CONFIG_TUN=m 665CONFIG_TUN=m
700# CONFIG_ARCNET is not set 666# CONFIG_ARCNET is not set
701# CONFIG_PHYLIB is not set 667# CONFIG_PHYLIB is not set
702
703#
704# Ethernet (10 or 100Mbit)
705#
706CONFIG_NET_ETHERNET=y 668CONFIG_NET_ETHERNET=y
707CONFIG_MII=y 669CONFIG_MII=y
708# CONFIG_HAPPYMEAL is not set 670# CONFIG_HAPPYMEAL is not set
709CONFIG_SUNGEM=y 671CONFIG_SUNGEM=y
710# CONFIG_CASSINI is not set 672# CONFIG_CASSINI is not set
711# CONFIG_NET_VENDOR_3COM is not set 673# CONFIG_NET_VENDOR_3COM is not set
712
713#
714# Tulip family network device support
715#
716# CONFIG_NET_TULIP is not set 674# CONFIG_NET_TULIP is not set
717# CONFIG_HP100 is not set 675# CONFIG_HP100 is not set
718# CONFIG_NET_PCI is not set 676# CONFIG_NET_PCI is not set
@@ -730,7 +688,6 @@ CONFIG_E1000=y
730# CONFIG_SIS190 is not set 688# CONFIG_SIS190 is not set
731# CONFIG_SKGE is not set 689# CONFIG_SKGE is not set
732# CONFIG_SKY2 is not set 690# CONFIG_SKY2 is not set
733# CONFIG_SK98LIN is not set
734# CONFIG_VIA_VELOCITY is not set 691# CONFIG_VIA_VELOCITY is not set
735CONFIG_TIGON3=y 692CONFIG_TIGON3=y
736# CONFIG_BNX2 is not set 693# CONFIG_BNX2 is not set
@@ -787,6 +744,7 @@ CONFIG_PPP_DEFLATE=m
787CONFIG_PPP_BSDCOMP=m 744CONFIG_PPP_BSDCOMP=m
788# CONFIG_PPP_MPPE is not set 745# CONFIG_PPP_MPPE is not set
789CONFIG_PPPOE=m 746CONFIG_PPPOE=m
747# CONFIG_PPPOL2TP is not set
790# CONFIG_SLIP is not set 748# CONFIG_SLIP is not set
791CONFIG_SLHC=m 749CONFIG_SLHC=m
792# CONFIG_NET_FC is not set 750# CONFIG_NET_FC is not set
@@ -794,15 +752,7 @@ CONFIG_SLHC=m
794# CONFIG_NETCONSOLE is not set 752# CONFIG_NETCONSOLE is not set
795# CONFIG_NETPOLL is not set 753# CONFIG_NETPOLL is not set
796# CONFIG_NET_POLL_CONTROLLER is not set 754# CONFIG_NET_POLL_CONTROLLER is not set
797
798#
799# ISDN subsystem
800#
801# CONFIG_ISDN is not set 755# CONFIG_ISDN is not set
802
803#
804# Telephony Support
805#
806# CONFIG_PHONE is not set 756# CONFIG_PHONE is not set
807 757
808# 758#
@@ -876,10 +826,6 @@ CONFIG_HW_CONSOLE=y
876CONFIG_UNIX98_PTYS=y 826CONFIG_UNIX98_PTYS=y
877CONFIG_LEGACY_PTYS=y 827CONFIG_LEGACY_PTYS=y
878CONFIG_LEGACY_PTY_COUNT=256 828CONFIG_LEGACY_PTY_COUNT=256
879
880#
881# IPMI
882#
883# CONFIG_IPMI_HANDLER is not set 829# CONFIG_IPMI_HANDLER is not set
884# CONFIG_WATCHDOG is not set 830# CONFIG_WATCHDOG is not set
885# CONFIG_HW_RANDOM is not set 831# CONFIG_HW_RANDOM is not set
@@ -893,10 +839,6 @@ CONFIG_AGP_UNINORTH=m
893CONFIG_RAW_DRIVER=y 839CONFIG_RAW_DRIVER=y
894CONFIG_MAX_RAW_DEVS=256 840CONFIG_MAX_RAW_DEVS=256
895# CONFIG_HANGCHECK_TIMER is not set 841# CONFIG_HANGCHECK_TIMER is not set
896
897#
898# TPM devices
899#
900# CONFIG_TCG_TPM is not set 842# CONFIG_TCG_TPM is not set
901CONFIG_DEVPORT=y 843CONFIG_DEVPORT=y
902CONFIG_I2C=y 844CONFIG_I2C=y
@@ -931,6 +873,7 @@ CONFIG_I2C_POWERMAC=y
931# CONFIG_I2C_SIS5595 is not set 873# CONFIG_I2C_SIS5595 is not set
932# CONFIG_I2C_SIS630 is not set 874# CONFIG_I2C_SIS630 is not set
933# CONFIG_I2C_SIS96X is not set 875# CONFIG_I2C_SIS96X is not set
876# CONFIG_I2C_TAOS_EVM is not set
934# CONFIG_I2C_STUB is not set 877# CONFIG_I2C_STUB is not set
935# CONFIG_I2C_TINY_USB is not set 878# CONFIG_I2C_TINY_USB is not set
936# CONFIG_I2C_VIA is not set 879# CONFIG_I2C_VIA is not set
@@ -942,11 +885,13 @@ CONFIG_I2C_POWERMAC=y
942# 885#
943# CONFIG_SENSORS_DS1337 is not set 886# CONFIG_SENSORS_DS1337 is not set
944# CONFIG_SENSORS_DS1374 is not set 887# CONFIG_SENSORS_DS1374 is not set
888# CONFIG_DS1682 is not set
945# CONFIG_SENSORS_EEPROM is not set 889# CONFIG_SENSORS_EEPROM is not set
946# CONFIG_SENSORS_PCF8574 is not set 890# CONFIG_SENSORS_PCF8574 is not set
947# CONFIG_SENSORS_PCA9539 is not set 891# CONFIG_SENSORS_PCA9539 is not set
948# CONFIG_SENSORS_PCF8591 is not set 892# CONFIG_SENSORS_PCF8591 is not set
949# CONFIG_SENSORS_MAX6875 is not set 893# CONFIG_SENSORS_MAX6875 is not set
894# CONFIG_SENSORS_TSL2550 is not set
950# CONFIG_I2C_DEBUG_CORE is not set 895# CONFIG_I2C_DEBUG_CORE is not set
951# CONFIG_I2C_DEBUG_ALGO is not set 896# CONFIG_I2C_DEBUG_ALGO is not set
952# CONFIG_I2C_DEBUG_BUS is not set 897# CONFIG_I2C_DEBUG_BUS is not set
@@ -957,11 +902,8 @@ CONFIG_I2C_POWERMAC=y
957# 902#
958# CONFIG_SPI is not set 903# CONFIG_SPI is not set
959# CONFIG_SPI_MASTER is not set 904# CONFIG_SPI_MASTER is not set
960
961#
962# Dallas's 1-wire bus
963#
964# CONFIG_W1 is not set 905# CONFIG_W1 is not set
906# CONFIG_POWER_SUPPLY is not set
965# CONFIG_HWMON is not set 907# CONFIG_HWMON is not set
966 908
967# 909#
@@ -981,14 +923,15 @@ CONFIG_DAB=y
981# Graphics support 923# Graphics support
982# 924#
983CONFIG_BACKLIGHT_LCD_SUPPORT=y 925CONFIG_BACKLIGHT_LCD_SUPPORT=y
984CONFIG_BACKLIGHT_CLASS_DEVICE=y
985CONFIG_LCD_CLASS_DEVICE=m 926CONFIG_LCD_CLASS_DEVICE=m
927CONFIG_BACKLIGHT_CLASS_DEVICE=y
986 928
987# 929#
988# Display device support 930# Display device support
989# 931#
990# CONFIG_DISPLAY_SUPPORT is not set 932# CONFIG_DISPLAY_SUPPORT is not set
991CONFIG_VGASTATE=y 933CONFIG_VGASTATE=y
934CONFIG_VIDEO_OUTPUT_CONTROL=m
992CONFIG_FB=y 935CONFIG_FB=y
993CONFIG_FIRMWARE_EDID=y 936CONFIG_FIRMWARE_EDID=y
994CONFIG_FB_DDC=y 937CONFIG_FB_DDC=y
@@ -1049,6 +992,7 @@ CONFIG_FB_RADEON_BACKLIGHT=y
1049# CONFIG_VGA_CONSOLE is not set 992# CONFIG_VGA_CONSOLE is not set
1050CONFIG_DUMMY_CONSOLE=y 993CONFIG_DUMMY_CONSOLE=y
1051CONFIG_FRAMEBUFFER_CONSOLE=y 994CONFIG_FRAMEBUFFER_CONSOLE=y
995# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1052# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 996# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1053# CONFIG_FONTS is not set 997# CONFIG_FONTS is not set
1054CONFIG_FONT_8x8=y 998CONFIG_FONT_8x8=y
@@ -1111,6 +1055,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1111# CONFIG_SND_CMIPCI is not set 1055# CONFIG_SND_CMIPCI is not set
1112# CONFIG_SND_CS4281 is not set 1056# CONFIG_SND_CS4281 is not set
1113# CONFIG_SND_CS46XX is not set 1057# CONFIG_SND_CS46XX is not set
1058# CONFIG_SND_CS5530 is not set
1114# CONFIG_SND_DARLA20 is not set 1059# CONFIG_SND_DARLA20 is not set
1115# CONFIG_SND_GINA20 is not set 1060# CONFIG_SND_GINA20 is not set
1116# CONFIG_SND_LAYLA20 is not set 1061# CONFIG_SND_LAYLA20 is not set
@@ -1160,6 +1105,10 @@ CONFIG_SND_POWERMAC=m
1160CONFIG_SND_POWERMAC_AUTO_DRC=y 1105CONFIG_SND_POWERMAC_AUTO_DRC=y
1161 1106
1162# 1107#
1108# ALSA PowerPC devices
1109#
1110
1111#
1163# Apple Onboard Audio driver 1112# Apple Onboard Audio driver
1164# 1113#
1165CONFIG_SND_AOA=m 1114CONFIG_SND_AOA=m
@@ -1183,13 +1132,14 @@ CONFIG_SND_USB_AUDIO=m
1183# CONFIG_SND_SOC is not set 1132# CONFIG_SND_SOC is not set
1184 1133
1185# 1134#
1186# Open Sound System 1135# SoC Audio support for SuperH
1187# 1136#
1188# CONFIG_SOUND_PRIME is not set
1189 1137
1190# 1138#
1191# HID Devices 1139# Open Sound System
1192# 1140#
1141# CONFIG_SOUND_PRIME is not set
1142CONFIG_HID_SUPPORT=y
1193CONFIG_HID=y 1143CONFIG_HID=y
1194# CONFIG_HID_DEBUG is not set 1144# CONFIG_HID_DEBUG is not set
1195 1145
@@ -1205,10 +1155,7 @@ CONFIG_LOGITECH_FF=y
1205CONFIG_THRUSTMASTER_FF=y 1155CONFIG_THRUSTMASTER_FF=y
1206# CONFIG_ZEROPLUS_FF is not set 1156# CONFIG_ZEROPLUS_FF is not set
1207CONFIG_USB_HIDDEV=y 1157CONFIG_USB_HIDDEV=y
1208 1158CONFIG_USB_SUPPORT=y
1209#
1210# USB support
1211#
1212CONFIG_USB_ARCH_HAS_HCD=y 1159CONFIG_USB_ARCH_HAS_HCD=y
1213CONFIG_USB_ARCH_HAS_OHCI=y 1160CONFIG_USB_ARCH_HAS_OHCI=y
1214CONFIG_USB_ARCH_HAS_EHCI=y 1161CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1230,7 +1177,6 @@ CONFIG_USB_EHCI_HCD=y
1230# CONFIG_USB_EHCI_SPLIT_ISO is not set 1177# CONFIG_USB_EHCI_SPLIT_ISO is not set
1231# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1178# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1232# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1179# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1233# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1234# CONFIG_USB_ISP116X_HCD is not set 1180# CONFIG_USB_ISP116X_HCD is not set
1235CONFIG_USB_OHCI_HCD=y 1181CONFIG_USB_OHCI_HCD=y
1236CONFIG_USB_OHCI_HCD_PPC_OF=y 1182CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1242,6 +1188,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1242CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1188CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1243# CONFIG_USB_UHCI_HCD is not set 1189# CONFIG_USB_UHCI_HCD is not set
1244# CONFIG_USB_SL811_HCD is not set 1190# CONFIG_USB_SL811_HCD is not set
1191# CONFIG_USB_R8A66597_HCD is not set
1245 1192
1246# 1193#
1247# USB Device Class drivers 1194# USB Device Class drivers
@@ -1326,6 +1273,7 @@ CONFIG_USB_SERIAL_MCT_U232=m
1326# CONFIG_USB_SERIAL_MOS7840 is not set 1273# CONFIG_USB_SERIAL_MOS7840 is not set
1327# CONFIG_USB_SERIAL_NAVMAN is not set 1274# CONFIG_USB_SERIAL_NAVMAN is not set
1328CONFIG_USB_SERIAL_PL2303=m 1275CONFIG_USB_SERIAL_PL2303=m
1276# CONFIG_USB_SERIAL_OTI6858 is not set
1329# CONFIG_USB_SERIAL_HP4X is not set 1277# CONFIG_USB_SERIAL_HP4X is not set
1330CONFIG_USB_SERIAL_SAFE=m 1278CONFIG_USB_SERIAL_SAFE=m
1331CONFIG_USB_SERIAL_SAFE_PADDED=y 1279CONFIG_USB_SERIAL_SAFE_PADDED=y
@@ -1371,32 +1319,9 @@ CONFIG_USB_APPLEDISPLAY=m
1371# 1319#
1372# CONFIG_USB_GADGET is not set 1320# CONFIG_USB_GADGET is not set
1373# CONFIG_MMC is not set 1321# CONFIG_MMC is not set
1374
1375#
1376# LED devices
1377#
1378# CONFIG_NEW_LEDS is not set 1322# CONFIG_NEW_LEDS is not set
1379
1380#
1381# LED drivers
1382#
1383
1384#
1385# LED Triggers
1386#
1387
1388#
1389# InfiniBand support
1390#
1391# CONFIG_INFINIBAND is not set 1323# CONFIG_INFINIBAND is not set
1392 1324# CONFIG_EDAC is not set
1393#
1394# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1395#
1396
1397#
1398# Real Time Clock
1399#
1400# CONFIG_RTC_CLASS is not set 1325# CONFIG_RTC_CLASS is not set
1401 1326
1402# 1327#
@@ -1413,6 +1338,11 @@ CONFIG_USB_APPLEDISPLAY=m
1413# 1338#
1414 1339
1415# 1340#
1341# Userspace I/O
1342#
1343# CONFIG_UIO is not set
1344
1345#
1416# File systems 1346# File systems
1417# 1347#
1418CONFIG_EXT2_FS=y 1348CONFIG_EXT2_FS=y
@@ -1538,7 +1468,6 @@ CONFIG_CIFS=m
1538# CONFIG_NCP_FS is not set 1468# CONFIG_NCP_FS is not set
1539# CONFIG_CODA_FS is not set 1469# CONFIG_CODA_FS is not set
1540# CONFIG_AFS_FS is not set 1470# CONFIG_AFS_FS is not set
1541# CONFIG_9P_FS is not set
1542 1471
1543# 1472#
1544# Partition Types 1473# Partition Types
@@ -1620,6 +1549,7 @@ CONFIG_CRC_CCITT=m
1620# CONFIG_CRC16 is not set 1549# CONFIG_CRC16 is not set
1621# CONFIG_CRC_ITU_T is not set 1550# CONFIG_CRC_ITU_T is not set
1622CONFIG_CRC32=y 1551CONFIG_CRC32=y
1552# CONFIG_CRC7 is not set
1623CONFIG_LIBCRC32C=m 1553CONFIG_LIBCRC32C=m
1624CONFIG_ZLIB_INFLATE=y 1554CONFIG_ZLIB_INFLATE=y
1625CONFIG_ZLIB_DEFLATE=m 1555CONFIG_ZLIB_DEFLATE=m
@@ -1647,6 +1577,7 @@ CONFIG_DEBUG_FS=y
1647CONFIG_DEBUG_KERNEL=y 1577CONFIG_DEBUG_KERNEL=y
1648# CONFIG_DEBUG_SHIRQ is not set 1578# CONFIG_DEBUG_SHIRQ is not set
1649CONFIG_DETECT_SOFTLOCKUP=y 1579CONFIG_DETECT_SOFTLOCKUP=y
1580CONFIG_SCHED_DEBUG=y
1650# CONFIG_SCHEDSTATS is not set 1581# CONFIG_SCHEDSTATS is not set
1651# CONFIG_TIMER_STATS is not set 1582# CONFIG_TIMER_STATS is not set
1652# CONFIG_DEBUG_SLAB is not set 1583# CONFIG_DEBUG_SLAB is not set
@@ -1677,10 +1608,6 @@ CONFIG_BOOTX_TEXT=y
1677# 1608#
1678# CONFIG_KEYS is not set 1609# CONFIG_KEYS is not set
1679# CONFIG_SECURITY is not set 1610# CONFIG_SECURITY is not set
1680
1681#
1682# Cryptographic options
1683#
1684CONFIG_CRYPTO=y 1611CONFIG_CRYPTO=y
1685CONFIG_CRYPTO_ALGAPI=y 1612CONFIG_CRYPTO_ALGAPI=y
1686CONFIG_CRYPTO_BLKCIPHER=y 1613CONFIG_CRYPTO_BLKCIPHER=y
@@ -1720,7 +1647,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1720CONFIG_CRYPTO_CRC32C=m 1647CONFIG_CRYPTO_CRC32C=m
1721# CONFIG_CRYPTO_CAMELLIA is not set 1648# CONFIG_CRYPTO_CAMELLIA is not set
1722CONFIG_CRYPTO_TEST=m 1649CONFIG_CRYPTO_TEST=m
1723 1650# CONFIG_CRYPTO_HW is not set
1724#
1725# Hardware crypto devices
1726#
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index 04b94f884aae..97d0202a9fe0 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -1,9 +1,24 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 13:22:36 2007 4# Thu Aug 30 16:35:41 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y
18CONFIG_PPC_STD_MMU=y
19CONFIG_PPC_STD_MMU_32=y
20# CONFIG_PPC_MM_SLICES is not set
21# CONFIG_SMP is not set
7CONFIG_PPC32=y 22CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 23CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 24CONFIG_MMU=y
@@ -14,61 +29,38 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_GENERIC_HWEIGHT=y 29CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 30CONFIG_GENERIC_CALIBRATE_DELAY=y
16CONFIG_GENERIC_FIND_NEXT_BIT=y 31CONFIG_GENERIC_FIND_NEXT_BIT=y
32# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
17CONFIG_PPC=y 33CONFIG_PPC=y
18CONFIG_EARLY_PRINTK=y 34CONFIG_EARLY_PRINTK=y
19CONFIG_GENERIC_NVRAM=y 35CONFIG_GENERIC_NVRAM=y
20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 36CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
21CONFIG_ARCH_MAY_HAVE_PC_FDC=y 37CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 38CONFIG_PPC_OF=y
39CONFIG_OF=y
23CONFIG_PPC_UDBG_16550=y 40CONFIG_PPC_UDBG_16550=y
24# CONFIG_GENERIC_TBSYNC is not set 41# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 42CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 43CONFIG_GENERIC_BUG=y
27# CONFIG_DEFAULT_UIMAGE is not set 44# CONFIG_DEFAULT_UIMAGE is not set
28
29#
30# Processor support
31#
32CONFIG_CLASSIC32=y
33# CONFIG_PPC_82xx is not set
34# CONFIG_PPC_83xx is not set
35# CONFIG_PPC_85xx is not set
36# CONFIG_PPC_86xx is not set
37# CONFIG_PPC_8xx is not set
38# CONFIG_40x is not set
39# CONFIG_44x is not set
40# CONFIG_E200 is not set
41CONFIG_6xx=y
42CONFIG_PPC_FPU=y
43# CONFIG_PPC_DCR_NATIVE is not set 45# CONFIG_PPC_DCR_NATIVE is not set
44# CONFIG_PPC_DCR_MMIO is not set 46# CONFIG_PPC_DCR_MMIO is not set
45# CONFIG_ALTIVEC is not set
46CONFIG_PPC_STD_MMU=y
47CONFIG_PPC_STD_MMU_32=y
48# CONFIG_PPC_MM_SLICES is not set
49# CONFIG_SMP is not set
50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 47CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 48
52# 49#
53# Code maturity level options 50# General setup
54# 51#
55CONFIG_EXPERIMENTAL=y 52CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 53CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 54CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 55CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 56CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 57CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 60# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 61# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 62# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 63# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 64# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 65# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 66CONFIG_LOG_BUF_SHIFT=14
@@ -102,23 +94,16 @@ CONFIG_SLAB=y
102CONFIG_RT_MUTEXES=y 94CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 95# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 96CONFIG_BASE_SMALL=0
105
106#
107# Loadable module support
108#
109CONFIG_MODULES=y 97CONFIG_MODULES=y
110# CONFIG_MODULE_UNLOAD is not set 98# CONFIG_MODULE_UNLOAD is not set
111# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
112# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
113# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
114
115#
116# Block layer
117#
118CONFIG_BLOCK=y 102CONFIG_BLOCK=y
119CONFIG_LBD=y 103CONFIG_LBD=y
120# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
121# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
122 107
123# 108#
124# IO Schedulers 109# IO Schedulers
@@ -138,7 +123,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
138# 123#
139# CONFIG_PPC_MULTIPLATFORM is not set 124# CONFIG_PPC_MULTIPLATFORM is not set
140CONFIG_EMBEDDED6xx=y 125CONFIG_EMBEDDED6xx=y
141# CONFIG_APUS is not set 126# CONFIG_PPC_82xx is not set
127# CONFIG_PPC_83xx is not set
128# CONFIG_PPC_86xx is not set
142# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
143# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
144# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -159,8 +146,8 @@ CONFIG_MPIC_WEIRD=y
159# CONFIG_PPC_INDIRECT_IO is not set 146# CONFIG_PPC_INDIRECT_IO is not set
160# CONFIG_GENERIC_IOMAP is not set 147# CONFIG_GENERIC_IOMAP is not set
161# CONFIG_CPU_FREQ is not set 148# CONFIG_CPU_FREQ is not set
162# CONFIG_TAU is not set
163# CONFIG_CPM2 is not set 149# CONFIG_CPM2 is not set
150# CONFIG_FSL_ULI1575 is not set
164 151
165# 152#
166# Kernel options 153# Kernel options
@@ -189,6 +176,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
189CONFIG_SPLIT_PTLOCK_CPUS=4 176CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_RESOURCES_64BIT is not set 177# CONFIG_RESOURCES_64BIT is not set
191CONFIG_ZONE_DMA_FLAG=1 178CONFIG_ZONE_DMA_FLAG=1
179CONFIG_BOUNCE=y
180CONFIG_VIRT_TO_BUS=y
192CONFIG_PROC_DEVICETREE=y 181CONFIG_PROC_DEVICETREE=y
193CONFIG_CMDLINE_BOOL=y 182CONFIG_CMDLINE_BOOL=y
194CONFIG_CMDLINE="console=ttyS0,115200" 183CONFIG_CMDLINE="console=ttyS0,115200"
@@ -206,6 +195,7 @@ CONFIG_GENERIC_ISA_DMA=y
206# CONFIG_PPC_INDIRECT_PCI is not set 195# CONFIG_PPC_INDIRECT_PCI is not set
207CONFIG_PCI=y 196CONFIG_PCI=y
208CONFIG_PCI_DOMAINS=y 197CONFIG_PCI_DOMAINS=y
198CONFIG_PCI_SYSCALL=y
209# CONFIG_PCIEPORTBUS is not set 199# CONFIG_PCIEPORTBUS is not set
210CONFIG_ARCH_SUPPORTS_MSI=y 200CONFIG_ARCH_SUPPORTS_MSI=y
211# CONFIG_PCI_MSI is not set 201# CONFIG_PCI_MSI is not set
@@ -316,6 +306,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# CONFIG_MAC80211 is not set 306# CONFIG_MAC80211 is not set
317# CONFIG_IEEE80211 is not set 307# CONFIG_IEEE80211 is not set
318# CONFIG_RFKILL is not set 308# CONFIG_RFKILL is not set
309# CONFIG_NET_9P is not set
319 310
320# 311#
321# Device Drivers 312# Device Drivers
@@ -330,26 +321,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
330# CONFIG_DEBUG_DRIVER is not set 321# CONFIG_DEBUG_DRIVER is not set
331# CONFIG_DEBUG_DEVRES is not set 322# CONFIG_DEBUG_DEVRES is not set
332# CONFIG_SYS_HYPERVISOR is not set 323# CONFIG_SYS_HYPERVISOR is not set
333
334#
335# Connector - unified userspace <-> kernelspace linker
336#
337# CONFIG_CONNECTOR is not set 324# CONFIG_CONNECTOR is not set
338# CONFIG_MTD is not set 325# CONFIG_MTD is not set
339 326CONFIG_OF_DEVICE=y
340#
341# Parallel port support
342#
343# CONFIG_PARPORT is not set 327# CONFIG_PARPORT is not set
344 328CONFIG_BLK_DEV=y
345#
346# Plug and Play support
347#
348# CONFIG_PNPACPI is not set
349
350#
351# Block devices
352#
353# CONFIG_BLK_DEV_FD is not set 329# CONFIG_BLK_DEV_FD is not set
354# CONFIG_BLK_CPQ_DA is not set 330# CONFIG_BLK_CPQ_DA is not set
355# CONFIG_BLK_CPQ_CISS_DA is not set 331# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -366,14 +342,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
366CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 342CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
367# CONFIG_CDROM_PKTCDVD is not set 343# CONFIG_CDROM_PKTCDVD is not set
368# CONFIG_ATA_OVER_ETH is not set 344# CONFIG_ATA_OVER_ETH is not set
369 345CONFIG_MISC_DEVICES=y
370#
371# Misc devices
372#
373# CONFIG_PHANTOM is not set 346# CONFIG_PHANTOM is not set
347# CONFIG_EEPROM_93CX6 is not set
374# CONFIG_SGI_IOC4 is not set 348# CONFIG_SGI_IOC4 is not set
375# CONFIG_TIFM_CORE is not set 349# CONFIG_TIFM_CORE is not set
376# CONFIG_BLINK is not set
377# CONFIG_IDE is not set 350# CONFIG_IDE is not set
378 351
379# 352#
@@ -381,6 +354,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
381# 354#
382# CONFIG_RAID_ATTRS is not set 355# CONFIG_RAID_ATTRS is not set
383CONFIG_SCSI=y 356CONFIG_SCSI=y
357CONFIG_SCSI_DMA=y
384# CONFIG_SCSI_TGT is not set 358# CONFIG_SCSI_TGT is not set
385# CONFIG_SCSI_NETLINK is not set 359# CONFIG_SCSI_NETLINK is not set
386CONFIG_SCSI_PROC_FS=y 360CONFIG_SCSI_PROC_FS=y
@@ -410,12 +384,8 @@ CONFIG_SCSI_WAIT_SCAN=m
410# CONFIG_SCSI_SPI_ATTRS is not set 384# CONFIG_SCSI_SPI_ATTRS is not set
411# CONFIG_SCSI_FC_ATTRS is not set 385# CONFIG_SCSI_FC_ATTRS is not set
412# CONFIG_SCSI_ISCSI_ATTRS is not set 386# CONFIG_SCSI_ISCSI_ATTRS is not set
413# CONFIG_SCSI_SAS_ATTRS is not set
414# CONFIG_SCSI_SAS_LIBSAS is not set 387# CONFIG_SCSI_SAS_LIBSAS is not set
415 388CONFIG_SCSI_LOWLEVEL=y
416#
417# SCSI low-level drivers
418#
419# CONFIG_ISCSI_TCP is not set 389# CONFIG_ISCSI_TCP is not set
420# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 390# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
421# CONFIG_SCSI_3W_9XXX is not set 391# CONFIG_SCSI_3W_9XXX is not set
@@ -506,10 +476,6 @@ CONFIG_ATA=y
506# CONFIG_PATA_VIA is not set 476# CONFIG_PATA_VIA is not set
507# CONFIG_PATA_WINBOND is not set 477# CONFIG_PATA_WINBOND is not set
508# CONFIG_PATA_PLATFORM is not set 478# CONFIG_PATA_PLATFORM is not set
509
510#
511# Multi-device support (RAID and LVM)
512#
513# CONFIG_MD is not set 479# CONFIG_MD is not set
514 480
515# 481#
@@ -525,19 +491,13 @@ CONFIG_ATA=y
525# 491#
526# CONFIG_FIREWIRE is not set 492# CONFIG_FIREWIRE is not set
527# CONFIG_IEEE1394 is not set 493# CONFIG_IEEE1394 is not set
528
529#
530# I2O device support
531#
532# CONFIG_I2O is not set 494# CONFIG_I2O is not set
533# CONFIG_MACINTOSH_DRIVERS is not set 495# CONFIG_MACINTOSH_DRIVERS is not set
534
535#
536# Network device support
537#
538CONFIG_NETDEVICES=y 496CONFIG_NETDEVICES=y
497# CONFIG_NETDEVICES_MULTIQUEUE is not set
539# CONFIG_DUMMY is not set 498# CONFIG_DUMMY is not set
540# CONFIG_BONDING is not set 499# CONFIG_BONDING is not set
500# CONFIG_MACVLAN is not set
541# CONFIG_EQUALIZER is not set 501# CONFIG_EQUALIZER is not set
542# CONFIG_TUN is not set 502# CONFIG_TUN is not set
543# CONFIG_ARCNET is not set 503# CONFIG_ARCNET is not set
@@ -554,11 +514,8 @@ CONFIG_PHYLIB=y
554# CONFIG_VITESSE_PHY is not set 514# CONFIG_VITESSE_PHY is not set
555# CONFIG_SMSC_PHY is not set 515# CONFIG_SMSC_PHY is not set
556# CONFIG_BROADCOM_PHY is not set 516# CONFIG_BROADCOM_PHY is not set
517# CONFIG_ICPLUS_PHY is not set
557# CONFIG_FIXED_PHY is not set 518# CONFIG_FIXED_PHY is not set
558
559#
560# Ethernet (10 or 100Mbit)
561#
562CONFIG_NET_ETHERNET=y 519CONFIG_NET_ETHERNET=y
563CONFIG_MII=y 520CONFIG_MII=y
564# CONFIG_HAPPYMEAL is not set 521# CONFIG_HAPPYMEAL is not set
@@ -567,10 +524,6 @@ CONFIG_MII=y
567CONFIG_NET_VENDOR_3COM=y 524CONFIG_NET_VENDOR_3COM=y
568CONFIG_VORTEX=y 525CONFIG_VORTEX=y
569# CONFIG_TYPHOON is not set 526# CONFIG_TYPHOON is not set
570
571#
572# Tulip family network device support
573#
574# CONFIG_NET_TULIP is not set 527# CONFIG_NET_TULIP is not set
575# CONFIG_HP100 is not set 528# CONFIG_HP100 is not set
576# CONFIG_NET_PCI is not set 529# CONFIG_NET_PCI is not set
@@ -585,7 +538,6 @@ CONFIG_NETDEV_1000=y
585# CONFIG_SIS190 is not set 538# CONFIG_SIS190 is not set
586# CONFIG_SKGE is not set 539# CONFIG_SKGE is not set
587# CONFIG_SKY2 is not set 540# CONFIG_SKY2 is not set
588# CONFIG_SK98LIN is not set
589# CONFIG_VIA_VELOCITY is not set 541# CONFIG_VIA_VELOCITY is not set
590# CONFIG_TIGON3 is not set 542# CONFIG_TIGON3 is not set
591# CONFIG_BNX2 is not set 543# CONFIG_BNX2 is not set
@@ -617,15 +569,7 @@ CONFIG_NETDEV_10000=y
617# CONFIG_NETCONSOLE is not set 569# CONFIG_NETCONSOLE is not set
618# CONFIG_NETPOLL is not set 570# CONFIG_NETPOLL is not set
619# CONFIG_NET_POLL_CONTROLLER is not set 571# CONFIG_NET_POLL_CONTROLLER is not set
620
621#
622# ISDN subsystem
623#
624# CONFIG_ISDN is not set 572# CONFIG_ISDN is not set
625
626#
627# Telephony Support
628#
629# CONFIG_PHONE is not set 573# CONFIG_PHONE is not set
630 574
631# 575#
@@ -691,10 +635,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
691CONFIG_UNIX98_PTYS=y 635CONFIG_UNIX98_PTYS=y
692CONFIG_LEGACY_PTYS=y 636CONFIG_LEGACY_PTYS=y
693CONFIG_LEGACY_PTY_COUNT=256 637CONFIG_LEGACY_PTY_COUNT=256
694
695#
696# IPMI
697#
698# CONFIG_IPMI_HANDLER is not set 638# CONFIG_IPMI_HANDLER is not set
699# CONFIG_WATCHDOG is not set 639# CONFIG_WATCHDOG is not set
700# CONFIG_HW_RANDOM is not set 640# CONFIG_HW_RANDOM is not set
@@ -706,10 +646,6 @@ CONFIG_GEN_RTC=y
706# CONFIG_AGP is not set 646# CONFIG_AGP is not set
707# CONFIG_DRM is not set 647# CONFIG_DRM is not set
708# CONFIG_RAW_DRIVER is not set 648# CONFIG_RAW_DRIVER is not set
709
710#
711# TPM devices
712#
713# CONFIG_TCG_TPM is not set 649# CONFIG_TCG_TPM is not set
714CONFIG_DEVPORT=y 650CONFIG_DEVPORT=y
715# CONFIG_I2C is not set 651# CONFIG_I2C is not set
@@ -719,20 +655,24 @@ CONFIG_DEVPORT=y
719# 655#
720# CONFIG_SPI is not set 656# CONFIG_SPI is not set
721# CONFIG_SPI_MASTER is not set 657# CONFIG_SPI_MASTER is not set
722
723#
724# Dallas's 1-wire bus
725#
726# CONFIG_W1 is not set 658# CONFIG_W1 is not set
659# CONFIG_POWER_SUPPLY is not set
727CONFIG_HWMON=y 660CONFIG_HWMON=y
728# CONFIG_HWMON_VID is not set 661# CONFIG_HWMON_VID is not set
729# CONFIG_SENSORS_ABITUGURU is not set 662# CONFIG_SENSORS_ABITUGURU is not set
663# CONFIG_SENSORS_ABITUGURU3 is not set
730# CONFIG_SENSORS_F71805F is not set 664# CONFIG_SENSORS_F71805F is not set
665# CONFIG_SENSORS_IT87 is not set
666# CONFIG_SENSORS_PC87360 is not set
731# CONFIG_SENSORS_PC87427 is not set 667# CONFIG_SENSORS_PC87427 is not set
668# CONFIG_SENSORS_SIS5595 is not set
732# CONFIG_SENSORS_SMSC47M1 is not set 669# CONFIG_SENSORS_SMSC47M1 is not set
733# CONFIG_SENSORS_SMSC47B397 is not set 670# CONFIG_SENSORS_SMSC47B397 is not set
671# CONFIG_SENSORS_VIA686A is not set
734# CONFIG_SENSORS_VT1211 is not set 672# CONFIG_SENSORS_VT1211 is not set
673# CONFIG_SENSORS_VT8231 is not set
735# CONFIG_SENSORS_W83627HF is not set 674# CONFIG_SENSORS_W83627HF is not set
675# CONFIG_SENSORS_W83627EHF is not set
736# CONFIG_HWMON_DEBUG_CHIP is not set 676# CONFIG_HWMON_DEBUG_CHIP is not set
737 677
738# 678#
@@ -757,6 +697,7 @@ CONFIG_HWMON=y
757# 697#
758# CONFIG_DISPLAY_SUPPORT is not set 698# CONFIG_DISPLAY_SUPPORT is not set
759# CONFIG_VGASTATE is not set 699# CONFIG_VGASTATE is not set
700# CONFIG_VIDEO_OUTPUT_CONTROL is not set
760# CONFIG_FB is not set 701# CONFIG_FB is not set
761# CONFIG_FB_IBM_GXT4500 is not set 702# CONFIG_FB_IBM_GXT4500 is not set
762 703
@@ -764,16 +705,10 @@ CONFIG_HWMON=y
764# Sound 705# Sound
765# 706#
766# CONFIG_SOUND is not set 707# CONFIG_SOUND is not set
767 708CONFIG_HID_SUPPORT=y
768#
769# HID Devices
770#
771CONFIG_HID=y 709CONFIG_HID=y
772# CONFIG_HID_DEBUG is not set 710# CONFIG_HID_DEBUG is not set
773 711CONFIG_USB_SUPPORT=y
774#
775# USB support
776#
777CONFIG_USB_ARCH_HAS_HCD=y 712CONFIG_USB_ARCH_HAS_HCD=y
778CONFIG_USB_ARCH_HAS_OHCI=y 713CONFIG_USB_ARCH_HAS_OHCI=y
779CONFIG_USB_ARCH_HAS_EHCI=y 714CONFIG_USB_ARCH_HAS_EHCI=y
@@ -788,32 +723,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
788# 723#
789# CONFIG_USB_GADGET is not set 724# CONFIG_USB_GADGET is not set
790# CONFIG_MMC is not set 725# CONFIG_MMC is not set
791
792#
793# LED devices
794#
795# CONFIG_NEW_LEDS is not set 726# CONFIG_NEW_LEDS is not set
796
797#
798# LED drivers
799#
800
801#
802# LED Triggers
803#
804
805#
806# InfiniBand support
807#
808# CONFIG_INFINIBAND is not set 727# CONFIG_INFINIBAND is not set
809 728# CONFIG_EDAC is not set
810#
811# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
812#
813
814#
815# Real Time Clock
816#
817# CONFIG_RTC_CLASS is not set 729# CONFIG_RTC_CLASS is not set
818 730
819# 731#
@@ -830,6 +742,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
830# 742#
831 743
832# 744#
745# Userspace I/O
746#
747# CONFIG_UIO is not set
748
749#
833# File systems 750# File systems
834# 751#
835CONFIG_EXT2_FS=y 752CONFIG_EXT2_FS=y
@@ -922,7 +839,6 @@ CONFIG_SUNRPC=y
922# CONFIG_NCP_FS is not set 839# CONFIG_NCP_FS is not set
923# CONFIG_CODA_FS is not set 840# CONFIG_CODA_FS is not set
924# CONFIG_AFS_FS is not set 841# CONFIG_AFS_FS is not set
925# CONFIG_9P_FS is not set
926 842
927# 843#
928# Partition Types 844# Partition Types
@@ -965,6 +881,7 @@ CONFIG_BITREVERSE=y
965# CONFIG_CRC16 is not set 881# CONFIG_CRC16 is not set
966# CONFIG_CRC_ITU_T is not set 882# CONFIG_CRC_ITU_T is not set
967CONFIG_CRC32=y 883CONFIG_CRC32=y
884# CONFIG_CRC7 is not set
968# CONFIG_LIBCRC32C is not set 885# CONFIG_LIBCRC32C is not set
969CONFIG_PLIST=y 886CONFIG_PLIST=y
970CONFIG_HAS_IOMEM=y 887CONFIG_HAS_IOMEM=y
@@ -989,6 +906,7 @@ CONFIG_MAGIC_SYSRQ=y
989CONFIG_DEBUG_KERNEL=y 906CONFIG_DEBUG_KERNEL=y
990# CONFIG_DEBUG_SHIRQ is not set 907# CONFIG_DEBUG_SHIRQ is not set
991CONFIG_DETECT_SOFTLOCKUP=y 908CONFIG_DETECT_SOFTLOCKUP=y
909# CONFIG_SCHED_DEBUG is not set
992# CONFIG_SCHEDSTATS is not set 910# CONFIG_SCHEDSTATS is not set
993# CONFIG_TIMER_STATS is not set 911# CONFIG_TIMER_STATS is not set
994# CONFIG_DEBUG_SLAB is not set 912# CONFIG_DEBUG_SLAB is not set
@@ -1014,7 +932,6 @@ CONFIG_XMON=y
1014CONFIG_XMON_DEFAULT=y 932CONFIG_XMON_DEFAULT=y
1015CONFIG_XMON_DISASSEMBLY=y 933CONFIG_XMON_DISASSEMBLY=y
1016# CONFIG_BDI_SWITCH is not set 934# CONFIG_BDI_SWITCH is not set
1017# CONFIG_BOOTX_TEXT is not set
1018# CONFIG_PPC_EARLY_DEBUG is not set 935# CONFIG_PPC_EARLY_DEBUG is not set
1019 936
1020# 937#
@@ -1022,8 +939,4 @@ CONFIG_XMON_DISASSEMBLY=y
1022# 939#
1023# CONFIG_KEYS is not set 940# CONFIG_KEYS is not set
1024# CONFIG_SECURITY is not set 941# CONFIG_SECURITY is not set
1025
1026#
1027# Cryptographic options
1028#
1029# CONFIG_CRYPTO is not set 942# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 8e3367452427..3fe1929460e7 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,9 +1,23 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 13:22:39 2007 4# Thu Aug 30 16:37:16 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y
13CONFIG_POWER4=y
14CONFIG_PPC_FPU=y
15# CONFIG_ALTIVEC is not set
16CONFIG_PPC_STD_MMU=y
17# CONFIG_PPC_MM_SLICES is not set
18CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y
20CONFIG_NR_CPUS=32
7CONFIG_64BIT=y 21CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 23CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 29CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 30CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 31CONFIG_GENERIC_FIND_NEXT_BIT=y
32CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 33CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 34CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 35CONFIG_COMPAT=y
@@ -22,50 +37,32 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
25# CONFIG_PPC_UDBG_16550 is not set 41# CONFIG_PPC_UDBG_16550 is not set
26# CONFIG_GENERIC_TBSYNC is not set 42# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34# CONFIG_POWER4_ONLY is not set
35CONFIG_POWER3=y
36CONFIG_POWER4=y
37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
39# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO is not set
40# CONFIG_PPC_OF_PLATFORM_PCI is not set 48# CONFIG_PPC_OF_PLATFORM_PCI is not set
41# CONFIG_ALTIVEC is not set
42CONFIG_PPC_STD_MMU=y
43# CONFIG_PPC_MM_SLICES is not set
44CONFIG_VIRT_CPU_ACCOUNTING=y
45CONFIG_SMP=y
46CONFIG_NR_CPUS=32
47CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
48 50
49# 51#
50# Code maturity level options 52# General setup
51# 53#
52CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
53CONFIG_LOCK_KERNEL=y 55CONFIG_LOCK_KERNEL=y
54CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
55
56#
57# General setup
58#
59CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
60CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
61CONFIG_SWAP=y 59CONFIG_SWAP=y
62CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
65CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
66# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
67# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
68# CONFIG_UTS_NS is not set 65# CONFIG_USER_NS is not set
69CONFIG_AUDIT=y 66CONFIG_AUDIT=y
70CONFIG_AUDITSYSCALL=y 67CONFIG_AUDITSYSCALL=y
71CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
@@ -102,10 +99,6 @@ CONFIG_SLAB=y
102CONFIG_RT_MUTEXES=y 99CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 100# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 101CONFIG_BASE_SMALL=0
105
106#
107# Loadable module support
108#
109CONFIG_MODULES=y 102CONFIG_MODULES=y
110CONFIG_MODULE_UNLOAD=y 103CONFIG_MODULE_UNLOAD=y
111# CONFIG_MODULE_FORCE_UNLOAD is not set 104# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -113,12 +106,9 @@ CONFIG_MODVERSIONS=y
113CONFIG_MODULE_SRCVERSION_ALL=y 106CONFIG_MODULE_SRCVERSION_ALL=y
114CONFIG_KMOD=y 107CONFIG_KMOD=y
115CONFIG_STOP_MACHINE=y 108CONFIG_STOP_MACHINE=y
116
117#
118# Block layer
119#
120CONFIG_BLOCK=y 109CONFIG_BLOCK=y
121# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_IO_TRACE is not set
111CONFIG_BLK_DEV_BSG=y
122 112
123# 113#
124# IO Schedulers 114# IO Schedulers
@@ -138,7 +128,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
138# 128#
139CONFIG_PPC_MULTIPLATFORM=y 129CONFIG_PPC_MULTIPLATFORM=y
140# CONFIG_EMBEDDED6xx is not set 130# CONFIG_EMBEDDED6xx is not set
141# CONFIG_APUS is not set 131# CONFIG_PPC_82xx is not set
132# CONFIG_PPC_83xx is not set
133# CONFIG_PPC_86xx is not set
142# CONFIG_PPC_PSERIES is not set 134# CONFIG_PPC_PSERIES is not set
143CONFIG_LPARCFG=y 135CONFIG_LPARCFG=y
144CONFIG_PPC_ISERIES=y 136CONFIG_PPC_ISERIES=y
@@ -174,6 +166,7 @@ CONFIG_PPC_INDIRECT_IO=y
174CONFIG_GENERIC_IOMAP=y 166CONFIG_GENERIC_IOMAP=y
175# CONFIG_CPU_FREQ is not set 167# CONFIG_CPU_FREQ is not set
176# CONFIG_CPM2 is not set 168# CONFIG_CPM2 is not set
169# CONFIG_FSL_ULI1575 is not set
177 170
178# 171#
179# Kernel options 172# Kernel options
@@ -210,6 +203,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
210CONFIG_SPLIT_PTLOCK_CPUS=4 203CONFIG_SPLIT_PTLOCK_CPUS=4
211CONFIG_RESOURCES_64BIT=y 204CONFIG_RESOURCES_64BIT=y
212CONFIG_ZONE_DMA_FLAG=1 205CONFIG_ZONE_DMA_FLAG=1
206CONFIG_BOUNCE=y
213# CONFIG_PPC_HAS_HASH_64K is not set 207# CONFIG_PPC_HAS_HASH_64K is not set
214# CONFIG_PPC_64K_PAGES is not set 208# CONFIG_PPC_64K_PAGES is not set
215# CONFIG_SCHED_SMT is not set 209# CONFIG_SCHED_SMT is not set
@@ -228,6 +222,7 @@ CONFIG_GENERIC_ISA_DMA=y
228# CONFIG_PPC_INDIRECT_PCI is not set 222# CONFIG_PPC_INDIRECT_PCI is not set
229CONFIG_PCI=y 223CONFIG_PCI=y
230CONFIG_PCI_DOMAINS=y 224CONFIG_PCI_DOMAINS=y
225CONFIG_PCI_SYSCALL=y
231# CONFIG_PCIEPORTBUS is not set 226# CONFIG_PCIEPORTBUS is not set
232CONFIG_ARCH_SUPPORTS_MSI=y 227CONFIG_ARCH_SUPPORTS_MSI=y
233# CONFIG_PCI_MSI is not set 228# CONFIG_PCI_MSI is not set
@@ -299,6 +294,7 @@ CONFIG_NF_CONNTRACK=m
299CONFIG_NF_CONNTRACK_MARK=y 294CONFIG_NF_CONNTRACK_MARK=y
300CONFIG_NF_CONNTRACK_EVENTS=y 295CONFIG_NF_CONNTRACK_EVENTS=y
301# CONFIG_NF_CT_PROTO_SCTP is not set 296# CONFIG_NF_CT_PROTO_SCTP is not set
297# CONFIG_NF_CT_PROTO_UDPLITE is not set
302# CONFIG_NF_CONNTRACK_AMANDA is not set 298# CONFIG_NF_CONNTRACK_AMANDA is not set
303CONFIG_NF_CONNTRACK_FTP=m 299CONFIG_NF_CONNTRACK_FTP=m
304# CONFIG_NF_CONNTRACK_H323 is not set 300# CONFIG_NF_CONNTRACK_H323 is not set
@@ -316,9 +312,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
316CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 312CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
317# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 313# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
318# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 314# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
315# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
319# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 316# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
320CONFIG_NETFILTER_XT_MATCH_COMMENT=m 317CONFIG_NETFILTER_XT_MATCH_COMMENT=m
321# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 318# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
319# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
322CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 320CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
323CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 321CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
324# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 322# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -339,6 +337,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
339# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 337# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
340CONFIG_NETFILTER_XT_MATCH_STRING=m 338CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 339CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
340# CONFIG_NETFILTER_XT_MATCH_U32 is not set
342# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 341# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
343 342
344# 343#
@@ -427,6 +426,7 @@ CONFIG_NET_CLS_ROUTE=y
427# CONFIG_MAC80211 is not set 426# CONFIG_MAC80211 is not set
428# CONFIG_IEEE80211 is not set 427# CONFIG_IEEE80211 is not set
429# CONFIG_RFKILL is not set 428# CONFIG_RFKILL is not set
429# CONFIG_NET_9P is not set
430 430
431# 431#
432# Device Drivers 432# Device Drivers
@@ -441,28 +441,12 @@ CONFIG_FW_LOADER=m
441# CONFIG_DEBUG_DRIVER is not set 441# CONFIG_DEBUG_DRIVER is not set
442# CONFIG_DEBUG_DEVRES is not set 442# CONFIG_DEBUG_DEVRES is not set
443# CONFIG_SYS_HYPERVISOR is not set 443# CONFIG_SYS_HYPERVISOR is not set
444
445#
446# Connector - unified userspace <-> kernelspace linker
447#
448# CONFIG_CONNECTOR is not set 444# CONFIG_CONNECTOR is not set
449# CONFIG_MTD is not set 445# CONFIG_MTD is not set
450 446CONFIG_OF_DEVICE=y
451#
452# Parallel port support
453#
454# CONFIG_PARPORT is not set 447# CONFIG_PARPORT is not set
455 448CONFIG_BLK_DEV=y
456#
457# Plug and Play support
458#
459# CONFIG_PNPACPI is not set
460
461#
462# Block devices
463#
464# CONFIG_BLK_DEV_FD is not set 449# CONFIG_BLK_DEV_FD is not set
465# CONFIG_BLK_CPQ_DA is not set
466# CONFIG_BLK_CPQ_CISS_DA is not set 450# CONFIG_BLK_CPQ_CISS_DA is not set
467# CONFIG_BLK_DEV_DAC960 is not set 451# CONFIG_BLK_DEV_DAC960 is not set
468# CONFIG_BLK_DEV_UMEM is not set 452# CONFIG_BLK_DEV_UMEM is not set
@@ -477,14 +461,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
477CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 461CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
478# CONFIG_CDROM_PKTCDVD is not set 462# CONFIG_CDROM_PKTCDVD is not set
479# CONFIG_ATA_OVER_ETH is not set 463# CONFIG_ATA_OVER_ETH is not set
480 464CONFIG_MISC_DEVICES=y
481#
482# Misc devices
483#
484# CONFIG_PHANTOM is not set 465# CONFIG_PHANTOM is not set
466# CONFIG_EEPROM_93CX6 is not set
485# CONFIG_SGI_IOC4 is not set 467# CONFIG_SGI_IOC4 is not set
486# CONFIG_TIFM_CORE is not set 468# CONFIG_TIFM_CORE is not set
487# CONFIG_BLINK is not set
488# CONFIG_IDE is not set 469# CONFIG_IDE is not set
489 470
490# 471#
@@ -492,6 +473,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
492# 473#
493# CONFIG_RAID_ATTRS is not set 474# CONFIG_RAID_ATTRS is not set
494CONFIG_SCSI=y 475CONFIG_SCSI=y
476CONFIG_SCSI_DMA=y
495# CONFIG_SCSI_TGT is not set 477# CONFIG_SCSI_TGT is not set
496CONFIG_SCSI_NETLINK=y 478CONFIG_SCSI_NETLINK=y
497CONFIG_SCSI_PROC_FS=y 479CONFIG_SCSI_PROC_FS=y
@@ -525,10 +507,7 @@ CONFIG_SCSI_FC_ATTRS=y
525CONFIG_SCSI_SAS_ATTRS=m 507CONFIG_SCSI_SAS_ATTRS=m
526CONFIG_SCSI_SAS_LIBSAS=m 508CONFIG_SCSI_SAS_LIBSAS=m
527CONFIG_SCSI_SAS_LIBSAS_DEBUG=y 509CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
528 510CONFIG_SCSI_LOWLEVEL=y
529#
530# SCSI low-level drivers
531#
532# CONFIG_ISCSI_TCP is not set 511# CONFIG_ISCSI_TCP is not set
533# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 512# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
534# CONFIG_SCSI_3W_9XXX is not set 513# CONFIG_SCSI_3W_9XXX is not set
@@ -543,7 +522,6 @@ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
543# CONFIG_MEGARAID_LEGACY is not set 522# CONFIG_MEGARAID_LEGACY is not set
544# CONFIG_MEGARAID_SAS is not set 523# CONFIG_MEGARAID_SAS is not set
545# CONFIG_SCSI_HPTIOP is not set 524# CONFIG_SCSI_HPTIOP is not set
546# CONFIG_SCSI_BUSLOGIC is not set
547# CONFIG_SCSI_DMX3191D is not set 525# CONFIG_SCSI_DMX3191D is not set
548# CONFIG_SCSI_EATA is not set 526# CONFIG_SCSI_EATA is not set
549# CONFIG_SCSI_FUTURE_DOMAIN is not set 527# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -563,10 +541,6 @@ CONFIG_SCSI_IBMVSCSI=m
563# CONFIG_SCSI_DEBUG is not set 541# CONFIG_SCSI_DEBUG is not set
564# CONFIG_SCSI_SRP is not set 542# CONFIG_SCSI_SRP is not set
565# CONFIG_ATA is not set 543# CONFIG_ATA is not set
566
567#
568# Multi-device support (RAID and LVM)
569#
570CONFIG_MD=y 544CONFIG_MD=y
571CONFIG_BLK_DEV_MD=y 545CONFIG_BLK_DEV_MD=y
572CONFIG_MD_LINEAR=y 546CONFIG_MD_LINEAR=y
@@ -598,37 +572,23 @@ CONFIG_DM_ZERO=m
598# 572#
599# CONFIG_FIREWIRE is not set 573# CONFIG_FIREWIRE is not set
600# CONFIG_IEEE1394 is not set 574# CONFIG_IEEE1394 is not set
601
602#
603# I2O device support
604#
605# CONFIG_I2O is not set 575# CONFIG_I2O is not set
606# CONFIG_MACINTOSH_DRIVERS is not set 576# CONFIG_MACINTOSH_DRIVERS is not set
607
608#
609# Network device support
610#
611CONFIG_NETDEVICES=y 577CONFIG_NETDEVICES=y
578# CONFIG_NETDEVICES_MULTIQUEUE is not set
612CONFIG_DUMMY=m 579CONFIG_DUMMY=m
613CONFIG_BONDING=m 580CONFIG_BONDING=m
581# CONFIG_MACVLAN is not set
614# CONFIG_EQUALIZER is not set 582# CONFIG_EQUALIZER is not set
615CONFIG_TUN=m 583CONFIG_TUN=m
616# CONFIG_ARCNET is not set 584# CONFIG_ARCNET is not set
617# CONFIG_PHYLIB is not set 585# CONFIG_PHYLIB is not set
618
619#
620# Ethernet (10 or 100Mbit)
621#
622CONFIG_NET_ETHERNET=y 586CONFIG_NET_ETHERNET=y
623CONFIG_MII=y 587CONFIG_MII=y
624# CONFIG_HAPPYMEAL is not set 588# CONFIG_HAPPYMEAL is not set
625# CONFIG_SUNGEM is not set 589# CONFIG_SUNGEM is not set
626# CONFIG_CASSINI is not set 590# CONFIG_CASSINI is not set
627# CONFIG_NET_VENDOR_3COM is not set 591# CONFIG_NET_VENDOR_3COM is not set
628
629#
630# Tulip family network device support
631#
632# CONFIG_NET_TULIP is not set 592# CONFIG_NET_TULIP is not set
633# CONFIG_HP100 is not set 593# CONFIG_HP100 is not set
634CONFIG_NET_PCI=y 594CONFIG_NET_PCI=y
@@ -665,7 +625,6 @@ CONFIG_E1000=m
665# CONFIG_SIS190 is not set 625# CONFIG_SIS190 is not set
666# CONFIG_SKGE is not set 626# CONFIG_SKGE is not set
667# CONFIG_SKY2 is not set 627# CONFIG_SKY2 is not set
668# CONFIG_SK98LIN is not set
669# CONFIG_VIA_VELOCITY is not set 628# CONFIG_VIA_VELOCITY is not set
670# CONFIG_TIGON3 is not set 629# CONFIG_TIGON3 is not set
671# CONFIG_BNX2 is not set 630# CONFIG_BNX2 is not set
@@ -703,6 +662,7 @@ CONFIG_PPP_DEFLATE=m
703CONFIG_PPP_BSDCOMP=m 662CONFIG_PPP_BSDCOMP=m
704# CONFIG_PPP_MPPE is not set 663# CONFIG_PPP_MPPE is not set
705CONFIG_PPPOE=m 664CONFIG_PPPOE=m
665# CONFIG_PPPOL2TP is not set
706# CONFIG_SLIP is not set 666# CONFIG_SLIP is not set
707CONFIG_SLHC=m 667CONFIG_SLHC=m
708# CONFIG_NET_FC is not set 668# CONFIG_NET_FC is not set
@@ -711,15 +671,7 @@ CONFIG_NETCONSOLE=y
711CONFIG_NETPOLL=y 671CONFIG_NETPOLL=y
712CONFIG_NETPOLL_TRAP=y 672CONFIG_NETPOLL_TRAP=y
713CONFIG_NET_POLL_CONTROLLER=y 673CONFIG_NET_POLL_CONTROLLER=y
714
715#
716# ISDN subsystem
717#
718# CONFIG_ISDN is not set 674# CONFIG_ISDN is not set
719
720#
721# Telephony Support
722#
723# CONFIG_PHONE is not set 675# CONFIG_PHONE is not set
724 676
725# 677#
@@ -782,10 +734,6 @@ CONFIG_LEGACY_PTYS=y
782CONFIG_LEGACY_PTY_COUNT=256 734CONFIG_LEGACY_PTY_COUNT=256
783CONFIG_HVC_DRIVER=y 735CONFIG_HVC_DRIVER=y
784CONFIG_HVC_ISERIES=y 736CONFIG_HVC_ISERIES=y
785
786#
787# IPMI
788#
789# CONFIG_IPMI_HANDLER is not set 737# CONFIG_IPMI_HANDLER is not set
790# CONFIG_WATCHDOG is not set 738# CONFIG_WATCHDOG is not set
791# CONFIG_HW_RANDOM is not set 739# CONFIG_HW_RANDOM is not set
@@ -798,10 +746,6 @@ CONFIG_GEN_RTC=y
798CONFIG_RAW_DRIVER=y 746CONFIG_RAW_DRIVER=y
799CONFIG_MAX_RAW_DEVS=256 747CONFIG_MAX_RAW_DEVS=256
800# CONFIG_HANGCHECK_TIMER is not set 748# CONFIG_HANGCHECK_TIMER is not set
801
802#
803# TPM devices
804#
805# CONFIG_TCG_TPM is not set 749# CONFIG_TCG_TPM is not set
806CONFIG_DEVPORT=y 750CONFIG_DEVPORT=y
807# CONFIG_I2C is not set 751# CONFIG_I2C is not set
@@ -811,11 +755,8 @@ CONFIG_DEVPORT=y
811# 755#
812# CONFIG_SPI is not set 756# CONFIG_SPI is not set
813# CONFIG_SPI_MASTER is not set 757# CONFIG_SPI_MASTER is not set
814
815#
816# Dallas's 1-wire bus
817#
818# CONFIG_W1 is not set 758# CONFIG_W1 is not set
759# CONFIG_POWER_SUPPLY is not set
819# CONFIG_HWMON is not set 760# CONFIG_HWMON is not set
820 761
821# 762#
@@ -840,6 +781,7 @@ CONFIG_DEVPORT=y
840# 781#
841# CONFIG_DISPLAY_SUPPORT is not set 782# CONFIG_DISPLAY_SUPPORT is not set
842# CONFIG_VGASTATE is not set 783# CONFIG_VGASTATE is not set
784# CONFIG_VIDEO_OUTPUT_CONTROL is not set
843# CONFIG_FB is not set 785# CONFIG_FB is not set
844# CONFIG_FB_IBM_GXT4500 is not set 786# CONFIG_FB_IBM_GXT4500 is not set
845 787
@@ -854,55 +796,12 @@ CONFIG_DUMMY_CONSOLE=y
854# Sound 796# Sound
855# 797#
856# CONFIG_SOUND is not set 798# CONFIG_SOUND is not set
857 799# CONFIG_HID_SUPPORT is not set
858# 800# CONFIG_USB_SUPPORT is not set
859# HID Devices
860#
861# CONFIG_HID is not set
862
863#
864# USB support
865#
866CONFIG_USB_ARCH_HAS_HCD=y
867CONFIG_USB_ARCH_HAS_OHCI=y
868CONFIG_USB_ARCH_HAS_EHCI=y
869# CONFIG_USB is not set
870
871#
872# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
873#
874
875#
876# USB Gadget Support
877#
878# CONFIG_USB_GADGET is not set
879# CONFIG_MMC is not set 801# CONFIG_MMC is not set
880
881#
882# LED devices
883#
884# CONFIG_NEW_LEDS is not set 802# CONFIG_NEW_LEDS is not set
885
886#
887# LED drivers
888#
889
890#
891# LED Triggers
892#
893
894#
895# InfiniBand support
896#
897# CONFIG_INFINIBAND is not set 803# CONFIG_INFINIBAND is not set
898 804# CONFIG_EDAC is not set
899#
900# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
901#
902
903#
904# Real Time Clock
905#
906# CONFIG_RTC_CLASS is not set 805# CONFIG_RTC_CLASS is not set
907 806
908# 807#
@@ -919,6 +818,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
919# 818#
920 819
921# 820#
821# Userspace I/O
822#
823# CONFIG_UIO is not set
824
825#
922# File systems 826# File systems
923# 827#
924CONFIG_EXT2_FS=y 828CONFIG_EXT2_FS=y
@@ -1052,7 +956,6 @@ CONFIG_CIFS_POSIX=y
1052# CONFIG_NCP_FS is not set 956# CONFIG_NCP_FS is not set
1053# CONFIG_CODA_FS is not set 957# CONFIG_CODA_FS is not set
1054# CONFIG_AFS_FS is not set 958# CONFIG_AFS_FS is not set
1055# CONFIG_9P_FS is not set
1056 959
1057# 960#
1058# Partition Types 961# Partition Types
@@ -1119,6 +1022,7 @@ CONFIG_CRC_CCITT=m
1119# CONFIG_CRC16 is not set 1022# CONFIG_CRC16 is not set
1120# CONFIG_CRC_ITU_T is not set 1023# CONFIG_CRC_ITU_T is not set
1121CONFIG_CRC32=y 1024CONFIG_CRC32=y
1025# CONFIG_CRC7 is not set
1122CONFIG_LIBCRC32C=m 1026CONFIG_LIBCRC32C=m
1123CONFIG_ZLIB_INFLATE=y 1027CONFIG_ZLIB_INFLATE=y
1124CONFIG_ZLIB_DEFLATE=m 1028CONFIG_ZLIB_DEFLATE=m
@@ -1149,6 +1053,7 @@ CONFIG_DEBUG_FS=y
1149CONFIG_DEBUG_KERNEL=y 1053CONFIG_DEBUG_KERNEL=y
1150# CONFIG_DEBUG_SHIRQ is not set 1054# CONFIG_DEBUG_SHIRQ is not set
1151CONFIG_DETECT_SOFTLOCKUP=y 1055CONFIG_DETECT_SOFTLOCKUP=y
1056CONFIG_SCHED_DEBUG=y
1152# CONFIG_SCHEDSTATS is not set 1057# CONFIG_SCHEDSTATS is not set
1153# CONFIG_TIMER_STATS is not set 1058# CONFIG_TIMER_STATS is not set
1154# CONFIG_DEBUG_SLAB is not set 1059# CONFIG_DEBUG_SLAB is not set
@@ -1179,10 +1084,6 @@ CONFIG_IRQSTACKS=y
1179# 1084#
1180# CONFIG_KEYS is not set 1085# CONFIG_KEYS is not set
1181# CONFIG_SECURITY is not set 1086# CONFIG_SECURITY is not set
1182
1183#
1184# Cryptographic options
1185#
1186CONFIG_CRYPTO=y 1087CONFIG_CRYPTO=y
1187CONFIG_CRYPTO_ALGAPI=y 1088CONFIG_CRYPTO_ALGAPI=y
1188CONFIG_CRYPTO_BLKCIPHER=y 1089CONFIG_CRYPTO_BLKCIPHER=y
@@ -1222,7 +1123,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1222CONFIG_CRYPTO_CRC32C=m 1123CONFIG_CRYPTO_CRC32C=m
1223# CONFIG_CRYPTO_CAMELLIA is not set 1124# CONFIG_CRYPTO_CAMELLIA is not set
1224CONFIG_CRYPTO_TEST=m 1125CONFIG_CRYPTO_TEST=m
1225 1126# CONFIG_CRYPTO_HW is not set
1226#
1227# Hardware crypto devices
1228#
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index eb3d9ad655ea..96b538bc676b 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,9 +1,22 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 13:27:35 2007 4# Thu Aug 30 16:38:16 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11CONFIG_POWER4_ONLY=y
12CONFIG_POWER4=y
13CONFIG_PPC_FPU=y
14# CONFIG_ALTIVEC is not set
15CONFIG_PPC_STD_MMU=y
16CONFIG_PPC_MM_SLICES=y
17CONFIG_VIRT_CPU_ACCOUNTING=y
18CONFIG_SMP=y
19CONFIG_NR_CPUS=4
7CONFIG_64BIT=y 20CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 21CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 22CONFIG_MMU=y
@@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 28CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 29CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 30CONFIG_GENERIC_FIND_NEXT_BIT=y
31CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 32CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 33CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 34CONFIG_COMPAT=y
@@ -22,49 +36,32 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 36CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 37CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 38CONFIG_PPC_OF=y
39CONFIG_OF=y
25CONFIG_PPC_UDBG_16550=y 40CONFIG_PPC_UDBG_16550=y
26CONFIG_GENERIC_TBSYNC=y 41CONFIG_GENERIC_TBSYNC=y
27CONFIG_AUDIT_ARCH=y 42CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 43CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 44# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34CONFIG_POWER4_ONLY=y
35CONFIG_POWER4=y
36CONFIG_PPC_FPU=y
37# CONFIG_PPC_DCR_NATIVE is not set 45# CONFIG_PPC_DCR_NATIVE is not set
38# CONFIG_PPC_DCR_MMIO is not set 46# CONFIG_PPC_DCR_MMIO is not set
39# CONFIG_PPC_OF_PLATFORM_PCI is not set 47# CONFIG_PPC_OF_PLATFORM_PCI is not set
40# CONFIG_ALTIVEC is not set
41CONFIG_PPC_STD_MMU=y
42CONFIG_PPC_MM_SLICES=y
43CONFIG_VIRT_CPU_ACCOUNTING=y
44CONFIG_SMP=y
45CONFIG_NR_CPUS=4
46CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
47 49
48# 50#
49# Code maturity level options 51# General setup
50# 52#
51CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
52CONFIG_LOCK_KERNEL=y 54CONFIG_LOCK_KERNEL=y
53CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
54
55#
56# General setup
57#
58CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
59CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
60CONFIG_SWAP=y 58CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
62# CONFIG_IPC_NS is not set
63CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
64CONFIG_POSIX_MQUEUE=y 61CONFIG_POSIX_MQUEUE=y
65# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
67# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
68# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
69CONFIG_IKCONFIG=y 66CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 67CONFIG_IKCONFIG_PROC=y
@@ -99,10 +96,6 @@ CONFIG_SLAB=y
99CONFIG_RT_MUTEXES=y 96CONFIG_RT_MUTEXES=y
100# CONFIG_TINY_SHMEM is not set 97# CONFIG_TINY_SHMEM is not set
101CONFIG_BASE_SMALL=0 98CONFIG_BASE_SMALL=0
102
103#
104# Loadable module support
105#
106CONFIG_MODULES=y 99CONFIG_MODULES=y
107CONFIG_MODULE_UNLOAD=y 100CONFIG_MODULE_UNLOAD=y
108# CONFIG_MODULE_FORCE_UNLOAD is not set 101# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -110,12 +103,9 @@ CONFIG_MODVERSIONS=y
110CONFIG_MODULE_SRCVERSION_ALL=y 103CONFIG_MODULE_SRCVERSION_ALL=y
111CONFIG_KMOD=y 104CONFIG_KMOD=y
112CONFIG_STOP_MACHINE=y 105CONFIG_STOP_MACHINE=y
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 106CONFIG_BLOCK=y
118# CONFIG_BLK_DEV_IO_TRACE is not set 107# CONFIG_BLK_DEV_IO_TRACE is not set
108# CONFIG_BLK_DEV_BSG is not set
119 109
120# 110#
121# IO Schedulers 111# IO Schedulers
@@ -135,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 125#
136CONFIG_PPC_MULTIPLATFORM=y 126CONFIG_PPC_MULTIPLATFORM=y
137# CONFIG_EMBEDDED6xx is not set 127# CONFIG_EMBEDDED6xx is not set
138# CONFIG_APUS is not set 128# CONFIG_PPC_82xx is not set
129# CONFIG_PPC_83xx is not set
130# CONFIG_PPC_86xx is not set
139# CONFIG_PPC_PSERIES is not set 131# CONFIG_PPC_PSERIES is not set
140# CONFIG_PPC_ISERIES is not set 132# CONFIG_PPC_ISERIES is not set
141# CONFIG_PPC_MPC52xx is not set 133# CONFIG_PPC_MPC52xx is not set
@@ -167,6 +159,7 @@ CONFIG_PPC_970_NAP=y
167# CONFIG_GENERIC_IOMAP is not set 159# CONFIG_GENERIC_IOMAP is not set
168# CONFIG_CPU_FREQ is not set 160# CONFIG_CPU_FREQ is not set
169# CONFIG_CPM2 is not set 161# CONFIG_CPM2 is not set
162# CONFIG_FSL_ULI1575 is not set
170 163
171# 164#
172# Kernel options 165# Kernel options
@@ -203,6 +196,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
203CONFIG_SPLIT_PTLOCK_CPUS=4 196CONFIG_SPLIT_PTLOCK_CPUS=4
204CONFIG_RESOURCES_64BIT=y 197CONFIG_RESOURCES_64BIT=y
205CONFIG_ZONE_DMA_FLAG=1 198CONFIG_ZONE_DMA_FLAG=1
199CONFIG_BOUNCE=y
206# CONFIG_PPC_HAS_HASH_64K is not set 200# CONFIG_PPC_HAS_HASH_64K is not set
207# CONFIG_PPC_64K_PAGES is not set 201# CONFIG_PPC_64K_PAGES is not set
208# CONFIG_SCHED_SMT is not set 202# CONFIG_SCHED_SMT is not set
@@ -221,6 +215,7 @@ CONFIG_GENERIC_ISA_DMA=y
221# CONFIG_PPC_INDIRECT_PCI is not set 215# CONFIG_PPC_INDIRECT_PCI is not set
222CONFIG_PCI=y 216CONFIG_PCI=y
223CONFIG_PCI_DOMAINS=y 217CONFIG_PCI_DOMAINS=y
218CONFIG_PCI_SYSCALL=y
224# CONFIG_PCIEPORTBUS is not set 219# CONFIG_PCIEPORTBUS is not set
225CONFIG_ARCH_SUPPORTS_MSI=y 220CONFIG_ARCH_SUPPORTS_MSI=y
226CONFIG_PCI_MSI=y 221CONFIG_PCI_MSI=y
@@ -318,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
318# CONFIG_MAC80211 is not set 313# CONFIG_MAC80211 is not set
319# CONFIG_IEEE80211 is not set 314# CONFIG_IEEE80211 is not set
320# CONFIG_RFKILL is not set 315# CONFIG_RFKILL is not set
316# CONFIG_NET_9P is not set
321 317
322# 318#
323# Device Drivers 319# Device Drivers
@@ -332,28 +328,12 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
332# CONFIG_DEBUG_DRIVER is not set 328# CONFIG_DEBUG_DRIVER is not set
333# CONFIG_DEBUG_DEVRES is not set 329# CONFIG_DEBUG_DEVRES is not set
334# CONFIG_SYS_HYPERVISOR is not set 330# CONFIG_SYS_HYPERVISOR is not set
335
336#
337# Connector - unified userspace <-> kernelspace linker
338#
339# CONFIG_CONNECTOR is not set 331# CONFIG_CONNECTOR is not set
340# CONFIG_MTD is not set 332# CONFIG_MTD is not set
341 333CONFIG_OF_DEVICE=y
342#
343# Parallel port support
344#
345# CONFIG_PARPORT is not set 334# CONFIG_PARPORT is not set
346 335CONFIG_BLK_DEV=y
347#
348# Plug and Play support
349#
350# CONFIG_PNPACPI is not set
351
352#
353# Block devices
354#
355# CONFIG_BLK_DEV_FD is not set 336# CONFIG_BLK_DEV_FD is not set
356# CONFIG_BLK_CPQ_DA is not set
357# CONFIG_BLK_CPQ_CISS_DA is not set 337# CONFIG_BLK_CPQ_CISS_DA is not set
358# CONFIG_BLK_DEV_DAC960 is not set 338# CONFIG_BLK_DEV_DAC960 is not set
359# CONFIG_BLK_DEV_UMEM is not set 339# CONFIG_BLK_DEV_UMEM is not set
@@ -368,14 +348,11 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
368CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 348CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
369# CONFIG_CDROM_PKTCDVD is not set 349# CONFIG_CDROM_PKTCDVD is not set
370# CONFIG_ATA_OVER_ETH is not set 350# CONFIG_ATA_OVER_ETH is not set
371 351CONFIG_MISC_DEVICES=y
372#
373# Misc devices
374#
375# CONFIG_PHANTOM is not set 352# CONFIG_PHANTOM is not set
353# CONFIG_EEPROM_93CX6 is not set
376# CONFIG_SGI_IOC4 is not set 354# CONFIG_SGI_IOC4 is not set
377# CONFIG_TIFM_CORE is not set 355# CONFIG_TIFM_CORE is not set
378# CONFIG_BLINK is not set
379CONFIG_IDE=y 356CONFIG_IDE=y
380CONFIG_BLK_DEV_IDE=y 357CONFIG_BLK_DEV_IDE=y
381 358
@@ -439,12 +416,9 @@ CONFIG_BLK_DEV_IDEDMA=y
439# 416#
440# CONFIG_RAID_ATTRS is not set 417# CONFIG_RAID_ATTRS is not set
441# CONFIG_SCSI is not set 418# CONFIG_SCSI is not set
419# CONFIG_SCSI_DMA is not set
442# CONFIG_SCSI_NETLINK is not set 420# CONFIG_SCSI_NETLINK is not set
443# CONFIG_ATA is not set 421# CONFIG_ATA is not set
444
445#
446# Multi-device support (RAID and LVM)
447#
448# CONFIG_MD is not set 422# CONFIG_MD is not set
449 423
450# 424#
@@ -457,37 +431,23 @@ CONFIG_BLK_DEV_IDEDMA=y
457# 431#
458# CONFIG_FIREWIRE is not set 432# CONFIG_FIREWIRE is not set
459# CONFIG_IEEE1394 is not set 433# CONFIG_IEEE1394 is not set
460
461#
462# I2O device support
463#
464# CONFIG_I2O is not set 434# CONFIG_I2O is not set
465# CONFIG_MACINTOSH_DRIVERS is not set 435# CONFIG_MACINTOSH_DRIVERS is not set
466
467#
468# Network device support
469#
470CONFIG_NETDEVICES=y 436CONFIG_NETDEVICES=y
437# CONFIG_NETDEVICES_MULTIQUEUE is not set
471# CONFIG_DUMMY is not set 438# CONFIG_DUMMY is not set
472# CONFIG_BONDING is not set 439# CONFIG_BONDING is not set
440# CONFIG_MACVLAN is not set
473# CONFIG_EQUALIZER is not set 441# CONFIG_EQUALIZER is not set
474# CONFIG_TUN is not set 442# CONFIG_TUN is not set
475# CONFIG_ARCNET is not set 443# CONFIG_ARCNET is not set
476# CONFIG_PHYLIB is not set 444# CONFIG_PHYLIB is not set
477
478#
479# Ethernet (10 or 100Mbit)
480#
481CONFIG_NET_ETHERNET=y 445CONFIG_NET_ETHERNET=y
482CONFIG_MII=y 446CONFIG_MII=y
483# CONFIG_HAPPYMEAL is not set 447# CONFIG_HAPPYMEAL is not set
484# CONFIG_SUNGEM is not set 448# CONFIG_SUNGEM is not set
485# CONFIG_CASSINI is not set 449# CONFIG_CASSINI is not set
486# CONFIG_NET_VENDOR_3COM is not set 450# CONFIG_NET_VENDOR_3COM is not set
487
488#
489# Tulip family network device support
490#
491# CONFIG_NET_TULIP is not set 451# CONFIG_NET_TULIP is not set
492# CONFIG_HP100 is not set 452# CONFIG_HP100 is not set
493CONFIG_NET_PCI=y 453CONFIG_NET_PCI=y
@@ -523,7 +483,6 @@ CONFIG_E1000=y
523# CONFIG_SIS190 is not set 483# CONFIG_SIS190 is not set
524# CONFIG_SKGE is not set 484# CONFIG_SKGE is not set
525# CONFIG_SKY2 is not set 485# CONFIG_SKY2 is not set
526# CONFIG_SK98LIN is not set
527# CONFIG_VIA_VELOCITY is not set 486# CONFIG_VIA_VELOCITY is not set
528CONFIG_TIGON3=y 487CONFIG_TIGON3=y
529# CONFIG_BNX2 is not set 488# CONFIG_BNX2 is not set
@@ -564,15 +523,7 @@ CONFIG_USB_PEGASUS=y
564# CONFIG_NETCONSOLE is not set 523# CONFIG_NETCONSOLE is not set
565# CONFIG_NETPOLL is not set 524# CONFIG_NETPOLL is not set
566# CONFIG_NET_POLL_CONTROLLER is not set 525# CONFIG_NET_POLL_CONTROLLER is not set
567
568#
569# ISDN subsystem
570#
571# CONFIG_ISDN is not set 526# CONFIG_ISDN is not set
572
573#
574# Telephony Support
575#
576# CONFIG_PHONE is not set 527# CONFIG_PHONE is not set
577 528
578# 529#
@@ -641,10 +592,6 @@ CONFIG_LEGACY_PTYS=y
641CONFIG_LEGACY_PTY_COUNT=256 592CONFIG_LEGACY_PTY_COUNT=256
642CONFIG_HVC_DRIVER=y 593CONFIG_HVC_DRIVER=y
643CONFIG_HVC_RTAS=y 594CONFIG_HVC_RTAS=y
644
645#
646# IPMI
647#
648# CONFIG_IPMI_HANDLER is not set 595# CONFIG_IPMI_HANDLER is not set
649# CONFIG_WATCHDOG is not set 596# CONFIG_WATCHDOG is not set
650# CONFIG_HW_RANDOM is not set 597# CONFIG_HW_RANDOM is not set
@@ -656,10 +603,6 @@ CONFIG_GEN_RTC=y
656# CONFIG_DRM is not set 603# CONFIG_DRM is not set
657# CONFIG_RAW_DRIVER is not set 604# CONFIG_RAW_DRIVER is not set
658# CONFIG_HANGCHECK_TIMER is not set 605# CONFIG_HANGCHECK_TIMER is not set
659
660#
661# TPM devices
662#
663# CONFIG_TCG_TPM is not set 606# CONFIG_TCG_TPM is not set
664CONFIG_DEVPORT=y 607CONFIG_DEVPORT=y
665CONFIG_I2C=y 608CONFIG_I2C=y
@@ -693,6 +636,7 @@ CONFIG_I2C_AMD8111=y
693# CONFIG_I2C_SIS5595 is not set 636# CONFIG_I2C_SIS5595 is not set
694# CONFIG_I2C_SIS630 is not set 637# CONFIG_I2C_SIS630 is not set
695# CONFIG_I2C_SIS96X is not set 638# CONFIG_I2C_SIS96X is not set
639# CONFIG_I2C_TAOS_EVM is not set
696# CONFIG_I2C_STUB is not set 640# CONFIG_I2C_STUB is not set
697# CONFIG_I2C_TINY_USB is not set 641# CONFIG_I2C_TINY_USB is not set
698# CONFIG_I2C_VIA is not set 642# CONFIG_I2C_VIA is not set
@@ -704,11 +648,13 @@ CONFIG_I2C_AMD8111=y
704# 648#
705# CONFIG_SENSORS_DS1337 is not set 649# CONFIG_SENSORS_DS1337 is not set
706# CONFIG_SENSORS_DS1374 is not set 650# CONFIG_SENSORS_DS1374 is not set
651# CONFIG_DS1682 is not set
707# CONFIG_SENSORS_EEPROM is not set 652# CONFIG_SENSORS_EEPROM is not set
708# CONFIG_SENSORS_PCF8574 is not set 653# CONFIG_SENSORS_PCF8574 is not set
709# CONFIG_SENSORS_PCA9539 is not set 654# CONFIG_SENSORS_PCA9539 is not set
710# CONFIG_SENSORS_PCF8591 is not set 655# CONFIG_SENSORS_PCF8591 is not set
711# CONFIG_SENSORS_MAX6875 is not set 656# CONFIG_SENSORS_MAX6875 is not set
657# CONFIG_SENSORS_TSL2550 is not set
712# CONFIG_I2C_DEBUG_CORE is not set 658# CONFIG_I2C_DEBUG_CORE is not set
713# CONFIG_I2C_DEBUG_ALGO is not set 659# CONFIG_I2C_DEBUG_ALGO is not set
714# CONFIG_I2C_DEBUG_BUS is not set 660# CONFIG_I2C_DEBUG_BUS is not set
@@ -719,11 +665,8 @@ CONFIG_I2C_AMD8111=y
719# 665#
720# CONFIG_SPI is not set 666# CONFIG_SPI is not set
721# CONFIG_SPI_MASTER is not set 667# CONFIG_SPI_MASTER is not set
722
723#
724# Dallas's 1-wire bus
725#
726# CONFIG_W1 is not set 668# CONFIG_W1 is not set
669# CONFIG_POWER_SUPPLY is not set
727# CONFIG_HWMON is not set 670# CONFIG_HWMON is not set
728 671
729# 672#
@@ -748,6 +691,7 @@ CONFIG_I2C_AMD8111=y
748# 691#
749# CONFIG_DISPLAY_SUPPORT is not set 692# CONFIG_DISPLAY_SUPPORT is not set
750# CONFIG_VGASTATE is not set 693# CONFIG_VGASTATE is not set
694# CONFIG_VIDEO_OUTPUT_CONTROL is not set
751# CONFIG_FB is not set 695# CONFIG_FB is not set
752# CONFIG_FB_IBM_GXT4500 is not set 696# CONFIG_FB_IBM_GXT4500 is not set
753 697
@@ -761,10 +705,7 @@ CONFIG_DUMMY_CONSOLE=y
761# Sound 705# Sound
762# 706#
763# CONFIG_SOUND is not set 707# CONFIG_SOUND is not set
764 708CONFIG_HID_SUPPORT=y
765#
766# HID Devices
767#
768CONFIG_HID=y 709CONFIG_HID=y
769# CONFIG_HID_DEBUG is not set 710# CONFIG_HID_DEBUG is not set
770 711
@@ -775,10 +716,7 @@ CONFIG_USB_HID=y
775# CONFIG_USB_HIDINPUT_POWERBOOK is not set 716# CONFIG_USB_HIDINPUT_POWERBOOK is not set
776# CONFIG_HID_FF is not set 717# CONFIG_HID_FF is not set
777# CONFIG_USB_HIDDEV is not set 718# CONFIG_USB_HIDDEV is not set
778 719CONFIG_USB_SUPPORT=y
779#
780# USB support
781#
782CONFIG_USB_ARCH_HAS_HCD=y 720CONFIG_USB_ARCH_HAS_HCD=y
783CONFIG_USB_ARCH_HAS_OHCI=y 721CONFIG_USB_ARCH_HAS_OHCI=y
784CONFIG_USB_ARCH_HAS_EHCI=y 722CONFIG_USB_ARCH_HAS_EHCI=y
@@ -800,7 +738,6 @@ CONFIG_USB_EHCI_HCD=y
800CONFIG_USB_EHCI_SPLIT_ISO=y 738CONFIG_USB_EHCI_SPLIT_ISO=y
801CONFIG_USB_EHCI_ROOT_HUB_TT=y 739CONFIG_USB_EHCI_ROOT_HUB_TT=y
802# CONFIG_USB_EHCI_TT_NEWSCHED is not set 740# CONFIG_USB_EHCI_TT_NEWSCHED is not set
803# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
804# CONFIG_USB_ISP116X_HCD is not set 741# CONFIG_USB_ISP116X_HCD is not set
805CONFIG_USB_OHCI_HCD=y 742CONFIG_USB_OHCI_HCD=y
806# CONFIG_USB_OHCI_HCD_PPC_OF is not set 743# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -809,6 +746,7 @@ CONFIG_USB_OHCI_HCD=y
809CONFIG_USB_OHCI_LITTLE_ENDIAN=y 746CONFIG_USB_OHCI_LITTLE_ENDIAN=y
810CONFIG_USB_UHCI_HCD=y 747CONFIG_USB_UHCI_HCD=y
811# CONFIG_USB_SL811_HCD is not set 748# CONFIG_USB_SL811_HCD is not set
749# CONFIG_USB_R8A66597_HCD is not set
812 750
813# 751#
814# USB Device Class drivers 752# USB Device Class drivers
@@ -880,6 +818,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
880# CONFIG_USB_SERIAL_MOS7840 is not set 818# CONFIG_USB_SERIAL_MOS7840 is not set
881# CONFIG_USB_SERIAL_NAVMAN is not set 819# CONFIG_USB_SERIAL_NAVMAN is not set
882# CONFIG_USB_SERIAL_PL2303 is not set 820# CONFIG_USB_SERIAL_PL2303 is not set
821# CONFIG_USB_SERIAL_OTI6858 is not set
883# CONFIG_USB_SERIAL_HP4X is not set 822# CONFIG_USB_SERIAL_HP4X is not set
884# CONFIG_USB_SERIAL_SAFE is not set 823# CONFIG_USB_SERIAL_SAFE is not set
885# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 824# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -924,32 +863,9 @@ CONFIG_USB_EZUSB=y
924# 863#
925# CONFIG_USB_GADGET is not set 864# CONFIG_USB_GADGET is not set
926# CONFIG_MMC is not set 865# CONFIG_MMC is not set
927
928#
929# LED devices
930#
931# CONFIG_NEW_LEDS is not set 866# CONFIG_NEW_LEDS is not set
932
933#
934# LED drivers
935#
936
937#
938# LED Triggers
939#
940
941#
942# InfiniBand support
943#
944# CONFIG_INFINIBAND is not set 867# CONFIG_INFINIBAND is not set
945 868# CONFIG_EDAC is not set
946#
947# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
948#
949
950#
951# Real Time Clock
952#
953# CONFIG_RTC_CLASS is not set 869# CONFIG_RTC_CLASS is not set
954 870
955# 871#
@@ -966,6 +882,11 @@ CONFIG_USB_EZUSB=y
966# 882#
967 883
968# 884#
885# Userspace I/O
886#
887# CONFIG_UIO is not set
888
889#
969# File systems 890# File systems
970# 891#
971CONFIG_EXT2_FS=y 892CONFIG_EXT2_FS=y
@@ -1064,7 +985,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1064# CONFIG_NCP_FS is not set 985# CONFIG_NCP_FS is not set
1065# CONFIG_CODA_FS is not set 986# CONFIG_CODA_FS is not set
1066# CONFIG_AFS_FS is not set 987# CONFIG_AFS_FS is not set
1067# CONFIG_9P_FS is not set
1068 988
1069# 989#
1070# Partition Types 990# Partition Types
@@ -1146,6 +1066,7 @@ CONFIG_CRC_CCITT=y
1146# CONFIG_CRC16 is not set 1066# CONFIG_CRC16 is not set
1147# CONFIG_CRC_ITU_T is not set 1067# CONFIG_CRC_ITU_T is not set
1148CONFIG_CRC32=y 1068CONFIG_CRC32=y
1069# CONFIG_CRC7 is not set
1149# CONFIG_LIBCRC32C is not set 1070# CONFIG_LIBCRC32C is not set
1150CONFIG_ZLIB_INFLATE=y 1071CONFIG_ZLIB_INFLATE=y
1151CONFIG_PLIST=y 1072CONFIG_PLIST=y
@@ -1171,6 +1092,7 @@ CONFIG_DEBUG_FS=y
1171CONFIG_DEBUG_KERNEL=y 1092CONFIG_DEBUG_KERNEL=y
1172# CONFIG_DEBUG_SHIRQ is not set 1093# CONFIG_DEBUG_SHIRQ is not set
1173CONFIG_DETECT_SOFTLOCKUP=y 1094CONFIG_DETECT_SOFTLOCKUP=y
1095CONFIG_SCHED_DEBUG=y
1174# CONFIG_SCHEDSTATS is not set 1096# CONFIG_SCHEDSTATS is not set
1175# CONFIG_TIMER_STATS is not set 1097# CONFIG_TIMER_STATS is not set
1176CONFIG_DEBUG_SLAB=y 1098CONFIG_DEBUG_SLAB=y
@@ -1205,10 +1127,6 @@ CONFIG_BOOTX_TEXT=y
1205# 1127#
1206# CONFIG_KEYS is not set 1128# CONFIG_KEYS is not set
1207# CONFIG_SECURITY is not set 1129# CONFIG_SECURITY is not set
1208
1209#
1210# Cryptographic options
1211#
1212CONFIG_CRYPTO=y 1130CONFIG_CRYPTO=y
1213CONFIG_CRYPTO_ALGAPI=y 1131CONFIG_CRYPTO_ALGAPI=y
1214CONFIG_CRYPTO_BLKCIPHER=y 1132CONFIG_CRYPTO_BLKCIPHER=y
@@ -1246,7 +1164,4 @@ CONFIG_CRYPTO_DES=y
1246# CONFIG_CRYPTO_CRC32C is not set 1164# CONFIG_CRYPTO_CRC32C is not set
1247# CONFIG_CRYPTO_CAMELLIA is not set 1165# CONFIG_CRYPTO_CAMELLIA is not set
1248# CONFIG_CRYPTO_TEST is not set 1166# CONFIG_CRYPTO_TEST is not set
1249 1167# CONFIG_CRYPTO_HW is not set
1250#
1251# Hardware crypto devices
1252#
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 905998b925ea..295207030c60 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,9 +1,22 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 13:51:39 2007 4# Thu Aug 30 16:40:47 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11CONFIG_POWER4_ONLY=y
12CONFIG_POWER4=y
13CONFIG_PPC_FPU=y
14CONFIG_ALTIVEC=y
15CONFIG_PPC_STD_MMU=y
16CONFIG_PPC_MM_SLICES=y
17# CONFIG_VIRT_CPU_ACCOUNTING is not set
18CONFIG_SMP=y
19CONFIG_NR_CPUS=2
7CONFIG_64BIT=y 20CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 21CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 22CONFIG_MMU=y
@@ -15,6 +28,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 28CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 29CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 30CONFIG_GENERIC_FIND_NEXT_BIT=y
31CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 32CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 33CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 34CONFIG_COMPAT=y
@@ -22,49 +36,32 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 36CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 37CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 38CONFIG_PPC_OF=y
39CONFIG_OF=y
25CONFIG_PPC_UDBG_16550=y 40CONFIG_PPC_UDBG_16550=y
26# CONFIG_GENERIC_TBSYNC is not set 41# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y 42CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 43CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 44# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34CONFIG_POWER4_ONLY=y
35CONFIG_POWER4=y
36CONFIG_PPC_FPU=y
37# CONFIG_PPC_DCR_NATIVE is not set 45# CONFIG_PPC_DCR_NATIVE is not set
38# CONFIG_PPC_DCR_MMIO is not set 46# CONFIG_PPC_DCR_MMIO is not set
39# CONFIG_PPC_OF_PLATFORM_PCI is not set 47# CONFIG_PPC_OF_PLATFORM_PCI is not set
40CONFIG_ALTIVEC=y
41CONFIG_PPC_STD_MMU=y
42CONFIG_PPC_MM_SLICES=y
43# CONFIG_VIRT_CPU_ACCOUNTING is not set
44CONFIG_SMP=y
45CONFIG_NR_CPUS=2
46CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
47 49
48# 50#
49# Code maturity level options 51# General setup
50# 52#
51CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
52CONFIG_LOCK_KERNEL=y 54CONFIG_LOCK_KERNEL=y
53CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
54
55#
56# General setup
57#
58CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
59CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
60CONFIG_SWAP=y 58CONFIG_SWAP=y
61CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
62# CONFIG_IPC_NS is not set
63CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
64# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
65# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
66# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
67# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
68# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
69# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=17 67CONFIG_LOG_BUF_SHIFT=17
@@ -99,10 +96,6 @@ CONFIG_SLAB=y
99CONFIG_RT_MUTEXES=y 96CONFIG_RT_MUTEXES=y
100# CONFIG_TINY_SHMEM is not set 97# CONFIG_TINY_SHMEM is not set
101CONFIG_BASE_SMALL=0 98CONFIG_BASE_SMALL=0
102
103#
104# Loadable module support
105#
106CONFIG_MODULES=y 99CONFIG_MODULES=y
107CONFIG_MODULE_UNLOAD=y 100CONFIG_MODULE_UNLOAD=y
108# CONFIG_MODULE_FORCE_UNLOAD is not set 101# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -110,12 +103,9 @@ CONFIG_MODULE_UNLOAD=y
110# CONFIG_MODULE_SRCVERSION_ALL is not set 103# CONFIG_MODULE_SRCVERSION_ALL is not set
111# CONFIG_KMOD is not set 104# CONFIG_KMOD is not set
112CONFIG_STOP_MACHINE=y 105CONFIG_STOP_MACHINE=y
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 106CONFIG_BLOCK=y
118# CONFIG_BLK_DEV_IO_TRACE is not set 107# CONFIG_BLK_DEV_IO_TRACE is not set
108# CONFIG_BLK_DEV_BSG is not set
119 109
120# 110#
121# IO Schedulers 111# IO Schedulers
@@ -135,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 125#
136CONFIG_PPC_MULTIPLATFORM=y 126CONFIG_PPC_MULTIPLATFORM=y
137# CONFIG_EMBEDDED6xx is not set 127# CONFIG_EMBEDDED6xx is not set
138# CONFIG_APUS is not set 128# CONFIG_PPC_82xx is not set
129# CONFIG_PPC_83xx is not set
130# CONFIG_PPC_86xx is not set
139# CONFIG_PPC_PSERIES is not set 131# CONFIG_PPC_PSERIES is not set
140# CONFIG_PPC_ISERIES is not set 132# CONFIG_PPC_ISERIES is not set
141# CONFIG_PPC_MPC52xx is not set 133# CONFIG_PPC_MPC52xx is not set
@@ -149,6 +141,7 @@ CONFIG_PPC_PASEMI=y
149# 141#
150CONFIG_PPC_PASEMI_IOMMU=y 142CONFIG_PPC_PASEMI_IOMMU=y
151CONFIG_PPC_PASEMI_MDIO=y 143CONFIG_PPC_PASEMI_MDIO=y
144CONFIG_ELECTRA_IDE=y
152# CONFIG_PPC_CELLEB is not set 145# CONFIG_PPC_CELLEB is not set
153# CONFIG_PPC_PS3 is not set 146# CONFIG_PPC_PS3 is not set
154# CONFIG_PPC_CELL is not set 147# CONFIG_PPC_CELL is not set
@@ -168,6 +161,7 @@ CONFIG_MPIC=y
168# CONFIG_GENERIC_IOMAP is not set 161# CONFIG_GENERIC_IOMAP is not set
169# CONFIG_CPU_FREQ is not set 162# CONFIG_CPU_FREQ is not set
170# CONFIG_CPM2 is not set 163# CONFIG_CPM2 is not set
164# CONFIG_FSL_ULI1575 is not set
171 165
172# 166#
173# Kernel options 167# Kernel options
@@ -204,6 +198,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
204CONFIG_SPLIT_PTLOCK_CPUS=4 198CONFIG_SPLIT_PTLOCK_CPUS=4
205CONFIG_RESOURCES_64BIT=y 199CONFIG_RESOURCES_64BIT=y
206CONFIG_ZONE_DMA_FLAG=1 200CONFIG_ZONE_DMA_FLAG=1
201CONFIG_BOUNCE=y
207# CONFIG_PPC_HAS_HASH_64K is not set 202# CONFIG_PPC_HAS_HASH_64K is not set
208# CONFIG_PPC_64K_PAGES is not set 203# CONFIG_PPC_64K_PAGES is not set
209# CONFIG_SCHED_SMT is not set 204# CONFIG_SCHED_SMT is not set
@@ -222,6 +217,7 @@ CONFIG_GENERIC_ISA_DMA=y
222# CONFIG_PPC_INDIRECT_PCI is not set 217# CONFIG_PPC_INDIRECT_PCI is not set
223CONFIG_PCI=y 218CONFIG_PCI=y
224CONFIG_PCI_DOMAINS=y 219CONFIG_PCI_DOMAINS=y
220CONFIG_PCI_SYSCALL=y
225# CONFIG_PCIEPORTBUS is not set 221# CONFIG_PCIEPORTBUS is not set
226CONFIG_ARCH_SUPPORTS_MSI=y 222CONFIG_ARCH_SUPPORTS_MSI=y
227# CONFIG_PCI_MSI is not set 223# CONFIG_PCI_MSI is not set
@@ -332,6 +328,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_MAC80211 is not set 328# CONFIG_MAC80211 is not set
333# CONFIG_IEEE80211 is not set 329# CONFIG_IEEE80211 is not set
334# CONFIG_RFKILL is not set 330# CONFIG_RFKILL is not set
331# CONFIG_NET_9P is not set
335 332
336# 333#
337# Device Drivers 334# Device Drivers
@@ -346,10 +343,6 @@ CONFIG_FW_LOADER=y
346# CONFIG_DEBUG_DRIVER is not set 343# CONFIG_DEBUG_DRIVER is not set
347# CONFIG_DEBUG_DEVRES is not set 344# CONFIG_DEBUG_DEVRES is not set
348# CONFIG_SYS_HYPERVISOR is not set 345# CONFIG_SYS_HYPERVISOR is not set
349
350#
351# Connector - unified userspace <-> kernelspace linker
352#
353# CONFIG_CONNECTOR is not set 346# CONFIG_CONNECTOR is not set
354CONFIG_MTD=y 347CONFIG_MTD=y
355# CONFIG_MTD_DEBUG is not set 348# CONFIG_MTD_DEBUG is not set
@@ -415,22 +408,10 @@ CONFIG_MTD_PHRAM=y
415# UBI - Unsorted block images 408# UBI - Unsorted block images
416# 409#
417# CONFIG_MTD_UBI is not set 410# CONFIG_MTD_UBI is not set
418 411CONFIG_OF_DEVICE=y
419#
420# Parallel port support
421#
422# CONFIG_PARPORT is not set 412# CONFIG_PARPORT is not set
423 413CONFIG_BLK_DEV=y
424#
425# Plug and Play support
426#
427# CONFIG_PNPACPI is not set
428
429#
430# Block devices
431#
432# CONFIG_BLK_DEV_FD is not set 414# CONFIG_BLK_DEV_FD is not set
433# CONFIG_BLK_CPQ_DA is not set
434# CONFIG_BLK_CPQ_CISS_DA is not set 415# CONFIG_BLK_CPQ_CISS_DA is not set
435# CONFIG_BLK_DEV_DAC960 is not set 416# CONFIG_BLK_DEV_DAC960 is not set
436# CONFIG_BLK_DEV_UMEM is not set 417# CONFIG_BLK_DEV_UMEM is not set
@@ -446,14 +427,11 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
446CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 427CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
447# CONFIG_CDROM_PKTCDVD is not set 428# CONFIG_CDROM_PKTCDVD is not set
448# CONFIG_ATA_OVER_ETH is not set 429# CONFIG_ATA_OVER_ETH is not set
449 430CONFIG_MISC_DEVICES=y
450#
451# Misc devices
452#
453# CONFIG_PHANTOM is not set 431# CONFIG_PHANTOM is not set
432# CONFIG_EEPROM_93CX6 is not set
454# CONFIG_SGI_IOC4 is not set 433# CONFIG_SGI_IOC4 is not set
455# CONFIG_TIFM_CORE is not set 434# CONFIG_TIFM_CORE is not set
456# CONFIG_BLINK is not set
457CONFIG_IDE=y 435CONFIG_IDE=y
458CONFIG_BLK_DEV_IDE=y 436CONFIG_BLK_DEV_IDE=y
459 437
@@ -487,6 +465,7 @@ CONFIG_IDE_PROC_FS=y
487# 465#
488# CONFIG_RAID_ATTRS is not set 466# CONFIG_RAID_ATTRS is not set
489CONFIG_SCSI=y 467CONFIG_SCSI=y
468CONFIG_SCSI_DMA=y
490# CONFIG_SCSI_TGT is not set 469# CONFIG_SCSI_TGT is not set
491# CONFIG_SCSI_NETLINK is not set 470# CONFIG_SCSI_NETLINK is not set
492CONFIG_SCSI_PROC_FS=y 471CONFIG_SCSI_PROC_FS=y
@@ -517,12 +496,8 @@ CONFIG_SCSI_WAIT_SCAN=m
517# CONFIG_SCSI_SPI_ATTRS is not set 496# CONFIG_SCSI_SPI_ATTRS is not set
518# CONFIG_SCSI_FC_ATTRS is not set 497# CONFIG_SCSI_FC_ATTRS is not set
519# CONFIG_SCSI_ISCSI_ATTRS is not set 498# CONFIG_SCSI_ISCSI_ATTRS is not set
520# CONFIG_SCSI_SAS_ATTRS is not set
521# CONFIG_SCSI_SAS_LIBSAS is not set 499# CONFIG_SCSI_SAS_LIBSAS is not set
522 500CONFIG_SCSI_LOWLEVEL=y
523#
524# SCSI low-level drivers
525#
526# CONFIG_ISCSI_TCP is not set 501# CONFIG_ISCSI_TCP is not set
527CONFIG_BLK_DEV_3W_XXXX_RAID=y 502CONFIG_BLK_DEV_3W_XXXX_RAID=y
528CONFIG_SCSI_3W_9XXX=y 503CONFIG_SCSI_3W_9XXX=y
@@ -537,7 +512,6 @@ CONFIG_SCSI_3W_9XXX=y
537# CONFIG_MEGARAID_LEGACY is not set 512# CONFIG_MEGARAID_LEGACY is not set
538# CONFIG_MEGARAID_SAS is not set 513# CONFIG_MEGARAID_SAS is not set
539# CONFIG_SCSI_HPTIOP is not set 514# CONFIG_SCSI_HPTIOP is not set
540# CONFIG_SCSI_BUSLOGIC is not set
541# CONFIG_SCSI_DMX3191D is not set 515# CONFIG_SCSI_DMX3191D is not set
542# CONFIG_SCSI_EATA is not set 516# CONFIG_SCSI_EATA is not set
543# CONFIG_SCSI_FUTURE_DOMAIN is not set 517# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -556,13 +530,7 @@ CONFIG_SCSI_3W_9XXX=y
556# CONFIG_SCSI_DC390T is not set 530# CONFIG_SCSI_DC390T is not set
557# CONFIG_SCSI_DEBUG is not set 531# CONFIG_SCSI_DEBUG is not set
558# CONFIG_SCSI_SRP is not set 532# CONFIG_SCSI_SRP is not set
559 533# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
560#
561# PCMCIA SCSI adapter support
562#
563# CONFIG_PCMCIA_FDOMAIN is not set
564# CONFIG_PCMCIA_QLOGIC is not set
565# CONFIG_PCMCIA_SYM53C500 is not set
566CONFIG_ATA=y 534CONFIG_ATA=y
567# CONFIG_ATA_NONSTANDARD is not set 535# CONFIG_ATA_NONSTANDARD is not set
568# CONFIG_SATA_AHCI is not set 536# CONFIG_SATA_AHCI is not set
@@ -618,10 +586,7 @@ CONFIG_ATA_GENERIC=y
618# CONFIG_PATA_SIS is not set 586# CONFIG_PATA_SIS is not set
619# CONFIG_PATA_VIA is not set 587# CONFIG_PATA_VIA is not set
620# CONFIG_PATA_WINBOND is not set 588# CONFIG_PATA_WINBOND is not set
621 589CONFIG_PATA_PLATFORM=y
622#
623# Multi-device support (RAID and LVM)
624#
625# CONFIG_MD is not set 590# CONFIG_MD is not set
626 591
627# 592#
@@ -658,19 +623,13 @@ CONFIG_IEEE1394_SBP2=y
658# CONFIG_IEEE1394_ETH1394 is not set 623# CONFIG_IEEE1394_ETH1394 is not set
659# CONFIG_IEEE1394_DV1394 is not set 624# CONFIG_IEEE1394_DV1394 is not set
660CONFIG_IEEE1394_RAWIO=y 625CONFIG_IEEE1394_RAWIO=y
661
662#
663# I2O device support
664#
665# CONFIG_I2O is not set 626# CONFIG_I2O is not set
666# CONFIG_MACINTOSH_DRIVERS is not set 627# CONFIG_MACINTOSH_DRIVERS is not set
667
668#
669# Network device support
670#
671CONFIG_NETDEVICES=y 628CONFIG_NETDEVICES=y
629# CONFIG_NETDEVICES_MULTIQUEUE is not set
672CONFIG_DUMMY=y 630CONFIG_DUMMY=y
673# CONFIG_BONDING is not set 631# CONFIG_BONDING is not set
632# CONFIG_MACVLAN is not set
674# CONFIG_EQUALIZER is not set 633# CONFIG_EQUALIZER is not set
675# CONFIG_TUN is not set 634# CONFIG_TUN is not set
676# CONFIG_ARCNET is not set 635# CONFIG_ARCNET is not set
@@ -687,21 +646,14 @@ CONFIG_MARVELL_PHY=y
687# CONFIG_VITESSE_PHY is not set 646# CONFIG_VITESSE_PHY is not set
688# CONFIG_SMSC_PHY is not set 647# CONFIG_SMSC_PHY is not set
689# CONFIG_BROADCOM_PHY is not set 648# CONFIG_BROADCOM_PHY is not set
649# CONFIG_ICPLUS_PHY is not set
690# CONFIG_FIXED_PHY is not set 650# CONFIG_FIXED_PHY is not set
691
692#
693# Ethernet (10 or 100Mbit)
694#
695CONFIG_NET_ETHERNET=y 651CONFIG_NET_ETHERNET=y
696CONFIG_MII=y 652CONFIG_MII=y
697# CONFIG_HAPPYMEAL is not set 653# CONFIG_HAPPYMEAL is not set
698# CONFIG_SUNGEM is not set 654# CONFIG_SUNGEM is not set
699# CONFIG_CASSINI is not set 655# CONFIG_CASSINI is not set
700# CONFIG_NET_VENDOR_3COM is not set 656# CONFIG_NET_VENDOR_3COM is not set
701
702#
703# Tulip family network device support
704#
705# CONFIG_NET_TULIP is not set 657# CONFIG_NET_TULIP is not set
706# CONFIG_HP100 is not set 658# CONFIG_HP100 is not set
707CONFIG_NET_PCI=y 659CONFIG_NET_PCI=y
@@ -736,7 +688,6 @@ CONFIG_E1000_NAPI=y
736# CONFIG_SIS190 is not set 688# CONFIG_SIS190 is not set
737# CONFIG_SKGE is not set 689# CONFIG_SKGE is not set
738# CONFIG_SKY2 is not set 690# CONFIG_SKY2 is not set
739# CONFIG_SK98LIN is not set
740# CONFIG_VIA_VELOCITY is not set 691# CONFIG_VIA_VELOCITY is not set
741CONFIG_TIGON3=y 692CONFIG_TIGON3=y
742# CONFIG_BNX2 is not set 693# CONFIG_BNX2 is not set
@@ -779,15 +730,7 @@ CONFIG_PASEMI_MAC=y
779# CONFIG_NETCONSOLE is not set 730# CONFIG_NETCONSOLE is not set
780# CONFIG_NETPOLL is not set 731# CONFIG_NETPOLL is not set
781# CONFIG_NET_POLL_CONTROLLER is not set 732# CONFIG_NET_POLL_CONTROLLER is not set
782
783#
784# ISDN subsystem
785#
786# CONFIG_ISDN is not set 733# CONFIG_ISDN is not set
787
788#
789# Telephony Support
790#
791# CONFIG_PHONE is not set 734# CONFIG_PHONE is not set
792 735
793# 736#
@@ -865,10 +808,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
865CONFIG_UNIX98_PTYS=y 808CONFIG_UNIX98_PTYS=y
866CONFIG_LEGACY_PTYS=y 809CONFIG_LEGACY_PTYS=y
867CONFIG_LEGACY_PTY_COUNT=4 810CONFIG_LEGACY_PTY_COUNT=4
868
869#
870# IPMI
871#
872# CONFIG_IPMI_HANDLER is not set 811# CONFIG_IPMI_HANDLER is not set
873# CONFIG_WATCHDOG is not set 812# CONFIG_WATCHDOG is not set
874CONFIG_HW_RANDOM=y 813CONFIG_HW_RANDOM=y
@@ -889,10 +828,6 @@ CONFIG_GEN_RTC_X=y
889CONFIG_RAW_DRIVER=y 828CONFIG_RAW_DRIVER=y
890CONFIG_MAX_RAW_DEVS=256 829CONFIG_MAX_RAW_DEVS=256
891# CONFIG_HANGCHECK_TIMER is not set 830# CONFIG_HANGCHECK_TIMER is not set
892
893#
894# TPM devices
895#
896# CONFIG_TCG_TPM is not set 831# CONFIG_TCG_TPM is not set
897CONFIG_DEVPORT=y 832CONFIG_DEVPORT=y
898CONFIG_I2C=y 833CONFIG_I2C=y
@@ -927,6 +862,7 @@ CONFIG_I2C_PASEMI=y
927# CONFIG_I2C_SIS5595 is not set 862# CONFIG_I2C_SIS5595 is not set
928# CONFIG_I2C_SIS630 is not set 863# CONFIG_I2C_SIS630 is not set
929# CONFIG_I2C_SIS96X is not set 864# CONFIG_I2C_SIS96X is not set
865# CONFIG_I2C_TAOS_EVM is not set
930# CONFIG_I2C_STUB is not set 866# CONFIG_I2C_STUB is not set
931# CONFIG_I2C_TINY_USB is not set 867# CONFIG_I2C_TINY_USB is not set
932# CONFIG_I2C_VIA is not set 868# CONFIG_I2C_VIA is not set
@@ -938,11 +874,13 @@ CONFIG_I2C_PASEMI=y
938# 874#
939# CONFIG_SENSORS_DS1337 is not set 875# CONFIG_SENSORS_DS1337 is not set
940# CONFIG_SENSORS_DS1374 is not set 876# CONFIG_SENSORS_DS1374 is not set
877# CONFIG_DS1682 is not set
941CONFIG_SENSORS_EEPROM=y 878CONFIG_SENSORS_EEPROM=y
942# CONFIG_SENSORS_PCF8574 is not set 879# CONFIG_SENSORS_PCF8574 is not set
943# CONFIG_SENSORS_PCA9539 is not set 880# CONFIG_SENSORS_PCA9539 is not set
944# CONFIG_SENSORS_PCF8591 is not set 881# CONFIG_SENSORS_PCF8591 is not set
945# CONFIG_SENSORS_MAX6875 is not set 882# CONFIG_SENSORS_MAX6875 is not set
883# CONFIG_SENSORS_TSL2550 is not set
946# CONFIG_I2C_DEBUG_CORE is not set 884# CONFIG_I2C_DEBUG_CORE is not set
947# CONFIG_I2C_DEBUG_ALGO is not set 885# CONFIG_I2C_DEBUG_ALGO is not set
948# CONFIG_I2C_DEBUG_BUS is not set 886# CONFIG_I2C_DEBUG_BUS is not set
@@ -953,14 +891,12 @@ CONFIG_SENSORS_EEPROM=y
953# 891#
954# CONFIG_SPI is not set 892# CONFIG_SPI is not set
955# CONFIG_SPI_MASTER is not set 893# CONFIG_SPI_MASTER is not set
956
957#
958# Dallas's 1-wire bus
959#
960# CONFIG_W1 is not set 894# CONFIG_W1 is not set
895# CONFIG_POWER_SUPPLY is not set
961CONFIG_HWMON=y 896CONFIG_HWMON=y
962CONFIG_HWMON_VID=y 897CONFIG_HWMON_VID=y
963# CONFIG_SENSORS_ABITUGURU is not set 898# CONFIG_SENSORS_ABITUGURU is not set
899# CONFIG_SENSORS_ABITUGURU3 is not set
964# CONFIG_SENSORS_AD7418 is not set 900# CONFIG_SENSORS_AD7418 is not set
965# CONFIG_SENSORS_ADM1021 is not set 901# CONFIG_SENSORS_ADM1021 is not set
966# CONFIG_SENSORS_ADM1025 is not set 902# CONFIG_SENSORS_ADM1025 is not set
@@ -987,14 +923,17 @@ CONFIG_SENSORS_LM85=y
987# CONFIG_SENSORS_LM87 is not set 923# CONFIG_SENSORS_LM87 is not set
988CONFIG_SENSORS_LM90=y 924CONFIG_SENSORS_LM90=y
989# CONFIG_SENSORS_LM92 is not set 925# CONFIG_SENSORS_LM92 is not set
926# CONFIG_SENSORS_LM93 is not set
990# CONFIG_SENSORS_MAX1619 is not set 927# CONFIG_SENSORS_MAX1619 is not set
991# CONFIG_SENSORS_MAX6650 is not set 928# CONFIG_SENSORS_MAX6650 is not set
992# CONFIG_SENSORS_PC87360 is not set 929# CONFIG_SENSORS_PC87360 is not set
993# CONFIG_SENSORS_PC87427 is not set 930# CONFIG_SENSORS_PC87427 is not set
994# CONFIG_SENSORS_SIS5595 is not set 931# CONFIG_SENSORS_SIS5595 is not set
932# CONFIG_SENSORS_DME1737 is not set
995# CONFIG_SENSORS_SMSC47M1 is not set 933# CONFIG_SENSORS_SMSC47M1 is not set
996# CONFIG_SENSORS_SMSC47M192 is not set 934# CONFIG_SENSORS_SMSC47M192 is not set
997# CONFIG_SENSORS_SMSC47B397 is not set 935# CONFIG_SENSORS_SMSC47B397 is not set
936# CONFIG_SENSORS_THMC50 is not set
998# CONFIG_SENSORS_VIA686A is not set 937# CONFIG_SENSORS_VIA686A is not set
999# CONFIG_SENSORS_VT1211 is not set 938# CONFIG_SENSORS_VT1211 is not set
1000# CONFIG_SENSORS_VT8231 is not set 939# CONFIG_SENSORS_VT8231 is not set
@@ -1024,14 +963,15 @@ CONFIG_DAB=y
1024# Graphics support 963# Graphics support
1025# 964#
1026CONFIG_BACKLIGHT_LCD_SUPPORT=y 965CONFIG_BACKLIGHT_LCD_SUPPORT=y
1027CONFIG_BACKLIGHT_CLASS_DEVICE=y
1028CONFIG_LCD_CLASS_DEVICE=m 966CONFIG_LCD_CLASS_DEVICE=m
967CONFIG_BACKLIGHT_CLASS_DEVICE=y
1029 968
1030# 969#
1031# Display device support 970# Display device support
1032# 971#
1033# CONFIG_DISPLAY_SUPPORT is not set 972# CONFIG_DISPLAY_SUPPORT is not set
1034CONFIG_VGASTATE=y 973CONFIG_VGASTATE=y
974# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1035CONFIG_FB=y 975CONFIG_FB=y
1036CONFIG_FIRMWARE_EDID=y 976CONFIG_FIRMWARE_EDID=y
1037CONFIG_FB_DDC=y 977CONFIG_FB_DDC=y
@@ -1094,6 +1034,7 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
1094CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 1034CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
1095CONFIG_DUMMY_CONSOLE=y 1035CONFIG_DUMMY_CONSOLE=y
1096CONFIG_FRAMEBUFFER_CONSOLE=y 1036CONFIG_FRAMEBUFFER_CONSOLE=y
1037# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1097# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1038# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1098# CONFIG_FONTS is not set 1039# CONFIG_FONTS is not set
1099CONFIG_FONT_8x8=y 1040CONFIG_FONT_8x8=y
@@ -1156,6 +1097,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1156# CONFIG_SND_CMIPCI is not set 1097# CONFIG_SND_CMIPCI is not set
1157# CONFIG_SND_CS4281 is not set 1098# CONFIG_SND_CS4281 is not set
1158# CONFIG_SND_CS46XX is not set 1099# CONFIG_SND_CS46XX is not set
1100# CONFIG_SND_CS5530 is not set
1159# CONFIG_SND_DARLA20 is not set 1101# CONFIG_SND_DARLA20 is not set
1160# CONFIG_SND_GINA20 is not set 1102# CONFIG_SND_GINA20 is not set
1161# CONFIG_SND_LAYLA20 is not set 1103# CONFIG_SND_LAYLA20 is not set
@@ -1203,6 +1145,10 @@ CONFIG_SND_VERBOSE_PROCFS=y
1203# 1145#
1204 1146
1205# 1147#
1148# ALSA PowerPC devices
1149#
1150
1151#
1206# USB devices 1152# USB devices
1207# 1153#
1208CONFIG_SND_USB_AUDIO=y 1154CONFIG_SND_USB_AUDIO=y
@@ -1221,13 +1167,14 @@ CONFIG_SND_USB_USX2Y=y
1221# CONFIG_SND_SOC is not set 1167# CONFIG_SND_SOC is not set
1222 1168
1223# 1169#
1224# Open Sound System 1170# SoC Audio support for SuperH
1225# 1171#
1226# CONFIG_SOUND_PRIME is not set
1227 1172
1228# 1173#
1229# HID Devices 1174# Open Sound System
1230# 1175#
1176# CONFIG_SOUND_PRIME is not set
1177CONFIG_HID_SUPPORT=y
1231CONFIG_HID=y 1178CONFIG_HID=y
1232# CONFIG_HID_DEBUG is not set 1179# CONFIG_HID_DEBUG is not set
1233 1180
@@ -1238,10 +1185,7 @@ CONFIG_USB_HID=y
1238# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1185# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1239# CONFIG_HID_FF is not set 1186# CONFIG_HID_FF is not set
1240# CONFIG_USB_HIDDEV is not set 1187# CONFIG_USB_HIDDEV is not set
1241 1188CONFIG_USB_SUPPORT=y
1242#
1243# USB support
1244#
1245CONFIG_USB_ARCH_HAS_HCD=y 1189CONFIG_USB_ARCH_HAS_HCD=y
1246CONFIG_USB_ARCH_HAS_OHCI=y 1190CONFIG_USB_ARCH_HAS_OHCI=y
1247CONFIG_USB_ARCH_HAS_EHCI=y 1191CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1263,7 +1207,6 @@ CONFIG_USB_EHCI_HCD=y
1263# CONFIG_USB_EHCI_SPLIT_ISO is not set 1207# CONFIG_USB_EHCI_SPLIT_ISO is not set
1264# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1208# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1265# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1209# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1266# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1267# CONFIG_USB_ISP116X_HCD is not set 1210# CONFIG_USB_ISP116X_HCD is not set
1268CONFIG_USB_OHCI_HCD=y 1211CONFIG_USB_OHCI_HCD=y
1269CONFIG_USB_OHCI_HCD_PPC_OF=y 1212CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1276,6 +1219,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1276CONFIG_USB_UHCI_HCD=y 1219CONFIG_USB_UHCI_HCD=y
1277CONFIG_USB_SL811_HCD=y 1220CONFIG_USB_SL811_HCD=y
1278# CONFIG_USB_SL811_CS is not set 1221# CONFIG_USB_SL811_CS is not set
1222# CONFIG_USB_R8A66597_HCD is not set
1279 1223
1280# 1224#
1281# USB Device Class drivers 1225# USB Device Class drivers
@@ -1354,32 +1298,16 @@ CONFIG_USB_LIBUSUAL=y
1354# 1298#
1355# CONFIG_USB_GADGET is not set 1299# CONFIG_USB_GADGET is not set
1356# CONFIG_MMC is not set 1300# CONFIG_MMC is not set
1357
1358#
1359# LED devices
1360#
1361# CONFIG_NEW_LEDS is not set 1301# CONFIG_NEW_LEDS is not set
1362
1363#
1364# LED drivers
1365#
1366
1367#
1368# LED Triggers
1369#
1370
1371#
1372# InfiniBand support
1373#
1374# CONFIG_INFINIBAND is not set 1302# CONFIG_INFINIBAND is not set
1303CONFIG_EDAC=y
1375 1304
1376# 1305#
1377# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1306# Reporting subsystems
1378#
1379
1380#
1381# Real Time Clock
1382# 1307#
1308# CONFIG_EDAC_DEBUG is not set
1309CONFIG_EDAC_MM_EDAC=y
1310CONFIG_EDAC_PASEMI=y
1383CONFIG_RTC_LIB=y 1311CONFIG_RTC_LIB=y
1384CONFIG_RTC_CLASS=y 1312CONFIG_RTC_CLASS=y
1385CONFIG_RTC_HCTOSYS=y 1313CONFIG_RTC_HCTOSYS=y
@@ -1406,6 +1334,7 @@ CONFIG_RTC_DRV_DS1307=y
1406# CONFIG_RTC_DRV_X1205 is not set 1334# CONFIG_RTC_DRV_X1205 is not set
1407# CONFIG_RTC_DRV_PCF8563 is not set 1335# CONFIG_RTC_DRV_PCF8563 is not set
1408# CONFIG_RTC_DRV_PCF8583 is not set 1336# CONFIG_RTC_DRV_PCF8583 is not set
1337# CONFIG_RTC_DRV_M41T80 is not set
1409 1338
1410# 1339#
1411# SPI RTC drivers 1340# SPI RTC drivers
@@ -1414,9 +1343,12 @@ CONFIG_RTC_DRV_DS1307=y
1414# 1343#
1415# Platform RTC drivers 1344# Platform RTC drivers
1416# 1345#
1346# CONFIG_RTC_DRV_CMOS is not set
1417# CONFIG_RTC_DRV_DS1553 is not set 1347# CONFIG_RTC_DRV_DS1553 is not set
1348# CONFIG_RTC_DRV_STK17TA8 is not set
1418# CONFIG_RTC_DRV_DS1742 is not set 1349# CONFIG_RTC_DRV_DS1742 is not set
1419# CONFIG_RTC_DRV_M48T86 is not set 1350# CONFIG_RTC_DRV_M48T86 is not set
1351# CONFIG_RTC_DRV_M48T59 is not set
1420# CONFIG_RTC_DRV_V3020 is not set 1352# CONFIG_RTC_DRV_V3020 is not set
1421 1353
1422# 1354#
@@ -1437,6 +1369,11 @@ CONFIG_RTC_DRV_DS1307=y
1437# 1369#
1438 1370
1439# 1371#
1372# Userspace I/O
1373#
1374# CONFIG_UIO is not set
1375
1376#
1440# File systems 1377# File systems
1441# 1378#
1442CONFIG_EXT2_FS=y 1379CONFIG_EXT2_FS=y
@@ -1541,7 +1478,6 @@ CONFIG_SUNRPC=y
1541# CONFIG_NCP_FS is not set 1478# CONFIG_NCP_FS is not set
1542# CONFIG_CODA_FS is not set 1479# CONFIG_CODA_FS is not set
1543# CONFIG_AFS_FS is not set 1480# CONFIG_AFS_FS is not set
1544# CONFIG_9P_FS is not set
1545 1481
1546# 1482#
1547# Partition Types 1483# Partition Types
@@ -1623,6 +1559,7 @@ CONFIG_CRC_CCITT=y
1623# CONFIG_CRC16 is not set 1559# CONFIG_CRC16 is not set
1624# CONFIG_CRC_ITU_T is not set 1560# CONFIG_CRC_ITU_T is not set
1625CONFIG_CRC32=y 1561CONFIG_CRC32=y
1562# CONFIG_CRC7 is not set
1626# CONFIG_LIBCRC32C is not set 1563# CONFIG_LIBCRC32C is not set
1627CONFIG_PLIST=y 1564CONFIG_PLIST=y
1628CONFIG_HAS_IOMEM=y 1565CONFIG_HAS_IOMEM=y
@@ -1648,6 +1585,7 @@ CONFIG_MAGIC_SYSRQ=y
1648CONFIG_DEBUG_KERNEL=y 1585CONFIG_DEBUG_KERNEL=y
1649# CONFIG_DEBUG_SHIRQ is not set 1586# CONFIG_DEBUG_SHIRQ is not set
1650CONFIG_DETECT_SOFTLOCKUP=y 1587CONFIG_DETECT_SOFTLOCKUP=y
1588CONFIG_SCHED_DEBUG=y
1651# CONFIG_SCHEDSTATS is not set 1589# CONFIG_SCHEDSTATS is not set
1652# CONFIG_TIMER_STATS is not set 1590# CONFIG_TIMER_STATS is not set
1653# CONFIG_DEBUG_SLAB is not set 1591# CONFIG_DEBUG_SLAB is not set
@@ -1681,10 +1619,6 @@ CONFIG_XMON_DISASSEMBLY=y
1681# 1619#
1682# CONFIG_KEYS is not set 1620# CONFIG_KEYS is not set
1683# CONFIG_SECURITY is not set 1621# CONFIG_SECURITY is not set
1684
1685#
1686# Cryptographic options
1687#
1688CONFIG_CRYPTO=y 1622CONFIG_CRYPTO=y
1689CONFIG_CRYPTO_ALGAPI=y 1623CONFIG_CRYPTO_ALGAPI=y
1690CONFIG_CRYPTO_BLKCIPHER=y 1624CONFIG_CRYPTO_BLKCIPHER=y
@@ -1723,7 +1657,4 @@ CONFIG_CRYPTO_DES=y
1723# CONFIG_CRYPTO_CRC32C is not set 1657# CONFIG_CRYPTO_CRC32C is not set
1724# CONFIG_CRYPTO_CAMELLIA is not set 1658# CONFIG_CRYPTO_CAMELLIA is not set
1725# CONFIG_CRYPTO_TEST is not set 1659# CONFIG_CRYPTO_TEST is not set
1726 1660# CONFIG_CRYPTO_HW is not set
1727#
1728# Hardware crypto devices
1729#
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 08525d6fb1f1..cfc9c6573a3c 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,10 +1,25 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 14:11:36 2007 4# Thu Aug 30 16:44:46 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7CONFIG_PPC_PM_NEEDS_RTC_LIB=y 7
8#
9# Processor support
10#
11CONFIG_6xx=y
12# CONFIG_PPC_85xx is not set
13# CONFIG_PPC_8xx is not set
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_PPC_FPU=y
18CONFIG_ALTIVEC=y
19CONFIG_PPC_STD_MMU=y
20CONFIG_PPC_STD_MMU_32=y
21# CONFIG_PPC_MM_SLICES is not set
22# CONFIG_SMP is not set
8CONFIG_PPC32=y 23CONFIG_PPC32=y
9CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
10CONFIG_MMU=y 25CONFIG_MMU=y
@@ -15,62 +30,39 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
15CONFIG_GENERIC_HWEIGHT=y 30CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 31CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 32CONFIG_GENERIC_FIND_NEXT_BIT=y
33# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
18CONFIG_PPC=y 34CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 35CONFIG_EARLY_PRINTK=y
20CONFIG_GENERIC_NVRAM=y 36CONFIG_GENERIC_NVRAM=y
21CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
22CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
23CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
24# CONFIG_PPC_UDBG_16550 is not set 41# CONFIG_PPC_UDBG_16550 is not set
25# CONFIG_GENERIC_TBSYNC is not set 42# CONFIG_GENERIC_TBSYNC is not set
26CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
27CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
28CONFIG_SYS_SUPPORTS_APM_EMULATION=y 45CONFIG_SYS_SUPPORTS_APM_EMULATION=y
29# CONFIG_DEFAULT_UIMAGE is not set 46# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34CONFIG_CLASSIC32=y
35# CONFIG_PPC_82xx is not set
36# CONFIG_PPC_83xx is not set
37# CONFIG_PPC_85xx is not set
38# CONFIG_PPC_86xx is not set
39# CONFIG_PPC_8xx is not set
40# CONFIG_40x is not set
41# CONFIG_44x is not set
42# CONFIG_E200 is not set
43CONFIG_6xx=y
44CONFIG_PPC_FPU=y
45# CONFIG_PPC_DCR_NATIVE is not set 47# CONFIG_PPC_DCR_NATIVE is not set
46# CONFIG_PPC_DCR_MMIO is not set 48# CONFIG_PPC_DCR_MMIO is not set
47CONFIG_ALTIVEC=y
48CONFIG_PPC_STD_MMU=y
49CONFIG_PPC_STD_MMU_32=y
50# CONFIG_PPC_MM_SLICES is not set
51# CONFIG_SMP is not set
52CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
53 50
54# 51#
55# Code maturity level options 52# General setup
56# 53#
57CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
58CONFIG_BROKEN_ON_SMP=y 55CONFIG_BROKEN_ON_SMP=y
59CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
60
61#
62# General setup
63#
64CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
65# CONFIG_LOCALVERSION_AUTO is not set 58# CONFIG_LOCALVERSION_AUTO is not set
66CONFIG_SWAP=y 59CONFIG_SWAP=y
67CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
68# CONFIG_IPC_NS is not set
69CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
70CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
71# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
72# CONFIG_TASKSTATS is not set 64# CONFIG_TASKSTATS is not set
73# CONFIG_UTS_NS is not set 65# CONFIG_USER_NS is not set
74# CONFIG_AUDIT is not set 66# CONFIG_AUDIT is not set
75CONFIG_IKCONFIG=y 67CONFIG_IKCONFIG=y
76CONFIG_IKCONFIG_PROC=y 68CONFIG_IKCONFIG_PROC=y
@@ -105,24 +97,17 @@ CONFIG_SLAB=y
105CONFIG_RT_MUTEXES=y 97CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 98# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 99CONFIG_BASE_SMALL=0
108
109#
110# Loadable module support
111#
112CONFIG_MODULES=y 100CONFIG_MODULES=y
113CONFIG_MODULE_UNLOAD=y 101CONFIG_MODULE_UNLOAD=y
114CONFIG_MODULE_FORCE_UNLOAD=y 102CONFIG_MODULE_FORCE_UNLOAD=y
115# CONFIG_MODVERSIONS is not set 103# CONFIG_MODVERSIONS is not set
116# CONFIG_MODULE_SRCVERSION_ALL is not set 104# CONFIG_MODULE_SRCVERSION_ALL is not set
117CONFIG_KMOD=y 105CONFIG_KMOD=y
118
119#
120# Block layer
121#
122CONFIG_BLOCK=y 106CONFIG_BLOCK=y
123CONFIG_LBD=y 107CONFIG_LBD=y
124# CONFIG_BLK_DEV_IO_TRACE is not set 108# CONFIG_BLK_DEV_IO_TRACE is not set
125CONFIG_LSF=y 109CONFIG_LSF=y
110CONFIG_BLK_DEV_BSG=y
126 111
127# 112#
128# IO Schedulers 113# IO Schedulers
@@ -142,7 +127,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
142# 127#
143CONFIG_PPC_MULTIPLATFORM=y 128CONFIG_PPC_MULTIPLATFORM=y
144# CONFIG_EMBEDDED6xx is not set 129# CONFIG_EMBEDDED6xx is not set
145# CONFIG_APUS is not set 130# CONFIG_PPC_82xx is not set
131# CONFIG_PPC_83xx is not set
132# CONFIG_PPC_86xx is not set
133CONFIG_CLASSIC32=y
146# CONFIG_PPC_CHRP is not set 134# CONFIG_PPC_CHRP is not set
147# CONFIG_PPC_MPC52xx is not set 135# CONFIG_PPC_MPC52xx is not set
148# CONFIG_PPC_MPC5200 is not set 136# CONFIG_PPC_MPC5200 is not set
@@ -182,6 +170,7 @@ CONFIG_CPU_FREQ_PMAC=y
182CONFIG_PPC601_SYNC_FIX=y 170CONFIG_PPC601_SYNC_FIX=y
183# CONFIG_TAU is not set 171# CONFIG_TAU is not set
184# CONFIG_CPM2 is not set 172# CONFIG_CPM2 is not set
173# CONFIG_FSL_ULI1575 is not set
185 174
186# 175#
187# Kernel options 176# Kernel options
@@ -211,13 +200,17 @@ CONFIG_FLAT_NODE_MEM_MAP=y
211CONFIG_SPLIT_PTLOCK_CPUS=4 200CONFIG_SPLIT_PTLOCK_CPUS=4
212# CONFIG_RESOURCES_64BIT is not set 201# CONFIG_RESOURCES_64BIT is not set
213CONFIG_ZONE_DMA_FLAG=1 202CONFIG_ZONE_DMA_FLAG=1
203CONFIG_BOUNCE=y
204CONFIG_VIRT_TO_BUS=y
214CONFIG_PROC_DEVICETREE=y 205CONFIG_PROC_DEVICETREE=y
215# CONFIG_CMDLINE_BOOL is not set 206# CONFIG_CMDLINE_BOOL is not set
216CONFIG_PM=y 207CONFIG_PM=y
217# CONFIG_PM_LEGACY is not set 208# CONFIG_PM_LEGACY is not set
218CONFIG_PM_DEBUG=y 209CONFIG_PM_DEBUG=y
210# CONFIG_PM_VERBOSE is not set
219# CONFIG_DISABLE_CONSOLE_SUSPEND is not set 211# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
220CONFIG_PM_SYSFS_DEPRECATED=y 212CONFIG_PM_SLEEP=y
213CONFIG_SUSPEND=y
221CONFIG_HIBERNATION=y 214CONFIG_HIBERNATION=y
222CONFIG_PM_STD_PARTITION="" 215CONFIG_PM_STD_PARTITION=""
223CONFIG_APM_EMULATION=y 216CONFIG_APM_EMULATION=y
@@ -231,9 +224,9 @@ CONFIG_ISA_DMA_API=y
231CONFIG_ZONE_DMA=y 224CONFIG_ZONE_DMA=y
232CONFIG_GENERIC_ISA_DMA=y 225CONFIG_GENERIC_ISA_DMA=y
233CONFIG_PPC_INDIRECT_PCI=y 226CONFIG_PPC_INDIRECT_PCI=y
234# CONFIG_PPC_INDIRECT_PCI_BE is not set
235CONFIG_PCI=y 227CONFIG_PCI=y
236CONFIG_PCI_DOMAINS=y 228CONFIG_PCI_DOMAINS=y
229CONFIG_PCI_SYSCALL=y
237# CONFIG_PCIEPORTBUS is not set 230# CONFIG_PCIEPORTBUS is not set
238CONFIG_ARCH_SUPPORTS_MSI=y 231CONFIG_ARCH_SUPPORTS_MSI=y
239# CONFIG_PCI_MSI is not set 232# CONFIG_PCI_MSI is not set
@@ -336,6 +329,7 @@ CONFIG_NF_CONNTRACK=m
336# CONFIG_NF_CONNTRACK_MARK is not set 329# CONFIG_NF_CONNTRACK_MARK is not set
337# CONFIG_NF_CONNTRACK_EVENTS is not set 330# CONFIG_NF_CONNTRACK_EVENTS is not set
338# CONFIG_NF_CT_PROTO_SCTP is not set 331# CONFIG_NF_CT_PROTO_SCTP is not set
332# CONFIG_NF_CT_PROTO_UDPLITE is not set
339# CONFIG_NF_CONNTRACK_AMANDA is not set 333# CONFIG_NF_CONNTRACK_AMANDA is not set
340CONFIG_NF_CONNTRACK_FTP=m 334CONFIG_NF_CONNTRACK_FTP=m
341# CONFIG_NF_CONNTRACK_H323 is not set 335# CONFIG_NF_CONNTRACK_H323 is not set
@@ -353,9 +347,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 347CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
354CONFIG_NETFILTER_XT_TARGET_NFLOG=m 348CONFIG_NETFILTER_XT_TARGET_NFLOG=m
355CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 349CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
350CONFIG_NETFILTER_XT_TARGET_TRACE=m
356CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 351CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
357CONFIG_NETFILTER_XT_MATCH_COMMENT=m 352CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 353# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
354CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
359# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set 355# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 356CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
361CONFIG_NETFILTER_XT_MATCH_DCCP=m 357CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -376,6 +372,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
376# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 372# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
377CONFIG_NETFILTER_XT_MATCH_STRING=m 373CONFIG_NETFILTER_XT_MATCH_STRING=m
378CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 374CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
375CONFIG_NETFILTER_XT_MATCH_U32=m
379# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 376# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
380 377
381# 378#
@@ -559,6 +556,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
559CONFIG_IEEE80211_CRYPT_TKIP=m 556CONFIG_IEEE80211_CRYPT_TKIP=m
560# CONFIG_IEEE80211_SOFTMAC is not set 557# CONFIG_IEEE80211_SOFTMAC is not set
561# CONFIG_RFKILL is not set 558# CONFIG_RFKILL is not set
559# CONFIG_NET_9P is not set
562 560
563# 561#
564# Device Drivers 562# Device Drivers
@@ -573,27 +571,12 @@ CONFIG_FW_LOADER=y
573# CONFIG_DEBUG_DRIVER is not set 571# CONFIG_DEBUG_DRIVER is not set
574# CONFIG_DEBUG_DEVRES is not set 572# CONFIG_DEBUG_DEVRES is not set
575# CONFIG_SYS_HYPERVISOR is not set 573# CONFIG_SYS_HYPERVISOR is not set
576
577#
578# Connector - unified userspace <-> kernelspace linker
579#
580CONFIG_CONNECTOR=y 574CONFIG_CONNECTOR=y
581CONFIG_PROC_EVENTS=y 575CONFIG_PROC_EVENTS=y
582# CONFIG_MTD is not set 576# CONFIG_MTD is not set
583 577CONFIG_OF_DEVICE=y
584#
585# Parallel port support
586#
587# CONFIG_PARPORT is not set 578# CONFIG_PARPORT is not set
588 579CONFIG_BLK_DEV=y
589#
590# Plug and Play support
591#
592# CONFIG_PNPACPI is not set
593
594#
595# Block devices
596#
597# CONFIG_BLK_DEV_FD is not set 580# CONFIG_BLK_DEV_FD is not set
598CONFIG_MAC_FLOPPY=m 581CONFIG_MAC_FLOPPY=m
599# CONFIG_BLK_CPQ_DA is not set 582# CONFIG_BLK_CPQ_DA is not set
@@ -612,14 +595,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
612CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 595CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
613# CONFIG_CDROM_PKTCDVD is not set 596# CONFIG_CDROM_PKTCDVD is not set
614# CONFIG_ATA_OVER_ETH is not set 597# CONFIG_ATA_OVER_ETH is not set
615 598CONFIG_MISC_DEVICES=y
616#
617# Misc devices
618#
619# CONFIG_PHANTOM is not set 599# CONFIG_PHANTOM is not set
600# CONFIG_EEPROM_93CX6 is not set
620# CONFIG_SGI_IOC4 is not set 601# CONFIG_SGI_IOC4 is not set
621# CONFIG_TIFM_CORE is not set 602# CONFIG_TIFM_CORE is not set
622# CONFIG_BLINK is not set
623CONFIG_IDE=y 603CONFIG_IDE=y
624CONFIG_BLK_DEV_IDE=y 604CONFIG_BLK_DEV_IDE=y
625 605
@@ -689,6 +669,7 @@ CONFIG_BLK_DEV_IDEDMA=y
689# 669#
690# CONFIG_RAID_ATTRS is not set 670# CONFIG_RAID_ATTRS is not set
691CONFIG_SCSI=y 671CONFIG_SCSI=y
672CONFIG_SCSI_DMA=y
692# CONFIG_SCSI_TGT is not set 673# CONFIG_SCSI_TGT is not set
693CONFIG_SCSI_NETLINK=y 674CONFIG_SCSI_NETLINK=y
694CONFIG_SCSI_PROC_FS=y 675CONFIG_SCSI_PROC_FS=y
@@ -721,10 +702,7 @@ CONFIG_SCSI_FC_ATTRS=y
721# CONFIG_SCSI_ISCSI_ATTRS is not set 702# CONFIG_SCSI_ISCSI_ATTRS is not set
722# CONFIG_SCSI_SAS_ATTRS is not set 703# CONFIG_SCSI_SAS_ATTRS is not set
723# CONFIG_SCSI_SAS_LIBSAS is not set 704# CONFIG_SCSI_SAS_LIBSAS is not set
724 705CONFIG_SCSI_LOWLEVEL=y
725#
726# SCSI low-level drivers
727#
728# CONFIG_ISCSI_TCP is not set 706# CONFIG_ISCSI_TCP is not set
729# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 707# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
730# CONFIG_SCSI_3W_9XXX is not set 708# CONFIG_SCSI_3W_9XXX is not set
@@ -772,20 +750,8 @@ CONFIG_SCSI_MESH_SYNC_RATE=5
772CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 750CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
773CONFIG_SCSI_MAC53C94=y 751CONFIG_SCSI_MAC53C94=y
774# CONFIG_SCSI_SRP is not set 752# CONFIG_SCSI_SRP is not set
775 753# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
776#
777# PCMCIA SCSI adapter support
778#
779# CONFIG_PCMCIA_AHA152X is not set
780# CONFIG_PCMCIA_FDOMAIN is not set
781# CONFIG_PCMCIA_NINJA_SCSI is not set
782# CONFIG_PCMCIA_QLOGIC is not set
783# CONFIG_PCMCIA_SYM53C500 is not set
784# CONFIG_ATA is not set 754# CONFIG_ATA is not set
785
786#
787# Multi-device support (RAID and LVM)
788#
789CONFIG_MD=y 755CONFIG_MD=y
790CONFIG_BLK_DEV_MD=m 756CONFIG_BLK_DEV_MD=m
791CONFIG_MD_LINEAR=m 757CONFIG_MD_LINEAR=m
@@ -834,14 +800,11 @@ CONFIG_IEEE1394_OHCI1394=m
834# 800#
835CONFIG_IEEE1394_VIDEO1394=m 801CONFIG_IEEE1394_VIDEO1394=m
836CONFIG_IEEE1394_SBP2=m 802CONFIG_IEEE1394_SBP2=m
803# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
837# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set 804# CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
838# CONFIG_IEEE1394_ETH1394 is not set 805# CONFIG_IEEE1394_ETH1394 is not set
839CONFIG_IEEE1394_DV1394=m 806CONFIG_IEEE1394_DV1394=m
840CONFIG_IEEE1394_RAWIO=m 807CONFIG_IEEE1394_RAWIO=m
841
842#
843# I2O device support
844#
845# CONFIG_I2O is not set 808# CONFIG_I2O is not set
846CONFIG_MACINTOSH_DRIVERS=y 809CONFIG_MACINTOSH_DRIVERS=y
847CONFIG_ADB=y 810CONFIG_ADB=y
@@ -860,21 +823,15 @@ CONFIG_THERM_ADT746X=m
860# CONFIG_WINDFARM is not set 823# CONFIG_WINDFARM is not set
861# CONFIG_ANSLCD is not set 824# CONFIG_ANSLCD is not set
862CONFIG_PMAC_RACKMETER=m 825CONFIG_PMAC_RACKMETER=m
863
864#
865# Network device support
866#
867CONFIG_NETDEVICES=y 826CONFIG_NETDEVICES=y
827# CONFIG_NETDEVICES_MULTIQUEUE is not set
868CONFIG_DUMMY=m 828CONFIG_DUMMY=m
869# CONFIG_BONDING is not set 829# CONFIG_BONDING is not set
830# CONFIG_MACVLAN is not set
870# CONFIG_EQUALIZER is not set 831# CONFIG_EQUALIZER is not set
871CONFIG_TUN=m 832CONFIG_TUN=m
872# CONFIG_ARCNET is not set 833# CONFIG_ARCNET is not set
873# CONFIG_PHYLIB is not set 834# CONFIG_PHYLIB is not set
874
875#
876# Ethernet (10 or 100Mbit)
877#
878CONFIG_NET_ETHERNET=y 835CONFIG_NET_ETHERNET=y
879CONFIG_MII=y 836CONFIG_MII=y
880CONFIG_MACE=y 837CONFIG_MACE=y
@@ -884,10 +841,6 @@ CONFIG_BMAC=y
884CONFIG_SUNGEM=y 841CONFIG_SUNGEM=y
885# CONFIG_CASSINI is not set 842# CONFIG_CASSINI is not set
886# CONFIG_NET_VENDOR_3COM is not set 843# CONFIG_NET_VENDOR_3COM is not set
887
888#
889# Tulip family network device support
890#
891# CONFIG_NET_TULIP is not set 844# CONFIG_NET_TULIP is not set
892# CONFIG_HP100 is not set 845# CONFIG_HP100 is not set
893CONFIG_NET_PCI=y 846CONFIG_NET_PCI=y
@@ -922,7 +875,6 @@ CONFIG_NETDEV_1000=y
922# CONFIG_SIS190 is not set 875# CONFIG_SIS190 is not set
923# CONFIG_SKGE is not set 876# CONFIG_SKGE is not set
924# CONFIG_SKY2 is not set 877# CONFIG_SKY2 is not set
925# CONFIG_SK98LIN is not set
926# CONFIG_VIA_VELOCITY is not set 878# CONFIG_VIA_VELOCITY is not set
927# CONFIG_TIGON3 is not set 879# CONFIG_TIGON3 is not set
928# CONFIG_BNX2 is not set 880# CONFIG_BNX2 is not set
@@ -962,6 +914,7 @@ CONFIG_PCMCIA_HERMES=m
962# CONFIG_PCMCIA_WL3501 is not set 914# CONFIG_PCMCIA_WL3501 is not set
963CONFIG_PRISM54=m 915CONFIG_PRISM54=m
964# CONFIG_USB_ZD1201 is not set 916# CONFIG_USB_ZD1201 is not set
917# CONFIG_RTL8187 is not set
965# CONFIG_HOSTAP is not set 918# CONFIG_HOSTAP is not set
966 919
967# 920#
@@ -996,6 +949,7 @@ CONFIG_PPP_DEFLATE=y
996CONFIG_PPP_BSDCOMP=m 949CONFIG_PPP_BSDCOMP=m
997# CONFIG_PPP_MPPE is not set 950# CONFIG_PPP_MPPE is not set
998# CONFIG_PPPOE is not set 951# CONFIG_PPPOE is not set
952# CONFIG_PPPOL2TP is not set
999# CONFIG_SLIP is not set 953# CONFIG_SLIP is not set
1000CONFIG_SLHC=y 954CONFIG_SLHC=y
1001# CONFIG_NET_FC is not set 955# CONFIG_NET_FC is not set
@@ -1003,15 +957,7 @@ CONFIG_SLHC=y
1003# CONFIG_NETCONSOLE is not set 957# CONFIG_NETCONSOLE is not set
1004# CONFIG_NETPOLL is not set 958# CONFIG_NETPOLL is not set
1005# CONFIG_NET_POLL_CONTROLLER is not set 959# CONFIG_NET_POLL_CONTROLLER is not set
1006
1007#
1008# ISDN subsystem
1009#
1010# CONFIG_ISDN is not set 960# CONFIG_ISDN is not set
1011
1012#
1013# Telephony Support
1014#
1015# CONFIG_PHONE is not set 961# CONFIG_PHONE is not set
1016 962
1017# 963#
@@ -1093,10 +1039,6 @@ CONFIG_SERIAL_PMACZILOG=m
1093CONFIG_UNIX98_PTYS=y 1039CONFIG_UNIX98_PTYS=y
1094CONFIG_LEGACY_PTYS=y 1040CONFIG_LEGACY_PTYS=y
1095CONFIG_LEGACY_PTY_COUNT=256 1041CONFIG_LEGACY_PTY_COUNT=256
1096
1097#
1098# IPMI
1099#
1100# CONFIG_IPMI_HANDLER is not set 1042# CONFIG_IPMI_HANDLER is not set
1101# CONFIG_WATCHDOG is not set 1043# CONFIG_WATCHDOG is not set
1102# CONFIG_HW_RANDOM is not set 1044# CONFIG_HW_RANDOM is not set
@@ -1123,10 +1065,6 @@ CONFIG_DRM_RADEON=m
1123# CONFIG_CARDMAN_4000 is not set 1065# CONFIG_CARDMAN_4000 is not set
1124# CONFIG_CARDMAN_4040 is not set 1066# CONFIG_CARDMAN_4040 is not set
1125# CONFIG_RAW_DRIVER is not set 1067# CONFIG_RAW_DRIVER is not set
1126
1127#
1128# TPM devices
1129#
1130# CONFIG_TCG_TPM is not set 1068# CONFIG_TCG_TPM is not set
1131CONFIG_DEVPORT=y 1069CONFIG_DEVPORT=y
1132CONFIG_I2C=y 1070CONFIG_I2C=y
@@ -1162,6 +1100,7 @@ CONFIG_I2C_POWERMAC=y
1162# CONFIG_I2C_SIS5595 is not set 1100# CONFIG_I2C_SIS5595 is not set
1163# CONFIG_I2C_SIS630 is not set 1101# CONFIG_I2C_SIS630 is not set
1164# CONFIG_I2C_SIS96X is not set 1102# CONFIG_I2C_SIS96X is not set
1103# CONFIG_I2C_TAOS_EVM is not set
1165# CONFIG_I2C_STUB is not set 1104# CONFIG_I2C_STUB is not set
1166# CONFIG_I2C_TINY_USB is not set 1105# CONFIG_I2C_TINY_USB is not set
1167# CONFIG_I2C_VIA is not set 1106# CONFIG_I2C_VIA is not set
@@ -1173,12 +1112,14 @@ CONFIG_I2C_POWERMAC=y
1173# 1112#
1174# CONFIG_SENSORS_DS1337 is not set 1113# CONFIG_SENSORS_DS1337 is not set
1175# CONFIG_SENSORS_DS1374 is not set 1114# CONFIG_SENSORS_DS1374 is not set
1115# CONFIG_DS1682 is not set
1176# CONFIG_SENSORS_EEPROM is not set 1116# CONFIG_SENSORS_EEPROM is not set
1177# CONFIG_SENSORS_PCF8574 is not set 1117# CONFIG_SENSORS_PCF8574 is not set
1178# CONFIG_SENSORS_PCA9539 is not set 1118# CONFIG_SENSORS_PCA9539 is not set
1179# CONFIG_SENSORS_PCF8591 is not set 1119# CONFIG_SENSORS_PCF8591 is not set
1180# CONFIG_SENSORS_M41T00 is not set 1120# CONFIG_SENSORS_M41T00 is not set
1181# CONFIG_SENSORS_MAX6875 is not set 1121# CONFIG_SENSORS_MAX6875 is not set
1122# CONFIG_SENSORS_TSL2550 is not set
1182# CONFIG_I2C_DEBUG_CORE is not set 1123# CONFIG_I2C_DEBUG_CORE is not set
1183# CONFIG_I2C_DEBUG_ALGO is not set 1124# CONFIG_I2C_DEBUG_ALGO is not set
1184# CONFIG_I2C_DEBUG_BUS is not set 1125# CONFIG_I2C_DEBUG_BUS is not set
@@ -1189,11 +1130,13 @@ CONFIG_I2C_POWERMAC=y
1189# 1130#
1190# CONFIG_SPI is not set 1131# CONFIG_SPI is not set
1191# CONFIG_SPI_MASTER is not set 1132# CONFIG_SPI_MASTER is not set
1192
1193#
1194# Dallas's 1-wire bus
1195#
1196# CONFIG_W1 is not set 1133# CONFIG_W1 is not set
1134CONFIG_POWER_SUPPLY=y
1135# CONFIG_POWER_SUPPLY_DEBUG is not set
1136# CONFIG_PDA_POWER is not set
1137CONFIG_APM_POWER=y
1138# CONFIG_BATTERY_DS2760 is not set
1139CONFIG_BATTERY_PMU=y
1197# CONFIG_HWMON is not set 1140# CONFIG_HWMON is not set
1198 1141
1199# 1142#
@@ -1212,8 +1155,8 @@ CONFIG_I2C_POWERMAC=y
1212# Graphics support 1155# Graphics support
1213# 1156#
1214CONFIG_BACKLIGHT_LCD_SUPPORT=y 1157CONFIG_BACKLIGHT_LCD_SUPPORT=y
1215CONFIG_BACKLIGHT_CLASS_DEVICE=y
1216CONFIG_LCD_CLASS_DEVICE=m 1158CONFIG_LCD_CLASS_DEVICE=m
1159CONFIG_BACKLIGHT_CLASS_DEVICE=y
1217 1160
1218# 1161#
1219# Display device support 1162# Display device support
@@ -1224,6 +1167,7 @@ CONFIG_DISPLAY_SUPPORT=y
1224# Display hardware drivers 1167# Display hardware drivers
1225# 1168#
1226CONFIG_VGASTATE=y 1169CONFIG_VGASTATE=y
1170# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1227CONFIG_FB=y 1171CONFIG_FB=y
1228# CONFIG_FIRMWARE_EDID is not set 1172# CONFIG_FIRMWARE_EDID is not set
1229CONFIG_FB_DDC=y 1173CONFIG_FB_DDC=y
@@ -1299,6 +1243,7 @@ CONFIG_FB_3DFX=y
1299# CONFIG_VGA_CONSOLE is not set 1243# CONFIG_VGA_CONSOLE is not set
1300CONFIG_DUMMY_CONSOLE=y 1244CONFIG_DUMMY_CONSOLE=y
1301CONFIG_FRAMEBUFFER_CONSOLE=y 1245CONFIG_FRAMEBUFFER_CONSOLE=y
1246# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1302# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1247# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1303# CONFIG_FONTS is not set 1248# CONFIG_FONTS is not set
1304CONFIG_FONT_8x8=y 1249CONFIG_FONT_8x8=y
@@ -1361,6 +1306,7 @@ CONFIG_SND_DUMMY=m
1361# CONFIG_SND_CMIPCI is not set 1306# CONFIG_SND_CMIPCI is not set
1362# CONFIG_SND_CS4281 is not set 1307# CONFIG_SND_CS4281 is not set
1363# CONFIG_SND_CS46XX is not set 1308# CONFIG_SND_CS46XX is not set
1309# CONFIG_SND_CS5530 is not set
1364# CONFIG_SND_DARLA20 is not set 1310# CONFIG_SND_DARLA20 is not set
1365# CONFIG_SND_GINA20 is not set 1311# CONFIG_SND_GINA20 is not set
1366# CONFIG_SND_LAYLA20 is not set 1312# CONFIG_SND_LAYLA20 is not set
@@ -1410,6 +1356,10 @@ CONFIG_SND_POWERMAC=m
1410CONFIG_SND_POWERMAC_AUTO_DRC=y 1356CONFIG_SND_POWERMAC_AUTO_DRC=y
1411 1357
1412# 1358#
1359# ALSA PowerPC devices
1360#
1361
1362#
1413# Apple Onboard Audio driver 1363# Apple Onboard Audio driver
1414# 1364#
1415CONFIG_SND_AOA=m 1365CONFIG_SND_AOA=m
@@ -1439,13 +1389,14 @@ CONFIG_SND_USB_AUDIO=m
1439# CONFIG_SND_SOC is not set 1389# CONFIG_SND_SOC is not set
1440 1390
1441# 1391#
1442# Open Sound System 1392# SoC Audio support for SuperH
1443# 1393#
1444# CONFIG_SOUND_PRIME is not set
1445 1394
1446# 1395#
1447# HID Devices 1396# Open Sound System
1448# 1397#
1398# CONFIG_SOUND_PRIME is not set
1399CONFIG_HID_SUPPORT=y
1449CONFIG_HID=y 1400CONFIG_HID=y
1450# CONFIG_HID_DEBUG is not set 1401# CONFIG_HID_DEBUG is not set
1451 1402
@@ -1456,10 +1407,7 @@ CONFIG_USB_HID=y
1456CONFIG_USB_HIDINPUT_POWERBOOK=y 1407CONFIG_USB_HIDINPUT_POWERBOOK=y
1457# CONFIG_HID_FF is not set 1408# CONFIG_HID_FF is not set
1458# CONFIG_USB_HIDDEV is not set 1409# CONFIG_USB_HIDDEV is not set
1459 1410CONFIG_USB_SUPPORT=y
1460#
1461# USB support
1462#
1463CONFIG_USB_ARCH_HAS_HCD=y 1411CONFIG_USB_ARCH_HAS_HCD=y
1464CONFIG_USB_ARCH_HAS_OHCI=y 1412CONFIG_USB_ARCH_HAS_OHCI=y
1465CONFIG_USB_ARCH_HAS_EHCI=y 1413CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1473,6 +1421,7 @@ CONFIG_USB_DEVICEFS=y
1473CONFIG_USB_DEVICE_CLASS=y 1421CONFIG_USB_DEVICE_CLASS=y
1474CONFIG_USB_DYNAMIC_MINORS=y 1422CONFIG_USB_DYNAMIC_MINORS=y
1475# CONFIG_USB_SUSPEND is not set 1423# CONFIG_USB_SUSPEND is not set
1424# CONFIG_USB_PERSIST is not set
1476# CONFIG_USB_OTG is not set 1425# CONFIG_USB_OTG is not set
1477 1426
1478# 1427#
@@ -1482,7 +1431,6 @@ CONFIG_USB_EHCI_HCD=m
1482CONFIG_USB_EHCI_SPLIT_ISO=y 1431CONFIG_USB_EHCI_SPLIT_ISO=y
1483CONFIG_USB_EHCI_ROOT_HUB_TT=y 1432CONFIG_USB_EHCI_ROOT_HUB_TT=y
1484# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1433# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1485# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1486# CONFIG_USB_ISP116X_HCD is not set 1434# CONFIG_USB_ISP116X_HCD is not set
1487CONFIG_USB_OHCI_HCD=y 1435CONFIG_USB_OHCI_HCD=y
1488# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1436# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1491,6 +1439,7 @@ CONFIG_USB_OHCI_HCD=y
1491CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1439CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1492# CONFIG_USB_UHCI_HCD is not set 1440# CONFIG_USB_UHCI_HCD is not set
1493# CONFIG_USB_SL811_HCD is not set 1441# CONFIG_USB_SL811_HCD is not set
1442# CONFIG_USB_R8A66597_HCD is not set
1494 1443
1495# 1444#
1496# USB Device Class drivers 1445# USB Device Class drivers
@@ -1574,6 +1523,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1574# CONFIG_USB_SERIAL_MOS7840 is not set 1523# CONFIG_USB_SERIAL_MOS7840 is not set
1575# CONFIG_USB_SERIAL_NAVMAN is not set 1524# CONFIG_USB_SERIAL_NAVMAN is not set
1576# CONFIG_USB_SERIAL_PL2303 is not set 1525# CONFIG_USB_SERIAL_PL2303 is not set
1526# CONFIG_USB_SERIAL_OTI6858 is not set
1577# CONFIG_USB_SERIAL_HP4X is not set 1527# CONFIG_USB_SERIAL_HP4X is not set
1578# CONFIG_USB_SERIAL_SAFE is not set 1528# CONFIG_USB_SERIAL_SAFE is not set
1579# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 1529# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -1618,10 +1568,6 @@ CONFIG_USB_APPLEDISPLAY=m
1618# 1568#
1619# CONFIG_USB_GADGET is not set 1569# CONFIG_USB_GADGET is not set
1620# CONFIG_MMC is not set 1570# CONFIG_MMC is not set
1621
1622#
1623# LED devices
1624#
1625CONFIG_NEW_LEDS=y 1571CONFIG_NEW_LEDS=y
1626CONFIG_LEDS_CLASS=y 1572CONFIG_LEDS_CLASS=y
1627 1573
@@ -1636,20 +1582,8 @@ CONFIG_LEDS_TRIGGERS=y
1636# CONFIG_LEDS_TRIGGER_TIMER is not set 1582# CONFIG_LEDS_TRIGGER_TIMER is not set
1637CONFIG_LEDS_TRIGGER_IDE_DISK=y 1583CONFIG_LEDS_TRIGGER_IDE_DISK=y
1638# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 1584# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
1639
1640#
1641# InfiniBand support
1642#
1643# CONFIG_INFINIBAND is not set 1585# CONFIG_INFINIBAND is not set
1644 1586# CONFIG_EDAC is not set
1645#
1646# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1647#
1648
1649#
1650# Real Time Clock
1651#
1652CONFIG_RTC_LIB=y
1653# CONFIG_RTC_CLASS is not set 1587# CONFIG_RTC_CLASS is not set
1654 1588
1655# 1589#
@@ -1666,6 +1600,11 @@ CONFIG_RTC_LIB=y
1666# 1600#
1667 1601
1668# 1602#
1603# Userspace I/O
1604#
1605# CONFIG_UIO is not set
1606
1607#
1669# File systems 1608# File systems
1670# 1609#
1671CONFIG_EXT2_FS=y 1610CONFIG_EXT2_FS=y
@@ -1774,7 +1713,6 @@ CONFIG_SMB_FS=m
1774# CONFIG_NCP_FS is not set 1713# CONFIG_NCP_FS is not set
1775# CONFIG_CODA_FS is not set 1714# CONFIG_CODA_FS is not set
1776# CONFIG_AFS_FS is not set 1715# CONFIG_AFS_FS is not set
1777# CONFIG_9P_FS is not set
1778 1716
1779# 1717#
1780# Partition Types 1718# Partition Types
@@ -1856,6 +1794,7 @@ CONFIG_CRC_CCITT=y
1856CONFIG_CRC16=y 1794CONFIG_CRC16=y
1857# CONFIG_CRC_ITU_T is not set 1795# CONFIG_CRC_ITU_T is not set
1858CONFIG_CRC32=y 1796CONFIG_CRC32=y
1797# CONFIG_CRC7 is not set
1859CONFIG_LIBCRC32C=m 1798CONFIG_LIBCRC32C=m
1860CONFIG_ZLIB_INFLATE=y 1799CONFIG_ZLIB_INFLATE=y
1861CONFIG_ZLIB_DEFLATE=y 1800CONFIG_ZLIB_DEFLATE=y
@@ -1887,6 +1826,7 @@ CONFIG_MAGIC_SYSRQ=y
1887CONFIG_DEBUG_KERNEL=y 1826CONFIG_DEBUG_KERNEL=y
1888# CONFIG_DEBUG_SHIRQ is not set 1827# CONFIG_DEBUG_SHIRQ is not set
1889CONFIG_DETECT_SOFTLOCKUP=y 1828CONFIG_DETECT_SOFTLOCKUP=y
1829CONFIG_SCHED_DEBUG=y
1890# CONFIG_SCHEDSTATS is not set 1830# CONFIG_SCHEDSTATS is not set
1891# CONFIG_TIMER_STATS is not set 1831# CONFIG_TIMER_STATS is not set
1892# CONFIG_DEBUG_SLAB is not set 1832# CONFIG_DEBUG_SLAB is not set
@@ -1919,10 +1859,6 @@ CONFIG_BOOTX_TEXT=y
1919# 1859#
1920# CONFIG_KEYS is not set 1860# CONFIG_KEYS is not set
1921# CONFIG_SECURITY is not set 1861# CONFIG_SECURITY is not set
1922
1923#
1924# Cryptographic options
1925#
1926CONFIG_CRYPTO=y 1862CONFIG_CRYPTO=y
1927CONFIG_CRYPTO_ALGAPI=y 1863CONFIG_CRYPTO_ALGAPI=y
1928CONFIG_CRYPTO_BLKCIPHER=y 1864CONFIG_CRYPTO_BLKCIPHER=y
@@ -1962,7 +1898,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1962CONFIG_CRYPTO_CRC32C=m 1898CONFIG_CRYPTO_CRC32C=m
1963# CONFIG_CRYPTO_CAMELLIA is not set 1899# CONFIG_CRYPTO_CAMELLIA is not set
1964# CONFIG_CRYPTO_TEST is not set 1900# CONFIG_CRYPTO_TEST is not set
1965 1901CONFIG_CRYPTO_HW=y
1966#
1967# Hardware crypto devices
1968#
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 6e503d98daba..5f6224a1feb8 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,9 +1,23 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 14:15:02 2007 4# Thu Aug 30 16:47:09 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y
13CONFIG_POWER4=y
14CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y
17CONFIG_PPC_MM_SLICES=y
18CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y
20CONFIG_NR_CPUS=32
7CONFIG_64BIT=y 21CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 23CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 29CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 30CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 31CONFIG_GENERIC_FIND_NEXT_BIT=y
32CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 33CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 34CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 35CONFIG_COMPAT=y
@@ -22,54 +37,36 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
25CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
26CONFIG_GENERIC_TBSYNC=y 42CONFIG_GENERIC_TBSYNC=y
27CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
30CONFIG_PPC64_SWSUSP=y 46CONFIG_PPC64_SWSUSP=y
31
32#
33# Processor support
34#
35# CONFIG_POWER4_ONLY is not set
36CONFIG_POWER3=y
37CONFIG_POWER4=y
38CONFIG_PPC_FPU=y
39# CONFIG_PPC_DCR_NATIVE is not set 47# CONFIG_PPC_DCR_NATIVE is not set
40CONFIG_PPC_DCR_MMIO=y 48CONFIG_PPC_DCR_MMIO=y
41CONFIG_PPC_DCR=y 49CONFIG_PPC_DCR=y
42CONFIG_PPC_OF_PLATFORM_PCI=y 50CONFIG_PPC_OF_PLATFORM_PCI=y
43CONFIG_ALTIVEC=y
44CONFIG_PPC_STD_MMU=y
45CONFIG_PPC_MM_SLICES=y
46CONFIG_VIRT_CPU_ACCOUNTING=y
47CONFIG_SMP=y
48CONFIG_NR_CPUS=32
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 51CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 52
51# 53#
52# Code maturity level options 54# General setup
53# 55#
54CONFIG_EXPERIMENTAL=y 56CONFIG_EXPERIMENTAL=y
55CONFIG_LOCK_KERNEL=y 57CONFIG_LOCK_KERNEL=y
56CONFIG_INIT_ENV_ARG_LIMIT=32 58CONFIG_INIT_ENV_ARG_LIMIT=32
57
58#
59# General setup
60#
61CONFIG_LOCALVERSION="" 59CONFIG_LOCALVERSION=""
62CONFIG_LOCALVERSION_AUTO=y 60CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 61CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 62CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
66CONFIG_SYSVIPC_SYSCTL=y 63CONFIG_SYSVIPC_SYSCTL=y
67CONFIG_POSIX_MQUEUE=y 64CONFIG_POSIX_MQUEUE=y
68# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
69CONFIG_TASKSTATS=y 66CONFIG_TASKSTATS=y
70CONFIG_TASK_DELAY_ACCT=y 67CONFIG_TASK_DELAY_ACCT=y
71# CONFIG_TASK_XACCT is not set 68# CONFIG_TASK_XACCT is not set
72# CONFIG_UTS_NS is not set 69# CONFIG_USER_NS is not set
73# CONFIG_AUDIT is not set 70# CONFIG_AUDIT is not set
74CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 72CONFIG_IKCONFIG_PROC=y
@@ -105,10 +102,6 @@ CONFIG_SLAB=y
105CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
108
109#
110# Loadable module support
111#
112CONFIG_MODULES=y 105CONFIG_MODULES=y
113CONFIG_MODULE_UNLOAD=y 106CONFIG_MODULE_UNLOAD=y
114# CONFIG_MODULE_FORCE_UNLOAD is not set 107# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -116,12 +109,9 @@ CONFIG_MODVERSIONS=y
116CONFIG_MODULE_SRCVERSION_ALL=y 109CONFIG_MODULE_SRCVERSION_ALL=y
117CONFIG_KMOD=y 110CONFIG_KMOD=y
118CONFIG_STOP_MACHINE=y 111CONFIG_STOP_MACHINE=y
119
120#
121# Block layer
122#
123CONFIG_BLOCK=y 112CONFIG_BLOCK=y
124CONFIG_BLK_DEV_IO_TRACE=y 113CONFIG_BLK_DEV_IO_TRACE=y
114CONFIG_BLK_DEV_BSG=y
125 115
126# 116#
127# IO Schedulers 117# IO Schedulers
@@ -141,7 +131,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
141# 131#
142CONFIG_PPC_MULTIPLATFORM=y 132CONFIG_PPC_MULTIPLATFORM=y
143# CONFIG_EMBEDDED6xx is not set 133# CONFIG_EMBEDDED6xx is not set
144# CONFIG_APUS is not set 134# CONFIG_PPC_82xx is not set
135# CONFIG_PPC_83xx is not set
136# CONFIG_PPC_86xx is not set
145CONFIG_PPC_PSERIES=y 137CONFIG_PPC_PSERIES=y
146CONFIG_PPC_SPLPAR=y 138CONFIG_PPC_SPLPAR=y
147CONFIG_EEH=y 139CONFIG_EEH=y
@@ -177,6 +169,7 @@ CONFIG_SPU_BASE=y
177CONFIG_CBE_RAS=y 169CONFIG_CBE_RAS=y
178CONFIG_CBE_THERM=m 170CONFIG_CBE_THERM=m
179CONFIG_CBE_CPUFREQ=m 171CONFIG_CBE_CPUFREQ=m
172CONFIG_CBE_CPUFREQ_PMI=m
180# CONFIG_PQ2ADS is not set 173# CONFIG_PQ2ADS is not set
181CONFIG_PPC_NATIVE=y 174CONFIG_PPC_NATIVE=y
182CONFIG_UDBG_RTAS_CONSOLE=y 175CONFIG_UDBG_RTAS_CONSOLE=y
@@ -217,6 +210,8 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
217# 210#
218CONFIG_CPU_FREQ_PMAC64=y 211CONFIG_CPU_FREQ_PMAC64=y
219# CONFIG_CPM2 is not set 212# CONFIG_CPM2 is not set
213CONFIG_AXON_RAM=m
214# CONFIG_FSL_ULI1575 is not set
220 215
221# 216#
222# Kernel options 217# Kernel options
@@ -258,6 +253,7 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
258CONFIG_SPLIT_PTLOCK_CPUS=4 253CONFIG_SPLIT_PTLOCK_CPUS=4
259CONFIG_RESOURCES_64BIT=y 254CONFIG_RESOURCES_64BIT=y
260CONFIG_ZONE_DMA_FLAG=1 255CONFIG_ZONE_DMA_FLAG=1
256CONFIG_BOUNCE=y
261CONFIG_ARCH_MEMORY_PROBE=y 257CONFIG_ARCH_MEMORY_PROBE=y
262CONFIG_PPC_HAS_HASH_64K=y 258CONFIG_PPC_HAS_HASH_64K=y
263# CONFIG_PPC_64K_PAGES is not set 259# CONFIG_PPC_64K_PAGES is not set
@@ -265,6 +261,7 @@ CONFIG_PPC_HAS_HASH_64K=y
265CONFIG_PROC_DEVICETREE=y 261CONFIG_PROC_DEVICETREE=y
266# CONFIG_CMDLINE_BOOL is not set 262# CONFIG_CMDLINE_BOOL is not set
267# CONFIG_PM is not set 263# CONFIG_PM is not set
264CONFIG_SUSPEND_SMP_POSSIBLE=y
268CONFIG_SECCOMP=y 265CONFIG_SECCOMP=y
269# CONFIG_WANT_DEVICE_TREE is not set 266# CONFIG_WANT_DEVICE_TREE is not set
270CONFIG_ISA_DMA_API=y 267CONFIG_ISA_DMA_API=y
@@ -277,6 +274,7 @@ CONFIG_GENERIC_ISA_DMA=y
277# CONFIG_PPC_INDIRECT_PCI is not set 274# CONFIG_PPC_INDIRECT_PCI is not set
278CONFIG_PCI=y 275CONFIG_PCI=y
279CONFIG_PCI_DOMAINS=y 276CONFIG_PCI_DOMAINS=y
277CONFIG_PCI_SYSCALL=y
280# CONFIG_PCIEPORTBUS is not set 278# CONFIG_PCIEPORTBUS is not set
281CONFIG_ARCH_SUPPORTS_MSI=y 279CONFIG_ARCH_SUPPORTS_MSI=y
282CONFIG_PCI_MSI=y 280CONFIG_PCI_MSI=y
@@ -356,6 +354,7 @@ CONFIG_NF_CONNTRACK_MARK=y
356CONFIG_NF_CONNTRACK_EVENTS=y 354CONFIG_NF_CONNTRACK_EVENTS=y
357CONFIG_NF_CT_PROTO_GRE=m 355CONFIG_NF_CT_PROTO_GRE=m
358CONFIG_NF_CT_PROTO_SCTP=m 356CONFIG_NF_CT_PROTO_SCTP=m
357# CONFIG_NF_CT_PROTO_UDPLITE is not set
359CONFIG_NF_CONNTRACK_AMANDA=m 358CONFIG_NF_CONNTRACK_AMANDA=m
360CONFIG_NF_CONNTRACK_FTP=m 359CONFIG_NF_CONNTRACK_FTP=m
361CONFIG_NF_CONNTRACK_H323=m 360CONFIG_NF_CONNTRACK_H323=m
@@ -374,9 +373,11 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
374CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 373CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
375CONFIG_NETFILTER_XT_TARGET_NFLOG=m 374CONFIG_NETFILTER_XT_TARGET_NFLOG=m
376CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 375CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
376CONFIG_NETFILTER_XT_TARGET_TRACE=m
377CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 377CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
378CONFIG_NETFILTER_XT_MATCH_COMMENT=m 378CONFIG_NETFILTER_XT_MATCH_COMMENT=m
379CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 379CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
380CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
380CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 381CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
381CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 382CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
382CONFIG_NETFILTER_XT_MATCH_DCCP=m 383CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -397,6 +398,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
397CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 398CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
398CONFIG_NETFILTER_XT_MATCH_STRING=m 399CONFIG_NETFILTER_XT_MATCH_STRING=m
399CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 400CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
401CONFIG_NETFILTER_XT_MATCH_U32=m
400CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 402CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
401 403
402# 404#
@@ -481,6 +483,7 @@ CONFIG_NET_CLS_ROUTE=y
481# CONFIG_MAC80211 is not set 483# CONFIG_MAC80211 is not set
482# CONFIG_IEEE80211 is not set 484# CONFIG_IEEE80211 is not set
483# CONFIG_RFKILL is not set 485# CONFIG_RFKILL is not set
486# CONFIG_NET_9P is not set
484 487
485# 488#
486# Device Drivers 489# Device Drivers
@@ -495,28 +498,12 @@ CONFIG_FW_LOADER=y
495# CONFIG_DEBUG_DRIVER is not set 498# CONFIG_DEBUG_DRIVER is not set
496# CONFIG_DEBUG_DEVRES is not set 499# CONFIG_DEBUG_DEVRES is not set
497# CONFIG_SYS_HYPERVISOR is not set 500# CONFIG_SYS_HYPERVISOR is not set
498
499#
500# Connector - unified userspace <-> kernelspace linker
501#
502# CONFIG_CONNECTOR is not set 501# CONFIG_CONNECTOR is not set
503# CONFIG_MTD is not set 502# CONFIG_MTD is not set
504 503CONFIG_OF_DEVICE=y
505#
506# Parallel port support
507#
508# CONFIG_PARPORT is not set 504# CONFIG_PARPORT is not set
509 505CONFIG_BLK_DEV=y
510#
511# Plug and Play support
512#
513# CONFIG_PNPACPI is not set
514
515#
516# Block devices
517#
518CONFIG_BLK_DEV_FD=y 506CONFIG_BLK_DEV_FD=y
519# CONFIG_BLK_CPQ_DA is not set
520# CONFIG_BLK_CPQ_CISS_DA is not set 507# CONFIG_BLK_CPQ_CISS_DA is not set
521# CONFIG_BLK_DEV_DAC960 is not set 508# CONFIG_BLK_DEV_DAC960 is not set
522# CONFIG_BLK_DEV_UMEM is not set 509# CONFIG_BLK_DEV_UMEM is not set
@@ -532,14 +519,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
532CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 519CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
533# CONFIG_CDROM_PKTCDVD is not set 520# CONFIG_CDROM_PKTCDVD is not set
534# CONFIG_ATA_OVER_ETH is not set 521# CONFIG_ATA_OVER_ETH is not set
535 522CONFIG_MISC_DEVICES=y
536#
537# Misc devices
538#
539# CONFIG_PHANTOM is not set 523# CONFIG_PHANTOM is not set
524# CONFIG_EEPROM_93CX6 is not set
540# CONFIG_SGI_IOC4 is not set 525# CONFIG_SGI_IOC4 is not set
541# CONFIG_TIFM_CORE is not set 526# CONFIG_TIFM_CORE is not set
542# CONFIG_BLINK is not set
543CONFIG_IDE=y 527CONFIG_IDE=y
544CONFIG_BLK_DEV_IDE=y 528CONFIG_BLK_DEV_IDE=y
545 529
@@ -608,6 +592,7 @@ CONFIG_BLK_DEV_IDEDMA=y
608# 592#
609# CONFIG_RAID_ATTRS is not set 593# CONFIG_RAID_ATTRS is not set
610CONFIG_SCSI=y 594CONFIG_SCSI=y
595CONFIG_SCSI_DMA=y
611# CONFIG_SCSI_TGT is not set 596# CONFIG_SCSI_TGT is not set
612CONFIG_SCSI_NETLINK=y 597CONFIG_SCSI_NETLINK=y
613CONFIG_SCSI_PROC_FS=y 598CONFIG_SCSI_PROC_FS=y
@@ -640,10 +625,7 @@ CONFIG_SCSI_FC_ATTRS=y
640CONFIG_SCSI_ISCSI_ATTRS=m 625CONFIG_SCSI_ISCSI_ATTRS=m
641# CONFIG_SCSI_SAS_ATTRS is not set 626# CONFIG_SCSI_SAS_ATTRS is not set
642# CONFIG_SCSI_SAS_LIBSAS is not set 627# CONFIG_SCSI_SAS_LIBSAS is not set
643 628CONFIG_SCSI_LOWLEVEL=y
644#
645# SCSI low-level drivers
646#
647# CONFIG_ISCSI_TCP is not set 629# CONFIG_ISCSI_TCP is not set
648# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 630# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
649# CONFIG_SCSI_3W_9XXX is not set 631# CONFIG_SCSI_3W_9XXX is not set
@@ -658,7 +640,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m
658# CONFIG_MEGARAID_LEGACY is not set 640# CONFIG_MEGARAID_LEGACY is not set
659# CONFIG_MEGARAID_SAS is not set 641# CONFIG_MEGARAID_SAS is not set
660# CONFIG_SCSI_HPTIOP is not set 642# CONFIG_SCSI_HPTIOP is not set
661# CONFIG_SCSI_BUSLOGIC is not set
662# CONFIG_SCSI_DMX3191D is not set 643# CONFIG_SCSI_DMX3191D is not set
663# CONFIG_SCSI_EATA is not set 644# CONFIG_SCSI_EATA is not set
664# CONFIG_SCSI_FUTURE_DOMAIN is not set 645# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -739,10 +720,6 @@ CONFIG_SATA_SVW=y
739# CONFIG_PATA_VIA is not set 720# CONFIG_PATA_VIA is not set
740CONFIG_PATA_WINBOND=y 721CONFIG_PATA_WINBOND=y
741CONFIG_PATA_SCC=y 722CONFIG_PATA_SCC=y
742
743#
744# Multi-device support (RAID and LVM)
745#
746CONFIG_MD=y 723CONFIG_MD=y
747CONFIG_BLK_DEV_MD=y 724CONFIG_BLK_DEV_MD=y
748CONFIG_MD_LINEAR=y 725CONFIG_MD_LINEAR=y
@@ -761,6 +738,7 @@ CONFIG_DM_MIRROR=m
761CONFIG_DM_ZERO=m 738CONFIG_DM_ZERO=m
762CONFIG_DM_MULTIPATH=m 739CONFIG_DM_MULTIPATH=m
763CONFIG_DM_MULTIPATH_EMC=m 740CONFIG_DM_MULTIPATH_EMC=m
741# CONFIG_DM_MULTIPATH_RDAC is not set
764# CONFIG_DM_DELAY is not set 742# CONFIG_DM_DELAY is not set
765 743
766# 744#
@@ -797,10 +775,6 @@ CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
797CONFIG_IEEE1394_ETH1394=m 775CONFIG_IEEE1394_ETH1394=m
798CONFIG_IEEE1394_DV1394=m 776CONFIG_IEEE1394_DV1394=m
799CONFIG_IEEE1394_RAWIO=y 777CONFIG_IEEE1394_RAWIO=y
800
801#
802# I2O device support
803#
804# CONFIG_I2O is not set 778# CONFIG_I2O is not set
805CONFIG_MACINTOSH_DRIVERS=y 779CONFIG_MACINTOSH_DRIVERS=y
806CONFIG_ADB_PMU=y 780CONFIG_ADB_PMU=y
@@ -813,13 +787,11 @@ CONFIG_WINDFARM_PM81=y
813CONFIG_WINDFARM_PM91=y 787CONFIG_WINDFARM_PM91=y
814CONFIG_WINDFARM_PM112=y 788CONFIG_WINDFARM_PM112=y
815# CONFIG_PMAC_RACKMETER is not set 789# CONFIG_PMAC_RACKMETER is not set
816
817#
818# Network device support
819#
820CONFIG_NETDEVICES=y 790CONFIG_NETDEVICES=y
791# CONFIG_NETDEVICES_MULTIQUEUE is not set
821CONFIG_DUMMY=m 792CONFIG_DUMMY=m
822CONFIG_BONDING=m 793CONFIG_BONDING=m
794# CONFIG_MACVLAN is not set
823# CONFIG_EQUALIZER is not set 795# CONFIG_EQUALIZER is not set
824CONFIG_TUN=m 796CONFIG_TUN=m
825# CONFIG_ARCNET is not set 797# CONFIG_ARCNET is not set
@@ -836,13 +808,10 @@ CONFIG_MARVELL_PHY=m
836# CONFIG_VITESSE_PHY is not set 808# CONFIG_VITESSE_PHY is not set
837# CONFIG_SMSC_PHY is not set 809# CONFIG_SMSC_PHY is not set
838CONFIG_BROADCOM_PHY=m 810CONFIG_BROADCOM_PHY=m
811# CONFIG_ICPLUS_PHY is not set
839CONFIG_FIXED_PHY=m 812CONFIG_FIXED_PHY=m
840CONFIG_FIXED_MII_10_FDX=y 813CONFIG_FIXED_MII_10_FDX=y
841CONFIG_FIXED_MII_100_FDX=y 814CONFIG_FIXED_MII_100_FDX=y
842
843#
844# Ethernet (10 or 100Mbit)
845#
846CONFIG_NET_ETHERNET=y 815CONFIG_NET_ETHERNET=y
847CONFIG_MII=y 816CONFIG_MII=y
848# CONFIG_HAPPYMEAL is not set 817# CONFIG_HAPPYMEAL is not set
@@ -851,10 +820,6 @@ CONFIG_SUNGEM=y
851CONFIG_NET_VENDOR_3COM=y 820CONFIG_NET_VENDOR_3COM=y
852CONFIG_VORTEX=y 821CONFIG_VORTEX=y
853# CONFIG_TYPHOON is not set 822# CONFIG_TYPHOON is not set
854
855#
856# Tulip family network device support
857#
858# CONFIG_NET_TULIP is not set 823# CONFIG_NET_TULIP is not set
859# CONFIG_HP100 is not set 824# CONFIG_HP100 is not set
860CONFIG_IBMVETH=m 825CONFIG_IBMVETH=m
@@ -892,7 +857,6 @@ CONFIG_E1000=y
892# CONFIG_SIS190 is not set 857# CONFIG_SIS190 is not set
893# CONFIG_SKGE is not set 858# CONFIG_SKGE is not set
894# CONFIG_SKY2 is not set 859# CONFIG_SKY2 is not set
895# CONFIG_SK98LIN is not set
896# CONFIG_VIA_VELOCITY is not set 860# CONFIG_VIA_VELOCITY is not set
897CONFIG_TIGON3=y 861CONFIG_TIGON3=y
898# CONFIG_BNX2 is not set 862# CONFIG_BNX2 is not set
@@ -942,6 +906,7 @@ CONFIG_PPP_DEFLATE=m
942CONFIG_PPP_BSDCOMP=m 906CONFIG_PPP_BSDCOMP=m
943# CONFIG_PPP_MPPE is not set 907# CONFIG_PPP_MPPE is not set
944CONFIG_PPPOE=m 908CONFIG_PPPOE=m
909# CONFIG_PPPOL2TP is not set
945# CONFIG_SLIP is not set 910# CONFIG_SLIP is not set
946CONFIG_SLHC=m 911CONFIG_SLHC=m
947# CONFIG_NET_FC is not set 912# CONFIG_NET_FC is not set
@@ -950,15 +915,7 @@ CONFIG_NETCONSOLE=y
950CONFIG_NETPOLL=y 915CONFIG_NETPOLL=y
951CONFIG_NETPOLL_TRAP=y 916CONFIG_NETPOLL_TRAP=y
952CONFIG_NET_POLL_CONTROLLER=y 917CONFIG_NET_POLL_CONTROLLER=y
953
954#
955# ISDN subsystem
956#
957# CONFIG_ISDN is not set 918# CONFIG_ISDN is not set
958
959#
960# Telephony Support
961#
962# CONFIG_PHONE is not set 919# CONFIG_PHONE is not set
963 920
964# 921#
@@ -1065,10 +1022,6 @@ CONFIG_HVC_ISERIES=y
1065CONFIG_HVC_RTAS=y 1022CONFIG_HVC_RTAS=y
1066CONFIG_HVC_BEAT=y 1023CONFIG_HVC_BEAT=y
1067CONFIG_HVCS=m 1024CONFIG_HVCS=m
1068
1069#
1070# IPMI
1071#
1072# CONFIG_IPMI_HANDLER is not set 1025# CONFIG_IPMI_HANDLER is not set
1073# CONFIG_WATCHDOG is not set 1026# CONFIG_WATCHDOG is not set
1074# CONFIG_HW_RANDOM is not set 1027# CONFIG_HW_RANDOM is not set
@@ -1081,10 +1034,6 @@ CONFIG_GEN_RTC=y
1081CONFIG_RAW_DRIVER=y 1034CONFIG_RAW_DRIVER=y
1082CONFIG_MAX_RAW_DEVS=256 1035CONFIG_MAX_RAW_DEVS=256
1083# CONFIG_HANGCHECK_TIMER is not set 1036# CONFIG_HANGCHECK_TIMER is not set
1084
1085#
1086# TPM devices
1087#
1088# CONFIG_TCG_TPM is not set 1037# CONFIG_TCG_TPM is not set
1089CONFIG_DEVPORT=y 1038CONFIG_DEVPORT=y
1090CONFIG_I2C=y 1039CONFIG_I2C=y
@@ -1119,6 +1068,7 @@ CONFIG_I2C_POWERMAC=y
1119# CONFIG_I2C_SIS5595 is not set 1068# CONFIG_I2C_SIS5595 is not set
1120# CONFIG_I2C_SIS630 is not set 1069# CONFIG_I2C_SIS630 is not set
1121# CONFIG_I2C_SIS96X is not set 1070# CONFIG_I2C_SIS96X is not set
1071# CONFIG_I2C_TAOS_EVM is not set
1122# CONFIG_I2C_STUB is not set 1072# CONFIG_I2C_STUB is not set
1123# CONFIG_I2C_TINY_USB is not set 1073# CONFIG_I2C_TINY_USB is not set
1124# CONFIG_I2C_VIA is not set 1074# CONFIG_I2C_VIA is not set
@@ -1130,11 +1080,13 @@ CONFIG_I2C_POWERMAC=y
1130# 1080#
1131# CONFIG_SENSORS_DS1337 is not set 1081# CONFIG_SENSORS_DS1337 is not set
1132# CONFIG_SENSORS_DS1374 is not set 1082# CONFIG_SENSORS_DS1374 is not set
1083# CONFIG_DS1682 is not set
1133# CONFIG_SENSORS_EEPROM is not set 1084# CONFIG_SENSORS_EEPROM is not set
1134# CONFIG_SENSORS_PCF8574 is not set 1085# CONFIG_SENSORS_PCF8574 is not set
1135# CONFIG_SENSORS_PCA9539 is not set 1086# CONFIG_SENSORS_PCA9539 is not set
1136# CONFIG_SENSORS_PCF8591 is not set 1087# CONFIG_SENSORS_PCF8591 is not set
1137# CONFIG_SENSORS_MAX6875 is not set 1088# CONFIG_SENSORS_MAX6875 is not set
1089# CONFIG_SENSORS_TSL2550 is not set
1138# CONFIG_I2C_DEBUG_CORE is not set 1090# CONFIG_I2C_DEBUG_CORE is not set
1139# CONFIG_I2C_DEBUG_ALGO is not set 1091# CONFIG_I2C_DEBUG_ALGO is not set
1140# CONFIG_I2C_DEBUG_BUS is not set 1092# CONFIG_I2C_DEBUG_BUS is not set
@@ -1145,11 +1097,8 @@ CONFIG_I2C_POWERMAC=y
1145# 1097#
1146# CONFIG_SPI is not set 1098# CONFIG_SPI is not set
1147# CONFIG_SPI_MASTER is not set 1099# CONFIG_SPI_MASTER is not set
1148
1149#
1150# Dallas's 1-wire bus
1151#
1152# CONFIG_W1 is not set 1100# CONFIG_W1 is not set
1101# CONFIG_POWER_SUPPLY is not set
1153# CONFIG_HWMON is not set 1102# CONFIG_HWMON is not set
1154 1103
1155# 1104#
@@ -1168,8 +1117,8 @@ CONFIG_I2C_POWERMAC=y
1168# Graphics support 1117# Graphics support
1169# 1118#
1170CONFIG_BACKLIGHT_LCD_SUPPORT=y 1119CONFIG_BACKLIGHT_LCD_SUPPORT=y
1171CONFIG_BACKLIGHT_CLASS_DEVICE=y
1172CONFIG_LCD_CLASS_DEVICE=y 1120CONFIG_LCD_CLASS_DEVICE=y
1121CONFIG_BACKLIGHT_CLASS_DEVICE=y
1173 1122
1174# 1123#
1175# Display device support 1124# Display device support
@@ -1180,6 +1129,7 @@ CONFIG_DISPLAY_SUPPORT=y
1180# Display hardware drivers 1129# Display hardware drivers
1181# 1130#
1182# CONFIG_VGASTATE is not set 1131# CONFIG_VGASTATE is not set
1132CONFIG_VIDEO_OUTPUT_CONTROL=m
1183CONFIG_FB=y 1133CONFIG_FB=y
1184CONFIG_FIRMWARE_EDID=y 1134CONFIG_FIRMWARE_EDID=y
1185CONFIG_FB_DDC=y 1135CONFIG_FB_DDC=y
@@ -1243,11 +1193,13 @@ CONFIG_FB_IBM_GXT4500=y
1243# CONFIG_VGA_CONSOLE is not set 1193# CONFIG_VGA_CONSOLE is not set
1244CONFIG_DUMMY_CONSOLE=y 1194CONFIG_DUMMY_CONSOLE=y
1245CONFIG_FRAMEBUFFER_CONSOLE=y 1195CONFIG_FRAMEBUFFER_CONSOLE=y
1196# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1246# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1197# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1247# CONFIG_FONTS is not set 1198# CONFIG_FONTS is not set
1248CONFIG_FONT_8x8=y 1199CONFIG_FONT_8x8=y
1249CONFIG_FONT_8x16=y 1200CONFIG_FONT_8x16=y
1250CONFIG_LOGO=y 1201CONFIG_LOGO=y
1202CONFIG_FB_LOGO_EXTRA=y
1251CONFIG_LOGO_LINUX_MONO=y 1203CONFIG_LOGO_LINUX_MONO=y
1252CONFIG_LOGO_LINUX_VGA16=y 1204CONFIG_LOGO_LINUX_VGA16=y
1253CONFIG_LOGO_LINUX_CLUT224=y 1205CONFIG_LOGO_LINUX_CLUT224=y
@@ -1303,6 +1255,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1303# CONFIG_SND_CMIPCI is not set 1255# CONFIG_SND_CMIPCI is not set
1304# CONFIG_SND_CS4281 is not set 1256# CONFIG_SND_CS4281 is not set
1305# CONFIG_SND_CS46XX is not set 1257# CONFIG_SND_CS46XX is not set
1258# CONFIG_SND_CS5530 is not set
1306# CONFIG_SND_DARLA20 is not set 1259# CONFIG_SND_DARLA20 is not set
1307# CONFIG_SND_GINA20 is not set 1260# CONFIG_SND_GINA20 is not set
1308# CONFIG_SND_LAYLA20 is not set 1261# CONFIG_SND_LAYLA20 is not set
@@ -1352,6 +1305,10 @@ CONFIG_SND_POWERMAC=m
1352CONFIG_SND_POWERMAC_AUTO_DRC=y 1305CONFIG_SND_POWERMAC_AUTO_DRC=y
1353 1306
1354# 1307#
1308# ALSA PowerPC devices
1309#
1310
1311#
1355# Apple Onboard Audio driver 1312# Apple Onboard Audio driver
1356# 1313#
1357CONFIG_SND_AOA=m 1314CONFIG_SND_AOA=m
@@ -1375,13 +1332,14 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m
1375# CONFIG_SND_SOC is not set 1332# CONFIG_SND_SOC is not set
1376 1333
1377# 1334#
1378# Open Sound System 1335# SoC Audio support for SuperH
1379# 1336#
1380# CONFIG_SOUND_PRIME is not set
1381 1337
1382# 1338#
1383# HID Devices 1339# Open Sound System
1384# 1340#
1341# CONFIG_SOUND_PRIME is not set
1342CONFIG_HID_SUPPORT=y
1385CONFIG_HID=y 1343CONFIG_HID=y
1386# CONFIG_HID_DEBUG is not set 1344# CONFIG_HID_DEBUG is not set
1387 1345
@@ -1392,10 +1350,7 @@ CONFIG_USB_HID=y
1392# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1350# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1393# CONFIG_HID_FF is not set 1351# CONFIG_HID_FF is not set
1394CONFIG_USB_HIDDEV=y 1352CONFIG_USB_HIDDEV=y
1395 1353CONFIG_USB_SUPPORT=y
1396#
1397# USB support
1398#
1399CONFIG_USB_ARCH_HAS_HCD=y 1354CONFIG_USB_ARCH_HAS_HCD=y
1400CONFIG_USB_ARCH_HAS_OHCI=y 1355CONFIG_USB_ARCH_HAS_OHCI=y
1401CONFIG_USB_ARCH_HAS_EHCI=y 1356CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1426,6 +1381,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1426CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1381CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1427# CONFIG_USB_UHCI_HCD is not set 1382# CONFIG_USB_UHCI_HCD is not set
1428# CONFIG_USB_SL811_HCD is not set 1383# CONFIG_USB_SL811_HCD is not set
1384# CONFIG_USB_R8A66597_HCD is not set
1429 1385
1430# 1386#
1431# USB Device Class drivers 1387# USB Device Class drivers
@@ -1504,23 +1460,7 @@ CONFIG_USB_APPLEDISPLAY=m
1504# 1460#
1505# CONFIG_USB_GADGET is not set 1461# CONFIG_USB_GADGET is not set
1506# CONFIG_MMC is not set 1462# CONFIG_MMC is not set
1507
1508#
1509# LED devices
1510#
1511# CONFIG_NEW_LEDS is not set 1463# CONFIG_NEW_LEDS is not set
1512
1513#
1514# LED drivers
1515#
1516
1517#
1518# LED Triggers
1519#
1520
1521#
1522# InfiniBand support
1523#
1524CONFIG_INFINIBAND=m 1464CONFIG_INFINIBAND=m
1525# CONFIG_INFINIBAND_USER_MAD is not set 1465# CONFIG_INFINIBAND_USER_MAD is not set
1526# CONFIG_INFINIBAND_USER_ACCESS is not set 1466# CONFIG_INFINIBAND_USER_ACCESS is not set
@@ -1536,14 +1476,13 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
1536# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set 1476# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1537# CONFIG_INFINIBAND_SRP is not set 1477# CONFIG_INFINIBAND_SRP is not set
1538CONFIG_INFINIBAND_ISER=m 1478CONFIG_INFINIBAND_ISER=m
1479CONFIG_EDAC=y
1539 1480
1540# 1481#
1541# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1482# Reporting subsystems
1542#
1543
1544#
1545# Real Time Clock
1546# 1483#
1484# CONFIG_EDAC_DEBUG is not set
1485CONFIG_EDAC_MM_EDAC=y
1547# CONFIG_RTC_CLASS is not set 1486# CONFIG_RTC_CLASS is not set
1548 1487
1549# 1488#
@@ -1560,6 +1499,11 @@ CONFIG_INFINIBAND_ISER=m
1560# 1499#
1561 1500
1562# 1501#
1502# Userspace I/O
1503#
1504# CONFIG_UIO is not set
1505
1506#
1563# File systems 1507# File systems
1564# 1508#
1565CONFIG_EXT2_FS=y 1509CONFIG_EXT2_FS=y
@@ -1690,7 +1634,6 @@ CONFIG_CIFS_POSIX=y
1690# CONFIG_NCP_FS is not set 1634# CONFIG_NCP_FS is not set
1691# CONFIG_CODA_FS is not set 1635# CONFIG_CODA_FS is not set
1692# CONFIG_AFS_FS is not set 1636# CONFIG_AFS_FS is not set
1693# CONFIG_9P_FS is not set
1694 1637
1695# 1638#
1696# Partition Types 1639# Partition Types
@@ -1772,6 +1715,7 @@ CONFIG_CRC_CCITT=m
1772# CONFIG_CRC16 is not set 1715# CONFIG_CRC16 is not set
1773# CONFIG_CRC_ITU_T is not set 1716# CONFIG_CRC_ITU_T is not set
1774CONFIG_CRC32=y 1717CONFIG_CRC32=y
1718# CONFIG_CRC7 is not set
1775CONFIG_LIBCRC32C=m 1719CONFIG_LIBCRC32C=m
1776CONFIG_ZLIB_INFLATE=y 1720CONFIG_ZLIB_INFLATE=y
1777CONFIG_ZLIB_DEFLATE=m 1721CONFIG_ZLIB_DEFLATE=m
@@ -1803,6 +1747,7 @@ CONFIG_DEBUG_FS=y
1803CONFIG_DEBUG_KERNEL=y 1747CONFIG_DEBUG_KERNEL=y
1804# CONFIG_DEBUG_SHIRQ is not set 1748# CONFIG_DEBUG_SHIRQ is not set
1805CONFIG_DETECT_SOFTLOCKUP=y 1749CONFIG_DETECT_SOFTLOCKUP=y
1750CONFIG_SCHED_DEBUG=y
1806# CONFIG_SCHEDSTATS is not set 1751# CONFIG_SCHEDSTATS is not set
1807# CONFIG_TIMER_STATS is not set 1752# CONFIG_TIMER_STATS is not set
1808# CONFIG_DEBUG_SLAB is not set 1753# CONFIG_DEBUG_SLAB is not set
@@ -1837,10 +1782,10 @@ CONFIG_BOOTX_TEXT=y
1837# 1782#
1838# CONFIG_KEYS is not set 1783# CONFIG_KEYS is not set
1839# CONFIG_SECURITY is not set 1784# CONFIG_SECURITY is not set
1840 1785CONFIG_XOR_BLOCKS=y
1841# 1786CONFIG_ASYNC_CORE=y
1842# Cryptographic options 1787CONFIG_ASYNC_MEMCPY=y
1843# 1788CONFIG_ASYNC_XOR=y
1844CONFIG_CRYPTO=y 1789CONFIG_CRYPTO=y
1845CONFIG_CRYPTO_ALGAPI=y 1790CONFIG_CRYPTO_ALGAPI=y
1846CONFIG_CRYPTO_BLKCIPHER=y 1791CONFIG_CRYPTO_BLKCIPHER=y
@@ -1880,7 +1825,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1880CONFIG_CRYPTO_CRC32C=m 1825CONFIG_CRYPTO_CRC32C=m
1881# CONFIG_CRYPTO_CAMELLIA is not set 1826# CONFIG_CRYPTO_CAMELLIA is not set
1882CONFIG_CRYPTO_TEST=m 1827CONFIG_CRYPTO_TEST=m
1883 1828# CONFIG_CRYPTO_HW is not set
1884#
1885# Hardware crypto devices
1886#
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 0caf0dd5ea87..0f274e5f6926 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,9 +1,23 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc4
4# Tue Jun 26 14:17:45 2007 4# Thu Aug 30 16:50:02 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y
13CONFIG_POWER4=y
14CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y
17CONFIG_PPC_MM_SLICES=y
18CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y
20CONFIG_NR_CPUS=128
7CONFIG_64BIT=y 21CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 23CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 29CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 30CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 31CONFIG_GENERIC_FIND_NEXT_BIT=y
32CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 33CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 34CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 35CONFIG_COMPAT=y
@@ -22,45 +37,27 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
25CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
26# CONFIG_GENERIC_TBSYNC is not set 42# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34# CONFIG_POWER4_ONLY is not set
35CONFIG_POWER3=y
36CONFIG_POWER4=y
37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
39# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO is not set
40# CONFIG_PPC_OF_PLATFORM_PCI is not set 48# CONFIG_PPC_OF_PLATFORM_PCI is not set
41CONFIG_ALTIVEC=y
42CONFIG_PPC_STD_MMU=y
43CONFIG_PPC_MM_SLICES=y
44CONFIG_VIRT_CPU_ACCOUNTING=y
45CONFIG_SMP=y
46CONFIG_NR_CPUS=128
47CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
48 50
49# 51#
50# Code maturity level options 52# General setup
51# 53#
52CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
53CONFIG_LOCK_KERNEL=y 55CONFIG_LOCK_KERNEL=y
54CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
55
56#
57# General setup
58#
59CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
60CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
61CONFIG_SWAP=y 59CONFIG_SWAP=y
62CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
63# CONFIG_IPC_NS is not set
64CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
65CONFIG_POSIX_MQUEUE=y 62CONFIG_POSIX_MQUEUE=y
66# CONFIG_BSD_PROCESS_ACCT is not set 63# CONFIG_BSD_PROCESS_ACCT is not set
@@ -68,7 +65,7 @@ CONFIG_TASKSTATS=y
68CONFIG_TASK_DELAY_ACCT=y 65CONFIG_TASK_DELAY_ACCT=y
69CONFIG_TASK_XACCT=y 66CONFIG_TASK_XACCT=y
70CONFIG_TASK_IO_ACCOUNTING=y 67CONFIG_TASK_IO_ACCOUNTING=y
71# CONFIG_UTS_NS is not set 68# CONFIG_USER_NS is not set
72CONFIG_AUDIT=y 69CONFIG_AUDIT=y
73CONFIG_AUDITSYSCALL=y 70CONFIG_AUDITSYSCALL=y
74CONFIG_IKCONFIG=y 71CONFIG_IKCONFIG=y
@@ -105,10 +102,6 @@ CONFIG_SLAB=y
105CONFIG_RT_MUTEXES=y 102CONFIG_RT_MUTEXES=y
106# CONFIG_TINY_SHMEM is not set 103# CONFIG_TINY_SHMEM is not set
107CONFIG_BASE_SMALL=0 104CONFIG_BASE_SMALL=0
108
109#
110# Loadable module support
111#
112CONFIG_MODULES=y 105CONFIG_MODULES=y
113CONFIG_MODULE_UNLOAD=y 106CONFIG_MODULE_UNLOAD=y
114# CONFIG_MODULE_FORCE_UNLOAD is not set 107# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -116,12 +109,9 @@ CONFIG_MODVERSIONS=y
116CONFIG_MODULE_SRCVERSION_ALL=y 109CONFIG_MODULE_SRCVERSION_ALL=y
117CONFIG_KMOD=y 110CONFIG_KMOD=y
118CONFIG_STOP_MACHINE=y 111CONFIG_STOP_MACHINE=y
119
120#
121# Block layer
122#
123CONFIG_BLOCK=y 112CONFIG_BLOCK=y
124# CONFIG_BLK_DEV_IO_TRACE is not set 113# CONFIG_BLK_DEV_IO_TRACE is not set
114CONFIG_BLK_DEV_BSG=y
125 115
126# 116#
127# IO Schedulers 117# IO Schedulers
@@ -141,7 +131,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
141# 131#
142CONFIG_PPC_MULTIPLATFORM=y 132CONFIG_PPC_MULTIPLATFORM=y
143# CONFIG_EMBEDDED6xx is not set 133# CONFIG_EMBEDDED6xx is not set
144# CONFIG_APUS is not set 134# CONFIG_PPC_82xx is not set
135# CONFIG_PPC_83xx is not set
136# CONFIG_PPC_86xx is not set
145CONFIG_PPC_PSERIES=y 137CONFIG_PPC_PSERIES=y
146CONFIG_PPC_SPLPAR=y 138CONFIG_PPC_SPLPAR=y
147CONFIG_EEH=y 139CONFIG_EEH=y
@@ -179,6 +171,7 @@ CONFIG_IBMEBUS=y
179# CONFIG_GENERIC_IOMAP is not set 171# CONFIG_GENERIC_IOMAP is not set
180# CONFIG_CPU_FREQ is not set 172# CONFIG_CPU_FREQ is not set
181# CONFIG_CPM2 is not set 173# CONFIG_CPM2 is not set
174# CONFIG_FSL_ULI1575 is not set
182 175
183# 176#
184# Kernel options 177# Kernel options
@@ -221,6 +214,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 214CONFIG_MIGRATION=y
222CONFIG_RESOURCES_64BIT=y 215CONFIG_RESOURCES_64BIT=y
223CONFIG_ZONE_DMA_FLAG=1 216CONFIG_ZONE_DMA_FLAG=1
217CONFIG_BOUNCE=y
224CONFIG_NODES_SPAN_OTHER_NODES=y 218CONFIG_NODES_SPAN_OTHER_NODES=y
225# CONFIG_PPC_HAS_HASH_64K is not set 219# CONFIG_PPC_HAS_HASH_64K is not set
226# CONFIG_PPC_64K_PAGES is not set 220# CONFIG_PPC_64K_PAGES is not set
@@ -228,6 +222,7 @@ CONFIG_SCHED_SMT=y
228CONFIG_PROC_DEVICETREE=y 222CONFIG_PROC_DEVICETREE=y
229# CONFIG_CMDLINE_BOOL is not set 223# CONFIG_CMDLINE_BOOL is not set
230# CONFIG_PM is not set 224# CONFIG_PM is not set
225CONFIG_SUSPEND_SMP_POSSIBLE=y
231CONFIG_SECCOMP=y 226CONFIG_SECCOMP=y
232# CONFIG_WANT_DEVICE_TREE is not set 227# CONFIG_WANT_DEVICE_TREE is not set
233CONFIG_ISA_DMA_API=y 228CONFIG_ISA_DMA_API=y
@@ -240,6 +235,7 @@ CONFIG_GENERIC_ISA_DMA=y
240# CONFIG_PPC_INDIRECT_PCI is not set 235# CONFIG_PPC_INDIRECT_PCI is not set
241CONFIG_PCI=y 236CONFIG_PCI=y
242CONFIG_PCI_DOMAINS=y 237CONFIG_PCI_DOMAINS=y
238CONFIG_PCI_SYSCALL=y
243# CONFIG_PCIEPORTBUS is not set 239# CONFIG_PCIEPORTBUS is not set
244CONFIG_ARCH_SUPPORTS_MSI=y 240CONFIG_ARCH_SUPPORTS_MSI=y
245CONFIG_PCI_MSI=y 241CONFIG_PCI_MSI=y
@@ -318,6 +314,7 @@ CONFIG_NF_CT_ACCT=y
318CONFIG_NF_CONNTRACK_MARK=y 314CONFIG_NF_CONNTRACK_MARK=y
319CONFIG_NF_CONNTRACK_EVENTS=y 315CONFIG_NF_CONNTRACK_EVENTS=y
320# CONFIG_NF_CT_PROTO_SCTP is not set 316# CONFIG_NF_CT_PROTO_SCTP is not set
317CONFIG_NF_CT_PROTO_UDPLITE=m
321# CONFIG_NF_CONNTRACK_AMANDA is not set 318# CONFIG_NF_CONNTRACK_AMANDA is not set
322CONFIG_NF_CONNTRACK_FTP=m 319CONFIG_NF_CONNTRACK_FTP=m
323# CONFIG_NF_CONNTRACK_H323 is not set 320# CONFIG_NF_CONNTRACK_H323 is not set
@@ -336,6 +333,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=m
336CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 333CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
337CONFIG_NETFILTER_XT_MATCH_COMMENT=m 334CONFIG_NETFILTER_XT_MATCH_COMMENT=m
338CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 335CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
336CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
339CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 337CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
340CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 338CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
341CONFIG_NETFILTER_XT_MATCH_DCCP=m 339CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -356,6 +354,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
356CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 354CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
357CONFIG_NETFILTER_XT_MATCH_STRING=m 355CONFIG_NETFILTER_XT_MATCH_STRING=m
358CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 356CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
357CONFIG_NETFILTER_XT_MATCH_U32=m
359CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 358CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
360 359
361# 360#
@@ -434,6 +433,7 @@ CONFIG_NET_CLS_ROUTE=y
434# CONFIG_MAC80211 is not set 433# CONFIG_MAC80211 is not set
435# CONFIG_IEEE80211 is not set 434# CONFIG_IEEE80211 is not set
436# CONFIG_RFKILL is not set 435# CONFIG_RFKILL is not set
436# CONFIG_NET_9P is not set
437 437
438# 438#
439# Device Drivers 439# Device Drivers
@@ -448,16 +448,9 @@ CONFIG_FW_LOADER=y
448# CONFIG_DEBUG_DRIVER is not set 448# CONFIG_DEBUG_DRIVER is not set
449# CONFIG_DEBUG_DEVRES is not set 449# CONFIG_DEBUG_DEVRES is not set
450# CONFIG_SYS_HYPERVISOR is not set 450# CONFIG_SYS_HYPERVISOR is not set
451
452#
453# Connector - unified userspace <-> kernelspace linker
454#
455# CONFIG_CONNECTOR is not set 451# CONFIG_CONNECTOR is not set
456# CONFIG_MTD is not set 452# CONFIG_MTD is not set
457 453CONFIG_OF_DEVICE=y
458#
459# Parallel port support
460#
461CONFIG_PARPORT=m 454CONFIG_PARPORT=m
462CONFIG_PARPORT_PC=m 455CONFIG_PARPORT_PC=m
463# CONFIG_PARPORT_SERIAL is not set 456# CONFIG_PARPORT_SERIAL is not set
@@ -466,18 +459,9 @@ CONFIG_PARPORT_PC=m
466# CONFIG_PARPORT_GSC is not set 459# CONFIG_PARPORT_GSC is not set
467# CONFIG_PARPORT_AX88796 is not set 460# CONFIG_PARPORT_AX88796 is not set
468# CONFIG_PARPORT_1284 is not set 461# CONFIG_PARPORT_1284 is not set
469 462CONFIG_BLK_DEV=y
470#
471# Plug and Play support
472#
473# CONFIG_PNPACPI is not set
474
475#
476# Block devices
477#
478CONFIG_BLK_DEV_FD=m 463CONFIG_BLK_DEV_FD=m
479# CONFIG_PARIDE is not set 464# CONFIG_PARIDE is not set
480# CONFIG_BLK_CPQ_DA is not set
481# CONFIG_BLK_CPQ_CISS_DA is not set 465# CONFIG_BLK_CPQ_CISS_DA is not set
482# CONFIG_BLK_DEV_DAC960 is not set 466# CONFIG_BLK_DEV_DAC960 is not set
483# CONFIG_BLK_DEV_UMEM is not set 467# CONFIG_BLK_DEV_UMEM is not set
@@ -493,14 +477,11 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
493CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 477CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
494# CONFIG_CDROM_PKTCDVD is not set 478# CONFIG_CDROM_PKTCDVD is not set
495# CONFIG_ATA_OVER_ETH is not set 479# CONFIG_ATA_OVER_ETH is not set
496 480CONFIG_MISC_DEVICES=y
497#
498# Misc devices
499#
500# CONFIG_PHANTOM is not set 481# CONFIG_PHANTOM is not set
482# CONFIG_EEPROM_93CX6 is not set
501# CONFIG_SGI_IOC4 is not set 483# CONFIG_SGI_IOC4 is not set
502# CONFIG_TIFM_CORE is not set 484# CONFIG_TIFM_CORE is not set
503# CONFIG_BLINK is not set
504CONFIG_IDE=y 485CONFIG_IDE=y
505CONFIG_BLK_DEV_IDE=y 486CONFIG_BLK_DEV_IDE=y
506 487
@@ -565,6 +546,7 @@ CONFIG_BLK_DEV_IDEDMA=y
565# 546#
566# CONFIG_RAID_ATTRS is not set 547# CONFIG_RAID_ATTRS is not set
567CONFIG_SCSI=y 548CONFIG_SCSI=y
549CONFIG_SCSI_DMA=y
568# CONFIG_SCSI_TGT is not set 550# CONFIG_SCSI_TGT is not set
569CONFIG_SCSI_NETLINK=y 551CONFIG_SCSI_NETLINK=y
570CONFIG_SCSI_PROC_FS=y 552CONFIG_SCSI_PROC_FS=y
@@ -597,10 +579,7 @@ CONFIG_SCSI_FC_ATTRS=y
597CONFIG_SCSI_ISCSI_ATTRS=m 579CONFIG_SCSI_ISCSI_ATTRS=m
598CONFIG_SCSI_SAS_ATTRS=m 580CONFIG_SCSI_SAS_ATTRS=m
599# CONFIG_SCSI_SAS_LIBSAS is not set 581# CONFIG_SCSI_SAS_LIBSAS is not set
600 582CONFIG_SCSI_LOWLEVEL=y
601#
602# SCSI low-level drivers
603#
604# CONFIG_ISCSI_TCP is not set 583# CONFIG_ISCSI_TCP is not set
605# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 584# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
606# CONFIG_SCSI_3W_9XXX is not set 585# CONFIG_SCSI_3W_9XXX is not set
@@ -615,7 +594,6 @@ CONFIG_SCSI_SAS_ATTRS=m
615# CONFIG_MEGARAID_LEGACY is not set 594# CONFIG_MEGARAID_LEGACY is not set
616# CONFIG_MEGARAID_SAS is not set 595# CONFIG_MEGARAID_SAS is not set
617# CONFIG_SCSI_HPTIOP is not set 596# CONFIG_SCSI_HPTIOP is not set
618# CONFIG_SCSI_BUSLOGIC is not set
619# CONFIG_SCSI_DMX3191D is not set 597# CONFIG_SCSI_DMX3191D is not set
620# CONFIG_SCSI_EATA is not set 598# CONFIG_SCSI_EATA is not set
621# CONFIG_SCSI_FUTURE_DOMAIN is not set 599# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -697,10 +675,6 @@ CONFIG_ATA=y
697# CONFIG_PATA_SIS is not set 675# CONFIG_PATA_SIS is not set
698# CONFIG_PATA_VIA is not set 676# CONFIG_PATA_VIA is not set
699CONFIG_PATA_WINBOND=y 677CONFIG_PATA_WINBOND=y
700
701#
702# Multi-device support (RAID and LVM)
703#
704CONFIG_MD=y 678CONFIG_MD=y
705CONFIG_BLK_DEV_MD=y 679CONFIG_BLK_DEV_MD=y
706CONFIG_MD_LINEAR=y 680CONFIG_MD_LINEAR=y
@@ -718,6 +692,7 @@ CONFIG_DM_MIRROR=m
718CONFIG_DM_ZERO=m 692CONFIG_DM_ZERO=m
719CONFIG_DM_MULTIPATH=m 693CONFIG_DM_MULTIPATH=m
720CONFIG_DM_MULTIPATH_EMC=m 694CONFIG_DM_MULTIPATH_EMC=m
695# CONFIG_DM_MULTIPATH_RDAC is not set
721# CONFIG_DM_DELAY is not set 696# CONFIG_DM_DELAY is not set
722 697
723# 698#
@@ -733,27 +708,17 @@ CONFIG_DM_MULTIPATH_EMC=m
733# 708#
734# CONFIG_FIREWIRE is not set 709# CONFIG_FIREWIRE is not set
735# CONFIG_IEEE1394 is not set 710# CONFIG_IEEE1394 is not set
736
737#
738# I2O device support
739#
740# CONFIG_I2O is not set 711# CONFIG_I2O is not set
741# CONFIG_MACINTOSH_DRIVERS is not set 712# CONFIG_MACINTOSH_DRIVERS is not set
742
743#
744# Network device support
745#
746CONFIG_NETDEVICES=y 713CONFIG_NETDEVICES=y
714# CONFIG_NETDEVICES_MULTIQUEUE is not set
747CONFIG_DUMMY=m 715CONFIG_DUMMY=m
748CONFIG_BONDING=m 716CONFIG_BONDING=m
717# CONFIG_MACVLAN is not set
749# CONFIG_EQUALIZER is not set 718# CONFIG_EQUALIZER is not set
750CONFIG_TUN=m 719CONFIG_TUN=m
751# CONFIG_ARCNET is not set 720# CONFIG_ARCNET is not set
752# CONFIG_PHYLIB is not set 721# CONFIG_PHYLIB is not set
753
754#
755# Ethernet (10 or 100Mbit)
756#
757CONFIG_NET_ETHERNET=y 722CONFIG_NET_ETHERNET=y
758CONFIG_MII=y 723CONFIG_MII=y
759# CONFIG_HAPPYMEAL is not set 724# CONFIG_HAPPYMEAL is not set
@@ -762,10 +727,6 @@ CONFIG_MII=y
762CONFIG_NET_VENDOR_3COM=y 727CONFIG_NET_VENDOR_3COM=y
763CONFIG_VORTEX=y 728CONFIG_VORTEX=y
764# CONFIG_TYPHOON is not set 729# CONFIG_TYPHOON is not set
765
766#
767# Tulip family network device support
768#
769# CONFIG_NET_TULIP is not set 730# CONFIG_NET_TULIP is not set
770# CONFIG_HP100 is not set 731# CONFIG_HP100 is not set
771CONFIG_IBMVETH=y 732CONFIG_IBMVETH=y
@@ -804,7 +765,6 @@ CONFIG_E1000=y
804# CONFIG_SIS190 is not set 765# CONFIG_SIS190 is not set
805# CONFIG_SKGE is not set 766# CONFIG_SKGE is not set
806# CONFIG_SKY2 is not set 767# CONFIG_SKY2 is not set
807# CONFIG_SK98LIN is not set
808# CONFIG_VIA_VELOCITY is not set 768# CONFIG_VIA_VELOCITY is not set
809CONFIG_TIGON3=y 769CONFIG_TIGON3=y
810# CONFIG_BNX2 is not set 770# CONFIG_BNX2 is not set
@@ -855,6 +815,7 @@ CONFIG_PPP_DEFLATE=m
855CONFIG_PPP_BSDCOMP=m 815CONFIG_PPP_BSDCOMP=m
856# CONFIG_PPP_MPPE is not set 816# CONFIG_PPP_MPPE is not set
857CONFIG_PPPOE=m 817CONFIG_PPPOE=m
818# CONFIG_PPPOL2TP is not set
858# CONFIG_SLIP is not set 819# CONFIG_SLIP is not set
859CONFIG_SLHC=m 820CONFIG_SLHC=m
860# CONFIG_NET_FC is not set 821# CONFIG_NET_FC is not set
@@ -863,15 +824,7 @@ CONFIG_NETCONSOLE=y
863CONFIG_NETPOLL=y 824CONFIG_NETPOLL=y
864CONFIG_NETPOLL_TRAP=y 825CONFIG_NETPOLL_TRAP=y
865CONFIG_NET_POLL_CONTROLLER=y 826CONFIG_NET_POLL_CONTROLLER=y
866
867#
868# ISDN subsystem
869#
870# CONFIG_ISDN is not set 827# CONFIG_ISDN is not set
871
872#
873# Telephony Support
874#
875# CONFIG_PHONE is not set 828# CONFIG_PHONE is not set
876 829
877# 830#
@@ -975,10 +928,6 @@ CONFIG_HVC_DRIVER=y
975CONFIG_HVC_CONSOLE=y 928CONFIG_HVC_CONSOLE=y
976CONFIG_HVC_RTAS=y 929CONFIG_HVC_RTAS=y
977CONFIG_HVCS=m 930CONFIG_HVCS=m
978
979#
980# IPMI
981#
982# CONFIG_IPMI_HANDLER is not set 931# CONFIG_IPMI_HANDLER is not set
983# CONFIG_WATCHDOG is not set 932# CONFIG_WATCHDOG is not set
984# CONFIG_HW_RANDOM is not set 933# CONFIG_HW_RANDOM is not set
@@ -991,10 +940,6 @@ CONFIG_GEN_RTC=y
991CONFIG_RAW_DRIVER=y 940CONFIG_RAW_DRIVER=y
992CONFIG_MAX_RAW_DEVS=1024 941CONFIG_MAX_RAW_DEVS=1024
993# CONFIG_HANGCHECK_TIMER is not set 942# CONFIG_HANGCHECK_TIMER is not set
994
995#
996# TPM devices
997#
998# CONFIG_TCG_TPM is not set 943# CONFIG_TCG_TPM is not set
999CONFIG_DEVPORT=y 944CONFIG_DEVPORT=y
1000CONFIG_I2C=y 945CONFIG_I2C=y
@@ -1029,6 +974,7 @@ CONFIG_I2C_ALGOBIT=y
1029# CONFIG_I2C_SIS5595 is not set 974# CONFIG_I2C_SIS5595 is not set
1030# CONFIG_I2C_SIS630 is not set 975# CONFIG_I2C_SIS630 is not set
1031# CONFIG_I2C_SIS96X is not set 976# CONFIG_I2C_SIS96X is not set
977# CONFIG_I2C_TAOS_EVM is not set
1032# CONFIG_I2C_STUB is not set 978# CONFIG_I2C_STUB is not set
1033# CONFIG_I2C_TINY_USB is not set 979# CONFIG_I2C_TINY_USB is not set
1034# CONFIG_I2C_VIA is not set 980# CONFIG_I2C_VIA is not set
@@ -1040,11 +986,13 @@ CONFIG_I2C_ALGOBIT=y
1040# 986#
1041# CONFIG_SENSORS_DS1337 is not set 987# CONFIG_SENSORS_DS1337 is not set
1042# CONFIG_SENSORS_DS1374 is not set 988# CONFIG_SENSORS_DS1374 is not set
989# CONFIG_DS1682 is not set
1043# CONFIG_SENSORS_EEPROM is not set 990# CONFIG_SENSORS_EEPROM is not set
1044# CONFIG_SENSORS_PCF8574 is not set 991# CONFIG_SENSORS_PCF8574 is not set
1045# CONFIG_SENSORS_PCA9539 is not set 992# CONFIG_SENSORS_PCA9539 is not set
1046# CONFIG_SENSORS_PCF8591 is not set 993# CONFIG_SENSORS_PCF8591 is not set
1047# CONFIG_SENSORS_MAX6875 is not set 994# CONFIG_SENSORS_MAX6875 is not set
995# CONFIG_SENSORS_TSL2550 is not set
1048# CONFIG_I2C_DEBUG_CORE is not set 996# CONFIG_I2C_DEBUG_CORE is not set
1049# CONFIG_I2C_DEBUG_ALGO is not set 997# CONFIG_I2C_DEBUG_ALGO is not set
1050# CONFIG_I2C_DEBUG_BUS is not set 998# CONFIG_I2C_DEBUG_BUS is not set
@@ -1055,11 +1003,8 @@ CONFIG_I2C_ALGOBIT=y
1055# 1003#
1056# CONFIG_SPI is not set 1004# CONFIG_SPI is not set
1057# CONFIG_SPI_MASTER is not set 1005# CONFIG_SPI_MASTER is not set
1058
1059#
1060# Dallas's 1-wire bus
1061#
1062# CONFIG_W1 is not set 1006# CONFIG_W1 is not set
1007# CONFIG_POWER_SUPPLY is not set
1063# CONFIG_HWMON is not set 1008# CONFIG_HWMON is not set
1064 1009
1065# 1010#
@@ -1078,8 +1023,8 @@ CONFIG_I2C_ALGOBIT=y
1078# Graphics support 1023# Graphics support
1079# 1024#
1080CONFIG_BACKLIGHT_LCD_SUPPORT=y 1025CONFIG_BACKLIGHT_LCD_SUPPORT=y
1081CONFIG_BACKLIGHT_CLASS_DEVICE=y
1082CONFIG_LCD_CLASS_DEVICE=m 1026CONFIG_LCD_CLASS_DEVICE=m
1027CONFIG_BACKLIGHT_CLASS_DEVICE=y
1083 1028
1084# 1029#
1085# Display device support 1030# Display device support
@@ -1090,6 +1035,7 @@ CONFIG_DISPLAY_SUPPORT=y
1090# Display hardware drivers 1035# Display hardware drivers
1091# 1036#
1092# CONFIG_VGASTATE is not set 1037# CONFIG_VGASTATE is not set
1038# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1093CONFIG_FB=y 1039CONFIG_FB=y
1094CONFIG_FIRMWARE_EDID=y 1040CONFIG_FIRMWARE_EDID=y
1095CONFIG_FB_DDC=y 1041CONFIG_FB_DDC=y
@@ -1152,6 +1098,7 @@ CONFIG_FB_IBM_GXT4500=y
1152# CONFIG_VGA_CONSOLE is not set 1098# CONFIG_VGA_CONSOLE is not set
1153CONFIG_DUMMY_CONSOLE=y 1099CONFIG_DUMMY_CONSOLE=y
1154CONFIG_FRAMEBUFFER_CONSOLE=y 1100CONFIG_FRAMEBUFFER_CONSOLE=y
1101# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1155# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1102# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1156# CONFIG_FONTS is not set 1103# CONFIG_FONTS is not set
1157CONFIG_FONT_8x8=y 1104CONFIG_FONT_8x8=y
@@ -1165,10 +1112,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
1165# Sound 1112# Sound
1166# 1113#
1167# CONFIG_SOUND is not set 1114# CONFIG_SOUND is not set
1168 1115CONFIG_HID_SUPPORT=y
1169#
1170# HID Devices
1171#
1172CONFIG_HID=y 1116CONFIG_HID=y
1173# CONFIG_HID_DEBUG is not set 1117# CONFIG_HID_DEBUG is not set
1174 1118
@@ -1179,10 +1123,7 @@ CONFIG_USB_HID=y
1179# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1123# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1180# CONFIG_HID_FF is not set 1124# CONFIG_HID_FF is not set
1181CONFIG_USB_HIDDEV=y 1125CONFIG_USB_HIDDEV=y
1182 1126CONFIG_USB_SUPPORT=y
1183#
1184# USB support
1185#
1186CONFIG_USB_ARCH_HAS_HCD=y 1127CONFIG_USB_ARCH_HAS_HCD=y
1187CONFIG_USB_ARCH_HAS_OHCI=y 1128CONFIG_USB_ARCH_HAS_OHCI=y
1188CONFIG_USB_ARCH_HAS_EHCI=y 1129CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1204,7 +1145,6 @@ CONFIG_USB_EHCI_HCD=y
1204# CONFIG_USB_EHCI_SPLIT_ISO is not set 1145# CONFIG_USB_EHCI_SPLIT_ISO is not set
1205# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1146# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1206# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1147# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1207# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1208# CONFIG_USB_ISP116X_HCD is not set 1148# CONFIG_USB_ISP116X_HCD is not set
1209CONFIG_USB_OHCI_HCD=y 1149CONFIG_USB_OHCI_HCD=y
1210# CONFIG_USB_OHCI_HCD_PPC_OF is not set 1150# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1213,6 +1153,7 @@ CONFIG_USB_OHCI_HCD=y
1213CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1153CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1214# CONFIG_USB_UHCI_HCD is not set 1154# CONFIG_USB_UHCI_HCD is not set
1215# CONFIG_USB_SL811_HCD is not set 1155# CONFIG_USB_SL811_HCD is not set
1156# CONFIG_USB_R8A66597_HCD is not set
1216 1157
1217# 1158#
1218# USB Device Class drivers 1159# USB Device Class drivers
@@ -1291,23 +1232,7 @@ CONFIG_USB_MON=y
1291# 1232#
1292# CONFIG_USB_GADGET is not set 1233# CONFIG_USB_GADGET is not set
1293# CONFIG_MMC is not set 1234# CONFIG_MMC is not set
1294
1295#
1296# LED devices
1297#
1298# CONFIG_NEW_LEDS is not set 1235# CONFIG_NEW_LEDS is not set
1299
1300#
1301# LED drivers
1302#
1303
1304#
1305# LED Triggers
1306#
1307
1308#
1309# InfiniBand support
1310#
1311CONFIG_INFINIBAND=m 1236CONFIG_INFINIBAND=m
1312CONFIG_INFINIBAND_USER_MAD=m 1237CONFIG_INFINIBAND_USER_MAD=m
1313CONFIG_INFINIBAND_USER_ACCESS=m 1238CONFIG_INFINIBAND_USER_ACCESS=m
@@ -1325,14 +1250,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
1325# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set 1250# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
1326CONFIG_INFINIBAND_SRP=m 1251CONFIG_INFINIBAND_SRP=m
1327# CONFIG_INFINIBAND_ISER is not set 1252# CONFIG_INFINIBAND_ISER is not set
1328 1253# CONFIG_EDAC is not set
1329#
1330# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1331#
1332
1333#
1334# Real Time Clock
1335#
1336# CONFIG_RTC_CLASS is not set 1254# CONFIG_RTC_CLASS is not set
1337 1255
1338# 1256#
@@ -1347,11 +1265,12 @@ CONFIG_INFINIBAND_SRP=m
1347# 1265#
1348# DMA Devices 1266# DMA Devices
1349# 1267#
1268# CONFIG_AUXDISPLAY is not set
1350 1269
1351# 1270#
1352# Auxiliary Display support 1271# Userspace I/O
1353# 1272#
1354# CONFIG_KS0108 is not set 1273# CONFIG_UIO is not set
1355 1274
1356# 1275#
1357# File systems 1276# File systems
@@ -1485,7 +1404,6 @@ CONFIG_CIFS_POSIX=y
1485# CONFIG_NCP_FS is not set 1404# CONFIG_NCP_FS is not set
1486# CONFIG_CODA_FS is not set 1405# CONFIG_CODA_FS is not set
1487# CONFIG_AFS_FS is not set 1406# CONFIG_AFS_FS is not set
1488# CONFIG_9P_FS is not set
1489 1407
1490# 1408#
1491# Partition Types 1409# Partition Types
@@ -1551,6 +1469,7 @@ CONFIG_CRC_CCITT=m
1551# CONFIG_CRC16 is not set 1469# CONFIG_CRC16 is not set
1552# CONFIG_CRC_ITU_T is not set 1470# CONFIG_CRC_ITU_T is not set
1553CONFIG_CRC32=y 1471CONFIG_CRC32=y
1472# CONFIG_CRC7 is not set
1554CONFIG_LIBCRC32C=m 1473CONFIG_LIBCRC32C=m
1555CONFIG_ZLIB_INFLATE=y 1474CONFIG_ZLIB_INFLATE=y
1556CONFIG_ZLIB_DEFLATE=m 1475CONFIG_ZLIB_DEFLATE=m
@@ -1582,6 +1501,7 @@ CONFIG_DEBUG_FS=y
1582CONFIG_DEBUG_KERNEL=y 1501CONFIG_DEBUG_KERNEL=y
1583# CONFIG_DEBUG_SHIRQ is not set 1502# CONFIG_DEBUG_SHIRQ is not set
1584CONFIG_DETECT_SOFTLOCKUP=y 1503CONFIG_DETECT_SOFTLOCKUP=y
1504CONFIG_SCHED_DEBUG=y
1585# CONFIG_SCHEDSTATS is not set 1505# CONFIG_SCHEDSTATS is not set
1586# CONFIG_TIMER_STATS is not set 1506# CONFIG_TIMER_STATS is not set
1587# CONFIG_DEBUG_SLAB is not set 1507# CONFIG_DEBUG_SLAB is not set
@@ -1617,10 +1537,6 @@ CONFIG_IRQSTACKS=y
1617# 1537#
1618# CONFIG_KEYS is not set 1538# CONFIG_KEYS is not set
1619# CONFIG_SECURITY is not set 1539# CONFIG_SECURITY is not set
1620
1621#
1622# Cryptographic options
1623#
1624CONFIG_CRYPTO=y 1540CONFIG_CRYPTO=y
1625CONFIG_CRYPTO_ALGAPI=y 1541CONFIG_CRYPTO_ALGAPI=y
1626CONFIG_CRYPTO_BLKCIPHER=y 1542CONFIG_CRYPTO_BLKCIPHER=y
@@ -1660,7 +1576,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1660CONFIG_CRYPTO_CRC32C=m 1576CONFIG_CRYPTO_CRC32C=m
1661# CONFIG_CRYPTO_CAMELLIA is not set 1577# CONFIG_CRYPTO_CAMELLIA is not set
1662CONFIG_CRYPTO_TEST=m 1578CONFIG_CRYPTO_TEST=m
1663 1579# CONFIG_CRYPTO_HW is not set
1664#
1665# Hardware crypto devices
1666#
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-27 16:07:13 -0500