aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-30 12:58:46 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-30 12:58:46 -0400
commita1c582d0720f2eff61043e90711767decf37b917 (patch)
tree6ca3d2eab832c753ab36343ba9d19b6b0ef1f26f
parentb5f281a62761887e7cb5f60fa81f7cd052fec5cb (diff)
parentfc43dca9e75b87d24a16d5be7b497e83837d9d31 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] PS3: Fix bug where the major version part is not compared [POWERPC] Update defconfigs [POWERPC] spufs: Don't call spu_run_init from spu_reacquire_runnable [POWERPC] spufs: Fix update of mailbox status register during backed wbox write [POWERPC] spu_manage: fix spu_unit_number for celleb device tree [POWERPC] Update defconfigs [POWERPC] Flush registers to proper task context
Diffstat
-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/linkstation_defconfig219
-rw-r--r--arch/powerpc/configs/lite5200_defconfig191
-rw-r--r--arch/powerpc/configs/maple_defconfig189
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig202
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig193
-rw-r--r--arch/powerpc/configs/mpc8313_rdb_defconfig224
-rw-r--r--arch/powerpc/configs/mpc832x_mds_defconfig209
-rw-r--r--arch/powerpc/configs/mpc832x_rdb_defconfig211
-rw-r--r--arch/powerpc/configs/mpc834x_itx_defconfig206
-rw-r--r--arch/powerpc/configs/mpc834x_itxgp_defconfig203
-rw-r--r--arch/powerpc/configs/mpc834x_mds_defconfig205
-rw-r--r--arch/powerpc/configs/mpc836x_mds_defconfig209
-rw-r--r--arch/powerpc/configs/mpc8540_ads_defconfig183
-rw-r--r--arch/powerpc/configs/mpc8544_ds_defconfig459
-rw-r--r--arch/powerpc/configs/mpc8560_ads_defconfig196
-rw-r--r--arch/powerpc/configs/mpc8568mds_defconfig43
-rw-r--r--arch/powerpc/configs/mpc85xx_cds_defconfig198
-rw-r--r--arch/powerpc/configs/mpc8641_hpcn_defconfig880
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig174
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig174
-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/prpmc2800_defconfig213
-rw-r--r--arch/powerpc/configs/pseries_defconfig205
-rw-r--r--arch/powerpc/kernel/process.c6
-rw-r--r--arch/powerpc/platforms/cell/spu_manage.c8
-rw-r--r--arch/powerpc/platforms/cell/spufs/backing_ops.c3
-rw-r--r--arch/powerpc/platforms/cell/spufs/run.c6
-rw-r--r--arch/powerpc/platforms/ps3/setup.c3
36 files changed, 2846 insertions, 4275 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/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index 78fd07c5f47f..a4e3ee045a6a 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_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:25:19 2007 4# Tue Aug 28 21:24:38 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
27CONFIG_DEFAULT_UIMAGE=y 44CONFIG_DEFAULT_UIMAGE=y
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
68CONFIG_POSIX_MQUEUE=y 60CONFIG_POSIX_MQUEUE=y
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
73CONFIG_IKCONFIG=y 65CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 66CONFIG_IKCONFIG_PROC=y
@@ -103,24 +95,17 @@ CONFIG_SLAB=y
103CONFIG_RT_MUTEXES=y 95CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 96# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 97CONFIG_BASE_SMALL=0
106
107#
108# Loadable module support
109#
110CONFIG_MODULES=y 98CONFIG_MODULES=y
111CONFIG_MODULE_UNLOAD=y 99CONFIG_MODULE_UNLOAD=y
112# CONFIG_MODULE_FORCE_UNLOAD is not set 100# CONFIG_MODULE_FORCE_UNLOAD is not set
113# CONFIG_MODVERSIONS is not set 101# CONFIG_MODVERSIONS is not set
114# CONFIG_MODULE_SRCVERSION_ALL is not set 102# CONFIG_MODULE_SRCVERSION_ALL is not set
115CONFIG_KMOD=y 103CONFIG_KMOD=y
116
117#
118# Block layer
119#
120CONFIG_BLOCK=y 104CONFIG_BLOCK=y
121# CONFIG_LBD is not set 105# CONFIG_LBD is not set
122# CONFIG_BLK_DEV_IO_TRACE is not set 106# CONFIG_BLK_DEV_IO_TRACE is not set
123# CONFIG_LSF is not set 107# CONFIG_LSF is not set
108# CONFIG_BLK_DEV_BSG is not set
124 109
125# 110#
126# IO Schedulers 111# IO Schedulers
@@ -140,7 +125,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
140# 125#
141# CONFIG_PPC_MULTIPLATFORM is not set 126# CONFIG_PPC_MULTIPLATFORM is not set
142CONFIG_EMBEDDED6xx=y 127CONFIG_EMBEDDED6xx=y
143# 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
144# CONFIG_PPC_MPC52xx is not set 131# CONFIG_PPC_MPC52xx is not set
145# CONFIG_PPC_MPC5200 is not set 132# CONFIG_PPC_MPC5200 is not set
146# CONFIG_PPC_CELL is not set 133# CONFIG_PPC_CELL is not set
@@ -163,8 +150,8 @@ CONFIG_MPIC=y
163# CONFIG_PPC_INDIRECT_IO is not set 150# CONFIG_PPC_INDIRECT_IO is not set
164# CONFIG_GENERIC_IOMAP is not set 151# CONFIG_GENERIC_IOMAP is not set
165# CONFIG_CPU_FREQ is not set 152# CONFIG_CPU_FREQ is not set
166# CONFIG_TAU is not set
167# CONFIG_CPM2 is not set 153# CONFIG_CPM2 is not set
154# CONFIG_FSL_ULI1575 is not set
168 155
169# 156#
170# Kernel options 157# Kernel options
@@ -193,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
193CONFIG_SPLIT_PTLOCK_CPUS=4 180CONFIG_SPLIT_PTLOCK_CPUS=4
194# CONFIG_RESOURCES_64BIT is not set 181# CONFIG_RESOURCES_64BIT is not set
195CONFIG_ZONE_DMA_FLAG=1 182CONFIG_ZONE_DMA_FLAG=1
183CONFIG_BOUNCE=y
184CONFIG_VIRT_TO_BUS=y
196CONFIG_PROC_DEVICETREE=y 185CONFIG_PROC_DEVICETREE=y
197# CONFIG_CMDLINE_BOOL is not set 186# CONFIG_CMDLINE_BOOL is not set
198# CONFIG_PM is not set 187# CONFIG_PM is not set
@@ -206,10 +195,10 @@ CONFIG_ISA_DMA_API=y
206CONFIG_ZONE_DMA=y 195CONFIG_ZONE_DMA=y
207CONFIG_GENERIC_ISA_DMA=y 196CONFIG_GENERIC_ISA_DMA=y
208CONFIG_PPC_INDIRECT_PCI=y 197CONFIG_PPC_INDIRECT_PCI=y
209# CONFIG_PPC_INDIRECT_PCI_BE is not set
210CONFIG_FSL_SOC=y 198CONFIG_FSL_SOC=y
211CONFIG_PCI=y 199CONFIG_PCI=y
212CONFIG_PCI_DOMAINS=y 200CONFIG_PCI_DOMAINS=y
201CONFIG_PCI_SYSCALL=y
213# CONFIG_PCIEPORTBUS is not set 202# CONFIG_PCIEPORTBUS is not set
214CONFIG_ARCH_SUPPORTS_MSI=y 203CONFIG_ARCH_SUPPORTS_MSI=y
215# CONFIG_PCI_MSI is not set 204# CONFIG_PCI_MSI is not set
@@ -297,6 +286,7 @@ CONFIG_NF_CONNTRACK=m
297# CONFIG_NF_CONNTRACK_EVENTS is not set 286# CONFIG_NF_CONNTRACK_EVENTS is not set
298CONFIG_NF_CT_PROTO_GRE=m 287CONFIG_NF_CT_PROTO_GRE=m
299CONFIG_NF_CT_PROTO_SCTP=m 288CONFIG_NF_CT_PROTO_SCTP=m
289# CONFIG_NF_CT_PROTO_UDPLITE is not set
300CONFIG_NF_CONNTRACK_AMANDA=m 290CONFIG_NF_CONNTRACK_AMANDA=m
301CONFIG_NF_CONNTRACK_FTP=m 291CONFIG_NF_CONNTRACK_FTP=m
302CONFIG_NF_CONNTRACK_H323=m 292CONFIG_NF_CONNTRACK_H323=m
@@ -314,9 +304,11 @@ CONFIG_NETFILTER_XTABLES=m
314# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set 304# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
315# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set 305# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
316# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set 306# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
307# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
317# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 308# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
318# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 309# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
319# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 310# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
311# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
320# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set 312# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
321# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 313# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
322# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 314# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
@@ -337,6 +329,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
337# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 329# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
338# CONFIG_NETFILTER_XT_MATCH_STRING is not set 330# CONFIG_NETFILTER_XT_MATCH_STRING is not set
339# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set 331# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
332# CONFIG_NETFILTER_XT_MATCH_U32 is not set
340# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set 333# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
341 334
342# 335#
@@ -425,6 +418,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
425CONFIG_IEEE80211_SOFTMAC=m 418CONFIG_IEEE80211_SOFTMAC=m
426CONFIG_IEEE80211_SOFTMAC_DEBUG=y 419CONFIG_IEEE80211_SOFTMAC_DEBUG=y
427# CONFIG_RFKILL is not set 420# CONFIG_RFKILL is not set
421# CONFIG_NET_9P is not set
428 422
429# 423#
430# Device Drivers 424# Device Drivers
@@ -439,10 +433,6 @@ CONFIG_FW_LOADER=m
439# CONFIG_DEBUG_DRIVER is not set 433# CONFIG_DEBUG_DRIVER is not set
440# CONFIG_DEBUG_DEVRES is not set 434# CONFIG_DEBUG_DEVRES is not set
441# CONFIG_SYS_HYPERVISOR is not set 435# CONFIG_SYS_HYPERVISOR is not set
442
443#
444# Connector - unified userspace <-> kernelspace linker
445#
446# CONFIG_CONNECTOR is not set 436# CONFIG_CONNECTOR is not set
447CONFIG_MTD=y 437CONFIG_MTD=y
448# CONFIG_MTD_DEBUG is not set 438# CONFIG_MTD_DEBUG is not set
@@ -526,20 +516,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
526# UBI - Unsorted block images 516# UBI - Unsorted block images
527# 517#
528# CONFIG_MTD_UBI is not set 518# CONFIG_MTD_UBI is not set
529 519CONFIG_OF_DEVICE=y
530#
531# Parallel port support
532#
533# CONFIG_PARPORT is not set 520# CONFIG_PARPORT is not set
534 521CONFIG_BLK_DEV=y
535#
536# Plug and Play support
537#
538# CONFIG_PNPACPI is not set
539
540#
541# Block devices
542#
543# CONFIG_BLK_DEV_FD is not set 522# CONFIG_BLK_DEV_FD is not set
544# CONFIG_BLK_CPQ_DA is not set 523# CONFIG_BLK_CPQ_DA is not set
545# CONFIG_BLK_CPQ_CISS_DA is not set 524# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -557,14 +536,11 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
557CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 536CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
558# CONFIG_CDROM_PKTCDVD is not set 537# CONFIG_CDROM_PKTCDVD is not set
559# CONFIG_ATA_OVER_ETH is not set 538# CONFIG_ATA_OVER_ETH is not set
560 539CONFIG_MISC_DEVICES=y
561#
562# Misc devices
563#
564# CONFIG_PHANTOM is not set 540# CONFIG_PHANTOM is not set
541# CONFIG_EEPROM_93CX6 is not set
565# CONFIG_SGI_IOC4 is not set 542# CONFIG_SGI_IOC4 is not set
566# CONFIG_TIFM_CORE is not set 543# CONFIG_TIFM_CORE is not set
567# CONFIG_BLINK is not set
568# CONFIG_IDE is not set 544# CONFIG_IDE is not set
569 545
570# 546#
@@ -572,6 +548,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
572# 548#
573# CONFIG_RAID_ATTRS is not set 549# CONFIG_RAID_ATTRS is not set
574CONFIG_SCSI=y 550CONFIG_SCSI=y
551CONFIG_SCSI_DMA=y
575# CONFIG_SCSI_TGT is not set 552# CONFIG_SCSI_TGT is not set
576# CONFIG_SCSI_NETLINK is not set 553# CONFIG_SCSI_NETLINK is not set
577CONFIG_SCSI_PROC_FS=y 554CONFIG_SCSI_PROC_FS=y
@@ -601,12 +578,8 @@ CONFIG_SCSI_WAIT_SCAN=m
601# CONFIG_SCSI_SPI_ATTRS is not set 578# CONFIG_SCSI_SPI_ATTRS is not set
602# CONFIG_SCSI_FC_ATTRS is not set 579# CONFIG_SCSI_FC_ATTRS is not set
603# CONFIG_SCSI_ISCSI_ATTRS is not set 580# CONFIG_SCSI_ISCSI_ATTRS is not set
604# CONFIG_SCSI_SAS_ATTRS is not set
605# CONFIG_SCSI_SAS_LIBSAS is not set 581# CONFIG_SCSI_SAS_LIBSAS is not set
606 582CONFIG_SCSI_LOWLEVEL=y
607#
608# SCSI low-level drivers
609#
610# CONFIG_ISCSI_TCP is not set 583# CONFIG_ISCSI_TCP is not set
611# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 584# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
612# CONFIG_SCSI_3W_9XXX is not set 585# CONFIG_SCSI_3W_9XXX is not set
@@ -696,10 +669,6 @@ CONFIG_PATA_SIL680=y
696# CONFIG_PATA_SIS is not set 669# CONFIG_PATA_SIS is not set
697# CONFIG_PATA_VIA is not set 670# CONFIG_PATA_VIA is not set
698# CONFIG_PATA_WINBOND is not set 671# CONFIG_PATA_WINBOND is not set
699
700#
701# Multi-device support (RAID and LVM)
702#
703# CONFIG_MD is not set 672# CONFIG_MD is not set
704 673
705# 674#
@@ -715,37 +684,23 @@ CONFIG_PATA_SIL680=y
715# 684#
716# CONFIG_FIREWIRE is not set 685# CONFIG_FIREWIRE is not set
717# CONFIG_IEEE1394 is not set 686# CONFIG_IEEE1394 is not set
718
719#
720# I2O device support
721#
722# CONFIG_I2O is not set 687# CONFIG_I2O is not set
723# CONFIG_MACINTOSH_DRIVERS is not set 688# CONFIG_MACINTOSH_DRIVERS is not set
724
725#
726# Network device support
727#
728CONFIG_NETDEVICES=y 689CONFIG_NETDEVICES=y
690# CONFIG_NETDEVICES_MULTIQUEUE is not set
729# CONFIG_DUMMY is not set 691# CONFIG_DUMMY is not set
730# CONFIG_BONDING is not set 692# CONFIG_BONDING is not set
693# CONFIG_MACVLAN is not set
731# CONFIG_EQUALIZER is not set 694# CONFIG_EQUALIZER is not set
732CONFIG_TUN=m 695CONFIG_TUN=m
733# CONFIG_ARCNET is not set 696# CONFIG_ARCNET is not set
734# CONFIG_PHYLIB is not set 697# CONFIG_PHYLIB is not set
735
736#
737# Ethernet (10 or 100Mbit)
738#
739CONFIG_NET_ETHERNET=y 698CONFIG_NET_ETHERNET=y
740# CONFIG_MII is not set 699# CONFIG_MII is not set
741# CONFIG_HAPPYMEAL is not set 700# CONFIG_HAPPYMEAL is not set
742# CONFIG_SUNGEM is not set 701# CONFIG_SUNGEM is not set
743# CONFIG_CASSINI is not set 702# CONFIG_CASSINI is not set
744# CONFIG_NET_VENDOR_3COM is not set 703# CONFIG_NET_VENDOR_3COM is not set
745
746#
747# Tulip family network device support
748#
749CONFIG_NET_TULIP=y 704CONFIG_NET_TULIP=y
750# CONFIG_DE2104X is not set 705# CONFIG_DE2104X is not set
751CONFIG_TULIP=y 706CONFIG_TULIP=y
@@ -770,7 +725,6 @@ CONFIG_R8169=y
770# CONFIG_SIS190 is not set 725# CONFIG_SIS190 is not set
771# CONFIG_SKGE is not set 726# CONFIG_SKGE is not set
772# CONFIG_SKY2 is not set 727# CONFIG_SKY2 is not set
773# CONFIG_SK98LIN is not set
774# CONFIG_VIA_VELOCITY is not set 728# CONFIG_VIA_VELOCITY is not set
775# CONFIG_TIGON3 is not set 729# CONFIG_TIGON3 is not set
776# CONFIG_BNX2 is not set 730# CONFIG_BNX2 is not set
@@ -812,15 +766,7 @@ CONFIG_NETCONSOLE=y
812CONFIG_NETPOLL=y 766CONFIG_NETPOLL=y
813# CONFIG_NETPOLL_TRAP is not set 767# CONFIG_NETPOLL_TRAP is not set
814CONFIG_NET_POLL_CONTROLLER=y 768CONFIG_NET_POLL_CONTROLLER=y
815
816#
817# ISDN subsystem
818#
819# CONFIG_ISDN is not set 769# CONFIG_ISDN is not set
820
821#
822# Telephony Support
823#
824# CONFIG_PHONE is not set 770# CONFIG_PHONE is not set
825 771
826# 772#
@@ -898,10 +844,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
898CONFIG_UNIX98_PTYS=y 844CONFIG_UNIX98_PTYS=y
899CONFIG_LEGACY_PTYS=y 845CONFIG_LEGACY_PTYS=y
900CONFIG_LEGACY_PTY_COUNT=256 846CONFIG_LEGACY_PTY_COUNT=256
901
902#
903# IPMI
904#
905# CONFIG_IPMI_HANDLER is not set 847# CONFIG_IPMI_HANDLER is not set
906# CONFIG_WATCHDOG is not set 848# CONFIG_WATCHDOG is not set
907CONFIG_HW_RANDOM=y 849CONFIG_HW_RANDOM=y
@@ -912,10 +854,6 @@ CONFIG_HW_RANDOM=y
912# CONFIG_AGP is not set 854# CONFIG_AGP is not set
913# CONFIG_DRM is not set 855# CONFIG_DRM is not set
914# CONFIG_RAW_DRIVER is not set 856# CONFIG_RAW_DRIVER is not set
915
916#
917# TPM devices
918#
919# CONFIG_TCG_TPM is not set 857# CONFIG_TCG_TPM is not set
920CONFIG_DEVPORT=y 858CONFIG_DEVPORT=y
921CONFIG_I2C=y 859CONFIG_I2C=y
@@ -950,6 +888,7 @@ CONFIG_I2C_MPC=y
950# CONFIG_I2C_SIS5595 is not set 888# CONFIG_I2C_SIS5595 is not set
951# CONFIG_I2C_SIS630 is not set 889# CONFIG_I2C_SIS630 is not set
952# CONFIG_I2C_SIS96X is not set 890# CONFIG_I2C_SIS96X is not set
891# CONFIG_I2C_TAOS_EVM is not set
953# CONFIG_I2C_STUB is not set 892# CONFIG_I2C_STUB is not set
954# CONFIG_I2C_TINY_USB is not set 893# CONFIG_I2C_TINY_USB is not set
955# CONFIG_I2C_VIA is not set 894# CONFIG_I2C_VIA is not set
@@ -961,12 +900,14 @@ CONFIG_I2C_MPC=y
961# 900#
962# CONFIG_SENSORS_DS1337 is not set 901# CONFIG_SENSORS_DS1337 is not set
963# CONFIG_SENSORS_DS1374 is not set 902# CONFIG_SENSORS_DS1374 is not set
903# CONFIG_DS1682 is not set
964CONFIG_SENSORS_EEPROM=m 904CONFIG_SENSORS_EEPROM=m
965# CONFIG_SENSORS_PCF8574 is not set 905# CONFIG_SENSORS_PCF8574 is not set
966# CONFIG_SENSORS_PCA9539 is not set 906# CONFIG_SENSORS_PCA9539 is not set
967# CONFIG_SENSORS_PCF8591 is not set 907# CONFIG_SENSORS_PCF8591 is not set
968# CONFIG_SENSORS_M41T00 is not set 908# CONFIG_SENSORS_M41T00 is not set
969# CONFIG_SENSORS_MAX6875 is not set 909# CONFIG_SENSORS_MAX6875 is not set
910# CONFIG_SENSORS_TSL2550 is not set
970# CONFIG_I2C_DEBUG_CORE is not set 911# CONFIG_I2C_DEBUG_CORE is not set
971# CONFIG_I2C_DEBUG_ALGO is not set 912# CONFIG_I2C_DEBUG_ALGO is not set
972# CONFIG_I2C_DEBUG_BUS is not set 913# CONFIG_I2C_DEBUG_BUS is not set
@@ -977,14 +918,12 @@ CONFIG_SENSORS_EEPROM=m
977# 918#
978# CONFIG_SPI is not set 919# CONFIG_SPI is not set
979# CONFIG_SPI_MASTER is not set 920# CONFIG_SPI_MASTER is not set
980
981#
982# Dallas's 1-wire bus
983#
984# CONFIG_W1 is not set 921# CONFIG_W1 is not set
922# CONFIG_POWER_SUPPLY is not set
985CONFIG_HWMON=y 923CONFIG_HWMON=y
986# CONFIG_HWMON_VID is not set 924# CONFIG_HWMON_VID is not set
987# CONFIG_SENSORS_ABITUGURU is not set 925# CONFIG_SENSORS_ABITUGURU is not set
926# CONFIG_SENSORS_ABITUGURU3 is not set
988# CONFIG_SENSORS_AD7418 is not set 927# CONFIG_SENSORS_AD7418 is not set
989# CONFIG_SENSORS_ADM1021 is not set 928# CONFIG_SENSORS_ADM1021 is not set
990# CONFIG_SENSORS_ADM1025 is not set 929# CONFIG_SENSORS_ADM1025 is not set
@@ -1011,14 +950,17 @@ CONFIG_HWMON=y
1011# CONFIG_SENSORS_LM87 is not set 950# CONFIG_SENSORS_LM87 is not set
1012# CONFIG_SENSORS_LM90 is not set 951# CONFIG_SENSORS_LM90 is not set
1013# CONFIG_SENSORS_LM92 is not set 952# CONFIG_SENSORS_LM92 is not set
953# CONFIG_SENSORS_LM93 is not set
1014# CONFIG_SENSORS_MAX1619 is not set 954# CONFIG_SENSORS_MAX1619 is not set
1015# CONFIG_SENSORS_MAX6650 is not set 955# CONFIG_SENSORS_MAX6650 is not set
1016# CONFIG_SENSORS_PC87360 is not set 956# CONFIG_SENSORS_PC87360 is not set
1017# CONFIG_SENSORS_PC87427 is not set 957# CONFIG_SENSORS_PC87427 is not set
1018# CONFIG_SENSORS_SIS5595 is not set 958# CONFIG_SENSORS_SIS5595 is not set
959# CONFIG_SENSORS_DME1737 is not set
1019# CONFIG_SENSORS_SMSC47M1 is not set 960# CONFIG_SENSORS_SMSC47M1 is not set
1020# CONFIG_SENSORS_SMSC47M192 is not set 961# CONFIG_SENSORS_SMSC47M192 is not set
1021# CONFIG_SENSORS_SMSC47B397 is not set 962# CONFIG_SENSORS_SMSC47B397 is not set
963# CONFIG_SENSORS_THMC50 is not set
1022# CONFIG_SENSORS_VIA686A is not set 964# CONFIG_SENSORS_VIA686A is not set
1023# CONFIG_SENSORS_VT1211 is not set 965# CONFIG_SENSORS_VT1211 is not set
1024# CONFIG_SENSORS_VT8231 is not set 966# CONFIG_SENSORS_VT8231 is not set
@@ -1053,6 +995,7 @@ CONFIG_HWMON=y
1053# 995#
1054# CONFIG_DISPLAY_SUPPORT is not set 996# CONFIG_DISPLAY_SUPPORT is not set
1055# CONFIG_VGASTATE is not set 997# CONFIG_VGASTATE is not set
998CONFIG_VIDEO_OUTPUT_CONTROL=m
1056# CONFIG_FB is not set 999# CONFIG_FB is not set
1057# CONFIG_FB_IBM_GXT4500 is not set 1000# CONFIG_FB_IBM_GXT4500 is not set
1058 1001
@@ -1066,10 +1009,7 @@ CONFIG_DUMMY_CONSOLE=y
1066# Sound 1009# Sound
1067# 1010#
1068# CONFIG_SOUND is not set 1011# CONFIG_SOUND is not set
1069 1012CONFIG_HID_SUPPORT=y
1070#
1071# HID Devices
1072#
1073CONFIG_HID=m 1013CONFIG_HID=m
1074# CONFIG_HID_DEBUG is not set 1014# CONFIG_HID_DEBUG is not set
1075 1015
@@ -1083,10 +1023,7 @@ CONFIG_HID=m
1083# 1023#
1084# CONFIG_USB_KBD is not set 1024# CONFIG_USB_KBD is not set
1085# CONFIG_USB_MOUSE is not set 1025# CONFIG_USB_MOUSE is not set
1086 1026CONFIG_USB_SUPPORT=y
1087#
1088# USB support
1089#
1090CONFIG_USB_ARCH_HAS_HCD=y 1027CONFIG_USB_ARCH_HAS_HCD=y
1091CONFIG_USB_ARCH_HAS_OHCI=y 1028CONFIG_USB_ARCH_HAS_OHCI=y
1092CONFIG_USB_ARCH_HAS_EHCI=y 1029CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1108,7 +1045,6 @@ CONFIG_USB_EHCI_HCD=y
1108# CONFIG_USB_EHCI_SPLIT_ISO is not set 1045# CONFIG_USB_EHCI_SPLIT_ISO is not set
1109# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1046# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1110# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1047# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1111# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1112# CONFIG_USB_ISP116X_HCD is not set 1048# CONFIG_USB_ISP116X_HCD is not set
1113CONFIG_USB_OHCI_HCD=y 1049CONFIG_USB_OHCI_HCD=y
1114CONFIG_USB_OHCI_HCD_PPC_OF=y 1050CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -1120,6 +1056,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1120CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1056CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1121# CONFIG_USB_UHCI_HCD is not set 1057# CONFIG_USB_UHCI_HCD is not set
1122# CONFIG_USB_SL811_HCD is not set 1058# CONFIG_USB_SL811_HCD is not set
1059# CONFIG_USB_R8A66597_HCD is not set
1123 1060
1124# 1061#
1125# USB Device Class drivers 1062# USB Device Class drivers
@@ -1192,6 +1129,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1192# CONFIG_USB_SERIAL_MOS7840 is not set 1129# CONFIG_USB_SERIAL_MOS7840 is not set
1193# CONFIG_USB_SERIAL_NAVMAN is not set 1130# CONFIG_USB_SERIAL_NAVMAN is not set
1194# CONFIG_USB_SERIAL_PL2303 is not set 1131# CONFIG_USB_SERIAL_PL2303 is not set
1132# CONFIG_USB_SERIAL_OTI6858 is not set
1195# CONFIG_USB_SERIAL_HP4X is not set 1133# CONFIG_USB_SERIAL_HP4X is not set
1196# CONFIG_USB_SERIAL_SAFE is not set 1134# CONFIG_USB_SERIAL_SAFE is not set
1197# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 1135# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -1235,32 +1173,9 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
1235# 1173#
1236# CONFIG_USB_GADGET is not set 1174# CONFIG_USB_GADGET is not set
1237# CONFIG_MMC is not set 1175# CONFIG_MMC is not set
1238
1239#
1240# LED devices
1241#
1242# CONFIG_NEW_LEDS is not set 1176# CONFIG_NEW_LEDS is not set
1243
1244#
1245# LED drivers
1246#
1247
1248#
1249# LED Triggers
1250#
1251
1252#
1253# InfiniBand support
1254#
1255# CONFIG_INFINIBAND is not set 1177# CONFIG_INFINIBAND is not set
1256 1178# CONFIG_EDAC is not set
1257#
1258# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1259#
1260
1261#
1262# Real Time Clock
1263#
1264CONFIG_RTC_LIB=y 1179CONFIG_RTC_LIB=y
1265CONFIG_RTC_CLASS=y 1180CONFIG_RTC_CLASS=y
1266CONFIG_RTC_HCTOSYS=y 1181CONFIG_RTC_HCTOSYS=y
@@ -1287,6 +1202,7 @@ CONFIG_RTC_DRV_RS5C372=y
1287# CONFIG_RTC_DRV_X1205 is not set 1202# CONFIG_RTC_DRV_X1205 is not set
1288# CONFIG_RTC_DRV_PCF8563 is not set 1203# CONFIG_RTC_DRV_PCF8563 is not set
1289# CONFIG_RTC_DRV_PCF8583 is not set 1204# CONFIG_RTC_DRV_PCF8583 is not set
1205# CONFIG_RTC_DRV_M41T80 is not set
1290 1206
1291# 1207#
1292# SPI RTC drivers 1208# SPI RTC drivers
@@ -1295,9 +1211,12 @@ CONFIG_RTC_DRV_RS5C372=y
1295# 1211#
1296# Platform RTC drivers 1212# Platform RTC drivers
1297# 1213#
1214# CONFIG_RTC_DRV_CMOS is not set
1298# CONFIG_RTC_DRV_DS1553 is not set 1215# CONFIG_RTC_DRV_DS1553 is not set
1216# CONFIG_RTC_DRV_STK17TA8 is not set
1299# CONFIG_RTC_DRV_DS1742 is not set 1217# CONFIG_RTC_DRV_DS1742 is not set
1300# CONFIG_RTC_DRV_M48T86 is not set 1218# CONFIG_RTC_DRV_M48T86 is not set
1219# CONFIG_RTC_DRV_M48T59 is not set
1301# CONFIG_RTC_DRV_V3020 is not set 1220# CONFIG_RTC_DRV_V3020 is not set
1302 1221
1303# 1222#
@@ -1318,6 +1237,11 @@ CONFIG_RTC_DRV_RS5C372=y
1318# 1237#
1319 1238
1320# 1239#
1240# Userspace I/O
1241#
1242# CONFIG_UIO is not set
1243
1244#
1321# File systems 1245# File systems
1322# 1246#
1323CONFIG_EXT2_FS=y 1247CONFIG_EXT2_FS=y
@@ -1437,7 +1361,6 @@ CONFIG_CIFS=m
1437# CONFIG_NCP_FS is not set 1361# CONFIG_NCP_FS is not set
1438# CONFIG_CODA_FS is not set 1362# CONFIG_CODA_FS is not set
1439# CONFIG_AFS_FS is not set 1363# CONFIG_AFS_FS is not set
1440# CONFIG_9P_FS is not set
1441 1364
1442# 1365#
1443# Partition Types 1366# Partition Types
@@ -1503,6 +1426,7 @@ CONFIG_CRC_CCITT=m
1503# CONFIG_CRC16 is not set 1426# CONFIG_CRC16 is not set
1504# CONFIG_CRC_ITU_T is not set 1427# CONFIG_CRC_ITU_T is not set
1505CONFIG_CRC32=y 1428CONFIG_CRC32=y
1429# CONFIG_CRC7 is not set
1506CONFIG_LIBCRC32C=m 1430CONFIG_LIBCRC32C=m
1507CONFIG_ZLIB_INFLATE=m 1431CONFIG_ZLIB_INFLATE=m
1508CONFIG_ZLIB_DEFLATE=m 1432CONFIG_ZLIB_DEFLATE=m
@@ -1532,6 +1456,7 @@ CONFIG_MAGIC_SYSRQ=y
1532CONFIG_DEBUG_KERNEL=y 1456CONFIG_DEBUG_KERNEL=y
1533# CONFIG_DEBUG_SHIRQ is not set 1457# CONFIG_DEBUG_SHIRQ is not set
1534CONFIG_DETECT_SOFTLOCKUP=y 1458CONFIG_DETECT_SOFTLOCKUP=y
1459CONFIG_SCHED_DEBUG=y
1535# CONFIG_SCHEDSTATS is not set 1460# CONFIG_SCHEDSTATS is not set
1536# CONFIG_TIMER_STATS is not set 1461# CONFIG_TIMER_STATS is not set
1537# CONFIG_DEBUG_SLAB is not set 1462# CONFIG_DEBUG_SLAB is not set
@@ -1554,7 +1479,6 @@ CONFIG_FORCED_INLINING=y
1554# CONFIG_DEBUG_PAGEALLOC is not set 1479# CONFIG_DEBUG_PAGEALLOC is not set
1555# CONFIG_DEBUGGER is not set 1480# CONFIG_DEBUGGER is not set
1556# CONFIG_BDI_SWITCH is not set 1481# CONFIG_BDI_SWITCH is not set
1557# CONFIG_BOOTX_TEXT is not set
1558# CONFIG_PPC_EARLY_DEBUG is not set 1482# CONFIG_PPC_EARLY_DEBUG is not set
1559 1483
1560# 1484#
@@ -1562,10 +1486,6 @@ CONFIG_FORCED_INLINING=y
1562# 1486#
1563# CONFIG_KEYS is not set 1487# CONFIG_KEYS is not set
1564# CONFIG_SECURITY is not set 1488# CONFIG_SECURITY is not set
1565
1566#
1567# Cryptographic options
1568#
1569CONFIG_CRYPTO=y 1489CONFIG_CRYPTO=y
1570CONFIG_CRYPTO_ALGAPI=y 1490CONFIG_CRYPTO_ALGAPI=y
1571CONFIG_CRYPTO_BLKCIPHER=y 1491CONFIG_CRYPTO_BLKCIPHER=y
@@ -1604,7 +1524,4 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1604CONFIG_CRYPTO_CRC32C=m 1524CONFIG_CRYPTO_CRC32C=m
1605# CONFIG_CRYPTO_CAMELLIA is not set 1525# CONFIG_CRYPTO_CAMELLIA is not set
1606# CONFIG_CRYPTO_TEST is not set 1526# CONFIG_CRYPTO_TEST is not set
1607 1527CONFIG_CRYPTO_HW=y
1608#
1609# Hardware crypto devices
1610#
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index 9c30ca451617..d42e226d3a28 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_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 13:26:09 2007 4# Tue Aug 28 21:24:38 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
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
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,61 +30,38 @@ 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
28# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
29
30#
31# Processor support
32#
33CONFIG_CLASSIC32=y
34# CONFIG_PPC_82xx is not set
35# CONFIG_PPC_83xx is not set
36# CONFIG_PPC_85xx is not set
37# CONFIG_PPC_86xx is not set
38# CONFIG_PPC_8xx is not set
39# CONFIG_40x is not set
40# CONFIG_44x is not set
41# CONFIG_E200 is not set
42CONFIG_6xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO is not set
46# CONFIG_ALTIVEC is not set
47CONFIG_PPC_STD_MMU=y
48CONFIG_PPC_STD_MMU_32=y
49# CONFIG_PPC_MM_SLICES is not set
50# CONFIG_SMP is not set
51CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
52 49
53# 50#
54# Code maturity level options 51# General setup
55# 52#
56CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
57CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
58CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
59
60#
61# General setup
62#
63CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
64CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
65CONFIG_SWAP=y 58CONFIG_SWAP=y
66CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
67# CONFIG_IPC_NS is not set
68CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
69# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
70# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
71# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
72# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
73# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
74# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -101,24 +93,17 @@ CONFIG_SLAB=y
101CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
104
105#
106# Loadable module support
107#
108CONFIG_MODULES=y 96CONFIG_MODULES=y
109CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
110# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_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
119# CONFIG_LBD is not set 103# CONFIG_LBD is not set
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,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
138# 123#
139CONFIG_PPC_MULTIPLATFORM=y 124CONFIG_PPC_MULTIPLATFORM=y
140# CONFIG_EMBEDDED6xx is not set 125# CONFIG_EMBEDDED6xx is not set
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
129CONFIG_CLASSIC32=y
142# CONFIG_PPC_CHRP is not set 130# CONFIG_PPC_CHRP is not set
143CONFIG_PPC_MPC52xx=y 131CONFIG_PPC_MPC52xx=y
144CONFIG_PPC_MPC5200=y 132CONFIG_PPC_MPC5200=y
@@ -161,6 +149,7 @@ CONFIG_PPC_LITE5200=y
161# CONFIG_CPU_FREQ is not set 149# CONFIG_CPU_FREQ is not set
162# CONFIG_TAU is not set 150# CONFIG_TAU is not set
163# CONFIG_CPM2 is not set 151# CONFIG_CPM2 is not set
152# CONFIG_FSL_ULI1575 is not set
164 153
165# 154#
166# Kernel options 155# Kernel options
@@ -190,12 +179,15 @@ CONFIG_FLAT_NODE_MEM_MAP=y
190CONFIG_SPLIT_PTLOCK_CPUS=4 179CONFIG_SPLIT_PTLOCK_CPUS=4
191# CONFIG_RESOURCES_64BIT is not set 180# CONFIG_RESOURCES_64BIT is not set
192CONFIG_ZONE_DMA_FLAG=1 181CONFIG_ZONE_DMA_FLAG=1
182CONFIG_BOUNCE=y
183CONFIG_VIRT_TO_BUS=y
193CONFIG_PROC_DEVICETREE=y 184CONFIG_PROC_DEVICETREE=y
194# CONFIG_CMDLINE_BOOL is not set 185# CONFIG_CMDLINE_BOOL is not set
195CONFIG_PM=y 186CONFIG_PM=y
196# CONFIG_PM_LEGACY is not set 187# CONFIG_PM_LEGACY is not set
197# CONFIG_PM_DEBUG is not set 188# CONFIG_PM_DEBUG is not set
198# CONFIG_PM_SYSFS_DEPRECATED is not set 189CONFIG_PM_SLEEP=y
190CONFIG_SUSPEND=y
199# CONFIG_HIBERNATION is not set 191# CONFIG_HIBERNATION is not set
200CONFIG_SECCOMP=y 192CONFIG_SECCOMP=y
201# CONFIG_WANT_DEVICE_TREE is not set 193# CONFIG_WANT_DEVICE_TREE is not set
@@ -210,6 +202,7 @@ CONFIG_GENERIC_ISA_DMA=y
210CONFIG_FSL_SOC=y 202CONFIG_FSL_SOC=y
211CONFIG_PCI=y 203CONFIG_PCI=y
212CONFIG_PCI_DOMAINS=y 204CONFIG_PCI_DOMAINS=y
205CONFIG_PCI_SYSCALL=y
213# CONFIG_PCIEPORTBUS is not set 206# CONFIG_PCIEPORTBUS is not set
214CONFIG_ARCH_SUPPORTS_MSI=y 207CONFIG_ARCH_SUPPORTS_MSI=y
215# CONFIG_PCI_MSI is not set 208# CONFIG_PCI_MSI is not set
@@ -320,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
320# CONFIG_MAC80211 is not set 313# CONFIG_MAC80211 is not set
321# CONFIG_IEEE80211 is not set 314# CONFIG_IEEE80211 is not set
322# CONFIG_RFKILL is not set 315# CONFIG_RFKILL is not set
316# CONFIG_NET_9P is not set
323 317
324# 318#
325# Device Drivers 319# Device Drivers
@@ -334,26 +328,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
334# CONFIG_DEBUG_DRIVER is not set 328# CONFIG_DEBUG_DRIVER is not set
335# CONFIG_DEBUG_DEVRES is not set 329# CONFIG_DEBUG_DEVRES is not set
336# CONFIG_SYS_HYPERVISOR is not set 330# CONFIG_SYS_HYPERVISOR is not set
337
338#
339# Connector - unified userspace <-> kernelspace linker
340#
341# CONFIG_CONNECTOR is not set 331# CONFIG_CONNECTOR is not set
342# CONFIG_MTD is not set 332# CONFIG_MTD is not set
343 333CONFIG_OF_DEVICE=y
344#
345# Parallel port support
346#
347# CONFIG_PARPORT is not set 334# CONFIG_PARPORT is not set
348 335CONFIG_BLK_DEV=y
349#
350# Plug and Play support
351#
352# CONFIG_PNPACPI is not set
353
354#
355# Block devices
356#
357# CONFIG_BLK_DEV_FD is not set 336# CONFIG_BLK_DEV_FD is not set
358# CONFIG_BLK_CPQ_DA is not set 337# CONFIG_BLK_CPQ_DA is not set
359# CONFIG_BLK_CPQ_CISS_DA is not set 338# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -370,14 +349,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
370CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 349CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
371# CONFIG_CDROM_PKTCDVD is not set 350# CONFIG_CDROM_PKTCDVD is not set
372# CONFIG_ATA_OVER_ETH is not set 351# CONFIG_ATA_OVER_ETH is not set
373 352CONFIG_MISC_DEVICES=y
374#
375# Misc devices
376#
377# CONFIG_PHANTOM is not set 353# CONFIG_PHANTOM is not set
354# CONFIG_EEPROM_93CX6 is not set
378# CONFIG_SGI_IOC4 is not set 355# CONFIG_SGI_IOC4 is not set
379# CONFIG_TIFM_CORE is not set 356# CONFIG_TIFM_CORE is not set
380# CONFIG_BLINK is not set
381# CONFIG_IDE is not set 357# CONFIG_IDE is not set
382 358
383# 359#
@@ -385,6 +361,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
385# 361#
386# CONFIG_RAID_ATTRS is not set 362# CONFIG_RAID_ATTRS is not set
387CONFIG_SCSI=y 363CONFIG_SCSI=y
364CONFIG_SCSI_DMA=y
388# CONFIG_SCSI_TGT is not set 365# CONFIG_SCSI_TGT is not set
389# CONFIG_SCSI_NETLINK is not set 366# CONFIG_SCSI_NETLINK is not set
390# CONFIG_SCSI_PROC_FS is not set 367# CONFIG_SCSI_PROC_FS is not set
@@ -414,12 +391,8 @@ CONFIG_SCSI_WAIT_SCAN=m
414# CONFIG_SCSI_SPI_ATTRS is not set 391# CONFIG_SCSI_SPI_ATTRS is not set
415# CONFIG_SCSI_FC_ATTRS is not set 392# CONFIG_SCSI_FC_ATTRS is not set
416# CONFIG_SCSI_ISCSI_ATTRS is not set 393# CONFIG_SCSI_ISCSI_ATTRS is not set
417# CONFIG_SCSI_SAS_ATTRS is not set
418# CONFIG_SCSI_SAS_LIBSAS is not set 394# CONFIG_SCSI_SAS_LIBSAS is not set
419 395CONFIG_SCSI_LOWLEVEL=y
420#
421# SCSI low-level drivers
422#
423# CONFIG_ISCSI_TCP is not set 396# CONFIG_ISCSI_TCP is not set
424# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 397# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
425# CONFIG_SCSI_3W_9XXX is not set 398# CONFIG_SCSI_3W_9XXX is not set
@@ -511,10 +484,6 @@ CONFIG_PATA_MPC52xx=y
511# CONFIG_PATA_VIA is not set 484# CONFIG_PATA_VIA is not set
512# CONFIG_PATA_WINBOND is not set 485# CONFIG_PATA_WINBOND is not set
513# CONFIG_PATA_PLATFORM is not set 486# CONFIG_PATA_PLATFORM is not set
514
515#
516# Multi-device support (RAID and LVM)
517#
518# CONFIG_MD is not set 487# CONFIG_MD is not set
519 488
520# 489#
@@ -530,26 +499,16 @@ CONFIG_PATA_MPC52xx=y
530# 499#
531# CONFIG_FIREWIRE is not set 500# CONFIG_FIREWIRE is not set
532# CONFIG_IEEE1394 is not set 501# CONFIG_IEEE1394 is not set
533
534#
535# I2O device support
536#
537# CONFIG_I2O is not set 502# CONFIG_I2O is not set
538# CONFIG_MACINTOSH_DRIVERS is not set 503# CONFIG_MACINTOSH_DRIVERS is not set
539
540#
541# Network device support
542#
543CONFIG_NETDEVICES=y 504CONFIG_NETDEVICES=y
505# CONFIG_NETDEVICES_MULTIQUEUE is not set
544# CONFIG_DUMMY is not set 506# CONFIG_DUMMY is not set
545# CONFIG_BONDING is not set 507# CONFIG_BONDING is not set
508# CONFIG_MACVLAN is not set
546# CONFIG_EQUALIZER is not set 509# CONFIG_EQUALIZER is not set
547# CONFIG_TUN is not set 510# CONFIG_TUN is not set
548# CONFIG_ARCNET is not set 511# CONFIG_ARCNET is not set
549
550#
551# Ethernet (10 or 100Mbit)
552#
553# CONFIG_NET_ETHERNET is not set 512# CONFIG_NET_ETHERNET is not set
554CONFIG_NETDEV_1000=y 513CONFIG_NETDEV_1000=y
555# CONFIG_ACENIC is not set 514# CONFIG_ACENIC is not set
@@ -562,7 +521,6 @@ CONFIG_NETDEV_1000=y
562# CONFIG_SIS190 is not set 521# CONFIG_SIS190 is not set
563# CONFIG_SKGE is not set 522# CONFIG_SKGE is not set
564# CONFIG_SKY2 is not set 523# CONFIG_SKY2 is not set
565# CONFIG_SK98LIN is not set
566# CONFIG_VIA_VELOCITY is not set 524# CONFIG_VIA_VELOCITY is not set
567# CONFIG_TIGON3 is not set 525# CONFIG_TIGON3 is not set
568# CONFIG_BNX2 is not set 526# CONFIG_BNX2 is not set
@@ -594,15 +552,7 @@ CONFIG_NETDEV_10000=y
594# CONFIG_NETCONSOLE is not set 552# CONFIG_NETCONSOLE is not set
595# CONFIG_NETPOLL is not set 553# CONFIG_NETPOLL is not set
596# CONFIG_NET_POLL_CONTROLLER is not set 554# CONFIG_NET_POLL_CONTROLLER is not set
597
598#
599# ISDN subsystem
600#
601# CONFIG_ISDN is not set 555# CONFIG_ISDN is not set
602
603#
604# Telephony Support
605#
606# CONFIG_PHONE is not set 556# CONFIG_PHONE is not set
607 557
608# 558#
@@ -640,10 +590,6 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=9600
640CONFIG_UNIX98_PTYS=y 590CONFIG_UNIX98_PTYS=y
641CONFIG_LEGACY_PTYS=y 591CONFIG_LEGACY_PTYS=y
642CONFIG_LEGACY_PTY_COUNT=256 592CONFIG_LEGACY_PTY_COUNT=256
643
644#
645# IPMI
646#
647# CONFIG_IPMI_HANDLER is not set 593# CONFIG_IPMI_HANDLER is not set
648# CONFIG_WATCHDOG is not set 594# CONFIG_WATCHDOG is not set
649# CONFIG_HW_RANDOM is not set 595# CONFIG_HW_RANDOM is not set
@@ -654,10 +600,6 @@ CONFIG_LEGACY_PTY_COUNT=256
654# CONFIG_AGP is not set 600# CONFIG_AGP is not set
655# CONFIG_DRM is not set 601# CONFIG_DRM is not set
656# CONFIG_RAW_DRIVER is not set 602# CONFIG_RAW_DRIVER is not set
657
658#
659# TPM devices
660#
661# CONFIG_TCG_TPM is not set 603# CONFIG_TCG_TPM is not set
662CONFIG_DEVPORT=y 604CONFIG_DEVPORT=y
663# CONFIG_I2C is not set 605# CONFIG_I2C is not set
@@ -667,11 +609,8 @@ CONFIG_DEVPORT=y
667# 609#
668# CONFIG_SPI is not set 610# CONFIG_SPI is not set
669# CONFIG_SPI_MASTER is not set 611# CONFIG_SPI_MASTER is not set
670
671#
672# Dallas's 1-wire bus
673#
674# CONFIG_W1 is not set 612# CONFIG_W1 is not set
613# CONFIG_POWER_SUPPLY is not set
675# CONFIG_HWMON is not set 614# CONFIG_HWMON is not set
676 615
677# 616#
@@ -696,6 +635,7 @@ CONFIG_DEVPORT=y
696# 635#
697# CONFIG_DISPLAY_SUPPORT is not set 636# CONFIG_DISPLAY_SUPPORT is not set
698# CONFIG_VGASTATE is not set 637# CONFIG_VGASTATE is not set
638CONFIG_VIDEO_OUTPUT_CONTROL=m
699# CONFIG_FB is not set 639# CONFIG_FB is not set
700# CONFIG_FB_IBM_GXT4500 is not set 640# CONFIG_FB_IBM_GXT4500 is not set
701 641
@@ -703,10 +643,7 @@ CONFIG_DEVPORT=y
703# Sound 643# Sound
704# 644#
705# CONFIG_SOUND is not set 645# CONFIG_SOUND is not set
706 646CONFIG_USB_SUPPORT=y
707#
708# USB support
709#
710CONFIG_USB_ARCH_HAS_HCD=y 647CONFIG_USB_ARCH_HAS_HCD=y
711CONFIG_USB_ARCH_HAS_OHCI=y 648CONFIG_USB_ARCH_HAS_OHCI=y
712CONFIG_USB_ARCH_HAS_EHCI=y 649CONFIG_USB_ARCH_HAS_EHCI=y
@@ -721,33 +658,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
721# 658#
722# CONFIG_USB_GADGET is not set 659# CONFIG_USB_GADGET is not set
723# CONFIG_MMC is not set 660# CONFIG_MMC is not set
724
725#
726# LED devices
727#
728# CONFIG_NEW_LEDS is not set 661# CONFIG_NEW_LEDS is not set
729
730#
731# LED drivers
732#
733
734#
735# LED Triggers
736#
737
738#
739# InfiniBand support
740#
741# CONFIG_INFINIBAND is not set 662# CONFIG_INFINIBAND is not set
742 663# CONFIG_EDAC is not set
743#
744# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
745#
746
747#
748# Real Time Clock
749#
750CONFIG_RTC_LIB=y
751# CONFIG_RTC_CLASS is not set 664# CONFIG_RTC_CLASS is not set
752 665
753# 666#
@@ -764,6 +677,11 @@ CONFIG_RTC_LIB=y
764# 677#
765 678
766# 679#
680# Userspace I/O
681#
682# CONFIG_UIO is not set
683
684#
767# File systems 685# File systems
768# 686#
769CONFIG_EXT2_FS=y 687CONFIG_EXT2_FS=y
@@ -846,7 +764,6 @@ CONFIG_RAMFS=y
846# CONFIG_NCP_FS is not set 764# CONFIG_NCP_FS is not set
847# CONFIG_CODA_FS is not set 765# CONFIG_CODA_FS is not set
848# CONFIG_AFS_FS is not set 766# CONFIG_AFS_FS is not set
849# CONFIG_9P_FS is not set
850 767
851# 768#
852# Partition Types 769# Partition Types
@@ -872,6 +789,7 @@ CONFIG_MSDOS_PARTITION=y
872# CONFIG_CRC16 is not set 789# CONFIG_CRC16 is not set
873# CONFIG_CRC_ITU_T is not set 790# CONFIG_CRC_ITU_T is not set
874# CONFIG_CRC32 is not set 791# CONFIG_CRC32 is not set
792# CONFIG_CRC7 is not set
875# CONFIG_LIBCRC32C is not set 793# CONFIG_LIBCRC32C is not set
876CONFIG_PLIST=y 794CONFIG_PLIST=y
877CONFIG_HAS_IOMEM=y 795CONFIG_HAS_IOMEM=y
@@ -895,6 +813,7 @@ CONFIG_ENABLE_MUST_CHECK=y
895CONFIG_DEBUG_KERNEL=y 813CONFIG_DEBUG_KERNEL=y
896# CONFIG_DEBUG_SHIRQ is not set 814# CONFIG_DEBUG_SHIRQ is not set
897CONFIG_DETECT_SOFTLOCKUP=y 815CONFIG_DETECT_SOFTLOCKUP=y
816CONFIG_SCHED_DEBUG=y
898# CONFIG_SCHEDSTATS is not set 817# CONFIG_SCHEDSTATS is not set
899# CONFIG_TIMER_STATS is not set 818# CONFIG_TIMER_STATS is not set
900# CONFIG_DEBUG_SLAB is not set 819# CONFIG_DEBUG_SLAB is not set
@@ -925,8 +844,4 @@ CONFIG_FORCED_INLINING=y
925# 844#
926# CONFIG_KEYS is not set 845# CONFIG_KEYS is not set
927# CONFIG_SECURITY is not set 846# CONFIG_SECURITY is not set
928
929#
930# Cryptographic options
931#
932# CONFIG_CRYPTO is not set 847# CONFIG_CRYPTO is not set
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/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 174a290ee7a9..05814a3b0e33 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:54 2007 4# Tue Aug 28 21:24:39 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
27CONFIG_DEFAULT_UIMAGE=y 44CONFIG_DEFAULT_UIMAGE=y
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
@@ -101,19 +93,12 @@ CONFIG_SLAB=y
101CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
102# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
103CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
104
105#
106# Loadable module support
107#
108# CONFIG_MODULES is not set 96# CONFIG_MODULES is not set
109
110#
111# Block layer
112#
113CONFIG_BLOCK=y 97CONFIG_BLOCK=y
114CONFIG_LBD=y 98CONFIG_LBD=y
115# CONFIG_BLK_DEV_IO_TRACE is not set 99# CONFIG_BLK_DEV_IO_TRACE is not set
116# CONFIG_LSF is not set 100# CONFIG_LSF is not set
101# CONFIG_BLK_DEV_BSG is not set
117 102
118# 103#
119# IO Schedulers 104# IO Schedulers
@@ -133,7 +118,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# 118#
134# CONFIG_PPC_MULTIPLATFORM is not set 119# CONFIG_PPC_MULTIPLATFORM is not set
135CONFIG_EMBEDDED6xx=y 120CONFIG_EMBEDDED6xx=y
136# CONFIG_APUS is not set 121# CONFIG_PPC_82xx is not set
122# CONFIG_PPC_83xx is not set
123# CONFIG_PPC_86xx is not set
137# CONFIG_PPC_MPC52xx is not set 124# CONFIG_PPC_MPC52xx is not set
138# CONFIG_PPC_MPC5200 is not set 125# CONFIG_PPC_MPC5200 is not set
139# CONFIG_PPC_CELL is not set 126# CONFIG_PPC_CELL is not set
@@ -154,8 +141,8 @@ CONFIG_MPIC_WEIRD=y
154# CONFIG_PPC_INDIRECT_IO is not set 141# CONFIG_PPC_INDIRECT_IO is not set
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_TAU is not set
158# CONFIG_CPM2 is not set 144# CONFIG_CPM2 is not set
145# CONFIG_FSL_ULI1575 is not set
159 146
160# 147#
161# Kernel options 148# Kernel options
@@ -184,6 +171,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
184CONFIG_SPLIT_PTLOCK_CPUS=4 171CONFIG_SPLIT_PTLOCK_CPUS=4
185# CONFIG_RESOURCES_64BIT is not set 172# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1 173CONFIG_ZONE_DMA_FLAG=1
174CONFIG_BOUNCE=y
175CONFIG_VIRT_TO_BUS=y
187CONFIG_PROC_DEVICETREE=y 176CONFIG_PROC_DEVICETREE=y
188# CONFIG_CMDLINE_BOOL is not set 177# CONFIG_CMDLINE_BOOL is not set
189# CONFIG_PM is not set 178# CONFIG_PM is not set
@@ -199,6 +188,7 @@ CONFIG_GENERIC_ISA_DMA=y
199# CONFIG_PPC_INDIRECT_PCI is not set 188# CONFIG_PPC_INDIRECT_PCI 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
@@ -308,6 +298,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
308# CONFIG_MAC80211 is not set 298# CONFIG_MAC80211 is not set
309# CONFIG_IEEE80211 is not set 299# CONFIG_IEEE80211 is not set
310# CONFIG_RFKILL is not set 300# CONFIG_RFKILL is not set
301# CONFIG_NET_9P is not set
311 302
312# 303#
313# Device Drivers 304# Device Drivers
@@ -320,26 +311,11 @@ CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y 311CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set 312# CONFIG_FW_LOADER 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#
327# CONFIG_CONNECTOR is not set 314# CONFIG_CONNECTOR is not set
328# CONFIG_MTD is not set 315# CONFIG_MTD is not set
329 316CONFIG_OF_DEVICE=y
330#
331# Parallel port support
332#
333# CONFIG_PARPORT is not set 317# CONFIG_PARPORT is not set
334 318CONFIG_BLK_DEV=y
335#
336# Plug and Play support
337#
338# CONFIG_PNPACPI is not set
339
340#
341# Block devices
342#
343# CONFIG_BLK_DEV_FD is not set 319# CONFIG_BLK_DEV_FD is not set
344# CONFIG_BLK_CPQ_DA is not set 320# CONFIG_BLK_CPQ_DA is not set
345# CONFIG_BLK_CPQ_CISS_DA is not set 321# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -356,14 +332,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
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 335CONFIG_MISC_DEVICES=y
360#
361# Misc devices
362#
363# CONFIG_PHANTOM is not set 336# CONFIG_PHANTOM is not set
337# CONFIG_EEPROM_93CX6 is not set
364# CONFIG_SGI_IOC4 is not set 338# CONFIG_SGI_IOC4 is not set
365# CONFIG_TIFM_CORE is not set 339# CONFIG_TIFM_CORE is not set
366# CONFIG_BLINK is not set
367# CONFIG_IDE is not set 340# CONFIG_IDE is not set
368 341
369# 342#
@@ -371,6 +344,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
371# 344#
372# CONFIG_RAID_ATTRS is not set 345# CONFIG_RAID_ATTRS is not set
373CONFIG_SCSI=y 346CONFIG_SCSI=y
347CONFIG_SCSI_DMA=y
374# CONFIG_SCSI_TGT is not set 348# CONFIG_SCSI_TGT is not set
375# CONFIG_SCSI_NETLINK is not set 349# CONFIG_SCSI_NETLINK is not set
376CONFIG_SCSI_PROC_FS=y 350CONFIG_SCSI_PROC_FS=y
@@ -399,12 +373,8 @@ CONFIG_BLK_DEV_SD=y
399# CONFIG_SCSI_SPI_ATTRS is not set 373# CONFIG_SCSI_SPI_ATTRS is not set
400# CONFIG_SCSI_FC_ATTRS is not set 374# CONFIG_SCSI_FC_ATTRS is not set
401# CONFIG_SCSI_ISCSI_ATTRS is not set 375# CONFIG_SCSI_ISCSI_ATTRS is not set
402# CONFIG_SCSI_SAS_ATTRS is not set
403# CONFIG_SCSI_SAS_LIBSAS is not set 376# CONFIG_SCSI_SAS_LIBSAS is not set
404 377CONFIG_SCSI_LOWLEVEL=y
405#
406# SCSI low-level drivers
407#
408# CONFIG_ISCSI_TCP is not set 378# CONFIG_ISCSI_TCP is not set
409# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 379# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
410# CONFIG_SCSI_3W_9XXX is not set 380# CONFIG_SCSI_3W_9XXX is not set
@@ -495,10 +465,6 @@ CONFIG_SATA_MV=y
495# CONFIG_PATA_VIA is not set 465# CONFIG_PATA_VIA is not set
496# CONFIG_PATA_WINBOND is not set 466# CONFIG_PATA_WINBOND is not set
497# CONFIG_PATA_PLATFORM is not set 467# CONFIG_PATA_PLATFORM is not set
498
499#
500# Multi-device support (RAID and LVM)
501#
502# CONFIG_MD is not set 468# CONFIG_MD is not set
503 469
504# 470#
@@ -514,19 +480,13 @@ CONFIG_SATA_MV=y
514# 480#
515# CONFIG_FIREWIRE is not set 481# CONFIG_FIREWIRE is not set
516# CONFIG_IEEE1394 is not set 482# CONFIG_IEEE1394 is not set
517
518#
519# I2O device support
520#
521# CONFIG_I2O is not set 483# CONFIG_I2O is not set
522# CONFIG_MACINTOSH_DRIVERS is not set 484# CONFIG_MACINTOSH_DRIVERS is not set
523
524#
525# Network device support
526#
527CONFIG_NETDEVICES=y 485CONFIG_NETDEVICES=y
486# CONFIG_NETDEVICES_MULTIQUEUE is not set
528# CONFIG_DUMMY is not set 487# CONFIG_DUMMY is not set
529# CONFIG_BONDING is not set 488# CONFIG_BONDING is not set
489# CONFIG_MACVLAN is not set
530# CONFIG_EQUALIZER is not set 490# CONFIG_EQUALIZER is not set
531# CONFIG_TUN is not set 491# CONFIG_TUN is not set
532# CONFIG_ARCNET is not set 492# CONFIG_ARCNET is not set
@@ -543,21 +503,14 @@ CONFIG_PHYLIB=y
543# CONFIG_VITESSE_PHY is not set 503# CONFIG_VITESSE_PHY is not set
544# CONFIG_SMSC_PHY is not set 504# CONFIG_SMSC_PHY is not set
545# CONFIG_BROADCOM_PHY is not set 505# CONFIG_BROADCOM_PHY is not set
506# CONFIG_ICPLUS_PHY is not set
546# CONFIG_FIXED_PHY is not set 507# CONFIG_FIXED_PHY is not set
547
548#
549# Ethernet (10 or 100Mbit)
550#
551CONFIG_NET_ETHERNET=y 508CONFIG_NET_ETHERNET=y
552CONFIG_MII=y 509CONFIG_MII=y
553# CONFIG_HAPPYMEAL is not set 510# CONFIG_HAPPYMEAL is not set
554# CONFIG_SUNGEM is not set 511# CONFIG_SUNGEM is not set
555# CONFIG_CASSINI is not set 512# CONFIG_CASSINI is not set
556# CONFIG_NET_VENDOR_3COM is not set 513# CONFIG_NET_VENDOR_3COM is not set
557
558#
559# Tulip family network device support
560#
561# CONFIG_NET_TULIP is not set 514# CONFIG_NET_TULIP is not set
562# CONFIG_HP100 is not set 515# CONFIG_HP100 is not set
563CONFIG_NET_PCI=y 516CONFIG_NET_PCI=y
@@ -595,7 +548,6 @@ CONFIG_NETDEV_1000=y
595# CONFIG_SIS190 is not set 548# CONFIG_SIS190 is not set
596# CONFIG_SKGE is not set 549# CONFIG_SKGE is not set
597# CONFIG_SKY2 is not set 550# CONFIG_SKY2 is not set
598# CONFIG_SK98LIN is not set
599# CONFIG_VIA_VELOCITY is not set 551# CONFIG_VIA_VELOCITY is not set
600# CONFIG_TIGON3 is not set 552# CONFIG_TIGON3 is not set
601# CONFIG_BNX2 is not set 553# CONFIG_BNX2 is not set
@@ -627,15 +579,7 @@ CONFIG_NETDEV_10000=y
627# CONFIG_NETCONSOLE is not set 579# CONFIG_NETCONSOLE is not set
628# CONFIG_NETPOLL is not set 580# CONFIG_NETPOLL is not set
629# CONFIG_NET_POLL_CONTROLLER is not set 581# CONFIG_NET_POLL_CONTROLLER is not set
630
631#
632# ISDN subsystem
633#
634# CONFIG_ISDN is not set 582# CONFIG_ISDN is not set
635
636#
637# Telephony Support
638#
639# CONFIG_PHONE is not set 583# CONFIG_PHONE is not set
640 584
641# 585#
@@ -697,10 +641,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
697CONFIG_UNIX98_PTYS=y 641CONFIG_UNIX98_PTYS=y
698CONFIG_LEGACY_PTYS=y 642CONFIG_LEGACY_PTYS=y
699CONFIG_LEGACY_PTY_COUNT=256 643CONFIG_LEGACY_PTY_COUNT=256
700
701#
702# IPMI
703#
704# CONFIG_IPMI_HANDLER is not set 644# CONFIG_IPMI_HANDLER is not set
705# CONFIG_WATCHDOG is not set 645# CONFIG_WATCHDOG is not set
706# CONFIG_HW_RANDOM is not set 646# CONFIG_HW_RANDOM is not set
@@ -712,10 +652,6 @@ CONFIG_GEN_RTC=y
712# CONFIG_AGP is not set 652# CONFIG_AGP is not set
713# CONFIG_DRM is not set 653# CONFIG_DRM is not set
714# CONFIG_RAW_DRIVER is not set 654# CONFIG_RAW_DRIVER is not set
715
716#
717# TPM devices
718#
719# CONFIG_TCG_TPM is not set 655# CONFIG_TCG_TPM is not set
720CONFIG_DEVPORT=y 656CONFIG_DEVPORT=y
721# CONFIG_I2C is not set 657# CONFIG_I2C is not set
@@ -725,20 +661,24 @@ CONFIG_DEVPORT=y
725# 661#
726# CONFIG_SPI is not set 662# CONFIG_SPI is not set
727# CONFIG_SPI_MASTER is not set 663# CONFIG_SPI_MASTER is not set
728
729#
730# Dallas's 1-wire bus
731#
732# CONFIG_W1 is not set 664# CONFIG_W1 is not set
665# CONFIG_POWER_SUPPLY is not set
733CONFIG_HWMON=y 666CONFIG_HWMON=y
734# CONFIG_HWMON_VID is not set 667# CONFIG_HWMON_VID is not set
735# CONFIG_SENSORS_ABITUGURU is not set 668# CONFIG_SENSORS_ABITUGURU is not set
669# CONFIG_SENSORS_ABITUGURU3 is not set
736# CONFIG_SENSORS_F71805F is not set 670# CONFIG_SENSORS_F71805F is not set
671# CONFIG_SENSORS_IT87 is not set
672# CONFIG_SENSORS_PC87360 is not set
737# CONFIG_SENSORS_PC87427 is not set 673# CONFIG_SENSORS_PC87427 is not set
674# CONFIG_SENSORS_SIS5595 is not set
738# CONFIG_SENSORS_SMSC47M1 is not set 675# CONFIG_SENSORS_SMSC47M1 is not set
739# CONFIG_SENSORS_SMSC47B397 is not set 676# CONFIG_SENSORS_SMSC47B397 is not set
677# CONFIG_SENSORS_VIA686A is not set
740# CONFIG_SENSORS_VT1211 is not set 678# CONFIG_SENSORS_VT1211 is not set
679# CONFIG_SENSORS_VT8231 is not set
741# CONFIG_SENSORS_W83627HF is not set 680# CONFIG_SENSORS_W83627HF is not set
681# CONFIG_SENSORS_W83627EHF is not set
742# CONFIG_HWMON_DEBUG_CHIP is not set 682# CONFIG_HWMON_DEBUG_CHIP is not set
743 683
744# 684#
@@ -763,6 +703,7 @@ CONFIG_DAB=y
763# 703#
764# CONFIG_DISPLAY_SUPPORT is not set 704# CONFIG_DISPLAY_SUPPORT is not set
765# CONFIG_VGASTATE is not set 705# CONFIG_VGASTATE is not set
706CONFIG_VIDEO_OUTPUT_CONTROL=y
766# CONFIG_FB is not set 707# CONFIG_FB is not set
767# CONFIG_FB_IBM_GXT4500 is not set 708# CONFIG_FB_IBM_GXT4500 is not set
768 709
@@ -770,16 +711,10 @@ CONFIG_DAB=y
770# Sound 711# Sound
771# 712#
772# CONFIG_SOUND is not set 713# CONFIG_SOUND is not set
773 714CONFIG_HID_SUPPORT=y
774#
775# HID Devices
776#
777CONFIG_HID=y 715CONFIG_HID=y
778# CONFIG_HID_DEBUG is not set 716# CONFIG_HID_DEBUG is not set
779 717CONFIG_USB_SUPPORT=y
780#
781# USB support
782#
783CONFIG_USB_ARCH_HAS_HCD=y 718CONFIG_USB_ARCH_HAS_HCD=y
784CONFIG_USB_ARCH_HAS_OHCI=y 719CONFIG_USB_ARCH_HAS_OHCI=y
785CONFIG_USB_ARCH_HAS_EHCI=y 720CONFIG_USB_ARCH_HAS_EHCI=y
@@ -794,32 +729,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
794# 729#
795# CONFIG_USB_GADGET is not set 730# CONFIG_USB_GADGET is not set
796# CONFIG_MMC is not set 731# CONFIG_MMC is not set
797
798#
799# LED devices
800#
801# CONFIG_NEW_LEDS is not set 732# CONFIG_NEW_LEDS is not set
802
803#
804# LED drivers
805#
806
807#
808# LED Triggers
809#
810
811#
812# InfiniBand support
813#
814# CONFIG_INFINIBAND is not set 733# CONFIG_INFINIBAND is not set
815 734# CONFIG_EDAC is not set
816#
817# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
818#
819
820#
821# Real Time Clock
822#
823# CONFIG_RTC_CLASS is not set 735# CONFIG_RTC_CLASS is not set
824 736
825# 737#
@@ -836,6 +748,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
836# 748#
837 749
838# 750#
751# Userspace I/O
752#
753# CONFIG_UIO is not set
754
755#
839# File systems 756# File systems
840# 757#
841CONFIG_EXT2_FS=y 758CONFIG_EXT2_FS=y
@@ -928,7 +845,6 @@ CONFIG_SUNRPC=y
928# CONFIG_NCP_FS is not set 845# CONFIG_NCP_FS is not set
929# CONFIG_CODA_FS is not set 846# CONFIG_CODA_FS is not set
930# CONFIG_AFS_FS is not set 847# CONFIG_AFS_FS is not set
931# CONFIG_9P_FS is not set
932 848
933# 849#
934# Partition Types 850# Partition Types
@@ -971,6 +887,7 @@ CONFIG_BITREVERSE=y
971# CONFIG_CRC16 is not set 887# CONFIG_CRC16 is not set
972# CONFIG_CRC_ITU_T is not set 888# CONFIG_CRC_ITU_T is not set
973CONFIG_CRC32=y 889CONFIG_CRC32=y
890# CONFIG_CRC7 is not set
974# CONFIG_LIBCRC32C is not set 891# CONFIG_LIBCRC32C is not set
975CONFIG_PLIST=y 892CONFIG_PLIST=y
976CONFIG_HAS_IOMEM=y 893CONFIG_HAS_IOMEM=y
@@ -993,7 +910,6 @@ CONFIG_ENABLE_MUST_CHECK=y
993# CONFIG_HEADERS_CHECK is not set 910# CONFIG_HEADERS_CHECK is not set
994# CONFIG_DEBUG_KERNEL is not set 911# CONFIG_DEBUG_KERNEL is not set
995# CONFIG_DEBUG_BUGVERBOSE is not set 912# CONFIG_DEBUG_BUGVERBOSE is not set
996# CONFIG_BOOTX_TEXT is not set
997# CONFIG_PPC_EARLY_DEBUG is not set 913# CONFIG_PPC_EARLY_DEBUG is not set
998 914
999# 915#
@@ -1001,8 +917,4 @@ CONFIG_ENABLE_MUST_CHECK=y
1001# 917#
1002# CONFIG_KEYS is not set 918# CONFIG_KEYS is not set
1003# CONFIG_SECURITY is not set 919# CONFIG_SECURITY is not set
1004
1005#
1006# Cryptographic options
1007#
1008# CONFIG_CRYPTO is not set 920# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 4a429294e4da..4b68032588ff 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:55 2007 4# Tue Aug 28 21:24:39 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,59 +29,36 @@ 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
23# CONFIG_PPC_UDBG_16550 is not set 40# CONFIG_PPC_UDBG_16550 is not set
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
27CONFIG_DEFAULT_UIMAGE=y 44CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33CONFIG_PPC_82xx=y
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
45CONFIG_PPC_STD_MMU=y
46CONFIG_PPC_STD_MMU_32=y
47# CONFIG_PPC_MM_SLICES is not set
48# CONFIG_SMP is not set
49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 47CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
50 48
51# 49#
52# Code maturity level options 50# General setup
53# 51#
54# CONFIG_EXPERIMENTAL is not set 52# CONFIG_EXPERIMENTAL is not set
55CONFIG_BROKEN_ON_SMP=y 53CONFIG_BROKEN_ON_SMP=y
56CONFIG_INIT_ENV_ARG_LIMIT=32 54CONFIG_INIT_ENV_ARG_LIMIT=32
57
58#
59# General setup
60#
61CONFIG_LOCALVERSION="powerpc8272" 55CONFIG_LOCALVERSION="powerpc8272"
62CONFIG_LOCALVERSION_AUTO=y 56CONFIG_LOCALVERSION_AUTO=y
63CONFIG_SWAP=y 57CONFIG_SWAP=y
64CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
65# CONFIG_IPC_NS is not set
66CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
67# CONFIG_BSD_PROCESS_ACCT is not set 60# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 61# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set
70# CONFIG_AUDIT is not set 62# CONFIG_AUDIT is not set
71CONFIG_IKCONFIG=y 63CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 64CONFIG_IKCONFIG_PROC=y
@@ -99,15 +91,7 @@ CONFIG_SLAB=y
99CONFIG_RT_MUTEXES=y 91CONFIG_RT_MUTEXES=y
100# CONFIG_TINY_SHMEM is not set 92# CONFIG_TINY_SHMEM is not set
101CONFIG_BASE_SMALL=0 93CONFIG_BASE_SMALL=0
102
103#
104# Loadable module support
105#
106# CONFIG_MODULES is not set 94# CONFIG_MODULES is not set
107
108#
109# Block layer
110#
111CONFIG_BLOCK=y 95CONFIG_BLOCK=y
112# CONFIG_LBD is not set 96# CONFIG_LBD is not set
113# CONFIG_BLK_DEV_IO_TRACE is not set 97# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -129,6 +113,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
129# 113#
130# Platform support 114# Platform support
131# 115#
116# CONFIG_PPC_MULTIPLATFORM is not set
117# CONFIG_EMBEDDED6xx is not set
118CONFIG_PPC_82xx=y
119# CONFIG_PPC_83xx is not set
120# CONFIG_PPC_86xx is not set
132# CONFIG_PPC_MPC52xx is not set 121# CONFIG_PPC_MPC52xx is not set
133# CONFIG_PPC_MPC5200 is not set 122# CONFIG_PPC_MPC5200 is not set
134# CONFIG_PPC_CELL is not set 123# CONFIG_PPC_CELL is not set
@@ -148,6 +137,7 @@ CONFIG_8272=y
148# CONFIG_GENERIC_IOMAP is not set 137# CONFIG_GENERIC_IOMAP is not set
149# CONFIG_CPU_FREQ is not set 138# CONFIG_CPU_FREQ is not set
150CONFIG_CPM2=y 139CONFIG_CPM2=y
140# CONFIG_FSL_ULI1575 is not set
151 141
152# 142#
153# Kernel options 143# Kernel options
@@ -172,6 +162,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
172CONFIG_SPLIT_PTLOCK_CPUS=4 162CONFIG_SPLIT_PTLOCK_CPUS=4
173# CONFIG_RESOURCES_64BIT is not set 163# CONFIG_RESOURCES_64BIT is not set
174CONFIG_ZONE_DMA_FLAG=1 164CONFIG_ZONE_DMA_FLAG=1
165CONFIG_BOUNCE=y
166CONFIG_VIRT_TO_BUS=y
175CONFIG_PROC_DEVICETREE=y 167CONFIG_PROC_DEVICETREE=y
176# CONFIG_CMDLINE_BOOL is not set 168# CONFIG_CMDLINE_BOOL is not set
177# CONFIG_PM is not set 169# CONFIG_PM is not set
@@ -186,6 +178,7 @@ CONFIG_ZONE_DMA=y
186CONFIG_FSL_SOC=y 178CONFIG_FSL_SOC=y
187# CONFIG_PCI is not set 179# CONFIG_PCI is not set
188# CONFIG_PCI_DOMAINS is not set 180# CONFIG_PCI_DOMAINS is not set
181# CONFIG_PCI_SYSCALL is not set
189# CONFIG_ARCH_SUPPORTS_MSI is not set 182# CONFIG_ARCH_SUPPORTS_MSI is not set
190 183
191# 184#
@@ -319,26 +312,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
319# CONFIG_DEBUG_DRIVER is not set 312# CONFIG_DEBUG_DRIVER is not set
320# CONFIG_DEBUG_DEVRES is not set 313# CONFIG_DEBUG_DEVRES is not set
321# CONFIG_SYS_HYPERVISOR is not set 314# CONFIG_SYS_HYPERVISOR is not set
322
323#
324# Connector - unified userspace <-> kernelspace linker
325#
326# CONFIG_CONNECTOR is not set 315# CONFIG_CONNECTOR is not set
327# CONFIG_MTD is not set 316# CONFIG_MTD is not set
328 317CONFIG_OF_DEVICE=y
329#
330# Parallel port support
331#
332# CONFIG_PARPORT is not set 318# CONFIG_PARPORT is not set
333 319CONFIG_BLK_DEV=y
334#
335# Plug and Play support
336#
337# CONFIG_PNPACPI is not set
338
339#
340# Block devices
341#
342# CONFIG_BLK_DEV_FD is not set 320# CONFIG_BLK_DEV_FD is not set
343# CONFIG_BLK_DEV_COW_COMMON is not set 321# CONFIG_BLK_DEV_COW_COMMON is not set
344CONFIG_BLK_DEV_LOOP=y 322CONFIG_BLK_DEV_LOOP=y
@@ -347,11 +325,8 @@ CONFIG_BLK_DEV_LOOP=y
347# CONFIG_BLK_DEV_RAM is not set 325# CONFIG_BLK_DEV_RAM is not set
348# CONFIG_CDROM_PKTCDVD is not set 326# CONFIG_CDROM_PKTCDVD is not set
349# CONFIG_ATA_OVER_ETH is not set 327# CONFIG_ATA_OVER_ETH is not set
350 328CONFIG_MISC_DEVICES=y
351# 329# CONFIG_EEPROM_93CX6 is not set
352# Misc devices
353#
354# CONFIG_BLINK is not set
355CONFIG_IDE=y 330CONFIG_IDE=y
356CONFIG_IDE_MAX_HWIFS=4 331CONFIG_IDE_MAX_HWIFS=4
357CONFIG_BLK_DEV_IDE=y 332CONFIG_BLK_DEV_IDE=y
@@ -381,19 +356,13 @@ CONFIG_IDE_PROC_FS=y
381# 356#
382# CONFIG_RAID_ATTRS is not set 357# CONFIG_RAID_ATTRS is not set
383# CONFIG_SCSI is not set 358# CONFIG_SCSI is not set
359# CONFIG_SCSI_DMA is not set
384# CONFIG_SCSI_NETLINK is not set 360# CONFIG_SCSI_NETLINK is not set
385# CONFIG_ATA is not set 361# CONFIG_ATA is not set
386
387#
388# Multi-device support (RAID and LVM)
389#
390# CONFIG_MD is not set 362# CONFIG_MD is not set
391# CONFIG_MACINTOSH_DRIVERS is not set 363# CONFIG_MACINTOSH_DRIVERS is not set
392
393#
394# Network device support
395#
396CONFIG_NETDEVICES=y 364CONFIG_NETDEVICES=y
365# CONFIG_NETDEVICES_MULTIQUEUE is not set
397# CONFIG_DUMMY is not set 366# CONFIG_DUMMY is not set
398# CONFIG_BONDING is not set 367# CONFIG_BONDING is not set
399# CONFIG_EQUALIZER is not set 368# CONFIG_EQUALIZER is not set
@@ -411,11 +380,8 @@ CONFIG_DAVICOM_PHY=y
411# CONFIG_VITESSE_PHY is not set 380# CONFIG_VITESSE_PHY is not set
412# CONFIG_SMSC_PHY is not set 381# CONFIG_SMSC_PHY is not set
413# CONFIG_BROADCOM_PHY is not set 382# CONFIG_BROADCOM_PHY is not set
383# CONFIG_ICPLUS_PHY is not set
414# CONFIG_FIXED_PHY is not set 384# CONFIG_FIXED_PHY is not set
415
416#
417# Ethernet (10 or 100Mbit)
418#
419CONFIG_NET_ETHERNET=y 385CONFIG_NET_ETHERNET=y
420CONFIG_MII=y 386CONFIG_MII=y
421CONFIG_FS_ENET=y 387CONFIG_FS_ENET=y
@@ -440,15 +406,7 @@ CONFIG_PPP_DEFLATE=y
440CONFIG_SLHC=y 406CONFIG_SLHC=y
441# CONFIG_NETPOLL is not set 407# CONFIG_NETPOLL is not set
442# CONFIG_NET_POLL_CONTROLLER is not set 408# CONFIG_NET_POLL_CONTROLLER is not set
443
444#
445# ISDN subsystem
446#
447# CONFIG_ISDN is not set 409# CONFIG_ISDN is not set
448
449#
450# Telephony Support
451#
452# CONFIG_PHONE is not set 410# CONFIG_PHONE is not set
453 411
454# 412#
@@ -533,10 +491,6 @@ CONFIG_SERIAL_CPM_SCC4=y
533CONFIG_UNIX98_PTYS=y 491CONFIG_UNIX98_PTYS=y
534CONFIG_LEGACY_PTYS=y 492CONFIG_LEGACY_PTYS=y
535CONFIG_LEGACY_PTY_COUNT=256 493CONFIG_LEGACY_PTY_COUNT=256
536
537#
538# IPMI
539#
540# CONFIG_IPMI_HANDLER is not set 494# CONFIG_IPMI_HANDLER is not set
541# CONFIG_WATCHDOG is not set 495# CONFIG_WATCHDOG is not set
542CONFIG_HW_RANDOM=y 496CONFIG_HW_RANDOM=y
@@ -544,10 +498,6 @@ CONFIG_HW_RANDOM=y
544# CONFIG_GEN_RTC is not set 498# CONFIG_GEN_RTC is not set
545# CONFIG_R3964 is not set 499# CONFIG_R3964 is not set
546# CONFIG_RAW_DRIVER is not set 500# CONFIG_RAW_DRIVER is not set
547
548#
549# TPM devices
550#
551# CONFIG_I2C is not set 501# CONFIG_I2C is not set
552 502
553# 503#
@@ -555,11 +505,8 @@ CONFIG_HW_RANDOM=y
555# 505#
556# CONFIG_SPI is not set 506# CONFIG_SPI is not set
557# CONFIG_SPI_MASTER is not set 507# CONFIG_SPI_MASTER is not set
558
559#
560# Dallas's 1-wire bus
561#
562# CONFIG_W1 is not set 508# CONFIG_W1 is not set
509# CONFIG_POWER_SUPPLY is not set
563# CONFIG_HWMON is not set 510# CONFIG_HWMON is not set
564 511
565# 512#
@@ -584,6 +531,7 @@ CONFIG_DAB=y
584# 531#
585# CONFIG_DISPLAY_SUPPORT is not set 532# CONFIG_DISPLAY_SUPPORT is not set
586# CONFIG_VGASTATE is not set 533# CONFIG_VGASTATE is not set
534CONFIG_VIDEO_OUTPUT_CONTROL=y
587# CONFIG_FB is not set 535# CONFIG_FB is not set
588# CONFIG_FB_IBM_GXT4500 is not set 536# CONFIG_FB_IBM_GXT4500 is not set
589 537
@@ -591,16 +539,10 @@ CONFIG_DAB=y
591# Sound 539# Sound
592# 540#
593# CONFIG_SOUND is not set 541# CONFIG_SOUND is not set
594 542CONFIG_HID_SUPPORT=y
595#
596# HID Devices
597#
598CONFIG_HID=y 543CONFIG_HID=y
599# CONFIG_HID_DEBUG is not set 544# CONFIG_HID_DEBUG is not set
600 545CONFIG_USB_SUPPORT=y
601#
602# USB support
603#
604# CONFIG_USB_ARCH_HAS_HCD is not set 546# CONFIG_USB_ARCH_HAS_HCD is not set
605# CONFIG_USB_ARCH_HAS_OHCI is not set 547# CONFIG_USB_ARCH_HAS_OHCI is not set
606# CONFIG_USB_ARCH_HAS_EHCI is not set 548# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -614,41 +556,29 @@ CONFIG_HID=y
614# 556#
615CONFIG_USB_GADGET=y 557CONFIG_USB_GADGET=y
616# CONFIG_USB_GADGET_DEBUG_FILES is not set 558# CONFIG_USB_GADGET_DEBUG_FILES is not set
559CONFIG_USB_GADGET_SELECTED=y
560# CONFIG_USB_GADGET_AMD5536UDC is not set
617# CONFIG_USB_GADGET_FSL_USB2 is not set 561# CONFIG_USB_GADGET_FSL_USB2 is not set
618# CONFIG_USB_GADGET_NET2280 is not set 562# CONFIG_USB_GADGET_NET2280 is not set
619# CONFIG_USB_GADGET_PXA2XX is not set 563# CONFIG_USB_GADGET_PXA2XX is not set
564CONFIG_USB_GADGET_M66592=y
565CONFIG_USB_M66592=y
620# CONFIG_USB_GADGET_GOKU is not set 566# CONFIG_USB_GADGET_GOKU is not set
621# CONFIG_USB_GADGET_LH7A40X is not set 567# CONFIG_USB_GADGET_LH7A40X is not set
622# CONFIG_USB_GADGET_OMAP is not set 568# CONFIG_USB_GADGET_OMAP is not set
569# CONFIG_USB_GADGET_S3C2410 is not set
623# CONFIG_USB_GADGET_AT91 is not set 570# CONFIG_USB_GADGET_AT91 is not set
624# CONFIG_USB_GADGET_DUMMY_HCD is not set 571# CONFIG_USB_GADGET_DUMMY_HCD is not set
625# CONFIG_USB_GADGET_DUALSPEED is not set 572CONFIG_USB_GADGET_DUALSPEED=y
573# CONFIG_USB_ZERO is not set
574CONFIG_USB_ETH=y
575# CONFIG_USB_GADGETFS is not set
576# CONFIG_USB_FILE_STORAGE is not set
577# CONFIG_USB_G_SERIAL is not set
578# CONFIG_USB_MIDI_GADGET is not set
626# CONFIG_MMC is not set 579# CONFIG_MMC is not set
627
628#
629# LED devices
630#
631# CONFIG_NEW_LEDS is not set 580# CONFIG_NEW_LEDS is not set
632 581# CONFIG_RTC_CLASS is not set
633#
634# LED drivers
635#
636
637#
638# LED Triggers
639#
640
641#
642# InfiniBand support
643#
644
645#
646# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
647#
648
649#
650# Real Time Clock
651#
652 582
653# 583#
654# DMA Engine support 584# DMA Engine support
@@ -664,6 +594,11 @@ CONFIG_USB_GADGET=y
664# 594#
665 595
666# 596#
597# Userspace I/O
598#
599# CONFIG_UIO is not set
600
601#
667# File systems 602# File systems
668# 603#
669CONFIG_EXT2_FS=y 604CONFIG_EXT2_FS=y
@@ -826,6 +761,7 @@ CONFIG_CRC_CCITT=y
826# CONFIG_CRC16 is not set 761# CONFIG_CRC16 is not set
827# CONFIG_CRC_ITU_T is not set 762# CONFIG_CRC_ITU_T is not set
828CONFIG_CRC32=y 763CONFIG_CRC32=y
764# CONFIG_CRC7 is not set
829# CONFIG_LIBCRC32C is not set 765# CONFIG_LIBCRC32C is not set
830CONFIG_ZLIB_INFLATE=y 766CONFIG_ZLIB_INFLATE=y
831CONFIG_ZLIB_DEFLATE=y 767CONFIG_ZLIB_DEFLATE=y
@@ -846,6 +782,7 @@ CONFIG_ENABLE_MUST_CHECK=y
846CONFIG_DEBUG_KERNEL=y 782CONFIG_DEBUG_KERNEL=y
847# CONFIG_DEBUG_SHIRQ is not set 783# CONFIG_DEBUG_SHIRQ is not set
848CONFIG_DETECT_SOFTLOCKUP=y 784CONFIG_DETECT_SOFTLOCKUP=y
785CONFIG_SCHED_DEBUG=y
849# CONFIG_SCHEDSTATS is not set 786# CONFIG_SCHEDSTATS is not set
850# CONFIG_TIMER_STATS is not set 787# CONFIG_TIMER_STATS is not set
851# CONFIG_DEBUG_SLAB is not set 788# CONFIG_DEBUG_SLAB is not set
@@ -868,7 +805,6 @@ CONFIG_FORCED_INLINING=y
868# CONFIG_DEBUGGER is not set 805# CONFIG_DEBUGGER is not set
869# CONFIG_KGDB_CONSOLE is not set 806# CONFIG_KGDB_CONSOLE is not set
870CONFIG_BDI_SWITCH=y 807CONFIG_BDI_SWITCH=y
871# CONFIG_BOOTX_TEXT is not set
872# CONFIG_PPC_EARLY_DEBUG is not set 808# CONFIG_PPC_EARLY_DEBUG is not set
873 809
874# 810#
@@ -876,10 +812,6 @@ CONFIG_BDI_SWITCH=y
876# 812#
877# CONFIG_KEYS is not set 813# CONFIG_KEYS is not set
878# CONFIG_SECURITY is not set 814# CONFIG_SECURITY is not set
879
880#
881# Cryptographic options
882#
883CONFIG_CRYPTO=y 815CONFIG_CRYPTO=y
884CONFIG_CRYPTO_ALGAPI=y 816CONFIG_CRYPTO_ALGAPI=y
885CONFIG_CRYPTO_BLKCIPHER=y 817CONFIG_CRYPTO_BLKCIPHER=y
@@ -913,7 +845,4 @@ CONFIG_CRYPTO_DES=y
913# CONFIG_CRYPTO_MICHAEL_MIC is not set 845# CONFIG_CRYPTO_MICHAEL_MIC is not set
914# CONFIG_CRYPTO_CRC32C is not set 846# CONFIG_CRYPTO_CRC32C is not set
915# CONFIG_CRYPTO_CAMELLIA is not set 847# CONFIG_CRYPTO_CAMELLIA is not set
916 848CONFIG_CRYPTO_HW=y
917#
918# Hardware crypto devices
919#
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index b7d3dffc981a..f387dac69d09 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:55 2007 4# Tue Aug 28 21:24:39 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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_PPC_MPC831x=y
158# CONFIG_GENERIC_IOMAP is not set 149# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set 151# CONFIG_CPM2 is not set
152# CONFIG_FSL_ULI1575 is not set
161 153
162# 154#
163# Kernel options 155# Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
186CONFIG_SPLIT_PTLOCK_CPUS=4 178CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_RESOURCES_64BIT is not set 179# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1 180CONFIG_ZONE_DMA_FLAG=1
181CONFIG_BOUNCE=y
182CONFIG_VIRT_TO_BUS=y
189CONFIG_PROC_DEVICETREE=y 183CONFIG_PROC_DEVICETREE=y
190# CONFIG_CMDLINE_BOOL is not set 184# CONFIG_CMDLINE_BOOL is not set
191# CONFIG_PM is not set 185# CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
200CONFIG_ZONE_DMA=y 194CONFIG_ZONE_DMA=y
201CONFIG_GENERIC_ISA_DMA=y 195CONFIG_GENERIC_ISA_DMA=y
202CONFIG_PPC_INDIRECT_PCI=y 196CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
204CONFIG_FSL_SOC=y 197CONFIG_FSL_SOC=y
205CONFIG_PCI=y 198CONFIG_PCI=y
206CONFIG_PCI_DOMAINS=y 199CONFIG_PCI_DOMAINS=y
200CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 201# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 202CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 203# CONFIG_PCI_MSI is not set
@@ -314,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
314# CONFIG_MAC80211 is not set 308# CONFIG_MAC80211 is not set
315# CONFIG_IEEE80211 is not set 309# CONFIG_IEEE80211 is not set
316# CONFIG_RFKILL is not set 310# CONFIG_RFKILL is not set
311# CONFIG_NET_9P is not set
317 312
318# 313#
319# Device Drivers 314# Device Drivers
@@ -328,10 +323,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_DEBUG_DRIVER is not set 323# CONFIG_DEBUG_DRIVER is not set
329# CONFIG_DEBUG_DEVRES is not set 324# CONFIG_DEBUG_DEVRES is not set
330# CONFIG_SYS_HYPERVISOR is not set 325# CONFIG_SYS_HYPERVISOR is not set
331
332#
333# Connector - unified userspace <-> kernelspace linker
334#
335# CONFIG_CONNECTOR is not set 326# CONFIG_CONNECTOR is not set
336CONFIG_MTD=y 327CONFIG_MTD=y
337# CONFIG_MTD_DEBUG is not set 328# CONFIG_MTD_DEBUG is not set
@@ -411,20 +402,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
411# UBI - Unsorted block images 402# UBI - Unsorted block images
412# 403#
413# CONFIG_MTD_UBI is not set 404# CONFIG_MTD_UBI is not set
414 405CONFIG_OF_DEVICE=y
415#
416# Parallel port support
417#
418# CONFIG_PARPORT is not set 406# CONFIG_PARPORT is not set
419 407CONFIG_BLK_DEV=y
420#
421# Plug and Play support
422#
423# CONFIG_PNPACPI is not set
424
425#
426# Block devices
427#
428# CONFIG_BLK_DEV_FD is not set 408# CONFIG_BLK_DEV_FD is not set
429# CONFIG_BLK_CPQ_DA is not set 409# CONFIG_BLK_CPQ_DA is not set
430# CONFIG_BLK_CPQ_CISS_DA is not set 410# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -442,14 +422,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
442CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 422CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
443# CONFIG_CDROM_PKTCDVD is not set 423# CONFIG_CDROM_PKTCDVD is not set
444# CONFIG_ATA_OVER_ETH is not set 424# CONFIG_ATA_OVER_ETH is not set
445 425CONFIG_MISC_DEVICES=y
446#
447# Misc devices
448#
449# CONFIG_PHANTOM is not set 426# CONFIG_PHANTOM is not set
427# CONFIG_EEPROM_93CX6 is not set
450# CONFIG_SGI_IOC4 is not set 428# CONFIG_SGI_IOC4 is not set
451# CONFIG_TIFM_CORE is not set 429# CONFIG_TIFM_CORE is not set
452# CONFIG_BLINK is not set
453# CONFIG_IDE is not set 430# CONFIG_IDE is not set
454 431
455# 432#
@@ -457,6 +434,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
457# 434#
458# CONFIG_RAID_ATTRS is not set 435# CONFIG_RAID_ATTRS is not set
459CONFIG_SCSI=y 436CONFIG_SCSI=y
437CONFIG_SCSI_DMA=y
460# CONFIG_SCSI_TGT is not set 438# CONFIG_SCSI_TGT is not set
461# CONFIG_SCSI_NETLINK is not set 439# CONFIG_SCSI_NETLINK is not set
462CONFIG_SCSI_PROC_FS=y 440CONFIG_SCSI_PROC_FS=y
@@ -486,12 +464,8 @@ CONFIG_SCSI_WAIT_SCAN=m
486CONFIG_SCSI_SPI_ATTRS=y 464CONFIG_SCSI_SPI_ATTRS=y
487# CONFIG_SCSI_FC_ATTRS is not set 465# CONFIG_SCSI_FC_ATTRS is not set
488# CONFIG_SCSI_ISCSI_ATTRS is not set 466# CONFIG_SCSI_ISCSI_ATTRS is not set
489# CONFIG_SCSI_SAS_ATTRS is not set
490# CONFIG_SCSI_SAS_LIBSAS is not set 467# CONFIG_SCSI_SAS_LIBSAS is not set
491 468CONFIG_SCSI_LOWLEVEL=y
492#
493# SCSI low-level drivers
494#
495# CONFIG_ISCSI_TCP is not set 469# CONFIG_ISCSI_TCP is not set
496# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 470# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
497# CONFIG_SCSI_3W_9XXX is not set 471# CONFIG_SCSI_3W_9XXX is not set
@@ -527,10 +501,6 @@ CONFIG_SCSI_SPI_ATTRS=y
527# CONFIG_SCSI_DEBUG is not set 501# CONFIG_SCSI_DEBUG is not set
528# CONFIG_SCSI_SRP is not set 502# CONFIG_SCSI_SRP is not set
529# CONFIG_ATA is not set 503# CONFIG_ATA is not set
530
531#
532# Multi-device support (RAID and LVM)
533#
534CONFIG_MD=y 504CONFIG_MD=y
535CONFIG_BLK_DEV_MD=y 505CONFIG_BLK_DEV_MD=y
536CONFIG_MD_LINEAR=y 506CONFIG_MD_LINEAR=y
@@ -555,19 +525,13 @@ CONFIG_MD_RAID1=y
555# 525#
556# CONFIG_FIREWIRE is not set 526# CONFIG_FIREWIRE is not set
557# CONFIG_IEEE1394 is not set 527# CONFIG_IEEE1394 is not set
558
559#
560# I2O device support
561#
562# CONFIG_I2O is not set 528# CONFIG_I2O is not set
563# CONFIG_MACINTOSH_DRIVERS is not set 529# CONFIG_MACINTOSH_DRIVERS is not set
564
565#
566# Network device support
567#
568CONFIG_NETDEVICES=y 530CONFIG_NETDEVICES=y
531# CONFIG_NETDEVICES_MULTIQUEUE is not set
569# CONFIG_DUMMY is not set 532# CONFIG_DUMMY is not set
570# CONFIG_BONDING is not set 533# CONFIG_BONDING is not set
534# CONFIG_MACVLAN is not set
571# CONFIG_EQUALIZER is not set 535# CONFIG_EQUALIZER is not set
572# CONFIG_TUN is not set 536# CONFIG_TUN is not set
573# CONFIG_ARCNET is not set 537# CONFIG_ARCNET is not set
@@ -584,21 +548,14 @@ CONFIG_CICADA_PHY=y
584# CONFIG_VITESSE_PHY is not set 548# CONFIG_VITESSE_PHY is not set
585# CONFIG_SMSC_PHY is not set 549# CONFIG_SMSC_PHY is not set
586# CONFIG_BROADCOM_PHY is not set 550# CONFIG_BROADCOM_PHY is not set
551# CONFIG_ICPLUS_PHY is not set
587# CONFIG_FIXED_PHY is not set 552# CONFIG_FIXED_PHY is not set
588
589#
590# Ethernet (10 or 100Mbit)
591#
592CONFIG_NET_ETHERNET=y 553CONFIG_NET_ETHERNET=y
593CONFIG_MII=y 554CONFIG_MII=y
594# CONFIG_HAPPYMEAL is not set 555# CONFIG_HAPPYMEAL is not set
595# CONFIG_SUNGEM is not set 556# CONFIG_SUNGEM is not set
596# CONFIG_CASSINI is not set 557# CONFIG_CASSINI is not set
597# CONFIG_NET_VENDOR_3COM is not set 558# CONFIG_NET_VENDOR_3COM is not set
598
599#
600# Tulip family network device support
601#
602# CONFIG_NET_TULIP is not set 559# CONFIG_NET_TULIP is not set
603# CONFIG_HP100 is not set 560# CONFIG_HP100 is not set
604CONFIG_NET_PCI=y 561CONFIG_NET_PCI=y
@@ -632,7 +589,6 @@ CONFIG_NETDEV_1000=y
632# CONFIG_SIS190 is not set 589# CONFIG_SIS190 is not set
633# CONFIG_SKGE is not set 590# CONFIG_SKGE is not set
634# CONFIG_SKY2 is not set 591# CONFIG_SKY2 is not set
635# CONFIG_SK98LIN is not set
636# CONFIG_VIA_VELOCITY is not set 592# CONFIG_VIA_VELOCITY is not set
637# CONFIG_TIGON3 is not set 593# CONFIG_TIGON3 is not set
638# CONFIG_BNX2 is not set 594# CONFIG_BNX2 is not set
@@ -675,15 +631,7 @@ CONFIG_NETDEV_10000=y
675# CONFIG_NETCONSOLE is not set 631# CONFIG_NETCONSOLE is not set
676# CONFIG_NETPOLL is not set 632# CONFIG_NETPOLL is not set
677# CONFIG_NET_POLL_CONTROLLER is not set 633# CONFIG_NET_POLL_CONTROLLER is not set
678
679#
680# ISDN subsystem
681#
682# CONFIG_ISDN is not set 634# CONFIG_ISDN is not set
683
684#
685# Telephony Support
686#
687# CONFIG_PHONE is not set 635# CONFIG_PHONE is not set
688 636
689# 637#
@@ -745,10 +693,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
745CONFIG_UNIX98_PTYS=y 693CONFIG_UNIX98_PTYS=y
746CONFIG_LEGACY_PTYS=y 694CONFIG_LEGACY_PTYS=y
747CONFIG_LEGACY_PTY_COUNT=256 695CONFIG_LEGACY_PTY_COUNT=256
748
749#
750# IPMI
751#
752# CONFIG_IPMI_HANDLER is not set 696# CONFIG_IPMI_HANDLER is not set
753CONFIG_WATCHDOG=y 697CONFIG_WATCHDOG=y
754# CONFIG_WATCHDOG_NOWAYOUT is not set 698# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -777,10 +721,6 @@ CONFIG_HW_RANDOM=y
777# CONFIG_AGP is not set 721# CONFIG_AGP is not set
778# CONFIG_DRM is not set 722# CONFIG_DRM is not set
779# CONFIG_RAW_DRIVER is not set 723# CONFIG_RAW_DRIVER is not set
780
781#
782# TPM devices
783#
784# CONFIG_TCG_TPM is not set 724# CONFIG_TCG_TPM is not set
785CONFIG_DEVPORT=y 725CONFIG_DEVPORT=y
786CONFIG_I2C=y 726CONFIG_I2C=y
@@ -815,6 +755,7 @@ CONFIG_I2C_MPC=y
815# CONFIG_I2C_SIS5595 is not set 755# CONFIG_I2C_SIS5595 is not set
816# CONFIG_I2C_SIS630 is not set 756# CONFIG_I2C_SIS630 is not set
817# CONFIG_I2C_SIS96X is not set 757# CONFIG_I2C_SIS96X is not set
758# CONFIG_I2C_TAOS_EVM is not set
818# CONFIG_I2C_STUB is not set 759# CONFIG_I2C_STUB is not set
819# CONFIG_I2C_TINY_USB is not set 760# CONFIG_I2C_TINY_USB is not set
820# CONFIG_I2C_VIA is not set 761# CONFIG_I2C_VIA is not set
@@ -826,12 +767,14 @@ CONFIG_I2C_MPC=y
826# 767#
827# CONFIG_SENSORS_DS1337 is not set 768# CONFIG_SENSORS_DS1337 is not set
828# CONFIG_SENSORS_DS1374 is not set 769# CONFIG_SENSORS_DS1374 is not set
770# CONFIG_DS1682 is not set
829# CONFIG_SENSORS_EEPROM is not set 771# CONFIG_SENSORS_EEPROM is not set
830# CONFIG_SENSORS_PCF8574 is not set 772# CONFIG_SENSORS_PCF8574 is not set
831# CONFIG_SENSORS_PCA9539 is not set 773# CONFIG_SENSORS_PCA9539 is not set
832# CONFIG_SENSORS_PCF8591 is not set 774# CONFIG_SENSORS_PCF8591 is not set
833# CONFIG_SENSORS_M41T00 is not set 775# CONFIG_SENSORS_M41T00 is not set
834# CONFIG_SENSORS_MAX6875 is not set 776# CONFIG_SENSORS_MAX6875 is not set
777# CONFIG_SENSORS_TSL2550 is not set
835# CONFIG_I2C_DEBUG_CORE is not set 778# CONFIG_I2C_DEBUG_CORE is not set
836# CONFIG_I2C_DEBUG_ALGO is not set 779# CONFIG_I2C_DEBUG_ALGO is not set
837# CONFIG_I2C_DEBUG_BUS is not set 780# CONFIG_I2C_DEBUG_BUS is not set
@@ -855,14 +798,13 @@ CONFIG_SPI_MPC83xx=y
855# 798#
856# CONFIG_SPI_AT25 is not set 799# CONFIG_SPI_AT25 is not set
857# CONFIG_SPI_SPIDEV is not set 800# CONFIG_SPI_SPIDEV is not set
858 801# CONFIG_SPI_TLE62X0 is not set
859#
860# Dallas's 1-wire bus
861#
862# CONFIG_W1 is not set 802# CONFIG_W1 is not set
803# CONFIG_POWER_SUPPLY is not set
863CONFIG_HWMON=y 804CONFIG_HWMON=y
864# CONFIG_HWMON_VID is not set 805# CONFIG_HWMON_VID is not set
865# CONFIG_SENSORS_ABITUGURU is not set 806# CONFIG_SENSORS_ABITUGURU is not set
807# CONFIG_SENSORS_ABITUGURU3 is not set
866# CONFIG_SENSORS_AD7418 is not set 808# CONFIG_SENSORS_AD7418 is not set
867# CONFIG_SENSORS_ADM1021 is not set 809# CONFIG_SENSORS_ADM1021 is not set
868# CONFIG_SENSORS_ADM1025 is not set 810# CONFIG_SENSORS_ADM1025 is not set
@@ -890,14 +832,17 @@ CONFIG_HWMON=y
890# CONFIG_SENSORS_LM87 is not set 832# CONFIG_SENSORS_LM87 is not set
891# CONFIG_SENSORS_LM90 is not set 833# CONFIG_SENSORS_LM90 is not set
892# CONFIG_SENSORS_LM92 is not set 834# CONFIG_SENSORS_LM92 is not set
835# CONFIG_SENSORS_LM93 is not set
893# CONFIG_SENSORS_MAX1619 is not set 836# CONFIG_SENSORS_MAX1619 is not set
894# CONFIG_SENSORS_MAX6650 is not set 837# CONFIG_SENSORS_MAX6650 is not set
895# CONFIG_SENSORS_PC87360 is not set 838# CONFIG_SENSORS_PC87360 is not set
896# CONFIG_SENSORS_PC87427 is not set 839# CONFIG_SENSORS_PC87427 is not set
897# CONFIG_SENSORS_SIS5595 is not set 840# CONFIG_SENSORS_SIS5595 is not set
841# CONFIG_SENSORS_DME1737 is not set
898# CONFIG_SENSORS_SMSC47M1 is not set 842# CONFIG_SENSORS_SMSC47M1 is not set
899# CONFIG_SENSORS_SMSC47M192 is not set 843# CONFIG_SENSORS_SMSC47M192 is not set
900# CONFIG_SENSORS_SMSC47B397 is not set 844# CONFIG_SENSORS_SMSC47B397 is not set
845# CONFIG_SENSORS_THMC50 is not set
901# CONFIG_SENSORS_VIA686A is not set 846# CONFIG_SENSORS_VIA686A is not set
902# CONFIG_SENSORS_VT1211 is not set 847# CONFIG_SENSORS_VT1211 is not set
903# CONFIG_SENSORS_VT8231 is not set 848# CONFIG_SENSORS_VT8231 is not set
@@ -933,6 +878,7 @@ CONFIG_DAB=y
933# 878#
934# CONFIG_DISPLAY_SUPPORT is not set 879# CONFIG_DISPLAY_SUPPORT is not set
935# CONFIG_VGASTATE is not set 880# CONFIG_VGASTATE is not set
881CONFIG_VIDEO_OUTPUT_CONTROL=m
936# CONFIG_FB is not set 882# CONFIG_FB is not set
937# CONFIG_FB_IBM_GXT4500 is not set 883# CONFIG_FB_IBM_GXT4500 is not set
938 884
@@ -940,10 +886,7 @@ CONFIG_DAB=y
940# Sound 886# Sound
941# 887#
942# CONFIG_SOUND is not set 888# CONFIG_SOUND is not set
943 889CONFIG_HID_SUPPORT=y
944#
945# HID Devices
946#
947CONFIG_HID=y 890CONFIG_HID=y
948# CONFIG_HID_DEBUG is not set 891# CONFIG_HID_DEBUG is not set
949 892
@@ -957,10 +900,7 @@ CONFIG_HID=y
957# 900#
958# CONFIG_USB_KBD is not set 901# CONFIG_USB_KBD is not set
959# CONFIG_USB_MOUSE is not set 902# CONFIG_USB_MOUSE is not set
960 903CONFIG_USB_SUPPORT=y
961#
962# USB support
963#
964CONFIG_USB_ARCH_HAS_HCD=y 904CONFIG_USB_ARCH_HAS_HCD=y
965CONFIG_USB_ARCH_HAS_OHCI=y 905CONFIG_USB_ARCH_HAS_OHCI=y
966CONFIG_USB_ARCH_HAS_EHCI=y 906CONFIG_USB_ARCH_HAS_EHCI=y
@@ -980,9 +920,9 @@ CONFIG_USB_DEVICE_CLASS=y
980# 920#
981CONFIG_USB_EHCI_HCD=y 921CONFIG_USB_EHCI_HCD=y
982# CONFIG_USB_EHCI_SPLIT_ISO is not set 922# CONFIG_USB_EHCI_SPLIT_ISO is not set
983# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 923CONFIG_USB_EHCI_ROOT_HUB_TT=y
984# CONFIG_USB_EHCI_TT_NEWSCHED is not set 924# CONFIG_USB_EHCI_TT_NEWSCHED is not set
985# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set 925CONFIG_USB_EHCI_FSL=y
986# CONFIG_USB_ISP116X_HCD is not set 926# CONFIG_USB_ISP116X_HCD is not set
987CONFIG_USB_OHCI_HCD=y 927CONFIG_USB_OHCI_HCD=y
988CONFIG_USB_OHCI_HCD_PPC_OF=y 928CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -994,6 +934,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
994CONFIG_USB_OHCI_LITTLE_ENDIAN=y 934CONFIG_USB_OHCI_LITTLE_ENDIAN=y
995CONFIG_USB_UHCI_HCD=y 935CONFIG_USB_UHCI_HCD=y
996# CONFIG_USB_SL811_HCD is not set 936# CONFIG_USB_SL811_HCD is not set
937# CONFIG_USB_R8A66597_HCD is not set
997 938
998# 939#
999# USB Device Class drivers 940# USB Device Class drivers
@@ -1069,15 +1010,19 @@ CONFIG_USB_MON=y
1069# USB Gadget Support 1010# USB Gadget Support
1070# 1011#
1071CONFIG_USB_GADGET=y 1012CONFIG_USB_GADGET=y
1013# CONFIG_USB_GADGET_DEBUG is not set
1072# CONFIG_USB_GADGET_DEBUG_FILES is not set 1014# CONFIG_USB_GADGET_DEBUG_FILES is not set
1073CONFIG_USB_GADGET_SELECTED=y 1015CONFIG_USB_GADGET_SELECTED=y
1016# CONFIG_USB_GADGET_AMD5536UDC is not set
1074# CONFIG_USB_GADGET_FSL_USB2 is not set 1017# CONFIG_USB_GADGET_FSL_USB2 is not set
1075CONFIG_USB_GADGET_NET2280=y 1018CONFIG_USB_GADGET_NET2280=y
1076CONFIG_USB_NET2280=y 1019CONFIG_USB_NET2280=y
1077# CONFIG_USB_GADGET_PXA2XX is not set 1020# CONFIG_USB_GADGET_PXA2XX is not set
1021# CONFIG_USB_GADGET_M66592 is not set
1078# CONFIG_USB_GADGET_GOKU is not set 1022# CONFIG_USB_GADGET_GOKU is not set
1079# CONFIG_USB_GADGET_LH7A40X is not set 1023# CONFIG_USB_GADGET_LH7A40X is not set
1080# CONFIG_USB_GADGET_OMAP is not set 1024# CONFIG_USB_GADGET_OMAP is not set
1025# CONFIG_USB_GADGET_S3C2410 is not set
1081# CONFIG_USB_GADGET_AT91 is not set 1026# CONFIG_USB_GADGET_AT91 is not set
1082# CONFIG_USB_GADGET_DUMMY_HCD is not set 1027# CONFIG_USB_GADGET_DUMMY_HCD is not set
1083CONFIG_USB_GADGET_DUALSPEED=y 1028CONFIG_USB_GADGET_DUALSPEED=y
@@ -1089,32 +1034,9 @@ CONFIG_USB_ETH_RNDIS=y
1089# CONFIG_USB_G_SERIAL is not set 1034# CONFIG_USB_G_SERIAL is not set
1090# CONFIG_USB_MIDI_GADGET is not set 1035# CONFIG_USB_MIDI_GADGET is not set
1091# CONFIG_MMC is not set 1036# CONFIG_MMC is not set
1092
1093#
1094# LED devices
1095#
1096# CONFIG_NEW_LEDS is not set 1037# CONFIG_NEW_LEDS is not set
1097
1098#
1099# LED drivers
1100#
1101
1102#
1103# LED Triggers
1104#
1105
1106#
1107# InfiniBand support
1108#
1109# CONFIG_INFINIBAND is not set 1038# CONFIG_INFINIBAND is not set
1110 1039# CONFIG_EDAC is not set
1111#
1112# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1113#
1114
1115#
1116# Real Time Clock
1117#
1118CONFIG_RTC_LIB=y 1040CONFIG_RTC_LIB=y
1119CONFIG_RTC_CLASS=y 1041CONFIG_RTC_CLASS=y
1120CONFIG_RTC_HCTOSYS=y 1042CONFIG_RTC_HCTOSYS=y
@@ -1141,6 +1063,7 @@ CONFIG_RTC_DRV_DS1307=y
1141# CONFIG_RTC_DRV_X1205 is not set 1063# CONFIG_RTC_DRV_X1205 is not set
1142# CONFIG_RTC_DRV_PCF8563 is not set 1064# CONFIG_RTC_DRV_PCF8563 is not set
1143# CONFIG_RTC_DRV_PCF8583 is not set 1065# CONFIG_RTC_DRV_PCF8583 is not set
1066# CONFIG_RTC_DRV_M41T80 is not set
1144 1067
1145# 1068#
1146# SPI RTC drivers 1069# SPI RTC drivers
@@ -1151,9 +1074,12 @@ CONFIG_RTC_DRV_DS1307=y
1151# 1074#
1152# Platform RTC drivers 1075# Platform RTC drivers
1153# 1076#
1077# CONFIG_RTC_DRV_CMOS is not set
1154# CONFIG_RTC_DRV_DS1553 is not set 1078# CONFIG_RTC_DRV_DS1553 is not set
1079# CONFIG_RTC_DRV_STK17TA8 is not set
1155# CONFIG_RTC_DRV_DS1742 is not set 1080# CONFIG_RTC_DRV_DS1742 is not set
1156# CONFIG_RTC_DRV_M48T86 is not set 1081# CONFIG_RTC_DRV_M48T86 is not set
1082# CONFIG_RTC_DRV_M48T59 is not set
1157# CONFIG_RTC_DRV_V3020 is not set 1083# CONFIG_RTC_DRV_V3020 is not set
1158 1084
1159# 1085#
@@ -1176,6 +1102,11 @@ CONFIG_NET_DMA=y
1176CONFIG_INTEL_IOATDMA=y 1102CONFIG_INTEL_IOATDMA=y
1177 1103
1178# 1104#
1105# Userspace I/O
1106#
1107# CONFIG_UIO is not set
1108
1109#
1179# File systems 1110# File systems
1180# 1111#
1181CONFIG_EXT2_FS=y 1112CONFIG_EXT2_FS=y
@@ -1272,7 +1203,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1272# CONFIG_NCP_FS is not set 1203# CONFIG_NCP_FS is not set
1273# CONFIG_CODA_FS is not set 1204# CONFIG_CODA_FS is not set
1274# CONFIG_AFS_FS is not set 1205# CONFIG_AFS_FS is not set
1275# CONFIG_9P_FS is not set
1276 1206
1277# 1207#
1278# Partition Types 1208# Partition Types
@@ -1315,6 +1245,7 @@ CONFIG_BITREVERSE=y
1315# CONFIG_CRC16 is not set 1245# CONFIG_CRC16 is not set
1316# CONFIG_CRC_ITU_T is not set 1246# CONFIG_CRC_ITU_T is not set
1317CONFIG_CRC32=y 1247CONFIG_CRC32=y
1248# CONFIG_CRC7 is not set
1318# CONFIG_LIBCRC32C is not set 1249# CONFIG_LIBCRC32C is not set
1319CONFIG_PLIST=y 1250CONFIG_PLIST=y
1320CONFIG_HAS_IOMEM=y 1251CONFIG_HAS_IOMEM=y
@@ -1338,6 +1269,7 @@ CONFIG_ENABLE_MUST_CHECK=y
1338CONFIG_DEBUG_KERNEL=y 1269CONFIG_DEBUG_KERNEL=y
1339# CONFIG_DEBUG_SHIRQ is not set 1270# CONFIG_DEBUG_SHIRQ is not set
1340CONFIG_DETECT_SOFTLOCKUP=y 1271CONFIG_DETECT_SOFTLOCKUP=y
1272CONFIG_SCHED_DEBUG=y
1341# CONFIG_SCHEDSTATS is not set 1273# CONFIG_SCHEDSTATS is not set
1342# CONFIG_TIMER_STATS is not set 1274# CONFIG_TIMER_STATS is not set
1343# CONFIG_DEBUG_SLAB is not set 1275# CONFIG_DEBUG_SLAB is not set
@@ -1360,7 +1292,6 @@ CONFIG_FORCED_INLINING=y
1360# CONFIG_DEBUG_PAGEALLOC is not set 1292# CONFIG_DEBUG_PAGEALLOC is not set
1361# CONFIG_DEBUGGER is not set 1293# CONFIG_DEBUGGER is not set
1362# CONFIG_BDI_SWITCH is not set 1294# CONFIG_BDI_SWITCH is not set
1363# CONFIG_BOOTX_TEXT is not set
1364# CONFIG_PPC_EARLY_DEBUG is not set 1295# CONFIG_PPC_EARLY_DEBUG is not set
1365 1296
1366# 1297#
@@ -1368,10 +1299,6 @@ CONFIG_FORCED_INLINING=y
1368# 1299#
1369# CONFIG_KEYS is not set 1300# CONFIG_KEYS is not set
1370# CONFIG_SECURITY is not set 1301# CONFIG_SECURITY is not set
1371
1372#
1373# Cryptographic options
1374#
1375CONFIG_CRYPTO=y 1302CONFIG_CRYPTO=y
1376CONFIG_CRYPTO_ALGAPI=y 1303CONFIG_CRYPTO_ALGAPI=y
1377CONFIG_CRYPTO_BLKCIPHER=y 1304CONFIG_CRYPTO_BLKCIPHER=y
@@ -1409,7 +1336,4 @@ CONFIG_CRYPTO_DES=y
1409# CONFIG_CRYPTO_CRC32C is not set 1336# CONFIG_CRYPTO_CRC32C is not set
1410# CONFIG_CRYPTO_CAMELLIA is not set 1337# CONFIG_CRYPTO_CAMELLIA is not set
1411# CONFIG_CRYPTO_TEST is not set 1338# CONFIG_CRYPTO_TEST is not set
1412 1339CONFIG_CRYPTO_HW=y
1413#
1414# Hardware crypto devices
1415#
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index 75ce78139a11..fc6695302cc8 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_mds_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:55 2007 4# Tue Aug 28 21:24:40 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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -159,6 +150,7 @@ CONFIG_PPC_MPC832x=y
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160CONFIG_QUICC_ENGINE=y 151CONFIG_QUICC_ENGINE=y
161# CONFIG_CPM2 is not set 152# CONFIG_CPM2 is not set
153# CONFIG_FSL_ULI1575 is not set
162 154
163# 155#
164# Kernel options 156# Kernel options
@@ -188,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
188CONFIG_SPLIT_PTLOCK_CPUS=4 180CONFIG_SPLIT_PTLOCK_CPUS=4
189# CONFIG_RESOURCES_64BIT is not set 181# CONFIG_RESOURCES_64BIT is not set
190CONFIG_ZONE_DMA_FLAG=1 182CONFIG_ZONE_DMA_FLAG=1
183CONFIG_BOUNCE=y
184CONFIG_VIRT_TO_BUS=y
191CONFIG_PROC_DEVICETREE=y 185CONFIG_PROC_DEVICETREE=y
192# CONFIG_CMDLINE_BOOL is not set 186# CONFIG_CMDLINE_BOOL is not set
193# CONFIG_PM is not set 187# CONFIG_PM is not set
@@ -202,10 +196,10 @@ CONFIG_ISA_DMA_API=y
202CONFIG_ZONE_DMA=y 196CONFIG_ZONE_DMA=y
203CONFIG_GENERIC_ISA_DMA=y 197CONFIG_GENERIC_ISA_DMA=y
204CONFIG_PPC_INDIRECT_PCI=y 198CONFIG_PPC_INDIRECT_PCI=y
205# CONFIG_PPC_INDIRECT_PCI_BE is not set
206CONFIG_FSL_SOC=y 199CONFIG_FSL_SOC=y
207CONFIG_PCI=y 200CONFIG_PCI=y
208CONFIG_PCI_DOMAINS=y 201CONFIG_PCI_DOMAINS=y
202CONFIG_PCI_SYSCALL=y
209# CONFIG_PCIEPORTBUS is not set 203# CONFIG_PCIEPORTBUS is not set
210CONFIG_ARCH_SUPPORTS_MSI=y 204CONFIG_ARCH_SUPPORTS_MSI=y
211# CONFIG_PCI_MSI is not set 205# CONFIG_PCI_MSI is not set
@@ -315,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_MAC80211 is not set 309# CONFIG_MAC80211 is not set
316# CONFIG_IEEE80211 is not set 310# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set 311# CONFIG_RFKILL is not set
312# CONFIG_NET_9P is not set
318 313
319# 314#
320# Device Drivers 315# Device Drivers
@@ -327,26 +322,11 @@ CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 322CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set 323# CONFIG_FW_LOADER is not set
329# CONFIG_SYS_HYPERVISOR is not set 324# CONFIG_SYS_HYPERVISOR is not set
330
331#
332# Connector - unified userspace <-> kernelspace linker
333#
334# CONFIG_CONNECTOR is not set 325# CONFIG_CONNECTOR is not set
335# CONFIG_MTD is not set 326# CONFIG_MTD is not set
336 327CONFIG_OF_DEVICE=y
337#
338# Parallel port support
339#
340# CONFIG_PARPORT is not set 328# CONFIG_PARPORT is not set
341 329CONFIG_BLK_DEV=y
342#
343# Plug and Play support
344#
345# CONFIG_PNPACPI is not set
346
347#
348# Block devices
349#
350# CONFIG_BLK_DEV_FD is not set 330# CONFIG_BLK_DEV_FD is not set
351# CONFIG_BLK_CPQ_DA is not set 331# CONFIG_BLK_CPQ_DA is not set
352# CONFIG_BLK_CPQ_CISS_DA is not set 332# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -363,14 +343,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
363CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 343CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
364# CONFIG_CDROM_PKTCDVD is not set 344# CONFIG_CDROM_PKTCDVD is not set
365# CONFIG_ATA_OVER_ETH is not set 345# CONFIG_ATA_OVER_ETH is not set
366 346CONFIG_MISC_DEVICES=y
367#
368# Misc devices
369#
370# CONFIG_PHANTOM is not set 347# CONFIG_PHANTOM is not set
348# CONFIG_EEPROM_93CX6 is not set
371# CONFIG_SGI_IOC4 is not set 349# CONFIG_SGI_IOC4 is not set
372# CONFIG_TIFM_CORE is not set 350# CONFIG_TIFM_CORE is not set
373# CONFIG_BLINK is not set
374# CONFIG_IDE is not set 351# CONFIG_IDE is not set
375 352
376# 353#
@@ -378,6 +355,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
378# 355#
379# CONFIG_RAID_ATTRS is not set 356# CONFIG_RAID_ATTRS is not set
380CONFIG_SCSI=y 357CONFIG_SCSI=y
358CONFIG_SCSI_DMA=y
381# CONFIG_SCSI_TGT is not set 359# CONFIG_SCSI_TGT is not set
382# CONFIG_SCSI_NETLINK is not set 360# CONFIG_SCSI_NETLINK is not set
383CONFIG_SCSI_PROC_FS=y 361CONFIG_SCSI_PROC_FS=y
@@ -407,12 +385,8 @@ CONFIG_SCSI_WAIT_SCAN=m
407# CONFIG_SCSI_SPI_ATTRS is not set 385# CONFIG_SCSI_SPI_ATTRS is not set
408# CONFIG_SCSI_FC_ATTRS is not set 386# CONFIG_SCSI_FC_ATTRS is not set
409# CONFIG_SCSI_ISCSI_ATTRS is not set 387# CONFIG_SCSI_ISCSI_ATTRS is not set
410# CONFIG_SCSI_SAS_ATTRS is not set
411# CONFIG_SCSI_SAS_LIBSAS is not set 388# CONFIG_SCSI_SAS_LIBSAS is not set
412 389CONFIG_SCSI_LOWLEVEL=y
413#
414# SCSI low-level drivers
415#
416# CONFIG_ISCSI_TCP is not set 390# CONFIG_ISCSI_TCP is not set
417# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 391# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
418# CONFIG_SCSI_3W_9XXX is not set 392# CONFIG_SCSI_3W_9XXX is not set
@@ -448,10 +422,6 @@ CONFIG_SCSI_WAIT_SCAN=m
448# CONFIG_SCSI_DEBUG is not set 422# CONFIG_SCSI_DEBUG is not set
449# CONFIG_SCSI_SRP is not set 423# CONFIG_SCSI_SRP is not set
450# CONFIG_ATA is not set 424# CONFIG_ATA is not set
451
452#
453# Multi-device support (RAID and LVM)
454#
455# CONFIG_MD is not set 425# CONFIG_MD is not set
456 426
457# 427#
@@ -467,19 +437,13 @@ CONFIG_SCSI_WAIT_SCAN=m
467# 437#
468# CONFIG_FIREWIRE is not set 438# CONFIG_FIREWIRE is not set
469# CONFIG_IEEE1394 is not set 439# CONFIG_IEEE1394 is not set
470
471#
472# I2O device support
473#
474# CONFIG_I2O is not set 440# CONFIG_I2O is not set
475# CONFIG_MACINTOSH_DRIVERS is not set 441# CONFIG_MACINTOSH_DRIVERS is not set
476
477#
478# Network device support
479#
480CONFIG_NETDEVICES=y 442CONFIG_NETDEVICES=y
443# CONFIG_NETDEVICES_MULTIQUEUE is not set
481# CONFIG_DUMMY is not set 444# CONFIG_DUMMY is not set
482# CONFIG_BONDING is not set 445# CONFIG_BONDING is not set
446# CONFIG_MACVLAN is not set
483# CONFIG_EQUALIZER is not set 447# CONFIG_EQUALIZER is not set
484# CONFIG_TUN is not set 448# CONFIG_TUN is not set
485# CONFIG_ARCNET is not set 449# CONFIG_ARCNET is not set
@@ -496,21 +460,14 @@ CONFIG_DAVICOM_PHY=y
496# CONFIG_VITESSE_PHY is not set 460# CONFIG_VITESSE_PHY is not set
497# CONFIG_SMSC_PHY is not set 461# CONFIG_SMSC_PHY is not set
498# CONFIG_BROADCOM_PHY is not set 462# CONFIG_BROADCOM_PHY is not set
463# CONFIG_ICPLUS_PHY is not set
499# CONFIG_FIXED_PHY is not set 464# CONFIG_FIXED_PHY is not set
500
501#
502# Ethernet (10 or 100Mbit)
503#
504CONFIG_NET_ETHERNET=y 465CONFIG_NET_ETHERNET=y
505CONFIG_MII=y 466CONFIG_MII=y
506# CONFIG_HAPPYMEAL is not set 467# CONFIG_HAPPYMEAL is not set
507# CONFIG_SUNGEM is not set 468# CONFIG_SUNGEM is not set
508# CONFIG_CASSINI is not set 469# CONFIG_CASSINI is not set
509# CONFIG_NET_VENDOR_3COM is not set 470# CONFIG_NET_VENDOR_3COM is not set
510
511#
512# Tulip family network device support
513#
514# CONFIG_NET_TULIP is not set 471# CONFIG_NET_TULIP is not set
515# CONFIG_HP100 is not set 472# CONFIG_HP100 is not set
516# CONFIG_NET_PCI is not set 473# CONFIG_NET_PCI is not set
@@ -525,7 +482,6 @@ CONFIG_NETDEV_1000=y
525# CONFIG_SIS190 is not set 482# CONFIG_SIS190 is not set
526# CONFIG_SKGE is not set 483# CONFIG_SKGE is not set
527# CONFIG_SKY2 is not set 484# CONFIG_SKY2 is not set
528# CONFIG_SK98LIN is not set
529# CONFIG_VIA_VELOCITY is not set 485# CONFIG_VIA_VELOCITY is not set
530# CONFIG_TIGON3 is not set 486# CONFIG_TIGON3 is not set
531# CONFIG_BNX2 is not set 487# CONFIG_BNX2 is not set
@@ -562,15 +518,7 @@ CONFIG_NETDEV_10000=y
562# CONFIG_NETCONSOLE is not set 518# CONFIG_NETCONSOLE is not set
563# CONFIG_NETPOLL is not set 519# CONFIG_NETPOLL is not set
564# CONFIG_NET_POLL_CONTROLLER is not set 520# CONFIG_NET_POLL_CONTROLLER is not set
565
566#
567# ISDN subsystem
568#
569# CONFIG_ISDN is not set 521# CONFIG_ISDN is not set
570
571#
572# Telephony Support
573#
574# CONFIG_PHONE is not set 522# CONFIG_PHONE is not set
575 523
576# 524#
@@ -632,10 +580,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
632CONFIG_UNIX98_PTYS=y 580CONFIG_UNIX98_PTYS=y
633CONFIG_LEGACY_PTYS=y 581CONFIG_LEGACY_PTYS=y
634CONFIG_LEGACY_PTY_COUNT=256 582CONFIG_LEGACY_PTY_COUNT=256
635
636#
637# IPMI
638#
639# CONFIG_IPMI_HANDLER is not set 583# CONFIG_IPMI_HANDLER is not set
640CONFIG_WATCHDOG=y 584CONFIG_WATCHDOG=y
641# CONFIG_WATCHDOG_NOWAYOUT is not set 585# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -660,10 +604,6 @@ CONFIG_GEN_RTC=y
660# CONFIG_AGP is not set 604# CONFIG_AGP is not set
661# CONFIG_DRM is not set 605# CONFIG_DRM is not set
662# CONFIG_RAW_DRIVER is not set 606# CONFIG_RAW_DRIVER is not set
663
664#
665# TPM devices
666#
667# CONFIG_TCG_TPM is not set 607# CONFIG_TCG_TPM is not set
668CONFIG_DEVPORT=y 608CONFIG_DEVPORT=y
669CONFIG_I2C=y 609CONFIG_I2C=y
@@ -698,6 +638,7 @@ CONFIG_I2C_MPC=y
698# CONFIG_I2C_SIS5595 is not set 638# CONFIG_I2C_SIS5595 is not set
699# CONFIG_I2C_SIS630 is not set 639# CONFIG_I2C_SIS630 is not set
700# CONFIG_I2C_SIS96X is not set 640# CONFIG_I2C_SIS96X is not set
641# CONFIG_I2C_TAOS_EVM is not set
701# CONFIG_I2C_STUB is not set 642# CONFIG_I2C_STUB is not set
702# CONFIG_I2C_VIA is not set 643# CONFIG_I2C_VIA is not set
703# CONFIG_I2C_VIAPRO is not set 644# CONFIG_I2C_VIAPRO is not set
@@ -708,12 +649,14 @@ CONFIG_I2C_MPC=y
708# 649#
709# CONFIG_SENSORS_DS1337 is not set 650# CONFIG_SENSORS_DS1337 is not set
710# CONFIG_SENSORS_DS1374 is not set 651# CONFIG_SENSORS_DS1374 is not set
652# CONFIG_DS1682 is not set
711# CONFIG_SENSORS_EEPROM is not set 653# CONFIG_SENSORS_EEPROM is not set
712# CONFIG_SENSORS_PCF8574 is not set 654# CONFIG_SENSORS_PCF8574 is not set
713# CONFIG_SENSORS_PCA9539 is not set 655# CONFIG_SENSORS_PCA9539 is not set
714# CONFIG_SENSORS_PCF8591 is not set 656# CONFIG_SENSORS_PCF8591 is not set
715# CONFIG_SENSORS_M41T00 is not set 657# CONFIG_SENSORS_M41T00 is not set
716# CONFIG_SENSORS_MAX6875 is not set 658# CONFIG_SENSORS_MAX6875 is not set
659# CONFIG_SENSORS_TSL2550 is not set
717# CONFIG_I2C_DEBUG_CORE is not set 660# CONFIG_I2C_DEBUG_CORE is not set
718# CONFIG_I2C_DEBUG_ALGO is not set 661# CONFIG_I2C_DEBUG_ALGO is not set
719# CONFIG_I2C_DEBUG_BUS is not set 662# CONFIG_I2C_DEBUG_BUS is not set
@@ -724,14 +667,12 @@ CONFIG_I2C_MPC=y
724# 667#
725# CONFIG_SPI is not set 668# CONFIG_SPI is not set
726# CONFIG_SPI_MASTER is not set 669# CONFIG_SPI_MASTER is not set
727
728#
729# Dallas's 1-wire bus
730#
731# CONFIG_W1 is not set 670# CONFIG_W1 is not set
671# CONFIG_POWER_SUPPLY is not set
732CONFIG_HWMON=y 672CONFIG_HWMON=y
733# CONFIG_HWMON_VID is not set 673# CONFIG_HWMON_VID is not set
734# CONFIG_SENSORS_ABITUGURU is not set 674# CONFIG_SENSORS_ABITUGURU is not set
675# CONFIG_SENSORS_ABITUGURU3 is not set
735# CONFIG_SENSORS_AD7418 is not set 676# CONFIG_SENSORS_AD7418 is not set
736# CONFIG_SENSORS_ADM1021 is not set 677# CONFIG_SENSORS_ADM1021 is not set
737# CONFIG_SENSORS_ADM1025 is not set 678# CONFIG_SENSORS_ADM1025 is not set
@@ -758,14 +699,17 @@ CONFIG_HWMON=y
758# CONFIG_SENSORS_LM87 is not set 699# CONFIG_SENSORS_LM87 is not set
759# CONFIG_SENSORS_LM90 is not set 700# CONFIG_SENSORS_LM90 is not set
760# CONFIG_SENSORS_LM92 is not set 701# CONFIG_SENSORS_LM92 is not set
702# CONFIG_SENSORS_LM93 is not set
761# CONFIG_SENSORS_MAX1619 is not set 703# CONFIG_SENSORS_MAX1619 is not set
762# CONFIG_SENSORS_MAX6650 is not set 704# CONFIG_SENSORS_MAX6650 is not set
763# CONFIG_SENSORS_PC87360 is not set 705# CONFIG_SENSORS_PC87360 is not set
764# CONFIG_SENSORS_PC87427 is not set 706# CONFIG_SENSORS_PC87427 is not set
765# CONFIG_SENSORS_SIS5595 is not set 707# CONFIG_SENSORS_SIS5595 is not set
708# CONFIG_SENSORS_DME1737 is not set
766# CONFIG_SENSORS_SMSC47M1 is not set 709# CONFIG_SENSORS_SMSC47M1 is not set
767# CONFIG_SENSORS_SMSC47M192 is not set 710# CONFIG_SENSORS_SMSC47M192 is not set
768# CONFIG_SENSORS_SMSC47B397 is not set 711# CONFIG_SENSORS_SMSC47B397 is not set
712# CONFIG_SENSORS_THMC50 is not set
769# CONFIG_SENSORS_VIA686A is not set 713# CONFIG_SENSORS_VIA686A is not set
770# CONFIG_SENSORS_VT1211 is not set 714# CONFIG_SENSORS_VT1211 is not set
771# CONFIG_SENSORS_VT8231 is not set 715# CONFIG_SENSORS_VT8231 is not set
@@ -800,6 +744,7 @@ CONFIG_DAB=y
800# 744#
801# CONFIG_DISPLAY_SUPPORT is not set 745# CONFIG_DISPLAY_SUPPORT is not set
802# CONFIG_VGASTATE is not set 746# CONFIG_VGASTATE is not set
747CONFIG_VIDEO_OUTPUT_CONTROL=m
803# CONFIG_FB is not set 748# CONFIG_FB is not set
804# CONFIG_FB_IBM_GXT4500 is not set 749# CONFIG_FB_IBM_GXT4500 is not set
805 750
@@ -807,16 +752,10 @@ CONFIG_DAB=y
807# Sound 752# Sound
808# 753#
809# CONFIG_SOUND is not set 754# CONFIG_SOUND is not set
810 755CONFIG_HID_SUPPORT=y
811#
812# HID Devices
813#
814CONFIG_HID=y 756CONFIG_HID=y
815# CONFIG_HID_DEBUG is not set 757# CONFIG_HID_DEBUG is not set
816 758CONFIG_USB_SUPPORT=y
817#
818# USB support
819#
820CONFIG_USB_ARCH_HAS_HCD=y 759CONFIG_USB_ARCH_HAS_HCD=y
821CONFIG_USB_ARCH_HAS_OHCI=y 760CONFIG_USB_ARCH_HAS_OHCI=y
822CONFIG_USB_ARCH_HAS_EHCI=y 761CONFIG_USB_ARCH_HAS_EHCI=y
@@ -831,32 +770,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
831# 770#
832# CONFIG_USB_GADGET is not set 771# CONFIG_USB_GADGET is not set
833# CONFIG_MMC is not set 772# CONFIG_MMC is not set
834
835#
836# LED devices
837#
838# CONFIG_NEW_LEDS is not set 773# CONFIG_NEW_LEDS is not set
839
840#
841# LED drivers
842#
843
844#
845# LED Triggers
846#
847
848#
849# InfiniBand support
850#
851# CONFIG_INFINIBAND is not set 774# CONFIG_INFINIBAND is not set
852 775# CONFIG_EDAC is not set
853#
854# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
855#
856
857#
858# Real Time Clock
859#
860# CONFIG_RTC_CLASS is not set 776# CONFIG_RTC_CLASS is not set
861 777
862# 778#
@@ -873,6 +789,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
873# 789#
874 790
875# 791#
792# Userspace I/O
793#
794# CONFIG_UIO is not set
795
796#
876# File systems 797# File systems
877# 798#
878CONFIG_EXT2_FS=y 799CONFIG_EXT2_FS=y
@@ -968,7 +889,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
968# CONFIG_NCP_FS is not set 889# CONFIG_NCP_FS is not set
969# CONFIG_CODA_FS is not set 890# CONFIG_CODA_FS is not set
970# CONFIG_AFS_FS is not set 891# CONFIG_AFS_FS is not set
971# CONFIG_9P_FS is not set
972 892
973# 893#
974# Partition Types 894# Partition Types
@@ -1009,6 +929,7 @@ CONFIG_BITREVERSE=y
1009# CONFIG_CRC16 is not set 929# CONFIG_CRC16 is not set
1010# CONFIG_CRC_ITU_T is not set 930# CONFIG_CRC_ITU_T is not set
1011CONFIG_CRC32=y 931CONFIG_CRC32=y
932# CONFIG_CRC7 is not set
1012# CONFIG_LIBCRC32C is not set 933# CONFIG_LIBCRC32C is not set
1013CONFIG_PLIST=y 934CONFIG_PLIST=y
1014CONFIG_HAS_IOMEM=y 935CONFIG_HAS_IOMEM=y
@@ -1031,7 +952,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1031# CONFIG_HEADERS_CHECK is not set 952# CONFIG_HEADERS_CHECK is not set
1032# CONFIG_DEBUG_KERNEL is not set 953# CONFIG_DEBUG_KERNEL is not set
1033# CONFIG_DEBUG_BUGVERBOSE is not set 954# CONFIG_DEBUG_BUGVERBOSE is not set
1034# CONFIG_BOOTX_TEXT is not set
1035# CONFIG_PPC_EARLY_DEBUG is not set 955# CONFIG_PPC_EARLY_DEBUG is not set
1036 956
1037# 957#
@@ -1039,10 +959,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1039# 959#
1040# CONFIG_KEYS is not set 960# CONFIG_KEYS is not set
1041# CONFIG_SECURITY is not set 961# CONFIG_SECURITY is not set
1042
1043#
1044# Cryptographic options
1045#
1046CONFIG_CRYPTO=y 962CONFIG_CRYPTO=y
1047CONFIG_CRYPTO_ALGAPI=y 963CONFIG_CRYPTO_ALGAPI=y
1048CONFIG_CRYPTO_BLKCIPHER=y 964CONFIG_CRYPTO_BLKCIPHER=y
@@ -1080,7 +996,4 @@ CONFIG_CRYPTO_DES=y
1080# CONFIG_CRYPTO_CRC32C is not set 996# CONFIG_CRYPTO_CRC32C is not set
1081# CONFIG_CRYPTO_CAMELLIA is not set 997# CONFIG_CRYPTO_CAMELLIA is not set
1082# CONFIG_CRYPTO_TEST is not set 998# CONFIG_CRYPTO_TEST is not set
1083 999CONFIG_CRYPTO_HW=y
1084#
1085# Hardware crypto devices
1086#
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 6a83b66dd99e..6d1c3e842051 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:56 2007 4# Tue Aug 28 21:27:19 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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -159,6 +150,7 @@ CONFIG_PPC_MPC832x=y
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160CONFIG_QUICC_ENGINE=y 151CONFIG_QUICC_ENGINE=y
161# CONFIG_CPM2 is not set 152# CONFIG_CPM2 is not set
153# CONFIG_FSL_ULI1575 is not set
162 154
163# 155#
164# Kernel options 156# Kernel options
@@ -188,6 +180,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
188CONFIG_SPLIT_PTLOCK_CPUS=4 180CONFIG_SPLIT_PTLOCK_CPUS=4
189# CONFIG_RESOURCES_64BIT is not set 181# CONFIG_RESOURCES_64BIT is not set
190CONFIG_ZONE_DMA_FLAG=1 182CONFIG_ZONE_DMA_FLAG=1
183CONFIG_BOUNCE=y
184CONFIG_VIRT_TO_BUS=y
191CONFIG_PROC_DEVICETREE=y 185CONFIG_PROC_DEVICETREE=y
192# CONFIG_CMDLINE_BOOL is not set 186# CONFIG_CMDLINE_BOOL is not set
193# CONFIG_PM is not set 187# CONFIG_PM is not set
@@ -202,10 +196,10 @@ CONFIG_ISA_DMA_API=y
202CONFIG_ZONE_DMA=y 196CONFIG_ZONE_DMA=y
203CONFIG_GENERIC_ISA_DMA=y 197CONFIG_GENERIC_ISA_DMA=y
204CONFIG_PPC_INDIRECT_PCI=y 198CONFIG_PPC_INDIRECT_PCI=y
205# CONFIG_PPC_INDIRECT_PCI_BE is not set
206CONFIG_FSL_SOC=y 199CONFIG_FSL_SOC=y
207CONFIG_PCI=y 200CONFIG_PCI=y
208CONFIG_PCI_DOMAINS=y 201CONFIG_PCI_DOMAINS=y
202CONFIG_PCI_SYSCALL=y
209# CONFIG_PCIEPORTBUS is not set 203# CONFIG_PCIEPORTBUS is not set
210CONFIG_ARCH_SUPPORTS_MSI=y 204CONFIG_ARCH_SUPPORTS_MSI=y
211# CONFIG_PCI_MSI is not set 205# CONFIG_PCI_MSI is not set
@@ -315,6 +309,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_MAC80211 is not set 309# CONFIG_MAC80211 is not set
316# CONFIG_IEEE80211 is not set 310# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set 311# CONFIG_RFKILL is not set
312# CONFIG_NET_9P is not set
318 313
319# 314#
320# Device Drivers 315# Device Drivers
@@ -327,26 +322,11 @@ CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 322CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set 323# CONFIG_FW_LOADER is not set
329# CONFIG_SYS_HYPERVISOR is not set 324# CONFIG_SYS_HYPERVISOR is not set
330
331#
332# Connector - unified userspace <-> kernelspace linker
333#
334# CONFIG_CONNECTOR is not set 325# CONFIG_CONNECTOR is not set
335# CONFIG_MTD is not set 326# CONFIG_MTD is not set
336 327CONFIG_OF_DEVICE=y
337#
338# Parallel port support
339#
340# CONFIG_PARPORT is not set 328# CONFIG_PARPORT is not set
341 329CONFIG_BLK_DEV=y
342#
343# Plug and Play support
344#
345# CONFIG_PNPACPI is not set
346
347#
348# Block devices
349#
350# CONFIG_BLK_DEV_FD is not set 330# CONFIG_BLK_DEV_FD is not set
351# CONFIG_BLK_CPQ_DA is not set 331# CONFIG_BLK_CPQ_DA is not set
352# CONFIG_BLK_CPQ_CISS_DA is not set 332# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,14 +344,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
364CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 344CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
365# CONFIG_CDROM_PKTCDVD is not set 345# CONFIG_CDROM_PKTCDVD is not set
366# CONFIG_ATA_OVER_ETH is not set 346# CONFIG_ATA_OVER_ETH is not set
367 347CONFIG_MISC_DEVICES=y
368#
369# Misc devices
370#
371# CONFIG_PHANTOM is not set 348# CONFIG_PHANTOM is not set
349# CONFIG_EEPROM_93CX6 is not set
372# CONFIG_SGI_IOC4 is not set 350# CONFIG_SGI_IOC4 is not set
373# CONFIG_TIFM_CORE is not set 351# CONFIG_TIFM_CORE is not set
374# CONFIG_BLINK is not set
375# CONFIG_IDE is not set 352# CONFIG_IDE is not set
376 353
377# 354#
@@ -379,6 +356,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
379# 356#
380# CONFIG_RAID_ATTRS is not set 357# CONFIG_RAID_ATTRS is not set
381CONFIG_SCSI=y 358CONFIG_SCSI=y
359CONFIG_SCSI_DMA=y
382# CONFIG_SCSI_TGT is not set 360# CONFIG_SCSI_TGT is not set
383# CONFIG_SCSI_NETLINK is not set 361# CONFIG_SCSI_NETLINK is not set
384CONFIG_SCSI_PROC_FS=y 362CONFIG_SCSI_PROC_FS=y
@@ -408,12 +386,8 @@ CONFIG_SCSI_WAIT_SCAN=m
408# CONFIG_SCSI_SPI_ATTRS is not set 386# CONFIG_SCSI_SPI_ATTRS is not set
409# CONFIG_SCSI_FC_ATTRS is not set 387# CONFIG_SCSI_FC_ATTRS is not set
410# CONFIG_SCSI_ISCSI_ATTRS is not set 388# CONFIG_SCSI_ISCSI_ATTRS is not set
411# CONFIG_SCSI_SAS_ATTRS is not set
412# CONFIG_SCSI_SAS_LIBSAS is not set 389# CONFIG_SCSI_SAS_LIBSAS is not set
413 390CONFIG_SCSI_LOWLEVEL=y
414#
415# SCSI low-level drivers
416#
417# CONFIG_ISCSI_TCP is not set 391# CONFIG_ISCSI_TCP is not set
418# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 392# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
419# CONFIG_SCSI_3W_9XXX is not set 393# CONFIG_SCSI_3W_9XXX is not set
@@ -449,10 +423,6 @@ CONFIG_SCSI_WAIT_SCAN=m
449# CONFIG_SCSI_DEBUG is not set 423# CONFIG_SCSI_DEBUG is not set
450# CONFIG_SCSI_SRP is not set 424# CONFIG_SCSI_SRP is not set
451# CONFIG_ATA is not set 425# CONFIG_ATA is not set
452
453#
454# Multi-device support (RAID and LVM)
455#
456# CONFIG_MD is not set 426# CONFIG_MD is not set
457 427
458# 428#
@@ -468,19 +438,13 @@ CONFIG_SCSI_WAIT_SCAN=m
468# 438#
469# CONFIG_FIREWIRE is not set 439# CONFIG_FIREWIRE is not set
470# CONFIG_IEEE1394 is not set 440# CONFIG_IEEE1394 is not set
471
472#
473# I2O device support
474#
475# CONFIG_I2O is not set 441# CONFIG_I2O is not set
476# CONFIG_MACINTOSH_DRIVERS is not set 442# CONFIG_MACINTOSH_DRIVERS is not set
477
478#
479# Network device support
480#
481CONFIG_NETDEVICES=y 443CONFIG_NETDEVICES=y
444# CONFIG_NETDEVICES_MULTIQUEUE is not set
482# CONFIG_DUMMY is not set 445# CONFIG_DUMMY is not set
483# CONFIG_BONDING is not set 446# CONFIG_BONDING is not set
447# CONFIG_MACVLAN is not set
484# CONFIG_EQUALIZER is not set 448# CONFIG_EQUALIZER is not set
485# CONFIG_TUN is not set 449# CONFIG_TUN is not set
486# CONFIG_ARCNET is not set 450# CONFIG_ARCNET is not set
@@ -497,21 +461,14 @@ CONFIG_PHYLIB=y
497# CONFIG_VITESSE_PHY is not set 461# CONFIG_VITESSE_PHY is not set
498# CONFIG_SMSC_PHY is not set 462# CONFIG_SMSC_PHY is not set
499# CONFIG_BROADCOM_PHY is not set 463# CONFIG_BROADCOM_PHY is not set
464CONFIG_ICPLUS_PHY=y
500# CONFIG_FIXED_PHY is not set 465# CONFIG_FIXED_PHY is not set
501
502#
503# Ethernet (10 or 100Mbit)
504#
505CONFIG_NET_ETHERNET=y 466CONFIG_NET_ETHERNET=y
506CONFIG_MII=y 467CONFIG_MII=y
507# CONFIG_HAPPYMEAL is not set 468# CONFIG_HAPPYMEAL is not set
508# CONFIG_SUNGEM is not set 469# CONFIG_SUNGEM is not set
509# CONFIG_CASSINI is not set 470# CONFIG_CASSINI is not set
510# CONFIG_NET_VENDOR_3COM is not set 471# CONFIG_NET_VENDOR_3COM is not set
511
512#
513# Tulip family network device support
514#
515# CONFIG_NET_TULIP is not set 472# CONFIG_NET_TULIP is not set
516# CONFIG_HP100 is not set 473# CONFIG_HP100 is not set
517# CONFIG_NET_PCI is not set 474# CONFIG_NET_PCI is not set
@@ -528,7 +485,6 @@ CONFIG_E1000=y
528# CONFIG_SIS190 is not set 485# CONFIG_SIS190 is not set
529# CONFIG_SKGE is not set 486# CONFIG_SKGE is not set
530# CONFIG_SKY2 is not set 487# CONFIG_SKY2 is not set
531# CONFIG_SK98LIN is not set
532# CONFIG_VIA_VELOCITY is not set 488# CONFIG_VIA_VELOCITY is not set
533# CONFIG_TIGON3 is not set 489# CONFIG_TIGON3 is not set
534# CONFIG_BNX2 is not set 490# CONFIG_BNX2 is not set
@@ -575,15 +531,7 @@ CONFIG_NETDEV_10000=y
575# CONFIG_NETCONSOLE is not set 531# CONFIG_NETCONSOLE is not set
576# CONFIG_NETPOLL is not set 532# CONFIG_NETPOLL is not set
577# CONFIG_NET_POLL_CONTROLLER is not set 533# CONFIG_NET_POLL_CONTROLLER is not set
578
579#
580# ISDN subsystem
581#
582# CONFIG_ISDN is not set 534# CONFIG_ISDN is not set
583
584#
585# Telephony Support
586#
587# CONFIG_PHONE is not set 535# CONFIG_PHONE is not set
588 536
589# 537#
@@ -645,10 +593,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
645CONFIG_UNIX98_PTYS=y 593CONFIG_UNIX98_PTYS=y
646CONFIG_LEGACY_PTYS=y 594CONFIG_LEGACY_PTYS=y
647CONFIG_LEGACY_PTY_COUNT=256 595CONFIG_LEGACY_PTY_COUNT=256
648
649#
650# IPMI
651#
652# CONFIG_IPMI_HANDLER is not set 596# CONFIG_IPMI_HANDLER is not set
653CONFIG_WATCHDOG=y 597CONFIG_WATCHDOG=y
654# CONFIG_WATCHDOG_NOWAYOUT is not set 598# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -678,10 +622,6 @@ CONFIG_GEN_RTC=y
678# CONFIG_AGP is not set 622# CONFIG_AGP is not set
679# CONFIG_DRM is not set 623# CONFIG_DRM is not set
680# CONFIG_RAW_DRIVER is not set 624# CONFIG_RAW_DRIVER is not set
681
682#
683# TPM devices
684#
685# CONFIG_TCG_TPM is not set 625# CONFIG_TCG_TPM is not set
686CONFIG_DEVPORT=y 626CONFIG_DEVPORT=y
687CONFIG_I2C=y 627CONFIG_I2C=y
@@ -716,6 +656,7 @@ CONFIG_I2C_MPC=y
716# CONFIG_I2C_SIS5595 is not set 656# CONFIG_I2C_SIS5595 is not set
717# CONFIG_I2C_SIS630 is not set 657# CONFIG_I2C_SIS630 is not set
718# CONFIG_I2C_SIS96X is not set 658# CONFIG_I2C_SIS96X is not set
659# CONFIG_I2C_TAOS_EVM is not set
719# CONFIG_I2C_STUB is not set 660# CONFIG_I2C_STUB is not set
720# CONFIG_I2C_TINY_USB is not set 661# CONFIG_I2C_TINY_USB is not set
721# CONFIG_I2C_VIA is not set 662# CONFIG_I2C_VIA is not set
@@ -727,12 +668,14 @@ CONFIG_I2C_MPC=y
727# 668#
728# CONFIG_SENSORS_DS1337 is not set 669# CONFIG_SENSORS_DS1337 is not set
729# CONFIG_SENSORS_DS1374 is not set 670# CONFIG_SENSORS_DS1374 is not set
671# CONFIG_DS1682 is not set
730# CONFIG_SENSORS_EEPROM is not set 672# CONFIG_SENSORS_EEPROM is not set
731# CONFIG_SENSORS_PCF8574 is not set 673# CONFIG_SENSORS_PCF8574 is not set
732# CONFIG_SENSORS_PCA9539 is not set 674# CONFIG_SENSORS_PCA9539 is not set
733# CONFIG_SENSORS_PCF8591 is not set 675# CONFIG_SENSORS_PCF8591 is not set
734# CONFIG_SENSORS_M41T00 is not set 676# CONFIG_SENSORS_M41T00 is not set
735# CONFIG_SENSORS_MAX6875 is not set 677# CONFIG_SENSORS_MAX6875 is not set
678# CONFIG_SENSORS_TSL2550 is not set
736# CONFIG_I2C_DEBUG_CORE is not set 679# CONFIG_I2C_DEBUG_CORE is not set
737# CONFIG_I2C_DEBUG_ALGO is not set 680# CONFIG_I2C_DEBUG_ALGO is not set
738# CONFIG_I2C_DEBUG_BUS is not set 681# CONFIG_I2C_DEBUG_BUS is not set
@@ -743,14 +686,12 @@ CONFIG_I2C_MPC=y
743# 686#
744# CONFIG_SPI is not set 687# CONFIG_SPI is not set
745# CONFIG_SPI_MASTER is not set 688# CONFIG_SPI_MASTER is not set
746
747#
748# Dallas's 1-wire bus
749#
750# CONFIG_W1 is not set 689# CONFIG_W1 is not set
690# CONFIG_POWER_SUPPLY is not set
751CONFIG_HWMON=y 691CONFIG_HWMON=y
752# CONFIG_HWMON_VID is not set 692# CONFIG_HWMON_VID is not set
753# CONFIG_SENSORS_ABITUGURU is not set 693# CONFIG_SENSORS_ABITUGURU is not set
694# CONFIG_SENSORS_ABITUGURU3 is not set
754# CONFIG_SENSORS_AD7418 is not set 695# CONFIG_SENSORS_AD7418 is not set
755# CONFIG_SENSORS_ADM1021 is not set 696# CONFIG_SENSORS_ADM1021 is not set
756# CONFIG_SENSORS_ADM1025 is not set 697# CONFIG_SENSORS_ADM1025 is not set
@@ -777,14 +718,17 @@ CONFIG_HWMON=y
777# CONFIG_SENSORS_LM87 is not set 718# CONFIG_SENSORS_LM87 is not set
778# CONFIG_SENSORS_LM90 is not set 719# CONFIG_SENSORS_LM90 is not set
779# CONFIG_SENSORS_LM92 is not set 720# CONFIG_SENSORS_LM92 is not set
721# CONFIG_SENSORS_LM93 is not set
780# CONFIG_SENSORS_MAX1619 is not set 722# CONFIG_SENSORS_MAX1619 is not set
781# CONFIG_SENSORS_MAX6650 is not set 723# CONFIG_SENSORS_MAX6650 is not set
782# CONFIG_SENSORS_PC87360 is not set 724# CONFIG_SENSORS_PC87360 is not set
783# CONFIG_SENSORS_PC87427 is not set 725# CONFIG_SENSORS_PC87427 is not set
784# CONFIG_SENSORS_SIS5595 is not set 726# CONFIG_SENSORS_SIS5595 is not set
727# CONFIG_SENSORS_DME1737 is not set
785# CONFIG_SENSORS_SMSC47M1 is not set 728# CONFIG_SENSORS_SMSC47M1 is not set
786# CONFIG_SENSORS_SMSC47M192 is not set 729# CONFIG_SENSORS_SMSC47M192 is not set
787# CONFIG_SENSORS_SMSC47B397 is not set 730# CONFIG_SENSORS_SMSC47B397 is not set
731# CONFIG_SENSORS_THMC50 is not set
788# CONFIG_SENSORS_VIA686A is not set 732# CONFIG_SENSORS_VIA686A is not set
789# CONFIG_SENSORS_VT1211 is not set 733# CONFIG_SENSORS_VT1211 is not set
790# CONFIG_SENSORS_VT8231 is not set 734# CONFIG_SENSORS_VT8231 is not set
@@ -820,6 +764,7 @@ CONFIG_DAB=y
820# 764#
821# CONFIG_DISPLAY_SUPPORT is not set 765# CONFIG_DISPLAY_SUPPORT is not set
822# CONFIG_VGASTATE is not set 766# CONFIG_VGASTATE is not set
767CONFIG_VIDEO_OUTPUT_CONTROL=m
823# CONFIG_FB is not set 768# CONFIG_FB is not set
824# CONFIG_FB_IBM_GXT4500 is not set 769# CONFIG_FB_IBM_GXT4500 is not set
825 770
@@ -827,10 +772,7 @@ CONFIG_DAB=y
827# Sound 772# Sound
828# 773#
829# CONFIG_SOUND is not set 774# CONFIG_SOUND is not set
830 775CONFIG_HID_SUPPORT=y
831#
832# HID Devices
833#
834CONFIG_HID=y 776CONFIG_HID=y
835# CONFIG_HID_DEBUG is not set 777# CONFIG_HID_DEBUG is not set
836 778
@@ -844,10 +786,7 @@ CONFIG_HID=y
844# 786#
845# CONFIG_USB_KBD is not set 787# CONFIG_USB_KBD is not set
846# CONFIG_USB_MOUSE is not set 788# CONFIG_USB_MOUSE is not set
847 789CONFIG_USB_SUPPORT=y
848#
849# USB support
850#
851CONFIG_USB_ARCH_HAS_HCD=y 790CONFIG_USB_ARCH_HAS_HCD=y
852CONFIG_USB_ARCH_HAS_OHCI=y 791CONFIG_USB_ARCH_HAS_OHCI=y
853CONFIG_USB_ARCH_HAS_EHCI=y 792CONFIG_USB_ARCH_HAS_EHCI=y
@@ -869,7 +808,6 @@ CONFIG_USB_EHCI_HCD=y
869# CONFIG_USB_EHCI_SPLIT_ISO is not set 808# CONFIG_USB_EHCI_SPLIT_ISO is not set
870# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 809# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
871# CONFIG_USB_EHCI_TT_NEWSCHED is not set 810# CONFIG_USB_EHCI_TT_NEWSCHED is not set
872# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
873# CONFIG_USB_ISP116X_HCD is not set 811# CONFIG_USB_ISP116X_HCD is not set
874CONFIG_USB_OHCI_HCD=y 812CONFIG_USB_OHCI_HCD=y
875CONFIG_USB_OHCI_HCD_PPC_OF=y 813CONFIG_USB_OHCI_HCD_PPC_OF=y
@@ -881,6 +819,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
881CONFIG_USB_OHCI_LITTLE_ENDIAN=y 819CONFIG_USB_OHCI_LITTLE_ENDIAN=y
882# CONFIG_USB_UHCI_HCD is not set 820# CONFIG_USB_UHCI_HCD is not set
883# CONFIG_USB_SL811_HCD is not set 821# CONFIG_USB_SL811_HCD is not set
822# CONFIG_USB_R8A66597_HCD is not set
884 823
885# 824#
886# USB Device Class drivers 825# USB Device Class drivers
@@ -957,32 +896,9 @@ CONFIG_USB_MON=y
957# 896#
958# CONFIG_USB_GADGET is not set 897# CONFIG_USB_GADGET is not set
959# CONFIG_MMC is not set 898# CONFIG_MMC is not set
960
961#
962# LED devices
963#
964# CONFIG_NEW_LEDS is not set 899# CONFIG_NEW_LEDS is not set
965
966#
967# LED drivers
968#
969
970#
971# LED Triggers
972#
973
974#
975# InfiniBand support
976#
977# CONFIG_INFINIBAND is not set 900# CONFIG_INFINIBAND is not set
978 901# CONFIG_EDAC is not set
979#
980# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
981#
982
983#
984# Real Time Clock
985#
986# CONFIG_RTC_CLASS is not set 902# CONFIG_RTC_CLASS is not set
987 903
988# 904#
@@ -999,6 +915,11 @@ CONFIG_USB_MON=y
999# 915#
1000 916
1001# 917#
918# Userspace I/O
919#
920# CONFIG_UIO is not set
921
922#
1002# File systems 923# File systems
1003# 924#
1004CONFIG_EXT2_FS=y 925CONFIG_EXT2_FS=y
@@ -1097,7 +1018,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1097# CONFIG_NCP_FS is not set 1018# CONFIG_NCP_FS is not set
1098# CONFIG_CODA_FS is not set 1019# CONFIG_CODA_FS is not set
1099# CONFIG_AFS_FS is not set 1020# CONFIG_AFS_FS is not set
1100# CONFIG_9P_FS is not set
1101 1021
1102# 1022#
1103# Partition Types 1023# Partition Types
@@ -1182,6 +1102,7 @@ CONFIG_BITREVERSE=y
1182# CONFIG_CRC16 is not set 1102# CONFIG_CRC16 is not set
1183# CONFIG_CRC_ITU_T is not set 1103# CONFIG_CRC_ITU_T is not set
1184CONFIG_CRC32=y 1104CONFIG_CRC32=y
1105# CONFIG_CRC7 is not set
1185# CONFIG_LIBCRC32C is not set 1106# CONFIG_LIBCRC32C is not set
1186CONFIG_PLIST=y 1107CONFIG_PLIST=y
1187CONFIG_HAS_IOMEM=y 1108CONFIG_HAS_IOMEM=y
@@ -1204,7 +1125,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1204# CONFIG_HEADERS_CHECK is not set 1125# CONFIG_HEADERS_CHECK is not set
1205# CONFIG_DEBUG_KERNEL is not set 1126# CONFIG_DEBUG_KERNEL is not set
1206# CONFIG_DEBUG_BUGVERBOSE is not set 1127# CONFIG_DEBUG_BUGVERBOSE is not set
1207# CONFIG_BOOTX_TEXT is not set
1208# CONFIG_PPC_EARLY_DEBUG is not set 1128# CONFIG_PPC_EARLY_DEBUG is not set
1209 1129
1210# 1130#
@@ -1212,10 +1132,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1212# 1132#
1213# CONFIG_KEYS is not set 1133# CONFIG_KEYS is not set
1214# CONFIG_SECURITY is not set 1134# CONFIG_SECURITY is not set
1215
1216#
1217# Cryptographic options
1218#
1219CONFIG_CRYPTO=y 1135CONFIG_CRYPTO=y
1220CONFIG_CRYPTO_ALGAPI=y 1136CONFIG_CRYPTO_ALGAPI=y
1221CONFIG_CRYPTO_BLKCIPHER=y 1137CONFIG_CRYPTO_BLKCIPHER=y
@@ -1253,7 +1169,4 @@ CONFIG_CRYPTO_DES=y
1253# CONFIG_CRYPTO_CRC32C is not set 1169# CONFIG_CRYPTO_CRC32C is not set
1254# CONFIG_CRYPTO_CAMELLIA is not set 1170# CONFIG_CRYPTO_CAMELLIA is not set
1255# CONFIG_CRYPTO_TEST is not set 1171# CONFIG_CRYPTO_TEST is not set
1256 1172CONFIG_CRYPTO_HW=y
1257#
1258# Hardware crypto devices
1259#
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index 85470b8cae09..ddafa6b9af05 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:56 2007 4# Tue Aug 28 21:24: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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_MPC834x=y
158# CONFIG_GENERIC_IOMAP is not set 149# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set 151# CONFIG_CPM2 is not set
152# CONFIG_FSL_ULI1575 is not set
161 153
162# 154#
163# Kernel options 155# Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
186CONFIG_SPLIT_PTLOCK_CPUS=4 178CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_RESOURCES_64BIT is not set 179# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1 180CONFIG_ZONE_DMA_FLAG=1
181CONFIG_BOUNCE=y
182CONFIG_VIRT_TO_BUS=y
189CONFIG_PROC_DEVICETREE=y 183CONFIG_PROC_DEVICETREE=y
190# CONFIG_CMDLINE_BOOL is not set 184# CONFIG_CMDLINE_BOOL is not set
191# CONFIG_PM is not set 185# CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
200CONFIG_ZONE_DMA=y 194CONFIG_ZONE_DMA=y
201CONFIG_GENERIC_ISA_DMA=y 195CONFIG_GENERIC_ISA_DMA=y
202CONFIG_PPC_INDIRECT_PCI=y 196CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
204CONFIG_FSL_SOC=y 197CONFIG_FSL_SOC=y
205CONFIG_PCI=y 198CONFIG_PCI=y
206CONFIG_PCI_DOMAINS=y 199CONFIG_PCI_DOMAINS=y
200CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 201# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 202CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 203# CONFIG_PCI_MSI is not set
@@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
313# CONFIG_MAC80211 is not set 307# CONFIG_MAC80211 is not set
314# CONFIG_IEEE80211 is not set 308# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set 309# CONFIG_RFKILL is not set
310# CONFIG_NET_9P is not set
316 311
317# 312#
318# Device Drivers 313# Device Drivers
@@ -325,10 +320,6 @@ CONFIG_STANDALONE=y
325CONFIG_PREVENT_FIRMWARE_BUILD=y 320CONFIG_PREVENT_FIRMWARE_BUILD=y
326# CONFIG_FW_LOADER is not set 321# CONFIG_FW_LOADER is not set
327# CONFIG_SYS_HYPERVISOR is not set 322# CONFIG_SYS_HYPERVISOR is not set
328
329#
330# Connector - unified userspace <-> kernelspace linker
331#
332# CONFIG_CONNECTOR is not set 323# CONFIG_CONNECTOR is not set
333CONFIG_MTD=y 324CONFIG_MTD=y
334# CONFIG_MTD_DEBUG is not set 325# CONFIG_MTD_DEBUG is not set
@@ -408,20 +399,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
408# UBI - Unsorted block images 399# UBI - Unsorted block images
409# 400#
410# CONFIG_MTD_UBI is not set 401# CONFIG_MTD_UBI is not set
411 402CONFIG_OF_DEVICE=y
412#
413# Parallel port support
414#
415# CONFIG_PARPORT is not set 403# CONFIG_PARPORT is not set
416 404CONFIG_BLK_DEV=y
417#
418# Plug and Play support
419#
420# CONFIG_PNPACPI is not set
421
422#
423# Block devices
424#
425# CONFIG_BLK_DEV_FD is not set 405# CONFIG_BLK_DEV_FD is not set
426# CONFIG_BLK_CPQ_DA is not set 406# CONFIG_BLK_CPQ_DA is not set
427# CONFIG_BLK_CPQ_CISS_DA is not set 407# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -439,14 +419,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
439CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 419CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
440# CONFIG_CDROM_PKTCDVD is not set 420# CONFIG_CDROM_PKTCDVD is not set
441# CONFIG_ATA_OVER_ETH is not set 421# CONFIG_ATA_OVER_ETH is not set
442 422CONFIG_MISC_DEVICES=y
443#
444# Misc devices
445#
446# CONFIG_PHANTOM is not set 423# CONFIG_PHANTOM is not set
424# CONFIG_EEPROM_93CX6 is not set
447# CONFIG_SGI_IOC4 is not set 425# CONFIG_SGI_IOC4 is not set
448# CONFIG_TIFM_CORE is not set 426# CONFIG_TIFM_CORE is not set
449# CONFIG_BLINK is not set
450CONFIG_IDE=y 427CONFIG_IDE=y
451CONFIG_IDE_MAX_HWIFS=4 428CONFIG_IDE_MAX_HWIFS=4
452# CONFIG_BLK_DEV_IDE is not set 429# CONFIG_BLK_DEV_IDE is not set
@@ -458,6 +435,7 @@ CONFIG_IDE_MAX_HWIFS=4
458# 435#
459# CONFIG_RAID_ATTRS is not set 436# CONFIG_RAID_ATTRS is not set
460CONFIG_SCSI=y 437CONFIG_SCSI=y
438CONFIG_SCSI_DMA=y
461# CONFIG_SCSI_TGT is not set 439# CONFIG_SCSI_TGT is not set
462# CONFIG_SCSI_NETLINK is not set 440# CONFIG_SCSI_NETLINK is not set
463CONFIG_SCSI_PROC_FS=y 441CONFIG_SCSI_PROC_FS=y
@@ -487,12 +465,8 @@ CONFIG_SCSI_WAIT_SCAN=m
487CONFIG_SCSI_SPI_ATTRS=y 465CONFIG_SCSI_SPI_ATTRS=y
488# CONFIG_SCSI_FC_ATTRS is not set 466# CONFIG_SCSI_FC_ATTRS is not set
489# CONFIG_SCSI_ISCSI_ATTRS is not set 467# CONFIG_SCSI_ISCSI_ATTRS is not set
490# CONFIG_SCSI_SAS_ATTRS is not set
491# CONFIG_SCSI_SAS_LIBSAS is not set 468# CONFIG_SCSI_SAS_LIBSAS is not set
492 469CONFIG_SCSI_LOWLEVEL=y
493#
494# SCSI low-level drivers
495#
496# CONFIG_ISCSI_TCP is not set 470# CONFIG_ISCSI_TCP is not set
497# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 471# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
498# CONFIG_SCSI_3W_9XXX is not set 472# CONFIG_SCSI_3W_9XXX is not set
@@ -583,10 +557,6 @@ CONFIG_SATA_SIL=y
583# CONFIG_PATA_VIA is not set 557# CONFIG_PATA_VIA is not set
584# CONFIG_PATA_WINBOND is not set 558# CONFIG_PATA_WINBOND is not set
585# CONFIG_PATA_PLATFORM is not set 559# CONFIG_PATA_PLATFORM is not set
586
587#
588# Multi-device support (RAID and LVM)
589#
590CONFIG_MD=y 560CONFIG_MD=y
591CONFIG_BLK_DEV_MD=y 561CONFIG_BLK_DEV_MD=y
592CONFIG_MD_LINEAR=y 562CONFIG_MD_LINEAR=y
@@ -611,19 +581,13 @@ CONFIG_MD_RAID1=y
611# 581#
612# CONFIG_FIREWIRE is not set 582# CONFIG_FIREWIRE is not set
613# CONFIG_IEEE1394 is not set 583# CONFIG_IEEE1394 is not set
614
615#
616# I2O device support
617#
618# CONFIG_I2O is not set 584# CONFIG_I2O is not set
619# CONFIG_MACINTOSH_DRIVERS is not set 585# CONFIG_MACINTOSH_DRIVERS is not set
620
621#
622# Network device support
623#
624CONFIG_NETDEVICES=y 586CONFIG_NETDEVICES=y
587# CONFIG_NETDEVICES_MULTIQUEUE is not set
625# CONFIG_DUMMY is not set 588# CONFIG_DUMMY is not set
626# CONFIG_BONDING is not set 589# CONFIG_BONDING is not set
590# CONFIG_MACVLAN is not set
627# CONFIG_EQUALIZER is not set 591# CONFIG_EQUALIZER is not set
628# CONFIG_TUN is not set 592# CONFIG_TUN is not set
629# CONFIG_ARCNET is not set 593# CONFIG_ARCNET is not set
@@ -640,11 +604,8 @@ CONFIG_CICADA_PHY=y
640# CONFIG_VITESSE_PHY is not set 604# CONFIG_VITESSE_PHY is not set
641# CONFIG_SMSC_PHY is not set 605# CONFIG_SMSC_PHY is not set
642# CONFIG_BROADCOM_PHY is not set 606# CONFIG_BROADCOM_PHY is not set
607# CONFIG_ICPLUS_PHY is not set
643# CONFIG_FIXED_PHY is not set 608# CONFIG_FIXED_PHY is not set
644
645#
646# Ethernet (10 or 100Mbit)
647#
648# CONFIG_NET_ETHERNET is not set 609# CONFIG_NET_ETHERNET is not set
649CONFIG_NETDEV_1000=y 610CONFIG_NETDEV_1000=y
650# CONFIG_ACENIC is not set 611# CONFIG_ACENIC is not set
@@ -657,7 +618,6 @@ CONFIG_NETDEV_1000=y
657# CONFIG_SIS190 is not set 618# CONFIG_SIS190 is not set
658# CONFIG_SKGE is not set 619# CONFIG_SKGE is not set
659# CONFIG_SKY2 is not set 620# CONFIG_SKY2 is not set
660# CONFIG_SK98LIN is not set
661# CONFIG_VIA_VELOCITY is not set 621# CONFIG_VIA_VELOCITY is not set
662# CONFIG_TIGON3 is not set 622# CONFIG_TIGON3 is not set
663# CONFIG_BNX2 is not set 623# CONFIG_BNX2 is not set
@@ -700,15 +660,7 @@ CONFIG_NETDEV_10000=y
700# CONFIG_NETCONSOLE is not set 660# CONFIG_NETCONSOLE is not set
701# CONFIG_NETPOLL is not set 661# CONFIG_NETPOLL is not set
702# CONFIG_NET_POLL_CONTROLLER is not set 662# CONFIG_NET_POLL_CONTROLLER is not set
703
704#
705# ISDN subsystem
706#
707# CONFIG_ISDN is not set 663# CONFIG_ISDN is not set
708
709#
710# Telephony Support
711#
712# CONFIG_PHONE is not set 664# CONFIG_PHONE is not set
713 665
714# 666#
@@ -749,10 +701,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
749CONFIG_UNIX98_PTYS=y 701CONFIG_UNIX98_PTYS=y
750CONFIG_LEGACY_PTYS=y 702CONFIG_LEGACY_PTYS=y
751CONFIG_LEGACY_PTY_COUNT=256 703CONFIG_LEGACY_PTY_COUNT=256
752
753#
754# IPMI
755#
756# CONFIG_IPMI_HANDLER is not set 704# CONFIG_IPMI_HANDLER is not set
757CONFIG_WATCHDOG=y 705CONFIG_WATCHDOG=y
758# CONFIG_WATCHDOG_NOWAYOUT is not set 706# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -781,10 +729,6 @@ CONFIG_HW_RANDOM=y
781# CONFIG_AGP is not set 729# CONFIG_AGP is not set
782# CONFIG_DRM is not set 730# CONFIG_DRM is not set
783# CONFIG_RAW_DRIVER is not set 731# CONFIG_RAW_DRIVER is not set
784
785#
786# TPM devices
787#
788# CONFIG_TCG_TPM is not set 732# CONFIG_TCG_TPM is not set
789CONFIG_DEVPORT=y 733CONFIG_DEVPORT=y
790CONFIG_I2C=y 734CONFIG_I2C=y
@@ -819,6 +763,7 @@ CONFIG_I2C_MPC=y
819# CONFIG_I2C_SIS5595 is not set 763# CONFIG_I2C_SIS5595 is not set
820# CONFIG_I2C_SIS630 is not set 764# CONFIG_I2C_SIS630 is not set
821# CONFIG_I2C_SIS96X is not set 765# CONFIG_I2C_SIS96X is not set
766# CONFIG_I2C_TAOS_EVM is not set
822# CONFIG_I2C_STUB is not set 767# CONFIG_I2C_STUB is not set
823# CONFIG_I2C_TINY_USB is not set 768# CONFIG_I2C_TINY_USB is not set
824# CONFIG_I2C_VIA is not set 769# CONFIG_I2C_VIA is not set
@@ -830,12 +775,14 @@ CONFIG_I2C_MPC=y
830# 775#
831# CONFIG_SENSORS_DS1337 is not set 776# CONFIG_SENSORS_DS1337 is not set
832# CONFIG_SENSORS_DS1374 is not set 777# CONFIG_SENSORS_DS1374 is not set
778# CONFIG_DS1682 is not set
833# CONFIG_SENSORS_EEPROM is not set 779# CONFIG_SENSORS_EEPROM is not set
834CONFIG_SENSORS_PCF8574=y 780CONFIG_SENSORS_PCF8574=y
835# CONFIG_SENSORS_PCA9539 is not set 781# CONFIG_SENSORS_PCA9539 is not set
836# CONFIG_SENSORS_PCF8591 is not set 782# CONFIG_SENSORS_PCF8591 is not set
837# CONFIG_SENSORS_M41T00 is not set 783# CONFIG_SENSORS_M41T00 is not set
838# CONFIG_SENSORS_MAX6875 is not set 784# CONFIG_SENSORS_MAX6875 is not set
785# CONFIG_SENSORS_TSL2550 is not set
839# CONFIG_I2C_DEBUG_CORE is not set 786# CONFIG_I2C_DEBUG_CORE is not set
840# CONFIG_I2C_DEBUG_ALGO is not set 787# CONFIG_I2C_DEBUG_ALGO is not set
841# CONFIG_I2C_DEBUG_BUS is not set 788# CONFIG_I2C_DEBUG_BUS is not set
@@ -858,11 +805,9 @@ CONFIG_SPI_MPC83xx=y
858# 805#
859# CONFIG_SPI_AT25 is not set 806# CONFIG_SPI_AT25 is not set
860# CONFIG_SPI_SPIDEV is not set 807# CONFIG_SPI_SPIDEV is not set
861 808# CONFIG_SPI_TLE62X0 is not set
862#
863# Dallas's 1-wire bus
864#
865# CONFIG_W1 is not set 809# CONFIG_W1 is not set
810# CONFIG_POWER_SUPPLY is not set
866# CONFIG_HWMON is not set 811# CONFIG_HWMON is not set
867 812
868# 813#
@@ -888,6 +833,7 @@ CONFIG_DAB=y
888# 833#
889# CONFIG_DISPLAY_SUPPORT is not set 834# CONFIG_DISPLAY_SUPPORT is not set
890# CONFIG_VGASTATE is not set 835# CONFIG_VGASTATE is not set
836CONFIG_VIDEO_OUTPUT_CONTROL=m
891# CONFIG_FB is not set 837# CONFIG_FB is not set
892# CONFIG_FB_IBM_GXT4500 is not set 838# CONFIG_FB_IBM_GXT4500 is not set
893 839
@@ -895,10 +841,7 @@ CONFIG_DAB=y
895# Sound 841# Sound
896# 842#
897# CONFIG_SOUND is not set 843# CONFIG_SOUND is not set
898 844CONFIG_USB_SUPPORT=y
899#
900# USB support
901#
902CONFIG_USB_ARCH_HAS_HCD=y 845CONFIG_USB_ARCH_HAS_HCD=y
903CONFIG_USB_ARCH_HAS_OHCI=y 846CONFIG_USB_ARCH_HAS_OHCI=y
904CONFIG_USB_ARCH_HAS_EHCI=y 847CONFIG_USB_ARCH_HAS_EHCI=y
@@ -918,13 +861,14 @@ CONFIG_USB_DEVICE_CLASS=y
918# 861#
919CONFIG_USB_EHCI_HCD=y 862CONFIG_USB_EHCI_HCD=y
920# CONFIG_USB_EHCI_SPLIT_ISO is not set 863# CONFIG_USB_EHCI_SPLIT_ISO is not set
921# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 864CONFIG_USB_EHCI_ROOT_HUB_TT=y
922# CONFIG_USB_EHCI_TT_NEWSCHED is not set 865# CONFIG_USB_EHCI_TT_NEWSCHED is not set
923# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set 866CONFIG_USB_EHCI_FSL=y
924# CONFIG_USB_ISP116X_HCD is not set 867# CONFIG_USB_ISP116X_HCD is not set
925# CONFIG_USB_OHCI_HCD is not set 868# CONFIG_USB_OHCI_HCD is not set
926# CONFIG_USB_UHCI_HCD is not set 869# CONFIG_USB_UHCI_HCD is not set
927# CONFIG_USB_SL811_HCD is not set 870# CONFIG_USB_SL811_HCD is not set
871# CONFIG_USB_R8A66597_HCD is not set
928 872
929# 873#
930# USB Device Class drivers 874# USB Device Class drivers
@@ -1001,32 +945,9 @@ CONFIG_USB_MON=y
1001# 945#
1002# CONFIG_USB_GADGET is not set 946# CONFIG_USB_GADGET is not set
1003# CONFIG_MMC is not set 947# CONFIG_MMC is not set
1004
1005#
1006# LED devices
1007#
1008# CONFIG_NEW_LEDS is not set 948# CONFIG_NEW_LEDS is not set
1009
1010#
1011# LED drivers
1012#
1013
1014#
1015# LED Triggers
1016#
1017
1018#
1019# InfiniBand support
1020#
1021# CONFIG_INFINIBAND is not set 949# CONFIG_INFINIBAND is not set
1022 950# CONFIG_EDAC is not set
1023#
1024# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1025#
1026
1027#
1028# Real Time Clock
1029#
1030CONFIG_RTC_LIB=y 951CONFIG_RTC_LIB=y
1031CONFIG_RTC_CLASS=y 952CONFIG_RTC_CLASS=y
1032CONFIG_RTC_HCTOSYS=y 953CONFIG_RTC_HCTOSYS=y
@@ -1053,6 +974,7 @@ CONFIG_RTC_DRV_DS1307=y
1053# CONFIG_RTC_DRV_X1205 is not set 974# CONFIG_RTC_DRV_X1205 is not set
1054# CONFIG_RTC_DRV_PCF8563 is not set 975# CONFIG_RTC_DRV_PCF8563 is not set
1055# CONFIG_RTC_DRV_PCF8583 is not set 976# CONFIG_RTC_DRV_PCF8583 is not set
977# CONFIG_RTC_DRV_M41T80 is not set
1056 978
1057# 979#
1058# SPI RTC drivers 980# SPI RTC drivers
@@ -1063,9 +985,12 @@ CONFIG_RTC_DRV_DS1307=y
1063# 985#
1064# Platform RTC drivers 986# Platform RTC drivers
1065# 987#
988# CONFIG_RTC_DRV_CMOS is not set
1066# CONFIG_RTC_DRV_DS1553 is not set 989# CONFIG_RTC_DRV_DS1553 is not set
990# CONFIG_RTC_DRV_STK17TA8 is not set
1067# CONFIG_RTC_DRV_DS1742 is not set 991# CONFIG_RTC_DRV_DS1742 is not set
1068# CONFIG_RTC_DRV_M48T86 is not set 992# CONFIG_RTC_DRV_M48T86 is not set
993# CONFIG_RTC_DRV_M48T59 is not set
1069# CONFIG_RTC_DRV_V3020 is not set 994# CONFIG_RTC_DRV_V3020 is not set
1070 995
1071# 996#
@@ -1088,6 +1013,11 @@ CONFIG_NET_DMA=y
1088CONFIG_INTEL_IOATDMA=y 1013CONFIG_INTEL_IOATDMA=y
1089 1014
1090# 1015#
1016# Userspace I/O
1017#
1018# CONFIG_UIO is not set
1019
1020#
1091# File systems 1021# File systems
1092# 1022#
1093CONFIG_EXT2_FS=y 1023CONFIG_EXT2_FS=y
@@ -1187,7 +1117,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1187# CONFIG_NCP_FS is not set 1117# CONFIG_NCP_FS is not set
1188# CONFIG_CODA_FS is not set 1118# CONFIG_CODA_FS is not set
1189# CONFIG_AFS_FS is not set 1119# CONFIG_AFS_FS is not set
1190# CONFIG_9P_FS is not set
1191 1120
1192# 1121#
1193# Partition Types 1122# Partition Types
@@ -1269,6 +1198,7 @@ CONFIG_BITREVERSE=y
1269# CONFIG_CRC16 is not set 1198# CONFIG_CRC16 is not set
1270# CONFIG_CRC_ITU_T is not set 1199# CONFIG_CRC_ITU_T is not set
1271CONFIG_CRC32=y 1200CONFIG_CRC32=y
1201# CONFIG_CRC7 is not set
1272# CONFIG_LIBCRC32C is not set 1202# CONFIG_LIBCRC32C is not set
1273CONFIG_PLIST=y 1203CONFIG_PLIST=y
1274CONFIG_HAS_IOMEM=y 1204CONFIG_HAS_IOMEM=y
@@ -1291,7 +1221,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1291# CONFIG_HEADERS_CHECK is not set 1221# CONFIG_HEADERS_CHECK is not set
1292# CONFIG_DEBUG_KERNEL is not set 1222# CONFIG_DEBUG_KERNEL is not set
1293# CONFIG_DEBUG_BUGVERBOSE is not set 1223# CONFIG_DEBUG_BUGVERBOSE is not set
1294# CONFIG_BOOTX_TEXT is not set
1295# CONFIG_PPC_EARLY_DEBUG is not set 1224# CONFIG_PPC_EARLY_DEBUG is not set
1296 1225
1297# 1226#
@@ -1299,10 +1228,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1299# 1228#
1300# CONFIG_KEYS is not set 1229# CONFIG_KEYS is not set
1301# CONFIG_SECURITY is not set 1230# CONFIG_SECURITY is not set
1302
1303#
1304# Cryptographic options
1305#
1306CONFIG_CRYPTO=y 1231CONFIG_CRYPTO=y
1307CONFIG_CRYPTO_ALGAPI=y 1232CONFIG_CRYPTO_ALGAPI=y
1308CONFIG_CRYPTO_BLKCIPHER=y 1233CONFIG_CRYPTO_BLKCIPHER=y
@@ -1340,7 +1265,4 @@ CONFIG_CRYPTO_DES=y
1340# CONFIG_CRYPTO_CRC32C is not set 1265# CONFIG_CRYPTO_CRC32C is not set
1341# CONFIG_CRYPTO_CAMELLIA is not set 1266# CONFIG_CRYPTO_CAMELLIA is not set
1342# CONFIG_CRYPTO_TEST is not set 1267# CONFIG_CRYPTO_TEST is not set
1343 1268CONFIG_CRYPTO_HW=y
1344#
1345# Hardware crypto devices
1346#
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 704ee8b285bf..8241c6985861 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:56 2007 4# Tue Aug 28 21:24: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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_MPC834x=y
158# CONFIG_GENERIC_IOMAP is not set 149# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set 151# CONFIG_CPM2 is not set
152# CONFIG_FSL_ULI1575 is not set
161 153
162# 154#
163# Kernel options 155# Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
186CONFIG_SPLIT_PTLOCK_CPUS=4 178CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_RESOURCES_64BIT is not set 179# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1 180CONFIG_ZONE_DMA_FLAG=1
181CONFIG_BOUNCE=y
182CONFIG_VIRT_TO_BUS=y
189CONFIG_PROC_DEVICETREE=y 183CONFIG_PROC_DEVICETREE=y
190# CONFIG_CMDLINE_BOOL is not set 184# CONFIG_CMDLINE_BOOL is not set
191# CONFIG_PM is not set 185# CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
200CONFIG_ZONE_DMA=y 194CONFIG_ZONE_DMA=y
201CONFIG_GENERIC_ISA_DMA=y 195CONFIG_GENERIC_ISA_DMA=y
202CONFIG_PPC_INDIRECT_PCI=y 196CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
204CONFIG_FSL_SOC=y 197CONFIG_FSL_SOC=y
205CONFIG_PCI=y 198CONFIG_PCI=y
206CONFIG_PCI_DOMAINS=y 199CONFIG_PCI_DOMAINS=y
200CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 201# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 202CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 203# CONFIG_PCI_MSI is not set
@@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
313# CONFIG_MAC80211 is not set 307# CONFIG_MAC80211 is not set
314# CONFIG_IEEE80211 is not set 308# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set 309# CONFIG_RFKILL is not set
310# CONFIG_NET_9P is not set
316 311
317# 312#
318# Device Drivers 313# Device Drivers
@@ -325,10 +320,6 @@ CONFIG_STANDALONE=y
325CONFIG_PREVENT_FIRMWARE_BUILD=y 320CONFIG_PREVENT_FIRMWARE_BUILD=y
326# CONFIG_FW_LOADER is not set 321# CONFIG_FW_LOADER is not set
327# CONFIG_SYS_HYPERVISOR is not set 322# CONFIG_SYS_HYPERVISOR is not set
328
329#
330# Connector - unified userspace <-> kernelspace linker
331#
332# CONFIG_CONNECTOR is not set 323# CONFIG_CONNECTOR is not set
333CONFIG_MTD=y 324CONFIG_MTD=y
334# CONFIG_MTD_DEBUG is not set 325# CONFIG_MTD_DEBUG is not set
@@ -408,20 +399,9 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
408# UBI - Unsorted block images 399# UBI - Unsorted block images
409# 400#
410# CONFIG_MTD_UBI is not set 401# CONFIG_MTD_UBI is not set
411 402CONFIG_OF_DEVICE=y
412#
413# Parallel port support
414#
415# CONFIG_PARPORT is not set 403# CONFIG_PARPORT is not set
416 404CONFIG_BLK_DEV=y
417#
418# Plug and Play support
419#
420# CONFIG_PNPACPI is not set
421
422#
423# Block devices
424#
425# CONFIG_BLK_DEV_FD is not set 405# CONFIG_BLK_DEV_FD is not set
426# CONFIG_BLK_CPQ_DA is not set 406# CONFIG_BLK_CPQ_DA is not set
427# CONFIG_BLK_CPQ_CISS_DA is not set 407# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -438,14 +418,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
438CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 418CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
439# CONFIG_CDROM_PKTCDVD is not set 419# CONFIG_CDROM_PKTCDVD is not set
440# CONFIG_ATA_OVER_ETH is not set 420# CONFIG_ATA_OVER_ETH is not set
441 421CONFIG_MISC_DEVICES=y
442#
443# Misc devices
444#
445# CONFIG_PHANTOM is not set 422# CONFIG_PHANTOM is not set
423# CONFIG_EEPROM_93CX6 is not set
446# CONFIG_SGI_IOC4 is not set 424# CONFIG_SGI_IOC4 is not set
447# CONFIG_TIFM_CORE is not set 425# CONFIG_TIFM_CORE is not set
448# CONFIG_BLINK is not set
449# CONFIG_IDE is not set 426# CONFIG_IDE is not set
450 427
451# 428#
@@ -453,6 +430,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
453# 430#
454# CONFIG_RAID_ATTRS is not set 431# CONFIG_RAID_ATTRS is not set
455CONFIG_SCSI=y 432CONFIG_SCSI=y
433CONFIG_SCSI_DMA=y
456# CONFIG_SCSI_TGT is not set 434# CONFIG_SCSI_TGT is not set
457# CONFIG_SCSI_NETLINK is not set 435# CONFIG_SCSI_NETLINK is not set
458CONFIG_SCSI_PROC_FS=y 436CONFIG_SCSI_PROC_FS=y
@@ -482,12 +460,8 @@ CONFIG_SCSI_WAIT_SCAN=m
482CONFIG_SCSI_SPI_ATTRS=y 460CONFIG_SCSI_SPI_ATTRS=y
483# CONFIG_SCSI_FC_ATTRS is not set 461# CONFIG_SCSI_FC_ATTRS is not set
484# CONFIG_SCSI_ISCSI_ATTRS is not set 462# CONFIG_SCSI_ISCSI_ATTRS is not set
485# CONFIG_SCSI_SAS_ATTRS is not set
486# CONFIG_SCSI_SAS_LIBSAS is not set 463# CONFIG_SCSI_SAS_LIBSAS is not set
487 464CONFIG_SCSI_LOWLEVEL=y
488#
489# SCSI low-level drivers
490#
491# CONFIG_ISCSI_TCP is not set 465# CONFIG_ISCSI_TCP is not set
492# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 466# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
493# CONFIG_SCSI_3W_9XXX is not set 467# CONFIG_SCSI_3W_9XXX is not set
@@ -523,10 +497,6 @@ CONFIG_SCSI_SPI_ATTRS=y
523# CONFIG_SCSI_DEBUG is not set 497# CONFIG_SCSI_DEBUG is not set
524# CONFIG_SCSI_SRP is not set 498# CONFIG_SCSI_SRP is not set
525# CONFIG_ATA is not set 499# CONFIG_ATA is not set
526
527#
528# Multi-device support (RAID and LVM)
529#
530# CONFIG_MD is not set 500# CONFIG_MD is not set
531 501
532# 502#
@@ -542,19 +512,13 @@ CONFIG_SCSI_SPI_ATTRS=y
542# 512#
543# CONFIG_FIREWIRE is not set 513# CONFIG_FIREWIRE is not set
544# CONFIG_IEEE1394 is not set 514# CONFIG_IEEE1394 is not set
545
546#
547# I2O device support
548#
549# CONFIG_I2O is not set 515# CONFIG_I2O is not set
550# CONFIG_MACINTOSH_DRIVERS is not set 516# CONFIG_MACINTOSH_DRIVERS is not set
551
552#
553# Network device support
554#
555CONFIG_NETDEVICES=y 517CONFIG_NETDEVICES=y
518# CONFIG_NETDEVICES_MULTIQUEUE is not set
556# CONFIG_DUMMY is not set 519# CONFIG_DUMMY is not set
557# CONFIG_BONDING is not set 520# CONFIG_BONDING is not set
521# CONFIG_MACVLAN is not set
558# CONFIG_EQUALIZER is not set 522# CONFIG_EQUALIZER is not set
559# CONFIG_TUN is not set 523# CONFIG_TUN is not set
560# CONFIG_ARCNET is not set 524# CONFIG_ARCNET is not set
@@ -571,11 +535,8 @@ CONFIG_CICADA_PHY=y
571# CONFIG_VITESSE_PHY is not set 535# CONFIG_VITESSE_PHY is not set
572# CONFIG_SMSC_PHY is not set 536# CONFIG_SMSC_PHY is not set
573# CONFIG_BROADCOM_PHY is not set 537# CONFIG_BROADCOM_PHY is not set
538# CONFIG_ICPLUS_PHY is not set
574# CONFIG_FIXED_PHY is not set 539# CONFIG_FIXED_PHY is not set
575
576#
577# Ethernet (10 or 100Mbit)
578#
579# CONFIG_NET_ETHERNET is not set 540# CONFIG_NET_ETHERNET is not set
580CONFIG_NETDEV_1000=y 541CONFIG_NETDEV_1000=y
581# CONFIG_ACENIC is not set 542# CONFIG_ACENIC is not set
@@ -588,7 +549,6 @@ CONFIG_NETDEV_1000=y
588# CONFIG_SIS190 is not set 549# CONFIG_SIS190 is not set
589# CONFIG_SKGE is not set 550# CONFIG_SKGE is not set
590# CONFIG_SKY2 is not set 551# CONFIG_SKY2 is not set
591# CONFIG_SK98LIN is not set
592# CONFIG_VIA_VELOCITY is not set 552# CONFIG_VIA_VELOCITY is not set
593# CONFIG_TIGON3 is not set 553# CONFIG_TIGON3 is not set
594# CONFIG_BNX2 is not set 554# CONFIG_BNX2 is not set
@@ -621,15 +581,7 @@ CONFIG_NETDEV_10000=y
621# CONFIG_NETCONSOLE is not set 581# CONFIG_NETCONSOLE is not set
622# CONFIG_NETPOLL is not set 582# CONFIG_NETPOLL is not set
623# CONFIG_NET_POLL_CONTROLLER is not set 583# CONFIG_NET_POLL_CONTROLLER is not set
624
625#
626# ISDN subsystem
627#
628# CONFIG_ISDN is not set 584# CONFIG_ISDN is not set
629
630#
631# Telephony Support
632#
633# CONFIG_PHONE is not set 585# CONFIG_PHONE is not set
634 586
635# 587#
@@ -670,10 +622,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
670CONFIG_UNIX98_PTYS=y 622CONFIG_UNIX98_PTYS=y
671CONFIG_LEGACY_PTYS=y 623CONFIG_LEGACY_PTYS=y
672CONFIG_LEGACY_PTY_COUNT=256 624CONFIG_LEGACY_PTY_COUNT=256
673
674#
675# IPMI
676#
677# CONFIG_IPMI_HANDLER is not set 625# CONFIG_IPMI_HANDLER is not set
678CONFIG_WATCHDOG=y 626CONFIG_WATCHDOG=y
679# CONFIG_WATCHDOG_NOWAYOUT is not set 627# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -697,10 +645,6 @@ CONFIG_HW_RANDOM=y
697# CONFIG_AGP is not set 645# CONFIG_AGP is not set
698# CONFIG_DRM is not set 646# CONFIG_DRM is not set
699# CONFIG_RAW_DRIVER is not set 647# CONFIG_RAW_DRIVER is not set
700
701#
702# TPM devices
703#
704# CONFIG_TCG_TPM is not set 648# CONFIG_TCG_TPM is not set
705CONFIG_DEVPORT=y 649CONFIG_DEVPORT=y
706CONFIG_I2C=y 650CONFIG_I2C=y
@@ -735,6 +679,7 @@ CONFIG_I2C_MPC=y
735# CONFIG_I2C_SIS5595 is not set 679# CONFIG_I2C_SIS5595 is not set
736# CONFIG_I2C_SIS630 is not set 680# CONFIG_I2C_SIS630 is not set
737# CONFIG_I2C_SIS96X is not set 681# CONFIG_I2C_SIS96X is not set
682# CONFIG_I2C_TAOS_EVM is not set
738# CONFIG_I2C_STUB is not set 683# CONFIG_I2C_STUB is not set
739# CONFIG_I2C_VIA is not set 684# CONFIG_I2C_VIA is not set
740# CONFIG_I2C_VIAPRO is not set 685# CONFIG_I2C_VIAPRO is not set
@@ -745,12 +690,14 @@ CONFIG_I2C_MPC=y
745# 690#
746# CONFIG_SENSORS_DS1337 is not set 691# CONFIG_SENSORS_DS1337 is not set
747# CONFIG_SENSORS_DS1374 is not set 692# CONFIG_SENSORS_DS1374 is not set
693# CONFIG_DS1682 is not set
748# CONFIG_SENSORS_EEPROM is not set 694# CONFIG_SENSORS_EEPROM is not set
749CONFIG_SENSORS_PCF8574=y 695CONFIG_SENSORS_PCF8574=y
750# CONFIG_SENSORS_PCA9539 is not set 696# CONFIG_SENSORS_PCA9539 is not set
751# CONFIG_SENSORS_PCF8591 is not set 697# CONFIG_SENSORS_PCF8591 is not set
752# CONFIG_SENSORS_M41T00 is not set 698# CONFIG_SENSORS_M41T00 is not set
753# CONFIG_SENSORS_MAX6875 is not set 699# CONFIG_SENSORS_MAX6875 is not set
700# CONFIG_SENSORS_TSL2550 is not set
754# CONFIG_I2C_DEBUG_CORE is not set 701# CONFIG_I2C_DEBUG_CORE is not set
755# CONFIG_I2C_DEBUG_ALGO is not set 702# CONFIG_I2C_DEBUG_ALGO is not set
756# CONFIG_I2C_DEBUG_BUS is not set 703# CONFIG_I2C_DEBUG_BUS is not set
@@ -773,11 +720,9 @@ CONFIG_SPI_MPC83xx=y
773# 720#
774# CONFIG_SPI_AT25 is not set 721# CONFIG_SPI_AT25 is not set
775# CONFIG_SPI_SPIDEV is not set 722# CONFIG_SPI_SPIDEV is not set
776 723# CONFIG_SPI_TLE62X0 is not set
777#
778# Dallas's 1-wire bus
779#
780# CONFIG_W1 is not set 724# CONFIG_W1 is not set
725# CONFIG_POWER_SUPPLY is not set
781# CONFIG_HWMON is not set 726# CONFIG_HWMON is not set
782 727
783# 728#
@@ -802,6 +747,7 @@ CONFIG_DAB=y
802# 747#
803# CONFIG_DISPLAY_SUPPORT is not set 748# CONFIG_DISPLAY_SUPPORT is not set
804# CONFIG_VGASTATE is not set 749# CONFIG_VGASTATE is not set
750CONFIG_VIDEO_OUTPUT_CONTROL=m
805# CONFIG_FB is not set 751# CONFIG_FB is not set
806# CONFIG_FB_IBM_GXT4500 is not set 752# CONFIG_FB_IBM_GXT4500 is not set
807 753
@@ -809,14 +755,13 @@ CONFIG_DAB=y
809# Sound 755# Sound
810# 756#
811# CONFIG_SOUND is not set 757# CONFIG_SOUND is not set
812 758CONFIG_USB_SUPPORT=y
813#
814# USB support
815#
816CONFIG_USB_ARCH_HAS_HCD=y 759CONFIG_USB_ARCH_HAS_HCD=y
817CONFIG_USB_ARCH_HAS_OHCI=y 760CONFIG_USB_ARCH_HAS_OHCI=y
818CONFIG_USB_ARCH_HAS_EHCI=y 761CONFIG_USB_ARCH_HAS_EHCI=y
819# CONFIG_USB is not set 762# CONFIG_USB is not set
763CONFIG_USB_EHCI_ROOT_HUB_TT=y
764CONFIG_USB_EHCI_FSL=y
820 765
821# 766#
822# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 767# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -827,32 +772,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
827# 772#
828# CONFIG_USB_GADGET is not set 773# CONFIG_USB_GADGET is not set
829# CONFIG_MMC is not set 774# CONFIG_MMC is not set
830
831#
832# LED devices
833#
834# CONFIG_NEW_LEDS is not set 775# CONFIG_NEW_LEDS is not set
835
836#
837# LED drivers
838#
839
840#
841# LED Triggers
842#
843
844#
845# InfiniBand support
846#
847# CONFIG_INFINIBAND is not set 776# CONFIG_INFINIBAND is not set
848 777# CONFIG_EDAC is not set
849#
850# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
851#
852
853#
854# Real Time Clock
855#
856CONFIG_RTC_LIB=y 778CONFIG_RTC_LIB=y
857CONFIG_RTC_CLASS=y 779CONFIG_RTC_CLASS=y
858CONFIG_RTC_HCTOSYS=y 780CONFIG_RTC_HCTOSYS=y
@@ -879,6 +801,7 @@ CONFIG_RTC_DRV_DS1307=y
879# CONFIG_RTC_DRV_X1205 is not set 801# CONFIG_RTC_DRV_X1205 is not set
880# CONFIG_RTC_DRV_PCF8563 is not set 802# CONFIG_RTC_DRV_PCF8563 is not set
881# CONFIG_RTC_DRV_PCF8583 is not set 803# CONFIG_RTC_DRV_PCF8583 is not set
804# CONFIG_RTC_DRV_M41T80 is not set
882 805
883# 806#
884# SPI RTC drivers 807# SPI RTC drivers
@@ -889,9 +812,12 @@ CONFIG_RTC_DRV_DS1307=y
889# 812#
890# Platform RTC drivers 813# Platform RTC drivers
891# 814#
815# CONFIG_RTC_DRV_CMOS is not set
892# CONFIG_RTC_DRV_DS1553 is not set 816# CONFIG_RTC_DRV_DS1553 is not set
817# CONFIG_RTC_DRV_STK17TA8 is not set
893# CONFIG_RTC_DRV_DS1742 is not set 818# CONFIG_RTC_DRV_DS1742 is not set
894# CONFIG_RTC_DRV_M48T86 is not set 819# CONFIG_RTC_DRV_M48T86 is not set
820# CONFIG_RTC_DRV_M48T59 is not set
895# CONFIG_RTC_DRV_V3020 is not set 821# CONFIG_RTC_DRV_V3020 is not set
896 822
897# 823#
@@ -914,6 +840,11 @@ CONFIG_NET_DMA=y
914CONFIG_INTEL_IOATDMA=y 840CONFIG_INTEL_IOATDMA=y
915 841
916# 842#
843# Userspace I/O
844#
845# CONFIG_UIO is not set
846
847#
917# File systems 848# File systems
918# 849#
919CONFIG_EXT2_FS=y 850CONFIG_EXT2_FS=y
@@ -1013,7 +944,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1013# CONFIG_NCP_FS is not set 944# CONFIG_NCP_FS is not set
1014# CONFIG_CODA_FS is not set 945# CONFIG_CODA_FS is not set
1015# CONFIG_AFS_FS is not set 946# CONFIG_AFS_FS is not set
1016# CONFIG_9P_FS is not set
1017 947
1018# 948#
1019# Partition Types 949# Partition Types
@@ -1095,6 +1025,7 @@ CONFIG_BITREVERSE=y
1095# CONFIG_CRC16 is not set 1025# CONFIG_CRC16 is not set
1096# CONFIG_CRC_ITU_T is not set 1026# CONFIG_CRC_ITU_T is not set
1097CONFIG_CRC32=y 1027CONFIG_CRC32=y
1028# CONFIG_CRC7 is not set
1098# CONFIG_LIBCRC32C is not set 1029# CONFIG_LIBCRC32C is not set
1099CONFIG_PLIST=y 1030CONFIG_PLIST=y
1100CONFIG_HAS_IOMEM=y 1031CONFIG_HAS_IOMEM=y
@@ -1117,7 +1048,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1117# CONFIG_HEADERS_CHECK is not set 1048# CONFIG_HEADERS_CHECK is not set
1118# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1119# CONFIG_DEBUG_BUGVERBOSE is not set 1050# CONFIG_DEBUG_BUGVERBOSE is not set
1120# CONFIG_BOOTX_TEXT is not set
1121# CONFIG_PPC_EARLY_DEBUG is not set 1051# CONFIG_PPC_EARLY_DEBUG is not set
1122 1052
1123# 1053#
@@ -1125,10 +1055,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1125# 1055#
1126# CONFIG_KEYS is not set 1056# CONFIG_KEYS is not set
1127# CONFIG_SECURITY is not set 1057# CONFIG_SECURITY is not set
1128
1129#
1130# Cryptographic options
1131#
1132CONFIG_CRYPTO=y 1058CONFIG_CRYPTO=y
1133CONFIG_CRYPTO_ALGAPI=y 1059CONFIG_CRYPTO_ALGAPI=y
1134CONFIG_CRYPTO_BLKCIPHER=y 1060CONFIG_CRYPTO_BLKCIPHER=y
@@ -1166,7 +1092,4 @@ CONFIG_CRYPTO_DES=y
1166# CONFIG_CRYPTO_CRC32C is not set 1092# CONFIG_CRYPTO_CRC32C is not set
1167# CONFIG_CRYPTO_CAMELLIA is not set 1093# CONFIG_CRYPTO_CAMELLIA is not set
1168# CONFIG_CRYPTO_TEST is not set 1094# CONFIG_CRYPTO_TEST is not set
1169 1095CONFIG_CRYPTO_HW=y
1170#
1171# Hardware crypto devices
1172#
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index c28b3ee3cb12..06233b1a9418 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:57 2007 4# Tue Aug 28 21:24: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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -158,6 +149,7 @@ CONFIG_MPC834x=y
158# CONFIG_GENERIC_IOMAP is not set 149# CONFIG_GENERIC_IOMAP is not set
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160# CONFIG_CPM2 is not set 151# CONFIG_CPM2 is not set
152# CONFIG_FSL_ULI1575 is not set
161 153
162# 154#
163# Kernel options 155# Kernel options
@@ -186,6 +178,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
186CONFIG_SPLIT_PTLOCK_CPUS=4 178CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_RESOURCES_64BIT is not set 179# CONFIG_RESOURCES_64BIT is not set
188CONFIG_ZONE_DMA_FLAG=1 180CONFIG_ZONE_DMA_FLAG=1
181CONFIG_BOUNCE=y
182CONFIG_VIRT_TO_BUS=y
189CONFIG_PROC_DEVICETREE=y 183CONFIG_PROC_DEVICETREE=y
190# CONFIG_CMDLINE_BOOL is not set 184# CONFIG_CMDLINE_BOOL is not set
191# CONFIG_PM is not set 185# CONFIG_PM is not set
@@ -200,10 +194,10 @@ CONFIG_ISA_DMA_API=y
200CONFIG_ZONE_DMA=y 194CONFIG_ZONE_DMA=y
201CONFIG_GENERIC_ISA_DMA=y 195CONFIG_GENERIC_ISA_DMA=y
202CONFIG_PPC_INDIRECT_PCI=y 196CONFIG_PPC_INDIRECT_PCI=y
203# CONFIG_PPC_INDIRECT_PCI_BE is not set
204CONFIG_FSL_SOC=y 197CONFIG_FSL_SOC=y
205CONFIG_PCI=y 198CONFIG_PCI=y
206CONFIG_PCI_DOMAINS=y 199CONFIG_PCI_DOMAINS=y
200CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 201# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 202CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 203# CONFIG_PCI_MSI is not set
@@ -313,6 +307,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
313# CONFIG_MAC80211 is not set 307# CONFIG_MAC80211 is not set
314# CONFIG_IEEE80211 is not set 308# CONFIG_IEEE80211 is not set
315# CONFIG_RFKILL is not set 309# CONFIG_RFKILL is not set
310# CONFIG_NET_9P is not set
316 311
317# 312#
318# Device Drivers 313# Device Drivers
@@ -325,26 +320,11 @@ CONFIG_STANDALONE=y
325CONFIG_PREVENT_FIRMWARE_BUILD=y 320CONFIG_PREVENT_FIRMWARE_BUILD=y
326# CONFIG_FW_LOADER is not set 321# CONFIG_FW_LOADER is not set
327# CONFIG_SYS_HYPERVISOR is not set 322# CONFIG_SYS_HYPERVISOR is not set
328
329#
330# Connector - unified userspace <-> kernelspace linker
331#
332# CONFIG_CONNECTOR is not set 323# CONFIG_CONNECTOR is not set
333# CONFIG_MTD is not set 324# CONFIG_MTD is not set
334 325CONFIG_OF_DEVICE=y
335#
336# Parallel port support
337#
338# CONFIG_PARPORT is not set 326# CONFIG_PARPORT is not set
339 327CONFIG_BLK_DEV=y
340#
341# Plug and Play support
342#
343# CONFIG_PNPACPI is not set
344
345#
346# Block devices
347#
348# CONFIG_BLK_DEV_FD is not set 328# CONFIG_BLK_DEV_FD is not set
349# CONFIG_BLK_CPQ_DA is not set 329# CONFIG_BLK_CPQ_DA is not set
350# CONFIG_BLK_CPQ_CISS_DA is not set 330# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -361,14 +341,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
361CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 341CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
362# CONFIG_CDROM_PKTCDVD is not set 342# CONFIG_CDROM_PKTCDVD is not set
363# CONFIG_ATA_OVER_ETH is not set 343# CONFIG_ATA_OVER_ETH is not set
364 344CONFIG_MISC_DEVICES=y
365#
366# Misc devices
367#
368# CONFIG_PHANTOM is not set 345# CONFIG_PHANTOM is not set
346# CONFIG_EEPROM_93CX6 is not set
369# CONFIG_SGI_IOC4 is not set 347# CONFIG_SGI_IOC4 is not set
370# CONFIG_TIFM_CORE is not set 348# CONFIG_TIFM_CORE is not set
371# CONFIG_BLINK is not set
372# CONFIG_IDE is not set 349# CONFIG_IDE is not set
373 350
374# 351#
@@ -376,12 +353,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
376# 353#
377# CONFIG_RAID_ATTRS is not set 354# CONFIG_RAID_ATTRS is not set
378# CONFIG_SCSI is not set 355# CONFIG_SCSI is not set
356# CONFIG_SCSI_DMA is not set
379# CONFIG_SCSI_NETLINK is not set 357# CONFIG_SCSI_NETLINK is not set
380# CONFIG_ATA is not set 358# CONFIG_ATA is not set
381
382#
383# Multi-device support (RAID and LVM)
384#
385# CONFIG_MD is not set 359# CONFIG_MD is not set
386 360
387# 361#
@@ -394,19 +368,13 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
394# 368#
395# CONFIG_FIREWIRE is not set 369# CONFIG_FIREWIRE is not set
396# CONFIG_IEEE1394 is not set 370# CONFIG_IEEE1394 is not set
397
398#
399# I2O device support
400#
401# CONFIG_I2O is not set 371# CONFIG_I2O is not set
402# CONFIG_MACINTOSH_DRIVERS is not set 372# CONFIG_MACINTOSH_DRIVERS is not set
403
404#
405# Network device support
406#
407CONFIG_NETDEVICES=y 373CONFIG_NETDEVICES=y
374# CONFIG_NETDEVICES_MULTIQUEUE is not set
408# CONFIG_DUMMY is not set 375# CONFIG_DUMMY is not set
409# CONFIG_BONDING is not set 376# CONFIG_BONDING is not set
377# CONFIG_MACVLAN is not set
410# CONFIG_EQUALIZER is not set 378# CONFIG_EQUALIZER is not set
411# CONFIG_TUN is not set 379# CONFIG_TUN is not set
412# CONFIG_ARCNET is not set 380# CONFIG_ARCNET is not set
@@ -423,21 +391,14 @@ CONFIG_MARVELL_PHY=y
423# CONFIG_VITESSE_PHY is not set 391# CONFIG_VITESSE_PHY is not set
424# CONFIG_SMSC_PHY is not set 392# CONFIG_SMSC_PHY is not set
425# CONFIG_BROADCOM_PHY is not set 393# CONFIG_BROADCOM_PHY is not set
394# CONFIG_ICPLUS_PHY is not set
426# CONFIG_FIXED_PHY is not set 395# CONFIG_FIXED_PHY is not set
427
428#
429# Ethernet (10 or 100Mbit)
430#
431CONFIG_NET_ETHERNET=y 396CONFIG_NET_ETHERNET=y
432CONFIG_MII=y 397CONFIG_MII=y
433# CONFIG_HAPPYMEAL is not set 398# CONFIG_HAPPYMEAL is not set
434# CONFIG_SUNGEM is not set 399# CONFIG_SUNGEM is not set
435# CONFIG_CASSINI is not set 400# CONFIG_CASSINI is not set
436# CONFIG_NET_VENDOR_3COM is not set 401# CONFIG_NET_VENDOR_3COM is not set
437
438#
439# Tulip family network device support
440#
441# CONFIG_NET_TULIP is not set 402# CONFIG_NET_TULIP is not set
442# CONFIG_HP100 is not set 403# CONFIG_HP100 is not set
443CONFIG_NET_PCI=y 404CONFIG_NET_PCI=y
@@ -471,7 +432,6 @@ CONFIG_NETDEV_1000=y
471# CONFIG_SIS190 is not set 432# CONFIG_SIS190 is not set
472# CONFIG_SKGE is not set 433# CONFIG_SKGE is not set
473# CONFIG_SKY2 is not set 434# CONFIG_SKY2 is not set
474# CONFIG_SK98LIN is not set
475# CONFIG_VIA_VELOCITY is not set 435# CONFIG_VIA_VELOCITY is not set
476# CONFIG_TIGON3 is not set 436# CONFIG_TIGON3 is not set
477# CONFIG_BNX2 is not set 437# CONFIG_BNX2 is not set
@@ -503,15 +463,7 @@ CONFIG_NETDEV_10000=y
503# CONFIG_NETCONSOLE is not set 463# CONFIG_NETCONSOLE is not set
504# CONFIG_NETPOLL is not set 464# CONFIG_NETPOLL is not set
505# CONFIG_NET_POLL_CONTROLLER is not set 465# CONFIG_NET_POLL_CONTROLLER is not set
506
507#
508# ISDN subsystem
509#
510# CONFIG_ISDN is not set 466# CONFIG_ISDN is not set
511
512#
513# Telephony Support
514#
515# CONFIG_PHONE is not set 467# CONFIG_PHONE is not set
516 468
517# 469#
@@ -573,10 +525,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
573CONFIG_UNIX98_PTYS=y 525CONFIG_UNIX98_PTYS=y
574CONFIG_LEGACY_PTYS=y 526CONFIG_LEGACY_PTYS=y
575CONFIG_LEGACY_PTY_COUNT=256 527CONFIG_LEGACY_PTY_COUNT=256
576
577#
578# IPMI
579#
580# CONFIG_IPMI_HANDLER is not set 528# CONFIG_IPMI_HANDLER is not set
581CONFIG_WATCHDOG=y 529CONFIG_WATCHDOG=y
582# CONFIG_WATCHDOG_NOWAYOUT is not set 530# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -601,10 +549,6 @@ CONFIG_GEN_RTC=y
601# CONFIG_AGP is not set 549# CONFIG_AGP is not set
602# CONFIG_DRM is not set 550# CONFIG_DRM is not set
603# CONFIG_RAW_DRIVER is not set 551# CONFIG_RAW_DRIVER is not set
604
605#
606# TPM devices
607#
608# CONFIG_TCG_TPM is not set 552# CONFIG_TCG_TPM is not set
609CONFIG_DEVPORT=y 553CONFIG_DEVPORT=y
610CONFIG_I2C=y 554CONFIG_I2C=y
@@ -639,6 +583,7 @@ CONFIG_I2C_MPC=y
639# CONFIG_I2C_SIS5595 is not set 583# CONFIG_I2C_SIS5595 is not set
640# CONFIG_I2C_SIS630 is not set 584# CONFIG_I2C_SIS630 is not set
641# CONFIG_I2C_SIS96X is not set 585# CONFIG_I2C_SIS96X is not set
586# CONFIG_I2C_TAOS_EVM is not set
642# CONFIG_I2C_STUB is not set 587# CONFIG_I2C_STUB is not set
643# CONFIG_I2C_VIA is not set 588# CONFIG_I2C_VIA is not set
644# CONFIG_I2C_VIAPRO is not set 589# CONFIG_I2C_VIAPRO is not set
@@ -649,12 +594,14 @@ CONFIG_I2C_MPC=y
649# 594#
650# CONFIG_SENSORS_DS1337 is not set 595# CONFIG_SENSORS_DS1337 is not set
651# CONFIG_SENSORS_DS1374 is not set 596# CONFIG_SENSORS_DS1374 is not set
597# CONFIG_DS1682 is not set
652# CONFIG_SENSORS_EEPROM is not set 598# CONFIG_SENSORS_EEPROM is not set
653# CONFIG_SENSORS_PCF8574 is not set 599# CONFIG_SENSORS_PCF8574 is not set
654# CONFIG_SENSORS_PCA9539 is not set 600# CONFIG_SENSORS_PCA9539 is not set
655# CONFIG_SENSORS_PCF8591 is not set 601# CONFIG_SENSORS_PCF8591 is not set
656# CONFIG_SENSORS_M41T00 is not set 602# CONFIG_SENSORS_M41T00 is not set
657# CONFIG_SENSORS_MAX6875 is not set 603# CONFIG_SENSORS_MAX6875 is not set
604# CONFIG_SENSORS_TSL2550 is not set
658# CONFIG_I2C_DEBUG_CORE is not set 605# CONFIG_I2C_DEBUG_CORE is not set
659# CONFIG_I2C_DEBUG_ALGO is not set 606# CONFIG_I2C_DEBUG_ALGO is not set
660# CONFIG_I2C_DEBUG_BUS is not set 607# CONFIG_I2C_DEBUG_BUS is not set
@@ -665,14 +612,12 @@ CONFIG_I2C_MPC=y
665# 612#
666# CONFIG_SPI is not set 613# CONFIG_SPI is not set
667# CONFIG_SPI_MASTER is not set 614# CONFIG_SPI_MASTER is not set
668
669#
670# Dallas's 1-wire bus
671#
672# CONFIG_W1 is not set 615# CONFIG_W1 is not set
616# CONFIG_POWER_SUPPLY is not set
673CONFIG_HWMON=y 617CONFIG_HWMON=y
674# CONFIG_HWMON_VID is not set 618# CONFIG_HWMON_VID is not set
675# CONFIG_SENSORS_ABITUGURU is not set 619# CONFIG_SENSORS_ABITUGURU is not set
620# CONFIG_SENSORS_ABITUGURU3 is not set
676# CONFIG_SENSORS_AD7418 is not set 621# CONFIG_SENSORS_AD7418 is not set
677# CONFIG_SENSORS_ADM1021 is not set 622# CONFIG_SENSORS_ADM1021 is not set
678# CONFIG_SENSORS_ADM1025 is not set 623# CONFIG_SENSORS_ADM1025 is not set
@@ -699,14 +644,17 @@ CONFIG_HWMON=y
699# CONFIG_SENSORS_LM87 is not set 644# CONFIG_SENSORS_LM87 is not set
700# CONFIG_SENSORS_LM90 is not set 645# CONFIG_SENSORS_LM90 is not set
701# CONFIG_SENSORS_LM92 is not set 646# CONFIG_SENSORS_LM92 is not set
647# CONFIG_SENSORS_LM93 is not set
702# CONFIG_SENSORS_MAX1619 is not set 648# CONFIG_SENSORS_MAX1619 is not set
703# CONFIG_SENSORS_MAX6650 is not set 649# CONFIG_SENSORS_MAX6650 is not set
704# CONFIG_SENSORS_PC87360 is not set 650# CONFIG_SENSORS_PC87360 is not set
705# CONFIG_SENSORS_PC87427 is not set 651# CONFIG_SENSORS_PC87427 is not set
706# CONFIG_SENSORS_SIS5595 is not set 652# CONFIG_SENSORS_SIS5595 is not set
653# CONFIG_SENSORS_DME1737 is not set
707# CONFIG_SENSORS_SMSC47M1 is not set 654# CONFIG_SENSORS_SMSC47M1 is not set
708# CONFIG_SENSORS_SMSC47M192 is not set 655# CONFIG_SENSORS_SMSC47M192 is not set
709# CONFIG_SENSORS_SMSC47B397 is not set 656# CONFIG_SENSORS_SMSC47B397 is not set
657# CONFIG_SENSORS_THMC50 is not set
710# CONFIG_SENSORS_VIA686A is not set 658# CONFIG_SENSORS_VIA686A is not set
711# CONFIG_SENSORS_VT1211 is not set 659# CONFIG_SENSORS_VT1211 is not set
712# CONFIG_SENSORS_VT8231 is not set 660# CONFIG_SENSORS_VT8231 is not set
@@ -741,6 +689,7 @@ CONFIG_DAB=y
741# 689#
742# CONFIG_DISPLAY_SUPPORT is not set 690# CONFIG_DISPLAY_SUPPORT is not set
743# CONFIG_VGASTATE is not set 691# CONFIG_VGASTATE is not set
692CONFIG_VIDEO_OUTPUT_CONTROL=m
744# CONFIG_FB is not set 693# CONFIG_FB is not set
745# CONFIG_FB_IBM_GXT4500 is not set 694# CONFIG_FB_IBM_GXT4500 is not set
746 695
@@ -748,20 +697,16 @@ CONFIG_DAB=y
748# Sound 697# Sound
749# 698#
750# CONFIG_SOUND is not set 699# CONFIG_SOUND is not set
751 700CONFIG_HID_SUPPORT=y
752#
753# HID Devices
754#
755CONFIG_HID=y 701CONFIG_HID=y
756# CONFIG_HID_DEBUG is not set 702# CONFIG_HID_DEBUG is not set
757 703CONFIG_USB_SUPPORT=y
758#
759# USB support
760#
761CONFIG_USB_ARCH_HAS_HCD=y 704CONFIG_USB_ARCH_HAS_HCD=y
762CONFIG_USB_ARCH_HAS_OHCI=y 705CONFIG_USB_ARCH_HAS_OHCI=y
763CONFIG_USB_ARCH_HAS_EHCI=y 706CONFIG_USB_ARCH_HAS_EHCI=y
764# CONFIG_USB is not set 707# CONFIG_USB is not set
708CONFIG_USB_EHCI_ROOT_HUB_TT=y
709CONFIG_USB_EHCI_FSL=y
765 710
766# 711#
767# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -772,32 +717,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
772# 717#
773# CONFIG_USB_GADGET is not set 718# CONFIG_USB_GADGET is not set
774# CONFIG_MMC is not set 719# CONFIG_MMC is not set
775
776#
777# LED devices
778#
779# CONFIG_NEW_LEDS is not set 720# CONFIG_NEW_LEDS is not set
780
781#
782# LED drivers
783#
784
785#
786# LED Triggers
787#
788
789#
790# InfiniBand support
791#
792# CONFIG_INFINIBAND is not set 721# CONFIG_INFINIBAND is not set
793 722# CONFIG_EDAC is not set
794#
795# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
796#
797
798#
799# Real Time Clock
800#
801# CONFIG_RTC_CLASS is not set 723# CONFIG_RTC_CLASS is not set
802 724
803# 725#
@@ -814,6 +736,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
814# 736#
815 737
816# 738#
739# Userspace I/O
740#
741# CONFIG_UIO is not set
742
743#
817# File systems 744# File systems
818# 745#
819CONFIG_EXT2_FS=y 746CONFIG_EXT2_FS=y
@@ -909,7 +836,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
909# CONFIG_NCP_FS is not set 836# CONFIG_NCP_FS is not set
910# CONFIG_CODA_FS is not set 837# CONFIG_CODA_FS is not set
911# CONFIG_AFS_FS is not set 838# CONFIG_AFS_FS is not set
912# CONFIG_9P_FS is not set
913 839
914# 840#
915# Partition Types 841# Partition Types
@@ -948,6 +874,7 @@ CONFIG_BITREVERSE=y
948# CONFIG_CRC16 is not set 874# CONFIG_CRC16 is not set
949# CONFIG_CRC_ITU_T is not set 875# CONFIG_CRC_ITU_T is not set
950CONFIG_CRC32=y 876CONFIG_CRC32=y
877# CONFIG_CRC7 is not set
951# CONFIG_LIBCRC32C is not set 878# CONFIG_LIBCRC32C is not set
952CONFIG_PLIST=y 879CONFIG_PLIST=y
953CONFIG_HAS_IOMEM=y 880CONFIG_HAS_IOMEM=y
@@ -970,7 +897,6 @@ CONFIG_ENABLE_MUST_CHECK=y
970# CONFIG_HEADERS_CHECK is not set 897# CONFIG_HEADERS_CHECK is not set
971# CONFIG_DEBUG_KERNEL is not set 898# CONFIG_DEBUG_KERNEL is not set
972# CONFIG_DEBUG_BUGVERBOSE is not set 899# CONFIG_DEBUG_BUGVERBOSE is not set
973# CONFIG_BOOTX_TEXT is not set
974# CONFIG_PPC_EARLY_DEBUG is not set 900# CONFIG_PPC_EARLY_DEBUG is not set
975 901
976# 902#
@@ -978,10 +904,6 @@ CONFIG_ENABLE_MUST_CHECK=y
978# 904#
979# CONFIG_KEYS is not set 905# CONFIG_KEYS is not set
980# CONFIG_SECURITY is not set 906# CONFIG_SECURITY is not set
981
982#
983# Cryptographic options
984#
985CONFIG_CRYPTO=y 907CONFIG_CRYPTO=y
986CONFIG_CRYPTO_ALGAPI=y 908CONFIG_CRYPTO_ALGAPI=y
987CONFIG_CRYPTO_BLKCIPHER=y 909CONFIG_CRYPTO_BLKCIPHER=y
@@ -1019,7 +941,4 @@ CONFIG_CRYPTO_DES=y
1019# CONFIG_CRYPTO_CRC32C is not set 941# CONFIG_CRYPTO_CRC32C is not set
1020# CONFIG_CRYPTO_CAMELLIA is not set 942# CONFIG_CRYPTO_CAMELLIA is not set
1021# CONFIG_CRYPTO_TEST is not set 943# CONFIG_CRYPTO_TEST is not set
1022 944CONFIG_CRYPTO_HW=y
1023#
1024# Hardware crypto devices
1025#
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index bcbbc167f90d..3045749d62fe 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_mds_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:57 2007 4# Tue Aug 28 21:24:42 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_83xx=y
18CONFIG_PPC_FPU=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
7CONFIG_PPC32=y 23CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 24CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 25CONFIG_MMU=y
@@ -14,61 +30,38 @@ 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
23CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
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
27CONFIG_DEFAULT_UIMAGE=y 45CONFIG_DEFAULT_UIMAGE=y
28
29#
30# Processor support
31#
32# CONFIG_CLASSIC32 is not set
33# CONFIG_PPC_82xx is not set
34CONFIG_PPC_83xx=y
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_83xx=y
43CONFIG_PPC_FPU=y
44# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
45# CONFIG_PPC_DCR_MMIO is not set 47# CONFIG_PPC_DCR_MMIO 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" 48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
51 49
52# 50#
53# Code maturity level options 51# General setup
54# 52#
55CONFIG_EXPERIMENTAL=y 53CONFIG_EXPERIMENTAL=y
56CONFIG_BROKEN_ON_SMP=y 54CONFIG_BROKEN_ON_SMP=y
57CONFIG_INIT_ENV_ARG_LIMIT=32 55CONFIG_INIT_ENV_ARG_LIMIT=32
58
59#
60# General setup
61#
62CONFIG_LOCALVERSION="" 56CONFIG_LOCALVERSION=""
63CONFIG_LOCALVERSION_AUTO=y 57CONFIG_LOCALVERSION_AUTO=y
64CONFIG_SWAP=y 58CONFIG_SWAP=y
65CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
66# CONFIG_IPC_NS is not set
67CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_POSIX_MQUEUE is not set 61# CONFIG_POSIX_MQUEUE is not set
69# CONFIG_BSD_PROCESS_ACCT is not set 62# CONFIG_BSD_PROCESS_ACCT is not set
70# CONFIG_TASKSTATS is not set 63# CONFIG_TASKSTATS is not set
71# CONFIG_UTS_NS is not set 64# CONFIG_USER_NS is not set
72# CONFIG_AUDIT is not set 65# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
@@ -100,24 +93,17 @@ CONFIG_SLAB=y
100CONFIG_RT_MUTEXES=y 93CONFIG_RT_MUTEXES=y
101# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
102CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
103
104#
105# Loadable module support
106#
107CONFIG_MODULES=y 96CONFIG_MODULES=y
108CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
109# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
110# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
111# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
112# CONFIG_KMOD is not set 101# CONFIG_KMOD is not set
113
114#
115# Block layer
116#
117CONFIG_BLOCK=y 102CONFIG_BLOCK=y
118# CONFIG_LBD is not set 103# CONFIG_LBD is not set
119# CONFIG_BLK_DEV_IO_TRACE is not set 104# CONFIG_BLK_DEV_IO_TRACE is not set
120# CONFIG_LSF is not set 105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
121 107
122# 108#
123# IO Schedulers 109# IO Schedulers
@@ -135,6 +121,11 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 121#
136# Platform support 122# Platform support
137# 123#
124# CONFIG_PPC_MULTIPLATFORM is not set
125# CONFIG_EMBEDDED6xx is not set
126# CONFIG_PPC_82xx is not set
127CONFIG_PPC_83xx=y
128# CONFIG_PPC_86xx is not set
138# CONFIG_PPC_MPC52xx is not set 129# CONFIG_PPC_MPC52xx is not set
139# CONFIG_PPC_MPC5200 is not set 130# CONFIG_PPC_MPC5200 is not set
140# CONFIG_PPC_CELL is not set 131# CONFIG_PPC_CELL is not set
@@ -159,6 +150,7 @@ CONFIG_PPC_MPC836x=y
159# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
160CONFIG_QUICC_ENGINE=y 151CONFIG_QUICC_ENGINE=y
161# CONFIG_CPM2 is not set 152# CONFIG_CPM2 is not set
153# CONFIG_FSL_ULI1575 is not set
162 154
163# 155#
164# Kernel options 156# Kernel options
@@ -187,6 +179,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
187CONFIG_SPLIT_PTLOCK_CPUS=4 179CONFIG_SPLIT_PTLOCK_CPUS=4
188# CONFIG_RESOURCES_64BIT is not set 180# CONFIG_RESOURCES_64BIT is not set
189CONFIG_ZONE_DMA_FLAG=1 181CONFIG_ZONE_DMA_FLAG=1
182CONFIG_BOUNCE=y
183CONFIG_VIRT_TO_BUS=y
190CONFIG_PROC_DEVICETREE=y 184CONFIG_PROC_DEVICETREE=y
191# CONFIG_CMDLINE_BOOL is not set 185# CONFIG_CMDLINE_BOOL is not set
192# CONFIG_PM is not set 186# CONFIG_PM is not set
@@ -201,10 +195,10 @@ CONFIG_ISA_DMA_API=y
201CONFIG_ZONE_DMA=y 195CONFIG_ZONE_DMA=y
202CONFIG_GENERIC_ISA_DMA=y 196CONFIG_GENERIC_ISA_DMA=y
203CONFIG_PPC_INDIRECT_PCI=y 197CONFIG_PPC_INDIRECT_PCI=y
204# CONFIG_PPC_INDIRECT_PCI_BE is not set
205CONFIG_FSL_SOC=y 198CONFIG_FSL_SOC=y
206CONFIG_PCI=y 199CONFIG_PCI=y
207CONFIG_PCI_DOMAINS=y 200CONFIG_PCI_DOMAINS=y
201CONFIG_PCI_SYSCALL=y
208# CONFIG_PCIEPORTBUS is not set 202# CONFIG_PCIEPORTBUS is not set
209CONFIG_ARCH_SUPPORTS_MSI=y 203CONFIG_ARCH_SUPPORTS_MSI=y
210# CONFIG_PCI_MSI is not set 204# CONFIG_PCI_MSI is not set
@@ -314,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
314# CONFIG_MAC80211 is not set 308# CONFIG_MAC80211 is not set
315# CONFIG_IEEE80211 is not set 309# CONFIG_IEEE80211 is not set
316# CONFIG_RFKILL is not set 310# CONFIG_RFKILL is not set
311# CONFIG_NET_9P is not set
317 312
318# 313#
319# Device Drivers 314# Device Drivers
@@ -326,26 +321,11 @@ CONFIG_STANDALONE=y
326CONFIG_PREVENT_FIRMWARE_BUILD=y 321CONFIG_PREVENT_FIRMWARE_BUILD=y
327# CONFIG_FW_LOADER is not set 322# CONFIG_FW_LOADER is not set
328# CONFIG_SYS_HYPERVISOR is not set 323# CONFIG_SYS_HYPERVISOR is not set
329
330#
331# Connector - unified userspace <-> kernelspace linker
332#
333# CONFIG_CONNECTOR is not set 324# CONFIG_CONNECTOR is not set
334# CONFIG_MTD is not set 325# CONFIG_MTD is not set
335 326CONFIG_OF_DEVICE=y
336#
337# Parallel port support
338#
339# CONFIG_PARPORT is not set 327# CONFIG_PARPORT is not set
340 328CONFIG_BLK_DEV=y
341#
342# Plug and Play support
343#
344# CONFIG_PNPACPI is not set
345
346#
347# Block devices
348#
349# CONFIG_BLK_DEV_FD is not set 329# CONFIG_BLK_DEV_FD is not set
350# CONFIG_BLK_CPQ_DA is not set 330# CONFIG_BLK_CPQ_DA is not set
351# CONFIG_BLK_CPQ_CISS_DA is not set 331# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -362,14 +342,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
362CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 342CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
363# CONFIG_CDROM_PKTCDVD is not set 343# CONFIG_CDROM_PKTCDVD is not set
364# CONFIG_ATA_OVER_ETH is not set 344# CONFIG_ATA_OVER_ETH is not set
365 345CONFIG_MISC_DEVICES=y
366#
367# Misc devices
368#
369# CONFIG_PHANTOM is not set 346# CONFIG_PHANTOM is not set
347# CONFIG_EEPROM_93CX6 is not set
370# CONFIG_SGI_IOC4 is not set 348# CONFIG_SGI_IOC4 is not set
371# CONFIG_TIFM_CORE is not set 349# CONFIG_TIFM_CORE is not set
372# CONFIG_BLINK is not set
373# CONFIG_IDE is not set 350# CONFIG_IDE is not set
374 351
375# 352#
@@ -377,6 +354,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
377# 354#
378# CONFIG_RAID_ATTRS is not set 355# CONFIG_RAID_ATTRS is not set
379CONFIG_SCSI=y 356CONFIG_SCSI=y
357CONFIG_SCSI_DMA=y
380# CONFIG_SCSI_TGT is not set 358# CONFIG_SCSI_TGT is not set
381# CONFIG_SCSI_NETLINK is not set 359# CONFIG_SCSI_NETLINK is not set
382CONFIG_SCSI_PROC_FS=y 360CONFIG_SCSI_PROC_FS=y
@@ -406,12 +384,8 @@ CONFIG_SCSI_WAIT_SCAN=m
406# CONFIG_SCSI_SPI_ATTRS is not set 384# CONFIG_SCSI_SPI_ATTRS is not set
407# CONFIG_SCSI_FC_ATTRS is not set 385# CONFIG_SCSI_FC_ATTRS is not set
408# CONFIG_SCSI_ISCSI_ATTRS is not set 386# CONFIG_SCSI_ISCSI_ATTRS is not set
409# CONFIG_SCSI_SAS_ATTRS is not set
410# CONFIG_SCSI_SAS_LIBSAS is not set 387# CONFIG_SCSI_SAS_LIBSAS is not set
411 388CONFIG_SCSI_LOWLEVEL=y
412#
413# SCSI low-level drivers
414#
415# CONFIG_ISCSI_TCP is not set 389# CONFIG_ISCSI_TCP is not set
416# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 390# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
417# CONFIG_SCSI_3W_9XXX is not set 391# CONFIG_SCSI_3W_9XXX is not set
@@ -447,10 +421,6 @@ CONFIG_SCSI_WAIT_SCAN=m
447# CONFIG_SCSI_DEBUG is not set 421# CONFIG_SCSI_DEBUG is not set
448# CONFIG_SCSI_SRP is not set 422# CONFIG_SCSI_SRP is not set
449# CONFIG_ATA is not set 423# CONFIG_ATA is not set
450
451#
452# Multi-device support (RAID and LVM)
453#
454# CONFIG_MD is not set 424# CONFIG_MD is not set
455 425
456# 426#
@@ -466,19 +436,13 @@ CONFIG_SCSI_WAIT_SCAN=m
466# 436#
467# CONFIG_FIREWIRE is not set 437# CONFIG_FIREWIRE is not set
468# CONFIG_IEEE1394 is not set 438# CONFIG_IEEE1394 is not set
469
470#
471# I2O device support
472#
473# CONFIG_I2O is not set 439# CONFIG_I2O is not set
474# CONFIG_MACINTOSH_DRIVERS is not set 440# CONFIG_MACINTOSH_DRIVERS is not set
475
476#
477# Network device support
478#
479CONFIG_NETDEVICES=y 441CONFIG_NETDEVICES=y
442# CONFIG_NETDEVICES_MULTIQUEUE is not set
480# CONFIG_DUMMY is not set 443# CONFIG_DUMMY is not set
481# CONFIG_BONDING is not set 444# CONFIG_BONDING is not set
445# CONFIG_MACVLAN is not set
482# CONFIG_EQUALIZER is not set 446# CONFIG_EQUALIZER is not set
483# CONFIG_TUN is not set 447# CONFIG_TUN is not set
484# CONFIG_ARCNET is not set 448# CONFIG_ARCNET is not set
@@ -495,21 +459,14 @@ CONFIG_MARVELL_PHY=y
495# CONFIG_VITESSE_PHY is not set 459# CONFIG_VITESSE_PHY is not set
496# CONFIG_SMSC_PHY is not set 460# CONFIG_SMSC_PHY is not set
497# CONFIG_BROADCOM_PHY is not set 461# CONFIG_BROADCOM_PHY is not set
462# CONFIG_ICPLUS_PHY is not set
498# CONFIG_FIXED_PHY is not set 463# CONFIG_FIXED_PHY is not set
499
500#
501# Ethernet (10 or 100Mbit)
502#
503CONFIG_NET_ETHERNET=y 464CONFIG_NET_ETHERNET=y
504CONFIG_MII=y 465CONFIG_MII=y
505# CONFIG_HAPPYMEAL is not set 466# CONFIG_HAPPYMEAL is not set
506# CONFIG_SUNGEM is not set 467# CONFIG_SUNGEM is not set
507# CONFIG_CASSINI is not set 468# CONFIG_CASSINI is not set
508# CONFIG_NET_VENDOR_3COM is not set 469# CONFIG_NET_VENDOR_3COM is not set
509
510#
511# Tulip family network device support
512#
513# CONFIG_NET_TULIP is not set 470# CONFIG_NET_TULIP is not set
514# CONFIG_HP100 is not set 471# CONFIG_HP100 is not set
515# CONFIG_NET_PCI is not set 472# CONFIG_NET_PCI is not set
@@ -524,7 +481,6 @@ CONFIG_NETDEV_1000=y
524# CONFIG_SIS190 is not set 481# CONFIG_SIS190 is not set
525# CONFIG_SKGE is not set 482# CONFIG_SKGE is not set
526# CONFIG_SKY2 is not set 483# CONFIG_SKY2 is not set
527# CONFIG_SK98LIN is not set
528# CONFIG_VIA_VELOCITY is not set 484# CONFIG_VIA_VELOCITY is not set
529# CONFIG_TIGON3 is not set 485# CONFIG_TIGON3 is not set
530# CONFIG_BNX2 is not set 486# CONFIG_BNX2 is not set
@@ -561,15 +517,7 @@ CONFIG_NETDEV_10000=y
561# CONFIG_NETCONSOLE is not set 517# CONFIG_NETCONSOLE is not set
562# CONFIG_NETPOLL is not set 518# CONFIG_NETPOLL is not set
563# CONFIG_NET_POLL_CONTROLLER is not set 519# CONFIG_NET_POLL_CONTROLLER is not set
564
565#
566# ISDN subsystem
567#
568# CONFIG_ISDN is not set 520# CONFIG_ISDN is not set
569
570#
571# Telephony Support
572#
573# CONFIG_PHONE is not set 521# CONFIG_PHONE is not set
574 522
575# 523#
@@ -631,10 +579,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
631CONFIG_UNIX98_PTYS=y 579CONFIG_UNIX98_PTYS=y
632CONFIG_LEGACY_PTYS=y 580CONFIG_LEGACY_PTYS=y
633CONFIG_LEGACY_PTY_COUNT=256 581CONFIG_LEGACY_PTY_COUNT=256
634
635#
636# IPMI
637#
638# CONFIG_IPMI_HANDLER is not set 582# CONFIG_IPMI_HANDLER is not set
639CONFIG_WATCHDOG=y 583CONFIG_WATCHDOG=y
640# CONFIG_WATCHDOG_NOWAYOUT is not set 584# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -659,10 +603,6 @@ CONFIG_GEN_RTC=y
659# CONFIG_AGP is not set 603# CONFIG_AGP is not set
660# CONFIG_DRM is not set 604# CONFIG_DRM is not set
661# CONFIG_RAW_DRIVER is not set 605# CONFIG_RAW_DRIVER is not set
662
663#
664# TPM devices
665#
666# CONFIG_TCG_TPM is not set 606# CONFIG_TCG_TPM is not set
667CONFIG_DEVPORT=y 607CONFIG_DEVPORT=y
668CONFIG_I2C=y 608CONFIG_I2C=y
@@ -697,6 +637,7 @@ CONFIG_I2C_MPC=y
697# CONFIG_I2C_SIS5595 is not set 637# CONFIG_I2C_SIS5595 is not set
698# CONFIG_I2C_SIS630 is not set 638# CONFIG_I2C_SIS630 is not set
699# CONFIG_I2C_SIS96X is not set 639# CONFIG_I2C_SIS96X is not set
640# CONFIG_I2C_TAOS_EVM is not set
700# CONFIG_I2C_STUB is not set 641# CONFIG_I2C_STUB is not set
701# CONFIG_I2C_VIA is not set 642# CONFIG_I2C_VIA is not set
702# CONFIG_I2C_VIAPRO is not set 643# CONFIG_I2C_VIAPRO is not set
@@ -707,12 +648,14 @@ CONFIG_I2C_MPC=y
707# 648#
708# CONFIG_SENSORS_DS1337 is not set 649# CONFIG_SENSORS_DS1337 is not set
709# CONFIG_SENSORS_DS1374 is not set 650# CONFIG_SENSORS_DS1374 is not set
651# CONFIG_DS1682 is not set
710# CONFIG_SENSORS_EEPROM is not set 652# CONFIG_SENSORS_EEPROM is not set
711# CONFIG_SENSORS_PCF8574 is not set 653# CONFIG_SENSORS_PCF8574 is not set
712# CONFIG_SENSORS_PCA9539 is not set 654# CONFIG_SENSORS_PCA9539 is not set
713# CONFIG_SENSORS_PCF8591 is not set 655# CONFIG_SENSORS_PCF8591 is not set
714# CONFIG_SENSORS_M41T00 is not set 656# CONFIG_SENSORS_M41T00 is not set
715# CONFIG_SENSORS_MAX6875 is not set 657# CONFIG_SENSORS_MAX6875 is not set
658# CONFIG_SENSORS_TSL2550 is not set
716# CONFIG_I2C_DEBUG_CORE is not set 659# CONFIG_I2C_DEBUG_CORE is not set
717# CONFIG_I2C_DEBUG_ALGO is not set 660# CONFIG_I2C_DEBUG_ALGO is not set
718# CONFIG_I2C_DEBUG_BUS is not set 661# CONFIG_I2C_DEBUG_BUS is not set
@@ -723,14 +666,12 @@ CONFIG_I2C_MPC=y
723# 666#
724# CONFIG_SPI is not set 667# CONFIG_SPI is not set
725# CONFIG_SPI_MASTER is not set 668# CONFIG_SPI_MASTER is not set
726
727#
728# Dallas's 1-wire bus
729#
730# CONFIG_W1 is not set 669# CONFIG_W1 is not set
670# CONFIG_POWER_SUPPLY is not set
731CONFIG_HWMON=y 671CONFIG_HWMON=y
732# CONFIG_HWMON_VID is not set 672# CONFIG_HWMON_VID is not set
733# CONFIG_SENSORS_ABITUGURU is not set 673# CONFIG_SENSORS_ABITUGURU is not set
674# CONFIG_SENSORS_ABITUGURU3 is not set
734# CONFIG_SENSORS_AD7418 is not set 675# CONFIG_SENSORS_AD7418 is not set
735# CONFIG_SENSORS_ADM1021 is not set 676# CONFIG_SENSORS_ADM1021 is not set
736# CONFIG_SENSORS_ADM1025 is not set 677# CONFIG_SENSORS_ADM1025 is not set
@@ -757,14 +698,17 @@ CONFIG_HWMON=y
757# CONFIG_SENSORS_LM87 is not set 698# CONFIG_SENSORS_LM87 is not set
758# CONFIG_SENSORS_LM90 is not set 699# CONFIG_SENSORS_LM90 is not set
759# CONFIG_SENSORS_LM92 is not set 700# CONFIG_SENSORS_LM92 is not set
701# CONFIG_SENSORS_LM93 is not set
760# CONFIG_SENSORS_MAX1619 is not set 702# CONFIG_SENSORS_MAX1619 is not set
761# CONFIG_SENSORS_MAX6650 is not set 703# CONFIG_SENSORS_MAX6650 is not set
762# CONFIG_SENSORS_PC87360 is not set 704# CONFIG_SENSORS_PC87360 is not set
763# CONFIG_SENSORS_PC87427 is not set 705# CONFIG_SENSORS_PC87427 is not set
764# CONFIG_SENSORS_SIS5595 is not set 706# CONFIG_SENSORS_SIS5595 is not set
707# CONFIG_SENSORS_DME1737 is not set
765# CONFIG_SENSORS_SMSC47M1 is not set 708# CONFIG_SENSORS_SMSC47M1 is not set
766# CONFIG_SENSORS_SMSC47M192 is not set 709# CONFIG_SENSORS_SMSC47M192 is not set
767# CONFIG_SENSORS_SMSC47B397 is not set 710# CONFIG_SENSORS_SMSC47B397 is not set
711# CONFIG_SENSORS_THMC50 is not set
768# CONFIG_SENSORS_VIA686A is not set 712# CONFIG_SENSORS_VIA686A is not set
769# CONFIG_SENSORS_VT1211 is not set 713# CONFIG_SENSORS_VT1211 is not set
770# CONFIG_SENSORS_VT8231 is not set 714# CONFIG_SENSORS_VT8231 is not set
@@ -799,6 +743,7 @@ CONFIG_DAB=y
799# 743#
800# CONFIG_DISPLAY_SUPPORT is not set 744# CONFIG_DISPLAY_SUPPORT is not set
801# CONFIG_VGASTATE is not set 745# CONFIG_VGASTATE is not set
746CONFIG_VIDEO_OUTPUT_CONTROL=m
802# CONFIG_FB is not set 747# CONFIG_FB is not set
803# CONFIG_FB_IBM_GXT4500 is not set 748# CONFIG_FB_IBM_GXT4500 is not set
804 749
@@ -806,16 +751,10 @@ CONFIG_DAB=y
806# Sound 751# Sound
807# 752#
808# CONFIG_SOUND is not set 753# CONFIG_SOUND is not set
809 754CONFIG_HID_SUPPORT=y
810#
811# HID Devices
812#
813CONFIG_HID=y 755CONFIG_HID=y
814# CONFIG_HID_DEBUG is not set 756# CONFIG_HID_DEBUG is not set
815 757CONFIG_USB_SUPPORT=y
816#
817# USB support
818#
819CONFIG_USB_ARCH_HAS_HCD=y 758CONFIG_USB_ARCH_HAS_HCD=y
820CONFIG_USB_ARCH_HAS_OHCI=y 759CONFIG_USB_ARCH_HAS_OHCI=y
821CONFIG_USB_ARCH_HAS_EHCI=y 760CONFIG_USB_ARCH_HAS_EHCI=y
@@ -830,32 +769,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
830# 769#
831# CONFIG_USB_GADGET is not set 770# CONFIG_USB_GADGET is not set
832# CONFIG_MMC is not set 771# CONFIG_MMC is not set
833
834#
835# LED devices
836#
837# CONFIG_NEW_LEDS is not set 772# CONFIG_NEW_LEDS is not set
838
839#
840# LED drivers
841#
842
843#
844# LED Triggers
845#
846
847#
848# InfiniBand support
849#
850# CONFIG_INFINIBAND is not set 773# CONFIG_INFINIBAND is not set
851 774# CONFIG_EDAC is not set
852#
853# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
854#
855
856#
857# Real Time Clock
858#
859# CONFIG_RTC_CLASS is not set 775# CONFIG_RTC_CLASS is not set
860 776
861# 777#
@@ -872,6 +788,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
872# 788#
873 789
874# 790#
791# Userspace I/O
792#
793# CONFIG_UIO is not set
794
795#
875# File systems 796# File systems
876# 797#
877CONFIG_EXT2_FS=y 798CONFIG_EXT2_FS=y
@@ -967,7 +888,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
967# CONFIG_NCP_FS is not set 888# CONFIG_NCP_FS is not set
968# CONFIG_CODA_FS is not set 889# CONFIG_CODA_FS is not set
969# CONFIG_AFS_FS is not set 890# CONFIG_AFS_FS is not set
970# CONFIG_9P_FS is not set
971 891
972# 892#
973# Partition Types 893# Partition Types
@@ -1008,6 +928,7 @@ CONFIG_BITREVERSE=y
1008# CONFIG_CRC16 is not set 928# CONFIG_CRC16 is not set
1009# CONFIG_CRC_ITU_T is not set 929# CONFIG_CRC_ITU_T is not set
1010CONFIG_CRC32=y 930CONFIG_CRC32=y
931# CONFIG_CRC7 is not set
1011# CONFIG_LIBCRC32C is not set 932# CONFIG_LIBCRC32C is not set
1012CONFIG_PLIST=y 933CONFIG_PLIST=y
1013CONFIG_HAS_IOMEM=y 934CONFIG_HAS_IOMEM=y
@@ -1030,7 +951,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1030# CONFIG_HEADERS_CHECK is not set 951# CONFIG_HEADERS_CHECK is not set
1031# CONFIG_DEBUG_KERNEL is not set 952# CONFIG_DEBUG_KERNEL is not set
1032# CONFIG_DEBUG_BUGVERBOSE is not set 953# CONFIG_DEBUG_BUGVERBOSE is not set
1033# CONFIG_BOOTX_TEXT is not set
1034# CONFIG_PPC_EARLY_DEBUG is not set 954# CONFIG_PPC_EARLY_DEBUG is not set
1035 955
1036# 956#
@@ -1038,10 +958,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1038# 958#
1039# CONFIG_KEYS is not set 959# CONFIG_KEYS is not set
1040# CONFIG_SECURITY is not set 960# CONFIG_SECURITY is not set
1041
1042#
1043# Cryptographic options
1044#
1045CONFIG_CRYPTO=y 961CONFIG_CRYPTO=y
1046CONFIG_CRYPTO_ALGAPI=y 962CONFIG_CRYPTO_ALGAPI=y
1047CONFIG_CRYPTO_BLKCIPHER=y 963CONFIG_CRYPTO_BLKCIPHER=y
@@ -1079,7 +995,4 @@ CONFIG_CRYPTO_DES=y
1079# CONFIG_CRYPTO_CRC32C is not set 995# CONFIG_CRYPTO_CRC32C is not set
1080# CONFIG_CRYPTO_CAMELLIA is not set 996# CONFIG_CRYPTO_CAMELLIA is not set
1081# CONFIG_CRYPTO_TEST is not set 997# CONFIG_CRYPTO_TEST is not set
1082 998CONFIG_CRYPTO_HW=y
1083#
1084# Hardware crypto devices
1085#
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index faedcf8d64a7..b282c3521dd5 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:58 2007 4# Tue Aug 28 21:24:42 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
12CONFIG_PPC_85xx=y
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_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
7CONFIG_PPC32=y 24CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 26CONFIG_MMU=y
@@ -14,61 +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
24# CONFIG_GENERIC_TBSYNC is not set 43# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 44CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 45CONFIG_GENERIC_BUG=y
27CONFIG_DEFAULT_UIMAGE=y 46CONFIG_DEFAULT_UIMAGE=y
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
35CONFIG_PPC_85xx=y
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_85xx=y
42CONFIG_E500=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
45CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
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
68# CONFIG_POSIX_MQUEUE is not set 62# CONFIG_POSIX_MQUEUE is not set
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,19 +96,12 @@ 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#
109# CONFIG_MODULES is not set 99# CONFIG_MODULES is not set
110
111#
112# Block layer
113#
114CONFIG_BLOCK=y 100CONFIG_BLOCK=y
115# CONFIG_LBD is not set 101# CONFIG_LBD is not set
116# CONFIG_BLK_DEV_IO_TRACE is not set 102# CONFIG_BLK_DEV_IO_TRACE is not set
117# CONFIG_LSF is not set 103# CONFIG_LSF is not set
104# CONFIG_BLK_DEV_BSG is not set
118 105
119# 106#
120# IO Schedulers 107# IO Schedulers
@@ -155,6 +142,7 @@ CONFIG_MPIC=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
185# CONFIG_RESOURCES_64BIT is not set 173# CONFIG_RESOURCES_64BIT is not set
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
189# CONFIG_PM is not set 179# CONFIG_PM is not set
@@ -197,10 +187,10 @@ CONFIG_ISA_DMA_API=y
197# 187#
198CONFIG_ZONE_DMA=y 188CONFIG_ZONE_DMA=y
199CONFIG_PPC_INDIRECT_PCI=y 189CONFIG_PPC_INDIRECT_PCI=y
200CONFIG_PPC_INDIRECT_PCI_BE=y
201CONFIG_FSL_SOC=y 190CONFIG_FSL_SOC=y
202# CONFIG_PCI is not set 191# CONFIG_PCI is not set
203# CONFIG_PCI_DOMAINS is not set 192# CONFIG_PCI_DOMAINS is not set
193# CONFIG_PCI_SYSCALL is not set
204# CONFIG_ARCH_SUPPORTS_MSI is not set 194# CONFIG_ARCH_SUPPORTS_MSI is not set
205 195
206# 196#
@@ -307,6 +297,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
307# CONFIG_MAC80211 is not set 297# CONFIG_MAC80211 is not set
308# CONFIG_IEEE80211 is not set 298# CONFIG_IEEE80211 is not set
309# CONFIG_RFKILL is not set 299# CONFIG_RFKILL is not set
300# CONFIG_NET_9P is not set
310 301
311# 302#
312# Device Drivers 303# Device Drivers
@@ -321,26 +312,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_DEBUG_DRIVER is not set 312# CONFIG_DEBUG_DRIVER is not set
322# CONFIG_DEBUG_DEVRES is not set 313# CONFIG_DEBUG_DEVRES is not set
323# CONFIG_SYS_HYPERVISOR is not set 314# CONFIG_SYS_HYPERVISOR is not set
324
325#
326# Connector - unified userspace <-> kernelspace linker
327#
328# CONFIG_CONNECTOR is not set 315# CONFIG_CONNECTOR is not set
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_DEV_COW_COMMON is not set 321# CONFIG_BLK_DEV_COW_COMMON is not set
346CONFIG_BLK_DEV_LOOP=y 322CONFIG_BLK_DEV_LOOP=y
@@ -352,11 +328,8 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
352CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 328CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
353# CONFIG_CDROM_PKTCDVD is not set 329# CONFIG_CDROM_PKTCDVD is not set
354# CONFIG_ATA_OVER_ETH is not set 330# CONFIG_ATA_OVER_ETH is not set
355 331CONFIG_MISC_DEVICES=y
356# 332# CONFIG_EEPROM_93CX6 is not set
357# Misc devices
358#
359# CONFIG_BLINK is not set
360# CONFIG_IDE is not set 333# CONFIG_IDE is not set
361 334
362# 335#
@@ -364,21 +337,16 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
364# 337#
365# CONFIG_RAID_ATTRS is not set 338# CONFIG_RAID_ATTRS is not set
366# CONFIG_SCSI is not set 339# CONFIG_SCSI is not set
340# CONFIG_SCSI_DMA is not set
367# CONFIG_SCSI_NETLINK is not set 341# CONFIG_SCSI_NETLINK is not set
368# CONFIG_ATA is not set 342# CONFIG_ATA is not set
369
370#
371# Multi-device support (RAID and LVM)
372#
373# CONFIG_MD is not set 343# CONFIG_MD is not set
374# CONFIG_MACINTOSH_DRIVERS is not set 344# CONFIG_MACINTOSH_DRIVERS is not set
375
376#
377# Network device support
378#
379CONFIG_NETDEVICES=y 345CONFIG_NETDEVICES=y
346# CONFIG_NETDEVICES_MULTIQUEUE is not set
380# CONFIG_DUMMY is not set 347# CONFIG_DUMMY is not set
381# CONFIG_BONDING is not set 348# CONFIG_BONDING is not set
349# CONFIG_MACVLAN is not set
382# CONFIG_EQUALIZER is not set 350# CONFIG_EQUALIZER is not set
383# CONFIG_TUN is not set 351# CONFIG_TUN is not set
384CONFIG_PHYLIB=y 352CONFIG_PHYLIB=y
@@ -394,11 +362,8 @@ CONFIG_PHYLIB=y
394# CONFIG_VITESSE_PHY is not set 362# CONFIG_VITESSE_PHY is not set
395# CONFIG_SMSC_PHY is not set 363# CONFIG_SMSC_PHY is not set
396# CONFIG_BROADCOM_PHY is not set 364# CONFIG_BROADCOM_PHY is not set
365# CONFIG_ICPLUS_PHY is not set
397# CONFIG_FIXED_PHY is not set 366# CONFIG_FIXED_PHY is not set
398
399#
400# Ethernet (10 or 100Mbit)
401#
402CONFIG_NET_ETHERNET=y 367CONFIG_NET_ETHERNET=y
403CONFIG_MII=y 368CONFIG_MII=y
404CONFIG_NETDEV_1000=y 369CONFIG_NETDEV_1000=y
@@ -418,15 +383,7 @@ CONFIG_NETDEV_10000=y
418# CONFIG_NETCONSOLE is not set 383# CONFIG_NETCONSOLE is not set
419# CONFIG_NETPOLL is not set 384# CONFIG_NETPOLL is not set
420# CONFIG_NET_POLL_CONTROLLER is not set 385# CONFIG_NET_POLL_CONTROLLER is not set
421
422#
423# ISDN subsystem
424#
425# CONFIG_ISDN is not set 386# CONFIG_ISDN is not set
426
427#
428# Telephony Support
429#
430# CONFIG_PHONE is not set 387# CONFIG_PHONE is not set
431 388
432# 389#
@@ -487,10 +444,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
487CONFIG_UNIX98_PTYS=y 444CONFIG_UNIX98_PTYS=y
488CONFIG_LEGACY_PTYS=y 445CONFIG_LEGACY_PTYS=y
489CONFIG_LEGACY_PTY_COUNT=256 446CONFIG_LEGACY_PTY_COUNT=256
490
491#
492# IPMI
493#
494# CONFIG_IPMI_HANDLER is not set 447# CONFIG_IPMI_HANDLER is not set
495# CONFIG_WATCHDOG is not set 448# CONFIG_WATCHDOG is not set
496# CONFIG_HW_RANDOM is not set 449# CONFIG_HW_RANDOM is not set
@@ -499,10 +452,6 @@ CONFIG_GEN_RTC=y
499# CONFIG_GEN_RTC_X is not set 452# CONFIG_GEN_RTC_X is not set
500# CONFIG_R3964 is not set 453# CONFIG_R3964 is not set
501# CONFIG_RAW_DRIVER is not set 454# CONFIG_RAW_DRIVER is not set
502
503#
504# TPM devices
505#
506# CONFIG_TCG_TPM is not set 455# CONFIG_TCG_TPM is not set
507# CONFIG_I2C is not set 456# CONFIG_I2C is not set
508 457
@@ -511,20 +460,21 @@ CONFIG_GEN_RTC=y
511# 460#
512# CONFIG_SPI is not set 461# CONFIG_SPI is not set
513# CONFIG_SPI_MASTER is not set 462# CONFIG_SPI_MASTER is not set
514
515#
516# Dallas's 1-wire bus
517#
518# CONFIG_W1 is not set 463# CONFIG_W1 is not set
464# CONFIG_POWER_SUPPLY is not set
519CONFIG_HWMON=y 465CONFIG_HWMON=y
520# CONFIG_HWMON_VID is not set 466# CONFIG_HWMON_VID is not set
521# CONFIG_SENSORS_ABITUGURU is not set 467# CONFIG_SENSORS_ABITUGURU is not set
468# CONFIG_SENSORS_ABITUGURU3 is not set
522# CONFIG_SENSORS_F71805F is not set 469# CONFIG_SENSORS_F71805F is not set
470# CONFIG_SENSORS_IT87 is not set
471# CONFIG_SENSORS_PC87360 is not set
523# CONFIG_SENSORS_PC87427 is not set 472# CONFIG_SENSORS_PC87427 is not set
524# CONFIG_SENSORS_SMSC47M1 is not set 473# CONFIG_SENSORS_SMSC47M1 is not set
525# CONFIG_SENSORS_SMSC47B397 is not set 474# CONFIG_SENSORS_SMSC47B397 is not set
526# CONFIG_SENSORS_VT1211 is not set 475# CONFIG_SENSORS_VT1211 is not set
527# CONFIG_SENSORS_W83627HF is not set 476# CONFIG_SENSORS_W83627HF is not set
477# CONFIG_SENSORS_W83627EHF is not set
528# CONFIG_HWMON_DEBUG_CHIP is not set 478# CONFIG_HWMON_DEBUG_CHIP is not set
529 479
530# 480#
@@ -549,6 +499,7 @@ CONFIG_DAB=y
549# 499#
550# CONFIG_DISPLAY_SUPPORT is not set 500# CONFIG_DISPLAY_SUPPORT is not set
551# CONFIG_VGASTATE is not set 501# CONFIG_VGASTATE is not set
502CONFIG_VIDEO_OUTPUT_CONTROL=y
552# CONFIG_FB is not set 503# CONFIG_FB is not set
553# CONFIG_FB_IBM_GXT4500 is not set 504# CONFIG_FB_IBM_GXT4500 is not set
554 505
@@ -556,16 +507,10 @@ CONFIG_DAB=y
556# Sound 507# Sound
557# 508#
558# CONFIG_SOUND is not set 509# CONFIG_SOUND is not set
559 510CONFIG_HID_SUPPORT=y
560#
561# HID Devices
562#
563CONFIG_HID=y 511CONFIG_HID=y
564# CONFIG_HID_DEBUG is not set 512# CONFIG_HID_DEBUG is not set
565 513CONFIG_USB_SUPPORT=y
566#
567# USB support
568#
569# CONFIG_USB_ARCH_HAS_HCD is not set 514# CONFIG_USB_ARCH_HAS_HCD is not set
570# CONFIG_USB_ARCH_HAS_OHCI is not set 515# CONFIG_USB_ARCH_HAS_OHCI is not set
571# CONFIG_USB_ARCH_HAS_EHCI is not set 516# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -579,31 +524,8 @@ CONFIG_HID=y
579# 524#
580# CONFIG_USB_GADGET is not set 525# CONFIG_USB_GADGET is not set
581# CONFIG_MMC is not set 526# CONFIG_MMC is not set
582
583#
584# LED devices
585#
586# CONFIG_NEW_LEDS is not set 527# CONFIG_NEW_LEDS is not set
587 528# CONFIG_EDAC is not set
588#
589# LED drivers
590#
591
592#
593# LED Triggers
594#
595
596#
597# InfiniBand support
598#
599
600#
601# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
602#
603
604#
605# Real Time Clock
606#
607# CONFIG_RTC_CLASS is not set 529# CONFIG_RTC_CLASS is not set
608 530
609# 531#
@@ -620,6 +542,11 @@ CONFIG_HID=y
620# 542#
621 543
622# 544#
545# Userspace I/O
546#
547# CONFIG_UIO is not set
548
549#
623# File systems 550# File systems
624# 551#
625CONFIG_EXT2_FS=y 552CONFIG_EXT2_FS=y
@@ -712,7 +639,6 @@ CONFIG_SUNRPC=y
712# CONFIG_NCP_FS is not set 639# CONFIG_NCP_FS is not set
713# CONFIG_CODA_FS is not set 640# CONFIG_CODA_FS is not set
714# CONFIG_AFS_FS is not set 641# CONFIG_AFS_FS is not set
715# CONFIG_9P_FS is not set
716 642
717# 643#
718# Partition Types 644# Partition Types
@@ -751,6 +677,7 @@ CONFIG_BITREVERSE=y
751# CONFIG_CRC16 is not set 677# CONFIG_CRC16 is not set
752# CONFIG_CRC_ITU_T is not set 678# CONFIG_CRC_ITU_T is not set
753CONFIG_CRC32=y 679CONFIG_CRC32=y
680# CONFIG_CRC7 is not set
754# CONFIG_LIBCRC32C is not set 681# CONFIG_LIBCRC32C is not set
755CONFIG_PLIST=y 682CONFIG_PLIST=y
756CONFIG_HAS_IOMEM=y 683CONFIG_HAS_IOMEM=y
@@ -774,6 +701,7 @@ CONFIG_ENABLE_MUST_CHECK=y
774CONFIG_DEBUG_KERNEL=y 701CONFIG_DEBUG_KERNEL=y
775# CONFIG_DEBUG_SHIRQ is not set 702# CONFIG_DEBUG_SHIRQ is not set
776CONFIG_DETECT_SOFTLOCKUP=y 703CONFIG_DETECT_SOFTLOCKUP=y
704CONFIG_SCHED_DEBUG=y
777# CONFIG_SCHEDSTATS is not set 705# CONFIG_SCHEDSTATS is not set
778# CONFIG_TIMER_STATS is not set 706# CONFIG_TIMER_STATS is not set
779# CONFIG_DEBUG_SLAB is not set 707# CONFIG_DEBUG_SLAB is not set
@@ -795,7 +723,6 @@ CONFIG_FORCED_INLINING=y
795# CONFIG_DEBUG_PAGEALLOC is not set 723# CONFIG_DEBUG_PAGEALLOC is not set
796# CONFIG_DEBUGGER is not set 724# CONFIG_DEBUGGER is not set
797# CONFIG_BDI_SWITCH is not set 725# CONFIG_BDI_SWITCH is not set
798# CONFIG_BOOTX_TEXT is not set
799# CONFIG_PPC_EARLY_DEBUG is not set 726# CONFIG_PPC_EARLY_DEBUG is not set
800 727
801# 728#
@@ -803,8 +730,4 @@ CONFIG_FORCED_INLINING=y
803# 730#
804# CONFIG_KEYS is not set 731# CONFIG_KEYS is not set
805# CONFIG_SECURITY is not set 732# CONFIG_SECURITY is not set
806
807#
808# Cryptographic options
809#
810# CONFIG_CRYPTO is not set 733# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index 7995231def26..86582aefab93 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22 3# Linux kernel version: 2.6.23-rc4
4# Fri Jul 20 14:09:13 2007 4# Wed Aug 29 16:41:04 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,7 +19,7 @@ CONFIG_E500=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y 20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set 21# CONFIG_PHYS_64BIT is not set
22# CONFIG_SPE is not set 22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
@@ -38,6 +38,7 @@ CONFIG_GENERIC_NVRAM=y
38CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 38CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
39CONFIG_ARCH_MAY_HAVE_PC_FDC=y 39CONFIG_ARCH_MAY_HAVE_PC_FDC=y
40CONFIG_PPC_OF=y 40CONFIG_PPC_OF=y
41CONFIG_OF=y
41CONFIG_PPC_UDBG_16550=y 42CONFIG_PPC_UDBG_16550=y
42# CONFIG_GENERIC_TBSYNC is not set 43# CONFIG_GENERIC_TBSYNC is not set
43CONFIG_AUDIT_ARCH=y 44CONFIG_AUDIT_ARCH=y
@@ -48,15 +49,11 @@ CONFIG_DEFAULT_UIMAGE=y
48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
49 50
50# 51#
51# Code maturity level options 52# General setup
52# 53#
53CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
54CONFIG_BROKEN_ON_SMP=y 55CONFIG_BROKEN_ON_SMP=y
55CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
56
57#
58# General setup
59#
60CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
61CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
62CONFIG_SWAP=y 59CONFIG_SWAP=y
@@ -82,7 +79,7 @@ CONFIG_EMBEDDED=y
82CONFIG_SYSCTL_SYSCALL=y 79CONFIG_SYSCTL_SYSCALL=y
83CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
84CONFIG_KALLSYMS_ALL=y 81CONFIG_KALLSYMS_ALL=y
85# CONFIG_KALLSYMS_EXTRA_PASS is not set 82CONFIG_KALLSYMS_EXTRA_PASS=y
86CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
87CONFIG_PRINTK=y 84CONFIG_PRINTK=y
88CONFIG_BUG=y 85CONFIG_BUG=y
@@ -152,6 +149,7 @@ CONFIG_PPC_I8259=y
152# CONFIG_GENERIC_IOMAP is not set 149# CONFIG_GENERIC_IOMAP is not set
153# CONFIG_CPU_FREQ is not set 150# CONFIG_CPU_FREQ is not set
154# CONFIG_CPM2 is not set 151# CONFIG_CPM2 is not set
152CONFIG_FSL_ULI1575=y
155 153
156# 154#
157# Kernel options 155# Kernel options
@@ -184,8 +182,7 @@ CONFIG_ZONE_DMA_FLAG=1
184CONFIG_BOUNCE=y 182CONFIG_BOUNCE=y
185CONFIG_VIRT_TO_BUS=y 183CONFIG_VIRT_TO_BUS=y
186CONFIG_PROC_DEVICETREE=y 184CONFIG_PROC_DEVICETREE=y
187CONFIG_CMDLINE_BOOL=y 185# CONFIG_CMDLINE_BOOL is not set
188CONFIG_CMDLINE="root=/dev/sda3 rw console=ttyS0,115200"
189# CONFIG_PM is not set 186# CONFIG_PM is not set
190CONFIG_SECCOMP=y 187CONFIG_SECCOMP=y
191CONFIG_WANT_DEVICE_TREE=y 188CONFIG_WANT_DEVICE_TREE=y
@@ -239,7 +236,7 @@ CONFIG_PACKET=y
239# CONFIG_PACKET_MMAP is not set 236# CONFIG_PACKET_MMAP is not set
240CONFIG_UNIX=y 237CONFIG_UNIX=y
241CONFIG_XFRM=y 238CONFIG_XFRM=y
242CONFIG_XFRM_USER=m 239CONFIG_XFRM_USER=y
243# CONFIG_XFRM_SUB_POLICY is not set 240# CONFIG_XFRM_SUB_POLICY is not set
244# CONFIG_XFRM_MIGRATE is not set 241# CONFIG_XFRM_MIGRATE is not set
245CONFIG_NET_KEY=m 242CONFIG_NET_KEY=m
@@ -279,9 +276,23 @@ CONFIG_INET_TCP_DIAG=y
279CONFIG_TCP_CONG_CUBIC=y 276CONFIG_TCP_CONG_CUBIC=y
280CONFIG_DEFAULT_TCP_CONG="cubic" 277CONFIG_DEFAULT_TCP_CONG="cubic"
281# CONFIG_TCP_MD5SIG is not set 278# CONFIG_TCP_MD5SIG is not set
282# CONFIG_IPV6 is not set 279CONFIG_IPV6=y
280# CONFIG_IPV6_PRIVACY is not set
281# CONFIG_IPV6_ROUTER_PREF is not set
282# CONFIG_IPV6_OPTIMISTIC_DAD is not set
283# CONFIG_INET6_AH is not set
284# CONFIG_INET6_ESP is not set
285# CONFIG_INET6_IPCOMP is not set
286# CONFIG_IPV6_MIP6 is not set
283# CONFIG_INET6_XFRM_TUNNEL is not set 287# CONFIG_INET6_XFRM_TUNNEL is not set
284# CONFIG_INET6_TUNNEL is not set 288# CONFIG_INET6_TUNNEL is not set
289CONFIG_INET6_XFRM_MODE_TRANSPORT=y
290CONFIG_INET6_XFRM_MODE_TUNNEL=y
291CONFIG_INET6_XFRM_MODE_BEET=y
292# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
293CONFIG_IPV6_SIT=y
294# CONFIG_IPV6_TUNNEL is not set
295# CONFIG_IPV6_MULTIPLE_TABLES is not set
285# CONFIG_NETWORK_SECMARK is not set 296# CONFIG_NETWORK_SECMARK is not set
286# CONFIG_NETFILTER is not set 297# CONFIG_NETFILTER is not set
287# CONFIG_IP_DCCP is not set 298# CONFIG_IP_DCCP is not set
@@ -338,12 +349,13 @@ CONFIG_FIB_RULES=y
338# 349#
339CONFIG_STANDALONE=y 350CONFIG_STANDALONE=y
340CONFIG_PREVENT_FIRMWARE_BUILD=y 351CONFIG_PREVENT_FIRMWARE_BUILD=y
341# CONFIG_FW_LOADER is not set 352CONFIG_FW_LOADER=y
342# CONFIG_DEBUG_DRIVER is not set 353# CONFIG_DEBUG_DRIVER is not set
343# CONFIG_DEBUG_DEVRES is not set 354# CONFIG_DEBUG_DEVRES is not set
344# CONFIG_SYS_HYPERVISOR is not set 355# CONFIG_SYS_HYPERVISOR is not set
345# CONFIG_CONNECTOR is not set 356# CONFIG_CONNECTOR is not set
346# CONFIG_MTD is not set 357# CONFIG_MTD is not set
358CONFIG_OF_DEVICE=y
347# CONFIG_PARPORT is not set 359# CONFIG_PARPORT is not set
348CONFIG_BLK_DEV=y 360CONFIG_BLK_DEV=y
349# CONFIG_BLK_DEV_FD is not set 361# CONFIG_BLK_DEV_FD is not set
@@ -356,9 +368,10 @@ CONFIG_BLK_DEV_LOOP=y
356# CONFIG_BLK_DEV_CRYPTOLOOP is not set 368# CONFIG_BLK_DEV_CRYPTOLOOP is not set
357CONFIG_BLK_DEV_NBD=y 369CONFIG_BLK_DEV_NBD=y
358# CONFIG_BLK_DEV_SX8 is not set 370# CONFIG_BLK_DEV_SX8 is not set
371# CONFIG_BLK_DEV_UB is not set
359CONFIG_BLK_DEV_RAM=y 372CONFIG_BLK_DEV_RAM=y
360CONFIG_BLK_DEV_RAM_COUNT=2 373CONFIG_BLK_DEV_RAM_COUNT=16
361CONFIG_BLK_DEV_RAM_SIZE=16384 374CONFIG_BLK_DEV_RAM_SIZE=131072
362CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 375CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
363# CONFIG_CDROM_PKTCDVD is not set 376# CONFIG_CDROM_PKTCDVD is not set
364# CONFIG_ATA_OVER_ETH is not set 377# CONFIG_ATA_OVER_ETH is not set
@@ -385,7 +398,8 @@ CONFIG_SCSI_PROC_FS=y
385CONFIG_BLK_DEV_SD=y 398CONFIG_BLK_DEV_SD=y
386CONFIG_CHR_DEV_ST=y 399CONFIG_CHR_DEV_ST=y
387# CONFIG_CHR_DEV_OSST is not set 400# CONFIG_CHR_DEV_OSST is not set
388# CONFIG_BLK_DEV_SR is not set 401CONFIG_BLK_DEV_SR=y
402# CONFIG_BLK_DEV_SR_VENDOR is not set
389CONFIG_CHR_DEV_SG=y 403CONFIG_CHR_DEV_SG=y
390# CONFIG_CHR_DEV_SCH is not set 404# CONFIG_CHR_DEV_SCH is not set
391 405
@@ -404,12 +418,8 @@ CONFIG_SCSI_WAIT_SCAN=m
404# CONFIG_SCSI_SPI_ATTRS is not set 418# CONFIG_SCSI_SPI_ATTRS is not set
405# CONFIG_SCSI_FC_ATTRS is not set 419# CONFIG_SCSI_FC_ATTRS is not set
406# CONFIG_SCSI_ISCSI_ATTRS is not set 420# CONFIG_SCSI_ISCSI_ATTRS is not set
407# CONFIG_SCSI_SAS_ATTRS is not set
408# CONFIG_SCSI_SAS_LIBSAS is not set 421# CONFIG_SCSI_SAS_LIBSAS is not set
409 422CONFIG_SCSI_LOWLEVEL=y
410#
411# SCSI low-level drivers
412#
413# CONFIG_ISCSI_TCP is not set 423# CONFIG_ISCSI_TCP is not set
414# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 424# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
415# CONFIG_SCSI_3W_9XXX is not set 425# CONFIG_SCSI_3W_9XXX is not set
@@ -447,7 +457,7 @@ CONFIG_SCSI_WAIT_SCAN=m
447# CONFIG_SCSI_SRP is not set 457# CONFIG_SCSI_SRP is not set
448CONFIG_ATA=y 458CONFIG_ATA=y
449# CONFIG_ATA_NONSTANDARD is not set 459# CONFIG_ATA_NONSTANDARD is not set
450# CONFIG_SATA_AHCI is not set 460CONFIG_SATA_AHCI=y
451# CONFIG_SATA_SVW is not set 461# CONFIG_SATA_SVW is not set
452# CONFIG_ATA_PIIX is not set 462# CONFIG_ATA_PIIX is not set
453# CONFIG_SATA_MV is not set 463# CONFIG_SATA_MV is not set
@@ -463,7 +473,7 @@ CONFIG_ATA=y
463# CONFIG_SATA_VIA is not set 473# CONFIG_SATA_VIA is not set
464# CONFIG_SATA_VITESSE is not set 474# CONFIG_SATA_VITESSE is not set
465# CONFIG_SATA_INIC162X is not set 475# CONFIG_SATA_INIC162X is not set
466# CONFIG_PATA_ALI is not set 476CONFIG_PATA_ALI=y
467# CONFIG_PATA_AMD is not set 477# CONFIG_PATA_AMD is not set
468# CONFIG_PATA_ARTOP is not set 478# CONFIG_PATA_ARTOP is not set
469# CONFIG_PATA_ATIIXP is not set 479# CONFIG_PATA_ATIIXP is not set
@@ -519,7 +529,7 @@ CONFIG_ATA=y
519# CONFIG_MACINTOSH_DRIVERS is not set 529# CONFIG_MACINTOSH_DRIVERS is not set
520CONFIG_NETDEVICES=y 530CONFIG_NETDEVICES=y
521# CONFIG_NETDEVICES_MULTIQUEUE is not set 531# CONFIG_NETDEVICES_MULTIQUEUE is not set
522# CONFIG_DUMMY is not set 532CONFIG_DUMMY=y
523# CONFIG_BONDING is not set 533# CONFIG_BONDING is not set
524# CONFIG_MACVLAN is not set 534# CONFIG_MACVLAN is not set
525# CONFIG_EQUALIZER is not set 535# CONFIG_EQUALIZER is not set
@@ -582,6 +592,16 @@ CONFIG_NETDEV_10000=y
582# 592#
583# CONFIG_WLAN_PRE80211 is not set 593# CONFIG_WLAN_PRE80211 is not set
584# CONFIG_WLAN_80211 is not set 594# CONFIG_WLAN_80211 is not set
595
596#
597# USB Network Adapters
598#
599# CONFIG_USB_CATC is not set
600# CONFIG_USB_KAWETH is not set
601# CONFIG_USB_PEGASUS is not set
602# CONFIG_USB_RTL8150 is not set
603# CONFIG_USB_USBNET_MII is not set
604# CONFIG_USB_USBNET is not set
585# CONFIG_WAN is not set 605# CONFIG_WAN is not set
586# CONFIG_FDDI is not set 606# CONFIG_FDDI is not set
587# CONFIG_HIPPI is not set 607# CONFIG_HIPPI is not set
@@ -647,10 +667,13 @@ CONFIG_HW_CONSOLE=y
647CONFIG_SERIAL_8250=y 667CONFIG_SERIAL_8250=y
648CONFIG_SERIAL_8250_CONSOLE=y 668CONFIG_SERIAL_8250_CONSOLE=y
649CONFIG_SERIAL_8250_PCI=y 669CONFIG_SERIAL_8250_PCI=y
650CONFIG_SERIAL_8250_NR_UARTS=4 670CONFIG_SERIAL_8250_NR_UARTS=2
651CONFIG_SERIAL_8250_RUNTIME_UARTS=4 671CONFIG_SERIAL_8250_RUNTIME_UARTS=2
652# CONFIG_SERIAL_8250_EXTENDED is not set 672CONFIG_SERIAL_8250_EXTENDED=y
673CONFIG_SERIAL_8250_MANY_PORTS=y
653CONFIG_SERIAL_8250_SHARE_IRQ=y 674CONFIG_SERIAL_8250_SHARE_IRQ=y
675CONFIG_SERIAL_8250_DETECT_IRQ=y
676CONFIG_SERIAL_8250_RSA=y
654 677
655# 678#
656# Non-8250 serial port support 679# Non-8250 serial port support
@@ -676,7 +699,62 @@ CONFIG_GEN_RTC_X=y
676# CONFIG_RAW_DRIVER is not set 699# CONFIG_RAW_DRIVER is not set
677# CONFIG_TCG_TPM is not set 700# CONFIG_TCG_TPM is not set
678CONFIG_DEVPORT=y 701CONFIG_DEVPORT=y
679# CONFIG_I2C is not set 702CONFIG_I2C=y
703CONFIG_I2C_BOARDINFO=y
704# CONFIG_I2C_CHARDEV is not set
705
706#
707# I2C Algorithms
708#
709# CONFIG_I2C_ALGOBIT is not set
710# CONFIG_I2C_ALGOPCF is not set
711# CONFIG_I2C_ALGOPCA is not set
712
713#
714# I2C Hardware Bus support
715#
716# CONFIG_I2C_ALI1535 is not set
717# CONFIG_I2C_ALI1563 is not set
718# CONFIG_I2C_ALI15X3 is not set
719# CONFIG_I2C_AMD756 is not set
720# CONFIG_I2C_AMD8111 is not set
721# CONFIG_I2C_I801 is not set
722# CONFIG_I2C_I810 is not set
723# CONFIG_I2C_PIIX4 is not set
724CONFIG_I2C_MPC=y
725# CONFIG_I2C_NFORCE2 is not set
726# CONFIG_I2C_OCORES is not set
727# CONFIG_I2C_PARPORT_LIGHT is not set
728# CONFIG_I2C_PROSAVAGE is not set
729# CONFIG_I2C_SAVAGE4 is not set
730# CONFIG_I2C_SIMTEC is not set
731# CONFIG_I2C_SIS5595 is not set
732# CONFIG_I2C_SIS630 is not set
733# CONFIG_I2C_SIS96X is not set
734# CONFIG_I2C_TAOS_EVM is not set
735# CONFIG_I2C_STUB is not set
736# CONFIG_I2C_TINY_USB is not set
737# CONFIG_I2C_VIA is not set
738# CONFIG_I2C_VIAPRO is not set
739# CONFIG_I2C_VOODOO3 is not set
740
741#
742# Miscellaneous I2C Chip support
743#
744# CONFIG_SENSORS_DS1337 is not set
745# CONFIG_SENSORS_DS1374 is not set
746# CONFIG_DS1682 is not set
747CONFIG_SENSORS_EEPROM=y
748# CONFIG_SENSORS_PCF8574 is not set
749# CONFIG_SENSORS_PCA9539 is not set
750# CONFIG_SENSORS_PCF8591 is not set
751# CONFIG_SENSORS_M41T00 is not set
752# CONFIG_SENSORS_MAX6875 is not set
753# CONFIG_SENSORS_TSL2550 is not set
754# CONFIG_I2C_DEBUG_CORE is not set
755# CONFIG_I2C_DEBUG_ALGO is not set
756# CONFIG_I2C_DEBUG_BUS is not set
757# CONFIG_I2C_DEBUG_CHIP is not set
680 758
681# 759#
682# SPI support 760# SPI support
@@ -701,6 +779,32 @@ CONFIG_DVB_CORE=m
701CONFIG_DVB_CAPTURE_DRIVERS=y 779CONFIG_DVB_CAPTURE_DRIVERS=y
702 780
703# 781#
782# Supported SAA7146 based PCI Adapters
783#
784
785#
786# Supported USB Adapters
787#
788# CONFIG_DVB_USB is not set
789# CONFIG_DVB_TTUSB_BUDGET is not set
790# CONFIG_DVB_TTUSB_DEC is not set
791# CONFIG_DVB_CINERGYT2 is not set
792
793#
794# Supported FlexCopII (B2C2) Adapters
795#
796# CONFIG_DVB_B2C2_FLEXCOP is not set
797
798#
799# Supported BT878 Adapters
800#
801
802#
803# Supported Pluto2 Adapters
804#
805# CONFIG_DVB_PLUTO2 is not set
806
807#
704# Supported DVB Frontends 808# Supported DVB Frontends
705# 809#
706 810
@@ -712,27 +816,66 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
712# 816#
713# DVB-S (satellite) frontends 817# DVB-S (satellite) frontends
714# 818#
819# CONFIG_DVB_STV0299 is not set
820# CONFIG_DVB_CX24110 is not set
821# CONFIG_DVB_CX24123 is not set
822# CONFIG_DVB_TDA8083 is not set
823# CONFIG_DVB_MT312 is not set
824# CONFIG_DVB_VES1X93 is not set
825# CONFIG_DVB_S5H1420 is not set
826# CONFIG_DVB_TDA10086 is not set
715 827
716# 828#
717# DVB-T (terrestrial) frontends 829# DVB-T (terrestrial) frontends
718# 830#
831# CONFIG_DVB_SP8870 is not set
832# CONFIG_DVB_SP887X is not set
833# CONFIG_DVB_CX22700 is not set
834# CONFIG_DVB_CX22702 is not set
835# CONFIG_DVB_L64781 is not set
836# CONFIG_DVB_TDA1004X is not set
837# CONFIG_DVB_NXT6000 is not set
838# CONFIG_DVB_MT352 is not set
839# CONFIG_DVB_ZL10353 is not set
840# CONFIG_DVB_DIB3000MB is not set
841# CONFIG_DVB_DIB3000MC is not set
842# CONFIG_DVB_DIB7000M is not set
843# CONFIG_DVB_DIB7000P is not set
719 844
720# 845#
721# DVB-C (cable) frontends 846# DVB-C (cable) frontends
722# 847#
848# CONFIG_DVB_VES1820 is not set
849# CONFIG_DVB_TDA10021 is not set
850# CONFIG_DVB_TDA10023 is not set
851# CONFIG_DVB_STV0297 is not set
723 852
724# 853#
725# ATSC (North American/Korean Terrestrial/Cable DTV) frontends 854# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
726# 855#
856# CONFIG_DVB_NXT200X is not set
857# CONFIG_DVB_OR51211 is not set
858# CONFIG_DVB_OR51132 is not set
859# CONFIG_DVB_BCM3510 is not set
860# CONFIG_DVB_LGDT330X is not set
727 861
728# 862#
729# Tuners/PLL support 863# Tuners/PLL support
730# 864#
865# CONFIG_DVB_PLL is not set
866# CONFIG_DVB_TDA826X is not set
867# CONFIG_DVB_TDA827X is not set
868# CONFIG_DVB_TUNER_QT1010 is not set
869# CONFIG_DVB_TUNER_MT2060 is not set
731 870
732# 871#
733# Miscellaneous devices 872# Miscellaneous devices
734# 873#
874# CONFIG_DVB_LNBP21 is not set
875# CONFIG_DVB_ISL6421 is not set
876# CONFIG_DVB_TUA6100 is not set
735CONFIG_DAB=y 877CONFIG_DAB=y
878# CONFIG_USB_DABUSB is not set
736 879
737# 880#
738# Graphics support 881# Graphics support
@@ -744,55 +887,261 @@ CONFIG_DAB=y
744# 887#
745# CONFIG_DISPLAY_SUPPORT is not set 888# CONFIG_DISPLAY_SUPPORT is not set
746# CONFIG_VGASTATE is not set 889# CONFIG_VGASTATE is not set
890CONFIG_VIDEO_OUTPUT_CONTROL=y
747# CONFIG_FB is not set 891# CONFIG_FB is not set
748# CONFIG_FB_IBM_GXT4500 is not set 892# CONFIG_FB_IBM_GXT4500 is not set
749 893
750# 894#
751# Console display driver support 895# Console display driver support
752# 896#
753# CONFIG_VGA_CONSOLE is not set 897CONFIG_VGA_CONSOLE=y
898# CONFIG_VGACON_SOFT_SCROLLBACK is not set
754CONFIG_DUMMY_CONSOLE=y 899CONFIG_DUMMY_CONSOLE=y
755 900
756# 901#
757# Sound 902# Sound
758# 903#
759# CONFIG_SOUND is not set 904CONFIG_SOUND=y
905
906#
907# Advanced Linux Sound Architecture
908#
909CONFIG_SND=y
910CONFIG_SND_TIMER=y
911CONFIG_SND_PCM=y
912# CONFIG_SND_SEQUENCER is not set
913# CONFIG_SND_MIXER_OSS is not set
914# CONFIG_SND_PCM_OSS is not set
915# CONFIG_SND_DYNAMIC_MINORS is not set
916CONFIG_SND_SUPPORT_OLD_API=y
917CONFIG_SND_VERBOSE_PROCFS=y
918# CONFIG_SND_VERBOSE_PRINTK is not set
919# CONFIG_SND_DEBUG is not set
920
921#
922# Generic devices
923#
924CONFIG_SND_AC97_CODEC=y
925# CONFIG_SND_DUMMY is not set
926# CONFIG_SND_MTPAV is not set
927# CONFIG_SND_SERIAL_U16550 is not set
928# CONFIG_SND_MPU401 is not set
929
930#
931# PCI devices
932#
933# CONFIG_SND_AD1889 is not set
934# CONFIG_SND_ALS300 is not set
935# CONFIG_SND_ALS4000 is not set
936# CONFIG_SND_ALI5451 is not set
937# CONFIG_SND_ATIIXP is not set
938# CONFIG_SND_ATIIXP_MODEM is not set
939# CONFIG_SND_AU8810 is not set
940# CONFIG_SND_AU8820 is not set
941# CONFIG_SND_AU8830 is not set
942# CONFIG_SND_AZT3328 is not set
943# CONFIG_SND_BT87X is not set
944# CONFIG_SND_CA0106 is not set
945# CONFIG_SND_CMIPCI is not set
946# CONFIG_SND_CS4281 is not set
947# CONFIG_SND_CS46XX is not set
948# CONFIG_SND_CS5530 is not set
949# CONFIG_SND_DARLA20 is not set
950# CONFIG_SND_GINA20 is not set
951# CONFIG_SND_LAYLA20 is not set
952# CONFIG_SND_DARLA24 is not set
953# CONFIG_SND_GINA24 is not set
954# CONFIG_SND_LAYLA24 is not set
955# CONFIG_SND_MONA is not set
956# CONFIG_SND_MIA is not set
957# CONFIG_SND_ECHO3G is not set
958# CONFIG_SND_INDIGO is not set
959# CONFIG_SND_INDIGOIO is not set
960# CONFIG_SND_INDIGODJ is not set
961# CONFIG_SND_EMU10K1 is not set
962# CONFIG_SND_EMU10K1X is not set
963# CONFIG_SND_ENS1370 is not set
964# CONFIG_SND_ENS1371 is not set
965# CONFIG_SND_ES1938 is not set
966# CONFIG_SND_ES1968 is not set
967# CONFIG_SND_FM801 is not set
968# CONFIG_SND_HDA_INTEL is not set
969# CONFIG_SND_HDSP is not set
970# CONFIG_SND_HDSPM is not set
971# CONFIG_SND_ICE1712 is not set
972# CONFIG_SND_ICE1724 is not set
973CONFIG_SND_INTEL8X0=y
974# CONFIG_SND_INTEL8X0M is not set
975# CONFIG_SND_KORG1212 is not set
976# CONFIG_SND_MAESTRO3 is not set
977# CONFIG_SND_MIXART is not set
978# CONFIG_SND_NM256 is not set
979# CONFIG_SND_PCXHR is not set
980# CONFIG_SND_RIPTIDE is not set
981# CONFIG_SND_RME32 is not set
982# CONFIG_SND_RME96 is not set
983# CONFIG_SND_RME9652 is not set
984# CONFIG_SND_SONICVIBES is not set
985# CONFIG_SND_TRIDENT is not set
986# CONFIG_SND_VIA82XX is not set
987# CONFIG_SND_VIA82XX_MODEM is not set
988# CONFIG_SND_VX222 is not set
989# CONFIG_SND_YMFPCI is not set
990# CONFIG_SND_AC97_POWER_SAVE is not set
991
992#
993# ALSA PowerMac devices
994#
995
996#
997# ALSA PowerPC devices
998#
999
1000#
1001# USB devices
1002#
1003# CONFIG_SND_USB_AUDIO is not set
1004# CONFIG_SND_USB_USX2Y is not set
1005# CONFIG_SND_USB_CAIAQ is not set
1006
1007#
1008# System on Chip audio support
1009#
1010# CONFIG_SND_SOC is not set
1011
1012#
1013# SoC Audio support for SuperH
1014#
1015
1016#
1017# Open Sound System
1018#
1019# CONFIG_SOUND_PRIME is not set
1020CONFIG_AC97_BUS=y
760CONFIG_HID_SUPPORT=y 1021CONFIG_HID_SUPPORT=y
761CONFIG_HID=y 1022CONFIG_HID=y
762# CONFIG_HID_DEBUG is not set 1023# CONFIG_HID_DEBUG is not set
1024
1025#
1026# USB Input Devices
1027#
1028CONFIG_USB_HID=y
1029# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1030# CONFIG_HID_FF is not set
1031# CONFIG_USB_HIDDEV is not set
763CONFIG_USB_SUPPORT=y 1032CONFIG_USB_SUPPORT=y
764CONFIG_USB_ARCH_HAS_HCD=y 1033CONFIG_USB_ARCH_HAS_HCD=y
765CONFIG_USB_ARCH_HAS_OHCI=y 1034CONFIG_USB_ARCH_HAS_OHCI=y
766CONFIG_USB_ARCH_HAS_EHCI=y 1035CONFIG_USB_ARCH_HAS_EHCI=y
767# CONFIG_USB is not set 1036CONFIG_USB=y
1037# CONFIG_USB_DEBUG is not set
1038
1039#
1040# Miscellaneous USB options
1041#
1042CONFIG_USB_DEVICEFS=y
1043CONFIG_USB_DEVICE_CLASS=y
1044# CONFIG_USB_DYNAMIC_MINORS is not set
1045# CONFIG_USB_OTG is not set
1046
1047#
1048# USB Host Controller Drivers
1049#
1050CONFIG_USB_EHCI_HCD=y
1051# CONFIG_USB_EHCI_SPLIT_ISO is not set
1052# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1053# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1054# CONFIG_USB_ISP116X_HCD is not set
1055CONFIG_USB_OHCI_HCD=y
1056CONFIG_USB_OHCI_HCD_PPC_OF=y
1057CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1058CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
1059CONFIG_USB_OHCI_HCD_PCI=y
1060CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1061CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1062CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1063# CONFIG_USB_UHCI_HCD is not set
1064# CONFIG_USB_SL811_HCD is not set
1065# CONFIG_USB_R8A66597_HCD is not set
1066
1067#
1068# USB Device Class drivers
1069#
1070# CONFIG_USB_ACM is not set
1071# CONFIG_USB_PRINTER is not set
768 1072
769# 1073#
770# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1074# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
771# 1075#
772 1076
773# 1077#
774# USB Gadget Support 1078# may also be needed; see USB_STORAGE Help for more information
775# 1079#
776# CONFIG_USB_GADGET is not set 1080CONFIG_USB_STORAGE=y
777# CONFIG_MMC is not set 1081# CONFIG_USB_STORAGE_DEBUG is not set
1082# CONFIG_USB_STORAGE_DATAFAB is not set
1083# CONFIG_USB_STORAGE_FREECOM is not set
1084# CONFIG_USB_STORAGE_DPCM is not set
1085# CONFIG_USB_STORAGE_USBAT is not set
1086# CONFIG_USB_STORAGE_SDDR09 is not set
1087# CONFIG_USB_STORAGE_SDDR55 is not set
1088# CONFIG_USB_STORAGE_JUMPSHOT is not set
1089# CONFIG_USB_STORAGE_ALAUDA is not set
1090# CONFIG_USB_STORAGE_KARMA is not set
1091# CONFIG_USB_LIBUSUAL is not set
778 1092
779# 1093#
780# LED devices 1094# USB Imaging devices
781# 1095#
782# CONFIG_NEW_LEDS is not set 1096# CONFIG_USB_MDC800 is not set
1097# CONFIG_USB_MICROTEK is not set
1098CONFIG_USB_MON=y
783 1099
784# 1100#
785# LED drivers 1101# USB port drivers
786# 1102#
787 1103
788# 1104#
789# LED Triggers 1105# USB Serial Converter support
1106#
1107# CONFIG_USB_SERIAL is not set
1108
1109#
1110# USB Miscellaneous drivers
1111#
1112# CONFIG_USB_EMI62 is not set
1113# CONFIG_USB_EMI26 is not set
1114# CONFIG_USB_ADUTUX is not set
1115# CONFIG_USB_AUERSWALD is not set
1116# CONFIG_USB_RIO500 is not set
1117# CONFIG_USB_LEGOTOWER is not set
1118# CONFIG_USB_LCD is not set
1119# CONFIG_USB_BERRY_CHARGE is not set
1120# CONFIG_USB_LED is not set
1121# CONFIG_USB_CYPRESS_CY7C63 is not set
1122# CONFIG_USB_CYTHERM is not set
1123# CONFIG_USB_PHIDGET is not set
1124# CONFIG_USB_IDMOUSE is not set
1125# CONFIG_USB_FTDI_ELAN is not set
1126# CONFIG_USB_APPLEDISPLAY is not set
1127# CONFIG_USB_SISUSBVGA is not set
1128# CONFIG_USB_LD is not set
1129# CONFIG_USB_TRANCEVIBRATOR is not set
1130# CONFIG_USB_IOWARRIOR is not set
1131# CONFIG_USB_TEST is not set
1132
1133#
1134# USB DSL modem support
790# 1135#
791# CONFIG_INFINIBAND is not set
792 1136
793# 1137#
794# Real Time Clock 1138# USB Gadget Support
795# 1139#
1140# CONFIG_USB_GADGET is not set
1141# CONFIG_MMC is not set
1142# CONFIG_NEW_LEDS is not set
1143# CONFIG_INFINIBAND is not set
1144# CONFIG_EDAC is not set
796CONFIG_RTC_LIB=y 1145CONFIG_RTC_LIB=y
797CONFIG_RTC_CLASS=y 1146CONFIG_RTC_CLASS=y
798CONFIG_RTC_HCTOSYS=y 1147CONFIG_RTC_HCTOSYS=y
@@ -809,10 +1158,28 @@ CONFIG_RTC_INTF_DEV=y
809# CONFIG_RTC_DRV_TEST is not set 1158# CONFIG_RTC_DRV_TEST is not set
810 1159
811# 1160#
1161# I2C RTC drivers
1162#
1163# CONFIG_RTC_DRV_DS1307 is not set
1164# CONFIG_RTC_DRV_DS1672 is not set
1165# CONFIG_RTC_DRV_MAX6900 is not set
1166# CONFIG_RTC_DRV_RS5C372 is not set
1167# CONFIG_RTC_DRV_ISL1208 is not set
1168# CONFIG_RTC_DRV_X1205 is not set
1169# CONFIG_RTC_DRV_PCF8563 is not set
1170# CONFIG_RTC_DRV_PCF8583 is not set
1171# CONFIG_RTC_DRV_M41T80 is not set
1172
1173#
1174# SPI RTC drivers
1175#
1176
1177#
812# Platform RTC drivers 1178# Platform RTC drivers
813# 1179#
814# CONFIG_RTC_DRV_CMOS is not set 1180CONFIG_RTC_DRV_CMOS=y
815# CONFIG_RTC_DRV_DS1553 is not set 1181# CONFIG_RTC_DRV_DS1553 is not set
1182# CONFIG_RTC_DRV_STK17TA8 is not set
816# CONFIG_RTC_DRV_DS1742 is not set 1183# CONFIG_RTC_DRV_DS1742 is not set
817# CONFIG_RTC_DRV_M48T86 is not set 1184# CONFIG_RTC_DRV_M48T86 is not set
818# CONFIG_RTC_DRV_M48T59 is not set 1185# CONFIG_RTC_DRV_M48T59 is not set
@@ -933,10 +1300,13 @@ CONFIG_NFS_V3=y
933# CONFIG_NFS_V3_ACL is not set 1300# CONFIG_NFS_V3_ACL is not set
934CONFIG_NFS_V4=y 1301CONFIG_NFS_V4=y
935# CONFIG_NFS_DIRECTIO is not set 1302# CONFIG_NFS_DIRECTIO is not set
936# CONFIG_NFSD is not set 1303CONFIG_NFSD=y
1304# CONFIG_NFSD_V3 is not set
1305CONFIG_NFSD_TCP=y
937CONFIG_ROOT_NFS=y 1306CONFIG_ROOT_NFS=y
938CONFIG_LOCKD=y 1307CONFIG_LOCKD=y
939CONFIG_LOCKD_V4=y 1308CONFIG_LOCKD_V4=y
1309CONFIG_EXPORTFS=y
940CONFIG_NFS_COMMON=y 1310CONFIG_NFS_COMMON=y
941CONFIG_SUNRPC=y 1311CONFIG_SUNRPC=y
942CONFIG_SUNRPC_GSS=y 1312CONFIG_SUNRPC_GSS=y
@@ -957,7 +1327,7 @@ CONFIG_PARTITION_ADVANCED=y
957# CONFIG_OSF_PARTITION is not set 1327# CONFIG_OSF_PARTITION is not set
958# CONFIG_AMIGA_PARTITION is not set 1328# CONFIG_AMIGA_PARTITION is not set
959# CONFIG_ATARI_PARTITION is not set 1329# CONFIG_ATARI_PARTITION is not set
960# CONFIG_MAC_PARTITION is not set 1330CONFIG_MAC_PARTITION=y
961CONFIG_MSDOS_PARTITION=y 1331CONFIG_MSDOS_PARTITION=y
962# CONFIG_BSD_DISKLABEL is not set 1332# CONFIG_BSD_DISKLABEL is not set
963# CONFIG_MINIX_SUBPARTITION is not set 1333# CONFIG_MINIX_SUBPARTITION is not set
@@ -1078,7 +1448,6 @@ CONFIG_FORCED_INLINING=y
1078# CONFIG_DEBUG_PAGEALLOC is not set 1448# CONFIG_DEBUG_PAGEALLOC is not set
1079# CONFIG_DEBUGGER is not set 1449# CONFIG_DEBUGGER is not set
1080# CONFIG_BDI_SWITCH is not set 1450# CONFIG_BDI_SWITCH is not set
1081# CONFIG_BOOTX_TEXT is not set
1082# CONFIG_PPC_EARLY_DEBUG is not set 1451# CONFIG_PPC_EARLY_DEBUG is not set
1083 1452
1084# 1453#
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index a30bc6f6211c..0fb54c775cf9 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:58 2007 4# Tue Aug 28 21:24:43 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
12CONFIG_PPC_85xx=y
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_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
7CONFIG_PPC32=y 24CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 26CONFIG_MMU=y
@@ -14,61 +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
24# CONFIG_GENERIC_TBSYNC is not set 43# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 44CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 45CONFIG_GENERIC_BUG=y
27CONFIG_DEFAULT_UIMAGE=y 46CONFIG_DEFAULT_UIMAGE=y
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
35CONFIG_PPC_85xx=y
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_85xx=y
42CONFIG_E500=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
45CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
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
68# CONFIG_POSIX_MQUEUE is not set 62# CONFIG_POSIX_MQUEUE is not set
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,19 +96,12 @@ 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#
109# CONFIG_MODULES is not set 99# CONFIG_MODULES is not set
110
111#
112# Block layer
113#
114CONFIG_BLOCK=y 100CONFIG_BLOCK=y
115# CONFIG_LBD is not set 101# CONFIG_LBD is not set
116# CONFIG_BLK_DEV_IO_TRACE is not set 102# CONFIG_BLK_DEV_IO_TRACE is not set
117# CONFIG_LSF is not set 103# CONFIG_LSF is not set
104# CONFIG_BLK_DEV_BSG is not set
118 105
119# 106#
120# IO Schedulers 107# IO Schedulers
@@ -155,6 +142,7 @@ CONFIG_MPIC=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
157CONFIG_CPM2=y 144CONFIG_CPM2=y
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
185# CONFIG_RESOURCES_64BIT is not set 173# CONFIG_RESOURCES_64BIT is not set
186CONFIG_ZONE_DMA_FLAG=1 174CONFIG_ZONE_DMA_FLAG=1
175CONFIG_BOUNCE=y
176CONFIG_VIRT_TO_BUS=y
187# CONFIG_PROC_DEVICETREE is not set 177# CONFIG_PROC_DEVICETREE is not set
188# CONFIG_CMDLINE_BOOL is not set 178# CONFIG_CMDLINE_BOOL is not set
189# CONFIG_PM is not set 179# CONFIG_PM is not set
@@ -197,10 +187,11 @@ CONFIG_ISA_DMA_API=y
197# 187#
198CONFIG_ZONE_DMA=y 188CONFIG_ZONE_DMA=y
199CONFIG_PPC_INDIRECT_PCI=y 189CONFIG_PPC_INDIRECT_PCI=y
200CONFIG_PPC_INDIRECT_PCI_BE=y
201CONFIG_FSL_SOC=y 190CONFIG_FSL_SOC=y
191CONFIG_FSL_PCI=y
202CONFIG_PCI=y 192CONFIG_PCI=y
203CONFIG_PCI_DOMAINS=y 193CONFIG_PCI_DOMAINS=y
194CONFIG_PCI_SYSCALL=y
204# CONFIG_PCIEPORTBUS is not set 195# CONFIG_PCIEPORTBUS is not set
205CONFIG_ARCH_SUPPORTS_MSI=y 196CONFIG_ARCH_SUPPORTS_MSI=y
206# CONFIG_PCI_MSI is not set 197# CONFIG_PCI_MSI is not set
@@ -311,6 +302,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
311# CONFIG_MAC80211 is not set 302# CONFIG_MAC80211 is not set
312# CONFIG_IEEE80211 is not set 303# CONFIG_IEEE80211 is not set
313# CONFIG_RFKILL is not set 304# CONFIG_RFKILL is not set
305# CONFIG_NET_9P is not set
314 306
315# 307#
316# Device Drivers 308# Device Drivers
@@ -325,26 +317,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
325# CONFIG_DEBUG_DRIVER is not set 317# CONFIG_DEBUG_DRIVER is not set
326# CONFIG_DEBUG_DEVRES is not set 318# CONFIG_DEBUG_DEVRES is not set
327# CONFIG_SYS_HYPERVISOR is not set 319# CONFIG_SYS_HYPERVISOR is not set
328
329#
330# Connector - unified userspace <-> kernelspace linker
331#
332# CONFIG_CONNECTOR is not set 320# CONFIG_CONNECTOR is not set
333# CONFIG_MTD is not set 321# CONFIG_MTD is not set
334 322CONFIG_OF_DEVICE=y
335#
336# Parallel port support
337#
338# CONFIG_PARPORT is not set 323# CONFIG_PARPORT is not set
339 324CONFIG_BLK_DEV=y
340#
341# Plug and Play support
342#
343# CONFIG_PNPACPI is not set
344
345#
346# Block devices
347#
348# CONFIG_BLK_DEV_FD is not set 325# CONFIG_BLK_DEV_FD is not set
349# CONFIG_BLK_CPQ_DA is not set 326# CONFIG_BLK_CPQ_DA is not set
350# CONFIG_BLK_CPQ_CISS_DA is not set 327# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -361,14 +338,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
361CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 338CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
362# CONFIG_CDROM_PKTCDVD is not set 339# CONFIG_CDROM_PKTCDVD is not set
363# CONFIG_ATA_OVER_ETH is not set 340# CONFIG_ATA_OVER_ETH is not set
364 341CONFIG_MISC_DEVICES=y
365#
366# Misc devices
367#
368# CONFIG_PHANTOM is not set 342# CONFIG_PHANTOM is not set
343# CONFIG_EEPROM_93CX6 is not set
369# CONFIG_SGI_IOC4 is not set 344# CONFIG_SGI_IOC4 is not set
370# CONFIG_TIFM_CORE is not set 345# CONFIG_TIFM_CORE is not set
371# CONFIG_BLINK is not set
372# CONFIG_IDE is not set 346# CONFIG_IDE is not set
373 347
374# 348#
@@ -376,12 +350,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
376# 350#
377# CONFIG_RAID_ATTRS is not set 351# CONFIG_RAID_ATTRS is not set
378# CONFIG_SCSI is not set 352# CONFIG_SCSI is not set
353# CONFIG_SCSI_DMA is not set
379# CONFIG_SCSI_NETLINK is not set 354# CONFIG_SCSI_NETLINK is not set
380# CONFIG_ATA is not set 355# CONFIG_ATA is not set
381
382#
383# Multi-device support (RAID and LVM)
384#
385# CONFIG_MD is not set 356# CONFIG_MD is not set
386 357
387# 358#
@@ -394,19 +365,13 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
394# 365#
395# CONFIG_FIREWIRE is not set 366# CONFIG_FIREWIRE is not set
396# CONFIG_IEEE1394 is not set 367# CONFIG_IEEE1394 is not set
397
398#
399# I2O device support
400#
401# CONFIG_I2O is not set 368# CONFIG_I2O is not set
402# CONFIG_MACINTOSH_DRIVERS is not set 369# CONFIG_MACINTOSH_DRIVERS is not set
403
404#
405# Network device support
406#
407CONFIG_NETDEVICES=y 370CONFIG_NETDEVICES=y
371# CONFIG_NETDEVICES_MULTIQUEUE is not set
408# CONFIG_DUMMY is not set 372# CONFIG_DUMMY is not set
409# CONFIG_BONDING is not set 373# CONFIG_BONDING is not set
374# CONFIG_MACVLAN is not set
410# CONFIG_EQUALIZER is not set 375# CONFIG_EQUALIZER is not set
411# CONFIG_TUN is not set 376# CONFIG_TUN is not set
412# CONFIG_ARCNET is not set 377# CONFIG_ARCNET is not set
@@ -423,21 +388,14 @@ CONFIG_DAVICOM_PHY=y
423# CONFIG_VITESSE_PHY is not set 388# CONFIG_VITESSE_PHY is not set
424# CONFIG_SMSC_PHY is not set 389# CONFIG_SMSC_PHY is not set
425# CONFIG_BROADCOM_PHY is not set 390# CONFIG_BROADCOM_PHY is not set
391# CONFIG_ICPLUS_PHY is not set
426# CONFIG_FIXED_PHY is not set 392# CONFIG_FIXED_PHY is not set
427
428#
429# Ethernet (10 or 100Mbit)
430#
431CONFIG_NET_ETHERNET=y 393CONFIG_NET_ETHERNET=y
432CONFIG_MII=y 394CONFIG_MII=y
433# CONFIG_HAPPYMEAL is not set 395# CONFIG_HAPPYMEAL is not set
434# CONFIG_SUNGEM is not set 396# CONFIG_SUNGEM is not set
435# CONFIG_CASSINI is not set 397# CONFIG_CASSINI is not set
436# CONFIG_NET_VENDOR_3COM is not set 398# CONFIG_NET_VENDOR_3COM is not set
437
438#
439# Tulip family network device support
440#
441# CONFIG_NET_TULIP is not set 399# CONFIG_NET_TULIP is not set
442# CONFIG_HP100 is not set 400# CONFIG_HP100 is not set
443# CONFIG_NET_PCI is not set 401# CONFIG_NET_PCI is not set
@@ -457,7 +415,6 @@ CONFIG_E1000_NAPI=y
457# CONFIG_SIS190 is not set 415# CONFIG_SIS190 is not set
458# CONFIG_SKGE is not set 416# CONFIG_SKGE is not set
459# CONFIG_SKY2 is not set 417# CONFIG_SKY2 is not set
460# CONFIG_SK98LIN is not set
461# CONFIG_VIA_VELOCITY is not set 418# CONFIG_VIA_VELOCITY is not set
462# CONFIG_TIGON3 is not set 419# CONFIG_TIGON3 is not set
463# CONFIG_BNX2 is not set 420# CONFIG_BNX2 is not set
@@ -489,15 +446,7 @@ CONFIG_NETDEV_10000=y
489# CONFIG_NETCONSOLE is not set 446# CONFIG_NETCONSOLE is not set
490# CONFIG_NETPOLL is not set 447# CONFIG_NETPOLL is not set
491# CONFIG_NET_POLL_CONTROLLER is not set 448# CONFIG_NET_POLL_CONTROLLER is not set
492
493#
494# ISDN subsystem
495#
496# CONFIG_ISDN is not set 449# CONFIG_ISDN is not set
497
498#
499# Telephony Support
500#
501# CONFIG_PHONE is not set 450# CONFIG_PHONE is not set
502 451
503# 452#
@@ -561,10 +510,6 @@ CONFIG_SERIAL_CPM_SCC2=y
561CONFIG_UNIX98_PTYS=y 510CONFIG_UNIX98_PTYS=y
562CONFIG_LEGACY_PTYS=y 511CONFIG_LEGACY_PTYS=y
563CONFIG_LEGACY_PTY_COUNT=256 512CONFIG_LEGACY_PTY_COUNT=256
564
565#
566# IPMI
567#
568# CONFIG_IPMI_HANDLER is not set 513# CONFIG_IPMI_HANDLER is not set
569# CONFIG_WATCHDOG is not set 514# CONFIG_WATCHDOG is not set
570CONFIG_HW_RANDOM=y 515CONFIG_HW_RANDOM=y
@@ -576,10 +521,6 @@ CONFIG_GEN_RTC=y
576# CONFIG_AGP is not set 521# CONFIG_AGP is not set
577# CONFIG_DRM is not set 522# CONFIG_DRM is not set
578# CONFIG_RAW_DRIVER is not set 523# CONFIG_RAW_DRIVER is not set
579
580#
581# TPM devices
582#
583# CONFIG_TCG_TPM is not set 524# CONFIG_TCG_TPM is not set
584CONFIG_DEVPORT=y 525CONFIG_DEVPORT=y
585# CONFIG_I2C is not set 526# CONFIG_I2C is not set
@@ -589,20 +530,24 @@ CONFIG_DEVPORT=y
589# 530#
590# CONFIG_SPI is not set 531# CONFIG_SPI is not set
591# CONFIG_SPI_MASTER is not set 532# CONFIG_SPI_MASTER is not set
592
593#
594# Dallas's 1-wire bus
595#
596# CONFIG_W1 is not set 533# CONFIG_W1 is not set
534# CONFIG_POWER_SUPPLY is not set
597CONFIG_HWMON=y 535CONFIG_HWMON=y
598# CONFIG_HWMON_VID is not set 536# CONFIG_HWMON_VID is not set
599# CONFIG_SENSORS_ABITUGURU is not set 537# CONFIG_SENSORS_ABITUGURU is not set
538# CONFIG_SENSORS_ABITUGURU3 is not set
600# CONFIG_SENSORS_F71805F is not set 539# CONFIG_SENSORS_F71805F is not set
540# CONFIG_SENSORS_IT87 is not set
541# CONFIG_SENSORS_PC87360 is not set
601# CONFIG_SENSORS_PC87427 is not set 542# CONFIG_SENSORS_PC87427 is not set
543# CONFIG_SENSORS_SIS5595 is not set
602# CONFIG_SENSORS_SMSC47M1 is not set 544# CONFIG_SENSORS_SMSC47M1 is not set
603# CONFIG_SENSORS_SMSC47B397 is not set 545# CONFIG_SENSORS_SMSC47B397 is not set
546# CONFIG_SENSORS_VIA686A is not set
604# CONFIG_SENSORS_VT1211 is not set 547# CONFIG_SENSORS_VT1211 is not set
548# CONFIG_SENSORS_VT8231 is not set
605# CONFIG_SENSORS_W83627HF is not set 549# CONFIG_SENSORS_W83627HF is not set
550# CONFIG_SENSORS_W83627EHF is not set
606# CONFIG_HWMON_DEBUG_CHIP is not set 551# CONFIG_HWMON_DEBUG_CHIP is not set
607 552
608# 553#
@@ -627,6 +572,7 @@ CONFIG_DAB=y
627# 572#
628# CONFIG_DISPLAY_SUPPORT is not set 573# CONFIG_DISPLAY_SUPPORT is not set
629# CONFIG_VGASTATE is not set 574# CONFIG_VGASTATE is not set
575CONFIG_VIDEO_OUTPUT_CONTROL=y
630# CONFIG_FB is not set 576# CONFIG_FB is not set
631# CONFIG_FB_IBM_GXT4500 is not set 577# CONFIG_FB_IBM_GXT4500 is not set
632 578
@@ -634,16 +580,10 @@ CONFIG_DAB=y
634# Sound 580# Sound
635# 581#
636# CONFIG_SOUND is not set 582# CONFIG_SOUND is not set
637 583CONFIG_HID_SUPPORT=y
638#
639# HID Devices
640#
641CONFIG_HID=y 584CONFIG_HID=y
642# CONFIG_HID_DEBUG is not set 585# CONFIG_HID_DEBUG is not set
643 586CONFIG_USB_SUPPORT=y
644#
645# USB support
646#
647CONFIG_USB_ARCH_HAS_HCD=y 587CONFIG_USB_ARCH_HAS_HCD=y
648CONFIG_USB_ARCH_HAS_OHCI=y 588CONFIG_USB_ARCH_HAS_OHCI=y
649CONFIG_USB_ARCH_HAS_EHCI=y 589CONFIG_USB_ARCH_HAS_EHCI=y
@@ -658,32 +598,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
658# 598#
659# CONFIG_USB_GADGET is not set 599# CONFIG_USB_GADGET is not set
660# CONFIG_MMC is not set 600# CONFIG_MMC is not set
661
662#
663# LED devices
664#
665# CONFIG_NEW_LEDS is not set 601# CONFIG_NEW_LEDS is not set
666
667#
668# LED drivers
669#
670
671#
672# LED Triggers
673#
674
675#
676# InfiniBand support
677#
678# CONFIG_INFINIBAND is not set 602# CONFIG_INFINIBAND is not set
679 603# CONFIG_EDAC is not set
680#
681# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
682#
683
684#
685# Real Time Clock
686#
687# CONFIG_RTC_CLASS is not set 604# CONFIG_RTC_CLASS is not set
688 605
689# 606#
@@ -700,6 +617,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
700# 617#
701 618
702# 619#
620# Userspace I/O
621#
622# CONFIG_UIO is not set
623
624#
703# File systems 625# File systems
704# 626#
705CONFIG_EXT2_FS=y 627CONFIG_EXT2_FS=y
@@ -792,7 +714,6 @@ CONFIG_SUNRPC=y
792# CONFIG_NCP_FS is not set 714# CONFIG_NCP_FS is not set
793# CONFIG_CODA_FS is not set 715# CONFIG_CODA_FS is not set
794# CONFIG_AFS_FS is not set 716# CONFIG_AFS_FS is not set
795# CONFIG_9P_FS is not set
796 717
797# 718#
798# Partition Types 719# Partition Types
@@ -831,6 +752,7 @@ CONFIG_BITREVERSE=y
831# CONFIG_CRC16 is not set 752# CONFIG_CRC16 is not set
832# CONFIG_CRC_ITU_T is not set 753# CONFIG_CRC_ITU_T is not set
833CONFIG_CRC32=y 754CONFIG_CRC32=y
755# CONFIG_CRC7 is not set
834# CONFIG_LIBCRC32C is not set 756# CONFIG_LIBCRC32C is not set
835CONFIG_PLIST=y 757CONFIG_PLIST=y
836CONFIG_HAS_IOMEM=y 758CONFIG_HAS_IOMEM=y
@@ -854,6 +776,7 @@ CONFIG_ENABLE_MUST_CHECK=y
854CONFIG_DEBUG_KERNEL=y 776CONFIG_DEBUG_KERNEL=y
855# CONFIG_DEBUG_SHIRQ is not set 777# CONFIG_DEBUG_SHIRQ is not set
856CONFIG_DETECT_SOFTLOCKUP=y 778CONFIG_DETECT_SOFTLOCKUP=y
779CONFIG_SCHED_DEBUG=y
857# CONFIG_SCHEDSTATS is not set 780# CONFIG_SCHEDSTATS is not set
858# CONFIG_TIMER_STATS is not set 781# CONFIG_TIMER_STATS is not set
859# CONFIG_DEBUG_SLAB is not set 782# CONFIG_DEBUG_SLAB is not set
@@ -876,7 +799,6 @@ CONFIG_FORCED_INLINING=y
876# CONFIG_DEBUGGER is not set 799# CONFIG_DEBUGGER is not set
877# CONFIG_KGDB_CONSOLE is not set 800# CONFIG_KGDB_CONSOLE is not set
878# CONFIG_BDI_SWITCH is not set 801# CONFIG_BDI_SWITCH is not set
879# CONFIG_BOOTX_TEXT is not set
880# CONFIG_PPC_EARLY_DEBUG is not set 802# CONFIG_PPC_EARLY_DEBUG is not set
881 803
882# 804#
@@ -884,8 +806,4 @@ CONFIG_FORCED_INLINING=y
884# 806#
885# CONFIG_KEYS is not set 807# CONFIG_KEYS is not set
886# CONFIG_SECURITY is not set 808# CONFIG_SECURITY is not set
887
888#
889# Cryptographic options
890#
891# CONFIG_CRYPTO is not set 809# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index 417d3e6abcdf..0307fe7b0487 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22 3# Linux kernel version: 2.6.23-rc4
4# Fri Jul 20 13:55:04 2007 4# Tue Aug 28 21:24:43 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -38,6 +38,7 @@ CONFIG_GENERIC_NVRAM=y
38CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 38CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
39CONFIG_ARCH_MAY_HAVE_PC_FDC=y 39CONFIG_ARCH_MAY_HAVE_PC_FDC=y
40CONFIG_PPC_OF=y 40CONFIG_PPC_OF=y
41CONFIG_OF=y
41CONFIG_PPC_UDBG_16550=y 42CONFIG_PPC_UDBG_16550=y
42# CONFIG_GENERIC_TBSYNC is not set 43# CONFIG_GENERIC_TBSYNC is not set
43CONFIG_AUDIT_ARCH=y 44CONFIG_AUDIT_ARCH=y
@@ -48,15 +49,11 @@ CONFIG_DEFAULT_UIMAGE=y
48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 49CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
49 50
50# 51#
51# Code maturity level options 52# General setup
52# 53#
53CONFIG_EXPERIMENTAL=y 54CONFIG_EXPERIMENTAL=y
54CONFIG_BROKEN_ON_SMP=y 55CONFIG_BROKEN_ON_SMP=y
55CONFIG_INIT_ENV_ARG_LIMIT=32 56CONFIG_INIT_ENV_ARG_LIMIT=32
56
57#
58# General setup
59#
60CONFIG_LOCALVERSION="" 57CONFIG_LOCALVERSION=""
61CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
62CONFIG_SWAP=y 59CONFIG_SWAP=y
@@ -147,6 +144,7 @@ CONFIG_MPIC=y
147# CONFIG_GENERIC_IOMAP is not set 144# CONFIG_GENERIC_IOMAP is not set
148# CONFIG_CPU_FREQ is not set 145# CONFIG_CPU_FREQ is not set
149# CONFIG_CPM2 is not set 146# CONFIG_CPM2 is not set
147# CONFIG_FSL_ULI1575 is not set
150 148
151# 149#
152# Kernel options 150# Kernel options
@@ -191,7 +189,6 @@ CONFIG_ISA_DMA_API=y
191# 189#
192CONFIG_ZONE_DMA=y 190CONFIG_ZONE_DMA=y
193CONFIG_PPC_INDIRECT_PCI=y 191CONFIG_PPC_INDIRECT_PCI=y
194CONFIG_PPC_INDIRECT_PCI_BE=y
195CONFIG_FSL_SOC=y 192CONFIG_FSL_SOC=y
196CONFIG_FSL_PCI=y 193CONFIG_FSL_PCI=y
197CONFIG_PCI=y 194CONFIG_PCI=y
@@ -324,6 +321,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
324# CONFIG_SYS_HYPERVISOR is not set 321# CONFIG_SYS_HYPERVISOR is not set
325# CONFIG_CONNECTOR is not set 322# CONFIG_CONNECTOR is not set
326# CONFIG_MTD is not set 323# CONFIG_MTD is not set
324CONFIG_OF_DEVICE=y
327# CONFIG_PARPORT is not set 325# CONFIG_PARPORT is not set
328CONFIG_BLK_DEV=y 326CONFIG_BLK_DEV=y
329# CONFIG_BLK_DEV_FD is not set 327# CONFIG_BLK_DEV_FD is not set
@@ -384,12 +382,8 @@ CONFIG_SCSI_WAIT_SCAN=m
384# CONFIG_SCSI_SPI_ATTRS is not set 382# CONFIG_SCSI_SPI_ATTRS is not set
385# CONFIG_SCSI_FC_ATTRS is not set 383# CONFIG_SCSI_FC_ATTRS is not set
386# CONFIG_SCSI_ISCSI_ATTRS is not set 384# CONFIG_SCSI_ISCSI_ATTRS is not set
387# CONFIG_SCSI_SAS_ATTRS is not set
388# CONFIG_SCSI_SAS_LIBSAS is not set 385# CONFIG_SCSI_SAS_LIBSAS is not set
389 386CONFIG_SCSI_LOWLEVEL=y
390#
391# SCSI low-level drivers
392#
393# CONFIG_ISCSI_TCP is not set 387# CONFIG_ISCSI_TCP is not set
394# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 388# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
395# CONFIG_SCSI_3W_9XXX is not set 389# CONFIG_SCSI_3W_9XXX is not set
@@ -672,6 +666,7 @@ CONFIG_I2C_MPC=y
672CONFIG_HWMON=y 666CONFIG_HWMON=y
673# CONFIG_HWMON_VID is not set 667# CONFIG_HWMON_VID is not set
674# CONFIG_SENSORS_ABITUGURU is not set 668# CONFIG_SENSORS_ABITUGURU is not set
669# CONFIG_SENSORS_ABITUGURU3 is not set
675# CONFIG_SENSORS_AD7418 is not set 670# CONFIG_SENSORS_AD7418 is not set
676# CONFIG_SENSORS_ADM1021 is not set 671# CONFIG_SENSORS_ADM1021 is not set
677# CONFIG_SENSORS_ADM1025 is not set 672# CONFIG_SENSORS_ADM1025 is not set
@@ -698,14 +693,17 @@ CONFIG_HWMON=y
698# CONFIG_SENSORS_LM87 is not set 693# CONFIG_SENSORS_LM87 is not set
699# CONFIG_SENSORS_LM90 is not set 694# CONFIG_SENSORS_LM90 is not set
700# CONFIG_SENSORS_LM92 is not set 695# CONFIG_SENSORS_LM92 is not set
696# CONFIG_SENSORS_LM93 is not set
701# CONFIG_SENSORS_MAX1619 is not set 697# CONFIG_SENSORS_MAX1619 is not set
702# CONFIG_SENSORS_MAX6650 is not set 698# CONFIG_SENSORS_MAX6650 is not set
703# CONFIG_SENSORS_PC87360 is not set 699# CONFIG_SENSORS_PC87360 is not set
704# CONFIG_SENSORS_PC87427 is not set 700# CONFIG_SENSORS_PC87427 is not set
705# CONFIG_SENSORS_SIS5595 is not set 701# CONFIG_SENSORS_SIS5595 is not set
702# CONFIG_SENSORS_DME1737 is not set
706# CONFIG_SENSORS_SMSC47M1 is not set 703# CONFIG_SENSORS_SMSC47M1 is not set
707# CONFIG_SENSORS_SMSC47M192 is not set 704# CONFIG_SENSORS_SMSC47M192 is not set
708# CONFIG_SENSORS_SMSC47B397 is not set 705# CONFIG_SENSORS_SMSC47B397 is not set
706# CONFIG_SENSORS_THMC50 is not set
709# CONFIG_SENSORS_VIA686A is not set 707# CONFIG_SENSORS_VIA686A is not set
710# CONFIG_SENSORS_VT1211 is not set 708# CONFIG_SENSORS_VT1211 is not set
711# CONFIG_SENSORS_VT8231 is not set 709# CONFIG_SENSORS_VT8231 is not set
@@ -740,6 +738,7 @@ CONFIG_DAB=y
740# 738#
741# CONFIG_DISPLAY_SUPPORT is not set 739# CONFIG_DISPLAY_SUPPORT is not set
742# CONFIG_VGASTATE is not set 740# CONFIG_VGASTATE is not set
741CONFIG_VIDEO_OUTPUT_CONTROL=m
743# CONFIG_FB is not set 742# CONFIG_FB is not set
744# CONFIG_FB_IBM_GXT4500 is not set 743# CONFIG_FB_IBM_GXT4500 is not set
745 744
@@ -765,24 +764,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
765# 764#
766# CONFIG_USB_GADGET is not set 765# CONFIG_USB_GADGET is not set
767# CONFIG_MMC is not set 766# CONFIG_MMC is not set
768
769#
770# LED devices
771#
772# CONFIG_NEW_LEDS is not set 767# CONFIG_NEW_LEDS is not set
773
774#
775# LED drivers
776#
777
778#
779# LED Triggers
780#
781# CONFIG_INFINIBAND is not set 768# CONFIG_INFINIBAND is not set
782 769# CONFIG_EDAC is not set
783#
784# Real Time Clock
785#
786# CONFIG_RTC_CLASS is not set 770# CONFIG_RTC_CLASS is not set
787 771
788# 772#
@@ -986,7 +970,6 @@ CONFIG_FORCED_INLINING=y
986CONFIG_DEBUGGER=y 970CONFIG_DEBUGGER=y
987# CONFIG_XMON is not set 971# CONFIG_XMON is not set
988# CONFIG_BDI_SWITCH is not set 972# CONFIG_BDI_SWITCH is not set
989# CONFIG_BOOTX_TEXT is not set
990CONFIG_PPC_EARLY_DEBUG=y 973CONFIG_PPC_EARLY_DEBUG=y
991# CONFIG_PPC_EARLY_DEBUG_LPAR is not set 974# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
992# CONFIG_PPC_EARLY_DEBUG_G5 is not set 975# CONFIG_PPC_EARLY_DEBUG_G5 is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index d9afe7009d99..e6850c619f88 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:56:59 2007 4# Tue Aug 28 21:24:43 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
12CONFIG_PPC_85xx=y
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_85xx=y
18CONFIG_E500=y
19CONFIG_BOOKE=y
20CONFIG_FSL_BOOKE=y
21# CONFIG_PHYS_64BIT is not set
22CONFIG_SPE=y
23# CONFIG_PPC_MM_SLICES is not set
7CONFIG_PPC32=y 24CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 26CONFIG_MMU=y
@@ -14,61 +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
24# CONFIG_GENERIC_TBSYNC is not set 43# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 44CONFIG_AUDIT_ARCH=y
26CONFIG_GENERIC_BUG=y 45CONFIG_GENERIC_BUG=y
27CONFIG_DEFAULT_UIMAGE=y 46CONFIG_DEFAULT_UIMAGE=y
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
35CONFIG_PPC_85xx=y
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_85xx=y
42CONFIG_E500=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
45CONFIG_BOOKE=y
46CONFIG_FSL_BOOKE=y
47# CONFIG_PHYS_64BIT is not set
48CONFIG_SPE=y
49# CONFIG_PPC_MM_SLICES is not set
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
68# CONFIG_POSIX_MQUEUE is not set 62# CONFIG_POSIX_MQUEUE is not set
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,19 +96,12 @@ 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#
109# CONFIG_MODULES is not set 99# CONFIG_MODULES is not set
110
111#
112# Block layer
113#
114CONFIG_BLOCK=y 100CONFIG_BLOCK=y
115# CONFIG_LBD is not set 101# CONFIG_LBD is not set
116# CONFIG_BLK_DEV_IO_TRACE is not set 102# CONFIG_BLK_DEV_IO_TRACE is not set
117# CONFIG_LSF is not set 103# CONFIG_LSF is not set
104# CONFIG_BLK_DEV_BSG is not set
118 105
119# 106#
120# IO Schedulers 107# IO Schedulers
@@ -146,7 +133,7 @@ CONFIG_MPC8540=y
146CONFIG_MPC85xx=y 133CONFIG_MPC85xx=y
147CONFIG_MPIC=y 134CONFIG_MPIC=y
148# CONFIG_MPIC_WEIRD is not set 135# CONFIG_MPIC_WEIRD is not set
149# CONFIG_PPC_I8259 is not set 136CONFIG_PPC_I8259=y
150# CONFIG_PPC_RTAS is not set 137# CONFIG_PPC_RTAS is not set
151# CONFIG_MMIO_NVRAM is not set 138# CONFIG_MMIO_NVRAM is not set
152# CONFIG_PPC_MPC106 is not set 139# CONFIG_PPC_MPC106 is not set
@@ -155,6 +142,7 @@ CONFIG_MPIC=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
185# CONFIG_RESOURCES_64BIT is not set 173# CONFIG_RESOURCES_64BIT is not set
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
189# CONFIG_PM is not set 179# CONFIG_PM is not set
@@ -197,10 +187,11 @@ CONFIG_ISA_DMA_API=y
197# 187#
198CONFIG_ZONE_DMA=y 188CONFIG_ZONE_DMA=y
199CONFIG_PPC_INDIRECT_PCI=y 189CONFIG_PPC_INDIRECT_PCI=y
200CONFIG_PPC_INDIRECT_PCI_BE=y
201CONFIG_FSL_SOC=y 190CONFIG_FSL_SOC=y
191CONFIG_FSL_PCI=y
202CONFIG_PCI=y 192CONFIG_PCI=y
203CONFIG_PCI_DOMAINS=y 193CONFIG_PCI_DOMAINS=y
194CONFIG_PCI_SYSCALL=y
204# CONFIG_PCIEPORTBUS is not set 195# CONFIG_PCIEPORTBUS is not set
205CONFIG_ARCH_SUPPORTS_MSI=y 196CONFIG_ARCH_SUPPORTS_MSI=y
206# CONFIG_PCI_MSI is not set 197# CONFIG_PCI_MSI is not set
@@ -311,6 +302,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
311# CONFIG_MAC80211 is not set 302# CONFIG_MAC80211 is not set
312# CONFIG_IEEE80211 is not set 303# CONFIG_IEEE80211 is not set
313# CONFIG_RFKILL is not set 304# CONFIG_RFKILL is not set
305# CONFIG_NET_9P is not set
314 306
315# 307#
316# Device Drivers 308# Device Drivers
@@ -325,26 +317,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
325# CONFIG_DEBUG_DRIVER is not set 317# CONFIG_DEBUG_DRIVER is not set
326# CONFIG_DEBUG_DEVRES is not set 318# CONFIG_DEBUG_DEVRES is not set
327# CONFIG_SYS_HYPERVISOR is not set 319# CONFIG_SYS_HYPERVISOR is not set
328
329#
330# Connector - unified userspace <-> kernelspace linker
331#
332# CONFIG_CONNECTOR is not set 320# CONFIG_CONNECTOR is not set
333# CONFIG_MTD is not set 321# CONFIG_MTD is not set
334 322CONFIG_OF_DEVICE=y
335#
336# Parallel port support
337#
338# CONFIG_PARPORT is not set 323# CONFIG_PARPORT is not set
339 324CONFIG_BLK_DEV=y
340#
341# Plug and Play support
342#
343# CONFIG_PNPACPI is not set
344
345#
346# Block devices
347#
348# CONFIG_BLK_DEV_FD is not set 325# CONFIG_BLK_DEV_FD is not set
349# CONFIG_BLK_CPQ_DA is not set 326# CONFIG_BLK_CPQ_DA is not set
350# CONFIG_BLK_CPQ_CISS_DA is not set 327# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -361,14 +338,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
361CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 338CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
362# CONFIG_CDROM_PKTCDVD is not set 339# CONFIG_CDROM_PKTCDVD is not set
363# CONFIG_ATA_OVER_ETH is not set 340# CONFIG_ATA_OVER_ETH is not set
364 341CONFIG_MISC_DEVICES=y
365#
366# Misc devices
367#
368# CONFIG_PHANTOM is not set 342# CONFIG_PHANTOM is not set
343# CONFIG_EEPROM_93CX6 is not set
369# CONFIG_SGI_IOC4 is not set 344# CONFIG_SGI_IOC4 is not set
370# CONFIG_TIFM_CORE is not set 345# CONFIG_TIFM_CORE is not set
371# CONFIG_BLINK is not set
372CONFIG_IDE=y 346CONFIG_IDE=y
373CONFIG_IDE_MAX_HWIFS=4 347CONFIG_IDE_MAX_HWIFS=4
374CONFIG_BLK_DEV_IDE=y 348CONFIG_BLK_DEV_IDE=y
@@ -433,12 +407,9 @@ CONFIG_BLK_DEV_IDEDMA=y
433# 407#
434# CONFIG_RAID_ATTRS is not set 408# CONFIG_RAID_ATTRS is not set
435# CONFIG_SCSI is not set 409# CONFIG_SCSI is not set
410# CONFIG_SCSI_DMA is not set
436# CONFIG_SCSI_NETLINK is not set 411# CONFIG_SCSI_NETLINK is not set
437# CONFIG_ATA is not set 412# CONFIG_ATA is not set
438
439#
440# Multi-device support (RAID and LVM)
441#
442# CONFIG_MD is not set 413# CONFIG_MD is not set
443 414
444# 415#
@@ -451,19 +422,13 @@ CONFIG_BLK_DEV_IDEDMA=y
451# 422#
452# CONFIG_FIREWIRE is not set 423# CONFIG_FIREWIRE is not set
453# CONFIG_IEEE1394 is not set 424# CONFIG_IEEE1394 is not set
454
455#
456# I2O device support
457#
458# CONFIG_I2O is not set 425# CONFIG_I2O is not set
459# CONFIG_MACINTOSH_DRIVERS is not set 426# CONFIG_MACINTOSH_DRIVERS is not set
460
461#
462# Network device support
463#
464CONFIG_NETDEVICES=y 427CONFIG_NETDEVICES=y
428# CONFIG_NETDEVICES_MULTIQUEUE is not set
465# CONFIG_DUMMY is not set 429# CONFIG_DUMMY is not set
466# CONFIG_BONDING is not set 430# CONFIG_BONDING is not set
431# CONFIG_MACVLAN is not set
467# CONFIG_EQUALIZER is not set 432# CONFIG_EQUALIZER is not set
468# CONFIG_TUN is not set 433# CONFIG_TUN is not set
469# CONFIG_ARCNET is not set 434# CONFIG_ARCNET is not set
@@ -480,21 +445,14 @@ CONFIG_PHYLIB=y
480# CONFIG_VITESSE_PHY is not set 445# CONFIG_VITESSE_PHY is not set
481# CONFIG_SMSC_PHY is not set 446# CONFIG_SMSC_PHY is not set
482# CONFIG_BROADCOM_PHY is not set 447# CONFIG_BROADCOM_PHY is not set
448# CONFIG_ICPLUS_PHY is not set
483# CONFIG_FIXED_PHY is not set 449# CONFIG_FIXED_PHY is not set
484
485#
486# Ethernet (10 or 100Mbit)
487#
488CONFIG_NET_ETHERNET=y 450CONFIG_NET_ETHERNET=y
489CONFIG_MII=y 451CONFIG_MII=y
490# CONFIG_HAPPYMEAL is not set 452# CONFIG_HAPPYMEAL is not set
491# CONFIG_SUNGEM is not set 453# CONFIG_SUNGEM is not set
492# CONFIG_CASSINI is not set 454# CONFIG_CASSINI is not set
493# CONFIG_NET_VENDOR_3COM is not set 455# CONFIG_NET_VENDOR_3COM is not set
494
495#
496# Tulip family network device support
497#
498# CONFIG_NET_TULIP is not set 456# CONFIG_NET_TULIP is not set
499# CONFIG_HP100 is not set 457# CONFIG_HP100 is not set
500# CONFIG_NET_PCI is not set 458# CONFIG_NET_PCI is not set
@@ -511,7 +469,6 @@ CONFIG_E1000_NAPI=y
511# CONFIG_SIS190 is not set 469# CONFIG_SIS190 is not set
512# CONFIG_SKGE is not set 470# CONFIG_SKGE is not set
513# CONFIG_SKY2 is not set 471# CONFIG_SKY2 is not set
514# CONFIG_SK98LIN is not set
515# CONFIG_VIA_VELOCITY is not set 472# CONFIG_VIA_VELOCITY is not set
516# CONFIG_TIGON3 is not set 473# CONFIG_TIGON3 is not set
517# CONFIG_BNX2 is not set 474# CONFIG_BNX2 is not set
@@ -543,15 +500,7 @@ CONFIG_NETDEV_10000=y
543# CONFIG_NETCONSOLE is not set 500# CONFIG_NETCONSOLE is not set
544# CONFIG_NETPOLL is not set 501# CONFIG_NETPOLL is not set
545# CONFIG_NET_POLL_CONTROLLER is not set 502# CONFIG_NET_POLL_CONTROLLER is not set
546
547#
548# ISDN subsystem
549#
550# CONFIG_ISDN is not set 503# CONFIG_ISDN is not set
551
552#
553# Telephony Support
554#
555# CONFIG_PHONE is not set 504# CONFIG_PHONE is not set
556 505
557# 506#
@@ -614,10 +563,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
614CONFIG_UNIX98_PTYS=y 563CONFIG_UNIX98_PTYS=y
615CONFIG_LEGACY_PTYS=y 564CONFIG_LEGACY_PTYS=y
616CONFIG_LEGACY_PTY_COUNT=256 565CONFIG_LEGACY_PTY_COUNT=256
617
618#
619# IPMI
620#
621# CONFIG_IPMI_HANDLER is not set 566# CONFIG_IPMI_HANDLER is not set
622# CONFIG_WATCHDOG is not set 567# CONFIG_WATCHDOG is not set
623# CONFIG_HW_RANDOM is not set 568# CONFIG_HW_RANDOM is not set
@@ -629,10 +574,6 @@ CONFIG_GEN_RTC=y
629# CONFIG_AGP is not set 574# CONFIG_AGP is not set
630# CONFIG_DRM is not set 575# CONFIG_DRM is not set
631# CONFIG_RAW_DRIVER is not set 576# CONFIG_RAW_DRIVER is not set
632
633#
634# TPM devices
635#
636# CONFIG_TCG_TPM is not set 577# CONFIG_TCG_TPM is not set
637CONFIG_DEVPORT=y 578CONFIG_DEVPORT=y
638# CONFIG_I2C is not set 579# CONFIG_I2C is not set
@@ -642,20 +583,24 @@ CONFIG_DEVPORT=y
642# 583#
643# CONFIG_SPI is not set 584# CONFIG_SPI is not set
644# CONFIG_SPI_MASTER is not set 585# CONFIG_SPI_MASTER is not set
645
646#
647# Dallas's 1-wire bus
648#
649# CONFIG_W1 is not set 586# CONFIG_W1 is not set
587# CONFIG_POWER_SUPPLY is not set
650CONFIG_HWMON=y 588CONFIG_HWMON=y
651# CONFIG_HWMON_VID is not set 589# CONFIG_HWMON_VID is not set
652# CONFIG_SENSORS_ABITUGURU is not set 590# CONFIG_SENSORS_ABITUGURU is not set
591# CONFIG_SENSORS_ABITUGURU3 is not set
653# CONFIG_SENSORS_F71805F is not set 592# CONFIG_SENSORS_F71805F is not set
593# CONFIG_SENSORS_IT87 is not set
594# CONFIG_SENSORS_PC87360 is not set
654# CONFIG_SENSORS_PC87427 is not set 595# CONFIG_SENSORS_PC87427 is not set
596# CONFIG_SENSORS_SIS5595 is not set
655# CONFIG_SENSORS_SMSC47M1 is not set 597# CONFIG_SENSORS_SMSC47M1 is not set
656# CONFIG_SENSORS_SMSC47B397 is not set 598# CONFIG_SENSORS_SMSC47B397 is not set
599# CONFIG_SENSORS_VIA686A is not set
657# CONFIG_SENSORS_VT1211 is not set 600# CONFIG_SENSORS_VT1211 is not set
601# CONFIG_SENSORS_VT8231 is not set
658# CONFIG_SENSORS_W83627HF is not set 602# CONFIG_SENSORS_W83627HF is not set
603# CONFIG_SENSORS_W83627EHF is not set
659# CONFIG_HWMON_DEBUG_CHIP is not set 604# CONFIG_HWMON_DEBUG_CHIP is not set
660 605
661# 606#
@@ -680,6 +625,7 @@ CONFIG_DAB=y
680# 625#
681# CONFIG_DISPLAY_SUPPORT is not set 626# CONFIG_DISPLAY_SUPPORT is not set
682# CONFIG_VGASTATE is not set 627# CONFIG_VGASTATE is not set
628CONFIG_VIDEO_OUTPUT_CONTROL=y
683# CONFIG_FB is not set 629# CONFIG_FB is not set
684# CONFIG_FB_IBM_GXT4500 is not set 630# CONFIG_FB_IBM_GXT4500 is not set
685 631
@@ -687,16 +633,10 @@ CONFIG_DAB=y
687# Sound 633# Sound
688# 634#
689# CONFIG_SOUND is not set 635# CONFIG_SOUND is not set
690 636CONFIG_HID_SUPPORT=y
691#
692# HID Devices
693#
694CONFIG_HID=y 637CONFIG_HID=y
695# CONFIG_HID_DEBUG is not set 638# CONFIG_HID_DEBUG is not set
696 639CONFIG_USB_SUPPORT=y
697#
698# USB support
699#
700CONFIG_USB_ARCH_HAS_HCD=y 640CONFIG_USB_ARCH_HAS_HCD=y
701CONFIG_USB_ARCH_HAS_OHCI=y 641CONFIG_USB_ARCH_HAS_OHCI=y
702CONFIG_USB_ARCH_HAS_EHCI=y 642CONFIG_USB_ARCH_HAS_EHCI=y
@@ -711,32 +651,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
711# 651#
712# CONFIG_USB_GADGET is not set 652# CONFIG_USB_GADGET is not set
713# CONFIG_MMC is not set 653# CONFIG_MMC is not set
714
715#
716# LED devices
717#
718# CONFIG_NEW_LEDS is not set 654# CONFIG_NEW_LEDS is not set
719
720#
721# LED drivers
722#
723
724#
725# LED Triggers
726#
727
728#
729# InfiniBand support
730#
731# CONFIG_INFINIBAND is not set 655# CONFIG_INFINIBAND is not set
732 656# CONFIG_EDAC is not set
733#
734# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
735#
736
737#
738# Real Time Clock
739#
740# CONFIG_RTC_CLASS is not set 657# CONFIG_RTC_CLASS is not set
741 658
742# 659#
@@ -753,6 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
753# 670#
754 671
755# 672#
673# Userspace I/O
674#
675# CONFIG_UIO is not set
676
677#
756# File systems 678# File systems
757# 679#
758CONFIG_EXT2_FS=y 680CONFIG_EXT2_FS=y
@@ -845,7 +767,6 @@ CONFIG_SUNRPC=y
845# CONFIG_NCP_FS is not set 767# CONFIG_NCP_FS is not set
846# CONFIG_CODA_FS is not set 768# CONFIG_CODA_FS is not set
847# CONFIG_AFS_FS is not set 769# CONFIG_AFS_FS is not set
848# CONFIG_9P_FS is not set
849 770
850# 771#
851# Partition Types 772# Partition Types
@@ -884,6 +805,7 @@ CONFIG_BITREVERSE=y
884# CONFIG_CRC16 is not set 805# CONFIG_CRC16 is not set
885# CONFIG_CRC_ITU_T is not set 806# CONFIG_CRC_ITU_T is not set
886CONFIG_CRC32=y 807CONFIG_CRC32=y
808# CONFIG_CRC7 is not set
887# CONFIG_LIBCRC32C is not set 809# CONFIG_LIBCRC32C is not set
888CONFIG_PLIST=y 810CONFIG_PLIST=y
889CONFIG_HAS_IOMEM=y 811CONFIG_HAS_IOMEM=y
@@ -907,6 +829,7 @@ CONFIG_ENABLE_MUST_CHECK=y
907CONFIG_DEBUG_KERNEL=y 829CONFIG_DEBUG_KERNEL=y
908# CONFIG_DEBUG_SHIRQ is not set 830# CONFIG_DEBUG_SHIRQ is not set
909CONFIG_DETECT_SOFTLOCKUP=y 831CONFIG_DETECT_SOFTLOCKUP=y
832CONFIG_SCHED_DEBUG=y
910# CONFIG_SCHEDSTATS is not set 833# CONFIG_SCHEDSTATS is not set
911# CONFIG_TIMER_STATS is not set 834# CONFIG_TIMER_STATS is not set
912# CONFIG_DEBUG_SLAB is not set 835# CONFIG_DEBUG_SLAB is not set
@@ -928,7 +851,6 @@ CONFIG_FORCED_INLINING=y
928# CONFIG_DEBUG_PAGEALLOC is not set 851# CONFIG_DEBUG_PAGEALLOC is not set
929# CONFIG_DEBUGGER is not set 852# CONFIG_DEBUGGER is not set
930# CONFIG_BDI_SWITCH is not set 853# CONFIG_BDI_SWITCH is not set
931# CONFIG_BOOTX_TEXT is not set
932# CONFIG_PPC_EARLY_DEBUG is not set 854# CONFIG_PPC_EARLY_DEBUG is not set
933 855
934# 856#
@@ -936,8 +858,4 @@ CONFIG_FORCED_INLINING=y
936# 858#
937# CONFIG_KEYS is not set 859# CONFIG_KEYS is not set
938# CONFIG_SECURITY is not set 860# CONFIG_SECURITY is not set
939
940#
941# Cryptographic options
942#
943# CONFIG_CRYPTO is not set 861# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index 1ac94a605b05..b2f389dcaded 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:57:00 2007 4# Wed Aug 29 16:16:23 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_ALTIVEC=y
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=2
7CONFIG_PPC32=y 24CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 26CONFIG_MMU=y
@@ -14,61 +31,41 @@ 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
27CONFIG_DEFAULT_UIMAGE=y 46CONFIG_DEFAULT_UIMAGE=y
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
36CONFIG_PPC_86xx=y
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
45CONFIG_ALTIVEC=y
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=2
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 58CONFIG_LOCALVERSION_AUTO=y
65# CONFIG_SWAP is not set 59CONFIG_SWAP=y
66# CONFIG_SYSVIPC is not set 60CONFIG_SYSVIPC=y
67# CONFIG_POSIX_MQUEUE is not set 61CONFIG_SYSVIPC_SYSCTL=y
68# CONFIG_BSD_PROCESS_ACCT is not set 62CONFIG_POSIX_MQUEUE=y
63CONFIG_BSD_PROCESS_ACCT=y
64# CONFIG_BSD_PROCESS_ACCT_V3 is not set
69# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
70# CONFIG_UTS_NS is not set 66# CONFIG_USER_NS is not set
71# CONFIG_AUDIT is not set 67CONFIG_AUDIT=y
68# CONFIG_AUDITSYSCALL is not set
72CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
74CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
@@ -82,12 +79,12 @@ CONFIG_SYSCTL=y
82CONFIG_EMBEDDED=y 79CONFIG_EMBEDDED=y
83CONFIG_SYSCTL_SYSCALL=y 80CONFIG_SYSCTL_SYSCALL=y
84CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
85# CONFIG_KALLSYMS_ALL is not set 82CONFIG_KALLSYMS_ALL=y
86CONFIG_KALLSYMS_EXTRA_PASS=y 83CONFIG_KALLSYMS_EXTRA_PASS=y
87CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
88CONFIG_PRINTK=y 85CONFIG_PRINTK=y
89CONFIG_BUG=y 86CONFIG_BUG=y
90# CONFIG_ELF_CORE is not set 87CONFIG_ELF_CORE=y
91CONFIG_BASE_FULL=y 88CONFIG_BASE_FULL=y
92CONFIG_FUTEX=y 89CONFIG_FUTEX=y
93CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -103,36 +100,40 @@ CONFIG_SLAB=y
103CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
106 103CONFIG_MODULES=y
107# 104CONFIG_MODULE_UNLOAD=y
108# Loadable module support 105CONFIG_MODULE_FORCE_UNLOAD=y
109# 106CONFIG_MODVERSIONS=y
110# CONFIG_MODULES is not set 107# CONFIG_MODULE_SRCVERSION_ALL is not set
111 108CONFIG_KMOD=y
112# 109CONFIG_STOP_MACHINE=y
113# Block layer
114#
115CONFIG_BLOCK=y 110CONFIG_BLOCK=y
116# CONFIG_LBD is not set 111CONFIG_LBD=y
117# CONFIG_BLK_DEV_IO_TRACE is not set 112# CONFIG_BLK_DEV_IO_TRACE is not set
118# CONFIG_LSF is not set 113# CONFIG_LSF is not set
114# CONFIG_BLK_DEV_BSG is not set
119 115
120# 116#
121# IO Schedulers 117# IO Schedulers
122# 118#
123CONFIG_IOSCHED_NOOP=y 119CONFIG_IOSCHED_NOOP=y
124# CONFIG_IOSCHED_AS is not set 120CONFIG_IOSCHED_AS=y
125CONFIG_IOSCHED_DEADLINE=y 121CONFIG_IOSCHED_DEADLINE=y
126# CONFIG_IOSCHED_CFQ is not set 122CONFIG_IOSCHED_CFQ=y
127# CONFIG_DEFAULT_AS is not set 123# CONFIG_DEFAULT_AS is not set
128CONFIG_DEFAULT_DEADLINE=y 124# CONFIG_DEFAULT_DEADLINE is not set
129# CONFIG_DEFAULT_CFQ is not set 125CONFIG_DEFAULT_CFQ=y
130# CONFIG_DEFAULT_NOOP is not set 126# CONFIG_DEFAULT_NOOP is not set
131CONFIG_DEFAULT_IOSCHED="deadline" 127CONFIG_DEFAULT_IOSCHED="cfq"
132 128
133# 129#
134# Platform support 130# Platform support
135# 131#
132# CONFIG_PPC_MULTIPLATFORM is not set
133# CONFIG_EMBEDDED6xx is not set
134# CONFIG_PPC_82xx is not set
135# CONFIG_PPC_83xx is not set
136CONFIG_PPC_86xx=y
136# CONFIG_PPC_MPC52xx is not set 137# CONFIG_PPC_MPC52xx is not set
137# CONFIG_PPC_MPC5200 is not set 138# CONFIG_PPC_MPC5200 is not set
138# CONFIG_PPC_CELL is not set 139# CONFIG_PPC_CELL is not set
@@ -151,6 +152,7 @@ CONFIG_PPC_I8259=y
151# CONFIG_GENERIC_IOMAP is not set 152# CONFIG_GENERIC_IOMAP is not set
152# CONFIG_CPU_FREQ is not set 153# CONFIG_CPU_FREQ is not set
153# CONFIG_CPM2 is not set 154# CONFIG_CPM2 is not set
155CONFIG_FSL_ULI1575=y
154 156
155# 157#
156# Kernel options 158# Kernel options
@@ -166,7 +168,7 @@ CONFIG_PREEMPT_NONE=y
166# CONFIG_PREEMPT is not set 168# CONFIG_PREEMPT is not set
167CONFIG_PREEMPT_BKL=y 169CONFIG_PREEMPT_BKL=y
168CONFIG_BINFMT_ELF=y 170CONFIG_BINFMT_ELF=y
169# CONFIG_BINFMT_MISC is not set 171CONFIG_BINFMT_MISC=m
170CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 172CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
171# CONFIG_IRQ_ALL_CPUS is not set 173# CONFIG_IRQ_ALL_CPUS is not set
172CONFIG_ARCH_FLATMEM_ENABLE=y 174CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -181,10 +183,12 @@ CONFIG_FLAT_NODE_MEM_MAP=y
181CONFIG_SPLIT_PTLOCK_CPUS=4 183CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_RESOURCES_64BIT is not set 184# CONFIG_RESOURCES_64BIT is not set
183CONFIG_ZONE_DMA_FLAG=1 185CONFIG_ZONE_DMA_FLAG=1
186CONFIG_BOUNCE=y
187CONFIG_VIRT_TO_BUS=y
184CONFIG_PROC_DEVICETREE=y 188CONFIG_PROC_DEVICETREE=y
185# CONFIG_CMDLINE_BOOL is not set 189# CONFIG_CMDLINE_BOOL is not set
186# CONFIG_PM is not set 190# CONFIG_PM is not set
187# CONFIG_SECCOMP is not set 191CONFIG_SECCOMP=y
188# CONFIG_WANT_DEVICE_TREE is not set 192# CONFIG_WANT_DEVICE_TREE is not set
189CONFIG_ISA_DMA_API=y 193CONFIG_ISA_DMA_API=y
190 194
@@ -194,11 +198,11 @@ CONFIG_ISA_DMA_API=y
194CONFIG_ZONE_DMA=y 198CONFIG_ZONE_DMA=y
195CONFIG_GENERIC_ISA_DMA=y 199CONFIG_GENERIC_ISA_DMA=y
196CONFIG_PPC_INDIRECT_PCI=y 200CONFIG_PPC_INDIRECT_PCI=y
197CONFIG_PPC_INDIRECT_PCI_BE=y
198CONFIG_FSL_SOC=y 201CONFIG_FSL_SOC=y
199CONFIG_FSL_PCIE=y 202CONFIG_FSL_PCI=y
200CONFIG_PCI=y 203CONFIG_PCI=y
201CONFIG_PCI_DOMAINS=y 204CONFIG_PCI_DOMAINS=y
205CONFIG_PCI_SYSCALL=y
202# CONFIG_PCIEPORTBUS is not set 206# CONFIG_PCIEPORTBUS is not set
203CONFIG_ARCH_SUPPORTS_MSI=y 207CONFIG_ARCH_SUPPORTS_MSI=y
204# CONFIG_PCI_MSI is not set 208# CONFIG_PCI_MSI is not set
@@ -239,27 +243,37 @@ CONFIG_XFRM=y
239CONFIG_XFRM_USER=y 243CONFIG_XFRM_USER=y
240# CONFIG_XFRM_SUB_POLICY is not set 244# CONFIG_XFRM_SUB_POLICY is not set
241# CONFIG_XFRM_MIGRATE is not set 245# CONFIG_XFRM_MIGRATE is not set
242# CONFIG_NET_KEY is not set 246CONFIG_NET_KEY=m
247# CONFIG_NET_KEY_MIGRATE is not set
243CONFIG_INET=y 248CONFIG_INET=y
244# CONFIG_IP_MULTICAST is not set 249CONFIG_IP_MULTICAST=y
245# CONFIG_IP_ADVANCED_ROUTER is not set 250CONFIG_IP_ADVANCED_ROUTER=y
251CONFIG_ASK_IP_FIB_HASH=y
252# CONFIG_IP_FIB_TRIE is not set
246CONFIG_IP_FIB_HASH=y 253CONFIG_IP_FIB_HASH=y
254CONFIG_IP_MULTIPLE_TABLES=y
255CONFIG_IP_ROUTE_MULTIPATH=y
256CONFIG_IP_ROUTE_VERBOSE=y
247CONFIG_IP_PNP=y 257CONFIG_IP_PNP=y
248CONFIG_IP_PNP_DHCP=y 258CONFIG_IP_PNP_DHCP=y
249CONFIG_IP_PNP_BOOTP=y 259CONFIG_IP_PNP_BOOTP=y
250CONFIG_IP_PNP_RARP=y 260CONFIG_IP_PNP_RARP=y
251# CONFIG_NET_IPIP is not set 261CONFIG_NET_IPIP=y
252# CONFIG_NET_IPGRE is not set 262CONFIG_NET_IPGRE=y
253# CONFIG_ARPD is not set 263CONFIG_NET_IPGRE_BROADCAST=y
264CONFIG_IP_MROUTE=y
265CONFIG_IP_PIMSM_V1=y
266CONFIG_IP_PIMSM_V2=y
267CONFIG_ARPD=y
254# CONFIG_SYN_COOKIES is not set 268# CONFIG_SYN_COOKIES is not set
255# CONFIG_INET_AH is not set 269# CONFIG_INET_AH is not set
256# CONFIG_INET_ESP is not set 270# CONFIG_INET_ESP is not set
257# CONFIG_INET_IPCOMP is not set 271# CONFIG_INET_IPCOMP is not set
258# CONFIG_INET_XFRM_TUNNEL is not set 272# CONFIG_INET_XFRM_TUNNEL is not set
259CONFIG_INET_TUNNEL=y 273CONFIG_INET_TUNNEL=y
260CONFIG_INET_XFRM_MODE_TRANSPORT=y 274# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
261CONFIG_INET_XFRM_MODE_TUNNEL=y 275# CONFIG_INET_XFRM_MODE_TUNNEL is not set
262CONFIG_INET_XFRM_MODE_BEET=y 276# CONFIG_INET_XFRM_MODE_BEET is not set
263CONFIG_INET_DIAG=y 277CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 278CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 279# CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,7 +300,12 @@ CONFIG_IPV6_SIT=y
286# CONFIG_NETWORK_SECMARK is not set 300# CONFIG_NETWORK_SECMARK is not set
287# CONFIG_NETFILTER is not set 301# CONFIG_NETFILTER is not set
288# CONFIG_IP_DCCP is not set 302# CONFIG_IP_DCCP is not set
289# CONFIG_IP_SCTP is not set 303CONFIG_IP_SCTP=m
304# CONFIG_SCTP_DBG_MSG is not set
305# CONFIG_SCTP_DBG_OBJCNT is not set
306# CONFIG_SCTP_HMAC_NONE is not set
307# CONFIG_SCTP_HMAC_SHA1 is not set
308CONFIG_SCTP_HMAC_MD5=y
290# CONFIG_TIPC is not set 309# CONFIG_TIPC is not set
291# CONFIG_ATM is not set 310# CONFIG_ATM is not set
292# CONFIG_BRIDGE is not set 311# CONFIG_BRIDGE is not set
@@ -313,6 +332,7 @@ CONFIG_IPV6_SIT=y
313# CONFIG_IRDA is not set 332# CONFIG_IRDA is not set
314# CONFIG_BT is not set 333# CONFIG_BT is not set
315# CONFIG_AF_RXRPC is not set 334# CONFIG_AF_RXRPC is not set
335CONFIG_FIB_RULES=y
316 336
317# 337#
318# Wireless 338# Wireless
@@ -322,6 +342,7 @@ CONFIG_IPV6_SIT=y
322# CONFIG_MAC80211 is not set 342# CONFIG_MAC80211 is not set
323# CONFIG_IEEE80211 is not set 343# CONFIG_IEEE80211 is not set
324# CONFIG_RFKILL is not set 344# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set
325 346
326# 347#
327# Device Drivers 348# Device Drivers
@@ -336,26 +357,11 @@ CONFIG_FW_LOADER=y
336# CONFIG_DEBUG_DRIVER is not set 357# CONFIG_DEBUG_DRIVER is not set
337# CONFIG_DEBUG_DEVRES is not set 358# CONFIG_DEBUG_DEVRES is not set
338# CONFIG_SYS_HYPERVISOR is not set 359# CONFIG_SYS_HYPERVISOR is not set
339
340#
341# Connector - unified userspace <-> kernelspace linker
342#
343# CONFIG_CONNECTOR is not set 360# CONFIG_CONNECTOR is not set
344# CONFIG_MTD is not set 361# CONFIG_MTD is not set
345 362CONFIG_OF_DEVICE=y
346#
347# Parallel port support
348#
349# CONFIG_PARPORT is not set 363# CONFIG_PARPORT is not set
350 364CONFIG_BLK_DEV=y
351#
352# Plug and Play support
353#
354# CONFIG_PNPACPI is not set
355
356#
357# Block devices
358#
359# CONFIG_BLK_DEV_FD is not set 365# CONFIG_BLK_DEV_FD is not set
360# CONFIG_BLK_CPQ_DA is not set 366# CONFIG_BLK_CPQ_DA is not set
361# CONFIG_BLK_CPQ_CISS_DA is not set 367# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -364,60 +370,172 @@ CONFIG_FW_LOADER=y
364# CONFIG_BLK_DEV_COW_COMMON is not set 370# CONFIG_BLK_DEV_COW_COMMON is not set
365CONFIG_BLK_DEV_LOOP=y 371CONFIG_BLK_DEV_LOOP=y
366# CONFIG_BLK_DEV_CRYPTOLOOP is not set 372# CONFIG_BLK_DEV_CRYPTOLOOP is not set
367# CONFIG_BLK_DEV_NBD is not set 373CONFIG_BLK_DEV_NBD=y
368# CONFIG_BLK_DEV_SX8 is not set 374# CONFIG_BLK_DEV_SX8 is not set
375# CONFIG_BLK_DEV_UB is not set
369CONFIG_BLK_DEV_RAM=y 376CONFIG_BLK_DEV_RAM=y
370CONFIG_BLK_DEV_RAM_COUNT=16 377CONFIG_BLK_DEV_RAM_COUNT=16
371CONFIG_BLK_DEV_RAM_SIZE=131072 378CONFIG_BLK_DEV_RAM_SIZE=131072
372CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 379CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
373# CONFIG_CDROM_PKTCDVD is not set 380# CONFIG_CDROM_PKTCDVD is not set
374# CONFIG_ATA_OVER_ETH is not set 381# CONFIG_ATA_OVER_ETH is not set
375 382CONFIG_MISC_DEVICES=y
376#
377# Misc devices
378#
379# CONFIG_PHANTOM is not set 383# CONFIG_PHANTOM is not set
384# CONFIG_EEPROM_93CX6 is not set
380# CONFIG_SGI_IOC4 is not set 385# CONFIG_SGI_IOC4 is not set
381# CONFIG_TIFM_CORE is not set 386# CONFIG_TIFM_CORE is not set
382# CONFIG_BLINK is not set
383# CONFIG_IDE is not set 387# CONFIG_IDE is not set
384 388
385# 389#
386# SCSI device support 390# SCSI device support
387# 391#
388# CONFIG_RAID_ATTRS is not set 392# CONFIG_RAID_ATTRS is not set
389# CONFIG_SCSI is not set 393CONFIG_SCSI=y
394CONFIG_SCSI_DMA=y
395# CONFIG_SCSI_TGT is not set
390# CONFIG_SCSI_NETLINK is not set 396# CONFIG_SCSI_NETLINK is not set
391# CONFIG_ATA is not set 397CONFIG_SCSI_PROC_FS=y
392 398
393# 399#
394# Multi-device support (RAID and LVM) 400# SCSI support type (disk, tape, CD-ROM)
395# 401#
402CONFIG_BLK_DEV_SD=y
403CONFIG_CHR_DEV_ST=y
404# CONFIG_CHR_DEV_OSST is not set
405CONFIG_BLK_DEV_SR=y
406# CONFIG_BLK_DEV_SR_VENDOR is not set
407CONFIG_CHR_DEV_SG=y
408# CONFIG_CHR_DEV_SCH is not set
409
410#
411# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
412#
413CONFIG_SCSI_MULTI_LUN=y
414# CONFIG_SCSI_CONSTANTS is not set
415CONFIG_SCSI_LOGGING=y
416# CONFIG_SCSI_SCAN_ASYNC is not set
417CONFIG_SCSI_WAIT_SCAN=m
418
419#
420# SCSI Transports
421#
422# CONFIG_SCSI_SPI_ATTRS is not set
423# CONFIG_SCSI_FC_ATTRS is not set
424# CONFIG_SCSI_ISCSI_ATTRS is not set
425# CONFIG_SCSI_SAS_LIBSAS is not set
426CONFIG_SCSI_LOWLEVEL=y
427# CONFIG_ISCSI_TCP is not set
428# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
429# CONFIG_SCSI_3W_9XXX is not set
430# CONFIG_SCSI_ACARD is not set
431# CONFIG_SCSI_AACRAID is not set
432# CONFIG_SCSI_AIC7XXX is not set
433# CONFIG_SCSI_AIC7XXX_OLD is not set
434# CONFIG_SCSI_AIC79XX is not set
435# CONFIG_SCSI_AIC94XX is not set
436# CONFIG_SCSI_DPT_I2O is not set
437# CONFIG_SCSI_ARCMSR is not set
438# CONFIG_MEGARAID_NEWGEN is not set
439# CONFIG_MEGARAID_LEGACY is not set
440# CONFIG_MEGARAID_SAS is not set
441# CONFIG_SCSI_HPTIOP is not set
442# CONFIG_SCSI_BUSLOGIC is not set
443# CONFIG_SCSI_DMX3191D is not set
444# CONFIG_SCSI_EATA is not set
445# CONFIG_SCSI_FUTURE_DOMAIN is not set
446# CONFIG_SCSI_GDTH is not set
447# CONFIG_SCSI_IPS is not set
448# CONFIG_SCSI_INITIO is not set
449# CONFIG_SCSI_INIA100 is not set
450# CONFIG_SCSI_STEX is not set
451# CONFIG_SCSI_SYM53C8XX_2 is not set
452# CONFIG_SCSI_IPR is not set
453# CONFIG_SCSI_QLOGIC_1280 is not set
454# CONFIG_SCSI_QLA_FC is not set
455# CONFIG_SCSI_QLA_ISCSI is not set
456# CONFIG_SCSI_LPFC is not set
457# CONFIG_SCSI_DC395x is not set
458# CONFIG_SCSI_DC390T is not set
459# CONFIG_SCSI_NSP32 is not set
460# CONFIG_SCSI_DEBUG is not set
461# CONFIG_SCSI_SRP is not set
462CONFIG_ATA=y
463# CONFIG_ATA_NONSTANDARD is not set
464CONFIG_SATA_AHCI=y
465# CONFIG_SATA_SVW is not set
466# CONFIG_ATA_PIIX is not set
467# CONFIG_SATA_MV is not set
468# CONFIG_SATA_NV is not set
469# CONFIG_PDC_ADMA is not set
470# CONFIG_SATA_QSTOR is not set
471# CONFIG_SATA_PROMISE is not set
472# CONFIG_SATA_SX4 is not set
473# CONFIG_SATA_SIL is not set
474# CONFIG_SATA_SIL24 is not set
475# CONFIG_SATA_SIS is not set
476# CONFIG_SATA_ULI is not set
477# CONFIG_SATA_VIA is not set
478# CONFIG_SATA_VITESSE is not set
479# CONFIG_SATA_INIC162X is not set
480CONFIG_PATA_ALI=y
481# CONFIG_PATA_AMD is not set
482# CONFIG_PATA_ARTOP is not set
483# CONFIG_PATA_ATIIXP is not set
484# CONFIG_PATA_CMD640_PCI is not set
485# CONFIG_PATA_CMD64X is not set
486# CONFIG_PATA_CS5520 is not set
487# CONFIG_PATA_CS5530 is not set
488# CONFIG_PATA_CYPRESS is not set
489# CONFIG_PATA_EFAR is not set
490# CONFIG_ATA_GENERIC is not set
491# CONFIG_PATA_HPT366 is not set
492# CONFIG_PATA_HPT37X is not set
493# CONFIG_PATA_HPT3X2N is not set
494# CONFIG_PATA_HPT3X3 is not set
495# CONFIG_PATA_IT821X is not set
496# CONFIG_PATA_IT8213 is not set
497# CONFIG_PATA_JMICRON is not set
498# CONFIG_PATA_TRIFLEX is not set
499# CONFIG_PATA_MARVELL is not set
500# CONFIG_PATA_MPIIX is not set
501# CONFIG_PATA_OLDPIIX is not set
502# CONFIG_PATA_NETCELL is not set
503# CONFIG_PATA_NS87410 is not set
504# CONFIG_PATA_OPTI is not set
505# CONFIG_PATA_OPTIDMA is not set
506# CONFIG_PATA_PDC_OLD is not set
507# CONFIG_PATA_RADISYS is not set
508# CONFIG_PATA_RZ1000 is not set
509# CONFIG_PATA_SC1200 is not set
510# CONFIG_PATA_SERVERWORKS is not set
511# CONFIG_PATA_PDC2027X is not set
512# CONFIG_PATA_SIL680 is not set
513# CONFIG_PATA_SIS is not set
514# CONFIG_PATA_VIA is not set
515# CONFIG_PATA_WINBOND is not set
516# CONFIG_PATA_PLATFORM is not set
396# CONFIG_MD is not set 517# CONFIG_MD is not set
397 518
398# 519#
399# Fusion MPT device support 520# Fusion MPT device support
400# 521#
401# CONFIG_FUSION is not set 522# CONFIG_FUSION is not set
523# CONFIG_FUSION_SPI is not set
524# CONFIG_FUSION_FC is not set
525# CONFIG_FUSION_SAS is not set
402 526
403# 527#
404# IEEE 1394 (FireWire) support 528# IEEE 1394 (FireWire) support
405# 529#
406# CONFIG_FIREWIRE is not set 530# CONFIG_FIREWIRE is not set
407# CONFIG_IEEE1394 is not set 531# CONFIG_IEEE1394 is not set
408
409#
410# I2O device support
411#
412# CONFIG_I2O is not set 532# CONFIG_I2O is not set
413# CONFIG_MACINTOSH_DRIVERS is not set 533# CONFIG_MACINTOSH_DRIVERS is not set
414
415#
416# Network device support
417#
418CONFIG_NETDEVICES=y 534CONFIG_NETDEVICES=y
535# CONFIG_NETDEVICES_MULTIQUEUE is not set
419CONFIG_DUMMY=y 536CONFIG_DUMMY=y
420# CONFIG_BONDING is not set 537# CONFIG_BONDING is not set
538# CONFIG_MACVLAN is not set
421# CONFIG_EQUALIZER is not set 539# CONFIG_EQUALIZER is not set
422# CONFIG_TUN is not set 540# CONFIG_TUN is not set
423# CONFIG_ARCNET is not set 541# CONFIG_ARCNET is not set
@@ -434,21 +552,14 @@ CONFIG_PHYLIB=y
434CONFIG_VITESSE_PHY=y 552CONFIG_VITESSE_PHY=y
435# CONFIG_SMSC_PHY is not set 553# CONFIG_SMSC_PHY is not set
436# CONFIG_BROADCOM_PHY is not set 554# CONFIG_BROADCOM_PHY is not set
555# CONFIG_ICPLUS_PHY is not set
437# CONFIG_FIXED_PHY is not set 556# CONFIG_FIXED_PHY is not set
438
439#
440# Ethernet (10 or 100Mbit)
441#
442CONFIG_NET_ETHERNET=y 557CONFIG_NET_ETHERNET=y
443CONFIG_MII=y 558CONFIG_MII=y
444# CONFIG_HAPPYMEAL is not set 559# CONFIG_HAPPYMEAL is not set
445# CONFIG_SUNGEM is not set 560# CONFIG_SUNGEM is not set
446# CONFIG_CASSINI is not set 561# CONFIG_CASSINI is not set
447# CONFIG_NET_VENDOR_3COM is not set 562# CONFIG_NET_VENDOR_3COM is not set
448
449#
450# Tulip family network device support
451#
452# CONFIG_NET_TULIP is not set 563# CONFIG_NET_TULIP is not set
453# CONFIG_HP100 is not set 564# CONFIG_HP100 is not set
454# CONFIG_NET_PCI is not set 565# CONFIG_NET_PCI is not set
@@ -463,12 +574,11 @@ CONFIG_NETDEV_1000=y
463# CONFIG_SIS190 is not set 574# CONFIG_SIS190 is not set
464# CONFIG_SKGE is not set 575# CONFIG_SKGE is not set
465# CONFIG_SKY2 is not set 576# CONFIG_SKY2 is not set
466# CONFIG_SK98LIN is not set
467# CONFIG_VIA_VELOCITY is not set 577# CONFIG_VIA_VELOCITY is not set
468# CONFIG_TIGON3 is not set 578# CONFIG_TIGON3 is not set
469# CONFIG_BNX2 is not set 579# CONFIG_BNX2 is not set
470CONFIG_GIANFAR=y 580CONFIG_GIANFAR=y
471# CONFIG_GFAR_NAPI is not set 581CONFIG_GFAR_NAPI=y
472# CONFIG_QLA3XXX is not set 582# CONFIG_QLA3XXX is not set
473# CONFIG_ATL1 is not set 583# CONFIG_ATL1 is not set
474CONFIG_NETDEV_10000=y 584CONFIG_NETDEV_10000=y
@@ -486,24 +596,27 @@ CONFIG_NETDEV_10000=y
486# 596#
487# CONFIG_WLAN_PRE80211 is not set 597# CONFIG_WLAN_PRE80211 is not set
488# CONFIG_WLAN_80211 is not set 598# CONFIG_WLAN_80211 is not set
599
600#
601# USB Network Adapters
602#
603# CONFIG_USB_CATC is not set
604# CONFIG_USB_KAWETH is not set
605# CONFIG_USB_PEGASUS is not set
606# CONFIG_USB_RTL8150 is not set
607# CONFIG_USB_USBNET_MII is not set
608# CONFIG_USB_USBNET is not set
489# CONFIG_WAN is not set 609# CONFIG_WAN is not set
490# CONFIG_FDDI is not set 610# CONFIG_FDDI is not set
491# CONFIG_HIPPI is not set 611# CONFIG_HIPPI is not set
492# CONFIG_PPP is not set 612# CONFIG_PPP is not set
493# CONFIG_SLIP is not set 613# CONFIG_SLIP is not set
614# CONFIG_NET_FC is not set
494# CONFIG_SHAPER is not set 615# CONFIG_SHAPER is not set
495# CONFIG_NETCONSOLE is not set 616# CONFIG_NETCONSOLE is not set
496# CONFIG_NETPOLL is not set 617# CONFIG_NETPOLL is not set
497# CONFIG_NET_POLL_CONTROLLER is not set 618# CONFIG_NET_POLL_CONTROLLER is not set
498
499#
500# ISDN subsystem
501#
502# CONFIG_ISDN is not set 619# CONFIG_ISDN is not set
503
504#
505# Telephony Support
506#
507# CONFIG_PHONE is not set 620# CONFIG_PHONE is not set
508 621
509# 622#
@@ -575,25 +688,19 @@ CONFIG_SERIAL_CORE_CONSOLE=y
575# CONFIG_SERIAL_JSM is not set 688# CONFIG_SERIAL_JSM is not set
576# CONFIG_SERIAL_OF_PLATFORM is not set 689# CONFIG_SERIAL_OF_PLATFORM is not set
577CONFIG_UNIX98_PTYS=y 690CONFIG_UNIX98_PTYS=y
578# CONFIG_LEGACY_PTYS is not set 691CONFIG_LEGACY_PTYS=y
579 692CONFIG_LEGACY_PTY_COUNT=256
580#
581# IPMI
582#
583# CONFIG_IPMI_HANDLER is not set 693# CONFIG_IPMI_HANDLER is not set
584# CONFIG_WATCHDOG is not set 694# CONFIG_WATCHDOG is not set
585# CONFIG_HW_RANDOM is not set 695# CONFIG_HW_RANDOM is not set
586# CONFIG_NVRAM is not set 696CONFIG_NVRAM=y
587# CONFIG_GEN_RTC is not set 697CONFIG_GEN_RTC=y
698CONFIG_GEN_RTC_X=y
588# CONFIG_R3964 is not set 699# CONFIG_R3964 is not set
589# CONFIG_APPLICOM is not set 700# CONFIG_APPLICOM is not set
590# CONFIG_AGP is not set 701# CONFIG_AGP is not set
591# CONFIG_DRM is not set 702# CONFIG_DRM is not set
592# CONFIG_RAW_DRIVER is not set 703# CONFIG_RAW_DRIVER is not set
593
594#
595# TPM devices
596#
597# CONFIG_TCG_TPM is not set 704# CONFIG_TCG_TPM is not set
598CONFIG_DEVPORT=y 705CONFIG_DEVPORT=y
599CONFIG_I2C=y 706CONFIG_I2C=y
@@ -628,6 +735,9 @@ CONFIG_I2C_MPC=y
628# CONFIG_I2C_SIS5595 is not set 735# CONFIG_I2C_SIS5595 is not set
629# CONFIG_I2C_SIS630 is not set 736# CONFIG_I2C_SIS630 is not set
630# CONFIG_I2C_SIS96X is not set 737# CONFIG_I2C_SIS96X is not set
738# CONFIG_I2C_TAOS_EVM is not set
739# CONFIG_I2C_STUB is not set
740# CONFIG_I2C_TINY_USB is not set
631# CONFIG_I2C_VIA is not set 741# CONFIG_I2C_VIA is not set
632# CONFIG_I2C_VIAPRO is not set 742# CONFIG_I2C_VIAPRO is not set
633# CONFIG_I2C_VOODOO3 is not set 743# CONFIG_I2C_VOODOO3 is not set
@@ -637,12 +747,14 @@ CONFIG_I2C_MPC=y
637# 747#
638# CONFIG_SENSORS_DS1337 is not set 748# CONFIG_SENSORS_DS1337 is not set
639# CONFIG_SENSORS_DS1374 is not set 749# CONFIG_SENSORS_DS1374 is not set
750# CONFIG_DS1682 is not set
640CONFIG_SENSORS_EEPROM=y 751CONFIG_SENSORS_EEPROM=y
641# CONFIG_SENSORS_PCF8574 is not set 752# CONFIG_SENSORS_PCF8574 is not set
642# CONFIG_SENSORS_PCA9539 is not set 753# CONFIG_SENSORS_PCA9539 is not set
643# CONFIG_SENSORS_PCF8591 is not set 754# CONFIG_SENSORS_PCF8591 is not set
644# CONFIG_SENSORS_M41T00 is not set 755# CONFIG_SENSORS_M41T00 is not set
645# CONFIG_SENSORS_MAX6875 is not set 756# CONFIG_SENSORS_MAX6875 is not set
757# CONFIG_SENSORS_TSL2550 is not set
646# CONFIG_I2C_DEBUG_CORE is not set 758# CONFIG_I2C_DEBUG_CORE is not set
647# CONFIG_I2C_DEBUG_ALGO is not set 759# CONFIG_I2C_DEBUG_ALGO is not set
648# CONFIG_I2C_DEBUG_BUS is not set 760# CONFIG_I2C_DEBUG_BUS is not set
@@ -653,11 +765,8 @@ CONFIG_SENSORS_EEPROM=y
653# 765#
654# CONFIG_SPI is not set 766# CONFIG_SPI is not set
655# CONFIG_SPI_MASTER is not set 767# CONFIG_SPI_MASTER is not set
656
657#
658# Dallas's 1-wire bus
659#
660# CONFIG_W1 is not set 768# CONFIG_W1 is not set
769# CONFIG_POWER_SUPPLY is not set
661# CONFIG_HWMON is not set 770# CONFIG_HWMON is not set
662 771
663# 772#
@@ -669,8 +778,108 @@ CONFIG_SENSORS_EEPROM=y
669# Multimedia devices 778# Multimedia devices
670# 779#
671# CONFIG_VIDEO_DEV is not set 780# CONFIG_VIDEO_DEV is not set
672# CONFIG_DVB_CORE is not set 781CONFIG_DVB_CORE=m
782# CONFIG_DVB_CORE_ATTACH is not set
783CONFIG_DVB_CAPTURE_DRIVERS=y
784
785#
786# Supported SAA7146 based PCI Adapters
787#
788
789#
790# Supported USB Adapters
791#
792# CONFIG_DVB_USB is not set
793# CONFIG_DVB_TTUSB_BUDGET is not set
794# CONFIG_DVB_TTUSB_DEC is not set
795# CONFIG_DVB_CINERGYT2 is not set
796
797#
798# Supported FlexCopII (B2C2) Adapters
799#
800# CONFIG_DVB_B2C2_FLEXCOP is not set
801
802#
803# Supported BT878 Adapters
804#
805
806#
807# Supported Pluto2 Adapters
808#
809# CONFIG_DVB_PLUTO2 is not set
810
811#
812# Supported DVB Frontends
813#
814
815#
816# Customise DVB Frontends
817#
818# CONFIG_DVB_FE_CUSTOMISE is not set
819
820#
821# DVB-S (satellite) frontends
822#
823# CONFIG_DVB_STV0299 is not set
824# CONFIG_DVB_CX24110 is not set
825# CONFIG_DVB_CX24123 is not set
826# CONFIG_DVB_TDA8083 is not set
827# CONFIG_DVB_MT312 is not set
828# CONFIG_DVB_VES1X93 is not set
829# CONFIG_DVB_S5H1420 is not set
830# CONFIG_DVB_TDA10086 is not set
831
832#
833# DVB-T (terrestrial) frontends
834#
835# CONFIG_DVB_SP8870 is not set
836# CONFIG_DVB_SP887X is not set
837# CONFIG_DVB_CX22700 is not set
838# CONFIG_DVB_CX22702 is not set
839# CONFIG_DVB_L64781 is not set
840# CONFIG_DVB_TDA1004X is not set
841# CONFIG_DVB_NXT6000 is not set
842# CONFIG_DVB_MT352 is not set
843# CONFIG_DVB_ZL10353 is not set
844# CONFIG_DVB_DIB3000MB is not set
845# CONFIG_DVB_DIB3000MC is not set
846# CONFIG_DVB_DIB7000M is not set
847# CONFIG_DVB_DIB7000P is not set
848
849#
850# DVB-C (cable) frontends
851#
852# CONFIG_DVB_VES1820 is not set
853# CONFIG_DVB_TDA10021 is not set
854# CONFIG_DVB_TDA10023 is not set
855# CONFIG_DVB_STV0297 is not set
856
857#
858# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
859#
860# CONFIG_DVB_NXT200X is not set
861# CONFIG_DVB_OR51211 is not set
862# CONFIG_DVB_OR51132 is not set
863# CONFIG_DVB_BCM3510 is not set
864# CONFIG_DVB_LGDT330X is not set
865
866#
867# Tuners/PLL support
868#
869# CONFIG_DVB_PLL is not set
870# CONFIG_DVB_TDA826X is not set
871# CONFIG_DVB_TDA827X is not set
872# CONFIG_DVB_TUNER_QT1010 is not set
873# CONFIG_DVB_TUNER_MT2060 is not set
874
875#
876# Miscellaneous devices
877#
878# CONFIG_DVB_LNBP21 is not set
879# CONFIG_DVB_ISL6421 is not set
880# CONFIG_DVB_TUA6100 is not set
673CONFIG_DAB=y 881CONFIG_DAB=y
882# CONFIG_USB_DABUSB is not set
674 883
675# 884#
676# Graphics support 885# Graphics support
@@ -682,6 +891,7 @@ CONFIG_DAB=y
682# 891#
683# CONFIG_DISPLAY_SUPPORT is not set 892# CONFIG_DISPLAY_SUPPORT is not set
684# CONFIG_VGASTATE is not set 893# CONFIG_VGASTATE is not set
894CONFIG_VIDEO_OUTPUT_CONTROL=y
685# CONFIG_FB is not set 895# CONFIG_FB is not set
686# CONFIG_FB_IBM_GXT4500 is not set 896# CONFIG_FB_IBM_GXT4500 is not set
687 897
@@ -695,58 +905,293 @@ CONFIG_DUMMY_CONSOLE=y
695# 905#
696# Sound 906# Sound
697# 907#
698# CONFIG_SOUND is not set 908CONFIG_SOUND=y
699 909
700# 910#
701# HID Devices 911# Advanced Linux Sound Architecture
702# 912#
913CONFIG_SND=y
914CONFIG_SND_TIMER=y
915CONFIG_SND_PCM=y
916# CONFIG_SND_SEQUENCER is not set
917# CONFIG_SND_MIXER_OSS is not set
918# CONFIG_SND_PCM_OSS is not set
919# CONFIG_SND_DYNAMIC_MINORS is not set
920CONFIG_SND_SUPPORT_OLD_API=y
921CONFIG_SND_VERBOSE_PROCFS=y
922# CONFIG_SND_VERBOSE_PRINTK is not set
923# CONFIG_SND_DEBUG is not set
924
925#
926# Generic devices
927#
928CONFIG_SND_AC97_CODEC=y
929# CONFIG_SND_DUMMY is not set
930# CONFIG_SND_MTPAV is not set
931# CONFIG_SND_SERIAL_U16550 is not set
932# CONFIG_SND_MPU401 is not set
933
934#
935# PCI devices
936#
937# CONFIG_SND_AD1889 is not set
938# CONFIG_SND_ALS300 is not set
939# CONFIG_SND_ALS4000 is not set
940# CONFIG_SND_ALI5451 is not set
941# CONFIG_SND_ATIIXP is not set
942# CONFIG_SND_ATIIXP_MODEM is not set
943# CONFIG_SND_AU8810 is not set
944# CONFIG_SND_AU8820 is not set
945# CONFIG_SND_AU8830 is not set
946# CONFIG_SND_AZT3328 is not set
947# CONFIG_SND_BT87X is not set
948# CONFIG_SND_CA0106 is not set
949# CONFIG_SND_CMIPCI is not set
950# CONFIG_SND_CS4281 is not set
951# CONFIG_SND_CS46XX is not set
952# CONFIG_SND_CS5530 is not set
953# CONFIG_SND_DARLA20 is not set
954# CONFIG_SND_GINA20 is not set
955# CONFIG_SND_LAYLA20 is not set
956# CONFIG_SND_DARLA24 is not set
957# CONFIG_SND_GINA24 is not set
958# CONFIG_SND_LAYLA24 is not set
959# CONFIG_SND_MONA is not set
960# CONFIG_SND_MIA is not set
961# CONFIG_SND_ECHO3G is not set
962# CONFIG_SND_INDIGO is not set
963# CONFIG_SND_INDIGOIO is not set
964# CONFIG_SND_INDIGODJ is not set
965# CONFIG_SND_EMU10K1 is not set
966# CONFIG_SND_EMU10K1X is not set
967# CONFIG_SND_ENS1370 is not set
968# CONFIG_SND_ENS1371 is not set
969# CONFIG_SND_ES1938 is not set
970# CONFIG_SND_ES1968 is not set
971# CONFIG_SND_FM801 is not set
972# CONFIG_SND_HDA_INTEL is not set
973# CONFIG_SND_HDSP is not set
974# CONFIG_SND_HDSPM is not set
975# CONFIG_SND_ICE1712 is not set
976# CONFIG_SND_ICE1724 is not set
977CONFIG_SND_INTEL8X0=y
978# CONFIG_SND_INTEL8X0M is not set
979# CONFIG_SND_KORG1212 is not set
980# CONFIG_SND_MAESTRO3 is not set
981# CONFIG_SND_MIXART is not set
982# CONFIG_SND_NM256 is not set
983# CONFIG_SND_PCXHR is not set
984# CONFIG_SND_RIPTIDE is not set
985# CONFIG_SND_RME32 is not set
986# CONFIG_SND_RME96 is not set
987# CONFIG_SND_RME9652 is not set
988# CONFIG_SND_SONICVIBES is not set
989# CONFIG_SND_TRIDENT is not set
990# CONFIG_SND_VIA82XX is not set
991# CONFIG_SND_VIA82XX_MODEM is not set
992# CONFIG_SND_VX222 is not set
993# CONFIG_SND_YMFPCI is not set
994# CONFIG_SND_AC97_POWER_SAVE is not set
995
996#
997# ALSA PowerMac devices
998#
999
1000#
1001# ALSA PowerPC devices
1002#
1003
1004#
1005# USB devices
1006#
1007# CONFIG_SND_USB_AUDIO is not set
1008# CONFIG_SND_USB_USX2Y is not set
1009# CONFIG_SND_USB_CAIAQ is not set
1010
1011#
1012# System on Chip audio support
1013#
1014# CONFIG_SND_SOC is not set
1015
1016#
1017# SoC Audio support for SuperH
1018#
1019
1020#
1021# Open Sound System
1022#
1023# CONFIG_SOUND_PRIME is not set
1024CONFIG_AC97_BUS=y
1025CONFIG_HID_SUPPORT=y
703CONFIG_HID=y 1026CONFIG_HID=y
704# CONFIG_HID_DEBUG is not set 1027# CONFIG_HID_DEBUG is not set
705 1028
706# 1029#
707# USB support 1030# USB Input Devices
708# 1031#
1032CONFIG_USB_HID=y
1033# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1034# CONFIG_HID_FF is not set
1035# CONFIG_USB_HIDDEV is not set
1036CONFIG_USB_SUPPORT=y
709CONFIG_USB_ARCH_HAS_HCD=y 1037CONFIG_USB_ARCH_HAS_HCD=y
710CONFIG_USB_ARCH_HAS_OHCI=y 1038CONFIG_USB_ARCH_HAS_OHCI=y
711CONFIG_USB_ARCH_HAS_EHCI=y 1039CONFIG_USB_ARCH_HAS_EHCI=y
712# CONFIG_USB is not set 1040CONFIG_USB=y
1041# CONFIG_USB_DEBUG is not set
1042
1043#
1044# Miscellaneous USB options
1045#
1046CONFIG_USB_DEVICEFS=y
1047CONFIG_USB_DEVICE_CLASS=y
1048# CONFIG_USB_DYNAMIC_MINORS is not set
1049# CONFIG_USB_OTG is not set
1050
1051#
1052# USB Host Controller Drivers
1053#
1054CONFIG_USB_EHCI_HCD=y
1055# CONFIG_USB_EHCI_SPLIT_ISO is not set
1056# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1057# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1058# CONFIG_USB_ISP116X_HCD is not set
1059CONFIG_USB_OHCI_HCD=y
1060CONFIG_USB_OHCI_HCD_PPC_OF=y
1061CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
1062CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
1063CONFIG_USB_OHCI_HCD_PCI=y
1064CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
1065CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1066CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1067# CONFIG_USB_UHCI_HCD is not set
1068# CONFIG_USB_SL811_HCD is not set
1069# CONFIG_USB_R8A66597_HCD is not set
1070
1071#
1072# USB Device Class drivers
1073#
1074# CONFIG_USB_ACM is not set
1075# CONFIG_USB_PRINTER is not set
713 1076
714# 1077#
715# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1078# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
716# 1079#
717 1080
718# 1081#
719# USB Gadget Support 1082# may also be needed; see USB_STORAGE Help for more information
720# 1083#
721# CONFIG_USB_GADGET is not set 1084CONFIG_USB_STORAGE=y
722# CONFIG_MMC is not set 1085# CONFIG_USB_STORAGE_DEBUG is not set
1086# CONFIG_USB_STORAGE_DATAFAB is not set
1087# CONFIG_USB_STORAGE_FREECOM is not set
1088# CONFIG_USB_STORAGE_DPCM is not set
1089# CONFIG_USB_STORAGE_USBAT is not set
1090# CONFIG_USB_STORAGE_SDDR09 is not set
1091# CONFIG_USB_STORAGE_SDDR55 is not set
1092# CONFIG_USB_STORAGE_JUMPSHOT is not set
1093# CONFIG_USB_STORAGE_ALAUDA is not set
1094# CONFIG_USB_STORAGE_KARMA is not set
1095# CONFIG_USB_LIBUSUAL is not set
723 1096
724# 1097#
725# LED devices 1098# USB Imaging devices
1099#
1100# CONFIG_USB_MDC800 is not set
1101# CONFIG_USB_MICROTEK is not set
1102CONFIG_USB_MON=y
1103
1104#
1105# USB port drivers
726# 1106#
727# CONFIG_NEW_LEDS is not set
728 1107
729# 1108#
730# LED drivers 1109# USB Serial Converter support
731# 1110#
1111# CONFIG_USB_SERIAL is not set
732 1112
733# 1113#
734# LED Triggers 1114# USB Miscellaneous drivers
735# 1115#
1116# CONFIG_USB_EMI62 is not set
1117# CONFIG_USB_EMI26 is not set
1118# CONFIG_USB_ADUTUX is not set
1119# CONFIG_USB_AUERSWALD is not set
1120# CONFIG_USB_RIO500 is not set
1121# CONFIG_USB_LEGOTOWER is not set
1122# CONFIG_USB_LCD is not set
1123# CONFIG_USB_BERRY_CHARGE is not set
1124# CONFIG_USB_LED is not set
1125# CONFIG_USB_CYPRESS_CY7C63 is not set
1126# CONFIG_USB_CYTHERM is not set
1127# CONFIG_USB_PHIDGET is not set
1128# CONFIG_USB_IDMOUSE is not set
1129# CONFIG_USB_FTDI_ELAN is not set
1130# CONFIG_USB_APPLEDISPLAY is not set
1131# CONFIG_USB_SISUSBVGA is not set
1132# CONFIG_USB_LD is not set
1133# CONFIG_USB_TRANCEVIBRATOR is not set
1134# CONFIG_USB_IOWARRIOR is not set
1135# CONFIG_USB_TEST is not set
736 1136
737# 1137#
738# InfiniBand support 1138# USB DSL modem support
739# 1139#
1140
1141#
1142# USB Gadget Support
1143#
1144# CONFIG_USB_GADGET is not set
1145# CONFIG_MMC is not set
1146# CONFIG_NEW_LEDS is not set
740# CONFIG_INFINIBAND is not set 1147# CONFIG_INFINIBAND is not set
1148# CONFIG_EDAC is not set
1149CONFIG_RTC_LIB=y
1150CONFIG_RTC_CLASS=y
1151CONFIG_RTC_HCTOSYS=y
1152CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1153# CONFIG_RTC_DEBUG is not set
1154
1155#
1156# RTC interfaces
1157#
1158CONFIG_RTC_INTF_SYSFS=y
1159CONFIG_RTC_INTF_PROC=y
1160CONFIG_RTC_INTF_DEV=y
1161# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1162# CONFIG_RTC_DRV_TEST is not set
1163
1164#
1165# I2C RTC drivers
1166#
1167# CONFIG_RTC_DRV_DS1307 is not set
1168# CONFIG_RTC_DRV_DS1672 is not set
1169# CONFIG_RTC_DRV_MAX6900 is not set
1170# CONFIG_RTC_DRV_RS5C372 is not set
1171# CONFIG_RTC_DRV_ISL1208 is not set
1172# CONFIG_RTC_DRV_X1205 is not set
1173# CONFIG_RTC_DRV_PCF8563 is not set
1174# CONFIG_RTC_DRV_PCF8583 is not set
1175# CONFIG_RTC_DRV_M41T80 is not set
1176
1177#
1178# SPI RTC drivers
1179#
741 1180
742# 1181#
743# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1182# Platform RTC drivers
744# 1183#
1184CONFIG_RTC_DRV_CMOS=y
1185# CONFIG_RTC_DRV_DS1553 is not set
1186# CONFIG_RTC_DRV_STK17TA8 is not set
1187# CONFIG_RTC_DRV_DS1742 is not set
1188# CONFIG_RTC_DRV_M48T86 is not set
1189# CONFIG_RTC_DRV_M48T59 is not set
1190# CONFIG_RTC_DRV_V3020 is not set
745 1191
746# 1192#
747# Real Time Clock 1193# on-CPU RTC drivers
748# 1194#
749# CONFIG_RTC_CLASS is not set
750 1195
751# 1196#
752# DMA Engine support 1197# DMA Engine support
@@ -762,6 +1207,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
762# 1207#
763 1208
764# 1209#
1210# Userspace I/O
1211#
1212# CONFIG_UIO is not set
1213
1214#
765# File systems 1215# File systems
766# 1216#
767CONFIG_EXT2_FS=y 1217CONFIG_EXT2_FS=y
@@ -783,9 +1233,10 @@ CONFIG_FS_MBCACHE=y
783# CONFIG_OCFS2_FS is not set 1233# CONFIG_OCFS2_FS is not set
784# CONFIG_MINIX_FS is not set 1234# CONFIG_MINIX_FS is not set
785# CONFIG_ROMFS_FS is not set 1235# CONFIG_ROMFS_FS is not set
786# CONFIG_INOTIFY is not set 1236CONFIG_INOTIFY=y
1237CONFIG_INOTIFY_USER=y
787# CONFIG_QUOTA is not set 1238# CONFIG_QUOTA is not set
788# CONFIG_DNOTIFY is not set 1239CONFIG_DNOTIFY=y
789# CONFIG_AUTOFS_FS is not set 1240# CONFIG_AUTOFS_FS is not set
790# CONFIG_AUTOFS4_FS is not set 1241# CONFIG_AUTOFS4_FS is not set
791# CONFIG_FUSE_FS is not set 1242# CONFIG_FUSE_FS is not set
@@ -793,15 +1244,23 @@ CONFIG_FS_MBCACHE=y
793# 1244#
794# CD-ROM/DVD Filesystems 1245# CD-ROM/DVD Filesystems
795# 1246#
796# CONFIG_ISO9660_FS is not set 1247CONFIG_ISO9660_FS=m
797# CONFIG_UDF_FS is not set 1248CONFIG_JOLIET=y
1249CONFIG_ZISOFS=y
1250CONFIG_UDF_FS=m
1251CONFIG_UDF_NLS=y
798 1252
799# 1253#
800# DOS/FAT/NT Filesystems 1254# DOS/FAT/NT Filesystems
801# 1255#
802# CONFIG_MSDOS_FS is not set 1256CONFIG_FAT_FS=y
803# CONFIG_VFAT_FS is not set 1257CONFIG_MSDOS_FS=m
804# CONFIG_NTFS_FS is not set 1258CONFIG_VFAT_FS=y
1259CONFIG_FAT_DEFAULT_CODEPAGE=437
1260CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1261CONFIG_NTFS_FS=y
1262# CONFIG_NTFS_DEBUG is not set
1263# CONFIG_NTFS_RW is not set
805 1264
806# 1265#
807# Pseudo filesystems 1266# Pseudo filesystems
@@ -819,19 +1278,23 @@ CONFIG_RAMFS=y
819# 1278#
820# Miscellaneous filesystems 1279# Miscellaneous filesystems
821# 1280#
822# CONFIG_ADFS_FS is not set 1281CONFIG_ADFS_FS=m
823# CONFIG_AFFS_FS is not set 1282# CONFIG_ADFS_FS_RW is not set
824# CONFIG_HFS_FS is not set 1283CONFIG_AFFS_FS=m
825# CONFIG_HFSPLUS_FS is not set 1284CONFIG_HFS_FS=m
826# CONFIG_BEFS_FS is not set 1285CONFIG_HFSPLUS_FS=m
827# CONFIG_BFS_FS is not set 1286CONFIG_BEFS_FS=m
828# CONFIG_EFS_FS is not set 1287# CONFIG_BEFS_DEBUG is not set
829# CONFIG_CRAMFS is not set 1288CONFIG_BFS_FS=m
830# CONFIG_VXFS_FS is not set 1289CONFIG_EFS_FS=m
831# CONFIG_HPFS_FS is not set 1290CONFIG_CRAMFS=y
832# CONFIG_QNX4FS_FS is not set 1291CONFIG_VXFS_FS=m
833# CONFIG_SYSV_FS is not set 1292CONFIG_HPFS_FS=m
834# CONFIG_UFS_FS is not set 1293CONFIG_QNX4FS_FS=m
1294CONFIG_SYSV_FS=m
1295CONFIG_UFS_FS=m
1296# CONFIG_UFS_FS_WRITE is not set
1297# CONFIG_UFS_DEBUG is not set
835 1298
836# 1299#
837# Network File Systems 1300# Network File Systems
@@ -839,7 +1302,7 @@ CONFIG_RAMFS=y
839CONFIG_NFS_FS=y 1302CONFIG_NFS_FS=y
840CONFIG_NFS_V3=y 1303CONFIG_NFS_V3=y
841# CONFIG_NFS_V3_ACL is not set 1304# CONFIG_NFS_V3_ACL is not set
842# CONFIG_NFS_V4 is not set 1305CONFIG_NFS_V4=y
843# CONFIG_NFS_DIRECTIO is not set 1306# CONFIG_NFS_DIRECTIO is not set
844CONFIG_NFSD=y 1307CONFIG_NFSD=y
845# CONFIG_NFSD_V3 is not set 1308# CONFIG_NFSD_V3 is not set
@@ -850,15 +1313,15 @@ CONFIG_LOCKD_V4=y
850CONFIG_EXPORTFS=y 1313CONFIG_EXPORTFS=y
851CONFIG_NFS_COMMON=y 1314CONFIG_NFS_COMMON=y
852CONFIG_SUNRPC=y 1315CONFIG_SUNRPC=y
1316CONFIG_SUNRPC_GSS=y
853# CONFIG_SUNRPC_BIND34 is not set 1317# CONFIG_SUNRPC_BIND34 is not set
854# CONFIG_RPCSEC_GSS_KRB5 is not set 1318CONFIG_RPCSEC_GSS_KRB5=y
855# CONFIG_RPCSEC_GSS_SPKM3 is not set 1319# CONFIG_RPCSEC_GSS_SPKM3 is not set
856# CONFIG_SMB_FS is not set 1320# CONFIG_SMB_FS is not set
857# CONFIG_CIFS is not set 1321# CONFIG_CIFS is not set
858# CONFIG_NCP_FS is not set 1322# CONFIG_NCP_FS is not set
859# CONFIG_CODA_FS is not set 1323# CONFIG_CODA_FS is not set
860# CONFIG_AFS_FS is not set 1324# CONFIG_AFS_FS is not set
861# CONFIG_9P_FS is not set
862 1325
863# 1326#
864# Partition Types 1327# Partition Types
@@ -868,14 +1331,13 @@ CONFIG_PARTITION_ADVANCED=y
868# CONFIG_OSF_PARTITION is not set 1331# CONFIG_OSF_PARTITION is not set
869# CONFIG_AMIGA_PARTITION is not set 1332# CONFIG_AMIGA_PARTITION is not set
870# CONFIG_ATARI_PARTITION is not set 1333# CONFIG_ATARI_PARTITION is not set
871# CONFIG_MAC_PARTITION is not set 1334CONFIG_MAC_PARTITION=y
872CONFIG_MSDOS_PARTITION=y 1335CONFIG_MSDOS_PARTITION=y
873# CONFIG_BSD_DISKLABEL is not set 1336# CONFIG_BSD_DISKLABEL is not set
874# CONFIG_MINIX_SUBPARTITION is not set 1337# CONFIG_MINIX_SUBPARTITION is not set
875# CONFIG_SOLARIS_X86_PARTITION is not set 1338# CONFIG_SOLARIS_X86_PARTITION is not set
876# CONFIG_UNIXWARE_DISKLABEL is not set 1339# CONFIG_UNIXWARE_DISKLABEL is not set
877CONFIG_LDM_PARTITION=y 1340# CONFIG_LDM_PARTITION is not set
878# CONFIG_LDM_DEBUG is not set
879# CONFIG_SGI_PARTITION is not set 1341# CONFIG_SGI_PARTITION is not set
880# CONFIG_ULTRIX_PARTITION is not set 1342# CONFIG_ULTRIX_PARTITION is not set
881# CONFIG_SUN_PARTITION is not set 1343# CONFIG_SUN_PARTITION is not set
@@ -925,7 +1387,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
925# CONFIG_NLS_ISO8859_15 is not set 1387# CONFIG_NLS_ISO8859_15 is not set
926# CONFIG_NLS_KOI8_R is not set 1388# CONFIG_NLS_KOI8_R is not set
927# CONFIG_NLS_KOI8_U is not set 1389# CONFIG_NLS_KOI8_U is not set
928# CONFIG_NLS_UTF8 is not set 1390CONFIG_NLS_UTF8=m
929 1391
930# 1392#
931# Distributed Lock Manager 1393# Distributed Lock Manager
@@ -941,7 +1403,9 @@ CONFIG_BITREVERSE=y
941# CONFIG_CRC16 is not set 1403# CONFIG_CRC16 is not set
942# CONFIG_CRC_ITU_T is not set 1404# CONFIG_CRC_ITU_T is not set
943CONFIG_CRC32=y 1405CONFIG_CRC32=y
944# CONFIG_LIBCRC32C is not set 1406# CONFIG_CRC7 is not set
1407CONFIG_LIBCRC32C=m
1408CONFIG_ZLIB_INFLATE=y
945CONFIG_PLIST=y 1409CONFIG_PLIST=y
946CONFIG_HAS_IOMEM=y 1410CONFIG_HAS_IOMEM=y
947CONFIG_HAS_IOPORT=y 1411CONFIG_HAS_IOPORT=y
@@ -951,6 +1415,7 @@ CONFIG_HAS_DMA=y
951# Instrumentation Support 1415# Instrumentation Support
952# 1416#
953# CONFIG_PROFILING is not set 1417# CONFIG_PROFILING is not set
1418# CONFIG_KPROBES is not set
954 1419
955# 1420#
956# Kernel hacking 1421# Kernel hacking
@@ -964,6 +1429,7 @@ CONFIG_ENABLE_MUST_CHECK=y
964CONFIG_DEBUG_KERNEL=y 1429CONFIG_DEBUG_KERNEL=y
965# CONFIG_DEBUG_SHIRQ is not set 1430# CONFIG_DEBUG_SHIRQ is not set
966CONFIG_DETECT_SOFTLOCKUP=y 1431CONFIG_DETECT_SOFTLOCKUP=y
1432CONFIG_SCHED_DEBUG=y
967# CONFIG_SCHEDSTATS is not set 1433# CONFIG_SCHEDSTATS is not set
968# CONFIG_TIMER_STATS is not set 1434# CONFIG_TIMER_STATS is not set
969# CONFIG_DEBUG_SLAB is not set 1435# CONFIG_DEBUG_SLAB is not set
@@ -976,17 +1442,17 @@ CONFIG_DETECT_SOFTLOCKUP=y
976# CONFIG_DEBUG_KOBJECT is not set 1442# CONFIG_DEBUG_KOBJECT is not set
977# CONFIG_DEBUG_HIGHMEM is not set 1443# CONFIG_DEBUG_HIGHMEM is not set
978# CONFIG_DEBUG_BUGVERBOSE is not set 1444# CONFIG_DEBUG_BUGVERBOSE is not set
979# CONFIG_DEBUG_INFO is not set 1445CONFIG_DEBUG_INFO=y
980# CONFIG_DEBUG_VM is not set 1446# CONFIG_DEBUG_VM is not set
981# CONFIG_DEBUG_LIST is not set 1447# CONFIG_DEBUG_LIST is not set
982CONFIG_FORCED_INLINING=y 1448CONFIG_FORCED_INLINING=y
1449# CONFIG_RCU_TORTURE_TEST is not set
983# CONFIG_FAULT_INJECTION is not set 1450# CONFIG_FAULT_INJECTION is not set
984# CONFIG_DEBUG_STACKOVERFLOW is not set 1451# CONFIG_DEBUG_STACKOVERFLOW is not set
985# CONFIG_DEBUG_STACK_USAGE is not set 1452# CONFIG_DEBUG_STACK_USAGE is not set
986# CONFIG_DEBUG_PAGEALLOC is not set 1453# CONFIG_DEBUG_PAGEALLOC is not set
987# CONFIG_DEBUGGER is not set 1454# CONFIG_DEBUGGER is not set
988# CONFIG_BDI_SWITCH is not set 1455# CONFIG_BDI_SWITCH is not set
989# CONFIG_BOOTX_TEXT is not set
990# CONFIG_PPC_EARLY_DEBUG is not set 1456# CONFIG_PPC_EARLY_DEBUG is not set
991 1457
992# 1458#
@@ -994,8 +1460,42 @@ CONFIG_FORCED_INLINING=y
994# 1460#
995# CONFIG_KEYS is not set 1461# CONFIG_KEYS is not set
996# CONFIG_SECURITY is not set 1462# CONFIG_SECURITY is not set
997 1463CONFIG_CRYPTO=y
998# 1464CONFIG_CRYPTO_ALGAPI=y
999# Cryptographic options 1465CONFIG_CRYPTO_BLKCIPHER=y
1000# 1466CONFIG_CRYPTO_HASH=y
1001# CONFIG_CRYPTO is not set 1467CONFIG_CRYPTO_MANAGER=y
1468CONFIG_CRYPTO_HMAC=y
1469# CONFIG_CRYPTO_XCBC is not set
1470# CONFIG_CRYPTO_NULL is not set
1471# CONFIG_CRYPTO_MD4 is not set
1472CONFIG_CRYPTO_MD5=y
1473# CONFIG_CRYPTO_SHA1 is not set
1474# CONFIG_CRYPTO_SHA256 is not set
1475# CONFIG_CRYPTO_SHA512 is not set
1476# CONFIG_CRYPTO_WP512 is not set
1477# CONFIG_CRYPTO_TGR192 is not set
1478# CONFIG_CRYPTO_GF128MUL is not set
1479# CONFIG_CRYPTO_ECB is not set
1480CONFIG_CRYPTO_CBC=y
1481CONFIG_CRYPTO_PCBC=m
1482# CONFIG_CRYPTO_LRW is not set
1483# CONFIG_CRYPTO_CRYPTD is not set
1484CONFIG_CRYPTO_DES=y
1485# CONFIG_CRYPTO_FCRYPT is not set
1486# CONFIG_CRYPTO_BLOWFISH is not set
1487# CONFIG_CRYPTO_TWOFISH is not set
1488# CONFIG_CRYPTO_SERPENT is not set
1489# CONFIG_CRYPTO_AES is not set
1490# CONFIG_CRYPTO_CAST5 is not set
1491# CONFIG_CRYPTO_CAST6 is not set
1492# CONFIG_CRYPTO_TEA is not set
1493# CONFIG_CRYPTO_ARC4 is not set
1494# CONFIG_CRYPTO_KHAZAD is not set
1495# CONFIG_CRYPTO_ANUBIS is not set
1496# CONFIG_CRYPTO_DEFLATE is not set
1497# CONFIG_CRYPTO_MICHAEL_MIC is not set
1498# CONFIG_CRYPTO_CRC32C is not set
1499# CONFIG_CRYPTO_CAMELLIA is not set
1500# CONFIG_CRYPTO_TEST is not set
1501CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index e6b18ea8f643..143a0cd83327 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:57:00 2007 4# Tue Aug 28 21:24:44 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
13CONFIG_PPC_8xx=y
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_8xx=y
18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y
7CONFIG_PPC32=y 20CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 21CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 22CONFIG_MMU=y
@@ -14,56 +27,37 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_GENERIC_HWEIGHT=y 27CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 28CONFIG_GENERIC_CALIBRATE_DELAY=y
16CONFIG_GENERIC_FIND_NEXT_BIT=y 29CONFIG_GENERIC_FIND_NEXT_BIT=y
30# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
17CONFIG_PPC=y 31CONFIG_PPC=y
18CONFIG_EARLY_PRINTK=y 32CONFIG_EARLY_PRINTK=y
19CONFIG_GENERIC_NVRAM=y 33CONFIG_GENERIC_NVRAM=y
20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 34CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
21CONFIG_ARCH_MAY_HAVE_PC_FDC=y 35CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 36CONFIG_PPC_OF=y
37CONFIG_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 38# CONFIG_PPC_UDBG_16550 is not set
24# CONFIG_GENERIC_TBSYNC is not set 39# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 40CONFIG_AUDIT_ARCH=y
26# CONFIG_DEFAULT_UIMAGE is not set 41# CONFIG_DEFAULT_UIMAGE is not set
27
28#
29# Processor support
30#
31# CONFIG_CLASSIC32 is not set
32# CONFIG_PPC_82xx is not set
33# CONFIG_PPC_83xx is not set
34# CONFIG_PPC_85xx is not set
35# CONFIG_PPC_86xx is not set
36CONFIG_PPC_8xx=y
37# CONFIG_40x is not set
38# CONFIG_44x is not set
39# CONFIG_E200 is not set
40CONFIG_8xx=y
41# CONFIG_PPC_DCR_NATIVE is not set 42# CONFIG_PPC_DCR_NATIVE is not set
42# CONFIG_PPC_DCR_MMIO is not set 43# CONFIG_PPC_DCR_MMIO is not set
43# CONFIG_PPC_MM_SLICES is not set
44CONFIG_NOT_COHERENT_CACHE=y
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 44CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
46 45
47# 46#
48# Code maturity level options 47# General setup
49# 48#
50CONFIG_EXPERIMENTAL=y 49CONFIG_EXPERIMENTAL=y
51CONFIG_BROKEN_ON_SMP=y 50CONFIG_BROKEN_ON_SMP=y
52CONFIG_INIT_ENV_ARG_LIMIT=32 51CONFIG_INIT_ENV_ARG_LIMIT=32
53
54#
55# General setup
56#
57CONFIG_LOCALVERSION="" 52CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 53CONFIG_LOCALVERSION_AUTO=y
59# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
60CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
61# CONFIG_IPC_NS is not set
62CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
63# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
64# CONFIG_BSD_PROCESS_ACCT is not set 58# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 59# CONFIG_TASKSTATS is not set
66# CONFIG_UTS_NS is not set 60# CONFIG_USER_NS is not set
67# CONFIG_AUDIT is not set 61# CONFIG_AUDIT is not set
68# CONFIG_IKCONFIG is not set 62# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 63CONFIG_LOG_BUF_SHIFT=14
@@ -95,19 +89,12 @@ CONFIG_SLAB=y
95CONFIG_RT_MUTEXES=y 89CONFIG_RT_MUTEXES=y
96# CONFIG_TINY_SHMEM is not set 90# CONFIG_TINY_SHMEM is not set
97CONFIG_BASE_SMALL=1 91CONFIG_BASE_SMALL=1
98
99#
100# Loadable module support
101#
102# CONFIG_MODULES is not set 92# CONFIG_MODULES is not set
103
104#
105# Block layer
106#
107CONFIG_BLOCK=y 93CONFIG_BLOCK=y
108# CONFIG_LBD is not set 94# CONFIG_LBD is not set
109# CONFIG_BLK_DEV_IO_TRACE is not set 95# CONFIG_BLK_DEV_IO_TRACE is not set
110# CONFIG_LSF is not set 96# CONFIG_LSF is not set
97# CONFIG_BLK_DEV_BSG is not set
111 98
112# 99#
113# IO Schedulers 100# IO Schedulers
@@ -159,6 +146,7 @@ CONFIG_NO_UCODE_PATCH=y
159# CONFIG_GENERIC_IOMAP is not set 146# CONFIG_GENERIC_IOMAP is not set
160# CONFIG_CPU_FREQ is not set 147# CONFIG_CPU_FREQ is not set
161# CONFIG_CPM2 is not set 148# CONFIG_CPM2 is not set
149# CONFIG_FSL_ULI1575 is not set
162 150
163# 151#
164# Kernel options 152# Kernel options
@@ -188,6 +176,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
188CONFIG_SPLIT_PTLOCK_CPUS=4 176CONFIG_SPLIT_PTLOCK_CPUS=4
189# CONFIG_RESOURCES_64BIT is not set 177# CONFIG_RESOURCES_64BIT is not set
190CONFIG_ZONE_DMA_FLAG=1 178CONFIG_ZONE_DMA_FLAG=1
179CONFIG_BOUNCE=y
180CONFIG_VIRT_TO_BUS=y
191# CONFIG_PROC_DEVICETREE is not set 181# CONFIG_PROC_DEVICETREE is not set
192# CONFIG_CMDLINE_BOOL is not set 182# CONFIG_CMDLINE_BOOL is not set
193# CONFIG_PM is not set 183# CONFIG_PM is not set
@@ -202,6 +192,7 @@ CONFIG_ZONE_DMA=y
202CONFIG_FSL_SOC=y 192CONFIG_FSL_SOC=y
203# CONFIG_PCI is not set 193# CONFIG_PCI is not set
204# CONFIG_PCI_DOMAINS is not set 194# CONFIG_PCI_DOMAINS is not set
195# CONFIG_PCI_SYSCALL is not set
205# CONFIG_PCI_QSPAN is not set 196# CONFIG_PCI_QSPAN is not set
206# CONFIG_ARCH_SUPPORTS_MSI is not set 197# CONFIG_ARCH_SUPPORTS_MSI is not set
207 198
@@ -310,6 +301,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
310# CONFIG_MAC80211 is not set 301# CONFIG_MAC80211 is not set
311# CONFIG_IEEE80211 is not set 302# CONFIG_IEEE80211 is not set
312# CONFIG_RFKILL is not set 303# CONFIG_RFKILL is not set
304# CONFIG_NET_9P is not set
313 305
314# 306#
315# Device Drivers 307# Device Drivers
@@ -321,26 +313,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
321CONFIG_STANDALONE=y 313CONFIG_STANDALONE=y
322CONFIG_PREVENT_FIRMWARE_BUILD=y 314CONFIG_PREVENT_FIRMWARE_BUILD=y
323# CONFIG_SYS_HYPERVISOR is not set 315# CONFIG_SYS_HYPERVISOR is not set
324
325#
326# Connector - unified userspace <-> kernelspace linker
327#
328# CONFIG_CONNECTOR is not set 316# CONFIG_CONNECTOR is not set
329# CONFIG_MTD is not set 317# CONFIG_MTD is not set
330 318CONFIG_OF_DEVICE=y
331#
332# Parallel port support
333#
334# CONFIG_PARPORT is not set 319# CONFIG_PARPORT is not set
335 320CONFIG_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 321# CONFIG_BLK_DEV_FD is not set
345# CONFIG_BLK_DEV_COW_COMMON is not set 322# CONFIG_BLK_DEV_COW_COMMON is not set
346CONFIG_BLK_DEV_LOOP=y 323CONFIG_BLK_DEV_LOOP=y
@@ -349,11 +326,8 @@ CONFIG_BLK_DEV_LOOP=y
349# CONFIG_BLK_DEV_RAM is not set 326# CONFIG_BLK_DEV_RAM is not set
350# CONFIG_CDROM_PKTCDVD is not set 327# CONFIG_CDROM_PKTCDVD is not set
351# CONFIG_ATA_OVER_ETH is not set 328# CONFIG_ATA_OVER_ETH is not set
352 329CONFIG_MISC_DEVICES=y
353# 330# CONFIG_EEPROM_93CX6 is not set
354# Misc devices
355#
356# CONFIG_BLINK is not set
357# CONFIG_IDE is not set 331# CONFIG_IDE is not set
358 332
359# 333#
@@ -361,21 +335,16 @@ CONFIG_BLK_DEV_LOOP=y
361# 335#
362# CONFIG_RAID_ATTRS is not set 336# CONFIG_RAID_ATTRS is not set
363# CONFIG_SCSI is not set 337# CONFIG_SCSI is not set
338# CONFIG_SCSI_DMA is not set
364# CONFIG_SCSI_NETLINK is not set 339# CONFIG_SCSI_NETLINK is not set
365# CONFIG_ATA is not set 340# CONFIG_ATA is not set
366
367#
368# Multi-device support (RAID and LVM)
369#
370# CONFIG_MD is not set 341# CONFIG_MD is not set
371# CONFIG_MACINTOSH_DRIVERS is not set 342# CONFIG_MACINTOSH_DRIVERS is not set
372
373#
374# Network device support
375#
376CONFIG_NETDEVICES=y 343CONFIG_NETDEVICES=y
344# CONFIG_NETDEVICES_MULTIQUEUE is not set
377# CONFIG_DUMMY is not set 345# CONFIG_DUMMY is not set
378# CONFIG_BONDING is not set 346# CONFIG_BONDING is not set
347# CONFIG_MACVLAN is not set
379# CONFIG_EQUALIZER is not set 348# CONFIG_EQUALIZER is not set
380# CONFIG_TUN is not set 349# CONFIG_TUN is not set
381CONFIG_PHYLIB=y 350CONFIG_PHYLIB=y
@@ -391,16 +360,12 @@ CONFIG_PHYLIB=y
391# CONFIG_VITESSE_PHY is not set 360# CONFIG_VITESSE_PHY is not set
392# CONFIG_SMSC_PHY is not set 361# CONFIG_SMSC_PHY is not set
393# CONFIG_BROADCOM_PHY is not set 362# CONFIG_BROADCOM_PHY is not set
363# CONFIG_ICPLUS_PHY is not set
394CONFIG_FIXED_PHY=y 364CONFIG_FIXED_PHY=y
395CONFIG_FIXED_MII_10_FDX=y 365CONFIG_FIXED_MII_10_FDX=y
396CONFIG_FIXED_MII_100_FDX=y 366CONFIG_FIXED_MII_100_FDX=y
397
398#
399# Ethernet (10 or 100Mbit)
400#
401CONFIG_NET_ETHERNET=y 367CONFIG_NET_ETHERNET=y
402CONFIG_MII=y 368CONFIG_MII=y
403# CONFIG_FEC_8XX is not set
404CONFIG_FS_ENET=y 369CONFIG_FS_ENET=y
405CONFIG_FS_ENET_HAS_SCC=y 370CONFIG_FS_ENET_HAS_SCC=y
406CONFIG_FS_ENET_HAS_FEC=y 371CONFIG_FS_ENET_HAS_FEC=y
@@ -419,15 +384,7 @@ CONFIG_NETDEV_10000=y
419# CONFIG_NETCONSOLE is not set 384# CONFIG_NETCONSOLE is not set
420# CONFIG_NETPOLL is not set 385# CONFIG_NETPOLL is not set
421# CONFIG_NET_POLL_CONTROLLER is not set 386# CONFIG_NET_POLL_CONTROLLER is not set
422
423#
424# ISDN subsystem
425#
426# CONFIG_ISDN is not set 387# CONFIG_ISDN is not set
427
428#
429# Telephony Support
430#
431# CONFIG_PHONE is not set 388# CONFIG_PHONE is not set
432 389
433# 390#
@@ -511,10 +468,6 @@ CONFIG_SERIAL_CPM_SMC1=y
511CONFIG_SERIAL_CPM_SMC2=y 468CONFIG_SERIAL_CPM_SMC2=y
512CONFIG_UNIX98_PTYS=y 469CONFIG_UNIX98_PTYS=y
513# CONFIG_LEGACY_PTYS is not set 470# CONFIG_LEGACY_PTYS is not set
514
515#
516# IPMI
517#
518# CONFIG_IPMI_HANDLER is not set 471# CONFIG_IPMI_HANDLER is not set
519# CONFIG_WATCHDOG is not set 472# CONFIG_WATCHDOG is not set
520CONFIG_HW_RANDOM=y 473CONFIG_HW_RANDOM=y
@@ -523,10 +476,6 @@ CONFIG_GEN_RTC=y
523# CONFIG_GEN_RTC_X is not set 476# CONFIG_GEN_RTC_X is not set
524# CONFIG_R3964 is not set 477# CONFIG_R3964 is not set
525# CONFIG_RAW_DRIVER is not set 478# CONFIG_RAW_DRIVER is not set
526
527#
528# TPM devices
529#
530# CONFIG_TCG_TPM is not set 479# CONFIG_TCG_TPM is not set
531# CONFIG_I2C is not set 480# CONFIG_I2C is not set
532 481
@@ -535,20 +484,21 @@ CONFIG_GEN_RTC=y
535# 484#
536# CONFIG_SPI is not set 485# CONFIG_SPI is not set
537# CONFIG_SPI_MASTER is not set 486# CONFIG_SPI_MASTER is not set
538
539#
540# Dallas's 1-wire bus
541#
542# CONFIG_W1 is not set 487# CONFIG_W1 is not set
488# CONFIG_POWER_SUPPLY is not set
543CONFIG_HWMON=y 489CONFIG_HWMON=y
544# CONFIG_HWMON_VID is not set 490# CONFIG_HWMON_VID is not set
545# CONFIG_SENSORS_ABITUGURU is not set 491# CONFIG_SENSORS_ABITUGURU is not set
492# CONFIG_SENSORS_ABITUGURU3 is not set
546# CONFIG_SENSORS_F71805F is not set 493# CONFIG_SENSORS_F71805F is not set
494# CONFIG_SENSORS_IT87 is not set
495# CONFIG_SENSORS_PC87360 is not set
547# CONFIG_SENSORS_PC87427 is not set 496# CONFIG_SENSORS_PC87427 is not set
548# CONFIG_SENSORS_SMSC47M1 is not set 497# CONFIG_SENSORS_SMSC47M1 is not set
549# CONFIG_SENSORS_SMSC47B397 is not set 498# CONFIG_SENSORS_SMSC47B397 is not set
550# CONFIG_SENSORS_VT1211 is not set 499# CONFIG_SENSORS_VT1211 is not set
551# CONFIG_SENSORS_W83627HF is not set 500# CONFIG_SENSORS_W83627HF is not set
501# CONFIG_SENSORS_W83627EHF is not set
552# CONFIG_HWMON_DEBUG_CHIP is not set 502# CONFIG_HWMON_DEBUG_CHIP is not set
553 503
554# 504#
@@ -573,6 +523,7 @@ CONFIG_DAB=y
573# 523#
574# CONFIG_DISPLAY_SUPPORT is not set 524# CONFIG_DISPLAY_SUPPORT is not set
575# CONFIG_VGASTATE is not set 525# CONFIG_VGASTATE is not set
526CONFIG_VIDEO_OUTPUT_CONTROL=y
576# CONFIG_FB is not set 527# CONFIG_FB is not set
577# CONFIG_FB_IBM_GXT4500 is not set 528# CONFIG_FB_IBM_GXT4500 is not set
578 529
@@ -580,16 +531,10 @@ CONFIG_DAB=y
580# Sound 531# Sound
581# 532#
582# CONFIG_SOUND is not set 533# CONFIG_SOUND is not set
583 534CONFIG_HID_SUPPORT=y
584#
585# HID Devices
586#
587CONFIG_HID=y 535CONFIG_HID=y
588# CONFIG_HID_DEBUG is not set 536# CONFIG_HID_DEBUG is not set
589 537CONFIG_USB_SUPPORT=y
590#
591# USB support
592#
593# CONFIG_USB_ARCH_HAS_HCD is not set 538# CONFIG_USB_ARCH_HAS_HCD is not set
594# CONFIG_USB_ARCH_HAS_OHCI is not set 539# CONFIG_USB_ARCH_HAS_OHCI is not set
595# CONFIG_USB_ARCH_HAS_EHCI is not set 540# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -603,31 +548,8 @@ CONFIG_HID=y
603# 548#
604# CONFIG_USB_GADGET is not set 549# CONFIG_USB_GADGET is not set
605# CONFIG_MMC is not set 550# CONFIG_MMC is not set
606
607#
608# LED devices
609#
610# CONFIG_NEW_LEDS is not set 551# CONFIG_NEW_LEDS is not set
611 552# CONFIG_EDAC is not set
612#
613# LED drivers
614#
615
616#
617# LED Triggers
618#
619
620#
621# InfiniBand support
622#
623
624#
625# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
626#
627
628#
629# Real Time Clock
630#
631# CONFIG_RTC_CLASS is not set 553# CONFIG_RTC_CLASS is not set
632 554
633# 555#
@@ -644,6 +566,11 @@ CONFIG_HID=y
644# 566#
645 567
646# 568#
569# Userspace I/O
570#
571# CONFIG_UIO is not set
572
573#
647# File systems 574# File systems
648# 575#
649CONFIG_EXT2_FS=y 576CONFIG_EXT2_FS=y
@@ -740,7 +667,6 @@ CONFIG_SUNRPC=y
740# CONFIG_NCP_FS is not set 667# CONFIG_NCP_FS is not set
741# CONFIG_CODA_FS is not set 668# CONFIG_CODA_FS is not set
742# CONFIG_AFS_FS is not set 669# CONFIG_AFS_FS is not set
743# CONFIG_9P_FS is not set
744 670
745# 671#
746# Partition Types 672# Partition Types
@@ -783,6 +709,7 @@ CONFIG_CRC_CCITT=y
783# CONFIG_CRC16 is not set 709# CONFIG_CRC16 is not set
784# CONFIG_CRC_ITU_T is not set 710# CONFIG_CRC_ITU_T is not set
785CONFIG_CRC32=y 711CONFIG_CRC32=y
712# CONFIG_CRC7 is not set
786# CONFIG_LIBCRC32C is not set 713# CONFIG_LIBCRC32C is not set
787CONFIG_ZLIB_INFLATE=y 714CONFIG_ZLIB_INFLATE=y
788CONFIG_PLIST=y 715CONFIG_PLIST=y
@@ -805,7 +732,6 @@ CONFIG_ENABLE_MUST_CHECK=y
805# CONFIG_DEBUG_FS is not set 732# CONFIG_DEBUG_FS is not set
806# CONFIG_HEADERS_CHECK is not set 733# CONFIG_HEADERS_CHECK is not set
807# CONFIG_DEBUG_KERNEL is not set 734# CONFIG_DEBUG_KERNEL is not set
808# CONFIG_BOOTX_TEXT is not set
809# CONFIG_PPC_EARLY_DEBUG is not set 735# CONFIG_PPC_EARLY_DEBUG is not set
810 736
811# 737#
@@ -813,8 +739,4 @@ CONFIG_ENABLE_MUST_CHECK=y
813# 739#
814# CONFIG_KEYS is not set 740# CONFIG_KEYS is not set
815# CONFIG_SECURITY is not set 741# CONFIG_SECURITY is not set
816
817#
818# Cryptographic options
819#
820# CONFIG_CRYPTO is not set 742# CONFIG_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index fc4f9b766aa7..d27e1f8c38fa 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_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-rc7 3# Linux kernel version: 2.6.23-rc4
4# Sun Jul 1 23:57:01 2007 4# Tue Aug 28 21:24:45 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
13CONFIG_PPC_8xx=y
14# CONFIG_40x is not set
15# CONFIG_44x is not set
16# CONFIG_E200 is not set
17CONFIG_8xx=y
18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y
7CONFIG_PPC32=y 20CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 21CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 22CONFIG_MMU=y
@@ -14,56 +27,37 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
14CONFIG_GENERIC_HWEIGHT=y 27CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 28CONFIG_GENERIC_CALIBRATE_DELAY=y
16CONFIG_GENERIC_FIND_NEXT_BIT=y 29CONFIG_GENERIC_FIND_NEXT_BIT=y
30# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
17CONFIG_PPC=y 31CONFIG_PPC=y
18CONFIG_EARLY_PRINTK=y 32CONFIG_EARLY_PRINTK=y
19CONFIG_GENERIC_NVRAM=y 33CONFIG_GENERIC_NVRAM=y
20CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 34CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
21CONFIG_ARCH_MAY_HAVE_PC_FDC=y 35CONFIG_ARCH_MAY_HAVE_PC_FDC=y
22CONFIG_PPC_OF=y 36CONFIG_PPC_OF=y
37CONFIG_OF=y
23# CONFIG_PPC_UDBG_16550 is not set 38# CONFIG_PPC_UDBG_16550 is not set
24# CONFIG_GENERIC_TBSYNC is not set 39# CONFIG_GENERIC_TBSYNC is not set
25CONFIG_AUDIT_ARCH=y 40CONFIG_AUDIT_ARCH=y
26# CONFIG_DEFAULT_UIMAGE is not set 41# CONFIG_DEFAULT_UIMAGE is not set
27
28#
29# Processor support
30#
31# CONFIG_CLASSIC32 is not set
32# CONFIG_PPC_82xx is not set
33# CONFIG_PPC_83xx is not set
34# CONFIG_PPC_85xx is not set
35# CONFIG_PPC_86xx is not set
36CONFIG_PPC_8xx=y
37# CONFIG_40x is not set
38# CONFIG_44x is not set
39# CONFIG_E200 is not set
40CONFIG_8xx=y
41# CONFIG_PPC_DCR_NATIVE is not set 42# CONFIG_PPC_DCR_NATIVE is not set
42# CONFIG_PPC_DCR_MMIO is not set 43# CONFIG_PPC_DCR_MMIO is not set
43# CONFIG_PPC_MM_SLICES is not set
44CONFIG_NOT_COHERENT_CACHE=y
45CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 44CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
46 45
47# 46#
48# Code maturity level options 47# General setup
49# 48#
50CONFIG_EXPERIMENTAL=y 49CONFIG_EXPERIMENTAL=y
51CONFIG_BROKEN_ON_SMP=y 50CONFIG_BROKEN_ON_SMP=y
52CONFIG_INIT_ENV_ARG_LIMIT=32 51CONFIG_INIT_ENV_ARG_LIMIT=32
53
54#
55# General setup
56#
57CONFIG_LOCALVERSION="" 52CONFIG_LOCALVERSION=""
58CONFIG_LOCALVERSION_AUTO=y 53CONFIG_LOCALVERSION_AUTO=y
59# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
60CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
61# CONFIG_IPC_NS is not set
62CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
63# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
64# CONFIG_BSD_PROCESS_ACCT is not set 58# CONFIG_BSD_PROCESS_ACCT is not set
65# CONFIG_TASKSTATS is not set 59# CONFIG_TASKSTATS is not set
66# CONFIG_UTS_NS is not set 60# CONFIG_USER_NS is not set
67# CONFIG_AUDIT is not set 61# CONFIG_AUDIT is not set
68# CONFIG_IKCONFIG is not set 62# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 63CONFIG_LOG_BUF_SHIFT=14
@@ -95,19 +89,12 @@ CONFIG_SLAB=y
95CONFIG_RT_MUTEXES=y 89CONFIG_RT_MUTEXES=y
96# CONFIG_TINY_SHMEM is not set 90# CONFIG_TINY_SHMEM is not set
97CONFIG_BASE_SMALL=1 91CONFIG_BASE_SMALL=1
98
99#
100# Loadable module support
101#
102# CONFIG_MODULES is not set 92# CONFIG_MODULES is not set
103
104#
105# Block layer
106#
107CONFIG_BLOCK=y 93CONFIG_BLOCK=y
108# CONFIG_LBD is not set 94# CONFIG_LBD is not set
109# CONFIG_BLK_DEV_IO_TRACE is not set 95# CONFIG_BLK_DEV_IO_TRACE is not set
110# CONFIG_LSF is not set 96# CONFIG_LSF is not set
97# CONFIG_BLK_DEV_BSG is not set
111 98
112# 99#
113# IO Schedulers 100# IO Schedulers
@@ -166,6 +153,7 @@ CONFIG_NO_UCODE_PATCH=y
166# CONFIG_GENERIC_IOMAP is not set 153# CONFIG_GENERIC_IOMAP is not set
167# CONFIG_CPU_FREQ is not set 154# CONFIG_CPU_FREQ is not set
168# CONFIG_CPM2 is not set 155# CONFIG_CPM2 is not set
156# CONFIG_FSL_ULI1575 is not set
169 157
170# 158#
171# Kernel options 159# Kernel options
@@ -195,6 +183,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
195CONFIG_SPLIT_PTLOCK_CPUS=4 183CONFIG_SPLIT_PTLOCK_CPUS=4
196# CONFIG_RESOURCES_64BIT is not set 184# CONFIG_RESOURCES_64BIT is not set
197CONFIG_ZONE_DMA_FLAG=1 185CONFIG_ZONE_DMA_FLAG=1
186CONFIG_BOUNCE=y
187CONFIG_VIRT_TO_BUS=y
198# CONFIG_PROC_DEVICETREE is not set 188# CONFIG_PROC_DEVICETREE is not set
199# CONFIG_CMDLINE_BOOL is not set 189# CONFIG_CMDLINE_BOOL is not set
200# CONFIG_PM is not set 190# CONFIG_PM is not set
@@ -209,6 +199,7 @@ CONFIG_ZONE_DMA=y
209CONFIG_FSL_SOC=y 199CONFIG_FSL_SOC=y
210# CONFIG_PCI is not set 200# CONFIG_PCI is not set
211# CONFIG_PCI_DOMAINS is not set 201# CONFIG_PCI_DOMAINS is not set
202# CONFIG_PCI_SYSCALL is not set
212# CONFIG_PCI_QSPAN is not set 203# CONFIG_PCI_QSPAN is not set
213# CONFIG_ARCH_SUPPORTS_MSI is not set 204# CONFIG_ARCH_SUPPORTS_MSI is not set
214 205
@@ -317,6 +308,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
317# CONFIG_MAC80211 is not set 308# CONFIG_MAC80211 is not set
318# CONFIG_IEEE80211 is not set 309# CONFIG_IEEE80211 is not set
319# CONFIG_RFKILL is not set 310# CONFIG_RFKILL is not set
311# CONFIG_NET_9P is not set
320 312
321# 313#
322# Device Drivers 314# Device Drivers
@@ -328,26 +320,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
328CONFIG_STANDALONE=y 320CONFIG_STANDALONE=y
329CONFIG_PREVENT_FIRMWARE_BUILD=y 321CONFIG_PREVENT_FIRMWARE_BUILD=y
330# CONFIG_SYS_HYPERVISOR is not set 322# CONFIG_SYS_HYPERVISOR is not set
331
332#
333# Connector - unified userspace <-> kernelspace linker
334#
335# CONFIG_CONNECTOR is not set 323# CONFIG_CONNECTOR is not set
336# CONFIG_MTD is not set 324# CONFIG_MTD is not set
337 325CONFIG_OF_DEVICE=y
338#
339# Parallel port support
340#
341# CONFIG_PARPORT is not set 326# CONFIG_PARPORT is not set
342 327CONFIG_BLK_DEV=y
343#
344# Plug and Play support
345#
346# CONFIG_PNPACPI is not set
347
348#
349# Block devices
350#
351# CONFIG_BLK_DEV_FD is not set 328# CONFIG_BLK_DEV_FD is not set
352# CONFIG_BLK_DEV_COW_COMMON is not set 329# CONFIG_BLK_DEV_COW_COMMON is not set
353CONFIG_BLK_DEV_LOOP=y 330CONFIG_BLK_DEV_LOOP=y
@@ -356,11 +333,8 @@ CONFIG_BLK_DEV_LOOP=y
356# CONFIG_BLK_DEV_RAM is not set 333# CONFIG_BLK_DEV_RAM is not set
357# CONFIG_CDROM_PKTCDVD is not set 334# CONFIG_CDROM_PKTCDVD is not set
358# CONFIG_ATA_OVER_ETH is not set 335# CONFIG_ATA_OVER_ETH is not set
359 336CONFIG_MISC_DEVICES=y
360# 337# CONFIG_EEPROM_93CX6 is not set
361# Misc devices
362#
363# CONFIG_BLINK is not set
364# CONFIG_IDE is not set 338# CONFIG_IDE is not set
365 339
366# 340#
@@ -368,21 +342,16 @@ CONFIG_BLK_DEV_LOOP=y
368# 342#
369# CONFIG_RAID_ATTRS is not set 343# CONFIG_RAID_ATTRS is not set
370# CONFIG_SCSI is not set 344# CONFIG_SCSI is not set
345# CONFIG_SCSI_DMA is not set
371# CONFIG_SCSI_NETLINK is not set 346# CONFIG_SCSI_NETLINK is not set
372# CONFIG_ATA is not set 347# CONFIG_ATA is not set
373
374#
375# Multi-device support (RAID and LVM)
376#
377# CONFIG_MD is not set 348# CONFIG_MD is not set
378# CONFIG_MACINTOSH_DRIVERS is not set 349# CONFIG_MACINTOSH_DRIVERS is not set
379
380#
381# Network device support
382#
383CONFIG_NETDEVICES=y 350CONFIG_NETDEVICES=y
351# CONFIG_NETDEVICES_MULTIQUEUE is not set
384# CONFIG_DUMMY is not set 352# CONFIG_DUMMY is not set
385# CONFIG_BONDING is not set 353# CONFIG_BONDING is not set
354# CONFIG_MACVLAN is not set
386# CONFIG_EQUALIZER is not set 355# CONFIG_EQUALIZER is not set
387# CONFIG_TUN is not set 356# CONFIG_TUN is not set
388CONFIG_PHYLIB=y 357CONFIG_PHYLIB=y
@@ -398,16 +367,12 @@ CONFIG_DAVICOM_PHY=y
398# CONFIG_VITESSE_PHY is not set 367# CONFIG_VITESSE_PHY is not set
399# CONFIG_SMSC_PHY is not set 368# CONFIG_SMSC_PHY is not set
400# CONFIG_BROADCOM_PHY is not set 369# CONFIG_BROADCOM_PHY is not set
370# CONFIG_ICPLUS_PHY is not set
401CONFIG_FIXED_PHY=y 371CONFIG_FIXED_PHY=y
402CONFIG_FIXED_MII_10_FDX=y 372CONFIG_FIXED_MII_10_FDX=y
403# CONFIG_FIXED_MII_100_FDX is not set 373# CONFIG_FIXED_MII_100_FDX is not set
404
405#
406# Ethernet (10 or 100Mbit)
407#
408CONFIG_NET_ETHERNET=y 374CONFIG_NET_ETHERNET=y
409CONFIG_MII=y 375CONFIG_MII=y
410# CONFIG_FEC_8XX is not set
411CONFIG_FS_ENET=y 376CONFIG_FS_ENET=y
412CONFIG_FS_ENET_HAS_SCC=y 377CONFIG_FS_ENET_HAS_SCC=y
413CONFIG_FS_ENET_HAS_FEC=y 378CONFIG_FS_ENET_HAS_FEC=y
@@ -426,15 +391,7 @@ CONFIG_NETDEV_10000=y
426# CONFIG_NETCONSOLE is not set 391# CONFIG_NETCONSOLE is not set
427# CONFIG_NETPOLL is not set 392# CONFIG_NETPOLL is not set
428# CONFIG_NET_POLL_CONTROLLER is not set 393# CONFIG_NET_POLL_CONTROLLER is not set
429
430#
431# ISDN subsystem
432#
433# CONFIG_ISDN is not set 394# CONFIG_ISDN is not set
434
435#
436# Telephony Support
437#
438# CONFIG_PHONE is not set 395# CONFIG_PHONE is not set
439 396
440# 397#
@@ -518,10 +475,6 @@ CONFIG_SERIAL_CPM_SMC1=y
518CONFIG_SERIAL_CPM_SMC2=y 475CONFIG_SERIAL_CPM_SMC2=y
519CONFIG_UNIX98_PTYS=y 476CONFIG_UNIX98_PTYS=y
520# CONFIG_LEGACY_PTYS is not set 477# CONFIG_LEGACY_PTYS is not set
521
522#
523# IPMI
524#
525# CONFIG_IPMI_HANDLER is not set 478# CONFIG_IPMI_HANDLER is not set
526# CONFIG_WATCHDOG is not set 479# CONFIG_WATCHDOG is not set
527CONFIG_HW_RANDOM=y 480CONFIG_HW_RANDOM=y
@@ -530,10 +483,6 @@ CONFIG_GEN_RTC=y
530# CONFIG_GEN_RTC_X is not set 483# CONFIG_GEN_RTC_X is not set
531# CONFIG_R3964 is not set 484# CONFIG_R3964 is not set
532# CONFIG_RAW_DRIVER is not set 485# CONFIG_RAW_DRIVER is not set
533
534#
535# TPM devices
536#
537# CONFIG_TCG_TPM is not set 486# CONFIG_TCG_TPM is not set
538# CONFIG_I2C is not set 487# CONFIG_I2C is not set
539 488
@@ -542,20 +491,21 @@ CONFIG_GEN_RTC=y
542# 491#
543# CONFIG_SPI is not set 492# CONFIG_SPI is not set
544# CONFIG_SPI_MASTER is not set 493# CONFIG_SPI_MASTER is not set
545
546#
547# Dallas's 1-wire bus
548#
549# CONFIG_W1 is not set 494# CONFIG_W1 is not set
495# CONFIG_POWER_SUPPLY is not set
550CONFIG_HWMON=y 496CONFIG_HWMON=y
551# CONFIG_HWMON_VID is not set 497# CONFIG_HWMON_VID is not set
552# CONFIG_SENSORS_ABITUGURU is not set 498# CONFIG_SENSORS_ABITUGURU is not set
499# CONFIG_SENSORS_ABITUGURU3 is not set
553# CONFIG_SENSORS_F71805F is not set 500# CONFIG_SENSORS_F71805F is not set
501# CONFIG_SENSORS_IT87 is not set
502# CONFIG_SENSORS_PC87360 is not set
554# CONFIG_SENSORS_PC87427 is not set 503# CONFIG_SENSORS_PC87427 is not set
555# CONFIG_SENSORS_SMSC47M1 is not set 504# CONFIG_SENSORS_SMSC47M1 is not set
556# CONFIG_SENSORS_SMSC47B397 is not set 505# CONFIG_SENSORS_SMSC47B397 is not set
557# CONFIG_SENSORS_VT1211 is not set 506# CONFIG_SENSORS_VT1211 is not set
558# CONFIG_SENSORS_W83627HF is not set 507# CONFIG_SENSORS_W83627HF is not set
508# CONFIG_SENSORS_W83627EHF is not set
559# CONFIG_HWMON_DEBUG_CHIP is not set 509# CONFIG_HWMON_DEBUG_CHIP is not set
560 510
561# 511#
@@ -580,6 +530,7 @@ CONFIG_DAB=y
580# 530#
581# CONFIG_DISPLAY_SUPPORT is not set 531# CONFIG_DISPLAY_SUPPORT is not set
582# CONFIG_VGASTATE is not set 532# CONFIG_VGASTATE is not set
533CONFIG_VIDEO_OUTPUT_CONTROL=y
583# CONFIG_FB is not set 534# CONFIG_FB is not set
584# CONFIG_FB_IBM_GXT4500 is not set 535# CONFIG_FB_IBM_GXT4500 is not set
585 536
@@ -587,16 +538,10 @@ CONFIG_DAB=y
587# Sound 538# Sound
588# 539#
589# CONFIG_SOUND is not set 540# CONFIG_SOUND is not set
590 541CONFIG_HID_SUPPORT=y
591#
592# HID Devices
593#
594CONFIG_HID=y 542CONFIG_HID=y
595# CONFIG_HID_DEBUG is not set 543# CONFIG_HID_DEBUG is not set
596 544CONFIG_USB_SUPPORT=y
597#
598# USB support
599#
600# CONFIG_USB_ARCH_HAS_HCD is not set 545# CONFIG_USB_ARCH_HAS_HCD is not set
601# CONFIG_USB_ARCH_HAS_OHCI is not set 546# CONFIG_USB_ARCH_HAS_OHCI is not set
602# CONFIG_USB_ARCH_HAS_EHCI is not set 547# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -610,31 +555,8 @@ CONFIG_HID=y
610# 555#
611# CONFIG_USB_GADGET is not set 556# CONFIG_USB_GADGET is not set
612# CONFIG_MMC is not set 557# CONFIG_MMC is not set
613
614#
615# LED devices
616#
617# CONFIG_NEW_LEDS is not set 558# CONFIG_NEW_LEDS is not set
618 559# CONFIG_EDAC is not set
619#
620# LED drivers
621#
622
623#
624# LED Triggers
625#
626
627#
628# InfiniBand support
629#
630
631#
632# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
633#
634
635#
636# Real Time Clock
637#
638# CONFIG_RTC_CLASS is not set 560# CONFIG_RTC_CLASS is not set
639 561
640# 562#
@@ -651,6 +573,11 @@ CONFIG_HID=y
651# 573#
652 574
653# 575#
576# Userspace I/O
577#
578# CONFIG_UIO is not set
579
580#
654# File systems 581# File systems
655# 582#
656CONFIG_EXT2_FS=y 583CONFIG_EXT2_FS=y
@@ -747,7 +674,6 @@ CONFIG_SUNRPC=y
747# CONFIG_NCP_FS is not set 674# CONFIG_NCP_FS is not set
748# CONFIG_CODA_FS is not set 675# CONFIG_CODA_FS is not set
749# CONFIG_AFS_FS is not set 676# CONFIG_AFS_FS is not set
750# CONFIG_9P_FS is not set
751 677
752# 678#
753# Partition Types 679# Partition Types
@@ -790,6 +716,7 @@ CONFIG_CRC_CCITT=y
790# CONFIG_CRC16 is not set 716# CONFIG_CRC16 is not set
791# CONFIG_CRC_ITU_T is not set 717# CONFIG_CRC_ITU_T is not set
792CONFIG_CRC32=y 718CONFIG_CRC32=y
719# CONFIG_CRC7 is not set
793# CONFIG_LIBCRC32C is not set 720# CONFIG_LIBCRC32C is not set
794CONFIG_ZLIB_INFLATE=y 721CONFIG_ZLIB_INFLATE=y
795CONFIG_PLIST=y 722CONFIG_PLIST=y
@@ -812,7 +739,6 @@ CONFIG_ENABLE_MUST_CHECK=y
812# CONFIG_DEBUG_FS is not set 739# CONFIG_DEBUG_FS is not set
813# CONFIG_HEADERS_CHECK is not set 740# CONFIG_HEADERS_CHECK is not set
814# CONFIG_DEBUG_KERNEL is not set 741# CONFIG_DEBUG_KERNEL is not set
815# CONFIG_BOOTX_TEXT is not set
816# CONFIG_PPC_EARLY_DEBUG is not set 742# CONFIG_PPC_EARLY_DEBUG is not set
817 743
818# 744#
@@ -820,8 +746,4 @@ CONFIG_ENABLE_MUST_CHECK=y
820# 746#
821# CONFIG_KEYS is not set 747# CONFIG_KEYS is not set
822# CONFIG_SECURITY is not set 748# CONFIG_SECURITY is not set
823
824#
825# Cryptographic options
826#
827# CONFIG_CRYPTO is not set 749# CONFIG_CRYPTO is not set
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/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index 858f865f2d59..cce3d3da086b 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_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 14:15:11 2007 4# Tue Aug 28 21:24:45 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
22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_CHECK_CACHE_COHERENCY=y
7CONFIG_PPC32=y 24CONFIG_PPC32=y
8CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 26CONFIG_MMU=y
@@ -14,63 +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
23# CONFIG_PPC_UDBG_16550 is not set 42# CONFIG_PPC_UDBG_16550 is not set
24# CONFIG_GENERIC_TBSYNC is not set 43# CONFIG_GENERIC_TBSYNC is not set
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
45CONFIG_ALTIVEC=y
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_NOT_COHERENT_CACHE=y
51CONFIG_CHECK_CACHE_COHERENCY=y
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=""
65CONFIG_LOCALVERSION_AUTO=y 58CONFIG_LOCALVERSION_AUTO=y
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
75# CONFIG_IKCONFIG is not set 67# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 68CONFIG_LOG_BUF_SHIFT=14
@@ -103,19 +95,12 @@ CONFIG_SLAB=y
103CONFIG_RT_MUTEXES=y 95CONFIG_RT_MUTEXES=y
104# CONFIG_TINY_SHMEM is not set 96# CONFIG_TINY_SHMEM is not set
105CONFIG_BASE_SMALL=0 97CONFIG_BASE_SMALL=0
106
107#
108# Loadable module support
109#
110# CONFIG_MODULES is not set 98# CONFIG_MODULES is not set
111
112#
113# Block layer
114#
115CONFIG_BLOCK=y 99CONFIG_BLOCK=y
116CONFIG_LBD=y 100CONFIG_LBD=y
117# CONFIG_BLK_DEV_IO_TRACE is not set 101# CONFIG_BLK_DEV_IO_TRACE is not set
118# CONFIG_LSF is not set 102# CONFIG_LSF is not set
103# CONFIG_BLK_DEV_BSG is not set
119 104
120# 105#
121# IO Schedulers 106# IO Schedulers
@@ -135,7 +120,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
135# 120#
136# CONFIG_PPC_MULTIPLATFORM is not set 121# CONFIG_PPC_MULTIPLATFORM is not set
137CONFIG_EMBEDDED6xx=y 122CONFIG_EMBEDDED6xx=y
138# CONFIG_APUS is not set 123# CONFIG_PPC_82xx is not set
124# CONFIG_PPC_83xx is not set
125# CONFIG_PPC_86xx is not set
139# CONFIG_PPC_MPC52xx is not set 126# CONFIG_PPC_MPC52xx is not set
140# CONFIG_PPC_MPC5200 is not set 127# CONFIG_PPC_MPC5200 is not set
141# CONFIG_PPC_CELL is not set 128# CONFIG_PPC_CELL is not set
@@ -156,8 +143,8 @@ CONFIG_MV64X60=y
156# CONFIG_PPC_INDIRECT_IO is not set 143# CONFIG_PPC_INDIRECT_IO is not set
157# CONFIG_GENERIC_IOMAP is not set 144# CONFIG_GENERIC_IOMAP is not set
158# CONFIG_CPU_FREQ is not set 145# CONFIG_CPU_FREQ is not set
159# CONFIG_TAU is not set
160# CONFIG_CPM2 is not set 146# CONFIG_CPM2 is not set
147# CONFIG_FSL_ULI1575 is not set
161 148
162# 149#
163# Kernel options 150# Kernel options
@@ -187,6 +174,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
187CONFIG_SPLIT_PTLOCK_CPUS=4 174CONFIG_SPLIT_PTLOCK_CPUS=4
188# CONFIG_RESOURCES_64BIT is not set 175# CONFIG_RESOURCES_64BIT is not set
189CONFIG_ZONE_DMA_FLAG=1 176CONFIG_ZONE_DMA_FLAG=1
177CONFIG_BOUNCE=y
178CONFIG_VIRT_TO_BUS=y
190CONFIG_PROC_DEVICETREE=y 179CONFIG_PROC_DEVICETREE=y
191# CONFIG_CMDLINE_BOOL is not set 180# CONFIG_CMDLINE_BOOL is not set
192# CONFIG_PM is not set 181# CONFIG_PM is not set
@@ -201,9 +190,9 @@ CONFIG_ISA_DMA_API=y
201CONFIG_ZONE_DMA=y 190CONFIG_ZONE_DMA=y
202CONFIG_GENERIC_ISA_DMA=y 191CONFIG_GENERIC_ISA_DMA=y
203CONFIG_PPC_INDIRECT_PCI=y 192CONFIG_PPC_INDIRECT_PCI=y
204# CONFIG_PPC_INDIRECT_PCI_BE is not set
205CONFIG_PCI=y 193CONFIG_PCI=y
206CONFIG_PCI_DOMAINS=y 194CONFIG_PCI_DOMAINS=y
195CONFIG_PCI_SYSCALL=y
207# CONFIG_PCIEPORTBUS is not set 196# CONFIG_PCIEPORTBUS is not set
208CONFIG_ARCH_SUPPORTS_MSI=y 197CONFIG_ARCH_SUPPORTS_MSI=y
209# CONFIG_PCI_MSI is not set 198# CONFIG_PCI_MSI is not set
@@ -315,6 +304,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
315# CONFIG_MAC80211 is not set 304# CONFIG_MAC80211 is not set
316# CONFIG_IEEE80211 is not set 305# CONFIG_IEEE80211 is not set
317# CONFIG_RFKILL is not set 306# CONFIG_RFKILL is not set
307# CONFIG_NET_9P is not set
318 308
319# 309#
320# Device Drivers 310# Device Drivers
@@ -327,10 +317,6 @@ CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 317CONFIG_PREVENT_FIRMWARE_BUILD=y
328# CONFIG_FW_LOADER is not set 318# CONFIG_FW_LOADER is not set
329# CONFIG_SYS_HYPERVISOR is not set 319# CONFIG_SYS_HYPERVISOR is not set
330
331#
332# Connector - unified userspace <-> kernelspace linker
333#
334# CONFIG_CONNECTOR is not set 320# CONFIG_CONNECTOR is not set
335CONFIG_MTD=y 321CONFIG_MTD=y
336# CONFIG_MTD_DEBUG is not set 322# CONFIG_MTD_DEBUG is not set
@@ -406,20 +392,9 @@ CONFIG_MTD_PHYSMAP_OF=y
406# UBI - Unsorted block images 392# UBI - Unsorted block images
407# 393#
408# CONFIG_MTD_UBI is not set 394# CONFIG_MTD_UBI is not set
409 395CONFIG_OF_DEVICE=y
410#
411# Parallel port support
412#
413# CONFIG_PARPORT is not set 396# CONFIG_PARPORT is not set
414 397CONFIG_BLK_DEV=y
415#
416# Plug and Play support
417#
418# CONFIG_PNPACPI is not set
419
420#
421# Block devices
422#
423# CONFIG_BLK_DEV_FD is not set 398# CONFIG_BLK_DEV_FD is not set
424# CONFIG_BLK_CPQ_DA is not set 399# CONFIG_BLK_CPQ_DA is not set
425# CONFIG_BLK_CPQ_CISS_DA is not set 400# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -437,14 +412,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
437CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 412CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
438# CONFIG_CDROM_PKTCDVD is not set 413# CONFIG_CDROM_PKTCDVD is not set
439# CONFIG_ATA_OVER_ETH is not set 414# CONFIG_ATA_OVER_ETH is not set
440 415CONFIG_MISC_DEVICES=y
441#
442# Misc devices
443#
444# CONFIG_PHANTOM is not set 416# CONFIG_PHANTOM is not set
417# CONFIG_EEPROM_93CX6 is not set
445# CONFIG_SGI_IOC4 is not set 418# CONFIG_SGI_IOC4 is not set
446# CONFIG_TIFM_CORE is not set 419# CONFIG_TIFM_CORE is not set
447# CONFIG_BLINK is not set
448CONFIG_IDE=y 420CONFIG_IDE=y
449CONFIG_BLK_DEV_IDE=y 421CONFIG_BLK_DEV_IDE=y
450 422
@@ -509,6 +481,7 @@ CONFIG_BLK_DEV_IDEDMA=y
509# 481#
510# CONFIG_RAID_ATTRS is not set 482# CONFIG_RAID_ATTRS is not set
511CONFIG_SCSI=y 483CONFIG_SCSI=y
484CONFIG_SCSI_DMA=y
512# CONFIG_SCSI_TGT is not set 485# CONFIG_SCSI_TGT is not set
513# CONFIG_SCSI_NETLINK is not set 486# CONFIG_SCSI_NETLINK is not set
514CONFIG_SCSI_PROC_FS=y 487CONFIG_SCSI_PROC_FS=y
@@ -537,12 +510,8 @@ CONFIG_BLK_DEV_SD=y
537# CONFIG_SCSI_SPI_ATTRS is not set 510# CONFIG_SCSI_SPI_ATTRS is not set
538# CONFIG_SCSI_FC_ATTRS is not set 511# CONFIG_SCSI_FC_ATTRS is not set
539# CONFIG_SCSI_ISCSI_ATTRS is not set 512# CONFIG_SCSI_ISCSI_ATTRS is not set
540# CONFIG_SCSI_SAS_ATTRS is not set
541# CONFIG_SCSI_SAS_LIBSAS is not set 513# CONFIG_SCSI_SAS_LIBSAS is not set
542 514CONFIG_SCSI_LOWLEVEL=y
543#
544# SCSI low-level drivers
545#
546# CONFIG_ISCSI_TCP is not set 515# CONFIG_ISCSI_TCP is not set
547# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 516# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
548# CONFIG_SCSI_3W_9XXX is not set 517# CONFIG_SCSI_3W_9XXX is not set
@@ -632,10 +601,6 @@ CONFIG_SATA_MV=y
632# CONFIG_PATA_SIS is not set 601# CONFIG_PATA_SIS is not set
633# CONFIG_PATA_VIA is not set 602# CONFIG_PATA_VIA is not set
634# CONFIG_PATA_WINBOND is not set 603# CONFIG_PATA_WINBOND is not set
635
636#
637# Multi-device support (RAID and LVM)
638#
639# CONFIG_MD is not set 604# CONFIG_MD is not set
640 605
641# 606#
@@ -651,21 +616,15 @@ CONFIG_SATA_MV=y
651# 616#
652# CONFIG_FIREWIRE is not set 617# CONFIG_FIREWIRE is not set
653# CONFIG_IEEE1394 is not set 618# CONFIG_IEEE1394 is not set
654
655#
656# I2O device support
657#
658# CONFIG_I2O is not set 619# CONFIG_I2O is not set
659CONFIG_MACINTOSH_DRIVERS=y 620CONFIG_MACINTOSH_DRIVERS=y
660# CONFIG_MAC_EMUMOUSEBTN is not set 621# CONFIG_MAC_EMUMOUSEBTN is not set
661# CONFIG_WINDFARM is not set 622# CONFIG_WINDFARM is not set
662
663#
664# Network device support
665#
666CONFIG_NETDEVICES=y 623CONFIG_NETDEVICES=y
624# CONFIG_NETDEVICES_MULTIQUEUE is not set
667# CONFIG_DUMMY is not set 625# CONFIG_DUMMY is not set
668# CONFIG_BONDING is not set 626# CONFIG_BONDING is not set
627# CONFIG_MACVLAN is not set
669# CONFIG_EQUALIZER is not set 628# CONFIG_EQUALIZER is not set
670# CONFIG_TUN is not set 629# CONFIG_TUN is not set
671# CONFIG_ARCNET is not set 630# CONFIG_ARCNET is not set
@@ -682,21 +641,14 @@ CONFIG_PHYLIB=y
682# CONFIG_VITESSE_PHY is not set 641# CONFIG_VITESSE_PHY is not set
683# CONFIG_SMSC_PHY is not set 642# CONFIG_SMSC_PHY is not set
684# CONFIG_BROADCOM_PHY is not set 643# CONFIG_BROADCOM_PHY is not set
644# CONFIG_ICPLUS_PHY is not set
685# CONFIG_FIXED_PHY is not set 645# CONFIG_FIXED_PHY is not set
686
687#
688# Ethernet (10 or 100Mbit)
689#
690CONFIG_NET_ETHERNET=y 646CONFIG_NET_ETHERNET=y
691CONFIG_MII=y 647CONFIG_MII=y
692# CONFIG_HAPPYMEAL is not set 648# CONFIG_HAPPYMEAL is not set
693# CONFIG_SUNGEM is not set 649# CONFIG_SUNGEM is not set
694# CONFIG_CASSINI is not set 650# CONFIG_CASSINI is not set
695# CONFIG_NET_VENDOR_3COM is not set 651# CONFIG_NET_VENDOR_3COM is not set
696
697#
698# Tulip family network device support
699#
700# CONFIG_NET_TULIP is not set 652# CONFIG_NET_TULIP is not set
701# CONFIG_HP100 is not set 653# CONFIG_HP100 is not set
702CONFIG_NET_PCI=y 654CONFIG_NET_PCI=y
@@ -736,7 +688,6 @@ CONFIG_E1000=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
741# CONFIG_TIGON3 is not set 692# CONFIG_TIGON3 is not set
742# CONFIG_BNX2 is not set 693# CONFIG_BNX2 is not set
@@ -778,15 +729,7 @@ CONFIG_NETDEV_10000=y
778# CONFIG_NETCONSOLE is not set 729# CONFIG_NETCONSOLE is not set
779# CONFIG_NETPOLL is not set 730# CONFIG_NETPOLL is not set
780# CONFIG_NET_POLL_CONTROLLER is not set 731# CONFIG_NET_POLL_CONTROLLER is not set
781
782#
783# ISDN subsystem
784#
785# CONFIG_ISDN is not set 732# CONFIG_ISDN is not set
786
787#
788# Telephony Support
789#
790# CONFIG_PHONE is not set 733# CONFIG_PHONE is not set
791 734
792# 735#
@@ -850,10 +793,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
850CONFIG_UNIX98_PTYS=y 793CONFIG_UNIX98_PTYS=y
851CONFIG_LEGACY_PTYS=y 794CONFIG_LEGACY_PTYS=y
852CONFIG_LEGACY_PTY_COUNT=256 795CONFIG_LEGACY_PTY_COUNT=256
853
854#
855# IPMI
856#
857# CONFIG_IPMI_HANDLER is not set 796# CONFIG_IPMI_HANDLER is not set
858# CONFIG_WATCHDOG is not set 797# CONFIG_WATCHDOG is not set
859# CONFIG_HW_RANDOM is not set 798# CONFIG_HW_RANDOM is not set
@@ -865,10 +804,6 @@ CONFIG_GEN_RTC=y
865# CONFIG_AGP is not set 804# CONFIG_AGP is not set
866# CONFIG_DRM is not set 805# CONFIG_DRM is not set
867# CONFIG_RAW_DRIVER is not set 806# CONFIG_RAW_DRIVER is not set
868
869#
870# TPM devices
871#
872# CONFIG_TCG_TPM is not set 807# CONFIG_TCG_TPM is not set
873CONFIG_DEVPORT=y 808CONFIG_DEVPORT=y
874CONFIG_I2C=y 809CONFIG_I2C=y
@@ -903,6 +838,7 @@ CONFIG_I2C_CHARDEV=y
903# CONFIG_I2C_SIS5595 is not set 838# CONFIG_I2C_SIS5595 is not set
904# CONFIG_I2C_SIS630 is not set 839# CONFIG_I2C_SIS630 is not set
905# CONFIG_I2C_SIS96X is not set 840# CONFIG_I2C_SIS96X is not set
841# CONFIG_I2C_TAOS_EVM is not set
906# CONFIG_I2C_TINY_USB is not set 842# CONFIG_I2C_TINY_USB is not set
907# CONFIG_I2C_VIA is not set 843# CONFIG_I2C_VIA is not set
908# CONFIG_I2C_VIAPRO is not set 844# CONFIG_I2C_VIAPRO is not set
@@ -914,12 +850,14 @@ CONFIG_I2C_MV64XXX=y
914# 850#
915# CONFIG_SENSORS_DS1337 is not set 851# CONFIG_SENSORS_DS1337 is not set
916# CONFIG_SENSORS_DS1374 is not set 852# CONFIG_SENSORS_DS1374 is not set
853# CONFIG_DS1682 is not set
917# CONFIG_SENSORS_EEPROM is not set 854# CONFIG_SENSORS_EEPROM is not set
918# CONFIG_SENSORS_PCF8574 is not set 855# CONFIG_SENSORS_PCF8574 is not set
919# CONFIG_SENSORS_PCA9539 is not set 856# CONFIG_SENSORS_PCA9539 is not set
920# CONFIG_SENSORS_PCF8591 is not set 857# CONFIG_SENSORS_PCF8591 is not set
921# CONFIG_SENSORS_M41T00 is not set 858# CONFIG_SENSORS_M41T00 is not set
922# CONFIG_SENSORS_MAX6875 is not set 859# CONFIG_SENSORS_MAX6875 is not set
860# CONFIG_SENSORS_TSL2550 is not set
923# CONFIG_I2C_DEBUG_CORE is not set 861# CONFIG_I2C_DEBUG_CORE is not set
924# CONFIG_I2C_DEBUG_ALGO is not set 862# CONFIG_I2C_DEBUG_ALGO is not set
925# CONFIG_I2C_DEBUG_BUS is not set 863# CONFIG_I2C_DEBUG_BUS is not set
@@ -930,14 +868,12 @@ CONFIG_I2C_MV64XXX=y
930# 868#
931# CONFIG_SPI is not set 869# CONFIG_SPI is not set
932# CONFIG_SPI_MASTER is not set 870# CONFIG_SPI_MASTER is not set
933
934#
935# Dallas's 1-wire bus
936#
937# CONFIG_W1 is not set 871# CONFIG_W1 is not set
872# CONFIG_POWER_SUPPLY is not set
938CONFIG_HWMON=y 873CONFIG_HWMON=y
939# CONFIG_HWMON_VID is not set 874# CONFIG_HWMON_VID is not set
940# CONFIG_SENSORS_ABITUGURU is not set 875# CONFIG_SENSORS_ABITUGURU is not set
876# CONFIG_SENSORS_ABITUGURU3 is not set
941# CONFIG_SENSORS_AD7418 is not set 877# CONFIG_SENSORS_AD7418 is not set
942# CONFIG_SENSORS_ADM1021 is not set 878# CONFIG_SENSORS_ADM1021 is not set
943# CONFIG_SENSORS_ADM1025 is not set 879# CONFIG_SENSORS_ADM1025 is not set
@@ -964,14 +900,17 @@ CONFIG_HWMON=y
964# CONFIG_SENSORS_LM87 is not set 900# CONFIG_SENSORS_LM87 is not set
965# CONFIG_SENSORS_LM90 is not set 901# CONFIG_SENSORS_LM90 is not set
966# CONFIG_SENSORS_LM92 is not set 902# CONFIG_SENSORS_LM92 is not set
903# CONFIG_SENSORS_LM93 is not set
967# CONFIG_SENSORS_MAX1619 is not set 904# CONFIG_SENSORS_MAX1619 is not set
968# CONFIG_SENSORS_MAX6650 is not set 905# CONFIG_SENSORS_MAX6650 is not set
969# CONFIG_SENSORS_PC87360 is not set 906# CONFIG_SENSORS_PC87360 is not set
970# CONFIG_SENSORS_PC87427 is not set 907# CONFIG_SENSORS_PC87427 is not set
971# CONFIG_SENSORS_SIS5595 is not set 908# CONFIG_SENSORS_SIS5595 is not set
909# CONFIG_SENSORS_DME1737 is not set
972# CONFIG_SENSORS_SMSC47M1 is not set 910# CONFIG_SENSORS_SMSC47M1 is not set
973# CONFIG_SENSORS_SMSC47M192 is not set 911# CONFIG_SENSORS_SMSC47M192 is not set
974# CONFIG_SENSORS_SMSC47B397 is not set 912# CONFIG_SENSORS_SMSC47B397 is not set
913# CONFIG_SENSORS_THMC50 is not set
975# CONFIG_SENSORS_VIA686A is not set 914# CONFIG_SENSORS_VIA686A is not set
976# CONFIG_SENSORS_VT1211 is not set 915# CONFIG_SENSORS_VT1211 is not set
977# CONFIG_SENSORS_VT8231 is not set 916# CONFIG_SENSORS_VT8231 is not set
@@ -1006,6 +945,7 @@ CONFIG_HWMON=y
1006# 945#
1007# CONFIG_DISPLAY_SUPPORT is not set 946# CONFIG_DISPLAY_SUPPORT is not set
1008# CONFIG_VGASTATE is not set 947# CONFIG_VGASTATE is not set
948CONFIG_VIDEO_OUTPUT_CONTROL=y
1009# CONFIG_FB is not set 949# CONFIG_FB is not set
1010# CONFIG_FB_IBM_GXT4500 is not set 950# CONFIG_FB_IBM_GXT4500 is not set
1011 951
@@ -1020,10 +960,7 @@ CONFIG_DUMMY_CONSOLE=y
1020# Sound 960# Sound
1021# 961#
1022# CONFIG_SOUND is not set 962# CONFIG_SOUND is not set
1023 963CONFIG_HID_SUPPORT=y
1024#
1025# HID Devices
1026#
1027CONFIG_HID=y 964CONFIG_HID=y
1028# CONFIG_HID_DEBUG is not set 965# CONFIG_HID_DEBUG is not set
1029 966
@@ -1034,10 +971,7 @@ CONFIG_USB_HID=y
1034# CONFIG_USB_HIDINPUT_POWERBOOK is not set 971# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1035# CONFIG_HID_FF is not set 972# CONFIG_HID_FF is not set
1036# CONFIG_USB_HIDDEV is not set 973# CONFIG_USB_HIDDEV is not set
1037 974CONFIG_USB_SUPPORT=y
1038#
1039# USB support
1040#
1041CONFIG_USB_ARCH_HAS_HCD=y 975CONFIG_USB_ARCH_HAS_HCD=y
1042CONFIG_USB_ARCH_HAS_OHCI=y 976CONFIG_USB_ARCH_HAS_OHCI=y
1043CONFIG_USB_ARCH_HAS_EHCI=y 977CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1059,7 +993,6 @@ CONFIG_USB_EHCI_HCD=y
1059# CONFIG_USB_EHCI_SPLIT_ISO is not set 993# CONFIG_USB_EHCI_SPLIT_ISO is not set
1060# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 994# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1061# CONFIG_USB_EHCI_TT_NEWSCHED is not set 995# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1062# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1063# CONFIG_USB_ISP116X_HCD is not set 996# CONFIG_USB_ISP116X_HCD is not set
1064CONFIG_USB_OHCI_HCD=y 997CONFIG_USB_OHCI_HCD=y
1065# CONFIG_USB_OHCI_HCD_PPC_OF is not set 998# CONFIG_USB_OHCI_HCD_PPC_OF is not set
@@ -1068,6 +1001,7 @@ CONFIG_USB_OHCI_HCD=y
1068CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1001CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1069# CONFIG_USB_UHCI_HCD is not set 1002# CONFIG_USB_UHCI_HCD is not set
1070# CONFIG_USB_SL811_HCD is not set 1003# CONFIG_USB_SL811_HCD is not set
1004# CONFIG_USB_R8A66597_HCD is not set
1071 1005
1072# 1006#
1073# USB Device Class drivers 1007# USB Device Class drivers
@@ -1134,32 +1068,9 @@ CONFIG_USB_MON=y
1134# 1068#
1135# CONFIG_USB_GADGET is not set 1069# CONFIG_USB_GADGET is not set
1136# CONFIG_MMC is not set 1070# CONFIG_MMC is not set
1137
1138#
1139# LED devices
1140#
1141# CONFIG_NEW_LEDS is not set 1071# CONFIG_NEW_LEDS is not set
1142
1143#
1144# LED drivers
1145#
1146
1147#
1148# LED Triggers
1149#
1150
1151#
1152# InfiniBand support
1153#
1154# CONFIG_INFINIBAND is not set 1072# CONFIG_INFINIBAND is not set
1155 1073# CONFIG_EDAC is not set
1156#
1157# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1158#
1159
1160#
1161# Real Time Clock
1162#
1163CONFIG_RTC_LIB=y 1074CONFIG_RTC_LIB=y
1164CONFIG_RTC_CLASS=y 1075CONFIG_RTC_CLASS=y
1165CONFIG_RTC_HCTOSYS=y 1076CONFIG_RTC_HCTOSYS=y
@@ -1186,6 +1097,7 @@ CONFIG_RTC_DRV_MAX6900=y
1186# CONFIG_RTC_DRV_X1205 is not set 1097# CONFIG_RTC_DRV_X1205 is not set
1187# CONFIG_RTC_DRV_PCF8563 is not set 1098# CONFIG_RTC_DRV_PCF8563 is not set
1188# CONFIG_RTC_DRV_PCF8583 is not set 1099# CONFIG_RTC_DRV_PCF8583 is not set
1100# CONFIG_RTC_DRV_M41T80 is not set
1189 1101
1190# 1102#
1191# SPI RTC drivers 1103# SPI RTC drivers
@@ -1194,9 +1106,12 @@ CONFIG_RTC_DRV_MAX6900=y
1194# 1106#
1195# Platform RTC drivers 1107# Platform RTC drivers
1196# 1108#
1109# CONFIG_RTC_DRV_CMOS is not set
1197# CONFIG_RTC_DRV_DS1553 is not set 1110# CONFIG_RTC_DRV_DS1553 is not set
1111# CONFIG_RTC_DRV_STK17TA8 is not set
1198# CONFIG_RTC_DRV_DS1742 is not set 1112# CONFIG_RTC_DRV_DS1742 is not set
1199# CONFIG_RTC_DRV_M48T86 is not set 1113# CONFIG_RTC_DRV_M48T86 is not set
1114# CONFIG_RTC_DRV_M48T59 is not set
1200# CONFIG_RTC_DRV_V3020 is not set 1115# CONFIG_RTC_DRV_V3020 is not set
1201 1116
1202# 1117#
@@ -1217,6 +1132,11 @@ CONFIG_RTC_DRV_MAX6900=y
1217# 1132#
1218 1133
1219# 1134#
1135# Userspace I/O
1136#
1137# CONFIG_UIO is not set
1138
1139#
1220# File systems 1140# File systems
1221# 1141#
1222CONFIG_EXT2_FS=y 1142CONFIG_EXT2_FS=y
@@ -1310,7 +1230,6 @@ CONFIG_SUNRPC=y
1310# CONFIG_NCP_FS is not set 1230# CONFIG_NCP_FS is not set
1311# CONFIG_CODA_FS is not set 1231# CONFIG_CODA_FS is not set
1312# CONFIG_AFS_FS is not set 1232# CONFIG_AFS_FS is not set
1313# CONFIG_9P_FS is not set
1314 1233
1315# 1234#
1316# Partition Types 1235# Partition Types
@@ -1353,6 +1272,7 @@ CONFIG_BITREVERSE=y
1353# CONFIG_CRC16 is not set 1272# CONFIG_CRC16 is not set
1354# CONFIG_CRC_ITU_T is not set 1273# CONFIG_CRC_ITU_T is not set
1355CONFIG_CRC32=y 1274CONFIG_CRC32=y
1275# CONFIG_CRC7 is not set
1356# CONFIG_LIBCRC32C is not set 1276# CONFIG_LIBCRC32C is not set
1357CONFIG_PLIST=y 1277CONFIG_PLIST=y
1358CONFIG_HAS_IOMEM=y 1278CONFIG_HAS_IOMEM=y
@@ -1375,7 +1295,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1375# CONFIG_HEADERS_CHECK is not set 1295# CONFIG_HEADERS_CHECK is not set
1376# CONFIG_DEBUG_KERNEL is not set 1296# CONFIG_DEBUG_KERNEL is not set
1377CONFIG_DEBUG_BUGVERBOSE=y 1297CONFIG_DEBUG_BUGVERBOSE=y
1378# CONFIG_BOOTX_TEXT is not set
1379# CONFIG_PPC_EARLY_DEBUG is not set 1298# CONFIG_PPC_EARLY_DEBUG is not set
1380 1299
1381# 1300#
@@ -1383,8 +1302,4 @@ CONFIG_DEBUG_BUGVERBOSE=y
1383# 1302#
1384# CONFIG_KEYS is not set 1303# CONFIG_KEYS is not set
1385# CONFIG_SECURITY is not set 1304# CONFIG_SECURITY is not set
1386
1387#
1388# Cryptographic options
1389#
1390# CONFIG_CRYPTO is not set 1305# CONFIG_CRYPTO is not set
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#
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a83727b308a0..e477c9d0498b 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -83,7 +83,7 @@ void flush_fp_to_thread(struct task_struct *tsk)
83 */ 83 */
84 BUG_ON(tsk != current); 84 BUG_ON(tsk != current);
85#endif 85#endif
86 giveup_fpu(current); 86 giveup_fpu(tsk);
87 } 87 }
88 preempt_enable(); 88 preempt_enable();
89 } 89 }
@@ -143,7 +143,7 @@ void flush_altivec_to_thread(struct task_struct *tsk)
143#ifdef CONFIG_SMP 143#ifdef CONFIG_SMP
144 BUG_ON(tsk != current); 144 BUG_ON(tsk != current);
145#endif 145#endif
146 giveup_altivec(current); 146 giveup_altivec(tsk);
147 } 147 }
148 preempt_enable(); 148 preempt_enable();
149 } 149 }
@@ -182,7 +182,7 @@ void flush_spe_to_thread(struct task_struct *tsk)
182#ifdef CONFIG_SMP 182#ifdef CONFIG_SMP
183 BUG_ON(tsk != current); 183 BUG_ON(tsk != current);
184#endif 184#endif
185 giveup_spe(current); 185 giveup_spe(tsk);
186 } 186 }
187 preempt_enable(); 187 preempt_enable();
188 } 188 }
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 7c0668a9dcc7..0e14f532500e 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -48,10 +48,18 @@ static u64 __init find_spu_unit_number(struct device_node *spe)
48{ 48{
49 const unsigned int *prop; 49 const unsigned int *prop;
50 int proplen; 50 int proplen;
51
52 /* new device trees should provide the physical-id attribute */
51 prop = of_get_property(spe, "physical-id", &proplen); 53 prop = of_get_property(spe, "physical-id", &proplen);
52 if (proplen == 4) 54 if (proplen == 4)
53 return (u64)*prop; 55 return (u64)*prop;
54 56
57 /* celleb device tree provides the unit-id */
58 prop = of_get_property(spe, "unit-id", &proplen);
59 if (proplen == 4)
60 return (u64)*prop;
61
62 /* legacy device trees provide the id in the reg attribute */
55 prop = of_get_property(spe, "reg", &proplen); 63 prop = of_get_property(spe, "reg", &proplen);
56 if (proplen == 4) 64 if (proplen == 4)
57 return (u64)*prop; 65 return (u64)*prop;
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c
index 07a0e815abf5..ec01214e51ee 100644
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -162,7 +162,8 @@ static int spu_backing_wbox_write(struct spu_context *ctx, u32 data)
162 BUG_ON(avail != (4 - slot)); 162 BUG_ON(avail != (4 - slot));
163 ctx->csa.spu_mailbox_data[slot] = data; 163 ctx->csa.spu_mailbox_data[slot] = data;
164 ctx->csa.spu_chnlcnt_RW[29] = ++slot; 164 ctx->csa.spu_chnlcnt_RW[29] = ++slot;
165 ctx->csa.prob.mb_stat_R = (((4 - slot) & 0xff) << 8); 165 ctx->csa.prob.mb_stat_R &= ~(0x00ff00);
166 ctx->csa.prob.mb_stat_R |= (((4 - slot) & 0xff) << 8);
166 gen_spu_event(ctx, MFC_SPU_MAILBOX_WRITTEN_EVENT); 167 gen_spu_event(ctx, MFC_SPU_MAILBOX_WRITTEN_EVENT);
167 ret = 4; 168 ret = 4;
168 } else { 169 } else {
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 6abdd8fe2098..958f10e90fdd 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -193,11 +193,7 @@ static int spu_reacquire_runnable(struct spu_context *ctx, u32 *npc,
193 if (ret) 193 if (ret)
194 return ret; 194 return ret;
195 195
196 ret = spu_run_init(ctx, npc); 196 spuctx_switch_state(ctx, SPU_UTIL_USER);
197 if (ret) {
198 spu_release(ctx);
199 return ret;
200 }
201 return 0; 197 return 0;
202} 198}
203 199
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 2952b22f1c84..609945dbe394 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -63,7 +63,8 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
63 x.minor = minor; 63 x.minor = minor;
64 x.rev = rev; 64 x.rev = rev;
65 65
66 return (ps3_firmware_version.raw - x.raw); 66 return (ps3_firmware_version.raw > x.raw) -
67 (ps3_firmware_version.raw < x.raw);
67} 68}
68EXPORT_SYMBOL_GPL(ps3_compare_firmware_version); 69EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
69 70
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 05:06:14 -0500