aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-01-20 01:36:53 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-01-20 02:06:58 -0500
commita85cade6762bf566698e625ec1a4461245e40768 (patch)
treee6dc30c400417d313c2546aa0bc93ca1905608b5
parent9a4fc4eaf111ca960c9f524b850598e9dbc9697f (diff)
powerpc: Update all configs using savedefconfig
It looks like it's ~4 years since we updated some of these, so do a bulk update. Verified that the before and after generated configs are exactly the same. Which begs the question why update them? The answer is that it can be confusing when the stored defconfig drifts too far from the generated result. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig21
-rw-r--r--arch/powerpc/configs/40x/ep405_defconfig18
-rw-r--r--arch/powerpc/configs/40x/kilauea_defconfig27
-rw-r--r--arch/powerpc/configs/40x/klondike_defconfig4
-rw-r--r--arch/powerpc/configs/40x/makalu_defconfig20
-rw-r--r--arch/powerpc/configs/40x/obs600_defconfig13
-rw-r--r--arch/powerpc/configs/40x/virtex_defconfig21
-rw-r--r--arch/powerpc/configs/40x/walnut_defconfig18
-rw-r--r--arch/powerpc/configs/44x/akebono_defconfig7
-rw-r--r--arch/powerpc/configs/44x/arches_defconfig23
-rw-r--r--arch/powerpc/configs/44x/bamboo_defconfig15
-rw-r--r--arch/powerpc/configs/44x/bluestone_defconfig16
-rw-r--r--arch/powerpc/configs/44x/canyonlands_defconfig26
-rw-r--r--arch/powerpc/configs/44x/currituck_defconfig13
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig17
-rw-r--r--arch/powerpc/configs/44x/eiger_defconfig26
-rw-r--r--arch/powerpc/configs/44x/icon_defconfig20
-rw-r--r--arch/powerpc/configs/44x/iss476-smp_defconfig16
-rw-r--r--arch/powerpc/configs/44x/katmai_defconfig15
-rw-r--r--arch/powerpc/configs/44x/rainier_defconfig15
-rw-r--r--arch/powerpc/configs/44x/redwood_defconfig26
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig19
-rw-r--r--arch/powerpc/configs/44x/sequoia_defconfig21
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig16
-rw-r--r--arch/powerpc/configs/44x/virtex5_defconfig21
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig23
-rw-r--r--arch/powerpc/configs/52xx/cm5200_defconfig19
-rw-r--r--arch/powerpc/configs/52xx/lite5200b_defconfig20
-rw-r--r--arch/powerpc/configs/52xx/motionpro_defconfig22
-rw-r--r--arch/powerpc/configs/52xx/pcm030_defconfig21
-rw-r--r--arch/powerpc/configs/52xx/tqm5200_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig4
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig25
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig21
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig23
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig20
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig20
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig23
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig22
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig16
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig15
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig17
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig16
-rw-r--r--arch/powerpc/configs/85xx/ge_imp3a_defconfig16
-rw-r--r--arch/powerpc/configs/85xx/kmp204x_defconfig3
-rw-r--r--arch/powerpc/configs/85xx/ksi8560_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/mpc8540_ads_defconfig19
-rw-r--r--arch/powerpc/configs/85xx/mpc8560_ads_defconfig19
-rw-r--r--arch/powerpc/configs/85xx/mpc85xx_cds_defconfig21
-rw-r--r--arch/powerpc/configs/85xx/ppa8548_defconfig62
-rw-r--r--arch/powerpc/configs/85xx/sbc8548_defconfig40
-rw-r--r--arch/powerpc/configs/85xx/socrates_defconfig24
-rw-r--r--arch/powerpc/configs/85xx/stx_gp3_defconfig15
-rw-r--r--arch/powerpc/configs/85xx/tqm8540_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/tqm8541_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/tqm8548_defconfig22
-rw-r--r--arch/powerpc/configs/85xx/tqm8555_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/tqm8560_defconfig17
-rw-r--r--arch/powerpc/configs/85xx/xes_mpc85xx_defconfig34
-rw-r--r--arch/powerpc/configs/86xx/gef_ppc9a_defconfig36
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc310_defconfig35
-rw-r--r--arch/powerpc/configs/86xx/gef_sbc610_defconfig53
-rw-r--r--arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig32
-rw-r--r--arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig33
-rw-r--r--arch/powerpc/configs/86xx/sbc8641d_defconfig54
-rw-r--r--arch/powerpc/configs/adder875_defconfig27
-rw-r--r--arch/powerpc/configs/amigaone_defconfig36
-rw-r--r--arch/powerpc/configs/c2k_defconfig82
-rw-r--r--arch/powerpc/configs/cell_defconfig30
-rw-r--r--arch/powerpc/configs/celleb_defconfig21
-rw-r--r--arch/powerpc/configs/chrp32_defconfig37
-rw-r--r--arch/powerpc/configs/corenet32_smp_defconfig19
-rw-r--r--arch/powerpc/configs/corenet64_smp_defconfig1
-rw-r--r--arch/powerpc/configs/ep8248e_defconfig17
-rw-r--r--arch/powerpc/configs/ep88xc_defconfig29
-rw-r--r--arch/powerpc/configs/g5_defconfig60
-rw-r--r--arch/powerpc/configs/gamecube_defconfig15
-rw-r--r--arch/powerpc/configs/holly_defconfig15
-rw-r--r--arch/powerpc/configs/linkstation_defconfig28
-rw-r--r--arch/powerpc/configs/maple_defconfig26
-rw-r--r--arch/powerpc/configs/mgcoge_defconfig12
-rw-r--r--arch/powerpc/configs/mpc512x_defconfig2
-rw-r--r--arch/powerpc/configs/mpc5200_defconfig18
-rw-r--r--arch/powerpc/configs/mpc7448_hpc2_defconfig18
-rw-r--r--arch/powerpc/configs/mpc8272_ads_defconfig24
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig7
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig58
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig62
-rw-r--r--arch/powerpc/configs/mpc866_ads_defconfig22
-rw-r--r--arch/powerpc/configs/mpc86xx_defconfig39
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig29
-rw-r--r--arch/powerpc/configs/mvme5100_defconfig9
-rw-r--r--arch/powerpc/configs/pasemi_defconfig3
-rw-r--r--arch/powerpc/configs/pmac32_defconfig65
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig17
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig14
-rw-r--r--arch/powerpc/configs/ppc64_defconfig12
-rw-r--r--arch/powerpc/configs/ppc64e_defconfig4
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig348
-rw-r--r--arch/powerpc/configs/pq2fads_defconfig28
-rw-r--r--arch/powerpc/configs/ps3_defconfig16
-rw-r--r--arch/powerpc/configs/pseries_defconfig12
-rw-r--r--arch/powerpc/configs/pseries_le_defconfig14
-rw-r--r--arch/powerpc/configs/storcenter_defconfig12
-rw-r--r--arch/powerpc/configs/tqm8xx_defconfig32
-rw-r--r--arch/powerpc/configs/wii_defconfig18
108 files changed, 581 insertions, 2207 deletions
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index 69e06eeae6a6..9110a5cb1bb7 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_ACADIA=y 11CONFIG_ACADIA=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_PCI=y 13CONFIG_PCI=y
18CONFIG_NET=y 14CONFIG_NET=y
19CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -31,27 +27,18 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
32CONFIG_MTD=y 28CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_OF_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=m 30CONFIG_MTD_BLOCK=m
37CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
38CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
39CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 35CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 36CONFIG_BLK_DEV_RAM_SIZE=35000
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
46CONFIG_ETHERNET=y
47CONFIG_NET_VENDOR_IBM=y
48CONFIG_MII=y
49CONFIG_IBM_EMAC=y 38CONFIG_IBM_EMAC=y
50CONFIG_IBM_EMAC_RXB=256 39CONFIG_IBM_EMAC_RXB=256
51CONFIG_IBM_EMAC_TXB=256 40CONFIG_IBM_EMAC_TXB=256
52CONFIG_IBM_EMAC_DEBUG=y 41CONFIG_IBM_EMAC_DEBUG=y
53# CONFIG_NETDEV_1000 is not set
54# CONFIG_NETDEV_10000 is not set
55# CONFIG_INPUT is not set 42# CONFIG_INPUT is not set
56# CONFIG_SERIO is not set 43# CONFIG_SERIO is not set
57# CONFIG_VT is not set 44# CONFIG_VT is not set
@@ -65,20 +52,14 @@ CONFIG_SERIAL_OF_PLATFORM=y
65CONFIG_THERMAL=y 52CONFIG_THERMAL=y
66# CONFIG_USB_SUPPORT is not set 53# CONFIG_USB_SUPPORT is not set
67CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
68CONFIG_INOTIFY=y
69CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 56CONFIG_TMPFS=y
71CONFIG_CRAMFS=y 57CONFIG_CRAMFS=y
72CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
73CONFIG_NFS_V3=y
74CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
75CONFIG_MAGIC_SYSRQ=y
76CONFIG_DEBUG_FS=y 60CONFIG_DEBUG_FS=y
77CONFIG_DEBUG_KERNEL=y 61CONFIG_MAGIC_SYSRQ=y
78CONFIG_DETECT_HUNG_TASK=y 62CONFIG_DETECT_HUNG_TASK=y
79# CONFIG_RCU_CPU_STALL_DETECTOR is not set
80CONFIG_SYSCTL_SYSCALL_CHECK=y
81CONFIG_CRYPTO=y
82CONFIG_CRYPTO_CBC=y 63CONFIG_CRYPTO_CBC=y
83CONFIG_CRYPTO_ECB=y 64CONFIG_CRYPTO_ECB=y
84CONFIG_CRYPTO_PCBC=y 65CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig
index e9d84b5d0ab6..790366652ba3 100644
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_EP405=y 11CONFIG_EP405=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_NET=y 13CONFIG_NET=y
18CONFIG_PACKET=y 14CONFIG_PACKET=y
19CONFIG_UNIX=y 15CONFIG_UNIX=y
@@ -30,19 +26,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 26CONFIG_CONNECTOR=y
31CONFIG_MTD=y 27CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 28CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=m 29CONFIG_MTD_BLOCK=m
36CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
38CONFIG_MTD_CFI_AMDSTD=y 32CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
43CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
44CONFIG_ETHERNET=y
45CONFIG_NET_VENDOR_IBM=y
46CONFIG_IBM_EMAC=y 37CONFIG_IBM_EMAC=y
47# CONFIG_INPUT is not set 38# CONFIG_INPUT is not set
48# CONFIG_SERIO is not set 39# CONFIG_SERIO is not set
@@ -55,27 +46,20 @@ CONFIG_SERIAL_OF_PLATFORM=y
55# CONFIG_HW_RANDOM is not set 46# CONFIG_HW_RANDOM is not set
56# CONFIG_HWMON is not set 47# CONFIG_HWMON is not set
57CONFIG_THERMAL=y 48CONFIG_THERMAL=y
58CONFIG_VIDEO_OUTPUT_CONTROL=m
59CONFIG_USB=y 49CONFIG_USB=y
60CONFIG_USB_MON=y 50CONFIG_USB_MON=y
61CONFIG_USB_OHCI_HCD=y 51CONFIG_USB_OHCI_HCD=y
62CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 52CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
63CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 53CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
64CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
65CONFIG_INOTIFY=y
66CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
67CONFIG_TMPFS=y 56CONFIG_TMPFS=y
68CONFIG_CRAMFS=y 57CONFIG_CRAMFS=y
69CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
70CONFIG_NFS_V3=y
71CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
72CONFIG_MAGIC_SYSRQ=y
73CONFIG_DEBUG_FS=y 60CONFIG_DEBUG_FS=y
74CONFIG_DEBUG_KERNEL=y 61CONFIG_MAGIC_SYSRQ=y
75CONFIG_DETECT_HUNG_TASK=y 62CONFIG_DETECT_HUNG_TASK=y
76# CONFIG_RCU_CPU_STALL_DETECTOR is not set
77CONFIG_SYSCTL_SYSCALL_CHECK=y
78CONFIG_CRYPTO=y
79CONFIG_CRYPTO_CBC=y 63CONFIG_CRYPTO_CBC=y
80CONFIG_CRYPTO_ECB=y 64CONFIG_CRYPTO_ECB=y
81CONFIG_CRYPTO_PCBC=y 65CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig
index 5ff338f6443f..01bd71bac027 100644
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -1,21 +1,17 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 9CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 10CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
14CONFIG_KILAUEA=y 13CONFIG_KILAUEA=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17# CONFIG_WALNUT is not set 14# CONFIG_WALNUT is not set
18CONFIG_SPARSE_IRQ=y
19CONFIG_PCI=y 15CONFIG_PCI=y
20CONFIG_NET=y 16CONFIG_NET=y
21CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -33,8 +29,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
34CONFIG_MTD=y 30CONFIG_MTD=y
35CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
40CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
@@ -42,21 +36,12 @@ CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
44CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
45CONFIG_PROC_DEVICETREE=y
46CONFIG_PM=y
47CONFIG_SUSPEND=y
48CONFIG_PPC4xx_CPM=y
49CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
50CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
51# CONFIG_MISC_DEVICES is not set
52CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
53CONFIG_ETHERNET=y
54CONFIG_NET_VENDOR_IBM=y
55CONFIG_IBM_EMAC=y 42CONFIG_IBM_EMAC=y
56CONFIG_IBM_EMAC_RXB=256 43CONFIG_IBM_EMAC_RXB=256
57CONFIG_IBM_EMAC_TXB=256 44CONFIG_IBM_EMAC_TXB=256
58# CONFIG_NETDEV_1000 is not set
59# CONFIG_NETDEV_10000 is not set
60# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
61# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
62# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -75,20 +60,14 @@ CONFIG_THERMAL=y
75CONFIG_RTC_CLASS=y 60CONFIG_RTC_CLASS=y
76CONFIG_RTC_DRV_DS1307=y 61CONFIG_RTC_DRV_DS1307=y
77CONFIG_EXT2_FS=y 62CONFIG_EXT2_FS=y
78CONFIG_INOTIFY=y
79CONFIG_PROC_KCORE=y 63CONFIG_PROC_KCORE=y
80CONFIG_TMPFS=y 64CONFIG_TMPFS=y
81CONFIG_CRAMFS=y 65CONFIG_CRAMFS=y
82CONFIG_NFS_FS=y 66CONFIG_NFS_FS=y
83CONFIG_NFS_V3=y
84CONFIG_ROOT_NFS=y 67CONFIG_ROOT_NFS=y
85CONFIG_MAGIC_SYSRQ=y
86CONFIG_DEBUG_FS=y 68CONFIG_DEBUG_FS=y
87CONFIG_DEBUG_KERNEL=y 69CONFIG_MAGIC_SYSRQ=y
88CONFIG_DETECT_HUNG_TASK=y 70CONFIG_DETECT_HUNG_TASK=y
89# CONFIG_RCU_CPU_STALL_DETECTOR is not set
90CONFIG_SYSCTL_SYSCALL_CHECK=y
91CONFIG_CRYPTO=y
92CONFIG_CRYPTO_CBC=y 71CONFIG_CRYPTO_CBC=y
93CONFIG_CRYPTO_ECB=y 72CONFIG_CRYPTO_ECB=y
94CONFIG_CRYPTO_PCBC=y 73CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/klondike_defconfig b/arch/powerpc/configs/40x/klondike_defconfig
index c0d228dc73dc..e2036b7c7edb 100644
--- a/arch/powerpc/configs/40x/klondike_defconfig
+++ b/arch/powerpc/configs/40x/klondike_defconfig
@@ -1,5 +1,4 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_SYSFS_DEPRECATED=y 4CONFIG_SYSFS_DEPRECATED=y
@@ -14,10 +13,8 @@ CONFIG_MODULE_UNLOAD=y
14CONFIG_APM8018X=y 13CONFIG_APM8018X=y
15# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 14# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
16CONFIG_MATH_EMULATION=y 15CONFIG_MATH_EMULATION=y
17# CONFIG_MIGRATION is not set
18# CONFIG_SUSPEND is not set 16# CONFIG_SUSPEND is not set
19CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 17CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
20CONFIG_PROC_DEVICETREE=y
21CONFIG_BLK_DEV_RAM=y 18CONFIG_BLK_DEV_RAM=y
22CONFIG_BLK_DEV_RAM_SIZE=35000 19CONFIG_BLK_DEV_RAM_SIZE=35000
23CONFIG_SCSI=y 20CONFIG_SCSI=y
@@ -51,5 +48,4 @@ CONFIG_AVERAGE=y
51CONFIG_MAGIC_SYSRQ=y 48CONFIG_MAGIC_SYSRQ=y
52# CONFIG_SCHED_DEBUG is not set 49# CONFIG_SCHED_DEBUG is not set
53# CONFIG_DEBUG_BUGVERBOSE is not set 50# CONFIG_DEBUG_BUGVERBOSE is not set
54CONFIG_SYSCTL_SYSCALL_CHECK=y
55# CONFIG_FTRACE is not set 51# CONFIG_FTRACE is not set
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig
index 84505e3aa0fb..efd51701fb4d 100644
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_MAKALU=y 11CONFIG_MAKALU=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_NET=y 13CONFIG_NET=y
18CONFIG_PACKET=y 14CONFIG_PACKET=y
19CONFIG_UNIX=y 15CONFIG_UNIX=y
@@ -30,25 +26,17 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 26CONFIG_CONNECTOR=y
31CONFIG_MTD=y 27CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 28CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=m 29CONFIG_MTD_BLOCK=m
36CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
38CONFIG_MTD_CFI_AMDSTD=y 32CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
43# CONFIG_MISC_DEVICES is not set
44CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
45CONFIG_ETHERNET=y
46CONFIG_NET_VENDOR_IBM=y
47CONFIG_IBM_EMAC=y 37CONFIG_IBM_EMAC=y
48CONFIG_IBM_EMAC_RXB=256 38CONFIG_IBM_EMAC_RXB=256
49CONFIG_IBM_EMAC_TXB=256 39CONFIG_IBM_EMAC_TXB=256
50# CONFIG_NETDEV_1000 is not set
51# CONFIG_NETDEV_10000 is not set
52# CONFIG_INPUT is not set 40# CONFIG_INPUT is not set
53# CONFIG_SERIO is not set 41# CONFIG_SERIO is not set
54# CONFIG_VT is not set 42# CONFIG_VT is not set
@@ -62,20 +50,14 @@ CONFIG_SERIAL_OF_PLATFORM=y
62CONFIG_THERMAL=y 50CONFIG_THERMAL=y
63# CONFIG_USB_SUPPORT is not set 51# CONFIG_USB_SUPPORT is not set
64CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
65CONFIG_INOTIFY=y
66CONFIG_PROC_KCORE=y 53CONFIG_PROC_KCORE=y
67CONFIG_TMPFS=y 54CONFIG_TMPFS=y
68CONFIG_CRAMFS=y 55CONFIG_CRAMFS=y
69CONFIG_NFS_FS=y 56CONFIG_NFS_FS=y
70CONFIG_NFS_V3=y
71CONFIG_ROOT_NFS=y 57CONFIG_ROOT_NFS=y
72CONFIG_MAGIC_SYSRQ=y
73CONFIG_DEBUG_FS=y 58CONFIG_DEBUG_FS=y
74CONFIG_DEBUG_KERNEL=y 59CONFIG_MAGIC_SYSRQ=y
75CONFIG_DETECT_HUNG_TASK=y 60CONFIG_DETECT_HUNG_TASK=y
76# CONFIG_RCU_CPU_STALL_DETECTOR is not set
77CONFIG_SYSCTL_SYSCALL_CHECK=y
78CONFIG_CRYPTO=y
79CONFIG_CRYPTO_CBC=y 61CONFIG_CRYPTO_CBC=y
80CONFIG_CRYPTO_ECB=y 62CONFIG_CRYPTO_ECB=y
81CONFIG_CRYPTO_PCBC=y 63CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/obs600_defconfig b/arch/powerpc/configs/40x/obs600_defconfig
index 91c110dad2d6..5ded3dcdf60a 100644
--- a/arch/powerpc/configs/40x/obs600_defconfig
+++ b/arch/powerpc/configs/40x/obs600_defconfig
@@ -1,7 +1,8 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7CONFIG_EXPERT=y 8CONFIG_EXPERT=y
@@ -11,8 +12,6 @@ CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_WALNUT is not set 13# CONFIG_WALNUT is not set
13CONFIG_OBS600=y 14CONFIG_OBS600=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_MATH_EMULATION=y 15CONFIG_MATH_EMULATION=y
17CONFIG_NET=y 16CONFIG_NET=y
18CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -30,8 +29,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
@@ -39,7 +36,6 @@ CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
41CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
42CONFIG_PROC_DEVICETREE=y
43CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
44CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
45CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
@@ -68,13 +64,10 @@ CONFIG_PROC_KCORE=y
68CONFIG_TMPFS=y 64CONFIG_TMPFS=y
69CONFIG_CRAMFS=y 65CONFIG_CRAMFS=y
70CONFIG_NFS_FS=y 66CONFIG_NFS_FS=y
71CONFIG_NFS_V3=y
72CONFIG_ROOT_NFS=y 67CONFIG_ROOT_NFS=y
73CONFIG_MAGIC_SYSRQ=y
74CONFIG_DEBUG_FS=y 68CONFIG_DEBUG_FS=y
69CONFIG_MAGIC_SYSRQ=y
75CONFIG_DETECT_HUNG_TASK=y 70CONFIG_DETECT_HUNG_TASK=y
76CONFIG_SYSCTL_SYSCALL_CHECK=y
77CONFIG_CRYPTO=y
78CONFIG_CRYPTO_CBC=y 71CONFIG_CRYPTO_CBC=y
79CONFIG_CRYPTO_ECB=y 72CONFIG_CRYPTO_ECB=y
80CONFIG_CRYPTO_PCBC=y 73CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig
index 0a81e1f7dd59..bcb0c4d854db 100644
--- a/arch/powerpc/configs/40x/virtex_defconfig
+++ b/arch/powerpc/configs/40x/virtex_defconfig
@@ -1,5 +1,4 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
@@ -7,7 +6,6 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_SLAB=y 9CONFIG_SLAB=y
12CONFIG_MODULES=y 10CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -35,16 +33,11 @@ CONFIG_IP_NF_IPTABLES=m
35CONFIG_IP_NF_FILTER=m 33CONFIG_IP_NF_FILTER=m
36CONFIG_IP_NF_MANGLE=m 34CONFIG_IP_NF_MANGLE=m
37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
38CONFIG_PROC_DEVICETREE=y
39CONFIG_BLK_DEV_LOOP=y 36CONFIG_BLK_DEV_LOOP=y
40CONFIG_BLK_DEV_RAM=y 37CONFIG_BLK_DEV_RAM=y
41CONFIG_BLK_DEV_RAM_SIZE=8192 38CONFIG_BLK_DEV_RAM_SIZE=8192
42CONFIG_XILINX_SYSACE=y 39CONFIG_XILINX_SYSACE=y
43CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
44CONFIG_NET_ETHERNET=y
45CONFIG_MII=y
46# CONFIG_NETDEV_10000 is not set
47# CONFIG_SERIO_I8042 is not set
48# CONFIG_SERIO_SERPORT is not set 41# CONFIG_SERIO_SERPORT is not set
49CONFIG_SERIO_XILINX_XPS_PS2=y 42CONFIG_SERIO_XILINX_XPS_PS2=y
50CONFIG_SERIAL_8250=y 43CONFIG_SERIAL_8250=y
@@ -60,15 +53,9 @@ CONFIG_GPIO_XILINX=y
60CONFIG_FB=y 53CONFIG_FB=y
61CONFIG_FB_XILINX=y 54CONFIG_FB_XILINX=y
62CONFIG_FRAMEBUFFER_CONSOLE=y 55CONFIG_FRAMEBUFFER_CONSOLE=y
63CONFIG_FONTS=y
64CONFIG_FONT_8x8=y
65CONFIG_FONT_8x16=y
66CONFIG_LOGO=y 56CONFIG_LOGO=y
67# CONFIG_HID_SUPPORT is not set
68# CONFIG_USB_SUPPORT is not set 57# CONFIG_USB_SUPPORT is not set
69CONFIG_EXT2_FS=y 58CONFIG_EXT2_FS=y
70CONFIG_INOTIFY=y
71CONFIG_AUTOFS_FS=y
72CONFIG_AUTOFS4_FS=y 59CONFIG_AUTOFS4_FS=y
73CONFIG_MSDOS_FS=y 60CONFIG_MSDOS_FS=y
74CONFIG_VFAT_FS=y 61CONFIG_VFAT_FS=y
@@ -76,16 +63,16 @@ CONFIG_TMPFS=y
76CONFIG_CRAMFS=y 63CONFIG_CRAMFS=y
77CONFIG_ROMFS_FS=y 64CONFIG_ROMFS_FS=y
78CONFIG_NFS_FS=y 65CONFIG_NFS_FS=y
79CONFIG_NFS_V3=y
80CONFIG_ROOT_NFS=y 66CONFIG_ROOT_NFS=y
81CONFIG_NLS_CODEPAGE_437=y 67CONFIG_NLS_CODEPAGE_437=y
82CONFIG_NLS_ASCII=m 68CONFIG_NLS_ASCII=m
83CONFIG_NLS_ISO8859_1=m 69CONFIG_NLS_ISO8859_1=m
84CONFIG_NLS_UTF8=m 70CONFIG_NLS_UTF8=m
85CONFIG_CRC_CCITT=y 71CONFIG_CRC_CCITT=y
72CONFIG_FONTS=y
73CONFIG_FONT_8x8=y
74CONFIG_FONT_8x16=y
86CONFIG_PRINTK_TIME=y 75CONFIG_PRINTK_TIME=y
87CONFIG_DEBUG_KERNEL=y
88CONFIG_DEBUG_INFO=y 76CONFIG_DEBUG_INFO=y
89# CONFIG_RCU_CPU_STALL_DETECTOR is not set 77CONFIG_DEBUG_KERNEL=y
90CONFIG_SYSCTL_SYSCALL_CHECK=y
91# CONFIG_CRYPTO_ANSI_CPRNG is not set 78# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig
index 0a19f4386ee9..37c838f26e53 100644
--- a/arch/powerpc/configs/40x/walnut_defconfig
+++ b/arch/powerpc/configs/40x/walnut_defconfig
@@ -1,17 +1,13 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_SPARSE_IRQ=y
15CONFIG_NET=y 11CONFIG_NET=y
16CONFIG_PACKET=y 12CONFIG_PACKET=y
17CONFIG_UNIX=y 13CONFIG_UNIX=y
@@ -28,19 +24,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28CONFIG_CONNECTOR=y 24CONFIG_CONNECTOR=y
29CONFIG_MTD=y 25CONFIG_MTD=y
30CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
31CONFIG_MTD_OF_PARTS=y
32CONFIG_MTD_CHAR=y
33CONFIG_MTD_BLOCK=m 27CONFIG_MTD_BLOCK=m
34CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
35CONFIG_MTD_JEDECPROBE=y 29CONFIG_MTD_JEDECPROBE=y
36CONFIG_MTD_CFI_AMDSTD=y 30CONFIG_MTD_CFI_AMDSTD=y
37CONFIG_MTD_PHYSMAP_OF=y 31CONFIG_MTD_PHYSMAP_OF=y
38CONFIG_PROC_DEVICETREE=y
39CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=35000 33CONFIG_BLK_DEV_RAM_SIZE=35000
41CONFIG_NETDEVICES=y 34CONFIG_NETDEVICES=y
42CONFIG_ETHERNET=y
43CONFIG_NET_VENDOR_IBM=y
44CONFIG_IBM_EMAC=y 35CONFIG_IBM_EMAC=y
45# CONFIG_INPUT is not set 36# CONFIG_INPUT is not set
46# CONFIG_SERIO is not set 37# CONFIG_SERIO is not set
@@ -53,22 +44,15 @@ CONFIG_SERIAL_OF_PLATFORM=y
53# CONFIG_HW_RANDOM is not set 44# CONFIG_HW_RANDOM is not set
54# CONFIG_HWMON is not set 45# CONFIG_HWMON is not set
55CONFIG_THERMAL=y 46CONFIG_THERMAL=y
56CONFIG_VIDEO_OUTPUT_CONTROL=m
57CONFIG_EXT2_FS=y 47CONFIG_EXT2_FS=y
58CONFIG_INOTIFY=y
59CONFIG_PROC_KCORE=y 48CONFIG_PROC_KCORE=y
60CONFIG_TMPFS=y 49CONFIG_TMPFS=y
61CONFIG_CRAMFS=y 50CONFIG_CRAMFS=y
62CONFIG_NFS_FS=y 51CONFIG_NFS_FS=y
63CONFIG_NFS_V3=y
64CONFIG_ROOT_NFS=y 52CONFIG_ROOT_NFS=y
65CONFIG_MAGIC_SYSRQ=y
66CONFIG_DEBUG_FS=y 53CONFIG_DEBUG_FS=y
67CONFIG_DEBUG_KERNEL=y 54CONFIG_MAGIC_SYSRQ=y
68CONFIG_DETECT_HUNG_TASK=y 55CONFIG_DETECT_HUNG_TASK=y
69# CONFIG_RCU_CPU_STALL_DETECTOR is not set
70CONFIG_SYSCTL_SYSCALL_CHECK=y
71CONFIG_CRYPTO=y
72CONFIG_CRYPTO_CBC=y 56CONFIG_CRYPTO_CBC=y
73CONFIG_CRYPTO_ECB=y 57CONFIG_CRYPTO_ECB=y
74CONFIG_CRYPTO_PCBC=y 58CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/akebono_defconfig b/arch/powerpc/configs/44x/akebono_defconfig
index 7e2530cd9d30..ea4ef02a0578 100644
--- a/arch/powerpc/configs/44x/akebono_defconfig
+++ b/arch/powerpc/configs/44x/akebono_defconfig
@@ -4,9 +4,6 @@ CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
7CONFIG_RD_BZIP2=y
8CONFIG_RD_LZMA=y
9CONFIG_RD_XZ=y
10CONFIG_EXPERT=y 7CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
12# CONFIG_SLUB_CPU_PARTIAL is not set 9# CONFIG_SLUB_CPU_PARTIAL is not set
@@ -15,7 +12,6 @@ CONFIG_OPROFILE=y
15CONFIG_MODULES=y 12CONFIG_MODULES=y
16CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
17# CONFIG_BLK_DEV_BSG is not set 14# CONFIG_BLK_DEV_BSG is not set
18# CONFIG_POWERNV_MSI is not set
19CONFIG_PPC_47x=y 15CONFIG_PPC_47x=y
20# CONFIG_EBONY is not set 16# CONFIG_EBONY is not set
21CONFIG_AKEBONO=y 17CONFIG_AKEBONO=y
@@ -26,7 +22,6 @@ CONFIG_IRQ_ALL_CPUS=y
26CONFIG_CMDLINE_BOOL=y 22CONFIG_CMDLINE_BOOL=y
27CONFIG_CMDLINE="" 23CONFIG_CMDLINE=""
28# CONFIG_SUSPEND is not set 24# CONFIG_SUSPEND is not set
29CONFIG_PCI_MSI=y
30CONFIG_NET=y 25CONFIG_NET=y
31CONFIG_PACKET=y 26CONFIG_PACKET=y
32CONFIG_UNIX=y 27CONFIG_UNIX=y
@@ -48,7 +43,6 @@ CONFIG_MTD_BLOCK=y
48CONFIG_MTD_JEDECPROBE=y 43CONFIG_MTD_JEDECPROBE=y
49CONFIG_MTD_CFI_AMDSTD=y 44CONFIG_MTD_CFI_AMDSTD=y
50CONFIG_MTD_PHYSMAP_OF=y 45CONFIG_MTD_PHYSMAP_OF=y
51CONFIG_PROC_DEVICETREE=y
52CONFIG_BLK_DEV_RAM=y 46CONFIG_BLK_DEV_RAM=y
53CONFIG_BLK_DEV_RAM_SIZE=35000 47CONFIG_BLK_DEV_RAM_SIZE=35000
54# CONFIG_SCSI_PROC_FS is not set 48# CONFIG_SCSI_PROC_FS is not set
@@ -62,7 +56,6 @@ CONFIG_BLK_DEV_SD=y
62# CONFIG_NET_VENDOR_AMD is not set 56# CONFIG_NET_VENDOR_AMD is not set
63# CONFIG_NET_VENDOR_ARC is not set 57# CONFIG_NET_VENDOR_ARC is not set
64# CONFIG_NET_VENDOR_ATHEROS is not set 58# CONFIG_NET_VENDOR_ATHEROS is not set
65# CONFIG_NET_CADENCE is not set
66# CONFIG_NET_VENDOR_BROADCOM is not set 59# CONFIG_NET_VENDOR_BROADCOM is not set
67# CONFIG_NET_VENDOR_BROCADE is not set 60# CONFIG_NET_VENDOR_BROCADE is not set
68# CONFIG_NET_VENDOR_CHELSIO is not set 61# CONFIG_NET_VENDOR_CHELSIO is not set
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 44355c53cd30..95494209c124 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 12# CONFIG_EBONY is not set
13CONFIG_ARCHES=y 13CONFIG_ARCHES=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -32,24 +29,16 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
33CONFIG_MTD=y 30CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
39CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 37CONFIG_BLK_DEV_RAM_SIZE=35000
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
46CONFIG_ETHERNET=y
47CONFIG_NET_VENDOR_IBM=y
48CONFIG_IBM_EMAC=y 39CONFIG_IBM_EMAC=y
49CONFIG_IBM_EMAC_RXB=256 40CONFIG_IBM_EMAC_RXB=256
50CONFIG_IBM_EMAC_TXB=256 41CONFIG_IBM_EMAC_TXB=256
51# CONFIG_NETDEV_1000 is not set
52# CONFIG_NETDEV_10000 is not set
53# CONFIG_INPUT is not set 42# CONFIG_INPUT is not set
54# CONFIG_SERIO is not set 43# CONFIG_SERIO is not set
55# CONFIG_VT is not set 44# CONFIG_VT is not set
@@ -64,21 +53,15 @@ CONFIG_I2C=y
64CONFIG_I2C_CHARDEV=y 53CONFIG_I2C_CHARDEV=y
65CONFIG_I2C_IBM_IIC=y 54CONFIG_I2C_IBM_IIC=y
66CONFIG_SENSORS_AD7414=y 55CONFIG_SENSORS_AD7414=y
67CONFIG_VIDEO_OUTPUT_CONTROL=m
68# CONFIG_USB_SUPPORT is not set 56# CONFIG_USB_SUPPORT is not set
69CONFIG_EXT2_FS=y 57CONFIG_EXT2_FS=y
70CONFIG_INOTIFY=y
71CONFIG_PROC_KCORE=y 58CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 59CONFIG_TMPFS=y
73CONFIG_JFFS2_FS=y 60CONFIG_JFFS2_FS=y
74CONFIG_CRAMFS=y 61CONFIG_CRAMFS=y
75CONFIG_NFS_FS=y 62CONFIG_NFS_FS=y
76CONFIG_NFS_V3=y
77CONFIG_ROOT_NFS=y 63CONFIG_ROOT_NFS=y
78CONFIG_MAGIC_SYSRQ=y
79CONFIG_DEBUG_FS=y 64CONFIG_DEBUG_FS=y
80CONFIG_DEBUG_KERNEL=y 65CONFIG_MAGIC_SYSRQ=y
81CONFIG_DETECT_HUNG_TASK=y 66CONFIG_DETECT_HUNG_TASK=y
82# CONFIG_DEBUG_BUGVERBOSE is not set 67# CONFIG_DEBUG_BUGVERBOSE is not set
83# CONFIG_RCU_CPU_STALL_DETECTOR is not set
84CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index cef7d62560c4..a046f08413fd 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -1,17 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
12CONFIG_BAMBOO=y 10CONFIG_BAMBOO=y
13# CONFIG_EBONY is not set 11# CONFIG_EBONY is not set
14CONFIG_SPARSE_IRQ=y
15CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
16CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
17CONFIG_NET=y 14CONFIG_NET=y
@@ -28,12 +25,9 @@ CONFIG_IP_PNP_BOOTP=y
28# CONFIG_IPV6 is not set 25# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
31CONFIG_PROC_DEVICETREE=y
32CONFIG_BLK_DEV_RAM=y 28CONFIG_BLK_DEV_RAM=y
33CONFIG_BLK_DEV_RAM_SIZE=35000 29CONFIG_BLK_DEV_RAM_SIZE=35000
34CONFIG_NETDEVICES=y 30CONFIG_NETDEVICES=y
35CONFIG_ETHERNET=y
36CONFIG_NET_VENDOR_IBM=y
37CONFIG_IBM_EMAC=y 31CONFIG_IBM_EMAC=y
38# CONFIG_INPUT is not set 32# CONFIG_INPUT is not set
39# CONFIG_SERIO is not set 33# CONFIG_SERIO is not set
@@ -47,23 +41,16 @@ CONFIG_SERIAL_OF_PLATFORM=y
47# CONFIG_HW_RANDOM is not set 41# CONFIG_HW_RANDOM is not set
48# CONFIG_HWMON is not set 42# CONFIG_HWMON is not set
49CONFIG_THERMAL=y 43CONFIG_THERMAL=y
50CONFIG_VIDEO_OUTPUT_CONTROL=m
51CONFIG_EXT2_FS=y 44CONFIG_EXT2_FS=y
52CONFIG_INOTIFY=y
53CONFIG_PROC_KCORE=y 45CONFIG_PROC_KCORE=y
54CONFIG_TMPFS=y 46CONFIG_TMPFS=y
55CONFIG_CRAMFS=y 47CONFIG_CRAMFS=y
56CONFIG_NFS_FS=y 48CONFIG_NFS_FS=y
57CONFIG_NFS_V3=y
58CONFIG_ROOT_NFS=y 49CONFIG_ROOT_NFS=y
59CONFIG_MAGIC_SYSRQ=y
60CONFIG_DEBUG_FS=y 50CONFIG_DEBUG_FS=y
61CONFIG_DEBUG_KERNEL=y 51CONFIG_MAGIC_SYSRQ=y
62CONFIG_DETECT_HUNG_TASK=y 52CONFIG_DETECT_HUNG_TASK=y
63# CONFIG_DEBUG_BUGVERBOSE is not set 53# CONFIG_DEBUG_BUGVERBOSE is not set
64# CONFIG_RCU_CPU_STALL_DETECTOR is not set
65CONFIG_SYSCTL_SYSCALL_CHECK=y
66CONFIG_CRYPTO=y
67CONFIG_CRYPTO_CBC=y 54CONFIG_CRYPTO_CBC=y
68CONFIG_CRYPTO_ECB=y 55CONFIG_CRYPTO_ECB=y
69CONFIG_CRYPTO_PCBC=y 56CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/bluestone_defconfig b/arch/powerpc/configs/44x/bluestone_defconfig
index ca7f1f32f2b2..a326b773ac05 100644
--- a/arch/powerpc/configs/44x/bluestone_defconfig
+++ b/arch/powerpc/configs/44x/bluestone_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7CONFIG_EXPERT=y 8CONFIG_EXPERT=y
8# CONFIG_VM_EVENT_COUNTERS is not set
9# CONFIG_PCI_QUIRKS is not set 9# CONFIG_PCI_QUIRKS is not set
10# CONFIG_VM_EVENT_COUNTERS is not set
10# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
11CONFIG_BLUESTONE=y 12CONFIG_BLUESTONE=y
12# CONFIG_EBONY is not set 13# CONFIG_EBONY is not set
13# CONFIG_KVM_GUEST is not set
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -27,18 +24,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
27CONFIG_CONNECTOR=y 24CONFIG_CONNECTOR=y
28CONFIG_MTD=y 25CONFIG_MTD=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_OF_PARTS=y
31CONFIG_MTD_CHAR=y
32CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
33CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
34CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
35CONFIG_MTD_PHYSMAP_OF=y 30CONFIG_MTD_PHYSMAP_OF=y
36CONFIG_PROC_DEVICETREE=y
37CONFIG_BLK_DEV_RAM=y 31CONFIG_BLK_DEV_RAM=y
38CONFIG_BLK_DEV_RAM_SIZE=35000 32CONFIG_BLK_DEV_RAM_SIZE=35000
39CONFIG_NETDEVICES=y 33CONFIG_NETDEVICES=y
40CONFIG_ETHERNET=y
41CONFIG_NET_VENDOR_IBM=y
42CONFIG_IBM_EMAC=y 34CONFIG_IBM_EMAC=y
43CONFIG_IBM_EMAC_RXB=256 35CONFIG_IBM_EMAC_RXB=256
44CONFIG_IBM_EMAC_TXB=256 36CONFIG_IBM_EMAC_TXB=256
@@ -53,7 +45,6 @@ CONFIG_I2C=y
53CONFIG_I2C_CHARDEV=y 45CONFIG_I2C_CHARDEV=y
54CONFIG_I2C_IBM_IIC=y 46CONFIG_I2C_IBM_IIC=y
55CONFIG_SENSORS_AD7414=y 47CONFIG_SENSORS_AD7414=y
56# CONFIG_HID_SUPPORT is not set
57# CONFIG_USB_SUPPORT is not set 48# CONFIG_USB_SUPPORT is not set
58CONFIG_RTC_CLASS=y 49CONFIG_RTC_CLASS=y
59CONFIG_RTC_DRV_M41T80=y 50CONFIG_RTC_DRV_M41T80=y
@@ -63,6 +54,5 @@ CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 54CONFIG_TMPFS=y
64CONFIG_CRAMFS=y 55CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 56CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 57CONFIG_ROOT_NFS=y
68CONFIG_NLS=y 58CONFIG_NLS=y
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index 9919a91add12..d939e71fff7d 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 12# CONFIG_EBONY is not set
13CONFIG_CANYONLANDS=y 13CONFIG_CANYONLANDS=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -32,29 +29,18 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
33CONFIG_MTD=y 30CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
39CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_MTD_NAND=y 36CONFIG_MTD_NAND=y
42CONFIG_MTD_NAND_NDFC=y 37CONFIG_MTD_NAND_NDFC=y
43CONFIG_PROC_DEVICETREE=y
44CONFIG_PM=y
45CONFIG_SUSPEND=y
46CONFIG_PPC4xx_CPM=y
47CONFIG_BLK_DEV_RAM=y 38CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=35000 39CONFIG_BLK_DEV_RAM_SIZE=35000
49# CONFIG_MISC_DEVICES is not set
50CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
51CONFIG_ETHERNET=y
52CONFIG_NET_VENDOR_IBM=y
53CONFIG_IBM_EMAC=y 41CONFIG_IBM_EMAC=y
54CONFIG_IBM_EMAC_RXB=256 42CONFIG_IBM_EMAC_RXB=256
55CONFIG_IBM_EMAC_TXB=256 43CONFIG_IBM_EMAC_TXB=256
56# CONFIG_NETDEV_1000 is not set
57# CONFIG_NETDEV_10000 is not set
58# CONFIG_INPUT is not set 44# CONFIG_INPUT is not set
59# CONFIG_SERIO is not set 45# CONFIG_SERIO is not set
60# CONFIG_VT is not set 46# CONFIG_VT is not set
@@ -76,21 +62,15 @@ CONFIG_USB_EHCI_HCD=m
76CONFIG_USB_OHCI_HCD=y 62CONFIG_USB_OHCI_HCD=y
77CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 63CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
78CONFIG_USB_OHCI_HCD_PPC_OF_LE=y 64CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
79CONFIG_USB_LIBUSUAL=y
80CONFIG_RTC_CLASS=y 65CONFIG_RTC_CLASS=y
81CONFIG_RTC_DRV_M41T80=y 66CONFIG_RTC_DRV_M41T80=y
82CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
83CONFIG_INOTIFY=y
84CONFIG_PROC_KCORE=y 68CONFIG_PROC_KCORE=y
85CONFIG_TMPFS=y 69CONFIG_TMPFS=y
86CONFIG_CRAMFS=y 70CONFIG_CRAMFS=y
87CONFIG_NFS_FS=y 71CONFIG_NFS_FS=y
88CONFIG_NFS_V3=y
89CONFIG_ROOT_NFS=y 72CONFIG_ROOT_NFS=y
90CONFIG_MAGIC_SYSRQ=y
91CONFIG_DEBUG_FS=y 73CONFIG_DEBUG_FS=y
92CONFIG_DEBUG_KERNEL=y 74CONFIG_MAGIC_SYSRQ=y
93CONFIG_DETECT_HUNG_TASK=y 75CONFIG_DETECT_HUNG_TASK=y
94# CONFIG_DEBUG_BUGVERBOSE is not set 76# CONFIG_DEBUG_BUGVERBOSE is not set
95# CONFIG_RCU_CPU_STALL_DETECTOR is not set
96CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig
index 47de68261443..5aa312a158dd 100644
--- a/arch/powerpc/configs/44x/currituck_defconfig
+++ b/arch/powerpc/configs/44x/currituck_defconfig
@@ -1,9 +1,7 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_SPARSE_IRQ=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
@@ -39,12 +37,10 @@ CONFIG_DEVTMPFS=y
39CONFIG_DEVTMPFS_MOUNT=y 37CONFIG_DEVTMPFS_MOUNT=y
40CONFIG_CONNECTOR=y 38CONFIG_CONNECTOR=y
41CONFIG_MTD=y 39CONFIG_MTD=y
42CONFIG_MTD_CHAR=y
43CONFIG_MTD_BLOCK=y 40CONFIG_MTD_BLOCK=y
44CONFIG_MTD_JEDECPROBE=y 41CONFIG_MTD_JEDECPROBE=y
45CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
46CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
47CONFIG_PROC_DEVICETREE=y
48CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_SIZE=35000 45CONFIG_BLK_DEV_RAM_SIZE=35000
50# CONFIG_SCSI_PROC_FS is not set 46# CONFIG_SCSI_PROC_FS is not set
@@ -56,7 +52,6 @@ CONFIG_SATA_SIL24=y
56# CONFIG_ATA_SFF is not set 52# CONFIG_ATA_SFF is not set
57CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
58CONFIG_E1000E=y 54CONFIG_E1000E=y
59# CONFIG_NETDEV_10000 is not set
60# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
61# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
62# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -84,22 +79,18 @@ CONFIG_PROC_KCORE=y
84CONFIG_TMPFS=y 79CONFIG_TMPFS=y
85CONFIG_CRAMFS=y 80CONFIG_CRAMFS=y
86CONFIG_NFS_FS=y 81CONFIG_NFS_FS=y
87CONFIG_NFS_V3=y
88CONFIG_NFS_V3_ACL=y 82CONFIG_NFS_V3_ACL=y
89CONFIG_NFS_V4=y 83CONFIG_NFS_V4=y
90CONFIG_NLS_DEFAULT="n" 84CONFIG_NLS_DEFAULT="n"
91CONFIG_MAGIC_SYSRQ=y 85CONFIG_DEBUG_INFO=y
92CONFIG_DEBUG_FS=y 86CONFIG_DEBUG_FS=y
93CONFIG_DEBUG_KERNEL=y 87CONFIG_MAGIC_SYSRQ=y
94CONFIG_DETECT_HUNG_TASK=y 88CONFIG_DETECT_HUNG_TASK=y
95CONFIG_DEBUG_INFO=y
96CONFIG_SYSCTL_SYSCALL_CHECK=y
97CONFIG_XMON=y 89CONFIG_XMON=y
98CONFIG_XMON_DEFAULT=y 90CONFIG_XMON_DEFAULT=y
99CONFIG_PPC_EARLY_DEBUG=y 91CONFIG_PPC_EARLY_DEBUG=y
100CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x10000000 92CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x10000000
101CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x200 93CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x200
102CONFIG_CRYPTO=y
103CONFIG_CRYPTO_CBC=y 94CONFIG_CRYPTO_CBC=y
104CONFIG_CRYPTO_ECB=y 95CONFIG_CRYPTO_ECB=y
105CONFIG_CRYPTO_PCBC=y 96CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index 31b58b0d52e2..5909e016c37d 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -1,18 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_MATH_EMULATION=y 11CONFIG_MATH_EMULATION=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_NET=y 12CONFIG_NET=y
17CONFIG_PACKET=y 13CONFIG_PACKET=y
18CONFIG_UNIX=y 14CONFIG_UNIX=y
@@ -28,19 +24,14 @@ CONFIG_IP_PNP_BOOTP=y
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 24CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29CONFIG_CONNECTOR=y 25CONFIG_CONNECTOR=y
30CONFIG_MTD=y 26CONFIG_MTD=y
31CONFIG_MTD_OF_PARTS=y
32CONFIG_MTD_CHAR=y
33CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
34CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
35CONFIG_MTD_JEDECPROBE=y 29CONFIG_MTD_JEDECPROBE=y
36CONFIG_MTD_CFI_AMDSTD=y 30CONFIG_MTD_CFI_AMDSTD=y
37CONFIG_MTD_PHYSMAP_OF=y 31CONFIG_MTD_PHYSMAP_OF=y
38CONFIG_PROC_DEVICETREE=y
39CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=35000 33CONFIG_BLK_DEV_RAM_SIZE=35000
41CONFIG_NETDEVICES=y 34CONFIG_NETDEVICES=y
42CONFIG_ETHERNET=y
43CONFIG_NET_VENDOR_IBM=y
44CONFIG_IBM_EMAC=y 35CONFIG_IBM_EMAC=y
45# CONFIG_INPUT is not set 36# CONFIG_INPUT is not set
46# CONFIG_SERIO is not set 37# CONFIG_SERIO is not set
@@ -55,21 +46,15 @@ CONFIG_SERIAL_OF_PLATFORM=y
55# CONFIG_HWMON is not set 46# CONFIG_HWMON is not set
56CONFIG_THERMAL=y 47CONFIG_THERMAL=y
57CONFIG_EXT2_FS=y 48CONFIG_EXT2_FS=y
58CONFIG_INOTIFY=y
59CONFIG_PROC_KCORE=y 49CONFIG_PROC_KCORE=y
60CONFIG_TMPFS=y 50CONFIG_TMPFS=y
61CONFIG_JFFS2_FS=y 51CONFIG_JFFS2_FS=y
62CONFIG_CRAMFS=y 52CONFIG_CRAMFS=y
63CONFIG_NFS_FS=y 53CONFIG_NFS_FS=y
64CONFIG_NFS_V3=y
65CONFIG_ROOT_NFS=y 54CONFIG_ROOT_NFS=y
66CONFIG_MAGIC_SYSRQ=y
67CONFIG_DEBUG_FS=y 55CONFIG_DEBUG_FS=y
68CONFIG_DEBUG_KERNEL=y 56CONFIG_MAGIC_SYSRQ=y
69CONFIG_DETECT_HUNG_TASK=y 57CONFIG_DETECT_HUNG_TASK=y
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72CONFIG_CRYPTO=y
73CONFIG_CRYPTO_CBC=y 58CONFIG_CRYPTO_CBC=y
74CONFIG_CRYPTO_ECB=y 59CONFIG_CRYPTO_ECB=y
75CONFIG_CRYPTO_PCBC=y 60CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig
index faccaf65f394..57499d25c877 100644
--- a/arch/powerpc/configs/44x/eiger_defconfig
+++ b/arch/powerpc/configs/44x/eiger_defconfig
@@ -1,19 +1,15 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 11# CONFIG_EBONY is not set
13CONFIG_EIGER=y 12CONFIG_EIGER=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 13CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 14CONFIG_CMDLINE=""
19CONFIG_PCIEPORTBUS=y 15CONFIG_PCIEPORTBUS=y
@@ -33,20 +29,15 @@ CONFIG_IP_PNP_BOOTP=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 30CONFIG_CONNECTOR=y
35CONFIG_MTD=y 31CONFIG_MTD=y
36CONFIG_MTD_CONCAT=y
37CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_OF_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 34CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 35CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
45CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
46CONFIG_PROC_DEVICETREE=y
47CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
49# CONFIG_MISC_DEVICES is not set
50CONFIG_SCSI=y 41CONFIG_SCSI=y
51CONFIG_BLK_DEV_SD=y 42CONFIG_BLK_DEV_SD=y
52CONFIG_CHR_DEV_SG=y 43CONFIG_CHR_DEV_SG=y
@@ -54,13 +45,10 @@ CONFIG_FUSION=y
54CONFIG_FUSION_SAS=y 45CONFIG_FUSION_SAS=y
55CONFIG_I2O=y 46CONFIG_I2O=y
56CONFIG_NETDEVICES=y 47CONFIG_NETDEVICES=y
57CONFIG_ETHERNET=y
58CONFIG_NET_VENDOR_IBM=y
59CONFIG_IBM_EMAC=y 48CONFIG_IBM_EMAC=y
60CONFIG_IBM_EMAC_RXB=256 49CONFIG_IBM_EMAC_RXB=256
61CONFIG_IBM_EMAC_TXB=256 50CONFIG_IBM_EMAC_TXB=256
62CONFIG_E1000E=y 51CONFIG_E1000E=y
63# CONFIG_NETDEV_10000 is not set
64# CONFIG_INPUT is not set 52# CONFIG_INPUT is not set
65# CONFIG_SERIO is not set 53# CONFIG_SERIO is not set
66# CONFIG_VT is not set 54# CONFIG_VT is not set
@@ -80,25 +68,18 @@ CONFIG_I2C_DEBUG_CORE=y
80CONFIG_I2C_DEBUG_ALGO=y 68CONFIG_I2C_DEBUG_ALGO=y
81CONFIG_I2C_DEBUG_BUS=y 69CONFIG_I2C_DEBUG_BUS=y
82# CONFIG_HWMON is not set 70# CONFIG_HWMON is not set
83CONFIG_VIDEO_OUTPUT_CONTROL=m
84# CONFIG_USB_SUPPORT is not set 71# CONFIG_USB_SUPPORT is not set
85CONFIG_DMADEVICES=y 72CONFIG_DMADEVICES=y
86CONFIG_EXT2_FS=y 73CONFIG_EXT2_FS=y
87CONFIG_INOTIFY=y
88CONFIG_PROC_KCORE=y 74CONFIG_PROC_KCORE=y
89CONFIG_TMPFS=y 75CONFIG_TMPFS=y
90CONFIG_CRAMFS=y 76CONFIG_CRAMFS=y
91CONFIG_NFS_FS=y 77CONFIG_NFS_FS=y
92CONFIG_NFS_V3=y
93CONFIG_ROOT_NFS=y 78CONFIG_ROOT_NFS=y
94CONFIG_MAGIC_SYSRQ=y
95CONFIG_DEBUG_FS=y 79CONFIG_DEBUG_FS=y
96CONFIG_DEBUG_KERNEL=y 80CONFIG_MAGIC_SYSRQ=y
97CONFIG_DETECT_HUNG_TASK=y 81CONFIG_DETECT_HUNG_TASK=y
98# CONFIG_DEBUG_BUGVERBOSE is not set 82# CONFIG_DEBUG_BUGVERBOSE is not set
99# CONFIG_RCU_CPU_STALL_DETECTOR is not set
100CONFIG_SYSCTL_SYSCALL_CHECK=y
101CONFIG_CRYPTO=y
102CONFIG_CRYPTO_CRYPTD=y 83CONFIG_CRYPTO_CRYPTD=y
103CONFIG_CRYPTO_AUTHENC=y 84CONFIG_CRYPTO_AUTHENC=y
104CONFIG_CRYPTO_CCM=y 85CONFIG_CRYPTO_CCM=y
@@ -116,7 +97,6 @@ CONFIG_CRYPTO_MD5=y
116CONFIG_CRYPTO_SHA1=y 97CONFIG_CRYPTO_SHA1=y
117CONFIG_CRYPTO_SHA256=y 98CONFIG_CRYPTO_SHA256=y
118CONFIG_CRYPTO_SHA512=y 99CONFIG_CRYPTO_SHA512=y
119CONFIG_CRYPTO_AES=y
120CONFIG_CRYPTO_ARC4=y 100CONFIG_CRYPTO_ARC4=y
121CONFIG_CRYPTO_BLOWFISH=y 101CONFIG_CRYPTO_BLOWFISH=y
122CONFIG_CRYPTO_DES=y 102CONFIG_CRYPTO_DES=y
diff --git a/arch/powerpc/configs/44x/icon_defconfig b/arch/powerpc/configs/44x/icon_defconfig
index 05782c145141..5d52185d8f5a 100644
--- a/arch/powerpc/configs/44x/icon_defconfig
+++ b/arch/powerpc/configs/44x/icon_defconfig
@@ -1,19 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_SYSFS_DEPRECATED_V2=y
7CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 6CONFIG_EXPERT=y
10CONFIG_MODULES=y 7CONFIG_MODULES=y
11CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
12# CONFIG_BLK_DEV_BSG is not set
13# CONFIG_EBONY is not set 9# CONFIG_EBONY is not set
14CONFIG_ICON=y 10CONFIG_ICON=y
15CONFIG_HIGHMEM=y 11CONFIG_HIGHMEM=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
19CONFIG_PCIEPORTBUS=y 14CONFIG_PCIEPORTBUS=y
@@ -34,17 +29,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
35CONFIG_MTD=y 30CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
40CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_PROC_DEVICETREE=y
44CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
45CONFIG_BLK_DEV_RAM_SIZE=35000 37CONFIG_BLK_DEV_RAM_SIZE=35000
46CONFIG_XILINX_SYSACE=y 38CONFIG_XILINX_SYSACE=y
47# CONFIG_MISC_DEVICES is not set
48CONFIG_SCSI=y 39CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 40CONFIG_BLK_DEV_SD=y
50CONFIG_SCSI_CONSTANTS=y 41CONFIG_SCSI_CONSTANTS=y
@@ -55,11 +46,7 @@ CONFIG_FUSION_SAS=y
55CONFIG_FUSION_CTL=y 46CONFIG_FUSION_CTL=y
56CONFIG_FUSION_LOGGING=y 47CONFIG_FUSION_LOGGING=y
57CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
58CONFIG_ETHERNET=y
59CONFIG_NET_VENDOR_IBM=y
60CONFIG_IBM_EMAC=y 49CONFIG_IBM_EMAC=y
61# CONFIG_NETDEV_1000 is not set
62# CONFIG_NETDEV_10000 is not set
63# CONFIG_WLAN is not set 50# CONFIG_WLAN is not set
64CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 51CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
65CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 52CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
@@ -79,7 +66,6 @@ CONFIG_I2C_CHARDEV=y
79CONFIG_I2C_IBM_IIC=y 66CONFIG_I2C_IBM_IIC=y
80# CONFIG_HWMON is not set 67# CONFIG_HWMON is not set
81CONFIG_MFD_SM501=y 68CONFIG_MFD_SM501=y
82CONFIG_VIDEO_OUTPUT_CONTROL=m
83CONFIG_FB=y 69CONFIG_FB=y
84CONFIG_FB_SM501=y 70CONFIG_FB_SM501=y
85CONFIG_FRAMEBUFFER_CONSOLE=y 71CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -92,25 +78,19 @@ CONFIG_RTC_DRV_DS1307=y
92CONFIG_EXT2_FS=y 78CONFIG_EXT2_FS=y
93CONFIG_EXT3_FS=y 79CONFIG_EXT3_FS=y
94# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 80# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
95CONFIG_INOTIFY=y
96CONFIG_VFAT_FS=y 81CONFIG_VFAT_FS=y
97CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
98CONFIG_TMPFS=y 83CONFIG_TMPFS=y
99CONFIG_CRAMFS=y 84CONFIG_CRAMFS=y
100CONFIG_NFS_FS=y 85CONFIG_NFS_FS=y
101CONFIG_NFS_V3=y
102CONFIG_ROOT_NFS=y 86CONFIG_ROOT_NFS=y
103CONFIG_NLS_CODEPAGE_437=y 87CONFIG_NLS_CODEPAGE_437=y
104CONFIG_NLS_CODEPAGE_850=y 88CONFIG_NLS_CODEPAGE_850=y
105CONFIG_NLS_ISO8859_1=y 89CONFIG_NLS_ISO8859_1=y
106CONFIG_NLS_ISO8859_15=y 90CONFIG_NLS_ISO8859_15=y
107CONFIG_MAGIC_SYSRQ=y 91CONFIG_MAGIC_SYSRQ=y
108CONFIG_DEBUG_KERNEL=y
109CONFIG_DETECT_HUNG_TASK=y 92CONFIG_DETECT_HUNG_TASK=y
110# CONFIG_DEBUG_BUGVERBOSE is not set 93# CONFIG_DEBUG_BUGVERBOSE is not set
111# CONFIG_RCU_CPU_STALL_DETECTOR is not set
112CONFIG_SYSCTL_SYSCALL_CHECK=y
113CONFIG_CRYPTO=y
114CONFIG_CRYPTO_CBC=y 94CONFIG_CRYPTO_CBC=y
115CONFIG_CRYPTO_ECB=y 95CONFIG_CRYPTO_ECB=y
116CONFIG_CRYPTO_PCBC=y 96CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig
index 49a1518a4e69..0ad3e449526e 100644
--- a/arch/powerpc/configs/44x/iss476-smp_defconfig
+++ b/arch/powerpc/configs/44x/iss476-smp_defconfig
@@ -1,15 +1,11 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_SPARSE_IRQ=y
7CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
8CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10CONFIG_EXPERT=y 7CONFIG_EXPERT=y
11CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
12CONFIG_KALLSYMS_EXTRA_PASS=y
13CONFIG_PROFILING=y 9CONFIG_PROFILING=y
14CONFIG_OPROFILE=y 10CONFIG_OPROFILE=y
15CONFIG_MODULES=y 11CONFIG_MODULES=y
@@ -25,7 +21,6 @@ CONFIG_CMDLINE_BOOL=y
25CONFIG_CMDLINE="root=/dev/issblk0" 21CONFIG_CMDLINE="root=/dev/issblk0"
26# CONFIG_PCI is not set 22# CONFIG_PCI is not set
27CONFIG_ADVANCED_OPTIONS=y 23CONFIG_ADVANCED_OPTIONS=y
28CONFIG_NONSTATIC_KERNEL=y
29CONFIG_DYNAMIC_MEMSTART=y 24CONFIG_DYNAMIC_MEMSTART=y
30CONFIG_NET=y 25CONFIG_NET=y
31CONFIG_PACKET=y 26CONFIG_PACKET=y
@@ -42,13 +37,10 @@ CONFIG_IP_PNP_BOOTP=y
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 37CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43CONFIG_CONNECTOR=y 38CONFIG_CONNECTOR=y
44CONFIG_MTD=y 39CONFIG_MTD=y
45CONFIG_MTD_OF_PARTS=y
46CONFIG_MTD_CHAR=y
47CONFIG_MTD_BLOCK=y 40CONFIG_MTD_BLOCK=y
48CONFIG_MTD_JEDECPROBE=y 41CONFIG_MTD_JEDECPROBE=y
49CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
50CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
51CONFIG_PROC_DEVICETREE=y
52CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
53CONFIG_BLK_DEV_RAM_SIZE=35000 45CONFIG_BLK_DEV_RAM_SIZE=35000
54# CONFIG_INPUT is not set 46# CONFIG_INPUT is not set
@@ -72,15 +64,11 @@ CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 64CONFIG_TMPFS=y
73CONFIG_CRAMFS=y 65CONFIG_CRAMFS=y
74# CONFIG_NETWORK_FILESYSTEMS is not set 66# CONFIG_NETWORK_FILESYSTEMS is not set
75CONFIG_MAGIC_SYSRQ=y 67CONFIG_DEBUG_INFO=y
76CONFIG_DEBUG_FS=y 68CONFIG_DEBUG_FS=y
77CONFIG_DEBUG_KERNEL=y 69CONFIG_MAGIC_SYSRQ=y
78CONFIG_DETECT_HUNG_TASK=y 70CONFIG_DETECT_HUNG_TASK=y
79CONFIG_DEBUG_INFO=y
80# CONFIG_RCU_CPU_STALL_DETECTOR is not set
81CONFIG_SYSCTL_SYSCALL_CHECK=y
82CONFIG_PPC_EARLY_DEBUG=y 71CONFIG_PPC_EARLY_DEBUG=y
83CONFIG_CRYPTO=y
84CONFIG_CRYPTO_CBC=y 72CONFIG_CRYPTO_CBC=y
85CONFIG_CRYPTO_ECB=y 73CONFIG_CRYPTO_ECB=y
86CONFIG_CRYPTO_PCBC=y 74CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index f1137972ed41..a042335971da 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_defconfig
@@ -1,17 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 10# CONFIG_EBONY is not set
13CONFIG_KATMAI=y 11CONFIG_KATMAI=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
16CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
17CONFIG_NET=y 14CONFIG_NET=y
@@ -30,19 +27,14 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
31CONFIG_MTD=y 28CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 30CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
37CONFIG_MTD_CFI_AMDSTD=y 32CONFIG_MTD_CFI_AMDSTD=y
38CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
41CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
42CONFIG_MACINTOSH_DRIVERS=y 36CONFIG_MACINTOSH_DRIVERS=y
43CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
44CONFIG_ETHERNET=y
45CONFIG_NET_VENDOR_IBM=y
46CONFIG_IBM_EMAC=y 38CONFIG_IBM_EMAC=y
47# CONFIG_INPUT is not set 39# CONFIG_INPUT is not set
48# CONFIG_SERIO is not set 40# CONFIG_SERIO is not set
@@ -55,22 +47,15 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
55CONFIG_SERIAL_OF_PLATFORM=y 47CONFIG_SERIAL_OF_PLATFORM=y
56# CONFIG_HW_RANDOM is not set 48# CONFIG_HW_RANDOM is not set
57# CONFIG_HWMON is not set 49# CONFIG_HWMON is not set
58CONFIG_VIDEO_OUTPUT_CONTROL=m
59CONFIG_EXT2_FS=y 50CONFIG_EXT2_FS=y
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 51CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 52CONFIG_TMPFS=y
63CONFIG_CRAMFS=y 53CONFIG_CRAMFS=y
64CONFIG_NFS_FS=y 54CONFIG_NFS_FS=y
65CONFIG_NFS_V3=y
66CONFIG_ROOT_NFS=y 55CONFIG_ROOT_NFS=y
67CONFIG_MAGIC_SYSRQ=y 56CONFIG_MAGIC_SYSRQ=y
68CONFIG_DEBUG_KERNEL=y
69CONFIG_DETECT_HUNG_TASK=y 57CONFIG_DETECT_HUNG_TASK=y
70# CONFIG_DEBUG_BUGVERBOSE is not set 58# CONFIG_DEBUG_BUGVERBOSE is not set
71# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72CONFIG_SYSCTL_SYSCALL_CHECK=y
73CONFIG_CRYPTO=y
74CONFIG_CRYPTO_CBC=y 59CONFIG_CRYPTO_CBC=y
75CONFIG_CRYPTO_ECB=y 60CONFIG_CRYPTO_ECB=y
76CONFIG_CRYPTO_PCBC=y 61CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 4b91a44c4c32..91c2aff9bd55 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -1,10 +1,8 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
@@ -12,7 +10,6 @@ CONFIG_MODULE_UNLOAD=y
12# CONFIG_EBONY is not set 10# CONFIG_EBONY is not set
13CONFIG_RAINIER=y 11CONFIG_RAINIER=y
14CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_CMDLINE_BOOL=y 13CONFIG_CMDLINE_BOOL=y
17CONFIG_CMDLINE="" 14CONFIG_CMDLINE=""
18CONFIG_NET=y 15CONFIG_NET=y
@@ -31,14 +28,11 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_CONNECTOR=y 28CONFIG_CONNECTOR=y
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_OF_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
37CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
38CONFIG_MTD_CFI_INTELEXT=y 33CONFIG_MTD_CFI_INTELEXT=y
39CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 37CONFIG_BLK_DEV_RAM_SIZE=35000
44CONFIG_MACINTOSH_DRIVERS=y 38CONFIG_MACINTOSH_DRIVERS=y
@@ -55,26 +49,19 @@ CONFIG_SERIAL_OF_PLATFORM=y
55# CONFIG_HW_RANDOM is not set 49# CONFIG_HW_RANDOM is not set
56# CONFIG_HWMON is not set 50# CONFIG_HWMON is not set
57CONFIG_THERMAL=y 51CONFIG_THERMAL=y
58CONFIG_VIDEO_OUTPUT_CONTROL=m
59CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 53CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 54CONFIG_TMPFS=y
63CONFIG_JFFS2_FS=y 55CONFIG_JFFS2_FS=y
64CONFIG_CRAMFS=y 56CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 57CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 58CONFIG_ROOT_NFS=y
68CONFIG_MAGIC_SYSRQ=y
69CONFIG_DEBUG_FS=y 59CONFIG_DEBUG_FS=y
70CONFIG_DEBUG_KERNEL=y 60CONFIG_MAGIC_SYSRQ=y
71CONFIG_DETECT_HUNG_TASK=y 61CONFIG_DETECT_HUNG_TASK=y
72# CONFIG_DEBUG_BUGVERBOSE is not set 62# CONFIG_DEBUG_BUGVERBOSE is not set
73# CONFIG_RCU_CPU_STALL_DETECTOR is not set
74CONFIG_SYSCTL_SYSCALL_CHECK=y
75CONFIG_PPC_EARLY_DEBUG=y 63CONFIG_PPC_EARLY_DEBUG=y
76CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 64CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
77CONFIG_CRYPTO=y
78CONFIG_CRYPTO_CBC=y 65CONFIG_CRYPTO_CBC=y
79CONFIG_CRYPTO_ECB=y 66CONFIG_CRYPTO_ECB=y
80CONFIG_CRYPTO_PCBC=y 67CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/redwood_defconfig b/arch/powerpc/configs/44x/redwood_defconfig
index b7113e114a14..7fddf3fe275c 100644
--- a/arch/powerpc/configs/44x/redwood_defconfig
+++ b/arch/powerpc/configs/44x/redwood_defconfig
@@ -1,19 +1,15 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 11# CONFIG_EBONY is not set
13CONFIG_REDWOOD=y 12CONFIG_REDWOOD=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 13CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 14CONFIG_CMDLINE=""
19CONFIG_PCIEPORTBUS=y 15CONFIG_PCIEPORTBUS=y
@@ -33,18 +29,13 @@ CONFIG_IP_PNP_BOOTP=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 30CONFIG_CONNECTOR=y
35CONFIG_MTD=y 31CONFIG_MTD=y
36CONFIG_MTD_CONCAT=y
37CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_OF_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 34CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 35CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_RAM=y 37CONFIG_BLK_DEV_RAM=y
46CONFIG_BLK_DEV_RAM_SIZE=35000 38CONFIG_BLK_DEV_RAM_SIZE=35000
47# CONFIG_MISC_DEVICES is not set
48CONFIG_SCSI=y 39CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 40CONFIG_BLK_DEV_SD=y
50CONFIG_CHR_DEV_SG=y 41CONFIG_CHR_DEV_SG=y
@@ -52,14 +43,11 @@ CONFIG_FUSION=y
52CONFIG_FUSION_SAS=y 43CONFIG_FUSION_SAS=y
53CONFIG_I2O=y 44CONFIG_I2O=y
54CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
55CONFIG_ETHERNET=y
56CONFIG_NET_VENDOR_IBM=y
57CONFIG_IBM_EMAC=y 46CONFIG_IBM_EMAC=y
58CONFIG_IBM_EMAC_RXB=256 47CONFIG_IBM_EMAC_RXB=256
59CONFIG_IBM_EMAC_TXB=256 48CONFIG_IBM_EMAC_TXB=256
60CONFIG_IBM_EMAC_DEBUG=y 49CONFIG_IBM_EMAC_DEBUG=y
61CONFIG_E1000E=y 50CONFIG_E1000E=y
62# CONFIG_NETDEV_10000 is not set
63# CONFIG_INPUT is not set 51# CONFIG_INPUT is not set
64# CONFIG_SERIO is not set 52# CONFIG_SERIO is not set
65# CONFIG_VT is not set 53# CONFIG_VT is not set
@@ -79,25 +67,18 @@ CONFIG_I2C_DEBUG_CORE=y
79CONFIG_I2C_DEBUG_ALGO=y 67CONFIG_I2C_DEBUG_ALGO=y
80CONFIG_I2C_DEBUG_BUS=y 68CONFIG_I2C_DEBUG_BUS=y
81# CONFIG_HWMON is not set 69# CONFIG_HWMON is not set
82CONFIG_VIDEO_OUTPUT_CONTROL=m
83# CONFIG_USB_SUPPORT is not set 70# CONFIG_USB_SUPPORT is not set
84CONFIG_DMADEVICES=y 71CONFIG_DMADEVICES=y
85CONFIG_EXT2_FS=y 72CONFIG_EXT2_FS=y
86CONFIG_INOTIFY=y
87CONFIG_PROC_KCORE=y 73CONFIG_PROC_KCORE=y
88CONFIG_TMPFS=y 74CONFIG_TMPFS=y
89CONFIG_CRAMFS=y 75CONFIG_CRAMFS=y
90CONFIG_NFS_FS=y 76CONFIG_NFS_FS=y
91CONFIG_NFS_V3=y
92CONFIG_ROOT_NFS=y 77CONFIG_ROOT_NFS=y
93CONFIG_MAGIC_SYSRQ=y
94CONFIG_DEBUG_FS=y 78CONFIG_DEBUG_FS=y
95CONFIG_DEBUG_KERNEL=y 79CONFIG_MAGIC_SYSRQ=y
96CONFIG_DETECT_HUNG_TASK=y 80CONFIG_DETECT_HUNG_TASK=y
97# CONFIG_DEBUG_BUGVERBOSE is not set 81# CONFIG_DEBUG_BUGVERBOSE is not set
98# CONFIG_RCU_CPU_STALL_DETECTOR is not set
99CONFIG_SYSCTL_SYSCALL_CHECK=y
100CONFIG_CRYPTO=y
101CONFIG_CRYPTO_CRYPTD=y 82CONFIG_CRYPTO_CRYPTD=y
102CONFIG_CRYPTO_AUTHENC=y 83CONFIG_CRYPTO_AUTHENC=y
103CONFIG_CRYPTO_CCM=y 84CONFIG_CRYPTO_CCM=y
@@ -115,7 +96,6 @@ CONFIG_CRYPTO_MD5=y
115CONFIG_CRYPTO_SHA1=y 96CONFIG_CRYPTO_SHA1=y
116CONFIG_CRYPTO_SHA256=y 97CONFIG_CRYPTO_SHA256=y
117CONFIG_CRYPTO_SHA512=y 98CONFIG_CRYPTO_SHA512=y
118CONFIG_CRYPTO_AES=y
119CONFIG_CRYPTO_ARC4=y 99CONFIG_CRYPTO_ARC4=y
120CONFIG_CRYPTO_BLOWFISH=y 100CONFIG_CRYPTO_BLOWFISH=y
121CONFIG_CRYPTO_DES=y 101CONFIG_CRYPTO_DES=y
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index 9622eb2a3e37..6928012f3813 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -1,20 +1,19 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
6CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
7CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 7CONFIG_EXPERT=y
10CONFIG_MODULES=y 8CONFIG_MODULES=y
11CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
12# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_AMIGA_PARTITION=y
13# CONFIG_IOSCHED_DEADLINE is not set 13# CONFIG_IOSCHED_DEADLINE is not set
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15# CONFIG_EBONY is not set 15# CONFIG_EBONY is not set
16CONFIG_SAM440EP=y 16CONFIG_SAM440EP=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_CMDLINE_BOOL=y 17CONFIG_CMDLINE_BOOL=y
19CONFIG_CMDLINE="" 18CONFIG_CMDLINE=""
20CONFIG_NET=y 19CONFIG_NET=y
@@ -31,11 +30,9 @@ CONFIG_IP_PNP_BOOTP=y
31# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33CONFIG_CONNECTOR=y 32CONFIG_CONNECTOR=y
34CONFIG_PROC_DEVICETREE=y
35CONFIG_BLK_DEV_LOOP=y 33CONFIG_BLK_DEV_LOOP=y
36CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
37CONFIG_BLK_DEV_RAM_SIZE=35000 35CONFIG_BLK_DEV_RAM_SIZE=35000
38# CONFIG_MISC_DEVICES is not set
39CONFIG_BLK_DEV_SD=y 36CONFIG_BLK_DEV_SD=y
40CONFIG_BLK_DEV_SR=y 37CONFIG_BLK_DEV_SR=y
41CONFIG_CHR_DEV_SG=y 38CONFIG_CHR_DEV_SG=y
@@ -44,11 +41,7 @@ CONFIG_ATA=y
44# CONFIG_SATA_PMP is not set 41# CONFIG_SATA_PMP is not set
45CONFIG_SATA_SIL=y 42CONFIG_SATA_SIL=y
46CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
47CONFIG_ETHERNET=y
48CONFIG_NET_VENDOR_IBM=y
49CONFIG_IBM_EMAC=y 44CONFIG_IBM_EMAC=y
50# CONFIG_NETDEV_1000 is not set
51# CONFIG_NETDEV_10000 is not set
52CONFIG_INPUT_FF_MEMLESS=m 45CONFIG_INPUT_FF_MEMLESS=m
53CONFIG_SERIAL_8250=y 46CONFIG_SERIAL_8250=y
54CONFIG_SERIAL_8250_CONSOLE=y 47CONFIG_SERIAL_8250_CONSOLE=y
@@ -59,7 +52,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
59# CONFIG_HW_RANDOM is not set 52# CONFIG_HW_RANDOM is not set
60CONFIG_I2C_IBM_IIC=y 53CONFIG_I2C_IBM_IIC=y
61# CONFIG_HWMON is not set 54# CONFIG_HWMON is not set
62CONFIG_VIDEO_OUTPUT_CONTROL=y
63CONFIG_FB=y 55CONFIG_FB=y
64CONFIG_FB_RADEON=y 56CONFIG_FB_RADEON=y
65CONFIG_LCD_CLASS_DEVICE=y 57CONFIG_LCD_CLASS_DEVICE=y
@@ -80,10 +72,8 @@ CONFIG_HID_MONTEREY=y
80CONFIG_HID_PANTHERLORD=y 72CONFIG_HID_PANTHERLORD=y
81CONFIG_HID_PETALYNX=y 73CONFIG_HID_PETALYNX=y
82CONFIG_HID_SAMSUNG=y 74CONFIG_HID_SAMSUNG=y
83CONFIG_HID_SONY=y
84CONFIG_HID_SUNPLUS=y 75CONFIG_HID_SUNPLUS=y
85CONFIG_USB=y 76CONFIG_USB=y
86# CONFIG_USB_DEVICE_CLASS is not set
87CONFIG_USB_EHCI_HCD=m 77CONFIG_USB_EHCI_HCD=m
88CONFIG_USB_OHCI_HCD=y 78CONFIG_USB_OHCI_HCD=y
89CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 79CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -99,7 +89,6 @@ CONFIG_EXT3_FS=y
99# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 89# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
100CONFIG_EXT3_FS_POSIX_ACL=y 90CONFIG_EXT3_FS_POSIX_ACL=y
101CONFIG_REISERFS_FS=y 91CONFIG_REISERFS_FS=y
102CONFIG_INOTIFY=y
103CONFIG_AUTOFS4_FS=y 92CONFIG_AUTOFS4_FS=y
104CONFIG_ISO9660_FS=y 93CONFIG_ISO9660_FS=y
105CONFIG_JOLIET=y 94CONFIG_JOLIET=y
@@ -111,11 +100,7 @@ CONFIG_PROC_KCORE=y
111CONFIG_TMPFS=y 100CONFIG_TMPFS=y
112CONFIG_AFFS_FS=m 101CONFIG_AFFS_FS=m
113# CONFIG_NETWORK_FILESYSTEMS is not set 102# CONFIG_NETWORK_FILESYSTEMS is not set
114CONFIG_PARTITION_ADVANCED=y
115CONFIG_AMIGA_PARTITION=y
116CONFIG_NLS_CODEPAGE_437=y 103CONFIG_NLS_CODEPAGE_437=y
117CONFIG_NLS_ISO8859_1=y 104CONFIG_NLS_ISO8859_1=y
118CONFIG_CRC_T10DIF=y 105CONFIG_CRC_T10DIF=y
119CONFIG_MAGIC_SYSRQ=y 106CONFIG_MAGIC_SYSRQ=y
120# CONFIG_RCU_CPU_STALL_DETECTOR is not set
121CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index 9642d99b47f1..c294369cc39f 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -1,19 +1,16 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 8CONFIG_EXPERT=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 12# CONFIG_EBONY is not set
13CONFIG_SEQUOIA=y 13CONFIG_SEQUOIA=y
14CONFIG_NO_HZ=y
15CONFIG_HIGH_RES_TIMERS=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_CMDLINE_BOOL=y 14CONFIG_CMDLINE_BOOL=y
18CONFIG_CMDLINE="" 15CONFIG_CMDLINE=""
19CONFIG_NET=y 16CONFIG_NET=y
@@ -32,8 +29,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32CONFIG_CONNECTOR=y 29CONFIG_CONNECTOR=y
33CONFIG_MTD=y 30CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
38CONFIG_MTD_JEDECPROBE=y 33CONFIG_MTD_JEDECPROBE=y
39CONFIG_MTD_CFI_INTELEXT=y 34CONFIG_MTD_CFI_INTELEXT=y
@@ -41,12 +36,9 @@ CONFIG_MTD_CFI_AMDSTD=y
41CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
42CONFIG_MTD_NAND=y 37CONFIG_MTD_NAND=y
43CONFIG_MTD_NAND_NDFC=y 38CONFIG_MTD_NAND_NDFC=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
46CONFIG_BLK_DEV_RAM_SIZE=35000 40CONFIG_BLK_DEV_RAM_SIZE=35000
47CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
48CONFIG_ETHERNET=y
49CONFIG_NET_VENDOR_IBM=y
50CONFIG_IBM_EMAC=y 42CONFIG_IBM_EMAC=y
51# CONFIG_INPUT is not set 43# CONFIG_INPUT is not set
52# CONFIG_SERIO is not set 44# CONFIG_SERIO is not set
@@ -60,24 +52,17 @@ CONFIG_SERIAL_OF_PLATFORM=y
60# CONFIG_HW_RANDOM is not set 52# CONFIG_HW_RANDOM is not set
61# CONFIG_HWMON is not set 53# CONFIG_HWMON is not set
62CONFIG_THERMAL=y 54CONFIG_THERMAL=y
63CONFIG_VIDEO_OUTPUT_CONTROL=m
64CONFIG_EXT2_FS=y 55CONFIG_EXT2_FS=y
65CONFIG_INOTIFY=y
66CONFIG_PROC_KCORE=y 56CONFIG_PROC_KCORE=y
67CONFIG_TMPFS=y 57CONFIG_TMPFS=y
68CONFIG_JFFS2_FS=y 58CONFIG_JFFS2_FS=y
69CONFIG_CRAMFS=y 59CONFIG_CRAMFS=y
70CONFIG_NFS_FS=y 60CONFIG_NFS_FS=y
71CONFIG_NFS_V3=y
72CONFIG_ROOT_NFS=y 61CONFIG_ROOT_NFS=y
73CONFIG_MAGIC_SYSRQ=y
74CONFIG_DEBUG_FS=y 62CONFIG_DEBUG_FS=y
75CONFIG_DEBUG_KERNEL=y 63CONFIG_MAGIC_SYSRQ=y
76CONFIG_DETECT_HUNG_TASK=y 64CONFIG_DETECT_HUNG_TASK=y
77# CONFIG_DEBUG_BUGVERBOSE is not set 65# CONFIG_DEBUG_BUGVERBOSE is not set
78# CONFIG_RCU_CPU_STALL_DETECTOR is not set
79CONFIG_SYSCTL_SYSCALL_CHECK=y
80CONFIG_CRYPTO=y
81CONFIG_CRYPTO_CBC=y 66CONFIG_CRYPTO_CBC=y
82CONFIG_CRYPTO_ECB=y 67CONFIG_CRYPTO_ECB=y
83CONFIG_CRYPTO_PCBC=y 68CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 09e3075030bf..e779228d6cd6 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -1,17 +1,14 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_MODULES=y 7CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_EBONY is not set 10# CONFIG_EBONY is not set
13CONFIG_TAISHAN=y 11CONFIG_TAISHAN=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_CMDLINE_BOOL=y 12CONFIG_CMDLINE_BOOL=y
16CONFIG_CMDLINE="" 13CONFIG_CMDLINE=""
17CONFIG_NET=y 14CONFIG_NET=y
@@ -30,17 +27,13 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
31CONFIG_MTD=y 28CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 31CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP_OF=y 32CONFIG_MTD_PHYSMAP_OF=y
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_RAM_SIZE=35000 34CONFIG_BLK_DEV_RAM_SIZE=35000
40CONFIG_MACINTOSH_DRIVERS=y 35CONFIG_MACINTOSH_DRIVERS=y
41CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
42CONFIG_ETHERNET=y
43CONFIG_NET_VENDOR_IBM=y
44CONFIG_IBM_EMAC=y 37CONFIG_IBM_EMAC=y
45# CONFIG_INPUT is not set 38# CONFIG_INPUT is not set
46# CONFIG_SERIO is not set 39# CONFIG_SERIO is not set
@@ -54,23 +47,16 @@ CONFIG_SERIAL_OF_PLATFORM=y
54# CONFIG_HW_RANDOM is not set 47# CONFIG_HW_RANDOM is not set
55# CONFIG_HWMON is not set 48# CONFIG_HWMON is not set
56CONFIG_THERMAL=y 49CONFIG_THERMAL=y
57CONFIG_VIDEO_OUTPUT_CONTROL=m
58CONFIG_EXT2_FS=y 50CONFIG_EXT2_FS=y
59CONFIG_INOTIFY=y
60CONFIG_PROC_KCORE=y 51CONFIG_PROC_KCORE=y
61CONFIG_TMPFS=y 52CONFIG_TMPFS=y
62CONFIG_CRAMFS=y 53CONFIG_CRAMFS=y
63CONFIG_NFS_FS=y 54CONFIG_NFS_FS=y
64CONFIG_NFS_V3=y
65CONFIG_ROOT_NFS=y 55CONFIG_ROOT_NFS=y
66CONFIG_MAGIC_SYSRQ=y
67CONFIG_DEBUG_FS=y 56CONFIG_DEBUG_FS=y
68CONFIG_DEBUG_KERNEL=y 57CONFIG_MAGIC_SYSRQ=y
69CONFIG_DETECT_HUNG_TASK=y 58CONFIG_DETECT_HUNG_TASK=y
70# CONFIG_DEBUG_BUGVERBOSE is not set 59# CONFIG_DEBUG_BUGVERBOSE is not set
71# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72CONFIG_SYSCTL_SYSCALL_CHECK=y
73CONFIG_CRYPTO=y
74CONFIG_CRYPTO_CBC=y 60CONFIG_CRYPTO_CBC=y
75CONFIG_CRYPTO_ECB=y 61CONFIG_CRYPTO_ECB=y
76CONFIG_CRYPTO_PCBC=y 62CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
index 1eb3caf828a5..53d0300b3390 100644
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
@@ -1,5 +1,4 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
@@ -7,7 +6,6 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_SLAB=y 9CONFIG_SLAB=y
12CONFIG_MODULES=y 10CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -34,16 +32,11 @@ CONFIG_IP_NF_IPTABLES=m
34CONFIG_IP_NF_FILTER=m 32CONFIG_IP_NF_FILTER=m
35CONFIG_IP_NF_MANGLE=m 33CONFIG_IP_NF_MANGLE=m
36CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
39CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=8192 37CONFIG_BLK_DEV_RAM_SIZE=8192
41CONFIG_XILINX_SYSACE=y 38CONFIG_XILINX_SYSACE=y
42CONFIG_NETDEVICES=y 39CONFIG_NETDEVICES=y
43CONFIG_NET_ETHERNET=y
44CONFIG_MII=y
45# CONFIG_NETDEV_10000 is not set
46# CONFIG_SERIO_I8042 is not set
47# CONFIG_SERIO_SERPORT is not set 40# CONFIG_SERIO_SERPORT is not set
48CONFIG_SERIO_XILINX_XPS_PS2=y 41CONFIG_SERIO_XILINX_XPS_PS2=y
49CONFIG_SERIAL_8250=y 42CONFIG_SERIAL_8250=y
@@ -59,15 +52,9 @@ CONFIG_GPIO_XILINX=y
59CONFIG_FB=y 52CONFIG_FB=y
60CONFIG_FB_XILINX=y 53CONFIG_FB_XILINX=y
61CONFIG_FRAMEBUFFER_CONSOLE=y 54CONFIG_FRAMEBUFFER_CONSOLE=y
62CONFIG_FONTS=y
63CONFIG_FONT_8x8=y
64CONFIG_FONT_8x16=y
65CONFIG_LOGO=y 55CONFIG_LOGO=y
66# CONFIG_HID_SUPPORT is not set
67# CONFIG_USB_SUPPORT is not set 56# CONFIG_USB_SUPPORT is not set
68CONFIG_EXT2_FS=y 57CONFIG_EXT2_FS=y
69CONFIG_INOTIFY=y
70CONFIG_AUTOFS_FS=y
71CONFIG_AUTOFS4_FS=y 58CONFIG_AUTOFS4_FS=y
72CONFIG_MSDOS_FS=y 59CONFIG_MSDOS_FS=y
73CONFIG_VFAT_FS=y 60CONFIG_VFAT_FS=y
@@ -75,16 +62,16 @@ CONFIG_TMPFS=y
75CONFIG_CRAMFS=y 62CONFIG_CRAMFS=y
76CONFIG_ROMFS_FS=y 63CONFIG_ROMFS_FS=y
77CONFIG_NFS_FS=y 64CONFIG_NFS_FS=y
78CONFIG_NFS_V3=y
79CONFIG_ROOT_NFS=y 65CONFIG_ROOT_NFS=y
80CONFIG_NLS_CODEPAGE_437=y 66CONFIG_NLS_CODEPAGE_437=y
81CONFIG_NLS_ASCII=m 67CONFIG_NLS_ASCII=m
82CONFIG_NLS_ISO8859_1=m 68CONFIG_NLS_ISO8859_1=m
83CONFIG_NLS_UTF8=m 69CONFIG_NLS_UTF8=m
84CONFIG_CRC_CCITT=y 70CONFIG_CRC_CCITT=y
71CONFIG_FONTS=y
72CONFIG_FONT_8x8=y
73CONFIG_FONT_8x16=y
85CONFIG_PRINTK_TIME=y 74CONFIG_PRINTK_TIME=y
86CONFIG_DEBUG_KERNEL=y
87CONFIG_DEBUG_INFO=y 75CONFIG_DEBUG_INFO=y
88# CONFIG_RCU_CPU_STALL_DETECTOR is not set 76CONFIG_DEBUG_KERNEL=y
89CONFIG_SYSCTL_SYSCALL_CHECK=y
90# CONFIG_CRYPTO_ANSI_CPRNG is not set 77# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index 551e50a0be5e..ee434375fc24 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -1,5 +1,4 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_LOCALVERSION="-pika" 2CONFIG_LOCALVERSION="-pika"
4# CONFIG_LOCALVERSION_AUTO is not set 3# CONFIG_LOCALVERSION_AUTO is not set
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
@@ -7,7 +6,6 @@ CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_EXPERT=y 9CONFIG_EXPERT=y
12CONFIG_MODULES=y 10CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -16,7 +14,6 @@ CONFIG_MODULE_UNLOAD=y
16CONFIG_WARP=y 14CONFIG_WARP=y
17CONFIG_PPC4xx_GPIO=y 15CONFIG_PPC4xx_GPIO=y
18CONFIG_HZ_1000=y 16CONFIG_HZ_1000=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_CMDLINE_BOOL=y 17CONFIG_CMDLINE_BOOL=y
21CONFIG_CMDLINE="ip=on" 18CONFIG_CMDLINE="ip=on"
22# CONFIG_PCI is not set 19# CONFIG_PCI is not set
@@ -35,8 +32,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FIRMWARE_IN_KERNEL is not set 32# CONFIG_FIRMWARE_IN_KERNEL is not set
36CONFIG_MTD=y 33CONFIG_MTD=y
37CONFIG_MTD_CMDLINE_PARTS=y 34CONFIG_MTD_CMDLINE_PARTS=y
38CONFIG_MTD_OF_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 35CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 37CONFIG_MTD_CFI_AMDSTD=y
@@ -44,21 +39,14 @@ CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_MTD_NAND=y 39CONFIG_MTD_NAND=y
45CONFIG_MTD_NAND_NDFC=y 40CONFIG_MTD_NAND_NDFC=y
46CONFIG_MTD_UBI=y 41CONFIG_MTD_UBI=y
47CONFIG_PROC_DEVICETREE=y
48CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
49CONFIG_MISC_DEVICES=y
50CONFIG_EEPROM_AT24=y 43CONFIG_EEPROM_AT24=y
51CONFIG_SCSI=y 44CONFIG_SCSI=y
52CONFIG_BLK_DEV_SD=y 45CONFIG_BLK_DEV_SD=y
53CONFIG_SCSI_SPI_ATTRS=y 46CONFIG_SCSI_SPI_ATTRS=y
54# CONFIG_SCSI_LOWLEVEL is not set 47# CONFIG_SCSI_LOWLEVEL is not set
55CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
56CONFIG_ETHERNET=y
57CONFIG_NET_VENDOR_IBM=y
58CONFIG_MII=y
59CONFIG_IBM_EMAC=y 49CONFIG_IBM_EMAC=y
60# CONFIG_NETDEV_1000 is not set
61# CONFIG_NETDEV_10000 is not set
62# CONFIG_INPUT is not set 50# CONFIG_INPUT is not set
63# CONFIG_SERIO is not set 51# CONFIG_SERIO is not set
64# CONFIG_VT is not set 52# CONFIG_VT is not set
@@ -72,7 +60,6 @@ CONFIG_I2C_IBM_IIC=y
72CONFIG_GPIO_SYSFS=y 60CONFIG_GPIO_SYSFS=y
73CONFIG_SENSORS_AD7414=y 61CONFIG_SENSORS_AD7414=y
74CONFIG_THERMAL=y 62CONFIG_THERMAL=y
75CONFIG_THERMAL_HWMON=y
76CONFIG_WATCHDOG=y 63CONFIG_WATCHDOG=y
77CONFIG_USB=y 64CONFIG_USB=y
78CONFIG_USB_MON=y 65CONFIG_USB_MON=y
@@ -83,14 +70,12 @@ CONFIG_MMC=y
83CONFIG_NEW_LEDS=y 70CONFIG_NEW_LEDS=y
84CONFIG_LEDS_CLASS=y 71CONFIG_LEDS_CLASS=y
85CONFIG_LEDS_GPIO=y 72CONFIG_LEDS_GPIO=y
86# CONFIG_LEDS_GPIO_PLATFORM is not set
87CONFIG_LEDS_TRIGGERS=y 73CONFIG_LEDS_TRIGGERS=y
88CONFIG_LEDS_TRIGGER_DEFAULT_ON=y 74CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
89CONFIG_EXT2_FS=y 75CONFIG_EXT2_FS=y
90CONFIG_EXT3_FS=y 76CONFIG_EXT3_FS=y
91# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 77# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
92# CONFIG_EXT3_FS_XATTR is not set 78# CONFIG_EXT3_FS_XATTR is not set
93CONFIG_INOTIFY=y
94CONFIG_MSDOS_FS=y 79CONFIG_MSDOS_FS=y
95CONFIG_VFAT_FS=y 80CONFIG_VFAT_FS=y
96CONFIG_PROC_KCORE=y 81CONFIG_PROC_KCORE=y
@@ -99,7 +84,6 @@ CONFIG_JFFS2_FS=y
99CONFIG_UBIFS_FS=y 84CONFIG_UBIFS_FS=y
100CONFIG_CRAMFS=y 85CONFIG_CRAMFS=y
101CONFIG_NFS_FS=y 86CONFIG_NFS_FS=y
102CONFIG_NFS_V3=y
103CONFIG_ROOT_NFS=y 87CONFIG_ROOT_NFS=y
104CONFIG_NLS_CODEPAGE_437=y 88CONFIG_NLS_CODEPAGE_437=y
105CONFIG_NLS_CODEPAGE_850=y 89CONFIG_NLS_CODEPAGE_850=y
@@ -110,13 +94,10 @@ CONFIG_NLS_UTF8=y
110CONFIG_CRC_CCITT=y 94CONFIG_CRC_CCITT=y
111CONFIG_CRC_T10DIF=y 95CONFIG_CRC_T10DIF=y
112CONFIG_PRINTK_TIME=y 96CONFIG_PRINTK_TIME=y
113CONFIG_MAGIC_SYSRQ=y 97CONFIG_DEBUG_INFO=y
114CONFIG_DEBUG_FS=y 98CONFIG_DEBUG_FS=y
115CONFIG_DEBUG_KERNEL=y 99CONFIG_MAGIC_SYSRQ=y
116CONFIG_DETECT_HUNG_TASK=y 100CONFIG_DETECT_HUNG_TASK=y
117# CONFIG_SCHED_DEBUG is not set 101# CONFIG_SCHED_DEBUG is not set
118# CONFIG_DEBUG_BUGVERBOSE is not set 102# CONFIG_DEBUG_BUGVERBOSE is not set
119CONFIG_DEBUG_INFO=y
120# CONFIG_RCU_CPU_STALL_DETECTOR is not set
121CONFIG_SYSCTL_SYSCALL_CHECK=y
122# CONFIG_CRYPTO_ANSI_CPRNG is not set 103# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig
index 0dc99e141035..19fad0e0016e 100644
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
@@ -1,18 +1,15 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_SYSCTL_SYSCALL is not set
8# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
9# CONFIG_EPOLL is not set 6# CONFIG_EPOLL is not set
10# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
8CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 9# CONFIG_PPC_CHRP is not set
12CONFIG_PPC_MPC52xx=y 10CONFIG_PPC_MPC52xx=y
13CONFIG_PPC_MPC5200_SIMPLE=y 11CONFIG_PPC_MPC5200_SIMPLE=y
14# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
15CONFIG_SPARSE_IRQ=y
16CONFIG_PM=y 13CONFIG_PM=y
17# CONFIG_PCI is not set 14# CONFIG_PCI is not set
18CONFIG_NET=y 15CONFIG_NET=y
@@ -31,26 +28,20 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
37CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
38CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
41CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
43# CONFIG_MISC_DEVICES is not set
44CONFIG_SCSI=y 38CONFIG_SCSI=y
45CONFIG_BLK_DEV_SD=y 39CONFIG_BLK_DEV_SD=y
46CONFIG_CHR_DEV_SG=y 40CONFIG_CHR_DEV_SG=y
47# CONFIG_SCSI_LOWLEVEL is not set 41# CONFIG_SCSI_LOWLEVEL is not set
48CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
49CONFIG_LXT_PHY=y
50CONFIG_NET_ETHERNET=y
51CONFIG_FEC_MPC52xx=y 43CONFIG_FEC_MPC52xx=y
52# CONFIG_NETDEV_1000 is not set 44CONFIG_LXT_PHY=y
53# CONFIG_NETDEV_10000 is not set
54# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
55# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
56# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -64,7 +55,6 @@ CONFIG_I2C_MPC=y
64# CONFIG_HWMON is not set 55# CONFIG_HWMON is not set
65CONFIG_WATCHDOG=y 56CONFIG_WATCHDOG=y
66CONFIG_USB=y 57CONFIG_USB=y
67# CONFIG_USB_DEVICE_CLASS is not set
68CONFIG_USB_OHCI_HCD=y 58CONFIG_USB_OHCI_HCD=y
69CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 59CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
70CONFIG_USB_STORAGE=y 60CONFIG_USB_STORAGE=y
@@ -73,7 +63,6 @@ CONFIG_PPC_BESTCOMM=y
73CONFIG_EXT2_FS=y 63CONFIG_EXT2_FS=y
74CONFIG_EXT3_FS=y 64CONFIG_EXT3_FS=y
75# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 65# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
76CONFIG_INOTIFY=y
77CONFIG_MSDOS_FS=y 66CONFIG_MSDOS_FS=y
78CONFIG_VFAT_FS=y 67CONFIG_VFAT_FS=y
79CONFIG_PROC_KCORE=y 68CONFIG_PROC_KCORE=y
@@ -81,17 +70,13 @@ CONFIG_TMPFS=y
81CONFIG_JFFS2_FS=y 70CONFIG_JFFS2_FS=y
82CONFIG_CRAMFS=y 71CONFIG_CRAMFS=y
83CONFIG_NFS_FS=y 72CONFIG_NFS_FS=y
84CONFIG_NFS_V3=y
85CONFIG_NFS_V4=y 73CONFIG_NFS_V4=y
86CONFIG_ROOT_NFS=y 74CONFIG_ROOT_NFS=y
87CONFIG_PARTITION_ADVANCED=y
88CONFIG_NLS_CODEPAGE_437=y 75CONFIG_NLS_CODEPAGE_437=y
89CONFIG_NLS_ISO8859_1=y 76CONFIG_NLS_ISO8859_1=y
90CONFIG_PRINTK_TIME=y 77CONFIG_PRINTK_TIME=y
91CONFIG_DEBUG_KERNEL=y
92CONFIG_DETECT_HUNG_TASK=y 78CONFIG_DETECT_HUNG_TASK=y
93# CONFIG_DEBUG_BUGVERBOSE is not set 79# CONFIG_DEBUG_BUGVERBOSE is not set
94# CONFIG_RCU_CPU_STALL_DETECTOR is not set
95CONFIG_CRYPTO_ECB=y 80CONFIG_CRYPTO_ECB=y
96CONFIG_CRYPTO_PCBC=y 81CONFIG_CRYPTO_PCBC=y
97# CONFIG_CRYPTO_ANSI_CPRNG is not set 82# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig
index 104a332e79ab..5f40ba92a39a 100644
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
@@ -1,10 +1,9 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_SYSCTL_SYSCALL is not set
8# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
9# CONFIG_EPOLL is not set 8# CONFIG_EPOLL is not set
10CONFIG_MODULES=y 9CONFIG_MODULES=y
@@ -15,10 +14,6 @@ CONFIG_PPC_MPC52xx=y
15CONFIG_PPC_MPC5200_SIMPLE=y 14CONFIG_PPC_MPC5200_SIMPLE=y
16CONFIG_PPC_LITE5200=y 15CONFIG_PPC_LITE5200=y
17# CONFIG_PPC_PMAC is not set 16# CONFIG_PPC_PMAC is not set
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_SPARSE_IRQ=y
21CONFIG_PM=y
22CONFIG_NET=y 17CONFIG_NET=y
23CONFIG_PACKET=y 18CONFIG_PACKET=y
24CONFIG_UNIX=y 19CONFIG_UNIX=y
@@ -33,7 +28,6 @@ CONFIG_SYN_COOKIES=y
33# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
36CONFIG_PROC_DEVICETREE=y
37CONFIG_BLK_DEV_LOOP=y 31CONFIG_BLK_DEV_LOOP=y
38CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_RAM_SIZE=32768 33CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -42,9 +36,8 @@ CONFIG_BLK_DEV_SD=y
42CONFIG_ATA=y 36CONFIG_ATA=y
43CONFIG_PATA_MPC52xx=y 37CONFIG_PATA_MPC52xx=y
44CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
45CONFIG_LXT_PHY=y
46CONFIG_NET_ETHERNET=y
47CONFIG_FEC_MPC52xx=y 39CONFIG_FEC_MPC52xx=y
40CONFIG_LXT_PHY=y
48# CONFIG_INPUT is not set 41# CONFIG_INPUT is not set
49# CONFIG_SERIO is not set 42# CONFIG_SERIO is not set
50# CONFIG_VT is not set 43# CONFIG_VT is not set
@@ -57,23 +50,18 @@ CONFIG_I2C=y
57CONFIG_I2C_CHARDEV=y 50CONFIG_I2C_CHARDEV=y
58CONFIG_I2C_MPC=y 51CONFIG_I2C_MPC=y
59# CONFIG_HWMON is not set 52# CONFIG_HWMON is not set
60CONFIG_VIDEO_OUTPUT_CONTROL=m
61CONFIG_DMADEVICES=y 53CONFIG_DMADEVICES=y
62CONFIG_PPC_BESTCOMM=y 54CONFIG_PPC_BESTCOMM=y
63CONFIG_EXT2_FS=y 55CONFIG_EXT2_FS=y
64CONFIG_EXT3_FS=y 56CONFIG_EXT3_FS=y
65# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 57# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
66CONFIG_INOTIFY=y
67CONFIG_PROC_KCORE=y 58CONFIG_PROC_KCORE=y
68CONFIG_TMPFS=y 59CONFIG_TMPFS=y
69CONFIG_NFS_FS=y 60CONFIG_NFS_FS=y
70CONFIG_NFS_V3=y
71CONFIG_NFS_V4=y 61CONFIG_NFS_V4=y
72CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
73CONFIG_PRINTK_TIME=y 63CONFIG_PRINTK_TIME=y
74CONFIG_DEBUG_KERNEL=y 64CONFIG_DEBUG_INFO=y
75CONFIG_DETECT_HUNG_TASK=y 65CONFIG_DETECT_HUNG_TASK=y
76# CONFIG_DEBUG_BUGVERBOSE is not set 66# CONFIG_DEBUG_BUGVERBOSE is not set
77CONFIG_DEBUG_INFO=y
78# CONFIG_RCU_CPU_STALL_DETECTOR is not set
79# CONFIG_CRYPTO_ANSI_CPRNG is not set 67# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index c936fab9ec4a..909e185a88d1 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -1,18 +1,15 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_SYSCTL_SYSCALL is not set
8# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
9# CONFIG_EPOLL is not set 6# CONFIG_EPOLL is not set
10# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
8CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 9# CONFIG_PPC_CHRP is not set
12CONFIG_PPC_MPC52xx=y 10CONFIG_PPC_MPC52xx=y
13CONFIG_PPC_MPC5200_SIMPLE=y 11CONFIG_PPC_MPC5200_SIMPLE=y
14# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
15CONFIG_SPARSE_IRQ=y
16CONFIG_PM=y 13CONFIG_PM=y
17# CONFIG_PCI is not set 14# CONFIG_PCI is not set
18CONFIG_NET=y 15CONFIG_NET=y
@@ -30,24 +27,21 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CONCAT=y
34CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
37CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_ROM=y 34CONFIG_MTD_ROM=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
42CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
44CONFIG_MISC_DEVICES=y
45CONFIG_EEPROM_LEGACY=y 38CONFIG_EEPROM_LEGACY=y
46CONFIG_BLK_DEV_SD=y 39CONFIG_BLK_DEV_SD=y
47CONFIG_CHR_DEV_SG=y 40CONFIG_CHR_DEV_SG=y
48CONFIG_ATA=y 41CONFIG_ATA=y
49CONFIG_PATA_MPC52xx=y 42CONFIG_PATA_MPC52xx=y
50CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
44CONFIG_FEC_MPC52xx=y
51CONFIG_MARVELL_PHY=y 45CONFIG_MARVELL_PHY=y
52CONFIG_DAVICOM_PHY=y 46CONFIG_DAVICOM_PHY=y
53CONFIG_QSEMI_PHY=y 47CONFIG_QSEMI_PHY=y
@@ -58,11 +52,6 @@ CONFIG_SMSC_PHY=y
58CONFIG_BROADCOM_PHY=y 52CONFIG_BROADCOM_PHY=y
59CONFIG_ICPLUS_PHY=y 53CONFIG_ICPLUS_PHY=y
60CONFIG_MDIO_BITBANG=y 54CONFIG_MDIO_BITBANG=y
61CONFIG_NET_ETHERNET=y
62CONFIG_MII=y
63CONFIG_FEC_MPC52xx=y
64# CONFIG_NETDEV_1000 is not set
65# CONFIG_NETDEV_10000 is not set
66# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
67# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
68# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -86,7 +75,6 @@ CONFIG_PPC_BESTCOMM=y
86CONFIG_EXT2_FS=y 75CONFIG_EXT2_FS=y
87CONFIG_EXT3_FS=y 76CONFIG_EXT3_FS=y
88# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 77# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
89CONFIG_INOTIFY=y
90CONFIG_MSDOS_FS=y 78CONFIG_MSDOS_FS=y
91CONFIG_VFAT_FS=y 79CONFIG_VFAT_FS=y
92CONFIG_PROC_KCORE=y 80CONFIG_PROC_KCORE=y
@@ -94,18 +82,14 @@ CONFIG_TMPFS=y
94CONFIG_JFFS2_FS=y 82CONFIG_JFFS2_FS=y
95CONFIG_CRAMFS=y 83CONFIG_CRAMFS=y
96CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
97CONFIG_NFS_V3=y
98CONFIG_NFS_V4=y 85CONFIG_NFS_V4=y
99CONFIG_ROOT_NFS=y 86CONFIG_ROOT_NFS=y
100CONFIG_PARTITION_ADVANCED=y
101CONFIG_NLS_CODEPAGE_437=y 87CONFIG_NLS_CODEPAGE_437=y
102CONFIG_NLS_ISO8859_1=y 88CONFIG_NLS_ISO8859_1=y
103CONFIG_PRINTK_TIME=y 89CONFIG_PRINTK_TIME=y
104CONFIG_DEBUG_KERNEL=y 90CONFIG_DEBUG_INFO=y
105CONFIG_DETECT_HUNG_TASK=y 91CONFIG_DETECT_HUNG_TASK=y
106# CONFIG_DEBUG_BUGVERBOSE is not set 92# CONFIG_DEBUG_BUGVERBOSE is not set
107CONFIG_DEBUG_INFO=y
108# CONFIG_RCU_CPU_STALL_DETECTOR is not set
109CONFIG_CRYPTO_ECB=y 93CONFIG_CRYPTO_ECB=y
110CONFIG_CRYPTO_PCBC=y 94CONFIG_CRYPTO_PCBC=y
111# CONFIG_CRYPTO_ANSI_CPRNG is not set 95# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig
index 1d03c35540c7..649a01a0044d 100644
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
@@ -1,15 +1,14 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_LOCALVERSION="trunk" 1CONFIG_LOCALVERSION="trunk"
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4# CONFIG_SWAP is not set 3# CONFIG_SWAP is not set
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
7CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
8CONFIG_IKCONFIG_PROC=y 9CONFIG_IKCONFIG_PROC=y
9CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11CONFIG_EXPERT=y 11CONFIG_EXPERT=y
12# CONFIG_SYSCTL_SYSCALL is not set
13# CONFIG_VM_EVENT_COUNTERS is not set 12# CONFIG_VM_EVENT_COUNTERS is not set
14CONFIG_SLAB=y 13CONFIG_SLAB=y
15CONFIG_MODULES=y 14CONFIG_MODULES=y
@@ -21,11 +20,8 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_MPC52xx=y 20CONFIG_PPC_MPC52xx=y
22CONFIG_PPC_MPC5200_SIMPLE=y 21CONFIG_PPC_MPC5200_SIMPLE=y
23# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
24CONFIG_NO_HZ=y
25CONFIG_HIGH_RES_TIMERS=y
26CONFIG_HZ_100=y 23CONFIG_HZ_100=y
27CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
28CONFIG_SPARSE_IRQ=y
29# CONFIG_SECCOMP is not set 25# CONFIG_SECCOMP is not set
30CONFIG_NET=y 26CONFIG_NET=y
31CONFIG_PACKET=y 27CONFIG_PACKET=y
@@ -45,40 +41,31 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45# CONFIG_FW_LOADER is not set 41# CONFIG_FW_LOADER is not set
46CONFIG_MTD=y 42CONFIG_MTD=y
47CONFIG_MTD_CMDLINE_PARTS=y 43CONFIG_MTD_CMDLINE_PARTS=y
48CONFIG_MTD_CHAR=y
49CONFIG_MTD_BLOCK=y 44CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=y 45CONFIG_MTD_CFI=y
51CONFIG_MTD_CFI_INTELEXT=y 46CONFIG_MTD_CFI_INTELEXT=y
52CONFIG_MTD_PHYSMAP=y 47CONFIG_MTD_PHYSMAP=y
53CONFIG_PROC_DEVICETREE=y
54# CONFIG_BLK_DEV is not set 48# CONFIG_BLK_DEV is not set
55# CONFIG_MISC_DEVICES is not set
56# CONFIG_SCSI_PROC_FS is not set 49# CONFIG_SCSI_PROC_FS is not set
57CONFIG_BLK_DEV_SD=m 50CONFIG_BLK_DEV_SD=m
58# CONFIG_SCSI_LOWLEVEL is not set 51# CONFIG_SCSI_LOWLEVEL is not set
59CONFIG_ATA=m 52CONFIG_ATA=m
60CONFIG_PATA_MPC52xx=m 53CONFIG_PATA_MPC52xx=m
61CONFIG_NETDEVICES=y 54CONFIG_NETDEVICES=y
62CONFIG_NET_ETHERNET=y
63CONFIG_MII=y
64CONFIG_FEC_MPC52xx=y 55CONFIG_FEC_MPC52xx=y
65# CONFIG_NETDEV_1000 is not set
66# CONFIG_NETDEV_10000 is not set
67# CONFIG_INPUT is not set 56# CONFIG_INPUT is not set
68# CONFIG_SERIO is not set 57# CONFIG_SERIO is not set
69# CONFIG_VT is not set 58# CONFIG_VT is not set
59# CONFIG_LEGACY_PTYS is not set
70CONFIG_SERIAL_MPC52xx=y 60CONFIG_SERIAL_MPC52xx=y
71CONFIG_SERIAL_MPC52xx_CONSOLE=y 61CONFIG_SERIAL_MPC52xx_CONSOLE=y
72# CONFIG_LEGACY_PTYS is not set
73CONFIG_HW_RANDOM=y 62CONFIG_HW_RANDOM=y
74CONFIG_I2C=y 63CONFIG_I2C=y
75CONFIG_I2C_CHARDEV=y 64CONFIG_I2C_CHARDEV=y
76CONFIG_I2C_MPC=y 65CONFIG_I2C_MPC=y
77# CONFIG_HWMON is not set 66# CONFIG_HWMON is not set
78CONFIG_USB=y 67CONFIG_USB=y
79# CONFIG_USB_DEVICE_CLASS is not set
80CONFIG_USB_OHCI_HCD=m 68CONFIG_USB_OHCI_HCD=m
81# CONFIG_USB_OHCI_HCD_PPC_SOC is not set
82CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 69CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
83# CONFIG_USB_OHCI_HCD_PCI is not set 70# CONFIG_USB_OHCI_HCD_PCI is not set
84CONFIG_USB_STORAGE=m 71CONFIG_USB_STORAGE=m
@@ -95,8 +82,6 @@ CONFIG_FAT_DEFAULT_CODEPAGE=850
95CONFIG_TMPFS=y 82CONFIG_TMPFS=y
96CONFIG_JFFS2_FS=y 83CONFIG_JFFS2_FS=y
97CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_ROOT_NFS=y 85CONFIG_ROOT_NFS=y
100CONFIG_NLS_CODEPAGE_850=y 86CONFIG_NLS_CODEPAGE_850=y
101CONFIG_NLS_ISO8859_1=y 87CONFIG_NLS_ISO8859_1=y
102# CONFIG_RCU_CPU_STALL_DETECTOR is not set
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig
index ca83ec88b114..efab8388ea92 100644
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
@@ -1,17 +1,14 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_SPARSE_IRQ=y
4CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EMBEDDED=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_KALLSYMS is not set 4# CONFIG_KALLSYMS is not set
10# CONFIG_EPOLL is not set 5# CONFIG_EPOLL is not set
6CONFIG_EMBEDDED=y
11CONFIG_MODULES=y 7CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
13CONFIG_MODVERSIONS=y 9CONFIG_MODVERSIONS=y
14# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
15# CONFIG_PPC_CHRP is not set 12# CONFIG_PPC_CHRP is not set
16CONFIG_PPC_MPC52xx=y 13CONFIG_PPC_MPC52xx=y
17CONFIG_PPC_MPC5200_SIMPLE=y 14CONFIG_PPC_MPC5200_SIMPLE=y
@@ -34,17 +31,13 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 33CONFIG_MTD=y
37CONFIG_MTD_CONCAT=y
38CONFIG_MTD_CMDLINE_PARTS=y 34CONFIG_MTD_CMDLINE_PARTS=y
39CONFIG_MTD_OF_PARTS=y
40CONFIG_MTD_CHAR=y
41CONFIG_MTD_BLOCK=y 35CONFIG_MTD_BLOCK=y
42CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
43CONFIG_MTD_CFI_AMDSTD=y 37CONFIG_MTD_CFI_AMDSTD=y
44CONFIG_MTD_ROM=y 38CONFIG_MTD_ROM=y
45CONFIG_MTD_PHYSMAP_OF=y 39CONFIG_MTD_PHYSMAP_OF=y
46CONFIG_MTD_PLATRAM=y 40CONFIG_MTD_PLATRAM=y
47CONFIG_PROC_DEVICETREE=y
48CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
49CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
50CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -54,12 +47,9 @@ CONFIG_ATA=y
54CONFIG_PATA_MPC52xx=y 47CONFIG_PATA_MPC52xx=y
55CONFIG_PATA_PLATFORM=y 48CONFIG_PATA_PLATFORM=y
56CONFIG_NETDEVICES=y 49CONFIG_NETDEVICES=y
50CONFIG_FEC_MPC52xx=y
57CONFIG_LXT_PHY=y 51CONFIG_LXT_PHY=y
58CONFIG_FIXED_PHY=y 52CONFIG_FIXED_PHY=y
59CONFIG_NET_ETHERNET=y
60CONFIG_FEC_MPC52xx=y
61# CONFIG_NETDEV_1000 is not set
62# CONFIG_NETDEV_10000 is not set
63CONFIG_SERIAL_MPC52xx=y 53CONFIG_SERIAL_MPC52xx=y
64CONFIG_SERIAL_MPC52xx_CONSOLE=y 54CONFIG_SERIAL_MPC52xx_CONSOLE=y
65CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 55CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
@@ -75,7 +65,6 @@ CONFIG_FB_FOREIGN_ENDIAN=y
75CONFIG_FB_SM501=y 65CONFIG_FB_SM501=y
76CONFIG_FRAMEBUFFER_CONSOLE=y 66CONFIG_FRAMEBUFFER_CONSOLE=y
77CONFIG_USB=y 67CONFIG_USB=y
78# CONFIG_USB_DEVICE_CLASS is not set
79CONFIG_USB_MON=y 68CONFIG_USB_MON=y
80CONFIG_USB_OHCI_HCD=y 69CONFIG_USB_OHCI_HCD=y
81CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 70CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -95,17 +84,14 @@ CONFIG_TMPFS=y
95CONFIG_JFFS2_FS=y 84CONFIG_JFFS2_FS=y
96CONFIG_CRAMFS=y 85CONFIG_CRAMFS=y
97CONFIG_NFS_FS=y 86CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_NFS_V4=y 87CONFIG_NFS_V4=y
100CONFIG_ROOT_NFS=y 88CONFIG_ROOT_NFS=y
101CONFIG_PARTITION_ADVANCED=y
102CONFIG_NLS_CODEPAGE_437=y 89CONFIG_NLS_CODEPAGE_437=y
103CONFIG_NLS_ISO8859_1=y 90CONFIG_NLS_ISO8859_1=y
104CONFIG_PRINTK_TIME=y 91CONFIG_PRINTK_TIME=y
105CONFIG_DEBUG_KERNEL=y 92CONFIG_DEBUG_INFO=y
106CONFIG_DETECT_HUNG_TASK=y 93CONFIG_DETECT_HUNG_TASK=y
107# CONFIG_DEBUG_BUGVERBOSE is not set 94# CONFIG_DEBUG_BUGVERBOSE is not set
108CONFIG_DEBUG_INFO=y
109CONFIG_CRYPTO_ECB=y 95CONFIG_CRYPTO_ECB=y
110CONFIG_CRYPTO_PCBC=y 96CONFIG_CRYPTO_PCBC=y
111# CONFIG_CRYPTO_ANSI_CPRNG is not set 97# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 985f95c7280a..bcdfb07921fc 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -1,21 +1,20 @@
1CONFIG_FSL_EMB_PERFMON=y 1CONFIG_FSL_EMB_PERFMON=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 8# CONFIG_KALLSYMS is not set
9CONFIG_MODULES=y 9CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12CONFIG_PARTITION_ADVANCED=y
13# CONFIG_MSDOS_PARTITION is not set
12# CONFIG_PPC_CHRP is not set 14# CONFIG_PPC_CHRP is not set
13# CONFIG_PPC_PMAC is not set 15# CONFIG_PPC_PMAC is not set
14CONFIG_PPC_83xx=y 16CONFIG_PPC_83xx=y
15CONFIG_ASP834x=y 17CONFIG_ASP834x=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_SPARSE_IRQ=y
19CONFIG_PCI=y 18CONFIG_PCI=y
20CONFIG_NET=y 19CONFIG_NET=y
21CONFIG_PACKET=y 20CONFIG_PACKET=y
@@ -34,22 +33,16 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_MTD=y 33CONFIG_MTD=y
35CONFIG_MTD_REDBOOT_PARTS=y 34CONFIG_MTD_REDBOOT_PARTS=y
36CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 35CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=y 36CONFIG_MTD_BLOCK=y
40CONFIG_MTD_CFI=y 37CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_INTELEXT=y 38CONFIG_MTD_CFI_INTELEXT=y
42CONFIG_MTD_CFI_AMDSTD=y 39CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 40CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
46CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
47CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
48CONFIG_NETDEVICES=y 44CONFIG_NETDEVICES=y
49CONFIG_NET_ETHERNET=y
50CONFIG_MII=y
51CONFIG_GIANFAR=y 45CONFIG_GIANFAR=y
52# CONFIG_NETDEV_10000 is not set
53# CONFIG_INPUT_MOUSEDEV is not set 46# CONFIG_INPUT_MOUSEDEV is not set
54# CONFIG_INPUT_KEYBOARD is not set 47# CONFIG_INPUT_KEYBOARD is not set
55# CONFIG_INPUT_MOUSE is not set 48# CONFIG_INPUT_MOUSE is not set
@@ -63,8 +56,6 @@ CONFIG_I2C_CHARDEV=y
63CONFIG_I2C_MPC=y 56CONFIG_I2C_MPC=y
64CONFIG_THERMAL=y 57CONFIG_THERMAL=y
65CONFIG_WATCHDOG=y 58CONFIG_WATCHDOG=y
66CONFIG_VIDEO_OUTPUT_CONTROL=m
67# CONFIG_HID_SUPPORT is not set
68CONFIG_USB=y 59CONFIG_USB=y
69CONFIG_USB_MON=y 60CONFIG_USB_MON=y
70CONFIG_USB_EHCI_HCD=y 61CONFIG_USB_EHCI_HCD=y
@@ -74,17 +65,12 @@ CONFIG_RTC_DRV_DS1374=y
74CONFIG_EXT2_FS=y 65CONFIG_EXT2_FS=y
75CONFIG_EXT3_FS=y 66CONFIG_EXT3_FS=y
76# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 67# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
77CONFIG_INOTIFY=y
78CONFIG_PROC_KCORE=y 68CONFIG_PROC_KCORE=y
79CONFIG_TMPFS=y 69CONFIG_TMPFS=y
80CONFIG_JFFS2_FS=y 70CONFIG_JFFS2_FS=y
81CONFIG_NFS_FS=y 71CONFIG_NFS_FS=y
82CONFIG_NFS_V3=y
83CONFIG_NFS_V4=y 72CONFIG_NFS_V4=y
84CONFIG_ROOT_NFS=y 73CONFIG_ROOT_NFS=y
85CONFIG_PARTITION_ADVANCED=y
86# CONFIG_MSDOS_PARTITION is not set
87# CONFIG_RCU_CPU_STALL_DETECTOR is not set
88CONFIG_CRYPTO_ECB=m 74CONFIG_CRYPTO_ECB=m
89CONFIG_CRYPTO_PCBC=m 75CONFIG_CRYPTO_PCBC=m
90# CONFIG_CRYPTO_ANSI_CPRNG is not set 76# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index e12e60c3b9a2..11a959283149 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
@@ -36,7 +35,6 @@ CONFIG_BRIDGE=m
36CONFIG_VLAN_8021Q=y 35CONFIG_VLAN_8021Q=y
37CONFIG_MTD=y 36CONFIG_MTD=y
38CONFIG_MTD_CMDLINE_PARTS=y 37CONFIG_MTD_CMDLINE_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLOCK=y 38CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 39CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_INTELEXT=y 40CONFIG_MTD_CFI_INTELEXT=y
@@ -45,10 +43,8 @@ CONFIG_MTD_PHYSMAP_OF=y
45CONFIG_MTD_PHRAM=y 43CONFIG_MTD_PHRAM=y
46CONFIG_MTD_UBI=y 44CONFIG_MTD_UBI=y
47CONFIG_MTD_UBI_GLUEBI=y 45CONFIG_MTD_UBI_GLUEBI=y
48CONFIG_PROC_DEVICETREE=y
49CONFIG_NETDEVICES=y 46CONFIG_NETDEVICES=y
50CONFIG_DUMMY=y 47CONFIG_DUMMY=y
51CONFIG_MII=y
52CONFIG_TUN=y 48CONFIG_TUN=y
53CONFIG_UCC_GETH=y 49CONFIG_UCC_GETH=y
54CONFIG_MARVELL_PHY=y 50CONFIG_MARVELL_PHY=y
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 4b4a2a9133a5..b47a41f77836 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -1,20 +1,18 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 12# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 13# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 14CONFIG_PPC_83xx=y
14CONFIG_MPC831x_RDB=y 15CONFIG_MPC831x_RDB=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 16CONFIG_PCI=y
19CONFIG_NET=y 17CONFIG_NET=y
20CONFIG_PACKET=y 18CONFIG_PACKET=y
@@ -30,15 +28,12 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 30CONFIG_MTD=y
33CONFIG_MTD_OF_PARTS=y
34CONFIG_MTD_CHAR=y
35CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
36CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
37CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
38CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_MTD_NAND=y 35CONFIG_MTD_NAND=y
40CONFIG_MTD_NAND_FSL_ELBC=y 36CONFIG_MTD_NAND_FSL_ELBC=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_LOOP=y 37CONFIG_BLK_DEV_LOOP=y
43CONFIG_BLK_DEV_RAM=y 38CONFIG_BLK_DEV_RAM=y
44CONFIG_BLK_DEV_RAM_SIZE=32768 39CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -51,12 +46,10 @@ CONFIG_MD_LINEAR=y
51CONFIG_MD_RAID0=y 46CONFIG_MD_RAID0=y
52CONFIG_MD_RAID1=y 47CONFIG_MD_RAID1=y
53CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
49CONFIG_GIANFAR=y
50CONFIG_E100=y
54CONFIG_CICADA_PHY=y 51CONFIG_CICADA_PHY=y
55CONFIG_FIXED_PHY=y 52CONFIG_FIXED_PHY=y
56CONFIG_NET_ETHERNET=y
57CONFIG_NET_PCI=y
58CONFIG_E100=y
59CONFIG_GIANFAR=y
60# CONFIG_INPUT_MOUSEDEV is not set 53# CONFIG_INPUT_MOUSEDEV is not set
61# CONFIG_INPUT_KEYBOARD is not set 54# CONFIG_INPUT_KEYBOARD is not set
62# CONFIG_INPUT_MOUSE is not set 55# CONFIG_INPUT_MOUSE is not set
@@ -71,7 +64,6 @@ CONFIG_I2C_MPC=y
71CONFIG_SPI=y 64CONFIG_SPI=y
72CONFIG_SPI_BITBANG=y 65CONFIG_SPI_BITBANG=y
73CONFIG_WATCHDOG=y 66CONFIG_WATCHDOG=y
74CONFIG_VIDEO_OUTPUT_CONTROL=m
75# CONFIG_USB_HID is not set 67# CONFIG_USB_HID is not set
76CONFIG_USB=y 68CONFIG_USB=y
77CONFIG_USB_MON=y 69CONFIG_USB_MON=y
@@ -82,7 +74,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
82CONFIG_USB_UHCI_HCD=y 74CONFIG_USB_UHCI_HCD=y
83CONFIG_USB_STORAGE=y 75CONFIG_USB_STORAGE=y
84CONFIG_USB_GADGET=y 76CONFIG_USB_GADGET=y
85CONFIG_USB_GADGET_NET2280=y
86CONFIG_USB_ETH=m 77CONFIG_USB_ETH=m
87CONFIG_RTC_CLASS=y 78CONFIG_RTC_CLASS=y
88CONFIG_RTC_INTF_DEV_UIE_EMUL=y 79CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -90,18 +81,12 @@ CONFIG_RTC_DRV_DS1307=y
90CONFIG_EXT2_FS=y 81CONFIG_EXT2_FS=y
91CONFIG_EXT3_FS=y 82CONFIG_EXT3_FS=y
92# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 83# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
93CONFIG_INOTIFY=y
94CONFIG_PROC_KCORE=y 84CONFIG_PROC_KCORE=y
95CONFIG_TMPFS=y 85CONFIG_TMPFS=y
96CONFIG_JFFS2_FS=y 86CONFIG_JFFS2_FS=y
97CONFIG_NFS_FS=y 87CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_NFS_V4=y 88CONFIG_NFS_V4=y
100CONFIG_ROOT_NFS=y 89CONFIG_ROOT_NFS=y
101CONFIG_PARTITION_ADVANCED=y
102CONFIG_DEBUG_KERNEL=y
103CONFIG_DETECT_HUNG_TASK=y 90CONFIG_DETECT_HUNG_TASK=y
104# CONFIG_RCU_CPU_STALL_DETECTOR is not set
105CONFIG_SYSCTL_SYSCALL_CHECK=y
106CONFIG_CRYPTO_PCBC=m 91CONFIG_CRYPTO_PCBC=m
107# CONFIG_CRYPTO_ANSI_CPRNG is not set 92# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 5871395573c5..e28c83f320c1 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -1,20 +1,18 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 12# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 13# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 14CONFIG_PPC_83xx=y
14CONFIG_MPC831x_RDB=y 15CONFIG_MPC831x_RDB=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 16CONFIG_PCI=y
19CONFIG_NET=y 17CONFIG_NET=y
20CONFIG_PACKET=y 18CONFIG_PACKET=y
@@ -30,13 +28,11 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 30CONFIG_MTD=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
35CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
36CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
37CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
38CONFIG_MTD_NAND=y 35CONFIG_MTD_NAND=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_LOOP=y 36CONFIG_BLK_DEV_LOOP=y
41CONFIG_BLK_DEV_RAM=y 37CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=32768 38CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -50,10 +46,8 @@ CONFIG_MD_LINEAR=y
50CONFIG_MD_RAID0=y 46CONFIG_MD_RAID0=y
51CONFIG_MD_RAID1=y 47CONFIG_MD_RAID1=y
52CONFIG_NETDEVICES=y 48CONFIG_NETDEVICES=y
53CONFIG_NET_ETHERNET=y
54CONFIG_NET_PCI=y
55CONFIG_E100=y
56CONFIG_GIANFAR=y 49CONFIG_GIANFAR=y
50CONFIG_E100=y
57# CONFIG_INPUT_MOUSEDEV is not set 51# CONFIG_INPUT_MOUSEDEV is not set
58# CONFIG_INPUT_KEYBOARD is not set 52# CONFIG_INPUT_KEYBOARD is not set
59# CONFIG_INPUT_MOUSE is not set 53# CONFIG_INPUT_MOUSE is not set
@@ -68,7 +62,6 @@ CONFIG_I2C_MPC=y
68CONFIG_SPI=y 62CONFIG_SPI=y
69CONFIG_SPI_BITBANG=y 63CONFIG_SPI_BITBANG=y
70CONFIG_WATCHDOG=y 64CONFIG_WATCHDOG=y
71CONFIG_VIDEO_OUTPUT_CONTROL=m
72# CONFIG_USB_HID is not set 65# CONFIG_USB_HID is not set
73CONFIG_USB=y 66CONFIG_USB=y
74CONFIG_USB_MON=y 67CONFIG_USB_MON=y
@@ -79,7 +72,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
79CONFIG_USB_UHCI_HCD=y 72CONFIG_USB_UHCI_HCD=y
80CONFIG_USB_STORAGE=y 73CONFIG_USB_STORAGE=y
81CONFIG_USB_GADGET=y 74CONFIG_USB_GADGET=y
82CONFIG_USB_GADGET_NET2280=y
83CONFIG_USB_ETH=m 75CONFIG_USB_ETH=m
84CONFIG_RTC_CLASS=y 76CONFIG_RTC_CLASS=y
85CONFIG_RTC_INTF_DEV_UIE_EMUL=y 77CONFIG_RTC_INTF_DEV_UIE_EMUL=y
@@ -87,18 +79,12 @@ CONFIG_RTC_DRV_DS1307=y
87CONFIG_EXT2_FS=y 79CONFIG_EXT2_FS=y
88CONFIG_EXT3_FS=y 80CONFIG_EXT3_FS=y
89# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 81# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
90CONFIG_INOTIFY=y
91CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
92CONFIG_TMPFS=y 83CONFIG_TMPFS=y
93CONFIG_JFFS2_FS=y 84CONFIG_JFFS2_FS=y
94CONFIG_NFS_FS=y 85CONFIG_NFS_FS=y
95CONFIG_NFS_V3=y
96CONFIG_NFS_V4=y 86CONFIG_NFS_V4=y
97CONFIG_ROOT_NFS=y 87CONFIG_ROOT_NFS=y
98CONFIG_PARTITION_ADVANCED=y
99CONFIG_DEBUG_KERNEL=y
100CONFIG_DETECT_HUNG_TASK=y 88CONFIG_DETECT_HUNG_TASK=y
101# CONFIG_RCU_CPU_STALL_DETECTOR is not set
102CONFIG_SYSCTL_SYSCALL_CHECK=y
103CONFIG_CRYPTO_PCBC=m 89CONFIG_CRYPTO_PCBC=m
104# CONFIG_CRYPTO_ANSI_CPRNG is not set 90# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index a5699a1f7d0a..e84d35b848c0 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -1,22 +1,21 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC832x_MDS=y 16CONFIG_MPC832x_MDS=y
15CONFIG_QUICC_ENGINE=y 17CONFIG_QUICC_ENGINE=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_MATH_EMULATION=y 18CONFIG_MATH_EMULATION=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_PCI=y 19CONFIG_PCI=y
21CONFIG_NET=y 20CONFIG_NET=y
22CONFIG_PACKET=y 21CONFIG_PACKET=y
@@ -31,16 +30,13 @@ CONFIG_SYN_COOKIES=y
31# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
34CONFIG_PROC_DEVICETREE=y
35CONFIG_BLK_DEV_LOOP=y 33CONFIG_BLK_DEV_LOOP=y
36CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
37CONFIG_BLK_DEV_RAM_SIZE=32768 35CONFIG_BLK_DEV_RAM_SIZE=32768
38CONFIG_SCSI=y 36CONFIG_SCSI=y
39CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
40CONFIG_DAVICOM_PHY=y
41CONFIG_NET_ETHERNET=y
42CONFIG_MII=y
43CONFIG_UCC_GETH=y 38CONFIG_UCC_GETH=y
39CONFIG_DAVICOM_PHY=y
44# CONFIG_INPUT_MOUSEDEV is not set 40# CONFIG_INPUT_MOUSEDEV is not set
45# CONFIG_INPUT_KEYBOARD is not set 41# CONFIG_INPUT_KEYBOARD is not set
46# CONFIG_INPUT_MOUSE is not set 42# CONFIG_INPUT_MOUSE is not set
@@ -53,23 +49,16 @@ CONFIG_I2C=y
53CONFIG_I2C_CHARDEV=y 49CONFIG_I2C_CHARDEV=y
54CONFIG_I2C_MPC=y 50CONFIG_I2C_MPC=y
55CONFIG_WATCHDOG=y 51CONFIG_WATCHDOG=y
56CONFIG_VIDEO_OUTPUT_CONTROL=m
57CONFIG_RTC_CLASS=y 52CONFIG_RTC_CLASS=y
58CONFIG_RTC_DRV_DS1374=y 53CONFIG_RTC_DRV_DS1374=y
59CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
60CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
61# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
62CONFIG_INOTIFY=y
63CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
64CONFIG_TMPFS=y 58CONFIG_TMPFS=y
65CONFIG_NFS_FS=y 59CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_NFS_V4=y 60CONFIG_NFS_V4=y
68CONFIG_ROOT_NFS=y 61CONFIG_ROOT_NFS=y
69CONFIG_PARTITION_ADVANCED=y
70# CONFIG_MSDOS_PARTITION is not set
71# CONFIG_RCU_CPU_STALL_DETECTOR is not set
72CONFIG_SYSCTL_SYSCALL_CHECK=y
73CONFIG_CRYPTO_ECB=m 62CONFIG_CRYPTO_ECB=m
74CONFIG_CRYPTO_PCBC=m 63CONFIG_CRYPTO_PCBC=m
75# CONFIG_CRYPTO_ANSI_CPRNG is not set 64# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 5adc4cea42d3..ae145f410590 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -1,22 +1,21 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_LDM_PARTITION=y
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC832x_RDB=y 16CONFIG_MPC832x_RDB=y
15CONFIG_QUICC_ENGINE=y 17CONFIG_QUICC_ENGINE=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_MATH_EMULATION=y 18CONFIG_MATH_EMULATION=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_PCI=y 19CONFIG_PCI=y
21CONFIG_NET=y 20CONFIG_NET=y
22CONFIG_PACKET=y 21CONFIG_PACKET=y
@@ -31,18 +30,15 @@ CONFIG_SYN_COOKIES=y
31# CONFIG_IPV6 is not set 30# CONFIG_IPV6 is not set
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
34CONFIG_PROC_DEVICETREE=y
35CONFIG_BLK_DEV_LOOP=y 33CONFIG_BLK_DEV_LOOP=y
36CONFIG_BLK_DEV_RAM=y 34CONFIG_BLK_DEV_RAM=y
37CONFIG_BLK_DEV_RAM_SIZE=32768 35CONFIG_BLK_DEV_RAM_SIZE=32768
38CONFIG_SCSI=y 36CONFIG_SCSI=y
39CONFIG_BLK_DEV_SD=y 37CONFIG_BLK_DEV_SD=y
40CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
41CONFIG_ICPLUS_PHY=y
42CONFIG_NET_ETHERNET=y
43CONFIG_MII=y
44CONFIG_E1000=y
45CONFIG_UCC_GETH=y 39CONFIG_UCC_GETH=y
40CONFIG_E1000=y
41CONFIG_ICPLUS_PHY=y
46# CONFIG_INPUT_MOUSEDEV is not set 42# CONFIG_INPUT_MOUSEDEV is not set
47# CONFIG_INPUT_KEYBOARD is not set 43# CONFIG_INPUT_KEYBOARD is not set
48# CONFIG_INPUT_MOUSE is not set 44# CONFIG_INPUT_MOUSE is not set
@@ -58,7 +54,6 @@ CONFIG_I2C_MPC=y
58CONFIG_SPI=y 54CONFIG_SPI=y
59CONFIG_SPI_BITBANG=y 55CONFIG_SPI_BITBANG=y
60CONFIG_WATCHDOG=y 56CONFIG_WATCHDOG=y
61CONFIG_VIDEO_OUTPUT_CONTROL=m
62# CONFIG_USB_HID is not set 57# CONFIG_USB_HID is not set
63CONFIG_USB=y 58CONFIG_USB=y
64CONFIG_USB_MON=y 59CONFIG_USB_MON=y
@@ -71,24 +66,18 @@ CONFIG_MMC_SPI=y
71CONFIG_EXT2_FS=y 66CONFIG_EXT2_FS=y
72CONFIG_EXT3_FS=y 67CONFIG_EXT3_FS=y
73# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 68# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
74CONFIG_INOTIFY=y
75CONFIG_MSDOS_FS=y 69CONFIG_MSDOS_FS=y
76CONFIG_VFAT_FS=y 70CONFIG_VFAT_FS=y
77CONFIG_PROC_KCORE=y 71CONFIG_PROC_KCORE=y
78CONFIG_TMPFS=y 72CONFIG_TMPFS=y
79CONFIG_NFS_FS=y 73CONFIG_NFS_FS=y
80CONFIG_NFS_V3=y
81CONFIG_NFS_V4=y 74CONFIG_NFS_V4=y
82CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
83CONFIG_PARTITION_ADVANCED=y
84CONFIG_LDM_PARTITION=y
85CONFIG_NLS_CODEPAGE_437=y 76CONFIG_NLS_CODEPAGE_437=y
86CONFIG_NLS_CODEPAGE_932=y 77CONFIG_NLS_CODEPAGE_932=y
87CONFIG_NLS_ISO8859_8=y 78CONFIG_NLS_ISO8859_8=y
88CONFIG_NLS_ISO8859_1=y 79CONFIG_NLS_ISO8859_1=y
89CONFIG_CRC_T10DIF=y 80CONFIG_CRC_T10DIF=y
90# CONFIG_RCU_CPU_STALL_DETECTOR is not set
91CONFIG_SYSCTL_SYSCALL_CHECK=y
92CONFIG_CRYPTO_ECB=m 81CONFIG_CRYPTO_ECB=m
93CONFIG_CRYPTO_PCBC=m 82CONFIG_CRYPTO_PCBC=m
94# CONFIG_CRYPTO_ANSI_CPRNG is not set 83# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 82b6b6c88d6a..2a5fdcbabcdd 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_MAC_PARTITION=y
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC834x_ITX=y 16CONFIG_MPC834x_ITX=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,11 +29,9 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP=y 34CONFIG_MTD_PHYSMAP=y
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
39CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -52,9 +49,9 @@ CONFIG_MD_LINEAR=y
52CONFIG_MD_RAID0=y 49CONFIG_MD_RAID0=y
53CONFIG_MD_RAID1=y 50CONFIG_MD_RAID1=y
54CONFIG_NETDEVICES=y 51CONFIG_NETDEVICES=y
52CONFIG_GIANFAR=y
55CONFIG_CICADA_PHY=y 53CONFIG_CICADA_PHY=y
56CONFIG_FIXED_PHY=y 54CONFIG_FIXED_PHY=y
57CONFIG_GIANFAR=y
58# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
59# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
60# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -69,7 +66,6 @@ CONFIG_SPI=y
69CONFIG_SPI_BITBANG=y 66CONFIG_SPI_BITBANG=y
70# CONFIG_HWMON is not set 67# CONFIG_HWMON is not set
71CONFIG_WATCHDOG=y 68CONFIG_WATCHDOG=y
72CONFIG_VIDEO_OUTPUT_CONTROL=m
73CONFIG_USB=y 69CONFIG_USB=y
74CONFIG_USB_MON=y 70CONFIG_USB_MON=y
75CONFIG_USB_EHCI_HCD=y 71CONFIG_USB_EHCI_HCD=y
@@ -82,19 +78,13 @@ CONFIG_RTC_DRV_DS1307=y
82CONFIG_EXT2_FS=y 78CONFIG_EXT2_FS=y
83CONFIG_EXT3_FS=y 79CONFIG_EXT3_FS=y
84# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 80# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
85CONFIG_INOTIFY=y
86CONFIG_MSDOS_FS=y 81CONFIG_MSDOS_FS=y
87CONFIG_VFAT_FS=y 82CONFIG_VFAT_FS=y
88CONFIG_PROC_KCORE=y 83CONFIG_PROC_KCORE=y
89CONFIG_TMPFS=y 84CONFIG_TMPFS=y
90CONFIG_NFS_FS=y 85CONFIG_NFS_FS=y
91CONFIG_NFS_V3=y
92CONFIG_NFS_V4=y 86CONFIG_NFS_V4=y
93CONFIG_ROOT_NFS=y 87CONFIG_ROOT_NFS=y
94CONFIG_PARTITION_ADVANCED=y
95CONFIG_MAC_PARTITION=y
96CONFIG_CRC_T10DIF=y 88CONFIG_CRC_T10DIF=y
97# CONFIG_RCU_CPU_STALL_DETECTOR is not set
98CONFIG_SYSCTL_SYSCALL_CHECK=y
99CONFIG_CRYPTO_PCBC=m 89CONFIG_CRYPTO_PCBC=m
100# CONFIG_CRYPTO_ANSI_CPRNG is not set 90# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index f8b228aaa03a..9a2ff25a2e98 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12CONFIG_MAC_PARTITION=y
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC834x_ITX=y 16CONFIG_MPC834x_ITX=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,11 +29,9 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 31CONFIG_MTD=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
35CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
36CONFIG_MTD_PHYSMAP=y 34CONFIG_MTD_PHYSMAP=y
37CONFIG_PROC_DEVICETREE=y
38CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
39CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
40CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -43,8 +40,8 @@ CONFIG_BLK_DEV_SD=y
43CONFIG_CHR_DEV_SG=y 40CONFIG_CHR_DEV_SG=y
44CONFIG_SCSI_SPI_ATTRS=y 41CONFIG_SCSI_SPI_ATTRS=y
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
46CONFIG_CICADA_PHY=y
47CONFIG_GIANFAR=y 43CONFIG_GIANFAR=y
44CONFIG_CICADA_PHY=y
48# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
49# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
50# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -59,7 +56,6 @@ CONFIG_SPI=y
59CONFIG_SPI_BITBANG=y 56CONFIG_SPI_BITBANG=y
60# CONFIG_HWMON is not set 57# CONFIG_HWMON is not set
61CONFIG_WATCHDOG=y 58CONFIG_WATCHDOG=y
62CONFIG_VIDEO_OUTPUT_CONTROL=m
63CONFIG_USB=y 59CONFIG_USB=y
64CONFIG_USB_MON=y 60CONFIG_USB_MON=y
65CONFIG_USB_EHCI_HCD=y 61CONFIG_USB_EHCI_HCD=y
@@ -72,19 +68,13 @@ CONFIG_RTC_DRV_DS1307=y
72CONFIG_EXT2_FS=y 68CONFIG_EXT2_FS=y
73CONFIG_EXT3_FS=y 69CONFIG_EXT3_FS=y
74# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 70# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
75CONFIG_INOTIFY=y
76CONFIG_MSDOS_FS=y 71CONFIG_MSDOS_FS=y
77CONFIG_VFAT_FS=y 72CONFIG_VFAT_FS=y
78CONFIG_PROC_KCORE=y 73CONFIG_PROC_KCORE=y
79CONFIG_TMPFS=y 74CONFIG_TMPFS=y
80CONFIG_NFS_FS=y 75CONFIG_NFS_FS=y
81CONFIG_NFS_V3=y
82CONFIG_NFS_V4=y 76CONFIG_NFS_V4=y
83CONFIG_ROOT_NFS=y 77CONFIG_ROOT_NFS=y
84CONFIG_PARTITION_ADVANCED=y
85CONFIG_MAC_PARTITION=y
86CONFIG_CRC_T10DIF=y 78CONFIG_CRC_T10DIF=y
87# CONFIG_RCU_CPU_STALL_DETECTOR is not set
88CONFIG_SYSCTL_SYSCALL_CHECK=y
89CONFIG_CRYPTO_PCBC=m 79CONFIG_CRYPTO_PCBC=m
90# CONFIG_CRYPTO_ANSI_CPRNG is not set 80# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 99660c062191..e44edc575549 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC834x_MDS=y 16CONFIG_MPC834x_MDS=y
15CONFIG_NO_HZ=y
16CONFIG_HIGH_RES_TIMERS=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,16 +29,13 @@ CONFIG_SYN_COOKIES=y
30# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y 32CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=32768 34CONFIG_BLK_DEV_RAM_SIZE=32768
37CONFIG_NETDEVICES=y 35CONFIG_NETDEVICES=y
38CONFIG_MARVELL_PHY=y
39CONFIG_NET_ETHERNET=y
40CONFIG_NET_PCI=y
41CONFIG_E100=y
42CONFIG_GIANFAR=y 36CONFIG_GIANFAR=y
37CONFIG_E100=y
38CONFIG_MARVELL_PHY=y
43# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
44# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
45# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -52,23 +48,16 @@ CONFIG_I2C=y
52CONFIG_I2C_CHARDEV=y 48CONFIG_I2C_CHARDEV=y
53CONFIG_I2C_MPC=y 49CONFIG_I2C_MPC=y
54CONFIG_WATCHDOG=y 50CONFIG_WATCHDOG=y
55CONFIG_VIDEO_OUTPUT_CONTROL=m
56CONFIG_RTC_CLASS=y 51CONFIG_RTC_CLASS=y
57CONFIG_RTC_DRV_DS1374=y 52CONFIG_RTC_DRV_DS1374=y
58CONFIG_EXT2_FS=y 53CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 54CONFIG_EXT3_FS=y
60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 55# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
61CONFIG_INOTIFY=y
62CONFIG_PROC_KCORE=y 56CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 57CONFIG_TMPFS=y
64CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
65CONFIG_NFS_V3=y
66CONFIG_NFS_V4=y 59CONFIG_NFS_V4=y
67CONFIG_ROOT_NFS=y 60CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69# CONFIG_MSDOS_PARTITION is not set
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72CONFIG_CRYPTO_ECB=m 61CONFIG_CRYPTO_ECB=m
73CONFIG_CRYPTO_PCBC=m 62CONFIG_CRYPTO_PCBC=m
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 05710bbfd2ef..94a7d85f1603 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -1,21 +1,20 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 7# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 15CONFIG_PPC_83xx=y
14CONFIG_MPC836x_MDS=y 16CONFIG_MPC836x_MDS=y
15CONFIG_QUICC_ENGINE=y 17CONFIG_QUICC_ENGINE=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_SPARSE_IRQ=y
19CONFIG_PCI=y 18CONFIG_PCI=y
20CONFIG_NET=y 19CONFIG_NET=y
21CONFIG_PACKET=y 20CONFIG_PACKET=y
@@ -32,21 +31,17 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
33CONFIG_MTD=y 32CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 33CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
37CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 37CONFIG_MTD_PHYSMAP_OF=y
40CONFIG_PROC_DEVICETREE=y
41CONFIG_BLK_DEV_LOOP=y 38CONFIG_BLK_DEV_LOOP=y
42CONFIG_BLK_DEV_RAM=y 39CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=32768 40CONFIG_BLK_DEV_RAM_SIZE=32768
44CONFIG_SCSI=y 41CONFIG_SCSI=y
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
46CONFIG_MARVELL_PHY=y
47CONFIG_NET_ETHERNET=y
48CONFIG_MII=y
49CONFIG_UCC_GETH=y 43CONFIG_UCC_GETH=y
44CONFIG_MARVELL_PHY=y
50# CONFIG_INPUT_MOUSEDEV is not set 45# CONFIG_INPUT_MOUSEDEV is not set
51# CONFIG_INPUT_KEYBOARD is not set 46# CONFIG_INPUT_KEYBOARD is not set
52# CONFIG_INPUT_MOUSE is not set 47# CONFIG_INPUT_MOUSE is not set
@@ -59,23 +54,16 @@ CONFIG_I2C=y
59CONFIG_I2C_CHARDEV=y 54CONFIG_I2C_CHARDEV=y
60CONFIG_I2C_MPC=y 55CONFIG_I2C_MPC=y
61CONFIG_WATCHDOG=y 56CONFIG_WATCHDOG=y
62CONFIG_VIDEO_OUTPUT_CONTROL=m
63CONFIG_RTC_CLASS=y 57CONFIG_RTC_CLASS=y
64CONFIG_RTC_DRV_DS1374=y 58CONFIG_RTC_DRV_DS1374=y
65CONFIG_EXT2_FS=y 59CONFIG_EXT2_FS=y
66CONFIG_EXT3_FS=y 60CONFIG_EXT3_FS=y
67# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 61# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
68CONFIG_INOTIFY=y
69CONFIG_PROC_KCORE=y 62CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 63CONFIG_TMPFS=y
71CONFIG_NFS_FS=y 64CONFIG_NFS_FS=y
72CONFIG_NFS_V3=y
73CONFIG_NFS_V4=y 65CONFIG_NFS_V4=y
74CONFIG_ROOT_NFS=y 66CONFIG_ROOT_NFS=y
75CONFIG_PARTITION_ADVANCED=y
76# CONFIG_MSDOS_PARTITION is not set
77# CONFIG_RCU_CPU_STALL_DETECTOR is not set
78CONFIG_SYSCTL_SYSCALL_CHECK=y
79CONFIG_CRYPTO_ECB=m 67CONFIG_CRYPTO_ECB=m
80CONFIG_CRYPTO_PCBC=m 68CONFIG_CRYPTO_PCBC=m
81# CONFIG_CRYPTO_ANSI_CPRNG is not set 69# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index 0540d673a052..761ed8ea0729 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -1,20 +1,19 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 7CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
11# CONFIG_PPC_CHRP is not set 11# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 13CONFIG_PPC_83xx=y
14CONFIG_MPC836x_RDK=y 14CONFIG_MPC836x_RDK=y
15CONFIG_QUICC_ENGINE=y 15CONFIG_QUICC_ENGINE=y
16CONFIG_QE_GPIO=y 16CONFIG_QE_GPIO=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 17CONFIG_PCI=y
19CONFIG_NET=y 18CONFIG_NET=y
20CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -30,20 +29,17 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CMDLINE_PARTS=y 31CONFIG_MTD_CMDLINE_PARTS=y
33CONFIG_MTD_CHAR=y
34CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
35CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
36CONFIG_MTD_CFI_ADV_OPTIONS=y 34CONFIG_MTD_CFI_ADV_OPTIONS=y
37CONFIG_MTD_CFI_INTELEXT=y 35CONFIG_MTD_CFI_INTELEXT=y
38CONFIG_MTD_PHYSMAP_OF=y 36CONFIG_MTD_PHYSMAP_OF=y
39CONFIG_PROC_DEVICETREE=y
40CONFIG_BLK_DEV_LOOP=y 37CONFIG_BLK_DEV_LOOP=y
41CONFIG_BLK_DEV_RAM=y 38CONFIG_BLK_DEV_RAM=y
42CONFIG_BLK_DEV_RAM_SIZE=32768 39CONFIG_BLK_DEV_RAM_SIZE=32768
43CONFIG_NETDEVICES=y 40CONFIG_NETDEVICES=y
44CONFIG_BROADCOM_PHY=y
45CONFIG_UCC_GETH=y 41CONFIG_UCC_GETH=y
46# CONFIG_NETDEV_10000 is not set 42CONFIG_BROADCOM_PHY=y
47# CONFIG_INPUT_MOUSEDEV is not set 43# CONFIG_INPUT_MOUSEDEV is not set
48# CONFIG_INPUT_KEYBOARD is not set 44# CONFIG_INPUT_KEYBOARD is not set
49# CONFIG_INPUT_MOUSE is not set 45# CONFIG_INPUT_MOUSE is not set
@@ -71,17 +67,11 @@ CONFIG_LOGO=y
71CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
72CONFIG_EXT3_FS=y 68CONFIG_EXT3_FS=y
73# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 69# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
74CONFIG_INOTIFY=y
75CONFIG_PROC_KCORE=y 70CONFIG_PROC_KCORE=y
76CONFIG_TMPFS=y 71CONFIG_TMPFS=y
77CONFIG_JFFS2_FS=y 72CONFIG_JFFS2_FS=y
78CONFIG_NFS_FS=y 73CONFIG_NFS_FS=y
79CONFIG_NFS_V3=y
80CONFIG_NFS_V4=y 74CONFIG_NFS_V4=y
81CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
82CONFIG_PARTITION_ADVANCED=y
83# CONFIG_MSDOS_PARTITION is not set
84# CONFIG_RCU_CPU_STALL_DETECTOR is not set
85CONFIG_SYSCTL_SYSCALL_CHECK=y
86CONFIG_PPC_EARLY_DEBUG=y 76CONFIG_PPC_EARLY_DEBUG=y
87# CONFIG_CRYPTO_ANSI_CPRNG is not set 77# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index f367985be6f7..bcf1b48cc9e6 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -1,18 +1,16 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7CONFIG_SLAB=y 5CONFIG_SLAB=y
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 7CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 12CONFIG_PPC_83xx=y
14CONFIG_MPC837x_MDS=y 13CONFIG_MPC837x_MDS=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 14CONFIG_PCI=y
17CONFIG_NET=y 15CONFIG_NET=y
18CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -28,7 +26,6 @@ CONFIG_SYN_COOKIES=y
28# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
31CONFIG_PROC_DEVICETREE=y
32CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
33CONFIG_BLK_DEV_RAM=y 30CONFIG_BLK_DEV_RAM=y
34CONFIG_BLK_DEV_RAM_SIZE=32768 31CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -37,10 +34,8 @@ CONFIG_CHR_DEV_SG=y
37CONFIG_ATA=y 34CONFIG_ATA=y
38CONFIG_SATA_FSL=y 35CONFIG_SATA_FSL=y
39CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
40CONFIG_MARVELL_PHY=y
41CONFIG_NET_ETHERNET=y
42CONFIG_MII=y
43CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_MARVELL_PHY=y
44# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
45# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
46# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -54,21 +49,15 @@ CONFIG_I2C=y
54CONFIG_I2C_CHARDEV=y 49CONFIG_I2C_CHARDEV=y
55CONFIG_I2C_MPC=y 50CONFIG_I2C_MPC=y
56CONFIG_WATCHDOG=y 51CONFIG_WATCHDOG=y
57CONFIG_VIDEO_OUTPUT_CONTROL=m
58CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
61CONFIG_INOTIFY=y
62CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 56CONFIG_TMPFS=y
64CONFIG_NFS_FS=y 57CONFIG_NFS_FS=y
65CONFIG_NFS_V3=y
66CONFIG_NFS_V4=y 58CONFIG_NFS_V4=y
67CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69CONFIG_CRC_T10DIF=y 60CONFIG_CRC_T10DIF=y
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72CONFIG_CRYPTO_ECB=m 61CONFIG_CRYPTO_ECB=m
73CONFIG_CRYPTO_PCBC=m 62CONFIG_CRYPTO_PCBC=m
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index 414eda381591..f0f0ebf75125 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -1,18 +1,16 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7CONFIG_SLAB=y 5CONFIG_SLAB=y
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 7CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
11# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
12# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
13CONFIG_PPC_83xx=y 12CONFIG_PPC_83xx=y
14CONFIG_MPC837x_RDB=y 13CONFIG_MPC837x_RDB=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 14CONFIG_PCI=y
17CONFIG_NET=y 15CONFIG_NET=y
18CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -30,7 +28,6 @@ CONFIG_SYN_COOKIES=y
30# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y 31CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y 32CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=32768 33CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -43,12 +40,9 @@ CONFIG_BLK_DEV_MD=y
43CONFIG_MD_RAID1=y 40CONFIG_MD_RAID1=y
44CONFIG_MD_RAID456=y 41CONFIG_MD_RAID456=y
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
43CONFIG_GIANFAR=y
46CONFIG_MARVELL_PHY=y 44CONFIG_MARVELL_PHY=y
47CONFIG_FIXED_PHY=y 45CONFIG_FIXED_PHY=y
48CONFIG_NET_ETHERNET=y
49CONFIG_MII=y
50CONFIG_GIANFAR=y
51# CONFIG_NETDEV_10000 is not set
52CONFIG_INPUT_FF_MEMLESS=m 46CONFIG_INPUT_FF_MEMLESS=m
53# CONFIG_INPUT_MOUSEDEV is not set 47# CONFIG_INPUT_MOUSEDEV is not set
54# CONFIG_INPUT_KEYBOARD is not set 48# CONFIG_INPUT_KEYBOARD is not set
@@ -63,7 +57,6 @@ CONFIG_I2C=y
63CONFIG_I2C_CHARDEV=y 57CONFIG_I2C_CHARDEV=y
64CONFIG_I2C_MPC=y 58CONFIG_I2C_MPC=y
65CONFIG_WATCHDOG=y 59CONFIG_WATCHDOG=y
66CONFIG_VIDEO_OUTPUT_CONTROL=m
67CONFIG_HID_A4TECH=y 60CONFIG_HID_A4TECH=y
68CONFIG_HID_APPLE=y 61CONFIG_HID_APPLE=y
69CONFIG_HID_BELKIN=y 62CONFIG_HID_BELKIN=y
@@ -78,7 +71,6 @@ CONFIG_HID_MONTEREY=y
78CONFIG_HID_PANTHERLORD=y 71CONFIG_HID_PANTHERLORD=y
79CONFIG_HID_PETALYNX=y 72CONFIG_HID_PETALYNX=y
80CONFIG_HID_SAMSUNG=y 73CONFIG_HID_SAMSUNG=y
81CONFIG_HID_SONY=y
82CONFIG_HID_SUNPLUS=y 74CONFIG_HID_SUNPLUS=y
83CONFIG_USB=y 75CONFIG_USB=y
84CONFIG_USB_MON=y 76CONFIG_USB_MON=y
@@ -87,18 +79,13 @@ CONFIG_USB_EHCI_FSL=y
87CONFIG_EXT2_FS=y 79CONFIG_EXT2_FS=y
88CONFIG_EXT3_FS=y 80CONFIG_EXT3_FS=y
89# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 81# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
90CONFIG_INOTIFY=y
91CONFIG_PROC_KCORE=y 82CONFIG_PROC_KCORE=y
92CONFIG_TMPFS=y 83CONFIG_TMPFS=y
93CONFIG_NFS_FS=y 84CONFIG_NFS_FS=y
94CONFIG_NFS_V3=y
95CONFIG_NFS_V4=y 85CONFIG_NFS_V4=y
96CONFIG_ROOT_NFS=y 86CONFIG_ROOT_NFS=y
97CONFIG_PARTITION_ADVANCED=y
98CONFIG_CRC_T10DIF=y 87CONFIG_CRC_T10DIF=y
99# CONFIG_ENABLE_MUST_CHECK is not set 88# CONFIG_ENABLE_MUST_CHECK is not set
100# CONFIG_RCU_CPU_STALL_DETECTOR is not set
101CONFIG_SYSCTL_SYSCALL_CHECK=y
102CONFIG_CRYPTO_ECB=m 89CONFIG_CRYPTO_ECB=m
103CONFIG_CRYPTO_PCBC=m 90CONFIG_CRYPTO_PCBC=m
104# CONFIG_CRYPTO_ANSI_CPRNG is not set 91# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 4ae385894c64..d2e4d82de14d 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -1,8 +1,6 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 4CONFIG_EXPERT=y
7# CONFIG_KALLSYMS is not set 5# CONFIG_KALLSYMS is not set
8CONFIG_SLAB=y 6CONFIG_SLAB=y
@@ -13,7 +11,6 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
14CONFIG_PPC_83xx=y 12CONFIG_PPC_83xx=y
15CONFIG_SBC834x=y 13CONFIG_SBC834x=y
16CONFIG_SPARSE_IRQ=y
17CONFIG_PCI=y 14CONFIG_PCI=y
18CONFIG_NET=y 15CONFIG_NET=y
19CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -30,15 +27,11 @@ CONFIG_SYN_COOKIES=y
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
32CONFIG_MTD=y 29CONFIG_MTD=y
33CONFIG_MTD_CONCAT=y
34CONFIG_MTD_CMDLINE_PARTS=y 30CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
38CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
39CONFIG_MTD_CFI_INTELEXT=y 33CONFIG_MTD_CFI_INTELEXT=y
40CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
43CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
44CONFIG_BLK_DEV_RAM_SIZE=32768 37CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -47,11 +40,8 @@ CONFIG_SCSI=y
47CONFIG_BLK_DEV_SD=y 40CONFIG_BLK_DEV_SD=y
48# CONFIG_SCSI_LOWLEVEL is not set 41# CONFIG_SCSI_LOWLEVEL is not set
49CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
50CONFIG_BROADCOM_PHY=y
51CONFIG_NET_ETHERNET=y
52CONFIG_MII=y
53CONFIG_GIANFAR=y 43CONFIG_GIANFAR=y
54# CONFIG_NETDEV_10000 is not set 44CONFIG_BROADCOM_PHY=y
55# CONFIG_INPUT_MOUSEDEV is not set 45# CONFIG_INPUT_MOUSEDEV is not set
56# CONFIG_INPUT_KEYBOARD is not set 46# CONFIG_INPUT_KEYBOARD is not set
57# CONFIG_INPUT_MOUSE is not set 47# CONFIG_INPUT_MOUSE is not set
@@ -78,15 +68,11 @@ CONFIG_EXT2_FS=y
78CONFIG_EXT3_FS=y 68CONFIG_EXT3_FS=y
79# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 69# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
80# CONFIG_EXT3_FS_XATTR is not set 70# CONFIG_EXT3_FS_XATTR is not set
81CONFIG_INOTIFY=y
82CONFIG_PROC_KCORE=y 71CONFIG_PROC_KCORE=y
83CONFIG_TMPFS=y 72CONFIG_TMPFS=y
84CONFIG_NFS_FS=y 73CONFIG_NFS_FS=y
85CONFIG_NFS_V3=y
86CONFIG_NFS_V4=y 74CONFIG_NFS_V4=y
87CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
88# CONFIG_RCU_CPU_STALL_DETECTOR is not set
89CONFIG_SYSCTL_SYSCALL_CHECK=y
90CONFIG_CRYPTO_ECB=m 76CONFIG_CRYPTO_ECB=m
91CONFIG_CRYPTO_PCBC=m 77CONFIG_CRYPTO_PCBC=m
92# CONFIG_CRYPTO_ANSI_CPRNG is not set 78# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/ge_imp3a_defconfig b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
index b4c4b469e320..b0939dd9ad6f 100644
--- a/arch/powerpc/configs/85xx/ge_imp3a_defconfig
+++ b/arch/powerpc/configs/85xx/ge_imp3a_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=2 3CONFIG_NR_CPUS=2
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
6CONFIG_HIGH_RES_TIMERS=y
7CONFIG_BSD_PROCESS_ACCT=y 7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_BSD_PROCESS_ACCT_V3=y 8CONFIG_BSD_PROCESS_ACCT_V3=y
9CONFIG_SPARSE_IRQ=y
10CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
11CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
12# CONFIG_UTS_NS is not set 11# CONFIG_UTS_NS is not set
13# CONFIG_IPC_NS is not set 12# CONFIG_IPC_NS is not set
14# CONFIG_USER_NS is not set
15# CONFIG_PID_NS is not set 13# CONFIG_PID_NS is not set
16# CONFIG_NET_NS is not set 14# CONFIG_NET_NS is not set
17CONFIG_SYSFS_DEPRECATED=y 15CONFIG_SYSFS_DEPRECATED=y
@@ -28,7 +26,6 @@ CONFIG_QUICC_ENGINE=y
28CONFIG_QE_GPIO=y 26CONFIG_QE_GPIO=y
29CONFIG_CPM2=y 27CONFIG_CPM2=y
30CONFIG_HIGHMEM=y 28CONFIG_HIGHMEM=y
31CONFIG_HIGH_RES_TIMERS=y
32CONFIG_HZ_1000=y 29CONFIG_HZ_1000=y
33CONFIG_PREEMPT=y 30CONFIG_PREEMPT=y
34# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 31# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -71,8 +68,6 @@ CONFIG_IPV6_TUNNEL=m
71CONFIG_NET_PKTGEN=m 68CONFIG_NET_PKTGEN=m
72CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 69CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
73CONFIG_MTD=y 70CONFIG_MTD=y
74CONFIG_MTD_OF_PARTS=y
75CONFIG_MTD_CHAR=y
76CONFIG_MTD_BLOCK=y 71CONFIG_MTD_BLOCK=y
77CONFIG_MTD_CFI=y 72CONFIG_MTD_CFI=y
78CONFIG_MTD_JEDECPROBE=y 73CONFIG_MTD_JEDECPROBE=y
@@ -81,13 +76,11 @@ CONFIG_MTD_CFI_AMDSTD=y
81CONFIG_MTD_PHYSMAP_OF=y 76CONFIG_MTD_PHYSMAP_OF=y
82CONFIG_MTD_NAND=y 77CONFIG_MTD_NAND=y
83CONFIG_MTD_NAND_FSL_ELBC=y 78CONFIG_MTD_NAND_FSL_ELBC=y
84CONFIG_PROC_DEVICETREE=y
85CONFIG_BLK_DEV_LOOP=m 79CONFIG_BLK_DEV_LOOP=m
86CONFIG_BLK_DEV_CRYPTOLOOP=m 80CONFIG_BLK_DEV_CRYPTOLOOP=m
87CONFIG_BLK_DEV_NBD=m 81CONFIG_BLK_DEV_NBD=m
88CONFIG_BLK_DEV_RAM=y 82CONFIG_BLK_DEV_RAM=y
89CONFIG_BLK_DEV_RAM_SIZE=131072 83CONFIG_BLK_DEV_RAM_SIZE=131072
90CONFIG_MISC_DEVICES=y
91CONFIG_DS1682=y 84CONFIG_DS1682=y
92CONFIG_BLK_DEV_SD=y 85CONFIG_BLK_DEV_SD=y
93CONFIG_CHR_DEV_ST=y 86CONFIG_CHR_DEV_ST=y
@@ -125,7 +118,6 @@ CONFIG_SERIAL_8250=y
125CONFIG_SERIAL_8250_CONSOLE=y 118CONFIG_SERIAL_8250_CONSOLE=y
126CONFIG_SERIAL_8250_NR_UARTS=2 119CONFIG_SERIAL_8250_NR_UARTS=2
127CONFIG_SERIAL_8250_RUNTIME_UARTS=2 120CONFIG_SERIAL_8250_RUNTIME_UARTS=2
128CONFIG_SERIAL_8250_EXTENDED=y
129CONFIG_SERIAL_8250_MANY_PORTS=y 121CONFIG_SERIAL_8250_MANY_PORTS=y
130CONFIG_SERIAL_8250_DETECT_IRQ=y 122CONFIG_SERIAL_8250_DETECT_IRQ=y
131CONFIG_SERIAL_8250_RSA=y 123CONFIG_SERIAL_8250_RSA=y
@@ -141,7 +133,6 @@ CONFIG_SENSORS_LM90=y
141CONFIG_SENSORS_LM92=y 133CONFIG_SENSORS_LM92=y
142CONFIG_WATCHDOG=y 134CONFIG_WATCHDOG=y
143CONFIG_GEF_WDT=y 135CONFIG_GEF_WDT=y
144CONFIG_VIDEO_OUTPUT_CONTROL=m
145CONFIG_HID_DRAGONRISE=y 136CONFIG_HID_DRAGONRISE=y
146CONFIG_HID_GYRATION=y 137CONFIG_HID_GYRATION=y
147CONFIG_HID_TWINHAN=y 138CONFIG_HID_TWINHAN=y
@@ -149,7 +140,6 @@ CONFIG_HID_ORTEK=y
149CONFIG_HID_PANTHERLORD=y 140CONFIG_HID_PANTHERLORD=y
150CONFIG_HID_PETALYNX=y 141CONFIG_HID_PETALYNX=y
151CONFIG_HID_SAMSUNG=y 142CONFIG_HID_SAMSUNG=y
152CONFIG_HID_SONY=y
153CONFIG_HID_SUNPLUS=y 143CONFIG_HID_SUNPLUS=y
154CONFIG_HID_GREENASIA=y 144CONFIG_HID_GREENASIA=y
155CONFIG_HID_SMARTJOYPLUS=y 145CONFIG_HID_SMARTJOYPLUS=y
@@ -172,7 +162,6 @@ CONFIG_RTC_CLASS=y
172CONFIG_RTC_DRV_RX8581=y 162CONFIG_RTC_DRV_RX8581=y
173CONFIG_DMADEVICES=y 163CONFIG_DMADEVICES=y
174CONFIG_FSL_DMA=y 164CONFIG_FSL_DMA=y
175# CONFIG_NET_DMA is not set
176CONFIG_EXT2_FS=y 165CONFIG_EXT2_FS=y
177CONFIG_EXT2_FS_XATTR=y 166CONFIG_EXT2_FS_XATTR=y
178CONFIG_EXT2_FS_POSIX_ACL=y 167CONFIG_EXT2_FS_POSIX_ACL=y
@@ -194,7 +183,6 @@ CONFIG_PROC_KCORE=y
194CONFIG_TMPFS=y 183CONFIG_TMPFS=y
195CONFIG_JFFS2_FS=y 184CONFIG_JFFS2_FS=y
196CONFIG_NFS_FS=y 185CONFIG_NFS_FS=y
197CONFIG_NFS_V3=y
198CONFIG_NFS_V4=y 186CONFIG_NFS_V4=y
199CONFIG_ROOT_NFS=y 187CONFIG_ROOT_NFS=y
200CONFIG_NFSD=y 188CONFIG_NFSD=y
@@ -244,10 +232,8 @@ CONFIG_CRC_CCITT=y
244CONFIG_CRC_T10DIF=y 232CONFIG_CRC_T10DIF=y
245CONFIG_LIBCRC32C=y 233CONFIG_LIBCRC32C=y
246CONFIG_MAGIC_SYSRQ=y 234CONFIG_MAGIC_SYSRQ=y
247CONFIG_SYSCTL_SYSCALL_CHECK=y
248CONFIG_CRYPTO_CBC=y 235CONFIG_CRYPTO_CBC=y
249CONFIG_CRYPTO_MD5=y 236CONFIG_CRYPTO_MD5=y
250CONFIG_CRYPTO_SHA256=m
251CONFIG_CRYPTO_SHA512=m 237CONFIG_CRYPTO_SHA512=m
252CONFIG_CRYPTO_DES=y 238CONFIG_CRYPTO_DES=y
253# CONFIG_CRYPTO_ANSI_CPRNG is not set 239# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/kmp204x_defconfig b/arch/powerpc/configs/85xx/kmp204x_defconfig
index e362d588dfbf..e94d3eb4a8c1 100644
--- a/arch/powerpc/configs/85xx/kmp204x_defconfig
+++ b/arch/powerpc/configs/85xx/kmp204x_defconfig
@@ -94,7 +94,6 @@ CONFIG_MTD_BLOCK=y
94CONFIG_MTD_CFI=y 94CONFIG_MTD_CFI=y
95CONFIG_MTD_CFI_AMDSTD=y 95CONFIG_MTD_CFI_AMDSTD=y
96CONFIG_MTD_PHYSMAP_OF=y 96CONFIG_MTD_PHYSMAP_OF=y
97CONFIG_MTD_M25P80=y
98CONFIG_MTD_PHRAM=y 97CONFIG_MTD_PHRAM=y
99CONFIG_MTD_NAND=y 98CONFIG_MTD_NAND=y
100CONFIG_MTD_NAND_ECC_BCH=y 99CONFIG_MTD_NAND_ECC_BCH=y
@@ -111,7 +110,6 @@ CONFIG_BLK_DEV_SD=y
111CONFIG_CHR_DEV_ST=y 110CONFIG_CHR_DEV_ST=y
112CONFIG_BLK_DEV_SR=y 111CONFIG_BLK_DEV_SR=y
113CONFIG_CHR_DEV_SG=y 112CONFIG_CHR_DEV_SG=y
114CONFIG_SCSI_MULTI_LUN=y
115CONFIG_SCSI_LOGGING=y 113CONFIG_SCSI_LOGGING=y
116CONFIG_SCSI_SYM53C8XX_2=y 114CONFIG_SCSI_SYM53C8XX_2=y
117CONFIG_NETDEVICES=y 115CONFIG_NETDEVICES=y
@@ -120,7 +118,6 @@ CONFIG_NETDEVICES=y
120# CONFIG_NET_VENDOR_ALTEON is not set 118# CONFIG_NET_VENDOR_ALTEON is not set
121# CONFIG_NET_VENDOR_AMD is not set 119# CONFIG_NET_VENDOR_AMD is not set
122# CONFIG_NET_VENDOR_ATHEROS is not set 120# CONFIG_NET_VENDOR_ATHEROS is not set
123# CONFIG_NET_CADENCE is not set
124# CONFIG_NET_VENDOR_BROADCOM is not set 121# CONFIG_NET_VENDOR_BROADCOM is not set
125# CONFIG_NET_VENDOR_BROCADE is not set 122# CONFIG_NET_VENDOR_BROCADE is not set
126# CONFIG_NET_VENDOR_CHELSIO is not set 123# CONFIG_NET_VENDOR_CHELSIO is not set
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig
index aee0d17a9551..3be85c5f1a2a 100644
--- a/arch/powerpc/configs/85xx/ksi8560_defconfig
+++ b/arch/powerpc/configs/85xx/ksi8560_defconfig
@@ -1,17 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 6# CONFIG_BLK_DEV_BSG is not set
7CONFIG_PARTITION_ADVANCED=y
8# CONFIG_MSDOS_PARTITION is not set
9CONFIG_KSI8560=y 9CONFIG_KSI8560=y
10CONFIG_CPM2=y 10CONFIG_CPM2=y
11CONFIG_HIGHMEM=y 11CONFIG_HIGHMEM=y
12CONFIG_BINFMT_MISC=y 12CONFIG_BINFMT_MISC=y
13CONFIG_MATH_EMULATION=y 13CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 14# CONFIG_SECCOMP is not set
16CONFIG_NET=y 15CONFIG_NET=y
17CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -27,8 +26,6 @@ CONFIG_SYN_COOKIES=y
27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28# CONFIG_FW_LOADER is not set 27# CONFIG_FW_LOADER is not set
29CONFIG_MTD=y 28CONFIG_MTD=y
30CONFIG_MTD_CONCAT=y
31CONFIG_MTD_CHAR=y
32CONFIG_MTD_BLOCK=y 29CONFIG_MTD_BLOCK=y
33CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
34CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
@@ -39,12 +36,11 @@ CONFIG_BLK_DEV_RAM=y
39CONFIG_BLK_DEV_RAM_SIZE=32768 36CONFIG_BLK_DEV_RAM_SIZE=32768
40CONFIG_IDE=y 37CONFIG_IDE=y
41CONFIG_NETDEVICES=y 38CONFIG_NETDEVICES=y
42CONFIG_MARVELL_PHY=y
43CONFIG_NET_ETHERNET=y
44CONFIG_FS_ENET=y 39CONFIG_FS_ENET=y
45# CONFIG_FS_ENET_HAS_SCC is not set 40# CONFIG_FS_ENET_HAS_SCC is not set
46CONFIG_FS_ENET_MDIO_FCC=y 41CONFIG_FS_ENET_MDIO_FCC=y
47CONFIG_GIANFAR=y 42CONFIG_GIANFAR=y
43CONFIG_MARVELL_PHY=y
48# CONFIG_INPUT_MOUSEDEV is not set 44# CONFIG_INPUT_MOUSEDEV is not set
49# CONFIG_INPUT_KEYBOARD is not set 45# CONFIG_INPUT_KEYBOARD is not set
50# CONFIG_INPUT_MOUSE is not set 46# CONFIG_INPUT_MOUSE is not set
@@ -53,22 +49,15 @@ CONFIG_GIANFAR=y
53CONFIG_SERIAL_CPM=y 49CONFIG_SERIAL_CPM=y
54CONFIG_SERIAL_CPM_CONSOLE=y 50CONFIG_SERIAL_CPM_CONSOLE=y
55CONFIG_GEN_RTC=y 51CONFIG_GEN_RTC=y
56CONFIG_VIDEO_OUTPUT_CONTROL=y
57CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
58CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
59# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 56CONFIG_TMPFS=y
63CONFIG_NFS_FS=y 57CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 58CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y
66# CONFIG_MSDOS_PARTITION is not set
67CONFIG_DEBUG_FS=y 59CONFIG_DEBUG_FS=y
68CONFIG_DEBUG_KERNEL=y
69CONFIG_DETECT_HUNG_TASK=y 60CONFIG_DETECT_HUNG_TASK=y
70CONFIG_DEBUG_MUTEXES=y 61CONFIG_DEBUG_MUTEXES=y
71# CONFIG_DEBUG_BUGVERBOSE is not set 62# CONFIG_DEBUG_BUGVERBOSE is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index 11662c217ac0..e38c373f2edf 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -1,17 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
9CONFIG_MPC8540_ADS=y 11CONFIG_MPC8540_ADS=y
10CONFIG_NO_HZ=y
11CONFIG_HIGH_RES_TIMERS=y
12CONFIG_BINFMT_MISC=y 12CONFIG_BINFMT_MISC=y
13CONFIG_MATH_EMULATION=y 13CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 14# CONFIG_SECCOMP is not set
16CONFIG_NET=y 15CONFIG_NET=y
17CONFIG_PACKET=y 16CONFIG_PACKET=y
@@ -27,13 +26,10 @@ CONFIG_SYN_COOKIES=y
27# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
30CONFIG_PROC_DEVICETREE=y
31CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
32CONFIG_BLK_DEV_RAM=y 30CONFIG_BLK_DEV_RAM=y
33CONFIG_BLK_DEV_RAM_SIZE=32768 31CONFIG_BLK_DEV_RAM_SIZE=32768
34CONFIG_NETDEVICES=y 32CONFIG_NETDEVICES=y
35CONFIG_NET_ETHERNET=y
36CONFIG_MII=y
37CONFIG_GIANFAR=y 33CONFIG_GIANFAR=y
38# CONFIG_INPUT_MOUSEDEV is not set 34# CONFIG_INPUT_MOUSEDEV is not set
39# CONFIG_INPUT_KEYBOARD is not set 35# CONFIG_INPUT_KEYBOARD is not set
@@ -44,20 +40,13 @@ CONFIG_SERIAL_8250=y
44CONFIG_SERIAL_8250_CONSOLE=y 40CONFIG_SERIAL_8250_CONSOLE=y
45# CONFIG_HW_RANDOM is not set 41# CONFIG_HW_RANDOM is not set
46CONFIG_GEN_RTC=y 42CONFIG_GEN_RTC=y
47CONFIG_VIDEO_OUTPUT_CONTROL=y
48CONFIG_EXT2_FS=y 43CONFIG_EXT2_FS=y
49CONFIG_EXT3_FS=y 44CONFIG_EXT3_FS=y
50# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 45# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
51CONFIG_INOTIFY=y
52CONFIG_PROC_KCORE=y 46CONFIG_PROC_KCORE=y
53CONFIG_TMPFS=y 47CONFIG_TMPFS=y
54CONFIG_NFS_FS=y 48CONFIG_NFS_FS=y
55CONFIG_ROOT_NFS=y 49CONFIG_ROOT_NFS=y
56CONFIG_PARTITION_ADVANCED=y
57# CONFIG_MSDOS_PARTITION is not set
58CONFIG_DEBUG_KERNEL=y
59CONFIG_DETECT_HUNG_TASK=y 50CONFIG_DETECT_HUNG_TASK=y
60CONFIG_DEBUG_MUTEXES=y 51CONFIG_DEBUG_MUTEXES=y
61# CONFIG_RCU_CPU_STALL_DETECTOR is not set
62CONFIG_SYSCTL_SYSCALL_CHECK=y
63# CONFIG_CRYPTO_ANSI_CPRNG is not set 52# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index ebe9b30b0721..48fc8e3a7be0 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -1,15 +1,14 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 6# CONFIG_BLK_DEV_BSG is not set
7CONFIG_PARTITION_ADVANCED=y
8# CONFIG_MSDOS_PARTITION is not set
9CONFIG_MPC8560_ADS=y 9CONFIG_MPC8560_ADS=y
10CONFIG_BINFMT_MISC=y 10CONFIG_BINFMT_MISC=y
11CONFIG_MATH_EMULATION=y 11CONFIG_MATH_EMULATION=y
12CONFIG_SPARSE_IRQ=y
13# CONFIG_SECCOMP is not set 12# CONFIG_SECCOMP is not set
14CONFIG_PCI=y 13CONFIG_PCI=y
15CONFIG_PCI_DEBUG=y 14CONFIG_PCI_DEBUG=y
@@ -30,13 +29,12 @@ CONFIG_BLK_DEV_LOOP=y
30CONFIG_BLK_DEV_RAM=y 29CONFIG_BLK_DEV_RAM=y
31CONFIG_BLK_DEV_RAM_SIZE=32768 30CONFIG_BLK_DEV_RAM_SIZE=32768
32CONFIG_NETDEVICES=y 31CONFIG_NETDEVICES=y
33CONFIG_MARVELL_PHY=y
34CONFIG_DAVICOM_PHY=y
35CONFIG_NET_ETHERNET=y
36CONFIG_FS_ENET=y 32CONFIG_FS_ENET=y
37# CONFIG_FS_ENET_HAS_SCC is not set 33# CONFIG_FS_ENET_HAS_SCC is not set
38CONFIG_E1000=y
39CONFIG_GIANFAR=y 34CONFIG_GIANFAR=y
35CONFIG_E1000=y
36CONFIG_MARVELL_PHY=y
37CONFIG_DAVICOM_PHY=y
40# CONFIG_INPUT_MOUSEDEV is not set 38# CONFIG_INPUT_MOUSEDEV is not set
41# CONFIG_INPUT_KEYBOARD is not set 39# CONFIG_INPUT_KEYBOARD is not set
42# CONFIG_INPUT_MOUSE is not set 40# CONFIG_INPUT_MOUSE is not set
@@ -45,20 +43,13 @@ CONFIG_GIANFAR=y
45CONFIG_SERIAL_CPM=y 43CONFIG_SERIAL_CPM=y
46CONFIG_SERIAL_CPM_CONSOLE=y 44CONFIG_SERIAL_CPM_CONSOLE=y
47CONFIG_GEN_RTC=y 45CONFIG_GEN_RTC=y
48CONFIG_VIDEO_OUTPUT_CONTROL=y
49CONFIG_EXT2_FS=y 46CONFIG_EXT2_FS=y
50CONFIG_EXT3_FS=y 47CONFIG_EXT3_FS=y
51# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 48# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
52CONFIG_INOTIFY=y
53CONFIG_PROC_KCORE=y 49CONFIG_PROC_KCORE=y
54CONFIG_TMPFS=y 50CONFIG_TMPFS=y
55CONFIG_NFS_FS=y 51CONFIG_NFS_FS=y
56CONFIG_ROOT_NFS=y 52CONFIG_ROOT_NFS=y
57CONFIG_PARTITION_ADVANCED=y
58# CONFIG_MSDOS_PARTITION is not set
59CONFIG_DEBUG_KERNEL=y
60CONFIG_DETECT_HUNG_TASK=y 53CONFIG_DETECT_HUNG_TASK=y
61CONFIG_DEBUG_MUTEXES=y 54CONFIG_DEBUG_MUTEXES=y
62# CONFIG_RCU_CPU_STALL_DETECTOR is not set
63CONFIG_SYSCTL_SYSCALL_CHECK=y
64# CONFIG_CRYPTO_ANSI_CPRNG is not set 55# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index eb25229b387a..ecb0c3bf8796 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -1,17 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
9CONFIG_MPC85xx_CDS=y 11CONFIG_MPC85xx_CDS=y
10CONFIG_NO_HZ=y
11CONFIG_HIGH_RES_TIMERS=y
12CONFIG_BINFMT_MISC=y 12CONFIG_BINFMT_MISC=y
13CONFIG_MATH_EMULATION=y 13CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 14# CONFIG_SECCOMP is not set
16CONFIG_PCI=y 15CONFIG_PCI=y
17CONFIG_NET=y 16CONFIG_NET=y
@@ -28,7 +27,6 @@ CONFIG_SYN_COOKIES=y
28# CONFIG_IPV6 is not set 27# CONFIG_IPV6 is not set
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
31CONFIG_PROC_DEVICETREE=y
32CONFIG_BLK_DEV_LOOP=y 30CONFIG_BLK_DEV_LOOP=y
33CONFIG_BLK_DEV_RAM=y 31CONFIG_BLK_DEV_RAM=y
34CONFIG_BLK_DEV_RAM_SIZE=32768 32CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -36,10 +34,8 @@ CONFIG_IDE=y
36CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
37CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
38CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
39CONFIG_NET_ETHERNET=y
40CONFIG_MII=y
41CONFIG_E1000=y
42CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E1000=y
43# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
44# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
45# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -49,20 +45,13 @@ CONFIG_SERIAL_8250=y
49CONFIG_SERIAL_8250_CONSOLE=y 45CONFIG_SERIAL_8250_CONSOLE=y
50# CONFIG_HW_RANDOM is not set 46# CONFIG_HW_RANDOM is not set
51CONFIG_GEN_RTC=y 47CONFIG_GEN_RTC=y
52CONFIG_VIDEO_OUTPUT_CONTROL=y
53CONFIG_EXT2_FS=y 48CONFIG_EXT2_FS=y
54CONFIG_EXT3_FS=y 49CONFIG_EXT3_FS=y
55# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 50# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
56CONFIG_INOTIFY=y
57CONFIG_PROC_KCORE=y 51CONFIG_PROC_KCORE=y
58CONFIG_TMPFS=y 52CONFIG_TMPFS=y
59CONFIG_NFS_FS=y 53CONFIG_NFS_FS=y
60CONFIG_ROOT_NFS=y 54CONFIG_ROOT_NFS=y
61CONFIG_PARTITION_ADVANCED=y
62# CONFIG_MSDOS_PARTITION is not set
63CONFIG_DEBUG_KERNEL=y
64CONFIG_DETECT_HUNG_TASK=y 55CONFIG_DETECT_HUNG_TASK=y
65CONFIG_DEBUG_MUTEXES=y 56CONFIG_DEBUG_MUTEXES=y
66# CONFIG_RCU_CPU_STALL_DETECTOR is not set
67CONFIG_SYSCTL_SYSCALL_CHECK=y
68# CONFIG_CRYPTO_ANSI_CPRNG is not set 57# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/ppa8548_defconfig b/arch/powerpc/configs/85xx/ppa8548_defconfig
index e80bb9b21eac..190978a5b7d5 100644
--- a/arch/powerpc/configs/85xx/ppa8548_defconfig
+++ b/arch/powerpc/configs/85xx/ppa8548_defconfig
@@ -1,11 +1,16 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_PPA8548=y
3CONFIG_DTC=y
4CONFIG_DEFAULT_UIMAGE=y
5CONFIG_IKCONFIG=y 2CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 3CONFIG_IKCONFIG_PROC=y
7# CONFIG_PCI is not set 4CONFIG_PPA8548=y
8# CONFIG_USB_SUPPORT is not set 5CONFIG_FSL_LBC=y
6CONFIG_RAPIDIO=y
7CONFIG_FSL_RIO=y
8CONFIG_RAPIDIO_DMA_ENGINE=y
9CONFIG_RAPIDIO_ENUM_BASIC=y
10CONFIG_RAPIDIO_TSI57X=y
11CONFIG_RAPIDIO_CPS_XX=y
12CONFIG_RAPIDIO_TSI568=y
13CONFIG_RAPIDIO_CPS_GEN2=y
9CONFIG_ADVANCED_OPTIONS=y 14CONFIG_ADVANCED_OPTIONS=y
10CONFIG_LOWMEM_SIZE_BOOL=y 15CONFIG_LOWMEM_SIZE_BOOL=y
11CONFIG_LOWMEM_SIZE=0x40000000 16CONFIG_LOWMEM_SIZE=0x40000000
@@ -14,51 +19,28 @@ CONFIG_LOWMEM_CAM_NUM=4
14CONFIG_PAGE_OFFSET_BOOL=y 19CONFIG_PAGE_OFFSET_BOOL=y
15CONFIG_PAGE_OFFSET=0xb0000000 20CONFIG_PAGE_OFFSET=0xb0000000
16CONFIG_KERNEL_START_BOOL=y 21CONFIG_KERNEL_START_BOOL=y
17CONFIG_KERNEL_START=0xb0000000
18# CONFIG_PHYSICAL_START_BOOL is not set
19CONFIG_PHYSICAL_START=0x00000000
20CONFIG_PHYSICAL_ALIGN=0x04000000
21CONFIG_TASK_SIZE_BOOL=y 22CONFIG_TASK_SIZE_BOOL=y
22CONFIG_TASK_SIZE=0xb0000000 23CONFIG_TASK_SIZE=0xb0000000
23 24CONFIG_NET=y
24CONFIG_FSL_LBC=y 25CONFIG_INET=y
25CONFIG_FSL_DMA=y 26CONFIG_IP_PNP=y
26CONFIG_FSL_RIO=y
27
28CONFIG_RAPIDIO=y
29CONFIG_RAPIDIO_DMA_ENGINE=y
30CONFIG_RAPIDIO_TSI57X=y
31CONFIG_RAPIDIO_TSI568=y
32CONFIG_RAPIDIO_CPS_XX=y
33CONFIG_RAPIDIO_CPS_GEN2=y
34CONFIG_SERIAL_8250=y
35CONFIG_SERIAL_8250_CONSOLE=y
36CONFIG_PROC_DEVICETREE=y
37
38CONFIG_MTD=y 27CONFIG_MTD=y
39CONFIG_MTD_BLKDEVS=y 28CONFIG_MTD_CMDLINE_PARTS=y
40CONFIG_MTD_BLOCK=y 29CONFIG_MTD_BLOCK=y
41CONFIG_MTD_CFI=y 30CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_CFI_INTELEXT=y 31CONFIG_MTD_CFI_INTELEXT=y
44CONFIG_MTD_CHAR=y 32CONFIG_MTD_CFI_AMDSTD=y
45CONFIG_MTD_CMDLINE_PARTS=y
46CONFIG_MTD_CONCAT=y
47CONFIG_MTD_PHYSMAP_OF=y 33CONFIG_MTD_PHYSMAP_OF=y
48 34CONFIG_NETDEVICES=y
35CONFIG_GIANFAR=y
36CONFIG_MARVELL_PHY=y
37CONFIG_SERIAL_8250=y
38CONFIG_SERIAL_8250_CONSOLE=y
49CONFIG_I2C=y 39CONFIG_I2C=y
50CONFIG_I2C_MPC=y 40CONFIG_I2C_MPC=y
51CONFIG_I2C_CHARDEV 41# CONFIG_USB_SUPPORT is not set
52CONFIG_RTC_CLASS=y 42CONFIG_RTC_CLASS=y
53CONFIG_RTC_HCTOSYS=y
54CONFIG_RTC_DRV_ISL1208=y 43CONFIG_RTC_DRV_ISL1208=y
55 44CONFIG_FSL_DMA=y
56CONFIG_NET=y
57CONFIG_INET=y
58CONFIG_IP_PNP=y
59CONFIG_NETDEVICES=y
60CONFIG_MII=y
61CONFIG_GIANFAR=y
62CONFIG_MARVELL_PHY=y
63CONFIG_NFS_FS=y 45CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 46CONFIG_ROOT_NFS=y
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig
index 008a7a47b89b..72b7ccfbe2c2 100644
--- a/arch/powerpc/configs/85xx/sbc8548_defconfig
+++ b/arch/powerpc/configs/85xx/sbc8548_defconfig
@@ -1,16 +1,13 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8CONFIG_SLAB=y 6CONFIG_SLAB=y
9# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
10CONFIG_SBC8548=y 8CONFIG_SBC8548=y
11CONFIG_BINFMT_MISC=y 9CONFIG_BINFMT_MISC=y
12CONFIG_MATH_EMULATION=y 10CONFIG_MATH_EMULATION=y
13CONFIG_SPARSE_IRQ=y
14# CONFIG_SECCOMP is not set 11# CONFIG_SECCOMP is not set
15CONFIG_PCI=y 12CONFIG_PCI=y
16CONFIG_NET=y 13CONFIG_NET=y
@@ -27,14 +24,19 @@ CONFIG_SYN_COOKIES=y
27# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 25CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 26# CONFIG_FW_LOADER is not set
30CONFIG_PROC_DEVICETREE=y 27CONFIG_MTD=y
28CONFIG_MTD_BLOCK=y
29CONFIG_MTD_CFI=y
30CONFIG_MTD_CFI_ADV_OPTIONS=y
31CONFIG_MTD_CFI_GEOMETRY=y
32CONFIG_MTD_CFI_I4=y
33CONFIG_MTD_CFI_INTELEXT=y
34CONFIG_MTD_PHYSMAP_OF=y
31CONFIG_BLK_DEV_LOOP=y 35CONFIG_BLK_DEV_LOOP=y
32CONFIG_BLK_DEV_RAM=y 36CONFIG_BLK_DEV_RAM=y
33CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
34CONFIG_BROADCOM_PHY=y
35CONFIG_NET_ETHERNET=y
36CONFIG_MII=y
37CONFIG_GIANFAR=y 38CONFIG_GIANFAR=y
39CONFIG_BROADCOM_PHY=y
38# CONFIG_INPUT_MOUSEDEV is not set 40# CONFIG_INPUT_MOUSEDEV is not set
39# CONFIG_INPUT_KEYBOARD is not set 41# CONFIG_INPUT_KEYBOARD is not set
40# CONFIG_INPUT_MOUSE is not set 42# CONFIG_INPUT_MOUSE is not set
@@ -44,33 +46,9 @@ CONFIG_SERIAL_8250=y
44CONFIG_SERIAL_8250_CONSOLE=y 46CONFIG_SERIAL_8250_CONSOLE=y
45# CONFIG_HW_RANDOM is not set 47# CONFIG_HW_RANDOM is not set
46CONFIG_GEN_RTC=y 48CONFIG_GEN_RTC=y
47CONFIG_VIDEO_OUTPUT_CONTROL=y
48# CONFIG_HID_SUPPORT is not set
49# CONFIG_USB_SUPPORT is not set 49# CONFIG_USB_SUPPORT is not set
50CONFIG_INOTIFY=y
51CONFIG_PROC_KCORE=y 50CONFIG_PROC_KCORE=y
52CONFIG_TMPFS=y 51CONFIG_TMPFS=y
53CONFIG_NFS_FS=y 52CONFIG_NFS_FS=y
54CONFIG_ROOT_NFS=y 53CONFIG_ROOT_NFS=y
55# CONFIG_RCU_CPU_STALL_DETECTOR is not set
56CONFIG_SYSCTL_SYSCALL_CHECK=y
57# CONFIG_CRYPTO_ANSI_CPRNG is not set 54# CONFIG_CRYPTO_ANSI_CPRNG is not set
58CONFIG_MTD=y
59CONFIG_MTD_OF_PARTS=y
60CONFIG_MTD_CHAR=y
61CONFIG_MTD_BLKDEVS=y
62CONFIG_MTD_BLOCK=y
63CONFIG_MTD_CFI=y
64CONFIG_MTD_GEN_PROBE=y
65CONFIG_MTD_CFI_ADV_OPTIONS=y
66CONFIG_MTD_CFI_NOSWAP=y
67CONFIG_MTD_CFI_GEOMETRY=y
68CONFIG_MTD_MAP_BANK_WIDTH_1=y
69CONFIG_MTD_MAP_BANK_WIDTH_2=y
70CONFIG_MTD_MAP_BANK_WIDTH_4=y
71CONFIG_MTD_CFI_I1=y
72CONFIG_MTD_CFI_I2=y
73CONFIG_MTD_CFI_I4=y
74CONFIG_MTD_CFI_INTELEXT=y
75CONFIG_MTD_CFI_UTIL=y
76CONFIG_MTD_PHYSMAP_OF=y
diff --git a/arch/powerpc/configs/85xx/socrates_defconfig b/arch/powerpc/configs/85xx/socrates_defconfig
index 435fd408eef1..0ad7bd5ee6b6 100644
--- a/arch/powerpc/configs/85xx/socrates_defconfig
+++ b/arch/powerpc/configs/85xx/socrates_defconfig
@@ -1,20 +1,17 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=16 3CONFIG_LOG_BUF_SHIFT=16
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13CONFIG_MODULE_FORCE_UNLOAD=y 10CONFIG_MODULE_FORCE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12CONFIG_PARTITION_ADVANCED=y
15CONFIG_SOCRATES=y 13CONFIG_SOCRATES=y
16CONFIG_MATH_EMULATION=y 14CONFIG_MATH_EMULATION=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_PCI=y 15CONFIG_PCI=y
19CONFIG_NET=y 16CONFIG_NET=y
20CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -28,13 +25,8 @@ CONFIG_SYN_COOKIES=y
28# CONFIG_INET_LRO is not set 25# CONFIG_INET_LRO is not set
29# CONFIG_IPV6 is not set 26# CONFIG_IPV6 is not set
30CONFIG_CAN=y 27CONFIG_CAN=y
31CONFIG_CAN_RAW=y
32CONFIG_CAN_BCM=y
33CONFIG_MTD=y 28CONFIG_MTD=y
34CONFIG_MTD_CONCAT=y
35CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 30CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
40CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
@@ -49,11 +41,8 @@ CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y 41CONFIG_BLK_DEV_SD=y
50# CONFIG_SCSI_LOWLEVEL is not set 42# CONFIG_SCSI_LOWLEVEL is not set
51CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
52CONFIG_MARVELL_PHY=y
53CONFIG_NET_ETHERNET=y
54CONFIG_MII=y
55CONFIG_GIANFAR=y 44CONFIG_GIANFAR=y
56# CONFIG_NETDEV_10000 is not set 45CONFIG_MARVELL_PHY=y
57CONFIG_INPUT_MOUSEDEV_SCREEN_X=800 46CONFIG_INPUT_MOUSEDEV_SCREEN_X=800
58CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 47CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
59CONFIG_INPUT_EVDEV=y 48CONFIG_INPUT_EVDEV=y
@@ -65,7 +54,6 @@ CONFIG_SERIAL_8250=y
65CONFIG_SERIAL_8250_CONSOLE=y 54CONFIG_SERIAL_8250_CONSOLE=y
66CONFIG_SERIAL_8250_NR_UARTS=2 55CONFIG_SERIAL_8250_NR_UARTS=2
67CONFIG_SERIAL_8250_RUNTIME_UARTS=2 56CONFIG_SERIAL_8250_RUNTIME_UARTS=2
68CONFIG_SERIAL_8250_EXTENDED=y
69CONFIG_SERIAL_8250_MANY_PORTS=y 57CONFIG_SERIAL_8250_MANY_PORTS=y
70CONFIG_SERIAL_8250_DETECT_IRQ=y 58CONFIG_SERIAL_8250_DETECT_IRQ=y
71CONFIG_SERIAL_8250_RSA=y 59CONFIG_SERIAL_8250_RSA=y
@@ -82,8 +70,6 @@ CONFIG_FB_MB862XX=y
82CONFIG_FB_MB862XX_LIME=y 70CONFIG_FB_MB862XX_LIME=y
83# CONFIG_VGA_CONSOLE is not set 71# CONFIG_VGA_CONSOLE is not set
84CONFIG_FRAMEBUFFER_CONSOLE=y 72CONFIG_FRAMEBUFFER_CONSOLE=y
85CONFIG_FONTS=y
86CONFIG_FONT_8x16=y
87CONFIG_USB=y 73CONFIG_USB=y
88CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 74CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
89CONFIG_USB_MON=y 75CONFIG_USB_MON=y
@@ -95,15 +81,11 @@ CONFIG_RTC_CLASS=y
95CONFIG_EXT2_FS=y 81CONFIG_EXT2_FS=y
96CONFIG_EXT3_FS=y 82CONFIG_EXT3_FS=y
97# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 83# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
98CONFIG_INOTIFY=y
99CONFIG_PROC_KCORE=y 84CONFIG_PROC_KCORE=y
100CONFIG_TMPFS=y 85CONFIG_TMPFS=y
101CONFIG_JFFS2_FS=y 86CONFIG_JFFS2_FS=y
102CONFIG_CRAMFS=y 87CONFIG_CRAMFS=y
103CONFIG_NFS_FS=y 88CONFIG_NFS_FS=y
104CONFIG_NFS_V3=y
105CONFIG_ROOT_NFS=y 89CONFIG_ROOT_NFS=y
106CONFIG_PARTITION_ADVANCED=y 90CONFIG_FONTS=y
107# CONFIG_RCU_CPU_STALL_DETECTOR is not set
108CONFIG_SYSCTL_SYSCALL_CHECK=y
109# CONFIG_CRYPTO_ANSI_CPRNG is not set 91# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig
index 5d4db154bf59..f66d16ba8c58 100644
--- a/arch/powerpc/configs/85xx/stx_gp3_defconfig
+++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig
@@ -1,9 +1,7 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8CONFIG_MODULES=y 6CONFIG_MODULES=y
9CONFIG_MODVERSIONS=y 7CONFIG_MODVERSIONS=y
@@ -12,7 +10,6 @@ CONFIG_STX_GP3=y
12CONFIG_HIGHMEM=y 10CONFIG_HIGHMEM=y
13CONFIG_BINFMT_MISC=m 11CONFIG_BINFMT_MISC=m
14CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 13CONFIG_PCI=y
17CONFIG_NET=y 14CONFIG_NET=y
18CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -28,7 +25,6 @@ CONFIG_IP_NF_FILTER=m
28CONFIG_NET_PKTGEN=y 25CONFIG_NET_PKTGEN=y
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 27# CONFIG_FW_LOADER is not set
31CONFIG_PROC_DEVICETREE=y
32CONFIG_PARPORT=m 28CONFIG_PARPORT=m
33CONFIG_PARPORT_PC=m 29CONFIG_PARPORT_PC=m
34CONFIG_BLK_DEV_LOOP=m 30CONFIG_BLK_DEV_LOOP=m
@@ -42,12 +38,10 @@ CONFIG_BLK_DEV_SD=m
42CONFIG_CHR_DEV_ST=m 38CONFIG_CHR_DEV_ST=m
43CONFIG_BLK_DEV_SR=m 39CONFIG_BLK_DEV_SR=m
44CONFIG_CHR_DEV_SG=m 40CONFIG_CHR_DEV_SG=m
45CONFIG_SCSI_MULTI_LUN=y
46CONFIG_SCSI_CONSTANTS=y 41CONFIG_SCSI_CONSTANTS=y
47CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
48CONFIG_MARVELL_PHY=y
49CONFIG_NET_ETHERNET=y
50CONFIG_GIANFAR=y 43CONFIG_GIANFAR=y
44CONFIG_MARVELL_PHY=y
51CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280 45CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
52CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024 46CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1024
53CONFIG_INPUT_JOYDEV=m 47CONFIG_INPUT_JOYDEV=m
@@ -63,8 +57,6 @@ CONFIG_SOUND=m
63CONFIG_EXT2_FS=y 57CONFIG_EXT2_FS=y
64CONFIG_EXT3_FS=y 58CONFIG_EXT3_FS=y
65# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 59# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
66CONFIG_INOTIFY=y
67CONFIG_AUTOFS_FS=m
68CONFIG_AUTOFS4_FS=y 60CONFIG_AUTOFS4_FS=y
69CONFIG_ISO9660_FS=m 61CONFIG_ISO9660_FS=m
70CONFIG_UDF_FS=m 62CONFIG_UDF_FS=m
@@ -73,16 +65,11 @@ CONFIG_VFAT_FS=m
73CONFIG_TMPFS=y 65CONFIG_TMPFS=y
74CONFIG_CRAMFS=m 66CONFIG_CRAMFS=m
75CONFIG_NFS_FS=y 67CONFIG_NFS_FS=y
76CONFIG_NFS_V3=y
77CONFIG_ROOT_NFS=y 68CONFIG_ROOT_NFS=y
78CONFIG_SMB_FS=m
79CONFIG_NLS=y 69CONFIG_NLS=y
80CONFIG_CRC_CCITT=y 70CONFIG_CRC_CCITT=y
81CONFIG_CRC_T10DIF=m 71CONFIG_CRC_T10DIF=m
82CONFIG_DEBUG_KERNEL=y
83CONFIG_DETECT_HUNG_TASK=y 72CONFIG_DETECT_HUNG_TASK=y
84# CONFIG_DEBUG_BUGVERBOSE is not set 73# CONFIG_DEBUG_BUGVERBOSE is not set
85# CONFIG_RCU_CPU_STALL_DETECTOR is not set
86CONFIG_SYSCTL_SYSCALL_CHECK=y
87CONFIG_BDI_SWITCH=y 74CONFIG_BDI_SWITCH=y
88# CONFIG_CRYPTO_ANSI_CPRNG is not set 75# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig
index 5a800e6e38e3..4daaf2943b44 100644
--- a/arch/powerpc/configs/85xx/tqm8540_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8540_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8540=y 11CONFIG_TQM8540=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -58,15 +52,10 @@ CONFIG_SENSORS_LM75=y
58CONFIG_EXT2_FS=y 52CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
61CONFIG_INOTIFY=y
62CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 56CONFIG_TMPFS=y
64CONFIG_JFFS2_FS=y 57CONFIG_JFFS2_FS=y
65CONFIG_CRAMFS=y 58CONFIG_CRAMFS=y
66CONFIG_NFS_FS=y 59CONFIG_NFS_FS=y
67CONFIG_ROOT_NFS=y 60CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69# CONFIG_MSDOS_PARTITION is not set
70# CONFIG_RCU_CPU_STALL_DETECTOR is not set
71CONFIG_SYSCTL_SYSCALL_CHECK=y
72# CONFIG_CRYPTO_ANSI_CPRNG is not set 61# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig
index 2d936697d69e..bb402b3cf786 100644
--- a/arch/powerpc/configs/85xx/tqm8541_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8541_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8541=y 11CONFIG_TQM8541=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -60,15 +54,10 @@ CONFIG_SENSORS_LM75=y
60CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
61CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
62# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
63CONFIG_INOTIFY=y
64CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
65CONFIG_TMPFS=y 58CONFIG_TMPFS=y
66CONFIG_JFFS2_FS=y 59CONFIG_JFFS2_FS=y
67CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
68CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
69CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
70CONFIG_PARTITION_ADVANCED=y
71# CONFIG_MSDOS_PARTITION is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
index ce8a67e89473..685d0fb132d6 100644
--- a/arch/powerpc/configs/85xx/tqm8548_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -1,20 +1,19 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8CONFIG_MODULES=y 8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
11CONFIG_TQM8548=y 13CONFIG_TQM8548=y
12CONFIG_HIGHMEM=y 14CONFIG_HIGHMEM=y
13CONFIG_NO_HZ=y
14CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BINFMT_MISC=y 15CONFIG_BINFMT_MISC=y
16CONFIG_MATH_EMULATION=y 16CONFIG_MATH_EMULATION=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
19CONFIG_PCI=y 18CONFIG_PCI=y
20CONFIG_PCIEPORTBUS=y 19CONFIG_PCIEPORTBUS=y
@@ -34,22 +33,16 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 34# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 35CONFIG_MTD=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLKDEVS=y
40CONFIG_MTD_CFI=y 36CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_AMDSTD=y 37CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 38CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_NAND_ECC_SMC=y 39CONFIG_MTD_NAND_ECC_SMC=y
44CONFIG_MTD_NAND=y 40CONFIG_MTD_NAND=y
45CONFIG_MTD_NAND_FSL_UPM=y 41CONFIG_MTD_NAND_FSL_UPM=y
46CONFIG_PROC_DEVICETREE=y
47CONFIG_BLK_DEV_LOOP=y 42CONFIG_BLK_DEV_LOOP=y
48CONFIG_BLK_DEV_RAM=y 43CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_SIZE=32768 44CONFIG_BLK_DEV_RAM_SIZE=32768
50CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
51CONFIG_NET_ETHERNET=y
52CONFIG_MII=y
53CONFIG_GIANFAR=y 46CONFIG_GIANFAR=y
54# CONFIG_INPUT_MOUSEDEV is not set 47# CONFIG_INPUT_MOUSEDEV is not set
55# CONFIG_INPUT_KEYBOARD is not set 48# CONFIG_INPUT_KEYBOARD is not set
@@ -63,22 +56,15 @@ CONFIG_I2C=y
63CONFIG_I2C_CHARDEV=y 56CONFIG_I2C_CHARDEV=y
64CONFIG_I2C_MPC=y 57CONFIG_I2C_MPC=y
65CONFIG_SENSORS_LM75=y 58CONFIG_SENSORS_LM75=y
66CONFIG_VIDEO_OUTPUT_CONTROL=y
67# CONFIG_USB_SUPPORT is not set 59# CONFIG_USB_SUPPORT is not set
68CONFIG_RTC_CLASS=y 60CONFIG_RTC_CLASS=y
69CONFIG_RTC_DRV_DS1307=y 61CONFIG_RTC_DRV_DS1307=y
70CONFIG_INOTIFY=y
71CONFIG_PROC_KCORE=y 62CONFIG_PROC_KCORE=y
72CONFIG_TMPFS=y 63CONFIG_TMPFS=y
73CONFIG_JFFS2_FS=y 64CONFIG_JFFS2_FS=y
74CONFIG_NFS_FS=y 65CONFIG_NFS_FS=y
75CONFIG_ROOT_NFS=y 66CONFIG_ROOT_NFS=y
76CONFIG_PARTITION_ADVANCED=y
77# CONFIG_MSDOS_PARTITION is not set
78CONFIG_DEBUG_KERNEL=y
79CONFIG_DETECT_HUNG_TASK=y 67CONFIG_DETECT_HUNG_TASK=y
80CONFIG_DEBUG_MUTEXES=y 68CONFIG_DEBUG_MUTEXES=y
81# CONFIG_DEBUG_BUGVERBOSE is not set 69# CONFIG_DEBUG_BUGVERBOSE is not set
82# CONFIG_RCU_CPU_STALL_DETECTOR is not set
83CONFIG_SYSCTL_SYSCALL_CHECK=y
84# CONFIG_CRYPTO_ANSI_CPRNG is not set 70# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig
index a4e12971ccac..02a931d4e954 100644
--- a/arch/powerpc/configs/85xx/tqm8555_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8555_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8555=y 11CONFIG_TQM8555=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -60,15 +54,10 @@ CONFIG_SENSORS_LM75=y
60CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
61CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
62# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
63CONFIG_INOTIFY=y
64CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
65CONFIG_TMPFS=y 58CONFIG_TMPFS=y
66CONFIG_JFFS2_FS=y 59CONFIG_JFFS2_FS=y
67CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
68CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
69CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
70CONFIG_PARTITION_ADVANCED=y
71# CONFIG_MSDOS_PARTITION is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig
index 341abe18a74d..633d5b759a36 100644
--- a/arch/powerpc/configs/85xx/tqm8560_defconfig
+++ b/arch/powerpc/configs/85xx/tqm8560_defconfig
@@ -1,17 +1,15 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_LOG_BUF_SHIFT=14 3CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 4CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_KALLSYMS is not set 6# CONFIG_KALLSYMS is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_EPOLL is not set 7# CONFIG_EPOLL is not set
11# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
10# CONFIG_MSDOS_PARTITION is not set
12CONFIG_TQM8560=y 11CONFIG_TQM8560=y
13CONFIG_MATH_EMULATION=y 12CONFIG_MATH_EMULATION=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 13CONFIG_PCI=y
16CONFIG_NET=y 14CONFIG_NET=y
17CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -25,9 +23,7 @@ CONFIG_SYN_COOKIES=y
25# CONFIG_INET_LRO is not set 23# CONFIG_INET_LRO is not set
26# CONFIG_IPV6 is not set 24# CONFIG_IPV6 is not set
27CONFIG_MTD=y 25CONFIG_MTD=y
28CONFIG_MTD_CONCAT=y
29CONFIG_MTD_CMDLINE_PARTS=y 26CONFIG_MTD_CMDLINE_PARTS=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 27CONFIG_MTD_BLOCK=y
32CONFIG_MTD_CFI=y 28CONFIG_MTD_CFI=y
33CONFIG_MTD_CFI_AMDSTD=y 29CONFIG_MTD_CFI_AMDSTD=y
@@ -38,10 +34,8 @@ CONFIG_IDE=y
38CONFIG_BLK_DEV_GENERIC=y 34CONFIG_BLK_DEV_GENERIC=y
39CONFIG_BLK_DEV_VIA82CXXX=y 35CONFIG_BLK_DEV_VIA82CXXX=y
40CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y
44CONFIG_GIANFAR=y 37CONFIG_GIANFAR=y
38CONFIG_E100=y
45# CONFIG_INPUT_MOUSEDEV is not set 39# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 40# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 41# CONFIG_INPUT_MOUSE is not set
@@ -60,15 +54,10 @@ CONFIG_SENSORS_LM75=y
60CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
61CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
62# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 56# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
63CONFIG_INOTIFY=y
64CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
65CONFIG_TMPFS=y 58CONFIG_TMPFS=y
66CONFIG_JFFS2_FS=y 59CONFIG_JFFS2_FS=y
67CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
68CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
69CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
70CONFIG_PARTITION_ADVANCED=y
71# CONFIG_MSDOS_PARTITION is not set
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_SYSCTL_SYSCALL_CHECK=y
74# CONFIG_CRYPTO_ANSI_CPRNG is not set 63# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index 72df8ab8449e..34f3ea1729e0 100644
--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
@@ -1,29 +1,25 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=2 3CONFIG_NR_CPUS=2
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y 6CONFIG_AUDIT=y
7CONFIG_BSD_PROCESS_ACCT=y
9CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 9CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
12CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 12CONFIG_EXPERT=y
15CONFIG_KALLSYMS_ALL=y 13CONFIG_KALLSYMS_ALL=y
16CONFIG_KALLSYMS_EXTRA_PASS=y
17CONFIG_MODULES=y 14CONFIG_MODULES=y
18CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
19CONFIG_MODULE_FORCE_UNLOAD=y 16CONFIG_MODULE_FORCE_UNLOAD=y
20CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
21# CONFIG_BLK_DEV_BSG is not set 18# CONFIG_BLK_DEV_BSG is not set
19CONFIG_PARTITION_ADVANCED=y
22CONFIG_XES_MPC85xx=y 20CONFIG_XES_MPC85xx=y
23CONFIG_GPIO_MPC8XXX=y
24CONFIG_HIGHMEM=y 21CONFIG_HIGHMEM=y
25CONFIG_MATH_EMULATION=y 22CONFIG_MATH_EMULATION=y
26CONFIG_SPARSE_IRQ=y
27CONFIG_PCI=y 23CONFIG_PCI=y
28CONFIG_PCIEPORTBUS=y 24CONFIG_PCIEPORTBUS=y
29# CONFIG_PCIEASPM is not set 25# CONFIG_PCIEASPM is not set
@@ -52,12 +48,9 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_IP_PNP_BOOTP=y 48CONFIG_IP_PNP_BOOTP=y
53CONFIG_IP_PNP_RARP=y 49CONFIG_IP_PNP_RARP=y
54CONFIG_NET_IPIP=y 50CONFIG_NET_IPIP=y
55CONFIG_NET_IPGRE=y
56CONFIG_NET_IPGRE_BROADCAST=y
57CONFIG_IP_MROUTE=y 51CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 52CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 53CONFIG_IP_PIMSM_V2=y
60CONFIG_ARPD=y
61# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 54# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
62# CONFIG_INET_XFRM_MODE_TUNNEL is not set 55# CONFIG_INET_XFRM_MODE_TUNNEL is not set
63# CONFIG_INET_XFRM_MODE_BEET is not set 56# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -67,8 +60,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
67CONFIG_MTD=y 60CONFIG_MTD=y
68CONFIG_MTD_REDBOOT_PARTS=y 61CONFIG_MTD_REDBOOT_PARTS=y
69CONFIG_MTD_CMDLINE_PARTS=y 62CONFIG_MTD_CMDLINE_PARTS=y
70CONFIG_MTD_OF_PARTS=y
71CONFIG_MTD_CHAR=y
72CONFIG_MTD_BLOCK=y 63CONFIG_MTD_BLOCK=y
73CONFIG_MTD_CFI=y 64CONFIG_MTD_CFI=y
74CONFIG_MTD_JEDECPROBE=y 65CONFIG_MTD_JEDECPROBE=y
@@ -79,7 +70,6 @@ CONFIG_MTD_PHYSMAP_OF=y
79CONFIG_MTD_NAND=y 70CONFIG_MTD_NAND=y
80CONFIG_MTD_NAND_FSL_ELBC=y 71CONFIG_MTD_NAND_FSL_ELBC=y
81CONFIG_MTD_NAND_FSL_UPM=y 72CONFIG_MTD_NAND_FSL_UPM=y
82CONFIG_PROC_DEVICETREE=y
83CONFIG_BLK_DEV_LOOP=y 73CONFIG_BLK_DEV_LOOP=y
84CONFIG_BLK_DEV_NBD=y 74CONFIG_BLK_DEV_NBD=y
85CONFIG_BLK_DEV_RAM=y 75CONFIG_BLK_DEV_RAM=y
@@ -88,19 +78,15 @@ CONFIG_BLK_DEV_SD=y
88CONFIG_CHR_DEV_ST=y 78CONFIG_CHR_DEV_ST=y
89CONFIG_BLK_DEV_SR=y 79CONFIG_BLK_DEV_SR=y
90CONFIG_CHR_DEV_SG=y 80CONFIG_CHR_DEV_SG=y
91CONFIG_SCSI_MULTI_LUN=y
92CONFIG_SCSI_LOGGING=y 81CONFIG_SCSI_LOGGING=y
93CONFIG_ATA=y 82CONFIG_ATA=y
94CONFIG_SATA_AHCI=y 83CONFIG_SATA_AHCI=y
95CONFIG_PATA_ALI=y 84CONFIG_PATA_ALI=y
96CONFIG_NETDEVICES=y 85CONFIG_NETDEVICES=y
97CONFIG_DUMMY=y 86CONFIG_DUMMY=y
98CONFIG_BROADCOM_PHY=y
99CONFIG_NET_ETHERNET=y
100CONFIG_MII=y
101CONFIG_E1000=y
102CONFIG_GIANFAR=y 87CONFIG_GIANFAR=y
103# CONFIG_NETDEV_10000 is not set 88CONFIG_E1000=y
89CONFIG_BROADCOM_PHY=y
104# CONFIG_INPUT_MOUSEDEV is not set 90# CONFIG_INPUT_MOUSEDEV is not set
105# CONFIG_INPUT_KEYBOARD is not set 91# CONFIG_INPUT_KEYBOARD is not set
106# CONFIG_INPUT_MOUSE is not set 92# CONFIG_INPUT_MOUSE is not set
@@ -109,7 +95,6 @@ CONFIG_SERIAL_8250=y
109CONFIG_SERIAL_8250_CONSOLE=y 95CONFIG_SERIAL_8250_CONSOLE=y
110CONFIG_SERIAL_8250_NR_UARTS=2 96CONFIG_SERIAL_8250_NR_UARTS=2
111CONFIG_SERIAL_8250_RUNTIME_UARTS=2 97CONFIG_SERIAL_8250_RUNTIME_UARTS=2
112CONFIG_SERIAL_8250_EXTENDED=y
113CONFIG_SERIAL_8250_MANY_PORTS=y 98CONFIG_SERIAL_8250_MANY_PORTS=y
114CONFIG_SERIAL_8250_DETECT_IRQ=y 99CONFIG_SERIAL_8250_DETECT_IRQ=y
115CONFIG_SERIAL_8250_RSA=y 100CONFIG_SERIAL_8250_RSA=y
@@ -118,25 +103,19 @@ CONFIG_NVRAM=y
118CONFIG_I2C=y 103CONFIG_I2C=y
119CONFIG_I2C_CHARDEV=y 104CONFIG_I2C_CHARDEV=y
120CONFIG_I2C_MPC=y 105CONFIG_I2C_MPC=y
121CONFIG_GPIO_SYSFS=y
122CONFIG_GPIO_PCA953X=y
123CONFIG_SENSORS_DS1621=y 106CONFIG_SENSORS_DS1621=y
124CONFIG_SENSORS_LM90=y 107CONFIG_SENSORS_LM90=y
125CONFIG_WATCHDOG=y 108CONFIG_WATCHDOG=y
126CONFIG_VIDEO_OUTPUT_CONTROL=y
127CONFIG_USB=y 109CONFIG_USB=y
128# CONFIG_USB_DEVICE_CLASS is not set
129CONFIG_USB_MON=y 110CONFIG_USB_MON=y
130CONFIG_USB_ISP1760_HCD=y 111CONFIG_USB_ISP1760_HCD=y
131CONFIG_USB_STORAGE=y 112CONFIG_USB_STORAGE=y
132CONFIG_NEW_LEDS=y 113CONFIG_NEW_LEDS=y
133CONFIG_LEDS_CLASS=y 114CONFIG_LEDS_CLASS=y
134CONFIG_LEDS_GPIO=y
135CONFIG_LEDS_PCA955X=y 115CONFIG_LEDS_PCA955X=y
136CONFIG_LEDS_TRIGGERS=y 116CONFIG_LEDS_TRIGGERS=y
137CONFIG_LEDS_TRIGGER_TIMER=y 117CONFIG_LEDS_TRIGGER_TIMER=y
138CONFIG_LEDS_TRIGGER_HEARTBEAT=y 118CONFIG_LEDS_TRIGGER_HEARTBEAT=y
139CONFIG_LEDS_TRIGGER_GPIO=y
140CONFIG_EDAC=y 119CONFIG_EDAC=y
141CONFIG_EDAC_MM_EDAC=y 120CONFIG_EDAC_MM_EDAC=y
142CONFIG_RTC_CLASS=y 121CONFIG_RTC_CLASS=y
@@ -147,7 +126,6 @@ CONFIG_FSL_DMA=y
147CONFIG_EXT2_FS=y 126CONFIG_EXT2_FS=y
148CONFIG_EXT3_FS=y 127CONFIG_EXT3_FS=y
149# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 128# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
150CONFIG_INOTIFY=y
151CONFIG_ISO9660_FS=y 129CONFIG_ISO9660_FS=y
152CONFIG_JOLIET=y 130CONFIG_JOLIET=y
153CONFIG_ZISOFS=y 131CONFIG_ZISOFS=y
@@ -159,17 +137,13 @@ CONFIG_TMPFS=y
159CONFIG_JFFS2_FS=y 137CONFIG_JFFS2_FS=y
160CONFIG_JFFS2_SUMMARY=y 138CONFIG_JFFS2_SUMMARY=y
161CONFIG_NFS_FS=y 139CONFIG_NFS_FS=y
162CONFIG_NFS_V3=y
163CONFIG_ROOT_NFS=y 140CONFIG_ROOT_NFS=y
164CONFIG_NFSD=y 141CONFIG_NFSD=y
165CONFIG_PARTITION_ADVANCED=y
166CONFIG_NLS_CODEPAGE_437=y 142CONFIG_NLS_CODEPAGE_437=y
167CONFIG_NLS_ISO8859_1=y 143CONFIG_NLS_ISO8859_1=y
168CONFIG_CRC_T10DIF=y 144CONFIG_CRC_T10DIF=y
169CONFIG_DEBUG_KERNEL=y
170CONFIG_DETECT_HUNG_TASK=y 145CONFIG_DETECT_HUNG_TASK=y
171# CONFIG_DEBUG_BUGVERBOSE is not set 146# CONFIG_DEBUG_BUGVERBOSE is not set
172# CONFIG_RCU_CPU_STALL_DETECTOR is not set
173CONFIG_CRYPTO_HMAC=y 147CONFIG_CRYPTO_HMAC=y
174CONFIG_CRYPTO_MD5=y 148CONFIG_CRYPTO_MD5=y
175# CONFIG_CRYPTO_ANSI_CPRNG is not set 149# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index 7cb9719abf3d..9792a2cb9b20 100644
--- a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -21,11 +20,9 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_GEF_PPC9A=y 21CONFIG_GEF_PPC9A=y
23CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
24CONFIG_HIGH_RES_TIMERS=y
25CONFIG_HZ_1000=y 23CONFIG_HZ_1000=y
26CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
27CONFIG_BINFMT_MISC=m 25CONFIG_BINFMT_MISC=m
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 26CONFIG_PCI=y
30CONFIG_PCIEPORTBUS=y 27CONFIG_PCIEPORTBUS=y
31# CONFIG_PCIEASPM is not set 28# CONFIG_PCIEASPM is not set
@@ -52,8 +49,6 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_IP_PNP_BOOTP=y 49CONFIG_IP_PNP_BOOTP=y
53CONFIG_IP_PNP_RARP=y 50CONFIG_IP_PNP_RARP=y
54CONFIG_NET_IPIP=m 51CONFIG_NET_IPIP=m
55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPGRE_BROADCAST=y
57CONFIG_IP_MROUTE=y 52CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 53CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 54CONFIG_IP_PIMSM_V2=y
@@ -69,9 +64,6 @@ CONFIG_IPV6_TUNNEL=m
69CONFIG_NET_PKTGEN=m 64CONFIG_NET_PKTGEN=m
70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 65CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71CONFIG_MTD=y 66CONFIG_MTD=y
72CONFIG_MTD_CONCAT=y
73CONFIG_MTD_OF_PARTS=y
74CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
76CONFIG_MTD_CFI=y 68CONFIG_MTD_CFI=y
77CONFIG_MTD_JEDECPROBE=y 69CONFIG_MTD_JEDECPROBE=y
@@ -83,7 +75,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
83CONFIG_BLK_DEV_NBD=m 75CONFIG_BLK_DEV_NBD=m
84CONFIG_BLK_DEV_RAM=y 76CONFIG_BLK_DEV_RAM=y
85CONFIG_BLK_DEV_RAM_SIZE=131072 77CONFIG_BLK_DEV_RAM_SIZE=131072
86CONFIG_MISC_DEVICES=y
87CONFIG_DS1682=y 78CONFIG_DS1682=y
88CONFIG_IDE=y 79CONFIG_IDE=y
89CONFIG_BLK_DEV_IDECS=y 80CONFIG_BLK_DEV_IDECS=y
@@ -93,35 +84,32 @@ CONFIG_BLK_DEV_SR=y
93CONFIG_ATA=y 84CONFIG_ATA=y
94CONFIG_SATA_SIL=y 85CONFIG_SATA_SIL=y
95CONFIG_NETDEVICES=y 86CONFIG_NETDEVICES=y
96CONFIG_DUMMY=m
97CONFIG_BONDING=m 87CONFIG_BONDING=m
88CONFIG_DUMMY=m
89CONFIG_NETCONSOLE=y
98CONFIG_TUN=m 90CONFIG_TUN=m
99CONFIG_NET_ETHERNET=y
100CONFIG_MII=y
101CONFIG_GIANFAR=y 91CONFIG_GIANFAR=y
102# CONFIG_NETDEV_10000 is not set
103CONFIG_PPP=m 92CONFIG_PPP=m
104CONFIG_PPP_MULTILINK=y 93CONFIG_PPP_BSDCOMP=m
94CONFIG_PPP_DEFLATE=m
105CONFIG_PPP_FILTER=y 95CONFIG_PPP_FILTER=y
96CONFIG_PPP_MULTILINK=y
97CONFIG_PPPOE=m
106CONFIG_PPP_ASYNC=m 98CONFIG_PPP_ASYNC=m
107CONFIG_PPP_SYNC_TTY=m 99CONFIG_PPP_SYNC_TTY=m
108CONFIG_PPP_DEFLATE=m
109CONFIG_PPP_BSDCOMP=m
110CONFIG_PPPOE=m
111CONFIG_SLIP=m 100CONFIG_SLIP=m
112CONFIG_SLIP_COMPRESSED=y 101CONFIG_SLIP_COMPRESSED=y
113CONFIG_SLIP_SMART=y 102CONFIG_SLIP_SMART=y
114CONFIG_SLIP_MODE_SLIP6=y 103CONFIG_SLIP_MODE_SLIP6=y
115CONFIG_NETCONSOLE=y
116# CONFIG_INPUT_KEYBOARD is not set 104# CONFIG_INPUT_KEYBOARD is not set
117# CONFIG_INPUT_MOUSE is not set 105# CONFIG_INPUT_MOUSE is not set
118# CONFIG_SERIO is not set 106# CONFIG_SERIO is not set
107# CONFIG_LEGACY_PTYS is not set
119CONFIG_SERIAL_8250=y 108CONFIG_SERIAL_8250=y
120CONFIG_SERIAL_8250_CONSOLE=y 109CONFIG_SERIAL_8250_CONSOLE=y
121# CONFIG_SERIAL_8250_PCI is not set 110# CONFIG_SERIAL_8250_PCI is not set
122CONFIG_SERIAL_8250_NR_UARTS=2 111CONFIG_SERIAL_8250_NR_UARTS=2
123CONFIG_SERIAL_8250_RUNTIME_UARTS=2 112CONFIG_SERIAL_8250_RUNTIME_UARTS=2
124# CONFIG_LEGACY_PTYS is not set
125CONFIG_HW_RANDOM=y 113CONFIG_HW_RANDOM=y
126CONFIG_NVRAM=y 114CONFIG_NVRAM=y
127CONFIG_I2C=y 115CONFIG_I2C=y
@@ -133,7 +121,6 @@ CONFIG_SENSORS_LM90=y
133CONFIG_SENSORS_LM92=y 121CONFIG_SENSORS_LM92=y
134CONFIG_WATCHDOG=y 122CONFIG_WATCHDOG=y
135CONFIG_GEF_WDT=y 123CONFIG_GEF_WDT=y
136CONFIG_VIDEO_OUTPUT_CONTROL=m
137CONFIG_HID_A4TECH=y 124CONFIG_HID_A4TECH=y
138CONFIG_HID_APPLE=y 125CONFIG_HID_APPLE=y
139CONFIG_HID_BELKIN=y 126CONFIG_HID_BELKIN=y
@@ -148,10 +135,8 @@ CONFIG_HID_MONTEREY=y
148CONFIG_HID_PANTHERLORD=y 135CONFIG_HID_PANTHERLORD=y
149CONFIG_HID_PETALYNX=y 136CONFIG_HID_PETALYNX=y
150CONFIG_HID_SAMSUNG=y 137CONFIG_HID_SAMSUNG=y
151CONFIG_HID_SONY=y
152CONFIG_HID_SUNPLUS=y 138CONFIG_HID_SUNPLUS=y
153CONFIG_USB=y 139CONFIG_USB=y
154# CONFIG_USB_DEVICE_CLASS is not set
155CONFIG_USB_EHCI_HCD=y 140CONFIG_USB_EHCI_HCD=y
156# CONFIG_USB_EHCI_HCD_PPC_OF is not set 141# CONFIG_USB_EHCI_HCD_PPC_OF is not set
157CONFIG_USB_OHCI_HCD=y 142CONFIG_USB_OHCI_HCD=y
@@ -160,7 +145,6 @@ CONFIG_RTC_CLASS=y
160# CONFIG_RTC_INTF_PROC is not set 145# CONFIG_RTC_INTF_PROC is not set
161CONFIG_RTC_DRV_RX8581=y 146CONFIG_RTC_DRV_RX8581=y
162CONFIG_STAGING=y 147CONFIG_STAGING=y
163# CONFIG_STAGING_EXCLUDE_BUILD is not set
164CONFIG_VME_BUS=y 148CONFIG_VME_BUS=y
165CONFIG_VME_TSI148=y 149CONFIG_VME_TSI148=y
166CONFIG_EXT2_FS=y 150CONFIG_EXT2_FS=y
@@ -169,7 +153,6 @@ CONFIG_EXT2_FS_POSIX_ACL=y
169CONFIG_EXT3_FS=y 153CONFIG_EXT3_FS=y
170# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 154# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
171CONFIG_EXT3_FS_POSIX_ACL=y 155CONFIG_EXT3_FS_POSIX_ACL=y
172CONFIG_INOTIFY=y
173CONFIG_ISO9660_FS=y 156CONFIG_ISO9660_FS=y
174CONFIG_JOLIET=y 157CONFIG_JOLIET=y
175CONFIG_ZISOFS=y 158CONFIG_ZISOFS=y
@@ -182,7 +165,6 @@ CONFIG_PROC_KCORE=y
182CONFIG_TMPFS=y 165CONFIG_TMPFS=y
183CONFIG_JFFS2_FS=y 166CONFIG_JFFS2_FS=y
184CONFIG_NFS_FS=y 167CONFIG_NFS_FS=y
185CONFIG_NFS_V3=y
186CONFIG_NFS_V4=y 168CONFIG_NFS_V4=y
187CONFIG_ROOT_NFS=y 169CONFIG_ROOT_NFS=y
188CONFIG_CIFS=m 170CONFIG_CIFS=m
@@ -230,7 +212,5 @@ CONFIG_CRC_CCITT=y
230CONFIG_CRC_T10DIF=y 212CONFIG_CRC_T10DIF=y
231CONFIG_LIBCRC32C=y 213CONFIG_LIBCRC32C=y
232CONFIG_MAGIC_SYSRQ=y 214CONFIG_MAGIC_SYSRQ=y
233# CONFIG_RCU_CPU_STALL_DETECTOR is not set
234CONFIG_SYSCTL_SYSCALL_CHECK=y
235# CONFIG_CRYPTO_ANSI_CPRNG is not set 215# CONFIG_CRYPTO_ANSI_CPRNG is not set
236# CONFIG_CRYPTO_HW is not set 216# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc310_defconfig b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
index ecabf625d249..cadc36682bb4 100644
--- a/arch/powerpc/configs/86xx/gef_sbc310_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc310_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -21,11 +20,9 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_GEF_SBC310=y 21CONFIG_GEF_SBC310=y
23CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
24CONFIG_HIGH_RES_TIMERS=y
25CONFIG_HZ_1000=y 23CONFIG_HZ_1000=y
26CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
27CONFIG_BINFMT_MISC=y 25CONFIG_BINFMT_MISC=y
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 26CONFIG_PCI=y
30CONFIG_PCIEPORTBUS=y 27CONFIG_PCIEPORTBUS=y
31# CONFIG_PCIEASPM is not set 28# CONFIG_PCIEASPM is not set
@@ -52,8 +49,6 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_IP_PNP_BOOTP=y 49CONFIG_IP_PNP_BOOTP=y
53CONFIG_IP_PNP_RARP=y 50CONFIG_IP_PNP_RARP=y
54CONFIG_NET_IPIP=m 51CONFIG_NET_IPIP=m
55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPGRE_BROADCAST=y
57CONFIG_IP_MROUTE=y 52CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 53CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 54CONFIG_IP_PIMSM_V2=y
@@ -69,9 +64,6 @@ CONFIG_IPV6_TUNNEL=m
69CONFIG_NET_PKTGEN=m 64CONFIG_NET_PKTGEN=m
70CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 65CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71CONFIG_MTD=y 66CONFIG_MTD=y
72CONFIG_MTD_CONCAT=y
73CONFIG_MTD_OF_PARTS=y
74CONFIG_MTD_CHAR=y
75CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
76CONFIG_MTD_CFI=y 68CONFIG_MTD_CFI=y
77CONFIG_MTD_JEDECPROBE=y 69CONFIG_MTD_JEDECPROBE=y
@@ -83,7 +75,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
83CONFIG_BLK_DEV_NBD=m 75CONFIG_BLK_DEV_NBD=m
84CONFIG_BLK_DEV_RAM=y 76CONFIG_BLK_DEV_RAM=y
85CONFIG_BLK_DEV_RAM_SIZE=131072 77CONFIG_BLK_DEV_RAM_SIZE=131072
86CONFIG_MISC_DEVICES=y
87CONFIG_DS1682=y 78CONFIG_DS1682=y
88CONFIG_IDE=y 79CONFIG_IDE=y
89CONFIG_BLK_DEV_IDECS=y 80CONFIG_BLK_DEV_IDECS=y
@@ -94,35 +85,32 @@ CONFIG_ATA=y
94CONFIG_SATA_SIL24=y 85CONFIG_SATA_SIL24=y
95# CONFIG_ATA_SFF is not set 86# CONFIG_ATA_SFF is not set
96CONFIG_NETDEVICES=y 87CONFIG_NETDEVICES=y
97CONFIG_DUMMY=m
98CONFIG_BONDING=m 88CONFIG_BONDING=m
89CONFIG_DUMMY=m
90CONFIG_NETCONSOLE=y
99CONFIG_TUN=m 91CONFIG_TUN=m
100CONFIG_NET_ETHERNET=y
101CONFIG_MII=y
102CONFIG_GIANFAR=y 92CONFIG_GIANFAR=y
103# CONFIG_NETDEV_10000 is not set
104CONFIG_PPP=m 93CONFIG_PPP=m
105CONFIG_PPP_MULTILINK=y 94CONFIG_PPP_BSDCOMP=m
95CONFIG_PPP_DEFLATE=m
106CONFIG_PPP_FILTER=y 96CONFIG_PPP_FILTER=y
97CONFIG_PPP_MULTILINK=y
98CONFIG_PPPOE=m
107CONFIG_PPP_ASYNC=m 99CONFIG_PPP_ASYNC=m
108CONFIG_PPP_SYNC_TTY=m 100CONFIG_PPP_SYNC_TTY=m
109CONFIG_PPP_DEFLATE=m
110CONFIG_PPP_BSDCOMP=m
111CONFIG_PPPOE=m
112CONFIG_SLIP=m 101CONFIG_SLIP=m
113CONFIG_SLIP_COMPRESSED=y 102CONFIG_SLIP_COMPRESSED=y
114CONFIG_SLIP_SMART=y 103CONFIG_SLIP_SMART=y
115CONFIG_SLIP_MODE_SLIP6=y 104CONFIG_SLIP_MODE_SLIP6=y
116CONFIG_NETCONSOLE=y
117# CONFIG_INPUT_KEYBOARD is not set 105# CONFIG_INPUT_KEYBOARD is not set
118# CONFIG_INPUT_MOUSE is not set 106# CONFIG_INPUT_MOUSE is not set
119# CONFIG_SERIO is not set 107# CONFIG_SERIO is not set
108# CONFIG_LEGACY_PTYS is not set
120CONFIG_SERIAL_8250=y 109CONFIG_SERIAL_8250=y
121CONFIG_SERIAL_8250_CONSOLE=y 110CONFIG_SERIAL_8250_CONSOLE=y
122# CONFIG_SERIAL_8250_PCI is not set 111# CONFIG_SERIAL_8250_PCI is not set
123CONFIG_SERIAL_8250_NR_UARTS=2 112CONFIG_SERIAL_8250_NR_UARTS=2
124CONFIG_SERIAL_8250_RUNTIME_UARTS=2 113CONFIG_SERIAL_8250_RUNTIME_UARTS=2
125# CONFIG_LEGACY_PTYS is not set
126CONFIG_HW_RANDOM=y 114CONFIG_HW_RANDOM=y
127CONFIG_NVRAM=y 115CONFIG_NVRAM=y
128CONFIG_I2C=y 116CONFIG_I2C=y
@@ -134,7 +122,6 @@ CONFIG_SENSORS_LM90=y
134CONFIG_SENSORS_LM92=y 122CONFIG_SENSORS_LM92=y
135CONFIG_WATCHDOG=y 123CONFIG_WATCHDOG=y
136CONFIG_GEF_WDT=y 124CONFIG_GEF_WDT=y
137CONFIG_VIDEO_OUTPUT_CONTROL=m
138CONFIG_HID_A4TECH=y 125CONFIG_HID_A4TECH=y
139CONFIG_HID_APPLE=y 126CONFIG_HID_APPLE=y
140CONFIG_HID_BELKIN=y 127CONFIG_HID_BELKIN=y
@@ -149,10 +136,8 @@ CONFIG_HID_MONTEREY=y
149CONFIG_HID_PANTHERLORD=y 136CONFIG_HID_PANTHERLORD=y
150CONFIG_HID_PETALYNX=y 137CONFIG_HID_PETALYNX=y
151CONFIG_HID_SAMSUNG=y 138CONFIG_HID_SAMSUNG=y
152CONFIG_HID_SONY=y
153CONFIG_HID_SUNPLUS=y 139CONFIG_HID_SUNPLUS=y
154CONFIG_USB=y 140CONFIG_USB=y
155# CONFIG_USB_DEVICE_CLASS is not set
156CONFIG_USB_EHCI_HCD=y 141CONFIG_USB_EHCI_HCD=y
157# CONFIG_USB_EHCI_HCD_PPC_OF is not set 142# CONFIG_USB_EHCI_HCD_PPC_OF is not set
158CONFIG_USB_OHCI_HCD=y 143CONFIG_USB_OHCI_HCD=y
@@ -166,7 +151,6 @@ CONFIG_EXT2_FS_POSIX_ACL=y
166CONFIG_EXT3_FS=y 151CONFIG_EXT3_FS=y
167# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 152# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
168CONFIG_EXT3_FS_POSIX_ACL=y 153CONFIG_EXT3_FS_POSIX_ACL=y
169CONFIG_INOTIFY=y
170CONFIG_ISO9660_FS=y 154CONFIG_ISO9660_FS=y
171CONFIG_JOLIET=y 155CONFIG_JOLIET=y
172CONFIG_ZISOFS=y 156CONFIG_ZISOFS=y
@@ -179,7 +163,6 @@ CONFIG_PROC_KCORE=y
179CONFIG_TMPFS=y 163CONFIG_TMPFS=y
180CONFIG_JFFS2_FS=y 164CONFIG_JFFS2_FS=y
181CONFIG_NFS_FS=y 165CONFIG_NFS_FS=y
182CONFIG_NFS_V3=y
183CONFIG_NFS_V4=y 166CONFIG_NFS_V4=y
184CONFIG_ROOT_NFS=y 167CONFIG_ROOT_NFS=y
185CONFIG_CIFS=m 168CONFIG_CIFS=m
@@ -227,7 +210,5 @@ CONFIG_CRC_CCITT=y
227CONFIG_CRC_T10DIF=y 210CONFIG_CRC_T10DIF=y
228CONFIG_LIBCRC32C=y 211CONFIG_LIBCRC32C=y
229CONFIG_MAGIC_SYSRQ=y 212CONFIG_MAGIC_SYSRQ=y
230# CONFIG_RCU_CPU_STALL_DETECTOR is not set
231CONFIG_SYSCTL_SYSCALL_CHECK=y
232# CONFIG_CRYPTO_ANSI_CPRNG is not set 213# CONFIG_CRYPTO_ANSI_CPRNG is not set
233# CONFIG_CRYPTO_HW is not set 214# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
index 4a4a86fb0d3d..2aa7d9737e43 100644
--- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -21,11 +20,9 @@ CONFIG_MODULE_UNLOAD=y
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_GEF_SBC610=y 21CONFIG_GEF_SBC610=y
23CONFIG_HIGHMEM=y 22CONFIG_HIGHMEM=y
24CONFIG_HIGH_RES_TIMERS=y
25CONFIG_HZ_1000=y 23CONFIG_HZ_1000=y
26CONFIG_PREEMPT=y 24CONFIG_PREEMPT=y
27CONFIG_BINFMT_MISC=m 25CONFIG_BINFMT_MISC=m
28CONFIG_SPARSE_IRQ=y
29CONFIG_PCI=y 26CONFIG_PCI=y
30CONFIG_PCIEPORTBUS=y 27CONFIG_PCIEPORTBUS=y
31# CONFIG_PCIEASPM is not set 28# CONFIG_PCIEASPM is not set
@@ -46,8 +43,6 @@ CONFIG_IP_PNP_DHCP=y
46CONFIG_IP_PNP_BOOTP=y 43CONFIG_IP_PNP_BOOTP=y
47CONFIG_IP_PNP_RARP=y 44CONFIG_IP_PNP_RARP=y
48CONFIG_NET_IPIP=m 45CONFIG_NET_IPIP=m
49CONFIG_NET_IPGRE=m
50CONFIG_NET_IPGRE_BROADCAST=y
51CONFIG_IP_MROUTE=y 46CONFIG_IP_MROUTE=y
52CONFIG_IP_PIMSM_V1=y 47CONFIG_IP_PIMSM_V1=y
53CONFIG_IP_PIMSM_V2=y 48CONFIG_IP_PIMSM_V2=y
@@ -62,22 +57,17 @@ CONFIG_INET6_IPCOMP=m
62CONFIG_IPV6_TUNNEL=m 57CONFIG_IPV6_TUNNEL=m
63CONFIG_NETFILTER=y 58CONFIG_NETFILTER=y
64# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 59# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
65CONFIG_IP_NF_QUEUE=m
66CONFIG_IP_NF_IPTABLES=m 60CONFIG_IP_NF_IPTABLES=m
67CONFIG_IP_NF_MATCH_ADDRTYPE=m
68CONFIG_IP_NF_MATCH_ECN=m 61CONFIG_IP_NF_MATCH_ECN=m
69CONFIG_IP_NF_MATCH_TTL=m 62CONFIG_IP_NF_MATCH_TTL=m
70CONFIG_IP_NF_FILTER=m 63CONFIG_IP_NF_FILTER=m
71CONFIG_IP_NF_TARGET_REJECT=m 64CONFIG_IP_NF_TARGET_REJECT=m
72CONFIG_IP_NF_TARGET_LOG=m
73CONFIG_IP_NF_TARGET_ULOG=m
74CONFIG_IP_NF_MANGLE=m 65CONFIG_IP_NF_MANGLE=m
75CONFIG_IP_NF_TARGET_ECN=m 66CONFIG_IP_NF_TARGET_ECN=m
76CONFIG_IP_NF_RAW=m 67CONFIG_IP_NF_RAW=m
77CONFIG_IP_NF_ARPTABLES=m 68CONFIG_IP_NF_ARPTABLES=m
78CONFIG_IP_NF_ARPFILTER=m 69CONFIG_IP_NF_ARPFILTER=m
79CONFIG_IP_NF_ARP_MANGLE=m 70CONFIG_IP_NF_ARP_MANGLE=m
80CONFIG_IP6_NF_QUEUE=m
81CONFIG_IP6_NF_IPTABLES=m 71CONFIG_IP6_NF_IPTABLES=m
82CONFIG_IP6_NF_MATCH_EUI64=m 72CONFIG_IP6_NF_MATCH_EUI64=m
83CONFIG_IP6_NF_MATCH_FRAG=m 73CONFIG_IP6_NF_MATCH_FRAG=m
@@ -85,7 +75,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
85CONFIG_IP6_NF_MATCH_HL=m 75CONFIG_IP6_NF_MATCH_HL=m
86CONFIG_IP6_NF_MATCH_IPV6HEADER=m 76CONFIG_IP6_NF_MATCH_IPV6HEADER=m
87CONFIG_IP6_NF_MATCH_RT=m 77CONFIG_IP6_NF_MATCH_RT=m
88CONFIG_IP6_NF_TARGET_LOG=m
89CONFIG_IP6_NF_FILTER=m 78CONFIG_IP6_NF_FILTER=m
90CONFIG_IP6_NF_MANGLE=m 79CONFIG_IP6_NF_MANGLE=m
91CONFIG_IP6_NF_RAW=m 80CONFIG_IP6_NF_RAW=m
@@ -98,7 +87,6 @@ CONFIG_ATM_MPOA=m
98CONFIG_ATM_BR2684=m 87CONFIG_ATM_BR2684=m
99CONFIG_BRIDGE=m 88CONFIG_BRIDGE=m
100CONFIG_VLAN_8021Q=m 89CONFIG_VLAN_8021Q=m
101CONFIG_WAN_ROUTER=m
102CONFIG_NET_SCHED=y 90CONFIG_NET_SCHED=y
103CONFIG_NET_SCH_CBQ=m 91CONFIG_NET_SCH_CBQ=m
104CONFIG_NET_SCH_HTB=m 92CONFIG_NET_SCH_HTB=m
@@ -122,9 +110,6 @@ CONFIG_NET_PKTGEN=m
122CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 110CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
123# CONFIG_FW_LOADER is not set 111# CONFIG_FW_LOADER is not set
124CONFIG_MTD=y 112CONFIG_MTD=y
125CONFIG_MTD_CONCAT=y
126CONFIG_MTD_OF_PARTS=y
127CONFIG_MTD_CHAR=y
128CONFIG_MTD_BLOCK=y 113CONFIG_MTD_BLOCK=y
129CONFIG_MTD_CFI=y 114CONFIG_MTD_CFI=y
130CONFIG_MTD_JEDECPROBE=y 115CONFIG_MTD_JEDECPROBE=y
@@ -136,7 +121,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
136CONFIG_BLK_DEV_NBD=m 121CONFIG_BLK_DEV_NBD=m
137CONFIG_BLK_DEV_RAM=y 122CONFIG_BLK_DEV_RAM=y
138CONFIG_BLK_DEV_RAM_SIZE=131072 123CONFIG_BLK_DEV_RAM_SIZE=131072
139CONFIG_MISC_DEVICES=y
140CONFIG_DS1682=y 124CONFIG_DS1682=y
141CONFIG_BLK_DEV_SD=y 125CONFIG_BLK_DEV_SD=y
142CONFIG_CHR_DEV_ST=y 126CONFIG_CHR_DEV_ST=y
@@ -144,37 +128,34 @@ CONFIG_BLK_DEV_SR=y
144CONFIG_ATA=y 128CONFIG_ATA=y
145CONFIG_SATA_SIL=y 129CONFIG_SATA_SIL=y
146CONFIG_NETDEVICES=y 130CONFIG_NETDEVICES=y
147CONFIG_DUMMY=m
148CONFIG_BONDING=m 131CONFIG_BONDING=m
132CONFIG_DUMMY=m
133CONFIG_NETCONSOLE=y
149CONFIG_TUN=m 134CONFIG_TUN=m
150CONFIG_NET_ETHERNET=y
151CONFIG_MII=y
152CONFIG_GIANFAR=y 135CONFIG_GIANFAR=y
153# CONFIG_NETDEV_10000 is not set
154CONFIG_PPP=m 136CONFIG_PPP=m
155CONFIG_PPP_MULTILINK=y 137CONFIG_PPP_BSDCOMP=m
138CONFIG_PPP_DEFLATE=m
156CONFIG_PPP_FILTER=y 139CONFIG_PPP_FILTER=y
140CONFIG_PPP_MULTILINK=y
141CONFIG_PPPOATM=m
142CONFIG_PPPOE=m
157CONFIG_PPP_ASYNC=m 143CONFIG_PPP_ASYNC=m
158CONFIG_PPP_SYNC_TTY=m 144CONFIG_PPP_SYNC_TTY=m
159CONFIG_PPP_DEFLATE=m
160CONFIG_PPP_BSDCOMP=m
161CONFIG_PPPOE=m
162CONFIG_PPPOATM=m
163CONFIG_SLIP=m 145CONFIG_SLIP=m
164CONFIG_SLIP_COMPRESSED=y 146CONFIG_SLIP_COMPRESSED=y
165CONFIG_SLIP_SMART=y 147CONFIG_SLIP_SMART=y
166CONFIG_SLIP_MODE_SLIP6=y 148CONFIG_SLIP_MODE_SLIP6=y
167CONFIG_NETCONSOLE=y
168CONFIG_INPUT_FF_MEMLESS=m 149CONFIG_INPUT_FF_MEMLESS=m
169# CONFIG_INPUT_KEYBOARD is not set 150# CONFIG_INPUT_KEYBOARD is not set
170# CONFIG_INPUT_MOUSE is not set 151# CONFIG_INPUT_MOUSE is not set
171# CONFIG_SERIO is not set 152# CONFIG_SERIO is not set
153# CONFIG_LEGACY_PTYS is not set
172CONFIG_SERIAL_8250=y 154CONFIG_SERIAL_8250=y
173CONFIG_SERIAL_8250_CONSOLE=y 155CONFIG_SERIAL_8250_CONSOLE=y
174# CONFIG_SERIAL_8250_PCI is not set 156# CONFIG_SERIAL_8250_PCI is not set
175CONFIG_SERIAL_8250_NR_UARTS=2 157CONFIG_SERIAL_8250_NR_UARTS=2
176CONFIG_SERIAL_8250_RUNTIME_UARTS=2 158CONFIG_SERIAL_8250_RUNTIME_UARTS=2
177# CONFIG_LEGACY_PTYS is not set
178CONFIG_HW_RANDOM=y 159CONFIG_HW_RANDOM=y
179CONFIG_NVRAM=y 160CONFIG_NVRAM=y
180CONFIG_I2C=y 161CONFIG_I2C=y
@@ -186,7 +167,6 @@ CONFIG_SENSORS_LM90=y
186CONFIG_SENSORS_LM92=y 167CONFIG_SENSORS_LM92=y
187CONFIG_WATCHDOG=y 168CONFIG_WATCHDOG=y
188CONFIG_GEF_WDT=y 169CONFIG_GEF_WDT=y
189CONFIG_VIDEO_OUTPUT_CONTROL=m
190CONFIG_HID_A4TECH=y 170CONFIG_HID_A4TECH=y
191CONFIG_HID_APPLE=y 171CONFIG_HID_APPLE=y
192CONFIG_HID_BELKIN=y 172CONFIG_HID_BELKIN=y
@@ -201,10 +181,8 @@ CONFIG_HID_MONTEREY=y
201CONFIG_HID_PANTHERLORD=y 181CONFIG_HID_PANTHERLORD=y
202CONFIG_HID_PETALYNX=y 182CONFIG_HID_PETALYNX=y
203CONFIG_HID_SAMSUNG=y 183CONFIG_HID_SAMSUNG=y
204CONFIG_HID_SONY=y
205CONFIG_HID_SUNPLUS=y 184CONFIG_HID_SUNPLUS=y
206CONFIG_USB=y 185CONFIG_USB=y
207# CONFIG_USB_DEVICE_CLASS is not set
208CONFIG_USB_EHCI_HCD=y 186CONFIG_USB_EHCI_HCD=y
209# CONFIG_USB_EHCI_HCD_PPC_OF is not set 187# CONFIG_USB_EHCI_HCD_PPC_OF is not set
210CONFIG_USB_OHCI_HCD=y 188CONFIG_USB_OHCI_HCD=y
@@ -213,7 +191,6 @@ CONFIG_RTC_CLASS=y
213# CONFIG_RTC_INTF_PROC is not set 191# CONFIG_RTC_INTF_PROC is not set
214CONFIG_RTC_DRV_RX8581=y 192CONFIG_RTC_DRV_RX8581=y
215CONFIG_STAGING=y 193CONFIG_STAGING=y
216# CONFIG_STAGING_EXCLUDE_BUILD is not set
217CONFIG_VME_BUS=y 194CONFIG_VME_BUS=y
218CONFIG_VME_TSI148=y 195CONFIG_VME_TSI148=y
219CONFIG_EXT2_FS=y 196CONFIG_EXT2_FS=y
@@ -222,14 +199,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
222CONFIG_EXT3_FS=y 199CONFIG_EXT3_FS=y
223# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 200# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
224CONFIG_EXT3_FS_POSIX_ACL=y 201CONFIG_EXT3_FS_POSIX_ACL=y
225CONFIG_INOTIFY=y
226CONFIG_MSDOS_FS=y 202CONFIG_MSDOS_FS=y
227CONFIG_VFAT_FS=y 203CONFIG_VFAT_FS=y
228CONFIG_PROC_KCORE=y 204CONFIG_PROC_KCORE=y
229CONFIG_TMPFS=y 205CONFIG_TMPFS=y
230CONFIG_JFFS2_FS=y 206CONFIG_JFFS2_FS=y
231CONFIG_NFS_FS=y 207CONFIG_NFS_FS=y
232CONFIG_NFS_V3=y
233CONFIG_NFS_V4=y 208CONFIG_NFS_V4=y
234CONFIG_ROOT_NFS=y 209CONFIG_ROOT_NFS=y
235CONFIG_CIFS=m 210CONFIG_CIFS=m
@@ -273,28 +248,20 @@ CONFIG_NLS_ISO8859_15=m
273CONFIG_NLS_KOI8_R=m 248CONFIG_NLS_KOI8_R=m
274CONFIG_NLS_KOI8_U=m 249CONFIG_NLS_KOI8_U=m
275CONFIG_NLS_UTF8=m 250CONFIG_NLS_UTF8=m
251CONFIG_DEBUG_INFO=y
276CONFIG_MAGIC_SYSRQ=y 252CONFIG_MAGIC_SYSRQ=y
277CONFIG_DEBUG_KERNEL=y
278CONFIG_DETECT_HUNG_TASK=y 253CONFIG_DETECT_HUNG_TASK=y
279# CONFIG_DEBUG_BUGVERBOSE is not set 254# CONFIG_DEBUG_BUGVERBOSE is not set
280CONFIG_DEBUG_INFO=y
281# CONFIG_RCU_CPU_STALL_DETECTOR is not set
282CONFIG_SYSCTL_SYSCALL_CHECK=y
283CONFIG_SECURITY=y 255CONFIG_SECURITY=y
284CONFIG_SECURITY_NETWORK=y 256CONFIG_SECURITY_NETWORK=y
285CONFIG_CRYPTO_NULL=m 257CONFIG_CRYPTO_NULL=m
286CONFIG_CRYPTO_TEST=m 258CONFIG_CRYPTO_TEST=m
287CONFIG_CRYPTO_ECB=m
288CONFIG_CRYPTO_PCBC=m 259CONFIG_CRYPTO_PCBC=m
289CONFIG_CRYPTO_HMAC=y 260CONFIG_CRYPTO_HMAC=y
290CONFIG_CRYPTO_MD4=m
291CONFIG_CRYPTO_MICHAEL_MIC=m 261CONFIG_CRYPTO_MICHAEL_MIC=m
292CONFIG_CRYPTO_SHA256=m
293CONFIG_CRYPTO_SHA512=m 262CONFIG_CRYPTO_SHA512=m
294CONFIG_CRYPTO_WP512=m 263CONFIG_CRYPTO_WP512=m
295CONFIG_CRYPTO_AES=m
296CONFIG_CRYPTO_ANUBIS=m 264CONFIG_CRYPTO_ANUBIS=m
297CONFIG_CRYPTO_ARC4=m
298CONFIG_CRYPTO_BLOWFISH=m 265CONFIG_CRYPTO_BLOWFISH=m
299CONFIG_CRYPTO_CAST5=m 266CONFIG_CRYPTO_CAST5=m
300CONFIG_CRYPTO_CAST6=m 267CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index 9b192bb6bd3d..e32207de2b77 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -1,27 +1,25 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_IKCONFIG=y 5CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
7CONFIG_BLK_DEV_INITRD=y 8CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 9CONFIG_EXPERT=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11# CONFIG_ELF_CORE is not set 10# CONFIG_ELF_CORE is not set
12CONFIG_MODULES=y 11CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 12CONFIG_MODULE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 13# CONFIG_BLK_DEV_BSG is not set
14CONFIG_PARTITION_ADVANCED=y
15CONFIG_LDM_PARTITION=y
15# CONFIG_IOSCHED_CFQ is not set 16# CONFIG_IOSCHED_CFQ is not set
16# CONFIG_PPC_CHRP is not set 17# CONFIG_PPC_CHRP is not set
17# CONFIG_PPC_PMAC is not set 18# CONFIG_PPC_PMAC is not set
18CONFIG_PPC_86xx=y 19CONFIG_PPC_86xx=y
19CONFIG_MPC8610_HPCD=y 20CONFIG_MPC8610_HPCD=y
20CONFIG_HIGHMEM=y 21CONFIG_HIGHMEM=y
21CONFIG_NO_HZ=y
22CONFIG_HIGH_RES_TIMERS=y
23CONFIG_HZ_1000=y 22CONFIG_HZ_1000=y
24CONFIG_SPARSE_IRQ=y
25CONFIG_FORCE_MAX_ZONEORDER=12 23CONFIG_FORCE_MAX_ZONEORDER=12
26# CONFIG_SECCOMP is not set 24# CONFIG_SECCOMP is not set
27CONFIG_PCI=y 25CONFIG_PCI=y
@@ -42,14 +40,12 @@ CONFIG_IPV6=y
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43CONFIG_MTD=y 41CONFIG_MTD=y
44CONFIG_MTD_CMDLINE_PARTS=y 42CONFIG_MTD_CMDLINE_PARTS=y
45CONFIG_MTD_CHAR=y
46CONFIG_MTD_BLOCK=y 43CONFIG_MTD_BLOCK=y
47CONFIG_MTD_CFI=y 44CONFIG_MTD_CFI=y
48CONFIG_MTD_CFI_AMDSTD=y 45CONFIG_MTD_CFI_AMDSTD=y
49CONFIG_MTD_PHYSMAP_OF=y 46CONFIG_MTD_PHYSMAP_OF=y
50CONFIG_MTD_NAND=y 47CONFIG_MTD_NAND=y
51CONFIG_MTD_NAND_FSL_ELBC=y 48CONFIG_MTD_NAND_FSL_ELBC=y
52CONFIG_PROC_DEVICETREE=y
53CONFIG_BLK_DEV_LOOP=y 49CONFIG_BLK_DEV_LOOP=y
54CONFIG_BLK_DEV_RAM=y 50CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_SIZE=131072 51CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -61,15 +57,13 @@ CONFIG_SATA_AHCI=y
61CONFIG_PATA_ALI=y 57CONFIG_PATA_ALI=y
62CONFIG_NETDEVICES=y 58CONFIG_NETDEVICES=y
63CONFIG_DUMMY=y 59CONFIG_DUMMY=y
64CONFIG_NET_ETHERNET=y
65CONFIG_NET_TULIP=y 60CONFIG_NET_TULIP=y
66CONFIG_ULI526X=y 61CONFIG_ULI526X=y
67# CONFIG_NETDEV_1000 is not set
68# CONFIG_NETDEV_10000 is not set
69# CONFIG_INPUT_MOUSEDEV is not set 62# CONFIG_INPUT_MOUSEDEV is not set
70# CONFIG_INPUT_KEYBOARD is not set 63# CONFIG_INPUT_KEYBOARD is not set
71# CONFIG_INPUT_MOUSE is not set 64# CONFIG_INPUT_MOUSE is not set
72CONFIG_SERIO_LIBPS2=y 65CONFIG_SERIO_LIBPS2=y
66# CONFIG_LEGACY_PTYS is not set
73CONFIG_SERIAL_8250=y 67CONFIG_SERIAL_8250=y
74CONFIG_SERIAL_8250_CONSOLE=y 68CONFIG_SERIAL_8250_CONSOLE=y
75CONFIG_SERIAL_8250_NR_UARTS=2 69CONFIG_SERIAL_8250_NR_UARTS=2
@@ -79,19 +73,14 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
79CONFIG_SERIAL_8250_SHARE_IRQ=y 73CONFIG_SERIAL_8250_SHARE_IRQ=y
80CONFIG_SERIAL_8250_DETECT_IRQ=y 74CONFIG_SERIAL_8250_DETECT_IRQ=y
81CONFIG_SERIAL_8250_RSA=y 75CONFIG_SERIAL_8250_RSA=y
82# CONFIG_LEGACY_PTYS is not set
83# CONFIG_HW_RANDOM is not set 76# CONFIG_HW_RANDOM is not set
84CONFIG_I2C=y 77CONFIG_I2C=y
85CONFIG_I2C_MPC=y 78CONFIG_I2C_MPC=y
86# CONFIG_HWMON is not set 79# CONFIG_HWMON is not set
87CONFIG_VIDEO_OUTPUT_CONTROL=y
88CONFIG_FB=y 80CONFIG_FB=y
89CONFIG_FB_FSL_DIU=y 81CONFIG_FB_FSL_DIU=y
90CONFIG_VGACON_SOFT_SCROLLBACK=y 82CONFIG_VGACON_SOFT_SCROLLBACK=y
91CONFIG_FRAMEBUFFER_CONSOLE=y 83CONFIG_FRAMEBUFFER_CONSOLE=y
92CONFIG_FONTS=y
93CONFIG_FONT_8x8=y
94CONFIG_FONT_8x16=y
95CONFIG_SOUND=y 84CONFIG_SOUND=y
96CONFIG_SND=y 85CONFIG_SND=y
97CONFIG_SND_MIXER_OSS=y 86CONFIG_SND_MIXER_OSS=y
@@ -108,17 +97,14 @@ CONFIG_EXT3_FS=y
108CONFIG_PROC_KCORE=y 97CONFIG_PROC_KCORE=y
109CONFIG_TMPFS=y 98CONFIG_TMPFS=y
110CONFIG_NFS_FS=y 99CONFIG_NFS_FS=y
111CONFIG_NFS_V3=y
112CONFIG_ROOT_NFS=y 100CONFIG_ROOT_NFS=y
113CONFIG_NFSD=y 101CONFIG_NFSD=y
114CONFIG_PARTITION_ADVANCED=y
115CONFIG_LDM_PARTITION=y
116CONFIG_NLS=y 102CONFIG_NLS=y
117CONFIG_CRC_T10DIF=y 103CONFIG_CRC_T10DIF=y
118CONFIG_DEBUG_KERNEL=y 104CONFIG_FONTS=y
105CONFIG_FONT_8x8=y
106CONFIG_FONT_8x16=y
107CONFIG_DEBUG_INFO=y
119CONFIG_DEBUG_SHIRQ=y 108CONFIG_DEBUG_SHIRQ=y
120CONFIG_DETECT_HUNG_TASK=y 109CONFIG_DETECT_HUNG_TASK=y
121CONFIG_DEBUG_INFO=y
122# CONFIG_RCU_CPU_STALL_DETECTOR is not set
123CONFIG_SYSCTL_SYSCALL_CHECK=y
124# CONFIG_CRYPTO_ANSI_CPRNG is not set 110# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index 76f43df3dec7..a36e11ddaebd 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -1,33 +1,31 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_AUDIT=y 5CONFIG_AUDIT=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
8CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
11CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
12# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
13CONFIG_EXPERT=y 13CONFIG_EXPERT=y
14CONFIG_KALLSYMS_ALL=y 14CONFIG_KALLSYMS_ALL=y
15CONFIG_KALLSYMS_EXTRA_PASS=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y 17CONFIG_MODULE_FORCE_UNLOAD=y
19CONFIG_MODVERSIONS=y 18CONFIG_MODVERSIONS=y
20# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PARTITION_ADVANCED=y
21CONFIG_MAC_PARTITION=y
21# CONFIG_PPC_CHRP is not set 22# CONFIG_PPC_CHRP is not set
22# CONFIG_PPC_PMAC is not set 23# CONFIG_PPC_PMAC is not set
23CONFIG_PPC_86xx=y 24CONFIG_PPC_86xx=y
24CONFIG_MPC8641_HPCN=y 25CONFIG_MPC8641_HPCN=y
25CONFIG_HIGHMEM=y 26CONFIG_HIGHMEM=y
26CONFIG_NO_HZ=y
27CONFIG_HIGH_RES_TIMERS=y
28CONFIG_HZ_1000=y 27CONFIG_HZ_1000=y
29CONFIG_BINFMT_MISC=m 28CONFIG_BINFMT_MISC=m
30CONFIG_SPARSE_IRQ=y
31CONFIG_PCI=y 29CONFIG_PCI=y
32CONFIG_NET=y 30CONFIG_NET=y
33CONFIG_PACKET=y 31CONFIG_PACKET=y
@@ -45,12 +43,9 @@ CONFIG_IP_PNP_DHCP=y
45CONFIG_IP_PNP_BOOTP=y 43CONFIG_IP_PNP_BOOTP=y
46CONFIG_IP_PNP_RARP=y 44CONFIG_IP_PNP_RARP=y
47CONFIG_NET_IPIP=y 45CONFIG_NET_IPIP=y
48CONFIG_NET_IPGRE=y
49CONFIG_NET_IPGRE_BROADCAST=y
50CONFIG_IP_MROUTE=y 46CONFIG_IP_MROUTE=y
51CONFIG_IP_PIMSM_V1=y 47CONFIG_IP_PIMSM_V1=y
52CONFIG_IP_PIMSM_V2=y 48CONFIG_IP_PIMSM_V2=y
53CONFIG_ARPD=y
54# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 49# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
55# CONFIG_INET_XFRM_MODE_TUNNEL is not set 50# CONFIG_INET_XFRM_MODE_TUNNEL is not set
56# CONFIG_INET_XFRM_MODE_BEET is not set 51# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -58,28 +53,23 @@ CONFIG_ARPD=y
58CONFIG_IPV6=y 53CONFIG_IPV6=y
59CONFIG_IP_SCTP=m 54CONFIG_IP_SCTP=m
60CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
61CONFIG_PROC_DEVICETREE=y
62CONFIG_BLK_DEV_LOOP=y 56CONFIG_BLK_DEV_LOOP=y
63CONFIG_BLK_DEV_NBD=y 57CONFIG_BLK_DEV_NBD=y
64CONFIG_BLK_DEV_RAM=y 58CONFIG_BLK_DEV_RAM=y
65CONFIG_BLK_DEV_RAM_SIZE=131072 59CONFIG_BLK_DEV_RAM_SIZE=131072
66CONFIG_MISC_DEVICES=y
67CONFIG_EEPROM_LEGACY=y 60CONFIG_EEPROM_LEGACY=y
68CONFIG_BLK_DEV_SD=y 61CONFIG_BLK_DEV_SD=y
69CONFIG_CHR_DEV_ST=y 62CONFIG_CHR_DEV_ST=y
70CONFIG_BLK_DEV_SR=y 63CONFIG_BLK_DEV_SR=y
71CONFIG_CHR_DEV_SG=y 64CONFIG_CHR_DEV_SG=y
72CONFIG_SCSI_MULTI_LUN=y
73CONFIG_SCSI_LOGGING=y 65CONFIG_SCSI_LOGGING=y
74CONFIG_ATA=y 66CONFIG_ATA=y
75CONFIG_SATA_AHCI=y 67CONFIG_SATA_AHCI=y
76CONFIG_PATA_ALI=y 68CONFIG_PATA_ALI=y
77CONFIG_NETDEVICES=y 69CONFIG_NETDEVICES=y
78CONFIG_DUMMY=y 70CONFIG_DUMMY=y
79CONFIG_VITESSE_PHY=y
80CONFIG_NET_ETHERNET=y
81CONFIG_MII=y
82CONFIG_GIANFAR=y 71CONFIG_GIANFAR=y
72CONFIG_VITESSE_PHY=y
83CONFIG_INPUT_FF_MEMLESS=m 73CONFIG_INPUT_FF_MEMLESS=m
84# CONFIG_INPUT_MOUSEDEV is not set 74# CONFIG_INPUT_MOUSEDEV is not set
85# CONFIG_INPUT_KEYBOARD is not set 75# CONFIG_INPUT_KEYBOARD is not set
@@ -99,7 +89,6 @@ CONFIG_NVRAM=y
99CONFIG_I2C=y 89CONFIG_I2C=y
100CONFIG_I2C_MPC=y 90CONFIG_I2C_MPC=y
101# CONFIG_HWMON is not set 91# CONFIG_HWMON is not set
102CONFIG_VIDEO_OUTPUT_CONTROL=y
103CONFIG_SOUND=y 92CONFIG_SOUND=y
104CONFIG_SND=y 93CONFIG_SND=y
105CONFIG_SND_MIXER_OSS=y 94CONFIG_SND_MIXER_OSS=y
@@ -120,7 +109,6 @@ CONFIG_HID_MONTEREY=y
120CONFIG_HID_PANTHERLORD=y 109CONFIG_HID_PANTHERLORD=y
121CONFIG_HID_PETALYNX=y 110CONFIG_HID_PETALYNX=y
122CONFIG_HID_SAMSUNG=y 111CONFIG_HID_SAMSUNG=y
123CONFIG_HID_SONY=y
124CONFIG_HID_SUNPLUS=y 112CONFIG_HID_SUNPLUS=y
125CONFIG_USB=y 113CONFIG_USB=y
126CONFIG_USB_MON=y 114CONFIG_USB_MON=y
@@ -134,7 +122,6 @@ CONFIG_RTC_DRV_CMOS=y
134CONFIG_EXT2_FS=y 122CONFIG_EXT2_FS=y
135CONFIG_EXT3_FS=y 123CONFIG_EXT3_FS=y
136# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 124# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
137CONFIG_INOTIFY=y
138CONFIG_ISO9660_FS=m 125CONFIG_ISO9660_FS=m
139CONFIG_JOLIET=y 126CONFIG_JOLIET=y
140CONFIG_ZISOFS=y 127CONFIG_ZISOFS=y
@@ -158,18 +145,12 @@ CONFIG_QNX4FS_FS=m
158CONFIG_SYSV_FS=m 145CONFIG_SYSV_FS=m
159CONFIG_UFS_FS=m 146CONFIG_UFS_FS=m
160CONFIG_NFS_FS=y 147CONFIG_NFS_FS=y
161CONFIG_NFS_V3=y
162CONFIG_NFS_V4=y 148CONFIG_NFS_V4=y
163CONFIG_ROOT_NFS=y 149CONFIG_ROOT_NFS=y
164CONFIG_NFSD=y 150CONFIG_NFSD=y
165CONFIG_PARTITION_ADVANCED=y
166CONFIG_MAC_PARTITION=y
167CONFIG_CRC_T10DIF=y 151CONFIG_CRC_T10DIF=y
168CONFIG_DEBUG_KERNEL=y
169CONFIG_DETECT_HUNG_TASK=y
170CONFIG_DEBUG_INFO=y 152CONFIG_DEBUG_INFO=y
171# CONFIG_RCU_CPU_STALL_DETECTOR is not set 153CONFIG_DETECT_HUNG_TASK=y
172CONFIG_SYSCTL_SYSCALL_CHECK=y
173CONFIG_CRYPTO_PCBC=m 154CONFIG_CRYPTO_PCBC=m
174CONFIG_CRYPTO_HMAC=y 155CONFIG_CRYPTO_HMAC=y
175# CONFIG_CRYPTO_ANSI_CPRNG is not set 156# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index 99ea8746bbaf..db79bdee844b 100644
--- a/arch/powerpc/configs/86xx/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -1,8 +1,8 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_BSD_PROCESS_ACCT_V3=y 7CONFIG_BSD_PROCESS_ACCT_V3=y
8CONFIG_IKCONFIG=y 8CONFIG_IKCONFIG=y
@@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 10CONFIG_LOG_BUF_SHIFT=14
11CONFIG_RELAY=y 11CONFIG_RELAY=y
12CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
13# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
14CONFIG_EXPERT=y 13CONFIG_EXPERT=y
15CONFIG_SLAB=y 14CONFIG_SLAB=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -20,10 +19,8 @@ CONFIG_MODULE_UNLOAD=y
20# CONFIG_PPC_PMAC is not set 19# CONFIG_PPC_PMAC is not set
21CONFIG_PPC_86xx=y 20CONFIG_PPC_86xx=y
22CONFIG_SBC8641D=y 21CONFIG_SBC8641D=y
23CONFIG_HIGH_RES_TIMERS=y
24CONFIG_PREEMPT=y 22CONFIG_PREEMPT=y
25CONFIG_BINFMT_MISC=m 23CONFIG_BINFMT_MISC=m
26CONFIG_SPARSE_IRQ=y
27CONFIG_PCI=y 24CONFIG_PCI=y
28CONFIG_PCIEPORTBUS=y 25CONFIG_PCIEPORTBUS=y
29# CONFIG_PCIEASPM is not set 26# CONFIG_PCIEASPM is not set
@@ -43,8 +40,6 @@ CONFIG_IP_PNP_DHCP=y
43CONFIG_IP_PNP_BOOTP=y 40CONFIG_IP_PNP_BOOTP=y
44CONFIG_IP_PNP_RARP=y 41CONFIG_IP_PNP_RARP=y
45CONFIG_NET_IPIP=m 42CONFIG_NET_IPIP=m
46CONFIG_NET_IPGRE=m
47CONFIG_NET_IPGRE_BROADCAST=y
48CONFIG_IP_MROUTE=y 43CONFIG_IP_MROUTE=y
49CONFIG_IP_PIMSM_V1=y 44CONFIG_IP_PIMSM_V1=y
50CONFIG_IP_PIMSM_V2=y 45CONFIG_IP_PIMSM_V2=y
@@ -59,22 +54,17 @@ CONFIG_INET6_IPCOMP=m
59CONFIG_IPV6_TUNNEL=m 54CONFIG_IPV6_TUNNEL=m
60CONFIG_NETFILTER=y 55CONFIG_NETFILTER=y
61# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 56# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
62CONFIG_IP_NF_QUEUE=m
63CONFIG_IP_NF_IPTABLES=m 57CONFIG_IP_NF_IPTABLES=m
64CONFIG_IP_NF_MATCH_ADDRTYPE=m
65CONFIG_IP_NF_MATCH_ECN=m 58CONFIG_IP_NF_MATCH_ECN=m
66CONFIG_IP_NF_MATCH_TTL=m 59CONFIG_IP_NF_MATCH_TTL=m
67CONFIG_IP_NF_FILTER=m 60CONFIG_IP_NF_FILTER=m
68CONFIG_IP_NF_TARGET_REJECT=m 61CONFIG_IP_NF_TARGET_REJECT=m
69CONFIG_IP_NF_TARGET_LOG=m
70CONFIG_IP_NF_TARGET_ULOG=m
71CONFIG_IP_NF_MANGLE=m 62CONFIG_IP_NF_MANGLE=m
72CONFIG_IP_NF_TARGET_ECN=m 63CONFIG_IP_NF_TARGET_ECN=m
73CONFIG_IP_NF_RAW=m 64CONFIG_IP_NF_RAW=m
74CONFIG_IP_NF_ARPTABLES=m 65CONFIG_IP_NF_ARPTABLES=m
75CONFIG_IP_NF_ARPFILTER=m 66CONFIG_IP_NF_ARPFILTER=m
76CONFIG_IP_NF_ARP_MANGLE=m 67CONFIG_IP_NF_ARP_MANGLE=m
77CONFIG_IP6_NF_QUEUE=m
78CONFIG_IP6_NF_IPTABLES=m 68CONFIG_IP6_NF_IPTABLES=m
79CONFIG_IP6_NF_MATCH_EUI64=m 69CONFIG_IP6_NF_MATCH_EUI64=m
80CONFIG_IP6_NF_MATCH_FRAG=m 70CONFIG_IP6_NF_MATCH_FRAG=m
@@ -82,7 +72,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
82CONFIG_IP6_NF_MATCH_HL=m 72CONFIG_IP6_NF_MATCH_HL=m
83CONFIG_IP6_NF_MATCH_IPV6HEADER=m 73CONFIG_IP6_NF_MATCH_IPV6HEADER=m
84CONFIG_IP6_NF_MATCH_RT=m 74CONFIG_IP6_NF_MATCH_RT=m
85CONFIG_IP6_NF_TARGET_LOG=m
86CONFIG_IP6_NF_FILTER=m 75CONFIG_IP6_NF_FILTER=m
87CONFIG_IP6_NF_MANGLE=m 76CONFIG_IP6_NF_MANGLE=m
88CONFIG_IP6_NF_RAW=m 77CONFIG_IP6_NF_RAW=m
@@ -95,7 +84,6 @@ CONFIG_ATM_MPOA=m
95CONFIG_ATM_BR2684=m 84CONFIG_ATM_BR2684=m
96CONFIG_BRIDGE=m 85CONFIG_BRIDGE=m
97CONFIG_VLAN_8021Q=m 86CONFIG_VLAN_8021Q=m
98CONFIG_WAN_ROUTER=m
99CONFIG_NET_SCHED=y 87CONFIG_NET_SCHED=y
100CONFIG_NET_SCH_CBQ=m 88CONFIG_NET_SCH_CBQ=m
101CONFIG_NET_SCH_HTB=m 89CONFIG_NET_SCH_HTB=m
@@ -119,8 +107,6 @@ CONFIG_NET_PKTGEN=m
119CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 107CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
120# CONFIG_FW_LOADER is not set 108# CONFIG_FW_LOADER is not set
121CONFIG_MTD=y 109CONFIG_MTD=y
122CONFIG_MTD_CONCAT=y
123CONFIG_MTD_CHAR=y
124CONFIG_MTD_BLOCK=y 110CONFIG_MTD_BLOCK=y
125CONFIG_MTD_CFI=y 111CONFIG_MTD_CFI=y
126CONFIG_MTD_CFI_ADV_OPTIONS=y 112CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -145,28 +131,25 @@ CONFIG_DM_SNAPSHOT=y
145CONFIG_DM_MIRROR=y 131CONFIG_DM_MIRROR=y
146CONFIG_DM_ZERO=y 132CONFIG_DM_ZERO=y
147CONFIG_NETDEVICES=y 133CONFIG_NETDEVICES=y
148CONFIG_DUMMY=m
149CONFIG_BONDING=m 134CONFIG_BONDING=m
135CONFIG_DUMMY=m
136CONFIG_NETCONSOLE=y
150CONFIG_TUN=m 137CONFIG_TUN=m
151CONFIG_BROADCOM_PHY=y
152CONFIG_NET_ETHERNET=y
153CONFIG_MII=y
154CONFIG_GIANFAR=y 138CONFIG_GIANFAR=y
155# CONFIG_NETDEV_10000 is not set 139CONFIG_BROADCOM_PHY=y
156CONFIG_PPP=m 140CONFIG_PPP=m
157CONFIG_PPP_MULTILINK=y 141CONFIG_PPP_BSDCOMP=m
142CONFIG_PPP_DEFLATE=m
158CONFIG_PPP_FILTER=y 143CONFIG_PPP_FILTER=y
144CONFIG_PPP_MULTILINK=y
145CONFIG_PPPOATM=m
146CONFIG_PPPOE=m
159CONFIG_PPP_ASYNC=m 147CONFIG_PPP_ASYNC=m
160CONFIG_PPP_SYNC_TTY=m 148CONFIG_PPP_SYNC_TTY=m
161CONFIG_PPP_DEFLATE=m
162CONFIG_PPP_BSDCOMP=m
163CONFIG_PPPOE=m
164CONFIG_PPPOATM=m
165CONFIG_SLIP=m 149CONFIG_SLIP=m
166CONFIG_SLIP_COMPRESSED=y 150CONFIG_SLIP_COMPRESSED=y
167CONFIG_SLIP_SMART=y 151CONFIG_SLIP_SMART=y
168CONFIG_SLIP_MODE_SLIP6=y 152CONFIG_SLIP_MODE_SLIP6=y
169CONFIG_NETCONSOLE=y
170# CONFIG_INPUT_KEYBOARD is not set 153# CONFIG_INPUT_KEYBOARD is not set
171# CONFIG_INPUT_MOUSE is not set 154# CONFIG_INPUT_MOUSE is not set
172# CONFIG_SERIO is not set 155# CONFIG_SERIO is not set
@@ -180,7 +163,6 @@ CONFIG_I2C_CHARDEV=y
180CONFIG_I2C_MPC=y 163CONFIG_I2C_MPC=y
181CONFIG_WATCHDOG=y 164CONFIG_WATCHDOG=y
182CONFIG_SOFT_WATCHDOG=m 165CONFIG_SOFT_WATCHDOG=m
183CONFIG_VIDEO_OUTPUT_CONTROL=m
184CONFIG_EXT2_FS=y 166CONFIG_EXT2_FS=y
185CONFIG_EXT2_FS_XATTR=y 167CONFIG_EXT2_FS_XATTR=y
186CONFIG_EXT2_FS_POSIX_ACL=y 168CONFIG_EXT2_FS_POSIX_ACL=y
@@ -190,20 +172,14 @@ CONFIG_EXT3_FS_POSIX_ACL=y
190CONFIG_REISERFS_FS=m 172CONFIG_REISERFS_FS=m
191CONFIG_REISERFS_FS_XATTR=y 173CONFIG_REISERFS_FS_XATTR=y
192CONFIG_REISERFS_FS_POSIX_ACL=y 174CONFIG_REISERFS_FS_POSIX_ACL=y
193CONFIG_OCFS2_FS=m
194CONFIG_INOTIFY=y
195CONFIG_AUTOFS_FS=m
196CONFIG_AUTOFS4_FS=m 175CONFIG_AUTOFS4_FS=m
197CONFIG_PROC_KCORE=y 176CONFIG_PROC_KCORE=y
198CONFIG_TMPFS=y 177CONFIG_TMPFS=y
199CONFIG_MINIX_FS=m 178CONFIG_MINIX_FS=m
200CONFIG_ROMFS_FS=m 179CONFIG_ROMFS_FS=m
201CONFIG_NFS_FS=y 180CONFIG_NFS_FS=y
202CONFIG_NFS_V3=y
203CONFIG_NFS_V4=y 181CONFIG_NFS_V4=y
204CONFIG_ROOT_NFS=y 182CONFIG_ROOT_NFS=y
205CONFIG_SMB_FS=m
206CONFIG_SMB_NLS_DEFAULT=y
207CONFIG_CIFS=m 183CONFIG_CIFS=m
208CONFIG_CIFS_XATTR=y 184CONFIG_CIFS_XATTR=y
209CONFIG_CIFS_POSIX=y 185CONFIG_CIFS_POSIX=y
@@ -245,29 +221,21 @@ CONFIG_NLS_ISO8859_15=m
245CONFIG_NLS_KOI8_R=m 221CONFIG_NLS_KOI8_R=m
246CONFIG_NLS_KOI8_U=m 222CONFIG_NLS_KOI8_U=m
247CONFIG_NLS_UTF8=m 223CONFIG_NLS_UTF8=m
248CONFIG_MAGIC_SYSRQ=y 224CONFIG_DEBUG_INFO=y
249CONFIG_DEBUG_FS=y 225CONFIG_DEBUG_FS=y
250CONFIG_DEBUG_KERNEL=y 226CONFIG_MAGIC_SYSRQ=y
251CONFIG_DETECT_HUNG_TASK=y 227CONFIG_DETECT_HUNG_TASK=y
252# CONFIG_DEBUG_BUGVERBOSE is not set 228# CONFIG_DEBUG_BUGVERBOSE is not set
253CONFIG_DEBUG_INFO=y
254# CONFIG_RCU_CPU_STALL_DETECTOR is not set
255CONFIG_SYSCTL_SYSCALL_CHECK=y
256CONFIG_SECURITY=y 229CONFIG_SECURITY=y
257CONFIG_SECURITY_NETWORK=y 230CONFIG_SECURITY_NETWORK=y
258CONFIG_CRYPTO_NULL=m 231CONFIG_CRYPTO_NULL=m
259CONFIG_CRYPTO_TEST=m 232CONFIG_CRYPTO_TEST=m
260CONFIG_CRYPTO_ECB=m
261CONFIG_CRYPTO_PCBC=m 233CONFIG_CRYPTO_PCBC=m
262CONFIG_CRYPTO_HMAC=y 234CONFIG_CRYPTO_HMAC=y
263CONFIG_CRYPTO_MD4=m
264CONFIG_CRYPTO_MICHAEL_MIC=m 235CONFIG_CRYPTO_MICHAEL_MIC=m
265CONFIG_CRYPTO_SHA256=m
266CONFIG_CRYPTO_SHA512=m 236CONFIG_CRYPTO_SHA512=m
267CONFIG_CRYPTO_WP512=m 237CONFIG_CRYPTO_WP512=m
268CONFIG_CRYPTO_AES=m
269CONFIG_CRYPTO_ANUBIS=m 238CONFIG_CRYPTO_ANUBIS=m
270CONFIG_CRYPTO_ARC4=m
271CONFIG_CRYPTO_BLOWFISH=m 239CONFIG_CRYPTO_BLOWFISH=m
272CONFIG_CRYPTO_CAST5=m 240CONFIG_CRYPTO_CAST5=m
273CONFIG_CRYPTO_CAST6=m 241CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig
index 15b1ff5d96e7..d89ff40d39b7 100644
--- a/arch/powerpc/configs/adder875_defconfig
+++ b/arch/powerpc/configs/adder875_defconfig
@@ -1,21 +1,18 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 5CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 6# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 7# CONFIG_BASE_FULL is not set
11# CONFIG_FUTEX is not set 8# CONFIG_FUTEX is not set
12# CONFIG_VM_EVENT_COUNTERS is not set 9# CONFIG_VM_EVENT_COUNTERS is not set
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 12# CONFIG_IOSCHED_CFQ is not set
15CONFIG_PPC_ADDER875=y 13CONFIG_PPC_ADDER875=y
16CONFIG_8xx_COPYBACK=y 14CONFIG_8xx_COPYBACK=y
17CONFIG_HZ_1000=y 15CONFIG_HZ_1000=y
18CONFIG_SPARSE_IRQ=y
19# CONFIG_SECCOMP is not set 16# CONFIG_SECCOMP is not set
20CONFIG_NET=y 17CONFIG_NET=y
21CONFIG_PACKET=y 18CONFIG_PACKET=y
@@ -32,42 +29,30 @@ CONFIG_SYN_COOKIES=y
32CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
33# CONFIG_FW_LOADER is not set 30# CONFIG_FW_LOADER is not set
34CONFIG_MTD=y 31CONFIG_MTD=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=y 32CONFIG_MTD_BLOCK=y
37CONFIG_MTD_CFI=y 33CONFIG_MTD_CFI=y
38CONFIG_MTD_CFI_AMDSTD=y 34CONFIG_MTD_CFI_AMDSTD=y
39CONFIG_MTD_PHYSMAP_OF=y 35CONFIG_MTD_PHYSMAP_OF=y
40# CONFIG_BLK_DEV is not set 36# CONFIG_BLK_DEV is not set
41# CONFIG_MISC_DEVICES is not set
42CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
43CONFIG_DAVICOM_PHY=y
44CONFIG_NET_ETHERNET=y
45CONFIG_FS_ENET=y 38CONFIG_FS_ENET=y
46# CONFIG_FS_ENET_HAS_SCC is not set 39# CONFIG_FS_ENET_HAS_SCC is not set
47# CONFIG_NETDEV_1000 is not set 40CONFIG_DAVICOM_PHY=y
48# CONFIG_NETDEV_10000 is not set
49# CONFIG_VT is not set 41# CONFIG_VT is not set
42# CONFIG_LEGACY_PTYS is not set
50CONFIG_SERIAL_CPM=y 43CONFIG_SERIAL_CPM=y
51CONFIG_SERIAL_CPM_CONSOLE=y 44CONFIG_SERIAL_CPM_CONSOLE=y
52# CONFIG_LEGACY_PTYS is not set
53CONFIG_GEN_RTC=y 45CONFIG_GEN_RTC=y
54# CONFIG_HWMON is not set 46# CONFIG_HWMON is not set
55CONFIG_THERMAL=y 47CONFIG_THERMAL=y
56CONFIG_VIDEO_OUTPUT_CONTROL=y
57# CONFIG_HID_SUPPORT is not set
58# CONFIG_USB_SUPPORT is not set 48# CONFIG_USB_SUPPORT is not set
59# CONFIG_DNOTIFY is not set 49# CONFIG_DNOTIFY is not set
60CONFIG_TMPFS=y 50CONFIG_TMPFS=y
61CONFIG_CRAMFS=y 51CONFIG_CRAMFS=y
62CONFIG_NFS_FS=y 52CONFIG_NFS_FS=y
63CONFIG_NFS_V3=y
64CONFIG_ROOT_NFS=y 53CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y 54CONFIG_CRC32_SLICEBY4=y
66# CONFIG_CRC32 is not set 55CONFIG_DEBUG_INFO=y
67CONFIG_MAGIC_SYSRQ=y
68CONFIG_DEBUG_FS=y 56CONFIG_DEBUG_FS=y
69CONFIG_DEBUG_KERNEL=y 57CONFIG_MAGIC_SYSRQ=y
70CONFIG_DETECT_HUNG_TASK=y 58CONFIG_DETECT_HUNG_TASK=y
71CONFIG_DEBUG_INFO=y
72# CONFIG_RCU_CPU_STALL_DETECTOR is not set
73CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/amigaone_defconfig b/arch/powerpc/configs/amigaone_defconfig
index 8c66b13e59fc..84f1b4140579 100644
--- a/arch/powerpc/configs/amigaone_defconfig
+++ b/arch/powerpc/configs/amigaone_defconfig
@@ -1,8 +1,9 @@
1CONFIG_ALTIVEC=y 1CONFIG_ALTIVEC=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=15 9CONFIG_LOG_BUF_SHIFT=15
@@ -12,14 +13,13 @@ CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
13CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
14# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16CONFIG_PARTITION_ADVANCED=y
17CONFIG_AMIGA_PARTITION=y
15# CONFIG_PPC_CHRP is not set 18# CONFIG_PPC_CHRP is not set
16# CONFIG_PPC_PMAC is not set 19# CONFIG_PPC_PMAC is not set
17CONFIG_AMIGAONE=y 20CONFIG_AMIGAONE=y
18CONFIG_HIGHMEM=y 21CONFIG_HIGHMEM=y
19CONFIG_NO_HZ=y
20CONFIG_HIGH_RES_TIMERS=y
21CONFIG_BINFMT_MISC=y 22CONFIG_BINFMT_MISC=y
22# CONFIG_MIGRATION is not set
23CONFIG_NET=y 23CONFIG_NET=y
24CONFIG_PACKET=y 24CONFIG_PACKET=y
25CONFIG_UNIX=y 25CONFIG_UNIX=y
@@ -37,11 +37,9 @@ CONFIG_NETFILTER=y
37# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 37# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
38# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 38# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
39# CONFIG_NETFILTER_XT_MATCH_STATE is not set 39# CONFIG_NETFILTER_XT_MATCH_STATE is not set
40# CONFIG_IP_NF_TARGET_ULOG is not set
41# CONFIG_IP_NF_MANGLE is not set 40# CONFIG_IP_NF_MANGLE is not set
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 41CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43# CONFIG_STANDALONE is not set 42# CONFIG_STANDALONE is not set
44CONFIG_PROC_DEVICETREE=y
45CONFIG_PARPORT=y 43CONFIG_PARPORT=y
46CONFIG_PARPORT_PC=y 44CONFIG_PARPORT_PC=y
47CONFIG_PARPORT_PC_FIFO=y 45CONFIG_PARPORT_PC_FIFO=y
@@ -65,24 +63,19 @@ CONFIG_SCSI_SYM53C8XX_2=y
65CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 63CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
66# CONFIG_SCSI_SYM53C8XX_MMIO is not set 64# CONFIG_SCSI_SYM53C8XX_MMIO is not set
67CONFIG_NETDEVICES=y 65CONFIG_NETDEVICES=y
68CONFIG_PHYLIB=y
69CONFIG_NET_ETHERNET=y
70CONFIG_NET_VENDOR_3COM=y
71CONFIG_VORTEX=y 66CONFIG_VORTEX=y
72CONFIG_NET_PCI=y
73CONFIG_8139CP=y 67CONFIG_8139CP=y
74CONFIG_8139TOO=y 68CONFIG_8139TOO=y
75# CONFIG_NETDEV_1000 is not set 69CONFIG_PHYLIB=y
76# CONFIG_NETDEV_10000 is not set
77CONFIG_PPP=m 70CONFIG_PPP=m
78CONFIG_PPP_MULTILINK=y
79CONFIG_PPP_FILTER=y
80CONFIG_PPP_ASYNC=m
81CONFIG_PPP_SYNC_TTY=m
82CONFIG_PPP_DEFLATE=m
83CONFIG_PPP_BSDCOMP=m 71CONFIG_PPP_BSDCOMP=m
72CONFIG_PPP_DEFLATE=m
73CONFIG_PPP_FILTER=y
84CONFIG_PPP_MPPE=m 74CONFIG_PPP_MPPE=m
75CONFIG_PPP_MULTILINK=y
85CONFIG_PPPOE=m 76CONFIG_PPPOE=m
77CONFIG_PPP_ASYNC=m
78CONFIG_PPP_SYNC_TTY=m
86CONFIG_INPUT_EVDEV=y 79CONFIG_INPUT_EVDEV=y
87CONFIG_INPUT_MISC=y 80CONFIG_INPUT_MISC=y
88CONFIG_INPUT_PCSPKR=y 81CONFIG_INPUT_PCSPKR=y
@@ -96,7 +89,6 @@ CONFIG_FIRMWARE_EDID=y
96CONFIG_FB_TILEBLITTING=y 89CONFIG_FB_TILEBLITTING=y
97CONFIG_FB_RADEON=y 90CONFIG_FB_RADEON=y
98CONFIG_FB_3DFX=y 91CONFIG_FB_3DFX=y
99CONFIG_DISPLAY_SUPPORT=m
100CONFIG_FRAMEBUFFER_CONSOLE=y 92CONFIG_FRAMEBUFFER_CONSOLE=y
101CONFIG_LOGO=y 93CONFIG_LOGO=y
102CONFIG_HID_GYRATION=y 94CONFIG_HID_GYRATION=y
@@ -104,7 +96,6 @@ CONFIG_HID_NTRIG=y
104CONFIG_HID_PANTHERLORD=y 96CONFIG_HID_PANTHERLORD=y
105CONFIG_HID_PETALYNX=y 97CONFIG_HID_PETALYNX=y
106CONFIG_HID_SAMSUNG=y 98CONFIG_HID_SAMSUNG=y
107CONFIG_HID_SONY=y
108CONFIG_HID_SUNPLUS=y 99CONFIG_HID_SUNPLUS=y
109CONFIG_HID_TOPSEED=y 100CONFIG_HID_TOPSEED=y
110CONFIG_USB=y 101CONFIG_USB=y
@@ -117,27 +108,20 @@ CONFIG_RTC_DRV_CMOS=y
117CONFIG_EXT2_FS=y 108CONFIG_EXT2_FS=y
118CONFIG_EXT3_FS=y 109CONFIG_EXT3_FS=y
119CONFIG_EXT4_FS=y 110CONFIG_EXT4_FS=y
120CONFIG_INOTIFY=y
121CONFIG_ISO9660_FS=y 111CONFIG_ISO9660_FS=y
122CONFIG_MSDOS_FS=m 112CONFIG_MSDOS_FS=m
123CONFIG_VFAT_FS=m 113CONFIG_VFAT_FS=m
124CONFIG_PROC_KCORE=y 114CONFIG_PROC_KCORE=y
125CONFIG_TMPFS=y 115CONFIG_TMPFS=y
126CONFIG_AFFS_FS=m 116CONFIG_AFFS_FS=m
127CONFIG_PARTITION_ADVANCED=y
128CONFIG_AMIGA_PARTITION=y
129CONFIG_NLS_ASCII=y 117CONFIG_NLS_ASCII=y
130CONFIG_NLS_ISO8859_1=m 118CONFIG_NLS_ISO8859_1=m
131CONFIG_CRC_T10DIF=y 119CONFIG_CRC_T10DIF=y
132CONFIG_MAGIC_SYSRQ=y 120CONFIG_MAGIC_SYSRQ=y
133CONFIG_DEBUG_KERNEL=y 121CONFIG_DEBUG_KERNEL=y
134CONFIG_DEBUG_MUTEXES=y 122CONFIG_DEBUG_MUTEXES=y
135CONFIG_DEBUG_SPINLOCK_SLEEP=y
136# CONFIG_RCU_CPU_STALL_DETECTOR is not set
137CONFIG_SYSCTL_SYSCALL_CHECK=y
138CONFIG_XMON=y 123CONFIG_XMON=y
139CONFIG_XMON_DEFAULT=y 124CONFIG_XMON_DEFAULT=y
140CONFIG_CRYPTO=y
141CONFIG_CRYPTO_CBC=m 125CONFIG_CRYPTO_CBC=m
142CONFIG_CRYPTO_PCBC=m 126CONFIG_CRYPTO_PCBC=m
143# CONFIG_CRYPTO_ANSI_CPRNG is not set 127# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index 8a08d6dcb0b4..91862292cd55 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -1,17 +1,23 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
4CONFIG_BSD_PROCESS_ACCT=y
5CONFIG_AUDIT=y 3CONFIG_AUDIT=y
4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7CONFIG_KALLSYMS_EXTRA_PASS=y
8CONFIG_PROFILING=y 6CONFIG_PROFILING=y
9CONFIG_OPROFILE=m 7CONFIG_OPROFILE=m
10CONFIG_KPROBES=y 8CONFIG_KPROBES=y
11CONFIG_MODULES=y 9CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
13CONFIG_MODVERSIONS=y 11CONFIG_MODVERSIONS=y
14# CONFIG_BLK_DEV_BSG is not set 12CONFIG_PARTITION_ADVANCED=y
13CONFIG_OSF_PARTITION=y
14CONFIG_MAC_PARTITION=y
15CONFIG_BSD_DISKLABEL=y
16CONFIG_MINIX_SUBPARTITION=y
17CONFIG_SOLARIS_X86_PARTITION=y
18CONFIG_UNIXWARE_DISKLABEL=y
19CONFIG_SGI_PARTITION=y
20CONFIG_SUN_PARTITION=y
15# CONFIG_PPC_CHRP is not set 21# CONFIG_PPC_CHRP is not set
16# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
17CONFIG_EMBEDDED6xx=y 23CONFIG_EMBEDDED6xx=y
@@ -24,7 +30,6 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
24CONFIG_HIGHMEM=y 30CONFIG_HIGHMEM=y
25CONFIG_PREEMPT_VOLUNTARY=y 31CONFIG_PREEMPT_VOLUNTARY=y
26CONFIG_BINFMT_MISC=y 32CONFIG_BINFMT_MISC=y
27CONFIG_SPARSE_IRQ=y
28CONFIG_PM=y 33CONFIG_PM=y
29CONFIG_PCI_MSI=y 34CONFIG_PCI_MSI=y
30CONFIG_HOTPLUG_PCI=y 35CONFIG_HOTPLUG_PCI=y
@@ -43,8 +48,6 @@ CONFIG_IP_ROUTE_VERBOSE=y
43CONFIG_IP_PNP=y 48CONFIG_IP_PNP=y
44CONFIG_IP_PNP_DHCP=y 49CONFIG_IP_PNP_DHCP=y
45CONFIG_NET_IPIP=m 50CONFIG_NET_IPIP=m
46CONFIG_NET_IPGRE=m
47CONFIG_NET_IPGRE_BROADCAST=y
48CONFIG_IP_MROUTE=y 51CONFIG_IP_MROUTE=y
49CONFIG_IP_PIMSM_V1=y 52CONFIG_IP_PIMSM_V1=y
50CONFIG_IP_PIMSM_V2=y 53CONFIG_IP_PIMSM_V2=y
@@ -52,22 +55,17 @@ CONFIG_SYN_COOKIES=y
52CONFIG_INET_AH=m 55CONFIG_INET_AH=m
53CONFIG_INET_ESP=m 56CONFIG_INET_ESP=m
54CONFIG_INET_IPCOMP=m 57CONFIG_INET_IPCOMP=m
55CONFIG_IPV6_PRIVACY=y
56CONFIG_INET6_AH=m 58CONFIG_INET6_AH=m
57CONFIG_INET6_ESP=m 59CONFIG_INET6_ESP=m
58CONFIG_INET6_IPCOMP=m 60CONFIG_INET6_IPCOMP=m
59CONFIG_IPV6_TUNNEL=m 61CONFIG_IPV6_TUNNEL=m
60CONFIG_NETFILTER=y 62CONFIG_NETFILTER=y
61# CONFIG_NETFILTER_XT_MATCH_SCTP is not set 63# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
62CONFIG_IP_NF_QUEUE=m
63CONFIG_IP_NF_IPTABLES=m 64CONFIG_IP_NF_IPTABLES=m
64CONFIG_IP_NF_MATCH_ADDRTYPE=m
65CONFIG_IP_NF_MATCH_ECN=m 65CONFIG_IP_NF_MATCH_ECN=m
66CONFIG_IP_NF_MATCH_TTL=m 66CONFIG_IP_NF_MATCH_TTL=m
67CONFIG_IP_NF_FILTER=m 67CONFIG_IP_NF_FILTER=m
68CONFIG_IP_NF_TARGET_REJECT=m 68CONFIG_IP_NF_TARGET_REJECT=m
69CONFIG_IP_NF_TARGET_LOG=m
70CONFIG_IP_NF_TARGET_ULOG=m
71CONFIG_IP_NF_MANGLE=m 69CONFIG_IP_NF_MANGLE=m
72CONFIG_IP_NF_TARGET_ECN=m 70CONFIG_IP_NF_TARGET_ECN=m
73CONFIG_IP_NF_RAW=m 71CONFIG_IP_NF_RAW=m
@@ -81,7 +79,6 @@ CONFIG_IP6_NF_MATCH_OPTS=m
81CONFIG_IP6_NF_MATCH_HL=m 79CONFIG_IP6_NF_MATCH_HL=m
82CONFIG_IP6_NF_MATCH_IPV6HEADER=m 80CONFIG_IP6_NF_MATCH_IPV6HEADER=m
83CONFIG_IP6_NF_MATCH_RT=m 81CONFIG_IP6_NF_MATCH_RT=m
84CONFIG_IP6_NF_TARGET_LOG=m
85CONFIG_IP6_NF_FILTER=m 82CONFIG_IP6_NF_FILTER=m
86CONFIG_IP6_NF_MANGLE=m 83CONFIG_IP6_NF_MANGLE=m
87CONFIG_IP6_NF_RAW=m 84CONFIG_IP6_NF_RAW=m
@@ -133,8 +130,6 @@ CONFIG_NET_CLS_RSVP=m
133CONFIG_NET_CLS_RSVP6=m 130CONFIG_NET_CLS_RSVP6=m
134CONFIG_NET_CLS_IND=y 131CONFIG_NET_CLS_IND=y
135CONFIG_BT=m 132CONFIG_BT=m
136CONFIG_BT_L2CAP=y
137CONFIG_BT_SCO=y
138CONFIG_BT_RFCOMM=m 133CONFIG_BT_RFCOMM=m
139CONFIG_BT_RFCOMM_TTY=y 134CONFIG_BT_RFCOMM_TTY=y
140CONFIG_BT_BNEP=m 135CONFIG_BT_BNEP=m
@@ -149,9 +144,6 @@ CONFIG_BT_HCIBFUSB=m
149CONFIG_BT_HCIVHCI=m 144CONFIG_BT_HCIVHCI=m
150CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 145CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
151CONFIG_MTD=y 146CONFIG_MTD=y
152CONFIG_MTD_CONCAT=m
153CONFIG_MTD_OF_PARTS=y
154CONFIG_MTD_CHAR=m
155CONFIG_MTD_BLOCK=y 147CONFIG_MTD_BLOCK=y
156CONFIG_MTD_CFI=y 148CONFIG_MTD_CFI=y
157CONFIG_MTD_CFI_AMDSTD=y 149CONFIG_MTD_CFI_AMDSTD=y
@@ -162,7 +154,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
162CONFIG_BLK_DEV_NBD=m 154CONFIG_BLK_DEV_NBD=m
163CONFIG_BLK_DEV_RAM=y 155CONFIG_BLK_DEV_RAM=y
164CONFIG_BLK_DEV_RAM_SIZE=16384 156CONFIG_BLK_DEV_RAM_SIZE=16384
165# CONFIG_MISC_DEVICES is not set
166CONFIG_SCSI=m 157CONFIG_SCSI=m
167CONFIG_BLK_DEV_SD=m 158CONFIG_BLK_DEV_SD=m
168CONFIG_CHR_DEV_ST=m 159CONFIG_CHR_DEV_ST=m
@@ -182,7 +173,6 @@ CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
182CONFIG_AIC7XXX_RESET_DELAY_MS=15000 173CONFIG_AIC7XXX_RESET_DELAY_MS=15000
183# CONFIG_AIC7XXX_DEBUG_ENABLE is not set 174# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
184# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set 175# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
185CONFIG_SCSI_AIC7XXX_OLD=m
186CONFIG_SCSI_AIC79XX=m 176CONFIG_SCSI_AIC79XX=m
187CONFIG_AIC79XX_CMDS_PER_DEVICE=4 177CONFIG_AIC79XX_CMDS_PER_DEVICE=4
188CONFIG_AIC79XX_RESET_DELAY_MS=15000 178CONFIG_AIC79XX_RESET_DELAY_MS=15000
@@ -199,18 +189,14 @@ CONFIG_SCSI_IPS=m
199CONFIG_SCSI_INITIO=m 189CONFIG_SCSI_INITIO=m
200CONFIG_SCSI_SYM53C8XX_2=m 190CONFIG_SCSI_SYM53C8XX_2=m
201CONFIG_SCSI_QLOGIC_1280=m 191CONFIG_SCSI_QLOGIC_1280=m
202CONFIG_SCSI_LPFC=m
203CONFIG_NETDEVICES=y 192CONFIG_NETDEVICES=y
204CONFIG_DUMMY=m
205CONFIG_BONDING=m 193CONFIG_BONDING=m
194CONFIG_DUMMY=m
195CONFIG_NETCONSOLE=m
206CONFIG_TUN=m 196CONFIG_TUN=m
207CONFIG_VITESSE_PHY=y
208CONFIG_NET_ETHERNET=y
209CONFIG_MII=y
210CONFIG_MV643XX_ETH=y
211# CONFIG_NETDEV_10000 is not set
212# CONFIG_ATM_DRIVERS is not set 197# CONFIG_ATM_DRIVERS is not set
213CONFIG_NETCONSOLE=m 198CONFIG_MV643XX_ETH=y
199CONFIG_VITESSE_PHY=y
214# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 200# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
215CONFIG_INPUT_EVDEV=y 201CONFIG_INPUT_EVDEV=y
216# CONFIG_INPUT_KEYBOARD is not set 202# CONFIG_INPUT_KEYBOARD is not set
@@ -218,10 +204,10 @@ CONFIG_INPUT_EVDEV=y
218CONFIG_INPUT_MISC=y 204CONFIG_INPUT_MISC=y
219CONFIG_INPUT_UINPUT=m 205CONFIG_INPUT_UINPUT=m
220# CONFIG_SERIO is not set 206# CONFIG_SERIO is not set
207# CONFIG_LEGACY_PTYS is not set
221CONFIG_SERIAL_NONSTANDARD=y 208CONFIG_SERIAL_NONSTANDARD=y
222CONFIG_SERIAL_MPSC=y 209CONFIG_SERIAL_MPSC=y
223CONFIG_SERIAL_MPSC_CONSOLE=y 210CONFIG_SERIAL_MPSC_CONSOLE=y
224# CONFIG_LEGACY_PTYS is not set
225CONFIG_NVRAM=m 211CONFIG_NVRAM=m
226CONFIG_GEN_RTC=m 212CONFIG_GEN_RTC=m
227CONFIG_RAW_DRIVER=y 213CONFIG_RAW_DRIVER=y
@@ -236,7 +222,7 @@ CONFIG_SENSORS_ADM1026=m
236CONFIG_SENSORS_ADM1031=m 222CONFIG_SENSORS_ADM1031=m
237CONFIG_SENSORS_DS1621=m 223CONFIG_SENSORS_DS1621=m
238CONFIG_SENSORS_GL518SM=m 224CONFIG_SENSORS_GL518SM=m
239CONFIG_SENSORS_IT87=m 225CONFIG_SENSORS_MAX1619=m
240CONFIG_SENSORS_LM75=m 226CONFIG_SENSORS_LM75=m
241CONFIG_SENSORS_LM77=m 227CONFIG_SENSORS_LM77=m
242CONFIG_SENSORS_LM78=m 228CONFIG_SENSORS_LM78=m
@@ -245,23 +231,17 @@ CONFIG_SENSORS_LM83=m
245CONFIG_SENSORS_LM85=m 231CONFIG_SENSORS_LM85=m
246CONFIG_SENSORS_LM87=m 232CONFIG_SENSORS_LM87=m
247CONFIG_SENSORS_LM90=m 233CONFIG_SENSORS_LM90=m
248CONFIG_SENSORS_MAX1619=m
249CONFIG_SENSORS_PCF8591=m 234CONFIG_SENSORS_PCF8591=m
250CONFIG_SENSORS_SMSC47M1=m
251CONFIG_SENSORS_SMSC47B397=m
252CONFIG_SENSORS_VIA686A=m 235CONFIG_SENSORS_VIA686A=m
253CONFIG_SENSORS_W83781D=m 236CONFIG_SENSORS_W83781D=m
254CONFIG_SENSORS_W83L785TS=m 237CONFIG_SENSORS_W83L785TS=m
255CONFIG_SENSORS_W83627HF=m
256CONFIG_WATCHDOG=y 238CONFIG_WATCHDOG=y
257CONFIG_SOFT_WATCHDOG=m 239CONFIG_SOFT_WATCHDOG=m
258CONFIG_PCIPCWATCHDOG=m 240CONFIG_PCIPCWATCHDOG=m
259CONFIG_WDTPCI=m 241CONFIG_WDTPCI=m
260CONFIG_USBPCWATCHDOG=m 242CONFIG_USBPCWATCHDOG=m
261# CONFIG_VGA_CONSOLE is not set 243# CONFIG_VGA_CONSOLE is not set
262# CONFIG_HID_SUPPORT is not set
263CONFIG_USB=m 244CONFIG_USB=m
264# CONFIG_USB_DEVICE_CLASS is not set
265CONFIG_USB_MON=m 245CONFIG_USB_MON=m
266CONFIG_USB_EHCI_HCD=m 246CONFIG_USB_EHCI_HCD=m
267CONFIG_USB_EHCI_ROOT_HUB_TT=y 247CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -350,24 +330,12 @@ CONFIG_JFFS2_FS=y
350CONFIG_CRAMFS=m 330CONFIG_CRAMFS=m
351CONFIG_VXFS_FS=m 331CONFIG_VXFS_FS=m
352CONFIG_NFS_FS=y 332CONFIG_NFS_FS=y
353CONFIG_NFS_V3=y
354CONFIG_NFS_V3_ACL=y 333CONFIG_NFS_V3_ACL=y
355CONFIG_NFS_V4=y 334CONFIG_NFS_V4=y
356CONFIG_ROOT_NFS=y 335CONFIG_ROOT_NFS=y
357CONFIG_RPCSEC_GSS_SPKM3=m
358CONFIG_CIFS=m 336CONFIG_CIFS=m
359CONFIG_CIFS_XATTR=y 337CONFIG_CIFS_XATTR=y
360CONFIG_CIFS_POSIX=y 338CONFIG_CIFS_POSIX=y
361CONFIG_PARTITION_ADVANCED=y
362CONFIG_OSF_PARTITION=y
363CONFIG_MAC_PARTITION=y
364CONFIG_BSD_DISKLABEL=y
365CONFIG_MINIX_SUBPARTITION=y
366CONFIG_SOLARIS_X86_PARTITION=y
367CONFIG_UNIXWARE_DISKLABEL=y
368CONFIG_SGI_PARTITION=y
369CONFIG_SUN_PARTITION=y
370CONFIG_EFI_PARTITION=y
371CONFIG_NLS=y 339CONFIG_NLS=y
372CONFIG_NLS_DEFAULT="utf8" 340CONFIG_NLS_DEFAULT="utf8"
373CONFIG_NLS_CODEPAGE_437=y 341CONFIG_NLS_CODEPAGE_437=y
@@ -409,21 +377,16 @@ CONFIG_NLS_KOI8_R=m
409CONFIG_NLS_KOI8_U=m 377CONFIG_NLS_KOI8_U=m
410CONFIG_CRC_CCITT=m 378CONFIG_CRC_CCITT=m
411CONFIG_CRC_T10DIF=m 379CONFIG_CRC_T10DIF=m
380CONFIG_DEBUG_INFO=y
412CONFIG_MAGIC_SYSRQ=y 381CONFIG_MAGIC_SYSRQ=y
413CONFIG_DEBUG_KERNEL=y 382CONFIG_DEBUG_KERNEL=y
414CONFIG_DETECT_HUNG_TASK=y 383CONFIG_DEBUG_STACK_USAGE=y
415CONFIG_DEBUG_SPINLOCK=y
416CONFIG_DEBUG_SPINLOCK_SLEEP=y
417CONFIG_DEBUG_HIGHMEM=y 384CONFIG_DEBUG_HIGHMEM=y
418CONFIG_DEBUG_INFO=y
419# CONFIG_RCU_CPU_STALL_DETECTOR is not set
420CONFIG_SYSCTL_SYSCALL_CHECK=y
421CONFIG_DEBUG_STACKOVERFLOW=y 385CONFIG_DEBUG_STACKOVERFLOW=y
422CONFIG_DEBUG_STACK_USAGE=y 386CONFIG_DETECT_HUNG_TASK=y
387CONFIG_DEBUG_SPINLOCK=y
423CONFIG_BOOTX_TEXT=y 388CONFIG_BOOTX_TEXT=y
424CONFIG_PPC_EARLY_DEBUG=y 389CONFIG_PPC_EARLY_DEBUG=y
425CONFIG_PPC_EARLY_DEBUG_BOOTX=y
426CONFIG_KEYS=y
427CONFIG_KEYS_DEBUG_PROC_KEYS=y 390CONFIG_KEYS_DEBUG_PROC_KEYS=y
428CONFIG_SECURITY=y 391CONFIG_SECURITY=y
429CONFIG_SECURITY_NETWORK=y 392CONFIG_SECURITY_NETWORK=y
@@ -431,16 +394,11 @@ CONFIG_SECURITY_SELINUX=y
431CONFIG_SECURITY_SELINUX_BOOTPARAM=y 394CONFIG_SECURITY_SELINUX_BOOTPARAM=y
432CONFIG_SECURITY_SELINUX_DISABLE=y 395CONFIG_SECURITY_SELINUX_DISABLE=y
433CONFIG_CRYPTO_NULL=m 396CONFIG_CRYPTO_NULL=m
434CONFIG_CRYPTO_ECB=m
435CONFIG_CRYPTO_HMAC=y 397CONFIG_CRYPTO_HMAC=y
436CONFIG_CRYPTO_MD4=m
437CONFIG_CRYPTO_MICHAEL_MIC=m 398CONFIG_CRYPTO_MICHAEL_MIC=m
438CONFIG_CRYPTO_SHA1=y 399CONFIG_CRYPTO_SHA1=y
439CONFIG_CRYPTO_SHA256=m
440CONFIG_CRYPTO_SHA512=m 400CONFIG_CRYPTO_SHA512=m
441CONFIG_CRYPTO_WP512=m 401CONFIG_CRYPTO_WP512=m
442CONFIG_CRYPTO_AES=m
443CONFIG_CRYPTO_ARC4=m
444CONFIG_CRYPTO_BLOWFISH=m 402CONFIG_CRYPTO_BLOWFISH=m
445CONFIG_CRYPTO_CAST6=m 403CONFIG_CRYPTO_CAST6=m
446CONFIG_CRYPTO_KHAZAD=m 404CONFIG_CRYPTO_KHAZAD=m
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index 7a7b3c879f96..9788b3c2d563 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -3,9 +3,10 @@ CONFIG_TUNE_CELL=y
3CONFIG_ALTIVEC=y 3CONFIG_ALTIVEC=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_NR_CPUS=4 5CONFIG_NR_CPUS=4
6CONFIG_EXPERIMENTAL=y
7CONFIG_SYSVIPC=y 6CONFIG_SYSVIPC=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=15 12CONFIG_LOG_BUF_SHIFT=15
@@ -17,7 +18,7 @@ CONFIG_PROFILING=y
17CONFIG_OPROFILE=m 18CONFIG_OPROFILE=m
18CONFIG_MODULES=y 19CONFIG_MODULES=y
19CONFIG_MODULE_UNLOAD=y 20CONFIG_MODULE_UNLOAD=y
20# CONFIG_BLK_DEV_BSG is not set 21CONFIG_PARTITION_ADVANCED=y
21# CONFIG_PPC_POWERNV is not set 22# CONFIG_PPC_POWERNV is not set
22# CONFIG_PPC_PSERIES is not set 23# CONFIG_PPC_PSERIES is not set
23# CONFIG_PPC_PMAC is not set 24# CONFIG_PPC_PMAC is not set
@@ -34,8 +35,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
34CONFIG_CPU_FREQ_GOV_USERSPACE=y 35CONFIG_CPU_FREQ_GOV_USERSPACE=y
35CONFIG_CPU_FREQ_GOV_ONDEMAND=y 36CONFIG_CPU_FREQ_GOV_ONDEMAND=y
36CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 37CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
37CONFIG_NO_HZ=y
38CONFIG_HIGH_RES_TIMERS=y
39CONFIG_BINFMT_MISC=m 38CONFIG_BINFMT_MISC=m
40CONFIG_IRQ_ALL_CPUS=y 39CONFIG_IRQ_ALL_CPUS=y
41CONFIG_NUMA=y 40CONFIG_NUMA=y
@@ -63,7 +62,6 @@ CONFIG_INET6_IPCOMP=m
63# CONFIG_IPV6_SIT is not set 62# CONFIG_IPV6_SIT is not set
64CONFIG_IPV6_TUNNEL=m 63CONFIG_IPV6_TUNNEL=m
65CONFIG_NETFILTER=y 64CONFIG_NETFILTER=y
66CONFIG_NETFILTER_NETLINK_QUEUE=m
67CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 65CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
68CONFIG_NETFILTER_XT_TARGET_DSCP=m 66CONFIG_NETFILTER_XT_TARGET_DSCP=m
69CONFIG_NETFILTER_XT_TARGET_MARK=m 67CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -94,16 +92,12 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
94CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 92CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
95CONFIG_NETFILTER_XT_MATCH_TIME=m 93CONFIG_NETFILTER_XT_MATCH_TIME=m
96CONFIG_NETFILTER_XT_MATCH_U32=m 94CONFIG_NETFILTER_XT_MATCH_U32=m
97CONFIG_IP_NF_QUEUE=m
98CONFIG_IP_NF_IPTABLES=m 95CONFIG_IP_NF_IPTABLES=m
99CONFIG_IP_NF_MATCH_ADDRTYPE=m
100CONFIG_IP_NF_MATCH_AH=m 96CONFIG_IP_NF_MATCH_AH=m
101CONFIG_IP_NF_MATCH_ECN=m 97CONFIG_IP_NF_MATCH_ECN=m
102CONFIG_IP_NF_MATCH_TTL=m 98CONFIG_IP_NF_MATCH_TTL=m
103CONFIG_IP_NF_FILTER=m 99CONFIG_IP_NF_FILTER=m
104CONFIG_IP_NF_TARGET_REJECT=m 100CONFIG_IP_NF_TARGET_REJECT=m
105CONFIG_IP_NF_TARGET_LOG=m
106CONFIG_IP_NF_TARGET_ULOG=m
107CONFIG_IP_NF_MANGLE=m 101CONFIG_IP_NF_MANGLE=m
108CONFIG_IP_NF_TARGET_ECN=m 102CONFIG_IP_NF_TARGET_ECN=m
109CONFIG_IP_NF_TARGET_TTL=m 103CONFIG_IP_NF_TARGET_TTL=m
@@ -112,7 +106,6 @@ CONFIG_IP_NF_ARPTABLES=m
112CONFIG_IP_NF_ARPFILTER=m 106CONFIG_IP_NF_ARPFILTER=m
113CONFIG_IP_NF_ARP_MANGLE=m 107CONFIG_IP_NF_ARP_MANGLE=m
114CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 108CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
115CONFIG_PROC_DEVICETREE=y
116CONFIG_BLK_DEV_LOOP=y 109CONFIG_BLK_DEV_LOOP=y
117CONFIG_BLK_DEV_RAM=y 110CONFIG_BLK_DEV_RAM=y
118CONFIG_BLK_DEV_RAM_SIZE=131072 111CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -144,26 +137,24 @@ CONFIG_NETDEVICES=y
144CONFIG_BONDING=m 137CONFIG_BONDING=m
145CONFIG_MACVLAN=m 138CONFIG_MACVLAN=m
146CONFIG_TUN=y 139CONFIG_TUN=y
147CONFIG_NET_ETHERNET=y 140CONFIG_TIGON3=y
148CONFIG_MII=y
149CONFIG_E1000=m 141CONFIG_E1000=m
150CONFIG_SKGE=m 142CONFIG_SKGE=m
151CONFIG_SKY2=m 143CONFIG_SKY2=m
152CONFIG_TIGON3=y
153CONFIG_SPIDER_NET=y
154CONFIG_GELIC_NET=m 144CONFIG_GELIC_NET=m
155CONFIG_GELIC_WIRELESS=y 145CONFIG_GELIC_WIRELESS=y
146CONFIG_SPIDER_NET=y
156# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 147# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
157# CONFIG_INPUT_KEYBOARD is not set 148# CONFIG_INPUT_KEYBOARD is not set
158# CONFIG_INPUT_MOUSE is not set 149# CONFIG_INPUT_MOUSE is not set
159# CONFIG_SERIO_I8042 is not set 150# CONFIG_SERIO_I8042 is not set
151# CONFIG_LEGACY_PTYS is not set
160CONFIG_SERIAL_NONSTANDARD=y 152CONFIG_SERIAL_NONSTANDARD=y
161CONFIG_SERIAL_8250=y 153CONFIG_SERIAL_8250=y
162CONFIG_SERIAL_8250_CONSOLE=y 154CONFIG_SERIAL_8250_CONSOLE=y
163CONFIG_SERIAL_TXX9_NR_UARTS=2 155CONFIG_SERIAL_TXX9_NR_UARTS=2
164CONFIG_SERIAL_TXX9_CONSOLE=y 156CONFIG_SERIAL_TXX9_CONSOLE=y
165CONFIG_SERIAL_OF_PLATFORM=y 157CONFIG_SERIAL_OF_PLATFORM=y
166# CONFIG_LEGACY_PTYS is not set
167CONFIG_HVC_RTAS=y 158CONFIG_HVC_RTAS=y
168CONFIG_HVC_BEAT=y 159CONFIG_HVC_BEAT=y
169CONFIG_IPMI_HANDLER=m 160CONFIG_IPMI_HANDLER=m
@@ -174,9 +165,7 @@ CONFIG_IPMI_POWEROFF=m
174# CONFIG_HW_RANDOM is not set 165# CONFIG_HW_RANDOM is not set
175CONFIG_GEN_RTC=y 166CONFIG_GEN_RTC=y
176CONFIG_I2C=y 167CONFIG_I2C=y
177# CONFIG_HWMON is not set
178CONFIG_WATCHDOG=y 168CONFIG_WATCHDOG=y
179CONFIG_VIDEO_OUTPUT_CONTROL=m
180# CONFIG_VGA_CONSOLE is not set 169# CONFIG_VGA_CONSOLE is not set
181CONFIG_HID=m 170CONFIG_HID=m
182# CONFIG_USB_HID is not set 171# CONFIG_USB_HID is not set
@@ -199,7 +188,6 @@ CONFIG_EDAC_CELL=y
199CONFIG_UIO=m 188CONFIG_UIO=m
200CONFIG_EXT2_FS=y 189CONFIG_EXT2_FS=y
201CONFIG_EXT3_FS=y 190CONFIG_EXT3_FS=y
202CONFIG_INOTIFY=y
203CONFIG_AUTOFS4_FS=m 191CONFIG_AUTOFS4_FS=m
204CONFIG_ISO9660_FS=m 192CONFIG_ISO9660_FS=m
205CONFIG_JOLIET=y 193CONFIG_JOLIET=y
@@ -210,11 +198,8 @@ CONFIG_PROC_KCORE=y
210CONFIG_TMPFS=y 198CONFIG_TMPFS=y
211CONFIG_HUGETLBFS=y 199CONFIG_HUGETLBFS=y
212CONFIG_NFS_FS=y 200CONFIG_NFS_FS=y
213CONFIG_NFS_V3=y
214CONFIG_NFS_V3_ACL=y 201CONFIG_NFS_V3_ACL=y
215CONFIG_ROOT_NFS=y 202CONFIG_ROOT_NFS=y
216CONFIG_PARTITION_ADVANCED=y
217CONFIG_EFI_PARTITION=y
218CONFIG_NLS_ISO8859_1=m 203CONFIG_NLS_ISO8859_1=m
219CONFIG_NLS_ISO8859_2=m 204CONFIG_NLS_ISO8859_2=m
220CONFIG_NLS_ISO8859_3=m 205CONFIG_NLS_ISO8859_3=m
@@ -227,11 +212,10 @@ CONFIG_NLS_ISO8859_13=m
227CONFIG_NLS_ISO8859_14=m 212CONFIG_NLS_ISO8859_14=m
228CONFIG_NLS_ISO8859_15=m 213CONFIG_NLS_ISO8859_15=m
229# CONFIG_ENABLE_MUST_CHECK is not set 214# CONFIG_ENABLE_MUST_CHECK is not set
230CONFIG_MAGIC_SYSRQ=y
231CONFIG_DEBUG_FS=y 215CONFIG_DEBUG_FS=y
216CONFIG_MAGIC_SYSRQ=y
232CONFIG_DEBUG_KERNEL=y 217CONFIG_DEBUG_KERNEL=y
233CONFIG_DEBUG_MUTEXES=y 218CONFIG_DEBUG_MUTEXES=y
234CONFIG_DEBUG_SPINLOCK_SLEEP=y
235CONFIG_XMON=y 219CONFIG_XMON=y
236CONFIG_XMON_DEFAULT=y 220CONFIG_XMON_DEFAULT=y
237CONFIG_CRYPTO_ECB=m 221CONFIG_CRYPTO_ECB=m
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index acccbfde8a50..ff454dcd2dd3 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -3,9 +3,10 @@ CONFIG_TUNE_CELL=y
3CONFIG_ALTIVEC=y 3CONFIG_ALTIVEC=y
4CONFIG_SMP=y 4CONFIG_SMP=y
5CONFIG_NR_CPUS=4 5CONFIG_NR_CPUS=4
6CONFIG_EXPERIMENTAL=y
7CONFIG_SYSVIPC=y 6CONFIG_SYSVIPC=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
11CONFIG_LOG_BUF_SHIFT=15 12CONFIG_LOG_BUF_SHIFT=15
@@ -15,6 +16,7 @@ CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
16CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
17CONFIG_MODULE_SRCVERSION_ALL=y 18CONFIG_MODULE_SRCVERSION_ALL=y
19CONFIG_PARTITION_ADVANCED=y
18# CONFIG_PPC_POWERNV is not set 20# CONFIG_PPC_POWERNV is not set
19# CONFIG_PPC_PSERIES is not set 21# CONFIG_PPC_PSERIES is not set
20# CONFIG_PPC_PMAC is not set 22# CONFIG_PPC_PMAC is not set
@@ -23,8 +25,6 @@ CONFIG_SPU_FS=y
23# CONFIG_CBE_THERM is not set 25# CONFIG_CBE_THERM is not set
24CONFIG_UDBG_RTAS_CONSOLE=y 26CONFIG_UDBG_RTAS_CONSOLE=y
25# CONFIG_RTAS_PROC is not set 27# CONFIG_RTAS_PROC is not set
26CONFIG_NO_HZ=y
27CONFIG_HIGH_RES_TIMERS=y
28CONFIG_BINFMT_MISC=m 28CONFIG_BINFMT_MISC=m
29CONFIG_KEXEC=y 29CONFIG_KEXEC=y
30CONFIG_NUMA=y 30CONFIG_NUMA=y
@@ -40,9 +40,7 @@ CONFIG_INET6_ESP=m
40CONFIG_INET6_IPCOMP=m 40CONFIG_INET6_IPCOMP=m
41CONFIG_IPV6_TUNNEL=m 41CONFIG_IPV6_TUNNEL=m
42CONFIG_NETFILTER=y 42CONFIG_NETFILTER=y
43CONFIG_IP_NF_QUEUE=m
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 44CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 45CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=131072 46CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -55,7 +53,6 @@ CONFIG_SCSI=m
55CONFIG_BLK_DEV_SD=m 53CONFIG_BLK_DEV_SD=m
56CONFIG_BLK_DEV_SR=m 54CONFIG_BLK_DEV_SR=m
57CONFIG_CHR_DEV_SG=m 55CONFIG_CHR_DEV_SG=m
58CONFIG_SCSI_MULTI_LUN=y
59CONFIG_MD=y 56CONFIG_MD=y
60CONFIG_BLK_DEV_MD=m 57CONFIG_BLK_DEV_MD=m
61CONFIG_MD_LINEAR=m 58CONFIG_MD_LINEAR=m
@@ -68,17 +65,15 @@ CONFIG_DM_MIRROR=m
68CONFIG_DM_ZERO=m 65CONFIG_DM_ZERO=m
69CONFIG_DM_MULTIPATH=m 66CONFIG_DM_MULTIPATH=m
70CONFIG_NETDEVICES=y 67CONFIG_NETDEVICES=y
71CONFIG_NET_ETHERNET=y
72CONFIG_MII=y
73CONFIG_SPIDER_NET=y 68CONFIG_SPIDER_NET=y
74# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 69# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
75# CONFIG_INPUT_KEYBOARD is not set 70# CONFIG_INPUT_KEYBOARD is not set
76# CONFIG_INPUT_MOUSE is not set 71# CONFIG_INPUT_MOUSE is not set
77# CONFIG_SERIO_I8042 is not set 72# CONFIG_SERIO_I8042 is not set
73# CONFIG_LEGACY_PTYS is not set
78CONFIG_SERIAL_NONSTANDARD=y 74CONFIG_SERIAL_NONSTANDARD=y
79CONFIG_SERIAL_TXX9_NR_UARTS=3 75CONFIG_SERIAL_TXX9_NR_UARTS=3
80CONFIG_SERIAL_TXX9_CONSOLE=y 76CONFIG_SERIAL_TXX9_CONSOLE=y
81# CONFIG_LEGACY_PTYS is not set
82CONFIG_HVC_RTAS=y 77CONFIG_HVC_RTAS=y
83CONFIG_HVC_BEAT=y 78CONFIG_HVC_BEAT=y
84# CONFIG_HW_RANDOM is not set 79# CONFIG_HW_RANDOM is not set
@@ -89,7 +84,6 @@ CONFIG_WATCHDOG=y
89# CONFIG_VGA_CONSOLE is not set 84# CONFIG_VGA_CONSOLE is not set
90CONFIG_USB_HIDDEV=y 85CONFIG_USB_HIDDEV=y
91CONFIG_USB=y 86CONFIG_USB=y
92# CONFIG_USB_DEVICE_CLASS is not set
93CONFIG_USB_MON=y 87CONFIG_USB_MON=y
94CONFIG_USB_EHCI_HCD=m 88CONFIG_USB_EHCI_HCD=m
95# CONFIG_USB_EHCI_HCD_PPC_OF is not set 89# CONFIG_USB_EHCI_HCD_PPC_OF is not set
@@ -103,7 +97,6 @@ CONFIG_EXT2_FS_XIP=y
103CONFIG_EXT3_FS=y 97CONFIG_EXT3_FS=y
104CONFIG_EXT3_FS_POSIX_ACL=y 98CONFIG_EXT3_FS_POSIX_ACL=y
105CONFIG_EXT3_FS_SECURITY=y 99CONFIG_EXT3_FS_SECURITY=y
106CONFIG_INOTIFY=y
107CONFIG_ISO9660_FS=m 100CONFIG_ISO9660_FS=m
108CONFIG_JOLIET=y 101CONFIG_JOLIET=y
109CONFIG_UDF_FS=m 102CONFIG_UDF_FS=m
@@ -113,13 +106,10 @@ CONFIG_PROC_KCORE=y
113CONFIG_TMPFS=y 106CONFIG_TMPFS=y
114CONFIG_HUGETLBFS=y 107CONFIG_HUGETLBFS=y
115CONFIG_NFS_FS=m 108CONFIG_NFS_FS=m
116CONFIG_NFS_V3=y
117CONFIG_NFS_V3_ACL=y 109CONFIG_NFS_V3_ACL=y
118CONFIG_NFSD=m 110CONFIG_NFSD=m
119CONFIG_NFSD_V3=y 111CONFIG_NFSD_V3=y
120CONFIG_NFSD_V3_ACL=y 112CONFIG_NFSD_V3_ACL=y
121CONFIG_PARTITION_ADVANCED=y
122CONFIG_EFI_PARTITION=y
123CONFIG_NLS_ISO8859_1=m 113CONFIG_NLS_ISO8859_1=m
124CONFIG_NLS_ISO8859_2=m 114CONFIG_NLS_ISO8859_2=m
125CONFIG_NLS_ISO8859_3=m 115CONFIG_NLS_ISO8859_3=m
@@ -132,11 +122,10 @@ CONFIG_NLS_ISO8859_13=m
132CONFIG_NLS_ISO8859_14=m 122CONFIG_NLS_ISO8859_14=m
133CONFIG_NLS_ISO8859_15=m 123CONFIG_NLS_ISO8859_15=m
134CONFIG_LIBCRC32C=m 124CONFIG_LIBCRC32C=m
135CONFIG_MAGIC_SYSRQ=y
136CONFIG_DEBUG_FS=y 125CONFIG_DEBUG_FS=y
126CONFIG_MAGIC_SYSRQ=y
137CONFIG_DEBUG_KERNEL=y 127CONFIG_DEBUG_KERNEL=y
138CONFIG_DEBUG_MUTEXES=y 128CONFIG_DEBUG_MUTEXES=y
139CONFIG_DEBUG_SPINLOCK_SLEEP=y
140CONFIG_XMON=y 129CONFIG_XMON=y
141CONFIG_XMON_DEFAULT=y 130CONFIG_XMON_DEFAULT=y
142CONFIG_CRYPTO_NULL=m 131CONFIG_CRYPTO_NULL=m
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index db5b30857e1c..253a9f200097 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,25 +1,24 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=15 9CONFIG_LOG_BUF_SHIFT=15
9CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
12CONFIG_MODULES=y 12CONFIG_MODULES=y
13CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
14CONFIG_MODULE_FORCE_UNLOAD=y 14CONFIG_MODULE_FORCE_UNLOAD=y
15# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16CONFIG_PARTITION_ADVANCED=y
17CONFIG_MAC_PARTITION=y
16# CONFIG_PPC_PMAC is not set 18# CONFIG_PPC_PMAC is not set
17CONFIG_HIGHMEM=y 19CONFIG_HIGHMEM=y
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_BINFMT_MISC=y 20CONFIG_BINFMT_MISC=y
21CONFIG_IRQ_ALL_CPUS=y 21CONFIG_IRQ_ALL_CPUS=y
22# CONFIG_MIGRATION is not set
23CONFIG_ISA=y 22CONFIG_ISA=y
24CONFIG_NET=y 23CONFIG_NET=y
25CONFIG_PACKET=y 24CONFIG_PACKET=y
@@ -37,11 +36,9 @@ CONFIG_NETFILTER=y
37# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set 36# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
38# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set 37# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
39# CONFIG_NETFILTER_XT_MATCH_STATE is not set 38# CONFIG_NETFILTER_XT_MATCH_STATE is not set
40# CONFIG_IP_NF_TARGET_ULOG is not set
41# CONFIG_IP_NF_MANGLE is not set 39# CONFIG_IP_NF_MANGLE is not set
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43# CONFIG_STANDALONE is not set 41# CONFIG_STANDALONE is not set
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_FD=y 42CONFIG_BLK_DEV_FD=y
46CONFIG_BLK_DEV_LOOP=y 43CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
@@ -60,31 +57,28 @@ CONFIG_SCSI_CONSTANTS=y
60CONFIG_SCSI_SYM53C8XX_2=y 57CONFIG_SCSI_SYM53C8XX_2=y
61CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 58CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
62CONFIG_NETDEVICES=y 59CONFIG_NETDEVICES=y
63CONFIG_NET_ETHERNET=y 60CONFIG_PCNET32=y
64CONFIG_NET_TULIP=y 61CONFIG_NET_TULIP=y
65CONFIG_DE4X5=y 62CONFIG_DE4X5=y
66CONFIG_NET_PCI=y 63CONFIG_MV643XX_ETH=y
67CONFIG_PCNET32=y
68CONFIG_8139CP=y 64CONFIG_8139CP=y
69CONFIG_8139TOO=y 65CONFIG_8139TOO=y
70# CONFIG_8139TOO_PIO is not set 66# CONFIG_8139TOO_PIO is not set
71CONFIG_VIA_RHINE=y 67CONFIG_VIA_RHINE=y
72CONFIG_MV643XX_ETH=y
73CONFIG_PPP=m 68CONFIG_PPP=m
74CONFIG_PPP_MULTILINK=y
75CONFIG_PPP_FILTER=y
76CONFIG_PPP_ASYNC=m
77CONFIG_PPP_SYNC_TTY=m
78CONFIG_PPP_DEFLATE=m
79CONFIG_PPP_BSDCOMP=m 69CONFIG_PPP_BSDCOMP=m
70CONFIG_PPP_DEFLATE=m
71CONFIG_PPP_FILTER=y
80CONFIG_PPP_MPPE=m 72CONFIG_PPP_MPPE=m
73CONFIG_PPP_MULTILINK=y
81CONFIG_PPPOE=m 74CONFIG_PPPOE=m
75CONFIG_PPP_ASYNC=m
76CONFIG_PPP_SYNC_TTY=m
82CONFIG_INPUT_EVDEV=y 77CONFIG_INPUT_EVDEV=y
83CONFIG_INPUT_MISC=y 78CONFIG_INPUT_MISC=y
84CONFIG_INPUT_UINPUT=y 79CONFIG_INPUT_UINPUT=y
85CONFIG_SERIAL_8250=y 80CONFIG_SERIAL_8250=y
86CONFIG_SERIAL_8250_CONSOLE=y 81CONFIG_SERIAL_8250_CONSOLE=y
87CONFIG_BRIQ_PANEL=m
88# CONFIG_HW_RANDOM is not set 82# CONFIG_HW_RANDOM is not set
89CONFIG_NVRAM=y 83CONFIG_NVRAM=y
90CONFIG_GEN_RTC=y 84CONFIG_GEN_RTC=y
@@ -101,14 +95,12 @@ CONFIG_FB_ATY=y
101CONFIG_FB_ATY_CT=y 95CONFIG_FB_ATY_CT=y
102CONFIG_FB_ATY_GX=y 96CONFIG_FB_ATY_GX=y
103CONFIG_FB_3DFX=y 97CONFIG_FB_3DFX=y
104CONFIG_DISPLAY_SUPPORT=m
105CONFIG_FRAMEBUFFER_CONSOLE=y 98CONFIG_FRAMEBUFFER_CONSOLE=y
106CONFIG_LOGO=y 99CONFIG_LOGO=y
107CONFIG_HID_GYRATION=y 100CONFIG_HID_GYRATION=y
108CONFIG_HID_PANTHERLORD=y 101CONFIG_HID_PANTHERLORD=y
109CONFIG_HID_PETALYNX=y 102CONFIG_HID_PETALYNX=y
110CONFIG_HID_SAMSUNG=y 103CONFIG_HID_SAMSUNG=y
111CONFIG_HID_SONY=y
112CONFIG_HID_SUNPLUS=y 104CONFIG_HID_SUNPLUS=y
113CONFIG_USB=y 105CONFIG_USB=y
114CONFIG_USB_MON=y 106CONFIG_USB_MON=y
@@ -120,26 +112,19 @@ CONFIG_USB_STORAGE=m
120CONFIG_EXT2_FS=y 112CONFIG_EXT2_FS=y
121CONFIG_EXT3_FS=y 113CONFIG_EXT3_FS=y
122CONFIG_EXT4_FS=y 114CONFIG_EXT4_FS=y
123CONFIG_INOTIFY=y
124CONFIG_ISO9660_FS=y 115CONFIG_ISO9660_FS=y
125CONFIG_MSDOS_FS=m 116CONFIG_MSDOS_FS=m
126CONFIG_VFAT_FS=m 117CONFIG_VFAT_FS=m
127CONFIG_PROC_KCORE=y 118CONFIG_PROC_KCORE=y
128CONFIG_TMPFS=y 119CONFIG_TMPFS=y
129CONFIG_PARTITION_ADVANCED=y
130CONFIG_MAC_PARTITION=y
131CONFIG_NLS_ASCII=y 120CONFIG_NLS_ASCII=y
132CONFIG_NLS_ISO8859_1=m 121CONFIG_NLS_ISO8859_1=m
133CONFIG_CRC_T10DIF=y 122CONFIG_CRC_T10DIF=y
134CONFIG_MAGIC_SYSRQ=y 123CONFIG_MAGIC_SYSRQ=y
135CONFIG_DEBUG_KERNEL=y 124CONFIG_DEBUG_KERNEL=y
136CONFIG_DEBUG_MUTEXES=y 125CONFIG_DEBUG_MUTEXES=y
137CONFIG_DEBUG_SPINLOCK_SLEEP=y
138# CONFIG_RCU_CPU_STALL_DETECTOR is not set
139CONFIG_SYSCTL_SYSCALL_CHECK=y
140CONFIG_XMON=y 126CONFIG_XMON=y
141CONFIG_XMON_DEFAULT=y 127CONFIG_XMON_DEFAULT=y
142CONFIG_CRYPTO=y
143CONFIG_CRYPTO_CBC=m 128CONFIG_CRYPTO_CBC=m
144CONFIG_CRYPTO_PCBC=m 129CONFIG_CRYPTO_PCBC=m
145# CONFIG_CRYPTO_ANSI_CPRNG is not set 130# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 611efe99faeb..2826bb4ff560 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -1,13 +1,12 @@
1CONFIG_PPC_85xx=y 1CONFIG_PPC_85xx=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=8 3CONFIG_NR_CPUS=8
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_AUDIT=y 6CONFIG_AUDIT=y
9CONFIG_NO_HZ=y 7CONFIG_NO_HZ=y
10CONFIG_HIGH_RES_TIMERS=y 8CONFIG_HIGH_RES_TIMERS=y
9CONFIG_BSD_PROCESS_ACCT=y
11CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
12CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
13CONFIG_LOG_BUF_SHIFT=14 12CONFIG_LOG_BUF_SHIFT=14
@@ -57,7 +56,6 @@ CONFIG_NET_IPIP=y
57CONFIG_IP_MROUTE=y 56CONFIG_IP_MROUTE=y
58CONFIG_IP_PIMSM_V1=y 57CONFIG_IP_PIMSM_V1=y
59CONFIG_IP_PIMSM_V2=y 58CONFIG_IP_PIMSM_V2=y
60CONFIG_ARPD=y
61CONFIG_INET_AH=y 59CONFIG_INET_AH=y
62CONFIG_INET_ESP=y 60CONFIG_INET_ESP=y
63CONFIG_INET_IPCOMP=y 61CONFIG_INET_IPCOMP=y
@@ -69,17 +67,14 @@ CONFIG_DEVTMPFS=y
69CONFIG_DEVTMPFS_MOUNT=y 67CONFIG_DEVTMPFS_MOUNT=y
70CONFIG_MTD=y 68CONFIG_MTD=y
71CONFIG_MTD_CMDLINE_PARTS=y 69CONFIG_MTD_CMDLINE_PARTS=y
72CONFIG_MTD_CHAR=y
73CONFIG_MTD_BLOCK=y 70CONFIG_MTD_BLOCK=y
74CONFIG_MTD_CFI=y 71CONFIG_MTD_CFI=y
75CONFIG_MTD_CFI_INTELEXT=y 72CONFIG_MTD_CFI_INTELEXT=y
76CONFIG_MTD_CFI_AMDSTD=y 73CONFIG_MTD_CFI_AMDSTD=y
77CONFIG_MTD_PHYSMAP_OF=y 74CONFIG_MTD_PHYSMAP_OF=y
78CONFIG_MTD_M25P80=y
79CONFIG_MTD_NAND=y 75CONFIG_MTD_NAND=y
80CONFIG_MTD_NAND_FSL_ELBC=y 76CONFIG_MTD_NAND_FSL_ELBC=y
81CONFIG_MTD_NAND_FSL_IFC=y 77CONFIG_MTD_NAND_FSL_IFC=y
82CONFIG_PROC_DEVICETREE=y
83CONFIG_BLK_DEV_LOOP=y 78CONFIG_BLK_DEV_LOOP=y
84CONFIG_BLK_DEV_RAM=y 79CONFIG_BLK_DEV_RAM=y
85CONFIG_BLK_DEV_RAM_SIZE=131072 80CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -87,7 +82,6 @@ CONFIG_BLK_DEV_SD=y
87CONFIG_CHR_DEV_ST=y 82CONFIG_CHR_DEV_ST=y
88CONFIG_BLK_DEV_SR=y 83CONFIG_BLK_DEV_SR=y
89CONFIG_CHR_DEV_SG=y 84CONFIG_CHR_DEV_SG=y
90CONFIG_SCSI_MULTI_LUN=y
91CONFIG_SCSI_LOGGING=y 85CONFIG_SCSI_LOGGING=y
92CONFIG_SCSI_SYM53C8XX_2=y 86CONFIG_SCSI_SYM53C8XX_2=y
93CONFIG_ATA=y 87CONFIG_ATA=y
@@ -100,8 +94,8 @@ CONFIG_NETDEVICES=y
100CONFIG_FSL_PQ_MDIO=y 94CONFIG_FSL_PQ_MDIO=y
101CONFIG_E1000=y 95CONFIG_E1000=y
102CONFIG_E1000E=y 96CONFIG_E1000E=y
103CONFIG_VITESSE_PHY=y
104CONFIG_AT803X_PHY=y 97CONFIG_AT803X_PHY=y
98CONFIG_VITESSE_PHY=y
105CONFIG_FIXED_PHY=y 99CONFIG_FIXED_PHY=y
106# CONFIG_INPUT_MOUSEDEV is not set 100# CONFIG_INPUT_MOUSEDEV is not set
107# CONFIG_INPUT_KEYBOARD is not set 101# CONFIG_INPUT_KEYBOARD is not set
@@ -123,7 +117,6 @@ CONFIG_SPI_GPIO=y
123CONFIG_SPI_FSL_SPI=y 117CONFIG_SPI_FSL_SPI=y
124CONFIG_SPI_FSL_ESPI=y 118CONFIG_SPI_FSL_ESPI=y
125# CONFIG_HWMON is not set 119# CONFIG_HWMON is not set
126CONFIG_VIDEO_OUTPUT_CONTROL=y
127CONFIG_USB_HID=m 120CONFIG_USB_HID=m
128CONFIG_USB=y 121CONFIG_USB=y
129CONFIG_USB_MON=y 122CONFIG_USB_MON=y
@@ -143,10 +136,10 @@ CONFIG_RTC_DRV_DS1307=y
143CONFIG_RTC_DRV_DS1374=y 136CONFIG_RTC_DRV_DS1374=y
144CONFIG_RTC_DRV_DS3232=y 137CONFIG_RTC_DRV_DS3232=y
145CONFIG_UIO=y 138CONFIG_UIO=y
146CONFIG_STAGING=y
147CONFIG_MEMORY=y
148CONFIG_VIRT_DRIVERS=y 139CONFIG_VIRT_DRIVERS=y
149CONFIG_FSL_HV_MANAGER=y 140CONFIG_FSL_HV_MANAGER=y
141CONFIG_STAGING=y
142CONFIG_FSL_CORENET_CF=y
150CONFIG_EXT2_FS=y 143CONFIG_EXT2_FS=y
151CONFIG_EXT3_FS=y 144CONFIG_EXT3_FS=y
152# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 145# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -170,17 +163,15 @@ CONFIG_NLS_CODEPAGE_437=y
170CONFIG_NLS_CODEPAGE_850=y 163CONFIG_NLS_CODEPAGE_850=y
171CONFIG_NLS_ISO8859_1=y 164CONFIG_NLS_ISO8859_1=y
172CONFIG_NLS_UTF8=m 165CONFIG_NLS_UTF8=m
166CONFIG_DEBUG_INFO=y
173CONFIG_MAGIC_SYSRQ=y 167CONFIG_MAGIC_SYSRQ=y
174CONFIG_DEBUG_SHIRQ=y 168CONFIG_DEBUG_SHIRQ=y
175CONFIG_DETECT_HUNG_TASK=y 169CONFIG_DETECT_HUNG_TASK=y
176CONFIG_DEBUG_INFO=y
177CONFIG_RCU_TRACE=y 170CONFIG_RCU_TRACE=y
178CONFIG_CRYPTO_NULL=y 171CONFIG_CRYPTO_NULL=y
179CONFIG_CRYPTO_PCBC=m 172CONFIG_CRYPTO_PCBC=m
180CONFIG_CRYPTO_MD4=y 173CONFIG_CRYPTO_MD4=y
181CONFIG_CRYPTO_SHA256=y 174CONFIG_CRYPTO_SHA256=y
182CONFIG_CRYPTO_SHA512=y 175CONFIG_CRYPTO_SHA512=y
183CONFIG_CRYPTO_AES=y
184# CONFIG_CRYPTO_ANSI_CPRNG is not set 176# CONFIG_CRYPTO_ANSI_CPRNG is not set
185CONFIG_CRYPTO_DEV_FSL_CAAM=y 177CONFIG_CRYPTO_DEV_FSL_CAAM=y
186CONFIG_FSL_CORENET_CF=y
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index be24a18c0d96..6db97e4414b2 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -118,7 +118,6 @@ CONFIG_FSL_DMA=y
118CONFIG_VIRT_DRIVERS=y 118CONFIG_VIRT_DRIVERS=y
119CONFIG_FSL_HV_MANAGER=y 119CONFIG_FSL_HV_MANAGER=y
120CONFIG_FSL_CORENET_CF=y 120CONFIG_FSL_CORENET_CF=y
121CONFIG_MEMORY=y
122CONFIG_EXT2_FS=y 121CONFIG_EXT2_FS=y
123CONFIG_EXT3_FS=y 122CONFIG_EXT3_FS=y
124CONFIG_ISO9660_FS=m 123CONFIG_ISO9660_FS=m
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index fceffb3cffbe..7c137041f1d6 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_defconfig
@@ -5,13 +5,13 @@ CONFIG_LOG_BUF_SHIFT=14
5CONFIG_EXPERT=y 5CONFIG_EXPERT=y
6CONFIG_KALLSYMS_ALL=y 6CONFIG_KALLSYMS_ALL=y
7CONFIG_SLAB=y 7CONFIG_SLAB=y
8CONFIG_PARTITION_ADVANCED=y
8# CONFIG_IOSCHED_CFQ is not set 9# CONFIG_IOSCHED_CFQ is not set
9# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
11CONFIG_PPC_82xx=y 12CONFIG_PPC_82xx=y
12CONFIG_EP8248E=y 13CONFIG_EP8248E=y
13CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
14CONFIG_SPARSE_IRQ=y
15# CONFIG_SECCOMP is not set 15# CONFIG_SECCOMP is not set
16CONFIG_PCI=y 16CONFIG_PCI=y
17CONFIG_NET=y 17CONFIG_NET=y
@@ -28,7 +28,6 @@ CONFIG_NETFILTER=y
28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
29# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
30CONFIG_MTD=y 30CONFIG_MTD=y
31CONFIG_MTD_CHAR=y
32CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
33CONFIG_MTD_CFI=y 32CONFIG_MTD_CFI=y
34CONFIG_MTD_CFI_ADV_OPTIONS=y 33CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -38,14 +37,11 @@ CONFIG_MTD_CFI_GEOMETRY=y
38# CONFIG_MTD_CFI_I1 is not set 37# CONFIG_MTD_CFI_I1 is not set
39CONFIG_MTD_CFI_AMDSTD=y 38CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 39CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_LOOP=y 40CONFIG_BLK_DEV_LOOP=y
43# CONFIG_MISC_DEVICES is not set
44CONFIG_NETDEVICES=y 41CONFIG_NETDEVICES=y
45CONFIG_DAVICOM_PHY=y
46CONFIG_NET_ETHERNET=y
47CONFIG_FS_ENET=y 42CONFIG_FS_ENET=y
48# CONFIG_FS_ENET_HAS_SCC is not set 43# CONFIG_FS_ENET_HAS_SCC is not set
44CONFIG_DAVICOM_PHY=y
49# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
50# CONFIG_SERIO is not set 46# CONFIG_SERIO is not set
51# CONFIG_VT is not set 47# CONFIG_VT is not set
@@ -57,27 +53,20 @@ CONFIG_EXT2_FS=y
57CONFIG_EXT3_FS=y 53CONFIG_EXT3_FS=y
58# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 54# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
59# CONFIG_EXT3_FS_XATTR is not set 55# CONFIG_EXT3_FS_XATTR is not set
60CONFIG_INOTIFY=y
61CONFIG_AUTOFS4_FS=y 56CONFIG_AUTOFS4_FS=y
62CONFIG_PROC_KCORE=y 57CONFIG_PROC_KCORE=y
63CONFIG_TMPFS=y 58CONFIG_TMPFS=y
64CONFIG_CRAMFS=y 59CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 60CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 61CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y
69CONFIG_NLS=y 62CONFIG_NLS=y
70CONFIG_NLS_CODEPAGE_437=y 63CONFIG_NLS_CODEPAGE_437=y
71CONFIG_NLS_ASCII=y 64CONFIG_NLS_ASCII=y
72CONFIG_NLS_ISO8859_1=y 65CONFIG_NLS_ISO8859_1=y
73CONFIG_NLS_UTF8=y 66CONFIG_NLS_UTF8=y
74# CONFIG_CRC32 is not set 67CONFIG_DEBUG_INFO=y
75CONFIG_MAGIC_SYSRQ=y 68CONFIG_MAGIC_SYSRQ=y
76CONFIG_DEBUG_KERNEL=y
77# CONFIG_SCHED_DEBUG is not set 69# CONFIG_SCHED_DEBUG is not set
78CONFIG_DEBUG_INFO=y
79# CONFIG_RCU_CPU_STALL_DETECTOR is not set
80CONFIG_SYSCTL_SYSCALL_CHECK=y
81CONFIG_BDI_SWITCH=y 70CONFIG_BDI_SWITCH=y
82CONFIG_CRYPTO_CBC=y 71CONFIG_CRYPTO_CBC=y
83CONFIG_CRYPTO_ECB=y 72CONFIG_CRYPTO_ECB=y
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
index b8a79d7ee89f..ee96be889dac 100644
--- a/arch/powerpc/configs/ep88xc_defconfig
+++ b/arch/powerpc/configs/ep88xc_defconfig
@@ -1,24 +1,20 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
11# CONFIG_FUTEX is not set 10# CONFIG_FUTEX is not set
12# CONFIG_VM_EVENT_COUNTERS is not set 11# CONFIG_VM_EVENT_COUNTERS is not set
13# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
13CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15CONFIG_PPC_EP88XC=y 15CONFIG_PPC_EP88XC=y
16CONFIG_8xx_COPYBACK=y 16CONFIG_8xx_COPYBACK=y
17CONFIG_NO_HZ=y
18CONFIG_HIGH_RES_TIMERS=y
19CONFIG_HZ_100=y 17CONFIG_HZ_100=y
20CONFIG_8XX_MINIMAL_FPEMU=y
21CONFIG_SPARSE_IRQ=y
22# CONFIG_SECCOMP is not set 18# CONFIG_SECCOMP is not set
23CONFIG_NET=y 19CONFIG_NET=y
24CONFIG_PACKET=y 20CONFIG_PACKET=y
@@ -35,27 +31,21 @@ CONFIG_SYN_COOKIES=y
35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
36# CONFIG_FW_LOADER is not set 32# CONFIG_FW_LOADER is not set
37CONFIG_MTD=y 33CONFIG_MTD=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
40CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
41CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
42CONFIG_MTD_PHYSMAP_OF=y 37CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_PROC_DEVICETREE=y
44# CONFIG_BLK_DEV is not set 38# CONFIG_BLK_DEV is not set
45# CONFIG_MISC_DEVICES is not set
46CONFIG_NETDEVICES=y 39CONFIG_NETDEVICES=y
47CONFIG_LXT_PHY=y
48CONFIG_NET_ETHERNET=y
49CONFIG_FS_ENET=y 40CONFIG_FS_ENET=y
50# CONFIG_FS_ENET_HAS_SCC is not set 41# CONFIG_FS_ENET_HAS_SCC is not set
51# CONFIG_NETDEV_1000 is not set 42CONFIG_LXT_PHY=y
52# CONFIG_NETDEV_10000 is not set
53# CONFIG_INPUT is not set 43# CONFIG_INPUT is not set
54# CONFIG_SERIO is not set 44# CONFIG_SERIO is not set
55# CONFIG_VT is not set 45# CONFIG_VT is not set
46# CONFIG_LEGACY_PTYS is not set
56CONFIG_SERIAL_CPM=y 47CONFIG_SERIAL_CPM=y
57CONFIG_SERIAL_CPM_CONSOLE=y 48CONFIG_SERIAL_CPM_CONSOLE=y
58# CONFIG_LEGACY_PTYS is not set
59CONFIG_GEN_RTC=y 49CONFIG_GEN_RTC=y
60# CONFIG_HWMON is not set 50# CONFIG_HWMON is not set
61# CONFIG_USB_SUPPORT is not set 51# CONFIG_USB_SUPPORT is not set
@@ -63,13 +53,8 @@ CONFIG_GEN_RTC=y
63CONFIG_TMPFS=y 53CONFIG_TMPFS=y
64CONFIG_CRAMFS=y 54CONFIG_CRAMFS=y
65CONFIG_NFS_FS=y 55CONFIG_NFS_FS=y
66CONFIG_NFS_V3=y
67CONFIG_ROOT_NFS=y 56CONFIG_ROOT_NFS=y
68CONFIG_PARTITION_ADVANCED=y 57CONFIG_CRC32_SLICEBY4=y
69# CONFIG_CRC32 is not set 58CONFIG_DEBUG_INFO=y
70CONFIG_MAGIC_SYSRQ=y 59CONFIG_MAGIC_SYSRQ=y
71CONFIG_DEBUG_KERNEL=y
72CONFIG_DETECT_HUNG_TASK=y 60CONFIG_DETECT_HUNG_TASK=y
73CONFIG_DEBUG_INFO=y
74# CONFIG_RCU_CPU_STALL_DETECTOR is not set
75CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 6fab06f7f411..5e0eed26137e 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -2,10 +2,11 @@ CONFIG_PPC64=y
2CONFIG_ALTIVEC=y 2CONFIG_ALTIVEC=y
3CONFIG_SMP=y 3CONFIG_SMP=y
4CONFIG_NR_CPUS=4 4CONFIG_NR_CPUS=4
5CONFIG_EXPERIMENTAL=y
6CONFIG_SYSVIPC=y 5CONFIG_SYSVIPC=y
7CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
8CONFIG_FHANDLE=y 7CONFIG_FHANDLE=y
8CONFIG_NO_HZ=y
9CONFIG_HIGH_RES_TIMERS=y
9CONFIG_IKCONFIG=y 10CONFIG_IKCONFIG=y
10CONFIG_IKCONFIG_PROC=y 11CONFIG_IKCONFIG_PROC=y
11CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
@@ -16,17 +17,15 @@ CONFIG_MODULES=y
16CONFIG_MODULE_UNLOAD=y 17CONFIG_MODULE_UNLOAD=y
17CONFIG_MODVERSIONS=y 18CONFIG_MODVERSIONS=y
18CONFIG_MODULE_SRCVERSION_ALL=y 19CONFIG_MODULE_SRCVERSION_ALL=y
20CONFIG_PARTITION_ADVANCED=y
19# CONFIG_PPC_POWERNV is not set 21# CONFIG_PPC_POWERNV is not set
20# CONFIG_PPC_PSERIES is not set 22# CONFIG_PPC_PSERIES is not set
21CONFIG_CPU_FREQ=y 23CONFIG_CPU_FREQ=y
22CONFIG_CPU_FREQ_GOV_POWERSAVE=y 24CONFIG_CPU_FREQ_GOV_POWERSAVE=y
23CONFIG_CPU_FREQ_GOV_USERSPACE=y 25CONFIG_CPU_FREQ_GOV_USERSPACE=y
24CONFIG_CPU_FREQ_PMAC64=y 26CONFIG_CPU_FREQ_PMAC64=y
25CONFIG_NO_HZ=y
26CONFIG_HIGH_RES_TIMERS=y
27CONFIG_KEXEC=y 27CONFIG_KEXEC=y
28CONFIG_IRQ_ALL_CPUS=y 28CONFIG_IRQ_ALL_CPUS=y
29# CONFIG_MIGRATION is not set
30CONFIG_PCI_MSI=y 29CONFIG_PCI_MSI=y
31CONFIG_NET=y 30CONFIG_NET=y
32CONFIG_PACKET=y 31CONFIG_PACKET=y
@@ -52,9 +51,7 @@ CONFIG_NF_CONNTRACK_IRC=m
52CONFIG_NF_CONNTRACK_TFTP=m 51CONFIG_NF_CONNTRACK_TFTP=m
53CONFIG_NF_CT_NETLINK=m 52CONFIG_NF_CT_NETLINK=m
54CONFIG_NF_CONNTRACK_IPV4=m 53CONFIG_NF_CONNTRACK_IPV4=m
55CONFIG_IP_NF_QUEUE=m
56CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 54CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
57CONFIG_PROC_DEVICETREE=y
58CONFIG_BLK_DEV_LOOP=y 55CONFIG_BLK_DEV_LOOP=y
59CONFIG_BLK_DEV_NBD=m 56CONFIG_BLK_DEV_NBD=m
60CONFIG_BLK_DEV_RAM=y 57CONFIG_BLK_DEV_RAM=y
@@ -69,7 +66,6 @@ CONFIG_CHR_DEV_ST=y
69CONFIG_BLK_DEV_SR=y 66CONFIG_BLK_DEV_SR=y
70CONFIG_BLK_DEV_SR_VENDOR=y 67CONFIG_BLK_DEV_SR_VENDOR=y
71CONFIG_CHR_DEV_SG=y 68CONFIG_CHR_DEV_SG=y
72CONFIG_SCSI_MULTI_LUN=y
73CONFIG_SCSI_CONSTANTS=y 69CONFIG_SCSI_CONSTANTS=y
74CONFIG_SCSI_SPI_ATTRS=y 70CONFIG_SCSI_SPI_ATTRS=y
75CONFIG_ATA=y 71CONFIG_ATA=y
@@ -87,33 +83,29 @@ CONFIG_DM_CRYPT=m
87CONFIG_DM_SNAPSHOT=m 83CONFIG_DM_SNAPSHOT=m
88CONFIG_DM_MIRROR=m 84CONFIG_DM_MIRROR=m
89CONFIG_DM_ZERO=m 85CONFIG_DM_ZERO=m
90CONFIG_IEEE1394=y
91CONFIG_IEEE1394_OHCI1394=y
92CONFIG_IEEE1394_SBP2=m
93CONFIG_IEEE1394_ETH1394=m
94CONFIG_IEEE1394_RAWIO=y
95CONFIG_IEEE1394_VIDEO1394=m
96CONFIG_IEEE1394_DV1394=m
97CONFIG_ADB_PMU=y 86CONFIG_ADB_PMU=y
98CONFIG_PMAC_SMU=y 87CONFIG_PMAC_SMU=y
99CONFIG_MAC_EMUMOUSEBTN=y 88CONFIG_MAC_EMUMOUSEBTN=y
100CONFIG_THERM_PM72=y
101CONFIG_WINDFARM=y 89CONFIG_WINDFARM=y
102CONFIG_WINDFARM_PM81=y 90CONFIG_WINDFARM_PM81=y
103CONFIG_WINDFARM_PM91=y 91CONFIG_WINDFARM_PM91=y
104CONFIG_WINDFARM_PM112=y 92CONFIG_WINDFARM_PM112=y
105CONFIG_WINDFARM_PM121=y 93CONFIG_WINDFARM_PM121=y
106CONFIG_NETDEVICES=y 94CONFIG_NETDEVICES=y
107CONFIG_DUMMY=m
108CONFIG_BONDING=m 95CONFIG_BONDING=m
96CONFIG_DUMMY=m
109CONFIG_TUN=m 97CONFIG_TUN=m
110CONFIG_NET_ETHERNET=y
111CONFIG_MII=y
112CONFIG_SUNGEM=y
113CONFIG_ACENIC=m 98CONFIG_ACENIC=m
114CONFIG_ACENIC_OMIT_TIGON_I=y 99CONFIG_ACENIC_OMIT_TIGON_I=y
115CONFIG_E1000=y
116CONFIG_TIGON3=y 100CONFIG_TIGON3=y
101CONFIG_E1000=y
102CONFIG_SUNGEM=y
103CONFIG_PPP=m
104CONFIG_PPP_BSDCOMP=m
105CONFIG_PPP_DEFLATE=m
106CONFIG_PPPOE=m
107CONFIG_PPP_ASYNC=m
108CONFIG_PPP_SYNC_TTY=m
117CONFIG_USB_CATC=m 109CONFIG_USB_CATC=m
118CONFIG_USB_KAWETH=m 110CONFIG_USB_KAWETH=m
119CONFIG_USB_PEGASUS=m 111CONFIG_USB_PEGASUS=m
@@ -123,12 +115,6 @@ CONFIG_USB_USBNET=m
123# CONFIG_USB_NET_NET1080 is not set 115# CONFIG_USB_NET_NET1080 is not set
124# CONFIG_USB_NET_CDC_SUBSET is not set 116# CONFIG_USB_NET_CDC_SUBSET is not set
125# CONFIG_USB_NET_ZAURUS is not set 117# CONFIG_USB_NET_ZAURUS is not set
126CONFIG_PPP=m
127CONFIG_PPP_ASYNC=m
128CONFIG_PPP_SYNC_TTY=m
129CONFIG_PPP_DEFLATE=m
130CONFIG_PPP_BSDCOMP=m
131CONFIG_PPPOE=m
132# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 118# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
133CONFIG_INPUT_JOYDEV=m 119CONFIG_INPUT_JOYDEV=m
134CONFIG_INPUT_EVDEV=y 120CONFIG_INPUT_EVDEV=y
@@ -140,10 +126,8 @@ CONFIG_INPUT_EVDEV=y
140CONFIG_GEN_RTC=y 126CONFIG_GEN_RTC=y
141CONFIG_RAW_DRIVER=y 127CONFIG_RAW_DRIVER=y
142CONFIG_I2C_CHARDEV=y 128CONFIG_I2C_CHARDEV=y
143# CONFIG_HWMON is not set
144CONFIG_AGP=m 129CONFIG_AGP=m
145CONFIG_AGP_UNINORTH=m 130CONFIG_AGP_UNINORTH=m
146CONFIG_VIDEO_OUTPUT_CONTROL=m
147CONFIG_FB=y 131CONFIG_FB=y
148CONFIG_FIRMWARE_EDID=y 132CONFIG_FIRMWARE_EDID=y
149CONFIG_FB_TILEBLITTING=y 133CONFIG_FB_TILEBLITTING=y
@@ -167,15 +151,14 @@ CONFIG_SND_AOA_ONYX=m
167CONFIG_SND_AOA_TAS=m 151CONFIG_SND_AOA_TAS=m
168CONFIG_SND_AOA_TOONIE=m 152CONFIG_SND_AOA_TOONIE=m
169CONFIG_SND_USB_AUDIO=m 153CONFIG_SND_USB_AUDIO=m
170CONFIG_HID_PID=y
171CONFIG_USB_HIDDEV=y
172CONFIG_HID_GYRATION=y 154CONFIG_HID_GYRATION=y
173CONFIG_LOGITECH_FF=y 155CONFIG_LOGITECH_FF=y
174CONFIG_HID_PANTHERLORD=y 156CONFIG_HID_PANTHERLORD=y
175CONFIG_HID_PETALYNX=y 157CONFIG_HID_PETALYNX=y
176CONFIG_HID_SAMSUNG=y 158CONFIG_HID_SAMSUNG=y
177CONFIG_HID_SONY=y
178CONFIG_HID_SUNPLUS=y 159CONFIG_HID_SUNPLUS=y
160CONFIG_HID_PID=y
161CONFIG_USB_HIDDEV=y
179CONFIG_USB=y 162CONFIG_USB=y
180CONFIG_USB_MON=y 163CONFIG_USB_MON=y
181CONFIG_USB_EHCI_HCD=y 164CONFIG_USB_EHCI_HCD=y
@@ -245,8 +228,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
245CONFIG_REISERFS_FS_SECURITY=y 228CONFIG_REISERFS_FS_SECURITY=y
246CONFIG_XFS_FS=m 229CONFIG_XFS_FS=m
247CONFIG_XFS_POSIX_ACL=y 230CONFIG_XFS_POSIX_ACL=y
248CONFIG_INOTIFY=y
249CONFIG_AUTOFS_FS=m
250CONFIG_ISO9660_FS=y 231CONFIG_ISO9660_FS=y
251CONFIG_JOLIET=y 232CONFIG_JOLIET=y
252CONFIG_ZISOFS=y 233CONFIG_ZISOFS=y
@@ -260,14 +241,12 @@ CONFIG_HFS_FS=m
260CONFIG_HFSPLUS_FS=m 241CONFIG_HFSPLUS_FS=m
261CONFIG_CRAMFS=y 242CONFIG_CRAMFS=y
262CONFIG_NFS_FS=y 243CONFIG_NFS_FS=y
263CONFIG_NFS_V3=y
264CONFIG_NFS_V3_ACL=y 244CONFIG_NFS_V3_ACL=y
265CONFIG_NFS_V4=y 245CONFIG_NFS_V4=y
266CONFIG_NFSD=y 246CONFIG_NFSD=y
267CONFIG_NFSD_V3_ACL=y 247CONFIG_NFSD_V3_ACL=y
268CONFIG_NFSD_V4=y 248CONFIG_NFSD_V4=y
269CONFIG_CIFS=m 249CONFIG_CIFS=m
270CONFIG_PARTITION_ADVANCED=y
271CONFIG_NLS_CODEPAGE_437=y 250CONFIG_NLS_CODEPAGE_437=y
272CONFIG_NLS_CODEPAGE_1250=y 251CONFIG_NLS_CODEPAGE_1250=y
273CONFIG_NLS_CODEPAGE_1251=y 252CONFIG_NLS_CODEPAGE_1251=y
@@ -276,30 +255,21 @@ CONFIG_NLS_ISO8859_1=y
276CONFIG_NLS_ISO8859_15=y 255CONFIG_NLS_ISO8859_15=y
277CONFIG_NLS_UTF8=y 256CONFIG_NLS_UTF8=y
278CONFIG_CRC_T10DIF=y 257CONFIG_CRC_T10DIF=y
279CONFIG_LIBCRC32C=m
280CONFIG_MAGIC_SYSRQ=y
281CONFIG_DEBUG_FS=y 258CONFIG_DEBUG_FS=y
259CONFIG_MAGIC_SYSRQ=y
282CONFIG_DEBUG_KERNEL=y 260CONFIG_DEBUG_KERNEL=y
283CONFIG_DEBUG_MUTEXES=y 261CONFIG_DEBUG_MUTEXES=y
284# CONFIG_RCU_CPU_STALL_DETECTOR is not set
285CONFIG_LATENCYTOP=y 262CONFIG_LATENCYTOP=y
286CONFIG_SYSCTL_SYSCALL_CHECK=y
287CONFIG_BOOTX_TEXT=y 263CONFIG_BOOTX_TEXT=y
288CONFIG_PPC_EARLY_DEBUG=y 264CONFIG_PPC_EARLY_DEBUG=y
289CONFIG_PPC_EARLY_DEBUG_BOOTX=y
290CONFIG_CRYPTO_NULL=m 265CONFIG_CRYPTO_NULL=m
291CONFIG_CRYPTO_TEST=m 266CONFIG_CRYPTO_TEST=m
292CONFIG_CRYPTO_ECB=m
293CONFIG_CRYPTO_PCBC=m 267CONFIG_CRYPTO_PCBC=m
294CONFIG_CRYPTO_HMAC=y 268CONFIG_CRYPTO_HMAC=y
295CONFIG_CRYPTO_MD4=m
296CONFIG_CRYPTO_MICHAEL_MIC=m 269CONFIG_CRYPTO_MICHAEL_MIC=m
297CONFIG_CRYPTO_SHA256=m
298CONFIG_CRYPTO_SHA512=m 270CONFIG_CRYPTO_SHA512=m
299CONFIG_CRYPTO_WP512=m 271CONFIG_CRYPTO_WP512=m
300CONFIG_CRYPTO_AES=m
301CONFIG_CRYPTO_ANUBIS=m 272CONFIG_CRYPTO_ANUBIS=m
302CONFIG_CRYPTO_ARC4=m
303CONFIG_CRYPTO_BLOWFISH=m 273CONFIG_CRYPTO_BLOWFISH=m
304CONFIG_CRYPTO_CAST5=m 274CONFIG_CRYPTO_CAST5=m
305CONFIG_CRYPTO_CAST6=m 275CONFIG_CRYPTO_CAST6=m
diff --git a/arch/powerpc/configs/gamecube_defconfig b/arch/powerpc/configs/gamecube_defconfig
index 9ef2cc13e1b4..6c6c60f1aba4 100644
--- a/arch/powerpc/configs/gamecube_defconfig
+++ b/arch/powerpc/configs/gamecube_defconfig
@@ -1,11 +1,9 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_LOCALVERSION="-gcn" 1CONFIG_LOCALVERSION="-gcn"
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_IKCONFIG=y 3CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 4CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
7CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
8# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
9CONFIG_EXPERT=y 7CONFIG_EXPERT=y
10# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
11CONFIG_PERF_EVENTS=y 9CONFIG_PERF_EVENTS=y
@@ -22,7 +20,6 @@ CONFIG_GAMECUBE=y
22CONFIG_PREEMPT=y 20CONFIG_PREEMPT=y
23CONFIG_BINFMT_MISC=m 21CONFIG_BINFMT_MISC=m
24CONFIG_KEXEC=y 22CONFIG_KEXEC=y
25# CONFIG_MIGRATION is not set
26# CONFIG_SECCOMP is not set 23# CONFIG_SECCOMP is not set
27CONFIG_ADVANCED_OPTIONS=y 24CONFIG_ADVANCED_OPTIONS=y
28CONFIG_NET=y 25CONFIG_NET=y
@@ -42,15 +39,11 @@ CONFIG_IP_PNP_RARP=y
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43# CONFIG_STANDALONE is not set 40# CONFIG_STANDALONE is not set
44# CONFIG_FW_LOADER is not set 41# CONFIG_FW_LOADER is not set
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 42CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_NBD=m 43CONFIG_BLK_DEV_NBD=m
48CONFIG_BLK_DEV_RAM=y 44CONFIG_BLK_DEV_RAM=y
49CONFIG_BLK_DEV_RAM_COUNT=2 45CONFIG_BLK_DEV_RAM_COUNT=2
50CONFIG_NETDEVICES=y 46CONFIG_NETDEVICES=y
51CONFIG_NET_ETHERNET=y
52# CONFIG_NETDEV_1000 is not set
53# CONFIG_NETDEV_10000 is not set
54# CONFIG_WLAN is not set 47# CONFIG_WLAN is not set
55CONFIG_INPUT_FF_MEMLESS=m 48CONFIG_INPUT_FF_MEMLESS=m
56# CONFIG_INPUT_MOUSEDEV is not set 49# CONFIG_INPUT_MOUSEDEV is not set
@@ -61,8 +54,8 @@ CONFIG_INPUT_EVDEV=y
61CONFIG_INPUT_JOYSTICK=y 54CONFIG_INPUT_JOYSTICK=y
62# CONFIG_SERIO_I8042 is not set 55# CONFIG_SERIO_I8042 is not set
63# CONFIG_SERIO_SERPORT is not set 56# CONFIG_SERIO_SERPORT is not set
64# CONFIG_DEVKMEM is not set
65CONFIG_LEGACY_PTY_COUNT=64 57CONFIG_LEGACY_PTY_COUNT=64
58# CONFIG_DEVKMEM is not set
66# CONFIG_HW_RANDOM is not set 59# CONFIG_HW_RANDOM is not set
67# CONFIG_HWMON is not set 60# CONFIG_HWMON is not set
68CONFIG_FB=y 61CONFIG_FB=y
@@ -86,7 +79,6 @@ CONFIG_EXT2_FS=y
86CONFIG_EXT3_FS=y 79CONFIG_EXT3_FS=y
87# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 80# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
88# CONFIG_EXT3_FS_XATTR is not set 81# CONFIG_EXT3_FS_XATTR is not set
89CONFIG_INOTIFY=y
90CONFIG_ISO9660_FS=y 82CONFIG_ISO9660_FS=y
91CONFIG_JOLIET=y 83CONFIG_JOLIET=y
92CONFIG_MSDOS_FS=y 84CONFIG_MSDOS_FS=y
@@ -95,20 +87,15 @@ CONFIG_PROC_KCORE=y
95# CONFIG_PROC_PAGE_MONITOR is not set 87# CONFIG_PROC_PAGE_MONITOR is not set
96CONFIG_TMPFS=y 88CONFIG_TMPFS=y
97CONFIG_NFS_FS=y 89CONFIG_NFS_FS=y
98CONFIG_NFS_V3=y
99CONFIG_ROOT_NFS=y 90CONFIG_ROOT_NFS=y
100CONFIG_CIFS=y 91CONFIG_CIFS=y
101CONFIG_NLS_CODEPAGE_437=y 92CONFIG_NLS_CODEPAGE_437=y
102CONFIG_NLS_ISO8859_1=y 93CONFIG_NLS_ISO8859_1=y
103CONFIG_CRC_CCITT=y 94CONFIG_CRC_CCITT=y
104CONFIG_PRINTK_TIME=y 95CONFIG_PRINTK_TIME=y
105CONFIG_DEBUG_KERNEL=y
106CONFIG_DEBUG_SPINLOCK=y 96CONFIG_DEBUG_SPINLOCK=y
107CONFIG_DEBUG_MUTEXES=y 97CONFIG_DEBUG_MUTEXES=y
108CONFIG_DEBUG_SPINLOCK_SLEEP=y
109# CONFIG_RCU_CPU_STALL_DETECTOR is not set
110CONFIG_LATENCYTOP=y 98CONFIG_LATENCYTOP=y
111CONFIG_SYSCTL_SYSCALL_CHECK=y
112CONFIG_SCHED_TRACER=y 99CONFIG_SCHED_TRACER=y
113CONFIG_DMA_API_DEBUG=y 100CONFIG_DMA_API_DEBUG=y
114CONFIG_PPC_EARLY_DEBUG=y 101CONFIG_PPC_EARLY_DEBUG=y
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index 94ebfee188db..5e0f2551e5c7 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -1,17 +1,16 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
3CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
5# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
6CONFIG_EXPERT=y 6CONFIG_EXPERT=y
7CONFIG_MODULES=y 7CONFIG_MODULES=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
9# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
11CONFIG_EMBEDDED6xx=y 12CONFIG_EMBEDDED6xx=y
12CONFIG_PPC_HOLLY=y 13CONFIG_PPC_HOLLY=y
13CONFIG_NO_HZ=y
14CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
16CONFIG_CMDLINE_BOOL=y 15CONFIG_CMDLINE_BOOL=y
17CONFIG_CMDLINE="console=ttyS0,115200" 16CONFIG_CMDLINE="console=ttyS0,115200"
@@ -30,18 +29,15 @@ CONFIG_SYN_COOKIES=y
30# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
33CONFIG_PROC_DEVICETREE=y
34CONFIG_BLK_DEV_LOOP=y 32CONFIG_BLK_DEV_LOOP=y
35CONFIG_BLK_DEV_RAM=y 33CONFIG_BLK_DEV_RAM=y
36CONFIG_BLK_DEV_RAM_SIZE=131072 34CONFIG_BLK_DEV_RAM_SIZE=131072
37CONFIG_BLK_DEV_SD=y 35CONFIG_BLK_DEV_SD=y
38CONFIG_ATA=y 36CONFIG_ATA=y
39CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
40CONFIG_PHYLIB=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_VENDOR_3COM=y
43CONFIG_VORTEX=y 38CONFIG_VORTEX=y
44CONFIG_TSI108_ETH=y 39CONFIG_TSI108_ETH=y
40CONFIG_PHYLIB=y
45# CONFIG_INPUT_MOUSEDEV is not set 41# CONFIG_INPUT_MOUSEDEV is not set
46# CONFIG_INPUT_KEYBOARD is not set 42# CONFIG_INPUT_KEYBOARD is not set
47# CONFIG_INPUT_MOUSE is not set 43# CONFIG_INPUT_MOUSE is not set
@@ -57,14 +53,11 @@ CONFIG_SERIAL_OF_PLATFORM=y
57CONFIG_GEN_RTC=y 53CONFIG_GEN_RTC=y
58CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
59CONFIG_EXT3_FS=y 55CONFIG_EXT3_FS=y
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 56CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 57CONFIG_TMPFS=y
63CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y
66CONFIG_MAGIC_SYSRQ=y 60CONFIG_MAGIC_SYSRQ=y
67CONFIG_DEBUG_KERNEL=y
68# CONFIG_SCHED_DEBUG is not set 61# CONFIG_SCHED_DEBUG is not set
69# CONFIG_DEBUG_BUGVERBOSE is not set 62# CONFIG_DEBUG_BUGVERBOSE is not set
70CONFIG_XMON=y 63CONFIG_XMON=y
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index b5e684640fdf..62ae92956d05 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -1,6 +1,7 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_IKCONFIG=y 5CONFIG_IKCONFIG=y
5CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
6CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
@@ -13,10 +14,7 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_PPC_PMAC is not set 14# CONFIG_PPC_PMAC is not set
14CONFIG_EMBEDDED6xx=y 15CONFIG_EMBEDDED6xx=y
15CONFIG_LINKSTATION=y 16CONFIG_LINKSTATION=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_HZ_100=y 17CONFIG_HZ_100=y
19CONFIG_SPARSE_IRQ=y
20CONFIG_NET=y 18CONFIG_NET=y
21CONFIG_PACKET=y 19CONFIG_PACKET=y
22CONFIG_UNIX=y 20CONFIG_UNIX=y
@@ -43,12 +41,8 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
43CONFIG_NETFILTER_XT_MATCH_STATE=m 41CONFIG_NETFILTER_XT_MATCH_STATE=m
44CONFIG_NF_CONNTRACK_IPV4=m 42CONFIG_NF_CONNTRACK_IPV4=m
45CONFIG_IP_NF_IPTABLES=m 43CONFIG_IP_NF_IPTABLES=m
46CONFIG_IP_NF_MATCH_ADDRTYPE=m
47CONFIG_IP_NF_FILTER=m 44CONFIG_IP_NF_FILTER=m
48CONFIG_IP_NF_TARGET_REJECT=m 45CONFIG_IP_NF_TARGET_REJECT=m
49CONFIG_NF_NAT=m
50CONFIG_IP_NF_TARGET_MASQUERADE=m
51CONFIG_IP_NF_TARGET_REDIRECT=m
52CONFIG_IP_NF_MANGLE=m 46CONFIG_IP_NF_MANGLE=m
53CONFIG_IP_NF_TARGET_ECN=m 47CONFIG_IP_NF_TARGET_ECN=m
54CONFIG_IP_NF_TARGET_TTL=m 48CONFIG_IP_NF_TARGET_TTL=m
@@ -58,10 +52,7 @@ CONFIG_IP_NF_ARPFILTER=m
58CONFIG_IP_NF_ARP_MANGLE=m 52CONFIG_IP_NF_ARP_MANGLE=m
59CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 53CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
60CONFIG_MTD=y 54CONFIG_MTD=y
61CONFIG_MTD_CONCAT=y
62CONFIG_MTD_CMDLINE_PARTS=y 55CONFIG_MTD_CMDLINE_PARTS=y
63CONFIG_MTD_OF_PARTS=y
64CONFIG_MTD_CHAR=y
65CONFIG_MTD_BLOCK=y 56CONFIG_MTD_BLOCK=y
66CONFIG_MTD_CFI=y 57CONFIG_MTD_CFI=y
67CONFIG_MTD_JEDECPROBE=y 58CONFIG_MTD_JEDECPROBE=y
@@ -72,27 +63,23 @@ CONFIG_MTD_CFI_GEOMETRY=y
72# CONFIG_MTD_CFI_I2 is not set 63# CONFIG_MTD_CFI_I2 is not set
73CONFIG_MTD_CFI_AMDSTD=y 64CONFIG_MTD_CFI_AMDSTD=y
74CONFIG_MTD_PHYSMAP=y 65CONFIG_MTD_PHYSMAP=y
75CONFIG_PROC_DEVICETREE=y
76CONFIG_BLK_DEV_LOOP=y 66CONFIG_BLK_DEV_LOOP=y
77CONFIG_BLK_DEV_RAM=y 67CONFIG_BLK_DEV_RAM=y
78CONFIG_BLK_DEV_RAM_COUNT=2 68CONFIG_BLK_DEV_RAM_COUNT=2
79CONFIG_BLK_DEV_RAM_SIZE=8192 69CONFIG_BLK_DEV_RAM_SIZE=8192
80CONFIG_MISC_DEVICES=y
81CONFIG_EEPROM_LEGACY=m 70CONFIG_EEPROM_LEGACY=m
82CONFIG_BLK_DEV_SD=y 71CONFIG_BLK_DEV_SD=y
83CONFIG_CHR_DEV_SG=y 72CONFIG_CHR_DEV_SG=y
84CONFIG_SCSI_MULTI_LUN=y
85CONFIG_ATA=y 73CONFIG_ATA=y
86CONFIG_PATA_IT821X=y 74CONFIG_PATA_IT821X=y
87CONFIG_PATA_SIL680=y 75CONFIG_PATA_SIL680=y
88CONFIG_NETDEVICES=y 76CONFIG_NETDEVICES=y
77CONFIG_NETCONSOLE=y
89CONFIG_TUN=m 78CONFIG_TUN=m
90CONFIG_NET_ETHERNET=y
91CONFIG_NET_TULIP=y 79CONFIG_NET_TULIP=y
92CONFIG_TULIP=y 80CONFIG_TULIP=y
93CONFIG_TULIP_MMIO=y 81CONFIG_TULIP_MMIO=y
94CONFIG_R8169=y 82CONFIG_R8169=y
95CONFIG_NETCONSOLE=y
96# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 83# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
97CONFIG_INPUT_EVDEV=m 84CONFIG_INPUT_EVDEV=m
98# CONFIG_INPUT_KEYBOARD is not set 85# CONFIG_INPUT_KEYBOARD is not set
@@ -106,7 +93,6 @@ CONFIG_HW_RANDOM=y
106CONFIG_I2C=y 93CONFIG_I2C=y
107CONFIG_I2C_CHARDEV=y 94CONFIG_I2C_CHARDEV=y
108CONFIG_I2C_MPC=y 95CONFIG_I2C_MPC=y
109CONFIG_VIDEO_OUTPUT_CONTROL=m
110# CONFIG_VGA_CONSOLE is not set 96# CONFIG_VGA_CONSOLE is not set
111CONFIG_HID=m 97CONFIG_HID=m
112# CONFIG_USB_HID is not set 98# CONFIG_USB_HID is not set
@@ -126,7 +112,6 @@ CONFIG_EXT2_FS=y
126CONFIG_EXT3_FS=y 112CONFIG_EXT3_FS=y
127# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 113# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
128CONFIG_XFS_FS=m 114CONFIG_XFS_FS=m
129CONFIG_INOTIFY=y
130CONFIG_ISO9660_FS=m 115CONFIG_ISO9660_FS=m
131CONFIG_JOLIET=y 116CONFIG_JOLIET=y
132CONFIG_ZISOFS=y 117CONFIG_ZISOFS=y
@@ -137,7 +122,6 @@ CONFIG_NTFS_FS=m
137CONFIG_PROC_KCORE=y 122CONFIG_PROC_KCORE=y
138CONFIG_TMPFS=y 123CONFIG_TMPFS=y
139CONFIG_NFS_FS=y 124CONFIG_NFS_FS=y
140CONFIG_NFS_V3=y
141CONFIG_NFS_V3_ACL=y 125CONFIG_NFS_V3_ACL=y
142CONFIG_NFS_V4=y 126CONFIG_NFS_V4=y
143CONFIG_ROOT_NFS=y 127CONFIG_ROOT_NFS=y
@@ -153,15 +137,9 @@ CONFIG_CRC_T10DIF=y
153CONFIG_MAGIC_SYSRQ=y 137CONFIG_MAGIC_SYSRQ=y
154CONFIG_DEBUG_KERNEL=y 138CONFIG_DEBUG_KERNEL=y
155CONFIG_DETECT_HUNG_TASK=y 139CONFIG_DETECT_HUNG_TASK=y
156# CONFIG_RCU_CPU_STALL_DETECTOR is not set
157CONFIG_SYSCTL_SYSCALL_CHECK=y
158CONFIG_CRYPTO_ECB=m
159CONFIG_CRYPTO_PCBC=m 140CONFIG_CRYPTO_PCBC=m
160CONFIG_CRYPTO_MD4=m
161CONFIG_CRYPTO_MICHAEL_MIC=m 141CONFIG_CRYPTO_MICHAEL_MIC=m
162CONFIG_CRYPTO_SHA1=m 142CONFIG_CRYPTO_SHA1=m
163CONFIG_CRYPTO_AES=m
164CONFIG_CRYPTO_ARC4=m
165CONFIG_CRYPTO_BLOWFISH=m 143CONFIG_CRYPTO_BLOWFISH=m
166CONFIG_CRYPTO_SERPENT=m 144CONFIG_CRYPTO_SERPENT=m
167CONFIG_CRYPTO_TWOFISH=m 145CONFIG_CRYPTO_TWOFISH=m
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index fbd9e4163311..ac9666f8abf1 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -1,10 +1,11 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_SMP=y 2CONFIG_SMP=y
3CONFIG_NR_CPUS=4 3CONFIG_NR_CPUS=4
4CONFIG_EXPERIMENTAL=y
5CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 5CONFIG_POSIX_MQUEUE=y
7CONFIG_FHANDLE=y 6CONFIG_FHANDLE=y
7CONFIG_NO_HZ=y
8CONFIG_HIGH_RES_TIMERS=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
@@ -16,16 +17,15 @@ CONFIG_MODULE_UNLOAD=y
16CONFIG_MODVERSIONS=y 17CONFIG_MODVERSIONS=y
17CONFIG_MODULE_SRCVERSION_ALL=y 18CONFIG_MODULE_SRCVERSION_ALL=y
18# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PARTITION_ADVANCED=y
21CONFIG_MAC_PARTITION=y
19# CONFIG_PPC_POWERNV is not set 22# CONFIG_PPC_POWERNV is not set
20# CONFIG_PPC_PSERIES is not set 23# CONFIG_PPC_PSERIES is not set
21# CONFIG_PPC_PMAC is not set 24# CONFIG_PPC_PMAC is not set
22CONFIG_PPC_MAPLE=y 25CONFIG_PPC_MAPLE=y
23CONFIG_UDBG_RTAS_CONSOLE=y 26CONFIG_UDBG_RTAS_CONSOLE=y
24CONFIG_NO_HZ=y
25CONFIG_HIGH_RES_TIMERS=y
26CONFIG_KEXEC=y 27CONFIG_KEXEC=y
27CONFIG_IRQ_ALL_CPUS=y 28CONFIG_IRQ_ALL_CPUS=y
28# CONFIG_MIGRATION is not set
29CONFIG_PCI_MSI=y 29CONFIG_PCI_MSI=y
30CONFIG_NET=y 30CONFIG_NET=y
31CONFIG_PACKET=y 31CONFIG_PACKET=y
@@ -38,7 +38,6 @@ CONFIG_IP_PNP_DHCP=y
38# CONFIG_INET_LRO is not set 38# CONFIG_INET_LRO is not set
39# CONFIG_IPV6 is not set 39# CONFIG_IPV6 is not set
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 41CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=8192 42CONFIG_BLK_DEV_RAM_SIZE=8192
44CONFIG_IDE=y 43CONFIG_IDE=y
@@ -52,11 +51,9 @@ CONFIG_CHR_DEV_SG=y
52CONFIG_SCSI_IPR=y 51CONFIG_SCSI_IPR=y
53CONFIG_ATA=y 52CONFIG_ATA=y
54CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
55CONFIG_NET_ETHERNET=y
56CONFIG_NET_PCI=y
57CONFIG_AMD8111_ETH=y 54CONFIG_AMD8111_ETH=y
58CONFIG_E1000=y
59CONFIG_TIGON3=y 55CONFIG_TIGON3=y
56CONFIG_E1000=y
60CONFIG_USB_PEGASUS=y 57CONFIG_USB_PEGASUS=y
61# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 58# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
62CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600 59CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600
@@ -72,13 +69,11 @@ CONFIG_GEN_RTC=y
72CONFIG_I2C=y 69CONFIG_I2C=y
73CONFIG_I2C_CHARDEV=y 70CONFIG_I2C_CHARDEV=y
74CONFIG_I2C_AMD8111=y 71CONFIG_I2C_AMD8111=y
75# CONFIG_HWMON is not set
76# CONFIG_VGA_CONSOLE is not set 72# CONFIG_VGA_CONSOLE is not set
77CONFIG_HID_GYRATION=y 73CONFIG_HID_GYRATION=y
78CONFIG_HID_PANTHERLORD=y 74CONFIG_HID_PANTHERLORD=y
79CONFIG_HID_PETALYNX=y 75CONFIG_HID_PETALYNX=y
80CONFIG_HID_SAMSUNG=y 76CONFIG_HID_SAMSUNG=y
81CONFIG_HID_SONY=y
82CONFIG_HID_SUNPLUS=y 77CONFIG_HID_SUNPLUS=y
83CONFIG_USB=y 78CONFIG_USB=y
84CONFIG_USB_MON=y 79CONFIG_USB_MON=y
@@ -111,7 +106,6 @@ CONFIG_EXT2_FS_XIP=y
111CONFIG_EXT3_FS=y 106CONFIG_EXT3_FS=y
112# CONFIG_EXT3_FS_XATTR is not set 107# CONFIG_EXT3_FS_XATTR is not set
113CONFIG_EXT4_FS=y 108CONFIG_EXT4_FS=y
114CONFIG_INOTIFY=y
115CONFIG_MSDOS_FS=y 109CONFIG_MSDOS_FS=y
116CONFIG_VFAT_FS=y 110CONFIG_VFAT_FS=y
117CONFIG_PROC_KCORE=y 111CONFIG_PROC_KCORE=y
@@ -119,28 +113,22 @@ CONFIG_TMPFS=y
119CONFIG_HUGETLBFS=y 113CONFIG_HUGETLBFS=y
120CONFIG_CRAMFS=y 114CONFIG_CRAMFS=y
121CONFIG_NFS_FS=y 115CONFIG_NFS_FS=y
122CONFIG_NFS_V3=y
123CONFIG_NFS_V3_ACL=y 116CONFIG_NFS_V3_ACL=y
124CONFIG_NFS_V4=y 117CONFIG_NFS_V4=y
125CONFIG_ROOT_NFS=y 118CONFIG_ROOT_NFS=y
126CONFIG_PARTITION_ADVANCED=y
127CONFIG_MAC_PARTITION=y
128CONFIG_NLS_DEFAULT="utf-8" 119CONFIG_NLS_DEFAULT="utf-8"
129CONFIG_NLS_UTF8=y 120CONFIG_NLS_UTF8=y
130CONFIG_CRC_CCITT=y 121CONFIG_CRC_CCITT=y
131CONFIG_CRC_T10DIF=y 122CONFIG_CRC_T10DIF=y
132CONFIG_MAGIC_SYSRQ=y 123CONFIG_MAGIC_SYSRQ=y
133CONFIG_DEBUG_KERNEL=y 124CONFIG_DEBUG_KERNEL=y
134CONFIG_DEBUG_SPINLOCK_SLEEP=y
135# CONFIG_RCU_CPU_STALL_DETECTOR is not set
136CONFIG_LATENCYTOP=y
137CONFIG_DEBUG_STACKOVERFLOW=y
138CONFIG_DEBUG_STACK_USAGE=y 125CONFIG_DEBUG_STACK_USAGE=y
126CONFIG_DEBUG_STACKOVERFLOW=y
127CONFIG_LATENCYTOP=y
139CONFIG_XMON=y 128CONFIG_XMON=y
140CONFIG_XMON_DEFAULT=y 129CONFIG_XMON_DEFAULT=y
141CONFIG_BOOTX_TEXT=y 130CONFIG_BOOTX_TEXT=y
142CONFIG_PPC_EARLY_DEBUG=y 131CONFIG_PPC_EARLY_DEBUG=y
143CONFIG_PPC_EARLY_DEBUG_BOOTX=y
144CONFIG_CRYPTO_ECB=m 132CONFIG_CRYPTO_ECB=m
145CONFIG_CRYPTO_PCBC=m 133CONFIG_CRYPTO_PCBC=m
146# CONFIG_CRYPTO_ANSI_CPRNG is not set 134# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
index 8fa84f156ef3..666922c5b572 100644
--- a/arch/powerpc/configs/mgcoge_defconfig
+++ b/arch/powerpc/configs/mgcoge_defconfig
@@ -1,7 +1,7 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_HIGH_RES_TIMERS=y
5CONFIG_IKCONFIG=y 5CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 6CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 7CONFIG_LOG_BUF_SHIFT=14
@@ -16,7 +16,6 @@ CONFIG_PARTITION_ADVANCED=y
16# CONFIG_PPC_PMAC is not set 16# CONFIG_PPC_PMAC is not set
17CONFIG_PPC_82xx=y 17CONFIG_PPC_82xx=y
18CONFIG_MGCOGE=y 18CONFIG_MGCOGE=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_BINFMT_MISC=y 19CONFIG_BINFMT_MISC=y
21# CONFIG_SECCOMP is not set 20# CONFIG_SECCOMP is not set
22CONFIG_NET=y 21CONFIG_NET=y
@@ -36,8 +35,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
36# CONFIG_FW_LOADER is not set 35# CONFIG_FW_LOADER is not set
37CONFIG_MTD=y 36CONFIG_MTD=y
38CONFIG_MTD_CMDLINE_PARTS=y 37CONFIG_MTD_CMDLINE_PARTS=y
39CONFIG_MTD_CHAR=y
40CONFIG_MTD_BLKDEVS=y
41CONFIG_MTD_CFI=y 38CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_ADV_OPTIONS=y 39CONFIG_MTD_CFI_ADV_OPTIONS=y
43CONFIG_MTD_CFI_GEOMETRY=y 40CONFIG_MTD_CFI_GEOMETRY=y
@@ -45,7 +42,6 @@ CONFIG_MTD_CFI_GEOMETRY=y
45CONFIG_MTD_CFI_INTELEXT=y 42CONFIG_MTD_CFI_INTELEXT=y
46CONFIG_MTD_CFI_AMDSTD=y 43CONFIG_MTD_CFI_AMDSTD=y
47CONFIG_MTD_PHYSMAP_OF=y 44CONFIG_MTD_PHYSMAP_OF=y
48CONFIG_PROC_DEVICETREE=y
49CONFIG_BLK_DEV_LOOP=y 45CONFIG_BLK_DEV_LOOP=y
50CONFIG_BLK_DEV_RAM=y 46CONFIG_BLK_DEV_RAM=y
51CONFIG_NETDEVICES=y 47CONFIG_NETDEVICES=y
@@ -68,7 +64,6 @@ CONFIG_USB_GADGET=y
68CONFIG_USB_FSL_USB2=y 64CONFIG_USB_FSL_USB2=y
69CONFIG_USB_G_SERIAL=y 65CONFIG_USB_G_SERIAL=y
70CONFIG_UIO=y 66CONFIG_UIO=y
71CONFIG_UIO_PDRV=y
72CONFIG_EXT2_FS=y 67CONFIG_EXT2_FS=y
73CONFIG_AUTOFS4_FS=y 68CONFIG_AUTOFS4_FS=y
74CONFIG_PROC_KCORE=y 69CONFIG_PROC_KCORE=y
@@ -77,16 +72,15 @@ CONFIG_JFFS2_FS=y
77CONFIG_CRAMFS=y 72CONFIG_CRAMFS=y
78CONFIG_SQUASHFS=y 73CONFIG_SQUASHFS=y
79CONFIG_NFS_FS=y 74CONFIG_NFS_FS=y
80CONFIG_NFS_V3=y
81CONFIG_ROOT_NFS=y 75CONFIG_ROOT_NFS=y
82CONFIG_NLS_CODEPAGE_437=y 76CONFIG_NLS_CODEPAGE_437=y
83CONFIG_NLS_ASCII=y 77CONFIG_NLS_ASCII=y
84CONFIG_NLS_ISO8859_1=y 78CONFIG_NLS_ISO8859_1=y
85CONFIG_NLS_UTF8=y 79CONFIG_NLS_UTF8=y
86CONFIG_MAGIC_SYSRQ=y 80CONFIG_DEBUG_INFO=y
87CONFIG_DEBUG_FS=y 81CONFIG_DEBUG_FS=y
82CONFIG_MAGIC_SYSRQ=y
88# CONFIG_SCHED_DEBUG is not set 83# CONFIG_SCHED_DEBUG is not set
89CONFIG_DEBUG_INFO=y
90CONFIG_BDI_SWITCH=y 84CONFIG_BDI_SWITCH=y
91CONFIG_CRYPTO_ECB=y 85CONFIG_CRYPTO_ECB=y
92CONFIG_CRYPTO_PCBC=y 86CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig
index ee853a1b1b2c..59b85cb95259 100644
--- a/arch/powerpc/configs/mpc512x_defconfig
+++ b/arch/powerpc/configs/mpc512x_defconfig
@@ -50,7 +50,6 @@ CONFIG_MTD_PHYSMAP_OF=y
50CONFIG_MTD_NAND=y 50CONFIG_MTD_NAND=y
51CONFIG_MTD_NAND_MPC5121_NFC=y 51CONFIG_MTD_NAND_MPC5121_NFC=y
52CONFIG_MTD_UBI=y 52CONFIG_MTD_UBI=y
53CONFIG_PROC_DEVICETREE=y
54CONFIG_BLK_DEV_RAM=y 53CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_COUNT=1 54CONFIG_BLK_DEV_RAM_COUNT=1
56CONFIG_BLK_DEV_RAM_SIZE=8192 55CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -81,7 +80,6 @@ CONFIG_MDIO_BITBANG=y
81# CONFIG_WLAN is not set 80# CONFIG_WLAN is not set
82# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 81# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
83CONFIG_INPUT_EVDEV=y 82CONFIG_INPUT_EVDEV=y
84CONFIG_VT_HW_CONSOLE_BINDING=y
85# CONFIG_DEVKMEM is not set 83# CONFIG_DEVKMEM is not set
86CONFIG_SERIAL_MPC52xx=y 84CONFIG_SERIAL_MPC52xx=y
87CONFIG_SERIAL_MPC52xx_CONSOLE=y 85CONFIG_SERIAL_MPC52xx_CONSOLE=y
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 69fd8adf9f5e..9fd041bfd778 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -1,6 +1,6 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_SPARSE_IRQ=y 2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
6CONFIG_MODULES=y 6CONFIG_MODULES=y
@@ -16,8 +16,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y
16CONFIG_PPC_MPC5200_LPBFIFO=m 16CONFIG_PPC_MPC5200_LPBFIFO=m
17# CONFIG_PPC_PMAC is not set 17# CONFIG_PPC_PMAC is not set
18CONFIG_SIMPLE_GPIO=y 18CONFIG_SIMPLE_GPIO=y
19CONFIG_NO_HZ=y
20CONFIG_HIGH_RES_TIMERS=y
21CONFIG_NET=y 19CONFIG_NET=y
22CONFIG_PACKET=y 20CONFIG_PACKET=y
23CONFIG_UNIX=y 21CONFIG_UNIX=y
@@ -33,8 +31,6 @@ CONFIG_SYN_COOKIES=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_MTD=y 32CONFIG_MTD=y
35CONFIG_MTD_CMDLINE_PARTS=y 33CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
40CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
@@ -42,7 +38,6 @@ CONFIG_MTD_ROM=y
42CONFIG_MTD_PHYSMAP_OF=y 38CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_PLATRAM=y 39CONFIG_MTD_PLATRAM=y
44CONFIG_MTD_UBI=m 40CONFIG_MTD_UBI=m
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -77,7 +72,6 @@ CONFIG_SENSORS_LM87=m
77CONFIG_WATCHDOG=y 72CONFIG_WATCHDOG=y
78CONFIG_MFD_SM501=m 73CONFIG_MFD_SM501=m
79CONFIG_DRM=y 74CONFIG_DRM=y
80CONFIG_VIDEO_OUTPUT_CONTROL=y
81CONFIG_FB=y 75CONFIG_FB=y
82CONFIG_FB_FOREIGN_ENDIAN=y 76CONFIG_FB_FOREIGN_ENDIAN=y
83CONFIG_FB_RADEON=y 77CONFIG_FB_RADEON=y
@@ -94,9 +88,6 @@ CONFIG_SND=y
94# CONFIG_SND_SPI is not set 88# CONFIG_SND_SPI is not set
95# CONFIG_SND_USB is not set 89# CONFIG_SND_USB is not set
96CONFIG_SND_SOC=y 90CONFIG_SND_SOC=y
97CONFIG_SND_SOC_MPC5200_I2S=y
98CONFIG_SND_MPC52xx_SOC_PCM030=y
99CONFIG_SND_MPC52xx_SOC_EFIKA=y
100CONFIG_HID_DRAGONRISE=y 91CONFIG_HID_DRAGONRISE=y
101CONFIG_HID_GYRATION=y 92CONFIG_HID_GYRATION=y
102CONFIG_HID_TWINHAN=y 93CONFIG_HID_TWINHAN=y
@@ -104,7 +95,6 @@ CONFIG_HID_ORTEK=y
104CONFIG_HID_PANTHERLORD=y 95CONFIG_HID_PANTHERLORD=y
105CONFIG_HID_PETALYNX=y 96CONFIG_HID_PETALYNX=y
106CONFIG_HID_SAMSUNG=y 97CONFIG_HID_SAMSUNG=y
107CONFIG_HID_SONY=y
108CONFIG_HID_SUNPLUS=y 98CONFIG_HID_SUNPLUS=y
109CONFIG_HID_GREENASIA=y 99CONFIG_HID_GREENASIA=y
110CONFIG_HID_SMARTJOYPLUS=y 100CONFIG_HID_SMARTJOYPLUS=y
@@ -112,7 +102,6 @@ CONFIG_HID_TOPSEED=y
112CONFIG_HID_THRUSTMASTER=y 102CONFIG_HID_THRUSTMASTER=y
113CONFIG_HID_ZEROPLUS=y 103CONFIG_HID_ZEROPLUS=y
114CONFIG_USB=y 104CONFIG_USB=y
115# CONFIG_USB_DEVICE_CLASS is not set
116CONFIG_USB_MON=y 105CONFIG_USB_MON=y
117CONFIG_USB_OHCI_HCD=y 106CONFIG_USB_OHCI_HCD=y
118CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 107CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -135,13 +124,12 @@ CONFIG_JFFS2_FS=y
135CONFIG_UBIFS_FS=m 124CONFIG_UBIFS_FS=m
136CONFIG_CRAMFS=y 125CONFIG_CRAMFS=y
137CONFIG_NFS_FS=y 126CONFIG_NFS_FS=y
138CONFIG_NFS_V3=y
139CONFIG_NFS_V4=y 127CONFIG_NFS_V4=y
140CONFIG_ROOT_NFS=y 128CONFIG_ROOT_NFS=y
141CONFIG_NLS_CODEPAGE_437=y 129CONFIG_NLS_CODEPAGE_437=y
142CONFIG_NLS_ISO8859_1=y 130CONFIG_NLS_ISO8859_1=y
143CONFIG_PRINTK_TIME=y 131CONFIG_PRINTK_TIME=y
132CONFIG_DEBUG_INFO=y
144CONFIG_DEBUG_KERNEL=y 133CONFIG_DEBUG_KERNEL=y
145CONFIG_DETECT_HUNG_TASK=y 134CONFIG_DETECT_HUNG_TASK=y
146CONFIG_DEBUG_INFO=y
147# CONFIG_CRYPTO_ANSI_CPRNG is not set 135# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 75f0bbf0f6e8..e2647d5bb605 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -1,19 +1,17 @@
1CONFIG_ALTIVEC=y 1CONFIG_ALTIVEC=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_NO_HZ=y
4CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_BLK_DEV_BSG is not set 8# CONFIG_BLK_DEV_BSG is not set
9CONFIG_PARTITION_ADVANCED=y
9# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
11CONFIG_EMBEDDED6xx=y 12CONFIG_EMBEDDED6xx=y
12CONFIG_MPC7448HPC2=y 13CONFIG_MPC7448HPC2=y
13CONFIG_NO_HZ=y
14CONFIG_HIGH_RES_TIMERS=y
15CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_SECCOMP is not set 15# CONFIG_SECCOMP is not set
18CONFIG_NET=y 16CONFIG_NET=y
19CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -29,7 +27,6 @@ CONFIG_SYN_COOKIES=y
29# CONFIG_IPV6 is not set 27# CONFIG_IPV6 is not set
30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
32CONFIG_PROC_DEVICETREE=y
33CONFIG_BLK_DEV_LOOP=y 30CONFIG_BLK_DEV_LOOP=y
34CONFIG_BLK_DEV_RAM=y 31CONFIG_BLK_DEV_RAM=y
35CONFIG_BLK_DEV_RAM_SIZE=131072 32CONFIG_BLK_DEV_RAM_SIZE=131072
@@ -37,13 +34,11 @@ CONFIG_BLK_DEV_SD=y
37CONFIG_ATA=y 34CONFIG_ATA=y
38CONFIG_SATA_MV=y 35CONFIG_SATA_MV=y
39CONFIG_NETDEVICES=y 36CONFIG_NETDEVICES=y
40CONFIG_PHYLIB=y
41CONFIG_NET_ETHERNET=y
42CONFIG_NET_PCI=y
43CONFIG_E100=y 37CONFIG_E100=y
44CONFIG_8139TOO=y 38CONFIG_8139TOO=y
45# CONFIG_8139TOO_PIO is not set 39# CONFIG_8139TOO_PIO is not set
46CONFIG_TSI108_ETH=y 40CONFIG_TSI108_ETH=y
41CONFIG_PHYLIB=y
47# CONFIG_INPUT_MOUSEDEV is not set 42# CONFIG_INPUT_MOUSEDEV is not set
48# CONFIG_INPUT_KEYBOARD is not set 43# CONFIG_INPUT_KEYBOARD is not set
49# CONFIG_INPUT_MOUSE is not set 44# CONFIG_INPUT_MOUSE is not set
@@ -53,17 +48,12 @@ CONFIG_SERIAL_8250=y
53CONFIG_SERIAL_8250_CONSOLE=y 48CONFIG_SERIAL_8250_CONSOLE=y
54# CONFIG_HW_RANDOM is not set 49# CONFIG_HW_RANDOM is not set
55CONFIG_GEN_RTC=y 50CONFIG_GEN_RTC=y
56CONFIG_VIDEO_OUTPUT_CONTROL=y
57CONFIG_EXT2_FS=y 51CONFIG_EXT2_FS=y
58CONFIG_EXT3_FS=y 52CONFIG_EXT3_FS=y
59# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 53# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
60CONFIG_INOTIFY=y
61CONFIG_PROC_KCORE=y 54CONFIG_PROC_KCORE=y
62CONFIG_TMPFS=y 55CONFIG_TMPFS=y
63CONFIG_NFS_FS=y 56CONFIG_NFS_FS=y
64CONFIG_ROOT_NFS=y 57CONFIG_ROOT_NFS=y
65CONFIG_PARTITION_ADVANCED=y
66CONFIG_CRC_T10DIF=y 58CONFIG_CRC_T10DIF=y
67# CONFIG_RCU_CPU_STALL_DETECTOR is not set
68CONFIG_SYSCTL_SYSCALL_CHECK=y
69# CONFIG_CRYPTO_ANSI_CPRNG is not set 59# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 6a22400f73c1..825b052176af 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,17 +1,17 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
2CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
3CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
4CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
5CONFIG_EXPERT=y 7CONFIG_EXPERT=y
6CONFIG_KALLSYMS_ALL=y 8CONFIG_KALLSYMS_ALL=y
9CONFIG_PARTITION_ADVANCED=y
7# CONFIG_PPC_CHRP is not set 10# CONFIG_PPC_CHRP is not set
8# CONFIG_PPC_PMAC is not set 11# CONFIG_PPC_PMAC is not set
9CONFIG_PPC_82xx=y 12CONFIG_PPC_82xx=y
10CONFIG_MPC8272_ADS=y 13CONFIG_MPC8272_ADS=y
11CONFIG_NO_HZ=y
12CONFIG_HIGH_RES_TIMERS=y
13CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
14CONFIG_SPARSE_IRQ=y
15CONFIG_PCI=y 15CONFIG_PCI=y
16CONFIG_NET=y 16CONFIG_NET=y
17CONFIG_PACKET=y 17CONFIG_PACKET=y
@@ -27,7 +27,6 @@ CONFIG_NETFILTER=y
27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 27CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
28# CONFIG_FW_LOADER is not set 28# CONFIG_FW_LOADER is not set
29CONFIG_MTD=y 29CONFIG_MTD=y
30CONFIG_MTD_CHAR=y
31CONFIG_MTD_BLOCK=y 30CONFIG_MTD_BLOCK=y
32CONFIG_MTD_JEDECPROBE=y 31CONFIG_MTD_JEDECPROBE=y
33CONFIG_MTD_CFI_ADV_OPTIONS=y 32CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -39,52 +38,41 @@ CONFIG_MTD_CFI_GEOMETRY=y
39CONFIG_MTD_CFI_I4=y 38CONFIG_MTD_CFI_I4=y
40CONFIG_MTD_CFI_INTELEXT=y 39CONFIG_MTD_CFI_INTELEXT=y
41CONFIG_MTD_PHYSMAP_OF=y 40CONFIG_MTD_PHYSMAP_OF=y
42CONFIG_PROC_DEVICETREE=y
43CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 42CONFIG_NETDEVICES=y
46CONFIG_TUN=y 43CONFIG_TUN=y
47CONFIG_DAVICOM_PHY=y
48CONFIG_NET_ETHERNET=y
49CONFIG_FS_ENET=y 44CONFIG_FS_ENET=y
50# CONFIG_FS_ENET_HAS_SCC is not set 45# CONFIG_FS_ENET_HAS_SCC is not set
51CONFIG_FS_ENET_MDIO_FCC=y 46CONFIG_FS_ENET_MDIO_FCC=y
47CONFIG_DAVICOM_PHY=y
52CONFIG_PPP=y 48CONFIG_PPP=y
49CONFIG_PPP_DEFLATE=y
53CONFIG_PPP_ASYNC=y 50CONFIG_PPP_ASYNC=y
54CONFIG_PPP_SYNC_TTY=y 51CONFIG_PPP_SYNC_TTY=y
55CONFIG_PPP_DEFLATE=y
56CONFIG_INPUT_EVDEV=y 52CONFIG_INPUT_EVDEV=y
57# CONFIG_SERIO_I8042 is not set
58# CONFIG_VT is not set 53# CONFIG_VT is not set
59CONFIG_SERIAL_CPM=y 54CONFIG_SERIAL_CPM=y
60CONFIG_SERIAL_CPM_CONSOLE=y 55CONFIG_SERIAL_CPM_CONSOLE=y
61# CONFIG_HWMON is not set 56# CONFIG_HWMON is not set
62# CONFIG_HID_SUPPORT is not set
63# CONFIG_USB_SUPPORT is not set 57# CONFIG_USB_SUPPORT is not set
64CONFIG_EXT2_FS=y 58CONFIG_EXT2_FS=y
65CONFIG_EXT3_FS=y 59CONFIG_EXT3_FS=y
66# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 60# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
67CONFIG_INOTIFY=y
68CONFIG_AUTOFS4_FS=y 61CONFIG_AUTOFS4_FS=y
69CONFIG_PROC_KCORE=y 62CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 63CONFIG_TMPFS=y
71CONFIG_CRAMFS=y 64CONFIG_CRAMFS=y
72CONFIG_NFS_FS=y 65CONFIG_NFS_FS=y
73CONFIG_NFS_V3=y
74CONFIG_NFS_V3_ACL=y 66CONFIG_NFS_V3_ACL=y
75CONFIG_ROOT_NFS=y 67CONFIG_ROOT_NFS=y
76CONFIG_PARTITION_ADVANCED=y
77CONFIG_NLS=y 68CONFIG_NLS=y
78CONFIG_NLS_CODEPAGE_437=y 69CONFIG_NLS_CODEPAGE_437=y
79CONFIG_NLS_ASCII=y 70CONFIG_NLS_ASCII=y
80CONFIG_NLS_ISO8859_1=y 71CONFIG_NLS_ISO8859_1=y
81CONFIG_NLS_UTF8=y 72CONFIG_NLS_UTF8=y
73CONFIG_DEBUG_INFO=y
82CONFIG_MAGIC_SYSRQ=y 74CONFIG_MAGIC_SYSRQ=y
83CONFIG_DEBUG_KERNEL=y
84CONFIG_DETECT_HUNG_TASK=y 75CONFIG_DETECT_HUNG_TASK=y
85CONFIG_DEBUG_INFO=y
86# CONFIG_RCU_CPU_STALL_DETECTOR is not set
87CONFIG_SYSCTL_SYSCALL_CHECK=y
88CONFIG_BDI_SWITCH=y 76CONFIG_BDI_SWITCH=y
89CONFIG_CRYPTO_CBC=y 77CONFIG_CRYPTO_CBC=y
90CONFIG_CRYPTO_ECB=y 78CONFIG_CRYPTO_ECB=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 23fec79964cf..671e220a9a98 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_BLK_DEV_INITRD=y 3CONFIG_BLK_DEV_INITRD=y
@@ -45,14 +44,12 @@ CONFIG_DEVTMPFS=y
45CONFIG_DEVTMPFS_MOUNT=y 44CONFIG_DEVTMPFS_MOUNT=y
46# CONFIG_FW_LOADER is not set 45# CONFIG_FW_LOADER is not set
47CONFIG_MTD=y 46CONFIG_MTD=y
48CONFIG_MTD_CHAR=y
49CONFIG_MTD_BLOCK=y 47CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=y 48CONFIG_MTD_CFI=y
51CONFIG_MTD_CFI_AMDSTD=y 49CONFIG_MTD_CFI_AMDSTD=y
52CONFIG_MTD_PHYSMAP_OF=y 50CONFIG_MTD_PHYSMAP_OF=y
53CONFIG_MTD_NAND=y 51CONFIG_MTD_NAND=y
54CONFIG_MTD_NAND_FSL_ELBC=y 52CONFIG_MTD_NAND_FSL_ELBC=y
55CONFIG_PROC_DEVICETREE=y
56CONFIG_BLK_DEV_LOOP=y 53CONFIG_BLK_DEV_LOOP=y
57CONFIG_BLK_DEV_RAM=y 54CONFIG_BLK_DEV_RAM=y
58CONFIG_BLK_DEV_RAM_SIZE=32768 55CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -62,7 +59,6 @@ CONFIG_ATA=y
62CONFIG_SATA_FSL=y 59CONFIG_SATA_FSL=y
63CONFIG_SATA_SIL=y 60CONFIG_SATA_SIL=y
64CONFIG_NETDEVICES=y 61CONFIG_NETDEVICES=y
65CONFIG_MII=y
66CONFIG_UCC_GETH=y 62CONFIG_UCC_GETH=y
67CONFIG_GIANFAR=y 63CONFIG_GIANFAR=y
68CONFIG_MARVELL_PHY=y 64CONFIG_MARVELL_PHY=y
@@ -82,7 +78,6 @@ CONFIG_I2C=y
82CONFIG_I2C_CHARDEV=y 78CONFIG_I2C_CHARDEV=y
83CONFIG_I2C_MPC=y 79CONFIG_I2C_MPC=y
84CONFIG_WATCHDOG=y 80CONFIG_WATCHDOG=y
85CONFIG_VIDEO_OUTPUT_CONTROL=m
86CONFIG_HID_A4TECH=y 81CONFIG_HID_A4TECH=y
87CONFIG_HID_APPLE=y 82CONFIG_HID_APPLE=y
88CONFIG_HID_BELKIN=y 83CONFIG_HID_BELKIN=y
@@ -97,7 +92,6 @@ CONFIG_HID_MONTEREY=y
97CONFIG_HID_PANTHERLORD=y 92CONFIG_HID_PANTHERLORD=y
98CONFIG_HID_PETALYNX=y 93CONFIG_HID_PETALYNX=y
99CONFIG_HID_SAMSUNG=y 94CONFIG_HID_SAMSUNG=y
100CONFIG_HID_SONY=y
101CONFIG_HID_SUNPLUS=y 95CONFIG_HID_SUNPLUS=y
102CONFIG_USB=y 96CONFIG_USB=y
103CONFIG_USB_MON=y 97CONFIG_USB_MON=y
@@ -119,6 +113,5 @@ CONFIG_CRYPTO_ECB=m
119CONFIG_CRYPTO_PCBC=m 113CONFIG_CRYPTO_PCBC=m
120CONFIG_CRYPTO_SHA256=y 114CONFIG_CRYPTO_SHA256=y
121CONFIG_CRYPTO_SHA512=y 115CONFIG_CRYPTO_SHA512=y
122CONFIG_CRYPTO_AES=y
123# CONFIG_CRYPTO_ANSI_CPRNG is not set 116# CONFIG_CRYPTO_ANSI_CPRNG is not set
124CONFIG_CRYPTO_DEV_TALITOS=y 117CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 02395fab19bd..cfae862d6347 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -20,6 +20,7 @@ CONFIG_MODVERSIONS=y
20# CONFIG_BLK_DEV_BSG is not set 20# CONFIG_BLK_DEV_BSG is not set
21CONFIG_PARTITION_ADVANCED=y 21CONFIG_PARTITION_ADVANCED=y
22CONFIG_MAC_PARTITION=y 22CONFIG_MAC_PARTITION=y
23CONFIG_C293_PCIE=y
23CONFIG_MPC8540_ADS=y 24CONFIG_MPC8540_ADS=y
24CONFIG_MPC8560_ADS=y 25CONFIG_MPC8560_ADS=y
25CONFIG_MPC85xx_CDS=y 26CONFIG_MPC85xx_CDS=y
@@ -27,7 +28,6 @@ CONFIG_MPC85xx_MDS=y
27CONFIG_MPC8536_DS=y 28CONFIG_MPC8536_DS=y
28CONFIG_MPC85xx_DS=y 29CONFIG_MPC85xx_DS=y
29CONFIG_MPC85xx_RDB=y 30CONFIG_MPC85xx_RDB=y
30CONFIG_C293_PCIE=y
31CONFIG_P1010_RDB=y 31CONFIG_P1010_RDB=y
32CONFIG_P1022_DS=y 32CONFIG_P1022_DS=y
33CONFIG_P1022_RDK=y 33CONFIG_P1022_RDK=y
@@ -70,7 +70,6 @@ CONFIG_NET_IPIP=y
70CONFIG_IP_MROUTE=y 70CONFIG_IP_MROUTE=y
71CONFIG_IP_PIMSM_V1=y 71CONFIG_IP_PIMSM_V1=y
72CONFIG_IP_PIMSM_V2=y 72CONFIG_IP_PIMSM_V2=y
73CONFIG_ARPD=y
74CONFIG_INET_ESP=y 73CONFIG_INET_ESP=y
75# CONFIG_INET_XFRM_MODE_BEET is not set 74# CONFIG_INET_XFRM_MODE_BEET is not set
76# CONFIG_INET_LRO is not set 75# CONFIG_INET_LRO is not set
@@ -80,33 +79,17 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
80CONFIG_DEVTMPFS=y 79CONFIG_DEVTMPFS=y
81CONFIG_DEVTMPFS_MOUNT=y 80CONFIG_DEVTMPFS_MOUNT=y
82CONFIG_MTD=y 81CONFIG_MTD=y
83CONFIG_MTD_OF_PARTS=y
84CONFIG_MTD_CMDLINE_PARTS=y 82CONFIG_MTD_CMDLINE_PARTS=y
85CONFIG_MTD_CHAR=y
86CONFIG_MTD_BLKDEVS=y
87CONFIG_MTD_BLOCK=y 83CONFIG_MTD_BLOCK=y
88CONFIG_FTL=y 84CONFIG_FTL=y
89CONFIG_MTD_CFI=y 85CONFIG_MTD_CFI=y
90CONFIG_MTD_GEN_PROBE=y
91CONFIG_MTD_MAP_BANK_WIDTH_1=y
92CONFIG_MTD_MAP_BANK_WIDTH_2=y
93CONFIG_MTD_MAP_BANK_WIDTH_4=y
94CONFIG_MTD_CFI_I1=y
95CONFIG_MTD_CFI_I2=y
96CONFIG_MTD_CFI_INTELEXT=y 86CONFIG_MTD_CFI_INTELEXT=y
97CONFIG_MTD_CFI_AMDSTD=y 87CONFIG_MTD_CFI_AMDSTD=y
98CONFIG_MTD_PHYSMAP_OF=y 88CONFIG_MTD_PHYSMAP_OF=y
99CONFIG_MTD_M25P80=y
100CONFIG_MTD_CFI_UTIL=y
101CONFIG_MTD_NAND_ECC=y
102CONFIG_MTD_NAND=y 89CONFIG_MTD_NAND=y
103CONFIG_MTD_NAND_IDS=y
104CONFIG_MTD_NAND_FSL_ELBC=y 90CONFIG_MTD_NAND_FSL_ELBC=y
105CONFIG_MTD_NAND_FSL_IFC=y 91CONFIG_MTD_NAND_FSL_IFC=y
106CONFIG_MTD_UBI=y 92CONFIG_MTD_UBI=y
107CONFIG_MTD_UBI_WL_THRESHOLD=4096
108CONFIG_MTD_UBI_BEB_RESERVE=1
109CONFIG_PROC_DEVICETREE=y
110CONFIG_BLK_DEV_LOOP=y 93CONFIG_BLK_DEV_LOOP=y
111CONFIG_BLK_DEV_NBD=y 94CONFIG_BLK_DEV_NBD=y
112CONFIG_BLK_DEV_RAM=y 95CONFIG_BLK_DEV_RAM=y
@@ -117,7 +100,6 @@ CONFIG_BLK_DEV_SD=y
117CONFIG_CHR_DEV_ST=y 100CONFIG_CHR_DEV_ST=y
118CONFIG_BLK_DEV_SR=y 101CONFIG_BLK_DEV_SR=y
119CONFIG_CHR_DEV_SG=y 102CONFIG_CHR_DEV_SG=y
120CONFIG_SCSI_MULTI_LUN=y
121CONFIG_SCSI_LOGGING=y 103CONFIG_SCSI_LOGGING=y
122CONFIG_ATA=y 104CONFIG_ATA=y
123CONFIG_SATA_AHCI=y 105CONFIG_SATA_AHCI=y
@@ -133,11 +115,11 @@ CONFIG_GIANFAR=y
133CONFIG_E1000=y 115CONFIG_E1000=y
134CONFIG_E1000E=y 116CONFIG_E1000E=y
135CONFIG_IGB=y 117CONFIG_IGB=y
118CONFIG_AT803X_PHY=y
136CONFIG_MARVELL_PHY=y 119CONFIG_MARVELL_PHY=y
137CONFIG_DAVICOM_PHY=y 120CONFIG_DAVICOM_PHY=y
138CONFIG_CICADA_PHY=y 121CONFIG_CICADA_PHY=y
139CONFIG_VITESSE_PHY=y 122CONFIG_VITESSE_PHY=y
140CONFIG_AT803X_PHY=y
141CONFIG_FIXED_PHY=y 123CONFIG_FIXED_PHY=y
142CONFIG_INPUT_FF_MEMLESS=m 124CONFIG_INPUT_FF_MEMLESS=m
143# CONFIG_INPUT_MOUSEDEV is not set 125# CONFIG_INPUT_MOUSEDEV is not set
@@ -161,14 +143,10 @@ CONFIG_SPI_FSL_SPI=y
161CONFIG_SPI_FSL_ESPI=y 143CONFIG_SPI_FSL_ESPI=y
162CONFIG_GPIO_MPC8XXX=y 144CONFIG_GPIO_MPC8XXX=y
163# CONFIG_HWMON is not set 145# CONFIG_HWMON is not set
164CONFIG_VIDEO_OUTPUT_CONTROL=y
165CONFIG_FB=y 146CONFIG_FB=y
166CONFIG_FB_FSL_DIU=y 147CONFIG_FB_FSL_DIU=y
167# CONFIG_VGA_CONSOLE is not set 148# CONFIG_VGA_CONSOLE is not set
168CONFIG_FRAMEBUFFER_CONSOLE=y 149CONFIG_FRAMEBUFFER_CONSOLE=y
169CONFIG_FONTS=y
170CONFIG_FONT_8x8=y
171CONFIG_FONT_8x16=y
172CONFIG_SOUND=y 150CONFIG_SOUND=y
173CONFIG_SND=y 151CONFIG_SND=y
174# CONFIG_SND_SUPPORT_OLD_API is not set 152# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -192,7 +170,6 @@ CONFIG_HID_MONTEREY=y
192CONFIG_HID_PANTHERLORD=y 170CONFIG_HID_PANTHERLORD=y
193CONFIG_HID_PETALYNX=y 171CONFIG_HID_PETALYNX=y
194CONFIG_HID_SAMSUNG=y 172CONFIG_HID_SAMSUNG=y
195CONFIG_HID_SONY=y
196CONFIG_HID_SUNPLUS=y 173CONFIG_HID_SUNPLUS=y
197CONFIG_USB=y 174CONFIG_USB=y
198CONFIG_USB_MON=y 175CONFIG_USB_MON=y
@@ -215,8 +192,6 @@ CONFIG_RTC_DRV_DS3232=y
215CONFIG_RTC_DRV_CMOS=y 192CONFIG_RTC_DRV_CMOS=y
216CONFIG_DMADEVICES=y 193CONFIG_DMADEVICES=y
217CONFIG_FSL_DMA=y 194CONFIG_FSL_DMA=y
218CONFIG_MEMORY=y
219# CONFIG_NET_DMA is not set
220CONFIG_EXT2_FS=y 195CONFIG_EXT2_FS=y
221CONFIG_EXT3_FS=y 196CONFIG_EXT3_FS=y
222# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 197# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -227,21 +202,9 @@ CONFIG_UDF_FS=m
227CONFIG_MSDOS_FS=m 202CONFIG_MSDOS_FS=m
228CONFIG_VFAT_FS=y 203CONFIG_VFAT_FS=y
229CONFIG_NTFS_FS=y 204CONFIG_NTFS_FS=y
230CONFIG_NLS_CODEPAGE_437=y
231CONFIG_NLS_CODEPAGE_850=y
232CONFIG_NLS_ISO8859_1=y
233CONFIG_PROC_KCORE=y 205CONFIG_PROC_KCORE=y
234CONFIG_TMPFS=y 206CONFIG_TMPFS=y
235CONFIG_HUGETLBFS=y 207CONFIG_HUGETLBFS=y
236CONFIG_JFFS2_FS=y
237CONFIG_JFFS2_FS_DEBUG=1
238CONFIG_JFFS2_FS_WRITEBUFFER=y
239CONFIG_JFFS2_ZLIB=y
240CONFIG_JFFS2_RTIME=y
241CONFIG_UBIFS_FS=y
242CONFIG_UBIFS_FS_XATTR=y
243CONFIG_UBIFS_FS_LZO=y
244CONFIG_UBIFS_FS_ZLIB=y
245CONFIG_ADFS_FS=m 208CONFIG_ADFS_FS=m
246CONFIG_AFFS_FS=m 209CONFIG_AFFS_FS=m
247CONFIG_HFS_FS=m 210CONFIG_HFS_FS=m
@@ -249,6 +212,9 @@ CONFIG_HFSPLUS_FS=m
249CONFIG_BEFS_FS=m 212CONFIG_BEFS_FS=m
250CONFIG_BFS_FS=m 213CONFIG_BFS_FS=m
251CONFIG_EFS_FS=m 214CONFIG_EFS_FS=m
215CONFIG_JFFS2_FS=y
216CONFIG_JFFS2_FS_DEBUG=1
217CONFIG_UBIFS_FS=y
252CONFIG_CRAMFS=y 218CONFIG_CRAMFS=y
253CONFIG_VXFS_FS=m 219CONFIG_VXFS_FS=m
254CONFIG_HPFS_FS=m 220CONFIG_HPFS_FS=m
@@ -259,16 +225,16 @@ CONFIG_NFS_FS=y
259CONFIG_NFS_V4=y 225CONFIG_NFS_V4=y
260CONFIG_ROOT_NFS=y 226CONFIG_ROOT_NFS=y
261CONFIG_NFSD=y 227CONFIG_NFSD=y
228CONFIG_NLS_CODEPAGE_437=y
229CONFIG_NLS_CODEPAGE_850=y
230CONFIG_NLS_ISO8859_1=y
262CONFIG_CRC_T10DIF=y 231CONFIG_CRC_T10DIF=y
263CONFIG_CRC16=y 232CONFIG_FONTS=y
264CONFIG_ZLIB_DEFLATE=y 233CONFIG_FONT_8x8=y
265CONFIG_LZO_COMPRESS=y 234CONFIG_FONT_8x16=y
266CONFIG_LZO_DECOMPRESS=y 235CONFIG_DEBUG_INFO=y
267CONFIG_CRYPTO_DEFLATE=y
268CONFIG_CRYPTO_LZO=y
269CONFIG_DEBUG_FS=y 236CONFIG_DEBUG_FS=y
270CONFIG_DETECT_HUNG_TASK=y 237CONFIG_DETECT_HUNG_TASK=y
271CONFIG_DEBUG_INFO=y
272CONFIG_CRYPTO_PCBC=m 238CONFIG_CRYPTO_PCBC=m
273CONFIG_CRYPTO_SHA256=y 239CONFIG_CRYPTO_SHA256=y
274CONFIG_CRYPTO_SHA512=y 240CONFIG_CRYPTO_SHA512=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index b5d1b82a1b43..5b79adb64ce2 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -2,14 +2,13 @@ CONFIG_PPC_85xx=y
2CONFIG_PHYS_64BIT=y 2CONFIG_PHYS_64BIT=y
3CONFIG_SMP=y 3CONFIG_SMP=y
4CONFIG_NR_CPUS=8 4CONFIG_NR_CPUS=8
5CONFIG_EXPERIMENTAL=y
6CONFIG_SYSVIPC=y 5CONFIG_SYSVIPC=y
7CONFIG_POSIX_MQUEUE=y 6CONFIG_POSIX_MQUEUE=y
8CONFIG_BSD_PROCESS_ACCT=y
9CONFIG_AUDIT=y 7CONFIG_AUDIT=y
10CONFIG_IRQ_DOMAIN_DEBUG=y 8CONFIG_IRQ_DOMAIN_DEBUG=y
11CONFIG_NO_HZ=y 9CONFIG_NO_HZ=y
12CONFIG_HIGH_RES_TIMERS=y 10CONFIG_HIGH_RES_TIMERS=y
11CONFIG_BSD_PROCESS_ACCT=y
13CONFIG_IKCONFIG=y 12CONFIG_IKCONFIG=y
14CONFIG_IKCONFIG_PROC=y 13CONFIG_IKCONFIG_PROC=y
15CONFIG_LOG_BUF_SHIFT=14 14CONFIG_LOG_BUF_SHIFT=14
@@ -23,6 +22,7 @@ CONFIG_MODVERSIONS=y
23# CONFIG_BLK_DEV_BSG is not set 22# CONFIG_BLK_DEV_BSG is not set
24CONFIG_PARTITION_ADVANCED=y 23CONFIG_PARTITION_ADVANCED=y
25CONFIG_MAC_PARTITION=y 24CONFIG_MAC_PARTITION=y
25CONFIG_C293_PCIE=y
26CONFIG_MPC8540_ADS=y 26CONFIG_MPC8540_ADS=y
27CONFIG_MPC8560_ADS=y 27CONFIG_MPC8560_ADS=y
28CONFIG_MPC85xx_CDS=y 28CONFIG_MPC85xx_CDS=y
@@ -30,7 +30,6 @@ CONFIG_MPC85xx_MDS=y
30CONFIG_MPC8536_DS=y 30CONFIG_MPC8536_DS=y
31CONFIG_MPC85xx_DS=y 31CONFIG_MPC85xx_DS=y
32CONFIG_MPC85xx_RDB=y 32CONFIG_MPC85xx_RDB=y
33CONFIG_C293_PCIE=y
34CONFIG_P1010_RDB=y 33CONFIG_P1010_RDB=y
35CONFIG_P1022_DS=y 34CONFIG_P1022_DS=y
36CONFIG_P1022_RDK=y 35CONFIG_P1022_RDK=y
@@ -73,7 +72,6 @@ CONFIG_NET_IPIP=y
73CONFIG_IP_MROUTE=y 72CONFIG_IP_MROUTE=y
74CONFIG_IP_PIMSM_V1=y 73CONFIG_IP_PIMSM_V1=y
75CONFIG_IP_PIMSM_V2=y 74CONFIG_IP_PIMSM_V2=y
76CONFIG_ARPD=y
77CONFIG_INET_ESP=y 75CONFIG_INET_ESP=y
78# CONFIG_INET_XFRM_MODE_BEET is not set 76# CONFIG_INET_XFRM_MODE_BEET is not set
79# CONFIG_INET_LRO is not set 77# CONFIG_INET_LRO is not set
@@ -83,33 +81,17 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
83CONFIG_DEVTMPFS=y 81CONFIG_DEVTMPFS=y
84CONFIG_DEVTMPFS_MOUNT=y 82CONFIG_DEVTMPFS_MOUNT=y
85CONFIG_MTD=y 83CONFIG_MTD=y
86CONFIG_MTD_OF_PARTS=y
87CONFIG_MTD_CMDLINE_PARTS=y 84CONFIG_MTD_CMDLINE_PARTS=y
88CONFIG_MTD_CHAR=y
89CONFIG_MTD_BLKDEVS=y
90CONFIG_MTD_BLOCK=y 85CONFIG_MTD_BLOCK=y
91CONFIG_FTL=y 86CONFIG_FTL=y
92CONFIG_MTD_CFI=y 87CONFIG_MTD_CFI=y
93CONFIG_MTD_GEN_PROBE=y
94CONFIG_MTD_MAP_BANK_WIDTH_1=y
95CONFIG_MTD_MAP_BANK_WIDTH_2=y
96CONFIG_MTD_MAP_BANK_WIDTH_4=y
97CONFIG_MTD_CFI_I1=y
98CONFIG_MTD_CFI_I2=y
99CONFIG_MTD_CFI_INTELEXT=y 88CONFIG_MTD_CFI_INTELEXT=y
100CONFIG_MTD_CFI_AMDSTD=y 89CONFIG_MTD_CFI_AMDSTD=y
101CONFIG_MTD_PHYSMAP_OF=y 90CONFIG_MTD_PHYSMAP_OF=y
102CONFIG_MTD_M25P80=y
103CONFIG_MTD_CFI_UTIL=y
104CONFIG_MTD_NAND_ECC=y
105CONFIG_MTD_NAND=y 91CONFIG_MTD_NAND=y
106CONFIG_MTD_NAND_IDS=y
107CONFIG_MTD_NAND_FSL_ELBC=y 92CONFIG_MTD_NAND_FSL_ELBC=y
108CONFIG_MTD_NAND_FSL_IFC=y 93CONFIG_MTD_NAND_FSL_IFC=y
109CONFIG_MTD_UBI=y 94CONFIG_MTD_UBI=y
110CONFIG_MTD_UBI_WL_THRESHOLD=4096
111CONFIG_MTD_UBI_BEB_RESERVE=1
112CONFIG_PROC_DEVICETREE=y
113CONFIG_BLK_DEV_LOOP=y 95CONFIG_BLK_DEV_LOOP=y
114CONFIG_BLK_DEV_NBD=y 96CONFIG_BLK_DEV_NBD=y
115CONFIG_BLK_DEV_RAM=y 97CONFIG_BLK_DEV_RAM=y
@@ -120,7 +102,6 @@ CONFIG_BLK_DEV_SD=y
120CONFIG_CHR_DEV_ST=y 102CONFIG_CHR_DEV_ST=y
121CONFIG_BLK_DEV_SR=y 103CONFIG_BLK_DEV_SR=y
122CONFIG_CHR_DEV_SG=y 104CONFIG_CHR_DEV_SG=y
123CONFIG_SCSI_MULTI_LUN=y
124CONFIG_SCSI_LOGGING=y 105CONFIG_SCSI_LOGGING=y
125CONFIG_ATA=y 106CONFIG_ATA=y
126CONFIG_SATA_AHCI=y 107CONFIG_SATA_AHCI=y
@@ -133,11 +114,11 @@ CONFIG_FS_ENET=y
133CONFIG_UCC_GETH=y 114CONFIG_UCC_GETH=y
134CONFIG_GIANFAR=y 115CONFIG_GIANFAR=y
135CONFIG_E1000E=y 116CONFIG_E1000E=y
117CONFIG_AT803X_PHY=y
136CONFIG_MARVELL_PHY=y 118CONFIG_MARVELL_PHY=y
137CONFIG_DAVICOM_PHY=y 119CONFIG_DAVICOM_PHY=y
138CONFIG_CICADA_PHY=y 120CONFIG_CICADA_PHY=y
139CONFIG_VITESSE_PHY=y 121CONFIG_VITESSE_PHY=y
140CONFIG_AT803X_PHY=y
141CONFIG_FIXED_PHY=y 122CONFIG_FIXED_PHY=y
142CONFIG_INPUT_FF_MEMLESS=m 123CONFIG_INPUT_FF_MEMLESS=m
143# CONFIG_INPUT_MOUSEDEV is not set 124# CONFIG_INPUT_MOUSEDEV is not set
@@ -162,14 +143,10 @@ CONFIG_SPI_FSL_SPI=y
162CONFIG_SPI_FSL_ESPI=y 143CONFIG_SPI_FSL_ESPI=y
163CONFIG_GPIO_MPC8XXX=y 144CONFIG_GPIO_MPC8XXX=y
164# CONFIG_HWMON is not set 145# CONFIG_HWMON is not set
165CONFIG_VIDEO_OUTPUT_CONTROL=y
166CONFIG_FB=y 146CONFIG_FB=y
167CONFIG_FB_FSL_DIU=y 147CONFIG_FB_FSL_DIU=y
168# CONFIG_VGA_CONSOLE is not set 148# CONFIG_VGA_CONSOLE is not set
169CONFIG_FRAMEBUFFER_CONSOLE=y 149CONFIG_FRAMEBUFFER_CONSOLE=y
170CONFIG_FONTS=y
171CONFIG_FONT_8x8=y
172CONFIG_FONT_8x16=y
173CONFIG_SOUND=y 150CONFIG_SOUND=y
174CONFIG_SND=y 151CONFIG_SND=y
175# CONFIG_SND_SUPPORT_OLD_API is not set 152# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -193,7 +170,6 @@ CONFIG_HID_MONTEREY=y
193CONFIG_HID_PANTHERLORD=y 170CONFIG_HID_PANTHERLORD=y
194CONFIG_HID_PETALYNX=y 171CONFIG_HID_PETALYNX=y
195CONFIG_HID_SAMSUNG=y 172CONFIG_HID_SAMSUNG=y
196CONFIG_HID_SONY=y
197CONFIG_HID_SUNPLUS=y 173CONFIG_HID_SUNPLUS=y
198CONFIG_USB=y 174CONFIG_USB=y
199CONFIG_USB_MON=y 175CONFIG_USB_MON=y
@@ -216,8 +192,6 @@ CONFIG_RTC_DRV_DS3232=y
216CONFIG_RTC_DRV_CMOS=y 192CONFIG_RTC_DRV_CMOS=y
217CONFIG_DMADEVICES=y 193CONFIG_DMADEVICES=y
218CONFIG_FSL_DMA=y 194CONFIG_FSL_DMA=y
219CONFIG_MEMORY=y
220# CONFIG_NET_DMA is not set
221CONFIG_EXT2_FS=y 195CONFIG_EXT2_FS=y
222CONFIG_EXT3_FS=y 196CONFIG_EXT3_FS=y
223# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 197# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -228,21 +202,9 @@ CONFIG_UDF_FS=m
228CONFIG_MSDOS_FS=m 202CONFIG_MSDOS_FS=m
229CONFIG_VFAT_FS=y 203CONFIG_VFAT_FS=y
230CONFIG_NTFS_FS=y 204CONFIG_NTFS_FS=y
231CONFIG_NLS_CODEPAGE_437=y
232CONFIG_NLS_CODEPAGE_850=y
233CONFIG_NLS_ISO8859_1=y
234CONFIG_PROC_KCORE=y 205CONFIG_PROC_KCORE=y
235CONFIG_TMPFS=y 206CONFIG_TMPFS=y
236CONFIG_HUGETLBFS=y 207CONFIG_HUGETLBFS=y
237CONFIG_JFFS2_FS=y
238CONFIG_JFFS2_FS_DEBUG=1
239CONFIG_JFFS2_FS_WRITEBUFFER=y
240CONFIG_JFFS2_ZLIB=y
241CONFIG_JFFS2_RTIME=y
242CONFIG_UBIFS_FS=y
243CONFIG_UBIFS_FS_XATTR=y
244CONFIG_UBIFS_FS_LZO=y
245CONFIG_UBIFS_FS_ZLIB=y
246CONFIG_ADFS_FS=m 208CONFIG_ADFS_FS=m
247CONFIG_AFFS_FS=m 209CONFIG_AFFS_FS=m
248CONFIG_HFS_FS=m 210CONFIG_HFS_FS=m
@@ -250,6 +212,9 @@ CONFIG_HFSPLUS_FS=m
250CONFIG_BEFS_FS=m 212CONFIG_BEFS_FS=m
251CONFIG_BFS_FS=m 213CONFIG_BFS_FS=m
252CONFIG_EFS_FS=m 214CONFIG_EFS_FS=m
215CONFIG_JFFS2_FS=y
216CONFIG_JFFS2_FS_DEBUG=1
217CONFIG_UBIFS_FS=y
253CONFIG_CRAMFS=y 218CONFIG_CRAMFS=y
254CONFIG_VXFS_FS=m 219CONFIG_VXFS_FS=m
255CONFIG_HPFS_FS=m 220CONFIG_HPFS_FS=m
@@ -260,20 +225,19 @@ CONFIG_NFS_FS=y
260CONFIG_NFS_V4=y 225CONFIG_NFS_V4=y
261CONFIG_ROOT_NFS=y 226CONFIG_ROOT_NFS=y
262CONFIG_NFSD=y 227CONFIG_NFSD=y
228CONFIG_NLS_CODEPAGE_437=y
229CONFIG_NLS_CODEPAGE_850=y
230CONFIG_NLS_ISO8859_1=y
263CONFIG_CRC_T10DIF=y 231CONFIG_CRC_T10DIF=y
264CONFIG_CRC16=y 232CONFIG_FONTS=y
265CONFIG_ZLIB_DEFLATE=y 233CONFIG_FONT_8x8=y
266CONFIG_LZO_COMPRESS=y 234CONFIG_FONT_8x16=y
267CONFIG_LZO_DECOMPRESS=y 235CONFIG_DEBUG_INFO=y
268CONFIG_CRYPTO_DEFLATE=y
269CONFIG_CRYPTO_LZO=y
270CONFIG_DEBUG_FS=y 236CONFIG_DEBUG_FS=y
271CONFIG_DETECT_HUNG_TASK=y 237CONFIG_DETECT_HUNG_TASK=y
272CONFIG_DEBUG_INFO=y
273CONFIG_CRYPTO_PCBC=m 238CONFIG_CRYPTO_PCBC=m
274CONFIG_CRYPTO_SHA256=y 239CONFIG_CRYPTO_SHA256=y
275CONFIG_CRYPTO_SHA512=y 240CONFIG_CRYPTO_SHA512=y
276CONFIG_CRYPTO_AES=y
277# CONFIG_CRYPTO_ANSI_CPRNG is not set 241# CONFIG_CRYPTO_ANSI_CPRNG is not set
278CONFIG_CRYPTO_DEV_FSL_CAAM=y 242CONFIG_CRYPTO_DEV_FSL_CAAM=y
279CONFIG_CRYPTO_DEV_TALITOS=y 243CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index d954e80c286a..321412c5dae4 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -1,25 +1,21 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_HOTPLUG is not set
10# CONFIG_BUG is not set 8# CONFIG_BUG is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
12# CONFIG_EPOLL is not set 10# CONFIG_EPOLL is not set
13# CONFIG_VM_EVENT_COUNTERS is not set 11# CONFIG_VM_EVENT_COUNTERS is not set
14# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
13CONFIG_PARTITION_ADVANCED=y
15CONFIG_MPC86XADS=y 14CONFIG_MPC86XADS=y
16CONFIG_8xx_COPYBACK=y 15CONFIG_8xx_COPYBACK=y
17CONFIG_8xx_CPU6=y 16CONFIG_8xx_CPU6=y
18CONFIG_NO_HZ=y
19CONFIG_HIGH_RES_TIMERS=y
20CONFIG_HZ_1000=y 17CONFIG_HZ_1000=y
21CONFIG_MATH_EMULATION=y 18CONFIG_MATH_EMULATION=y
22CONFIG_SPARSE_IRQ=y
23# CONFIG_SECCOMP is not set 19# CONFIG_SECCOMP is not set
24CONFIG_NET=y 20CONFIG_NET=y
25CONFIG_PACKET=y 21CONFIG_PACKET=y
@@ -32,27 +28,21 @@ CONFIG_SYN_COOKIES=y
32# CONFIG_IPV6 is not set 28# CONFIG_IPV6 is not set
33CONFIG_BLK_DEV_LOOP=y 29CONFIG_BLK_DEV_LOOP=y
34CONFIG_NETDEVICES=y 30CONFIG_NETDEVICES=y
35CONFIG_FIXED_PHY=y
36CONFIG_NET_ETHERNET=y
37CONFIG_FS_ENET=y 31CONFIG_FS_ENET=y
32CONFIG_FIXED_PHY=y
38# CONFIG_VT is not set 33# CONFIG_VT is not set
34# CONFIG_LEGACY_PTYS is not set
39CONFIG_SERIAL_CPM=y 35CONFIG_SERIAL_CPM=y
40CONFIG_SERIAL_CPM_CONSOLE=y 36CONFIG_SERIAL_CPM_CONSOLE=y
41# CONFIG_LEGACY_PTYS is not set
42CONFIG_GEN_RTC=y 37CONFIG_GEN_RTC=y
43CONFIG_VIDEO_OUTPUT_CONTROL=y
44CONFIG_EXT2_FS=y 38CONFIG_EXT2_FS=y
45CONFIG_EXT2_FS_XATTR=y 39CONFIG_EXT2_FS_XATTR=y
46CONFIG_EXT3_FS=y 40CONFIG_EXT3_FS=y
47# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 41# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
48CONFIG_INOTIFY=y
49CONFIG_TMPFS=y 42CONFIG_TMPFS=y
50CONFIG_CRAMFS=y 43CONFIG_CRAMFS=y
51CONFIG_NFS_FS=y 44CONFIG_NFS_FS=y
52CONFIG_NFS_V3=y
53CONFIG_ROOT_NFS=y 45CONFIG_ROOT_NFS=y
54CONFIG_PARTITION_ADVANCED=y
55CONFIG_CRC_CCITT=y 46CONFIG_CRC_CCITT=y
56# CONFIG_RCU_CPU_STALL_DETECTOR is not set
57# CONFIG_CRYPTO_ANSI_CPRNG is not set
58CONFIG_CRC32_SLICEBY4=y 47CONFIG_CRC32_SLICEBY4=y
48# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index fc58aa8a89e4..a4572563681c 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -1,23 +1,24 @@
1CONFIG_SMP=y 1CONFIG_SMP=y
2CONFIG_NR_CPUS=2 2CONFIG_NR_CPUS=2
3CONFIG_EXPERIMENTAL=y
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
6CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_AUDIT=y 5CONFIG_AUDIT=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
8CONFIG_BSD_PROCESS_ACCT=y
8CONFIG_IKCONFIG=y 9CONFIG_IKCONFIG=y
9CONFIG_IKCONFIG_PROC=y 10CONFIG_IKCONFIG_PROC=y
10CONFIG_LOG_BUF_SHIFT=14 11CONFIG_LOG_BUF_SHIFT=14
11CONFIG_BLK_DEV_INITRD=y 12CONFIG_BLK_DEV_INITRD=y
12# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
13CONFIG_EXPERT=y 13CONFIG_EXPERT=y
14CONFIG_KALLSYMS_ALL=y 14CONFIG_KALLSYMS_ALL=y
15CONFIG_KALLSYMS_EXTRA_PASS=y
16CONFIG_MODULES=y 15CONFIG_MODULES=y
17CONFIG_MODULE_UNLOAD=y 16CONFIG_MODULE_UNLOAD=y
18CONFIG_MODULE_FORCE_UNLOAD=y 17CONFIG_MODULE_FORCE_UNLOAD=y
19CONFIG_MODVERSIONS=y 18CONFIG_MODVERSIONS=y
20# CONFIG_BLK_DEV_BSG is not set 19# CONFIG_BLK_DEV_BSG is not set
20CONFIG_PARTITION_ADVANCED=y
21CONFIG_MAC_PARTITION=y
21# CONFIG_PPC_CHRP is not set 22# CONFIG_PPC_CHRP is not set
22# CONFIG_PPC_PMAC is not set 23# CONFIG_PPC_PMAC is not set
23CONFIG_PPC_86xx=y 24CONFIG_PPC_86xx=y
@@ -26,11 +27,8 @@ CONFIG_SBC8641D=y
26CONFIG_MPC8610_HPCD=y 27CONFIG_MPC8610_HPCD=y
27CONFIG_GEF_SBC610=y 28CONFIG_GEF_SBC610=y
28CONFIG_HIGHMEM=y 29CONFIG_HIGHMEM=y
29CONFIG_NO_HZ=y
30CONFIG_HIGH_RES_TIMERS=y
31CONFIG_HZ_1000=y 30CONFIG_HZ_1000=y
32CONFIG_BINFMT_MISC=m 31CONFIG_BINFMT_MISC=m
33CONFIG_SPARSE_IRQ=y
34CONFIG_PCI=y 32CONFIG_PCI=y
35CONFIG_NET=y 33CONFIG_NET=y
36CONFIG_PACKET=y 34CONFIG_PACKET=y
@@ -48,12 +46,9 @@ CONFIG_IP_PNP_DHCP=y
48CONFIG_IP_PNP_BOOTP=y 46CONFIG_IP_PNP_BOOTP=y
49CONFIG_IP_PNP_RARP=y 47CONFIG_IP_PNP_RARP=y
50CONFIG_NET_IPIP=y 48CONFIG_NET_IPIP=y
51CONFIG_NET_IPGRE=y
52CONFIG_NET_IPGRE_BROADCAST=y
53CONFIG_IP_MROUTE=y 49CONFIG_IP_MROUTE=y
54CONFIG_IP_PIMSM_V1=y 50CONFIG_IP_PIMSM_V1=y
55CONFIG_IP_PIMSM_V2=y 51CONFIG_IP_PIMSM_V2=y
56CONFIG_ARPD=y
57# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 52# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
58# CONFIG_INET_XFRM_MODE_TUNNEL is not set 53# CONFIG_INET_XFRM_MODE_TUNNEL is not set
59# CONFIG_INET_XFRM_MODE_BEET is not set 54# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -61,28 +56,23 @@ CONFIG_ARPD=y
61CONFIG_IPV6=y 56CONFIG_IPV6=y
62CONFIG_IP_SCTP=m 57CONFIG_IP_SCTP=m
63CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 58CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
64CONFIG_PROC_DEVICETREE=y
65CONFIG_BLK_DEV_LOOP=y 59CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_NBD=y 60CONFIG_BLK_DEV_NBD=y
67CONFIG_BLK_DEV_RAM=y 61CONFIG_BLK_DEV_RAM=y
68CONFIG_BLK_DEV_RAM_SIZE=131072 62CONFIG_BLK_DEV_RAM_SIZE=131072
69CONFIG_MISC_DEVICES=y
70CONFIG_EEPROM_LEGACY=y 63CONFIG_EEPROM_LEGACY=y
71CONFIG_BLK_DEV_SD=y 64CONFIG_BLK_DEV_SD=y
72CONFIG_CHR_DEV_ST=y 65CONFIG_CHR_DEV_ST=y
73CONFIG_BLK_DEV_SR=y 66CONFIG_BLK_DEV_SR=y
74CONFIG_CHR_DEV_SG=y 67CONFIG_CHR_DEV_SG=y
75CONFIG_SCSI_MULTI_LUN=y
76CONFIG_SCSI_LOGGING=y 68CONFIG_SCSI_LOGGING=y
77CONFIG_ATA=y 69CONFIG_ATA=y
78CONFIG_SATA_AHCI=y 70CONFIG_SATA_AHCI=y
79CONFIG_PATA_ALI=y 71CONFIG_PATA_ALI=y
80CONFIG_NETDEVICES=y 72CONFIG_NETDEVICES=y
81CONFIG_DUMMY=y 73CONFIG_DUMMY=y
82CONFIG_VITESSE_PHY=y
83CONFIG_NET_ETHERNET=y
84CONFIG_MII=y
85CONFIG_GIANFAR=y 74CONFIG_GIANFAR=y
75CONFIG_VITESSE_PHY=y
86CONFIG_INPUT_FF_MEMLESS=m 76CONFIG_INPUT_FF_MEMLESS=m
87# CONFIG_INPUT_MOUSEDEV is not set 77# CONFIG_INPUT_MOUSEDEV is not set
88# CONFIG_INPUT_KEYBOARD is not set 78# CONFIG_INPUT_KEYBOARD is not set
@@ -102,7 +92,6 @@ CONFIG_NVRAM=y
102CONFIG_I2C=y 92CONFIG_I2C=y
103CONFIG_I2C_MPC=y 93CONFIG_I2C_MPC=y
104# CONFIG_HWMON is not set 94# CONFIG_HWMON is not set
105CONFIG_VIDEO_OUTPUT_CONTROL=y
106CONFIG_SOUND=y 95CONFIG_SOUND=y
107CONFIG_SND=y 96CONFIG_SND=y
108CONFIG_SND_MIXER_OSS=y 97CONFIG_SND_MIXER_OSS=y
@@ -123,7 +112,6 @@ CONFIG_HID_MONTEREY=y
123CONFIG_HID_PANTHERLORD=y 112CONFIG_HID_PANTHERLORD=y
124CONFIG_HID_PETALYNX=y 113CONFIG_HID_PETALYNX=y
125CONFIG_HID_SAMSUNG=y 114CONFIG_HID_SAMSUNG=y
126CONFIG_HID_SONY=y
127CONFIG_HID_SUNPLUS=y 115CONFIG_HID_SUNPLUS=y
128CONFIG_USB=y 116CONFIG_USB=y
129CONFIG_USB_MON=y 117CONFIG_USB_MON=y
@@ -137,7 +125,6 @@ CONFIG_RTC_DRV_CMOS=y
137CONFIG_EXT2_FS=y 125CONFIG_EXT2_FS=y
138CONFIG_EXT3_FS=y 126CONFIG_EXT3_FS=y
139# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 127# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
140CONFIG_INOTIFY=y
141CONFIG_ISO9660_FS=m 128CONFIG_ISO9660_FS=m
142CONFIG_JOLIET=y 129CONFIG_JOLIET=y
143CONFIG_ZISOFS=y 130CONFIG_ZISOFS=y
@@ -145,9 +132,6 @@ CONFIG_UDF_FS=m
145CONFIG_MSDOS_FS=m 132CONFIG_MSDOS_FS=m
146CONFIG_VFAT_FS=y 133CONFIG_VFAT_FS=y
147CONFIG_NTFS_FS=y 134CONFIG_NTFS_FS=y
148CONFIG_NLS_CODEPAGE_437=y
149CONFIG_NLS_CODEPAGE_850=y
150CONFIG_NLS_ISO8859_1=y
151CONFIG_PROC_KCORE=y 135CONFIG_PROC_KCORE=y
152CONFIG_TMPFS=y 136CONFIG_TMPFS=y
153CONFIG_ADFS_FS=m 137CONFIG_ADFS_FS=m
@@ -164,18 +148,15 @@ CONFIG_QNX4FS_FS=m
164CONFIG_SYSV_FS=m 148CONFIG_SYSV_FS=m
165CONFIG_UFS_FS=m 149CONFIG_UFS_FS=m
166CONFIG_NFS_FS=y 150CONFIG_NFS_FS=y
167CONFIG_NFS_V3=y
168CONFIG_NFS_V4=y 151CONFIG_NFS_V4=y
169CONFIG_ROOT_NFS=y 152CONFIG_ROOT_NFS=y
170CONFIG_NFSD=y 153CONFIG_NFSD=y
171CONFIG_PARTITION_ADVANCED=y 154CONFIG_NLS_CODEPAGE_437=y
172CONFIG_MAC_PARTITION=y 155CONFIG_NLS_CODEPAGE_850=y
156CONFIG_NLS_ISO8859_1=y
173CONFIG_CRC_T10DIF=y 157CONFIG_CRC_T10DIF=y
174CONFIG_DEBUG_KERNEL=y
175CONFIG_DETECT_HUNG_TASK=y
176CONFIG_DEBUG_INFO=y 158CONFIG_DEBUG_INFO=y
177# CONFIG_RCU_CPU_STALL_DETECTOR is not set 159CONFIG_DETECT_HUNG_TASK=y
178CONFIG_SYSCTL_SYSCALL_CHECK=y
179CONFIG_CRYPTO_PCBC=m 160CONFIG_CRYPTO_PCBC=m
180CONFIG_CRYPTO_HMAC=y 161CONFIG_CRYPTO_HMAC=y
181# CONFIG_CRYPTO_ANSI_CPRNG is not set 162# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index 3f47d00a10c0..2a10f98d4ee5 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,23 +1,19 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8# CONFIG_SYSCTL_SYSCALL is not set
9# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
10# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
11# CONFIG_FUTEX is not set 10# CONFIG_FUTEX is not set
12# CONFIG_VM_EVENT_COUNTERS is not set 11# CONFIG_VM_EVENT_COUNTERS is not set
13# CONFIG_BLK_DEV_BSG is not set 12# CONFIG_BLK_DEV_BSG is not set
13CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15CONFIG_8xx_COPYBACK=y 15CONFIG_8xx_COPYBACK=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_HZ_100=y 16CONFIG_HZ_100=y
19CONFIG_8XX_MINIMAL_FPEMU=y
20CONFIG_SPARSE_IRQ=y
21# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
22CONFIG_NET=y 18CONFIG_NET=y
23CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -34,7 +30,6 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 32CONFIG_MTD=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
39CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
40CONFIG_MTD_CFI_ADV_OPTIONS=y 35CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -46,22 +41,17 @@ CONFIG_MTD_CFI_GEOMETRY=y
46CONFIG_MTD_CFI_I4=y 41CONFIG_MTD_CFI_I4=y
47CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
48CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
49CONFIG_PROC_DEVICETREE=y
50# CONFIG_BLK_DEV is not set 44# CONFIG_BLK_DEV is not set
51# CONFIG_MISC_DEVICES is not set
52CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
53CONFIG_DAVICOM_PHY=y
54CONFIG_NET_ETHERNET=y
55CONFIG_FS_ENET=y 46CONFIG_FS_ENET=y
56# CONFIG_FS_ENET_HAS_SCC is not set 47# CONFIG_FS_ENET_HAS_SCC is not set
57# CONFIG_NETDEV_1000 is not set 48CONFIG_DAVICOM_PHY=y
58# CONFIG_NETDEV_10000 is not set
59# CONFIG_INPUT is not set 49# CONFIG_INPUT is not set
60# CONFIG_SERIO is not set 50# CONFIG_SERIO is not set
61# CONFIG_VT is not set 51# CONFIG_VT is not set
52# CONFIG_LEGACY_PTYS is not set
62CONFIG_SERIAL_CPM=y 53CONFIG_SERIAL_CPM=y
63CONFIG_SERIAL_CPM_CONSOLE=y 54CONFIG_SERIAL_CPM_CONSOLE=y
64# CONFIG_LEGACY_PTYS is not set
65CONFIG_GEN_RTC=y 55CONFIG_GEN_RTC=y
66# CONFIG_HWMON is not set 56# CONFIG_HWMON is not set
67# CONFIG_USB_SUPPORT is not set 57# CONFIG_USB_SUPPORT is not set
@@ -69,13 +59,8 @@ CONFIG_GEN_RTC=y
69CONFIG_TMPFS=y 59CONFIG_TMPFS=y
70CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
71CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
72CONFIG_NFS_V3=y
73CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
74CONFIG_PARTITION_ADVANCED=y 63CONFIG_CRC32_SLICEBY4=y
75# CONFIG_CRC32 is not set 64CONFIG_DEBUG_INFO=y
76CONFIG_MAGIC_SYSRQ=y 65CONFIG_MAGIC_SYSRQ=y
77CONFIG_DEBUG_KERNEL=y
78CONFIG_DETECT_HUNG_TASK=y 66CONFIG_DETECT_HUNG_TASK=y
79CONFIG_DEBUG_INFO=y
80# CONFIG_RCU_CPU_STALL_DETECTOR is not set
81CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/mvme5100_defconfig b/arch/powerpc/configs/mvme5100_defconfig
index 93c7752e2dbb..525a2cb500a7 100644
--- a/arch/powerpc/configs/mvme5100_defconfig
+++ b/arch/powerpc/configs/mvme5100_defconfig
@@ -61,7 +61,6 @@ CONFIG_IP_NF_ARPFILTER=m
61CONFIG_IP_NF_ARP_MANGLE=m 61CONFIG_IP_NF_ARP_MANGLE=m
62CONFIG_LAPB=m 62CONFIG_LAPB=m
63CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 63CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
64CONFIG_PROC_DEVICETREE=y
65CONFIG_BLK_DEV_LOOP=y 64CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_RAM=y 65CONFIG_BLK_DEV_RAM=y
67CONFIG_BLK_DEV_RAM_COUNT=2 66CONFIG_BLK_DEV_RAM_COUNT=2
@@ -88,13 +87,10 @@ CONFIG_I2C=y
88CONFIG_I2C_CHARDEV=y 87CONFIG_I2C_CHARDEV=y
89CONFIG_I2C_MPC=y 88CONFIG_I2C_MPC=y
90# CONFIG_HWMON is not set 89# CONFIG_HWMON is not set
91CONFIG_VIDEO_OUTPUT_CONTROL=m
92# CONFIG_VGA_CONSOLE is not set 90# CONFIG_VGA_CONSOLE is not set
93# CONFIG_HID is not set 91# CONFIG_HID is not set
94# CONFIG_USB_SUPPORT is not set 92# CONFIG_USB_SUPPORT is not set
95# CONFIG_IOMMU_SUPPORT is not set 93# CONFIG_IOMMU_SUPPORT is not set
96CONFIG_VME_BUS=m
97CONFIG_VME_CA91CX42=m
98CONFIG_EXT2_FS=m 94CONFIG_EXT2_FS=m
99CONFIG_EXT3_FS=m 95CONFIG_EXT3_FS=m
100# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 96# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -122,11 +118,6 @@ CONFIG_NLS_UTF8=m
122CONFIG_CRC_CCITT=m 118CONFIG_CRC_CCITT=m
123CONFIG_CRC_T10DIF=y 119CONFIG_CRC_T10DIF=y
124CONFIG_XZ_DEC=y 120CONFIG_XZ_DEC=y
125CONFIG_XZ_DEC_X86=y
126CONFIG_XZ_DEC_IA64=y
127CONFIG_XZ_DEC_ARM=y
128CONFIG_XZ_DEC_ARMTHUMB=y
129CONFIG_XZ_DEC_SPARC=y
130CONFIG_MAGIC_SYSRQ=y 121CONFIG_MAGIC_SYSRQ=y
131CONFIG_DEBUG_KERNEL=y 122CONFIG_DEBUG_KERNEL=y
132CONFIG_DETECT_HUNG_TASK=y 123CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 3e72c8c06a0d..8f94782eb907 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -54,7 +54,6 @@ CONFIG_MTD_SLRAM=y
54CONFIG_MTD_PHRAM=y 54CONFIG_MTD_PHRAM=y
55CONFIG_MTD_NAND=y 55CONFIG_MTD_NAND=y
56CONFIG_MTD_NAND_PASEMI=y 56CONFIG_MTD_NAND_PASEMI=y
57CONFIG_PROC_DEVICETREE=y
58CONFIG_BLK_DEV_LOOP=y 57CONFIG_BLK_DEV_LOOP=y
59CONFIG_BLK_DEV_RAM=y 58CONFIG_BLK_DEV_RAM=y
60CONFIG_BLK_DEV_RAM_SIZE=16384 59CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -69,7 +68,6 @@ CONFIG_BLK_DEV_SR=y
69CONFIG_BLK_DEV_SR_VENDOR=y 68CONFIG_BLK_DEV_SR_VENDOR=y
70CONFIG_CHR_DEV_SG=y 69CONFIG_CHR_DEV_SG=y
71CONFIG_CHR_DEV_SCH=y 70CONFIG_CHR_DEV_SCH=y
72CONFIG_SCSI_MULTI_LUN=y
73CONFIG_SCSI_CONSTANTS=y 71CONFIG_SCSI_CONSTANTS=y
74CONFIG_SCSI_LOGGING=y 72CONFIG_SCSI_LOGGING=y
75CONFIG_ATA=y 73CONFIG_ATA=y
@@ -134,7 +132,6 @@ CONFIG_HID_NTRIG=y
134CONFIG_HID_PANTHERLORD=y 132CONFIG_HID_PANTHERLORD=y
135CONFIG_HID_PETALYNX=y 133CONFIG_HID_PETALYNX=y
136CONFIG_HID_SAMSUNG=y 134CONFIG_HID_SAMSUNG=y
137CONFIG_HID_SONY=y
138CONFIG_HID_SUNPLUS=y 135CONFIG_HID_SUNPLUS=y
139CONFIG_HID_GREENASIA=y 136CONFIG_HID_GREENASIA=y
140CONFIG_HID_SMARTJOYPLUS=y 137CONFIG_HID_SMARTJOYPLUS=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 0351b5ffdfef..ea8705ffcd76 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,19 +1,20 @@
1CONFIG_ALTIVEC=y 1CONFIG_ALTIVEC=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
6CONFIG_IKCONFIG=y 7CONFIG_IKCONFIG=y
7CONFIG_IKCONFIG_PROC=y 8CONFIG_IKCONFIG_PROC=y
8CONFIG_LOG_BUF_SHIFT=14 9CONFIG_LOG_BUF_SHIFT=14
9CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
10# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
11# CONFIG_COMPAT_BRK is not set 11# CONFIG_COMPAT_BRK is not set
12CONFIG_PROFILING=y 12CONFIG_PROFILING=y
13CONFIG_OPROFILE=y 13CONFIG_OPROFILE=y
14CONFIG_MODULES=y 14CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 15CONFIG_MODULE_UNLOAD=y
16CONFIG_MODULE_FORCE_UNLOAD=y 16CONFIG_MODULE_FORCE_UNLOAD=y
17CONFIG_PARTITION_ADVANCED=y
17# CONFIG_PPC_CHRP is not set 18# CONFIG_PPC_CHRP is not set
18CONFIG_CPU_FREQ=y 19CONFIG_CPU_FREQ=y
19CONFIG_CPU_FREQ_GOV_POWERSAVE=y 20CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -21,13 +22,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
21CONFIG_CPU_FREQ_PMAC=y 22CONFIG_CPU_FREQ_PMAC=y
22CONFIG_PPC601_SYNC_FIX=y 23CONFIG_PPC601_SYNC_FIX=y
23CONFIG_HIGHMEM=y 24CONFIG_HIGHMEM=y
24CONFIG_NO_HZ=y
25CONFIG_HIGH_RES_TIMERS=y
26CONFIG_BINFMT_MISC=m 25CONFIG_BINFMT_MISC=m
27# CONFIG_MIGRATION is not set
28CONFIG_PM=y
29CONFIG_PM_DEBUG=y
30CONFIG_HIBERNATION=y 26CONFIG_HIBERNATION=y
27CONFIG_PM_DEBUG=y
31CONFIG_APM_EMULATION=y 28CONFIG_APM_EMULATION=y
32CONFIG_PCCARD=m 29CONFIG_PCCARD=m
33CONFIG_YENTA=m 30CONFIG_YENTA=m
@@ -46,7 +43,6 @@ CONFIG_INET_ESP=y
46# CONFIG_INET_LRO is not set 43# CONFIG_INET_LRO is not set
47# CONFIG_IPV6 is not set 44# CONFIG_IPV6 is not set
48CONFIG_NETFILTER=y 45CONFIG_NETFILTER=y
49CONFIG_NETFILTER_NETLINK_QUEUE=m
50CONFIG_NF_CONNTRACK=m 46CONFIG_NF_CONNTRACK=m
51CONFIG_NF_CONNTRACK_FTP=m 47CONFIG_NF_CONNTRACK_FTP=m
52CONFIG_NF_CONNTRACK_IRC=m 48CONFIG_NF_CONNTRACK_IRC=m
@@ -84,18 +80,11 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
84CONFIG_NETFILTER_XT_MATCH_U32=m 80CONFIG_NETFILTER_XT_MATCH_U32=m
85CONFIG_NF_CONNTRACK_IPV4=m 81CONFIG_NF_CONNTRACK_IPV4=m
86CONFIG_IP_NF_IPTABLES=m 82CONFIG_IP_NF_IPTABLES=m
87CONFIG_IP_NF_MATCH_ADDRTYPE=m
88CONFIG_IP_NF_MATCH_AH=m 83CONFIG_IP_NF_MATCH_AH=m
89CONFIG_IP_NF_MATCH_ECN=m 84CONFIG_IP_NF_MATCH_ECN=m
90CONFIG_IP_NF_MATCH_TTL=m 85CONFIG_IP_NF_MATCH_TTL=m
91CONFIG_IP_NF_FILTER=m 86CONFIG_IP_NF_FILTER=m
92CONFIG_IP_NF_TARGET_REJECT=m 87CONFIG_IP_NF_TARGET_REJECT=m
93CONFIG_IP_NF_TARGET_LOG=m
94CONFIG_IP_NF_TARGET_ULOG=m
95CONFIG_NF_NAT=m
96CONFIG_IP_NF_TARGET_MASQUERADE=m
97CONFIG_IP_NF_TARGET_NETMAP=m
98CONFIG_IP_NF_TARGET_REDIRECT=m
99CONFIG_IP_NF_MANGLE=m 88CONFIG_IP_NF_MANGLE=m
100CONFIG_IP_NF_TARGET_ECN=m 89CONFIG_IP_NF_TARGET_ECN=m
101CONFIG_IP_NF_TARGET_TTL=m 90CONFIG_IP_NF_TARGET_TTL=m
@@ -112,8 +101,6 @@ CONFIG_IRDA_CACHE_LAST_LSAP=y
112CONFIG_IRDA_FAST_RR=y 101CONFIG_IRDA_FAST_RR=y
113CONFIG_IRTTY_SIR=m 102CONFIG_IRTTY_SIR=m
114CONFIG_BT=m 103CONFIG_BT=m
115CONFIG_BT_L2CAP=y
116CONFIG_BT_SCO=y
117CONFIG_BT_RFCOMM=m 104CONFIG_BT_RFCOMM=m
118CONFIG_BT_RFCOMM_TTY=y 105CONFIG_BT_RFCOMM_TTY=y
119CONFIG_BT_BNEP=m 106CONFIG_BT_BNEP=m
@@ -128,10 +115,8 @@ CONFIG_MAC80211_LEDS=y
128CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 115CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
129# CONFIG_STANDALONE is not set 116# CONFIG_STANDALONE is not set
130CONFIG_CONNECTOR=y 117CONFIG_CONNECTOR=y
131CONFIG_PROC_DEVICETREE=y
132CONFIG_MAC_FLOPPY=m 118CONFIG_MAC_FLOPPY=m
133CONFIG_BLK_DEV_LOOP=y 119CONFIG_BLK_DEV_LOOP=y
134CONFIG_BLK_DEV_UB=m
135CONFIG_BLK_DEV_RAM=y 120CONFIG_BLK_DEV_RAM=y
136CONFIG_IDE=y 121CONFIG_IDE=y
137CONFIG_BLK_DEV_IDECS=m 122CONFIG_BLK_DEV_IDECS=m
@@ -152,7 +137,6 @@ CONFIG_SCSI_FC_ATTRS=y
152CONFIG_SCSI_AIC7XXX=m 137CONFIG_SCSI_AIC7XXX=m
153CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 138CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
154CONFIG_AIC7XXX_RESET_DELAY_MS=15000 139CONFIG_AIC7XXX_RESET_DELAY_MS=15000
155CONFIG_SCSI_AIC7XXX_OLD=m
156CONFIG_SCSI_SYM53C8XX_2=y 140CONFIG_SCSI_SYM53C8XX_2=y
157CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 141CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
158CONFIG_SCSI_MESH=y 142CONFIG_SCSI_MESH=y
@@ -170,12 +154,6 @@ CONFIG_DM_CRYPT=m
170CONFIG_DM_SNAPSHOT=m 154CONFIG_DM_SNAPSHOT=m
171CONFIG_DM_MIRROR=m 155CONFIG_DM_MIRROR=m
172CONFIG_DM_ZERO=m 156CONFIG_DM_ZERO=m
173CONFIG_IEEE1394=m
174CONFIG_IEEE1394_OHCI1394=m
175CONFIG_IEEE1394_SBP2=m
176CONFIG_IEEE1394_RAWIO=m
177CONFIG_IEEE1394_VIDEO1394=m
178CONFIG_IEEE1394_DV1394=m
179CONFIG_ADB=y 157CONFIG_ADB=y
180CONFIG_ADB_CUDA=y 158CONFIG_ADB_CUDA=y
181CONFIG_ADB_PMU=y 159CONFIG_ADB_PMU=y
@@ -193,27 +171,22 @@ CONFIG_PMAC_RACKMETER=m
193CONFIG_NETDEVICES=y 171CONFIG_NETDEVICES=y
194CONFIG_DUMMY=m 172CONFIG_DUMMY=m
195CONFIG_TUN=m 173CONFIG_TUN=m
196CONFIG_NET_ETHERNET=y 174CONFIG_PCNET32=y
197CONFIG_MACE=y 175CONFIG_MACE=y
198CONFIG_BMAC=y 176CONFIG_BMAC=y
199CONFIG_SUNGEM=y 177CONFIG_SUNGEM=y
200CONFIG_NET_PCI=y
201CONFIG_PCNET32=y
202CONFIG_PRISM54=m
203CONFIG_B43=m
204CONFIG_B43LEGACY=m
205CONFIG_HERMES=m
206CONFIG_APPLE_AIRPORT=m
207CONFIG_PCMCIA_HERMES=m
208CONFIG_P54_COMMON=m
209CONFIG_USB_USBNET=m
210# CONFIG_USB_NET_CDC_SUBSET is not set
211CONFIG_PPP=y 178CONFIG_PPP=y
179CONFIG_PPP_BSDCOMP=m
180CONFIG_PPP_DEFLATE=y
212CONFIG_PPP_MULTILINK=y 181CONFIG_PPP_MULTILINK=y
213CONFIG_PPP_ASYNC=y 182CONFIG_PPP_ASYNC=y
214CONFIG_PPP_SYNC_TTY=m 183CONFIG_PPP_SYNC_TTY=m
215CONFIG_PPP_DEFLATE=y 184CONFIG_USB_USBNET=m
216CONFIG_PPP_BSDCOMP=m 185# CONFIG_USB_NET_CDC_SUBSET is not set
186CONFIG_PRISM54=m
187CONFIG_B43=m
188CONFIG_B43LEGACY=m
189CONFIG_P54_COMMON=m
217CONFIG_INPUT_EVDEV=y 190CONFIG_INPUT_EVDEV=y
218# CONFIG_KEYBOARD_ATKBD is not set 191# CONFIG_KEYBOARD_ATKBD is not set
219# CONFIG_MOUSE_PS2 is not set 192# CONFIG_MOUSE_PS2 is not set
@@ -226,7 +199,6 @@ CONFIG_SERIAL_PMACZILOG_TTYS=y
226CONFIG_NVRAM=y 199CONFIG_NVRAM=y
227CONFIG_GEN_RTC=y 200CONFIG_GEN_RTC=y
228CONFIG_I2C_CHARDEV=m 201CONFIG_I2C_CHARDEV=m
229CONFIG_POWER_SUPPLY=y
230CONFIG_APM_POWER=y 202CONFIG_APM_POWER=y
231CONFIG_BATTERY_PMU=y 203CONFIG_BATTERY_PMU=y
232CONFIG_HWMON=m 204CONFIG_HWMON=m
@@ -253,7 +225,6 @@ CONFIG_FB_ATY=y
253CONFIG_FB_ATY_CT=y 225CONFIG_FB_ATY_CT=y
254CONFIG_FB_ATY_GX=y 226CONFIG_FB_ATY_GX=y
255CONFIG_FB_3DFX=y 227CONFIG_FB_3DFX=y
256CONFIG_DISPLAY_SUPPORT=y
257# CONFIG_VGA_CONSOLE is not set 228# CONFIG_VGA_CONSOLE is not set
258CONFIG_FRAMEBUFFER_CONSOLE=y 229CONFIG_FRAMEBUFFER_CONSOLE=y
259CONFIG_LOGO=y 230CONFIG_LOGO=y
@@ -314,7 +285,6 @@ CONFIG_EXT3_FS=y
314# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 285# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
315CONFIG_EXT3_FS_POSIX_ACL=y 286CONFIG_EXT3_FS_POSIX_ACL=y
316CONFIG_EXT4_FS=y 287CONFIG_EXT4_FS=y
317CONFIG_INOTIFY=y
318CONFIG_AUTOFS4_FS=m 288CONFIG_AUTOFS4_FS=m
319CONFIG_FUSE_FS=m 289CONFIG_FUSE_FS=m
320CONFIG_ISO9660_FS=y 290CONFIG_ISO9660_FS=y
@@ -328,34 +298,27 @@ CONFIG_TMPFS=y
328CONFIG_HFS_FS=m 298CONFIG_HFS_FS=m
329CONFIG_HFSPLUS_FS=m 299CONFIG_HFSPLUS_FS=m
330CONFIG_NFS_FS=y 300CONFIG_NFS_FS=y
331CONFIG_NFS_V3=y
332CONFIG_NFS_V3_ACL=y 301CONFIG_NFS_V3_ACL=y
333CONFIG_NFS_V4=y 302CONFIG_NFS_V4=y
334CONFIG_NFSD=m 303CONFIG_NFSD=m
335CONFIG_NFSD_V3_ACL=y 304CONFIG_NFSD_V3_ACL=y
336CONFIG_NFSD_V4=y 305CONFIG_NFSD_V4=y
337CONFIG_SMB_FS=m
338CONFIG_PARTITION_ADVANCED=y
339CONFIG_NLS_CODEPAGE_437=m 306CONFIG_NLS_CODEPAGE_437=m
340CONFIG_NLS_ISO8859_1=m 307CONFIG_NLS_ISO8859_1=m
341CONFIG_CRC_T10DIF=y 308CONFIG_CRC_T10DIF=y
342CONFIG_LIBCRC32C=m 309CONFIG_LIBCRC32C=m
343CONFIG_MAGIC_SYSRQ=y
344CONFIG_DEBUG_FS=y 310CONFIG_DEBUG_FS=y
311CONFIG_MAGIC_SYSRQ=y
345CONFIG_DEBUG_KERNEL=y 312CONFIG_DEBUG_KERNEL=y
346CONFIG_DETECT_HUNG_TASK=y 313CONFIG_DETECT_HUNG_TASK=y
347# CONFIG_RCU_CPU_STALL_DETECTOR is not set
348CONFIG_LATENCYTOP=y 314CONFIG_LATENCYTOP=y
349CONFIG_SYSCTL_SYSCALL_CHECK=y
350CONFIG_XMON=y 315CONFIG_XMON=y
351CONFIG_XMON_DEFAULT=y 316CONFIG_XMON_DEFAULT=y
352CONFIG_BOOTX_TEXT=y 317CONFIG_BOOTX_TEXT=y
353CONFIG_PPC_EARLY_DEBUG=y 318CONFIG_PPC_EARLY_DEBUG=y
354CONFIG_PPC_EARLY_DEBUG_BOOTX=y
355CONFIG_CRYPTO_NULL=m 319CONFIG_CRYPTO_NULL=m
356CONFIG_CRYPTO_PCBC=m 320CONFIG_CRYPTO_PCBC=m
357CONFIG_CRYPTO_MD4=m 321CONFIG_CRYPTO_MD4=m
358CONFIG_CRYPTO_SHA256=m
359CONFIG_CRYPTO_SHA512=m 322CONFIG_CRYPTO_SHA512=m
360CONFIG_CRYPTO_TGR192=m 323CONFIG_CRYPTO_TGR192=m
361CONFIG_CRYPTO_WP512=m 324CONFIG_CRYPTO_WP512=m
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 52908c7897d9..a43bf6ea10fb 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -1,13 +1,10 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
@@ -18,7 +15,6 @@ CONFIG_HOTFOOT=y
18CONFIG_KILAUEA=y 15CONFIG_KILAUEA=y
19CONFIG_MAKALU=y 16CONFIG_MAKALU=y
20CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y 17CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y
21CONFIG_SPARSE_IRQ=y
22CONFIG_NET=y 18CONFIG_NET=y
23CONFIG_PACKET=y 19CONFIG_PACKET=y
24CONFIG_UNIX=y 20CONFIG_UNIX=y
@@ -34,8 +30,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_CONNECTOR=y 30CONFIG_CONNECTOR=y
35CONFIG_MTD=y 31CONFIG_MTD=y
36CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
37CONFIG_MTD_OF_PARTS=y
38CONFIG_MTD_CHAR=y
39CONFIG_MTD_BLOCK=m 33CONFIG_MTD_BLOCK=m
40CONFIG_MTD_CFI=y 34CONFIG_MTD_CFI=y
41CONFIG_MTD_JEDECPROBE=y 35CONFIG_MTD_JEDECPROBE=y
@@ -43,13 +37,10 @@ CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP_OF=y 37CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_MTD_UBI=m 38CONFIG_MTD_UBI=m
45CONFIG_MTD_UBI_GLUEBI=m 39CONFIG_MTD_UBI_GLUEBI=m
46CONFIG_PROC_DEVICETREE=y
47CONFIG_BLK_DEV_RAM=y 40CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=35000 41CONFIG_BLK_DEV_RAM_SIZE=35000
49CONFIG_XILINX_SYSACE=m 42CONFIG_XILINX_SYSACE=m
50CONFIG_NETDEVICES=y 43CONFIG_NETDEVICES=y
51CONFIG_ETHERNET=y
52CONFIG_NET_VENDOR_IBM=y
53CONFIG_IBM_EMAC=y 44CONFIG_IBM_EMAC=y
54# CONFIG_INPUT is not set 45# CONFIG_INPUT is not set
55CONFIG_SERIO=m 46CONFIG_SERIO=m
@@ -73,13 +64,11 @@ CONFIG_I2C_IBM_IIC=m
73CONFIG_GPIO_XILINX=y 64CONFIG_GPIO_XILINX=y
74# CONFIG_HWMON is not set 65# CONFIG_HWMON is not set
75CONFIG_THERMAL=y 66CONFIG_THERMAL=y
76CONFIG_VIDEO_OUTPUT_CONTROL=m
77CONFIG_FB=m 67CONFIG_FB=m
78CONFIG_FB_XILINX=m 68CONFIG_FB_XILINX=m
79CONFIG_EXT2_FS=y 69CONFIG_EXT2_FS=y
80CONFIG_EXT3_FS=m 70CONFIG_EXT3_FS=m
81# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 71# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
82CONFIG_INOTIFY=y
83CONFIG_VFAT_FS=m 72CONFIG_VFAT_FS=m
84CONFIG_PROC_KCORE=y 73CONFIG_PROC_KCORE=y
85CONFIG_TMPFS=y 74CONFIG_TMPFS=y
@@ -87,16 +76,12 @@ CONFIG_JFFS2_FS=m
87CONFIG_UBIFS_FS=m 76CONFIG_UBIFS_FS=m
88CONFIG_CRAMFS=y 77CONFIG_CRAMFS=y
89CONFIG_NFS_FS=y 78CONFIG_NFS_FS=y
90CONFIG_NFS_V3=y
91CONFIG_ROOT_NFS=y 79CONFIG_ROOT_NFS=y
92CONFIG_NLS_CODEPAGE_437=m 80CONFIG_NLS_CODEPAGE_437=m
93CONFIG_NLS_ISO8859_1=m 81CONFIG_NLS_ISO8859_1=m
94CONFIG_MAGIC_SYSRQ=y
95CONFIG_DEBUG_FS=y 82CONFIG_DEBUG_FS=y
96CONFIG_DEBUG_KERNEL=y 83CONFIG_MAGIC_SYSRQ=y
97CONFIG_DETECT_HUNG_TASK=y 84CONFIG_DETECT_HUNG_TASK=y
98# CONFIG_RCU_CPU_STALL_DETECTOR is not set
99CONFIG_SYSCTL_SYSCALL_CHECK=y
100CONFIG_CRYPTO_CBC=y 85CONFIG_CRYPTO_CBC=y
101CONFIG_CRYPTO_ECB=y 86CONFIG_CRYPTO_ECB=y
102CONFIG_CRYPTO_PCBC=y 87CONFIG_CRYPTO_PCBC=y
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 924e10df1844..bbc7f76d52c8 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,13 +1,10 @@
1CONFIG_44x=y 1CONFIG_44x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
@@ -28,7 +25,6 @@ CONFIG_YOSEMITE=y
28CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y 25CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
29CONFIG_PPC4xx_GPIO=y 26CONFIG_PPC4xx_GPIO=y
30CONFIG_MATH_EMULATION=y 27CONFIG_MATH_EMULATION=y
31CONFIG_SPARSE_IRQ=y
32CONFIG_NET=y 28CONFIG_NET=y
33CONFIG_PACKET=y 29CONFIG_PACKET=y
34CONFIG_UNIX=y 30CONFIG_UNIX=y
@@ -44,8 +40,6 @@ CONFIG_BRIDGE=m
44CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
45CONFIG_CONNECTOR=y 41CONFIG_CONNECTOR=y
46CONFIG_MTD=y 42CONFIG_MTD=y
47CONFIG_MTD_OF_PARTS=y
48CONFIG_MTD_CHAR=y
49CONFIG_MTD_BLOCK=y 43CONFIG_MTD_BLOCK=y
50CONFIG_MTD_CFI=y 44CONFIG_MTD_CFI=y
51CONFIG_MTD_JEDECPROBE=y 45CONFIG_MTD_JEDECPROBE=y
@@ -55,7 +49,6 @@ CONFIG_MTD_NAND=m
55CONFIG_MTD_NAND_NDFC=m 49CONFIG_MTD_NAND_NDFC=m
56CONFIG_MTD_UBI=m 50CONFIG_MTD_UBI=m
57CONFIG_MTD_UBI_GLUEBI=m 51CONFIG_MTD_UBI_GLUEBI=m
58CONFIG_PROC_DEVICETREE=y
59CONFIG_BLK_DEV_RAM=y 52CONFIG_BLK_DEV_RAM=y
60CONFIG_BLK_DEV_RAM_SIZE=35000 53CONFIG_BLK_DEV_RAM_SIZE=35000
61CONFIG_XILINX_SYSACE=m 54CONFIG_XILINX_SYSACE=m
@@ -64,8 +57,6 @@ CONFIG_BLK_DEV_SD=m
64# CONFIG_SCSI_LOWLEVEL is not set 57# CONFIG_SCSI_LOWLEVEL is not set
65CONFIG_NETDEVICES=y 58CONFIG_NETDEVICES=y
66CONFIG_TUN=m 59CONFIG_TUN=m
67CONFIG_ETHERNET=y
68CONFIG_NET_VENDOR_IBM=y
69CONFIG_IBM_EMAC=y 60CONFIG_IBM_EMAC=y
70# CONFIG_INPUT is not set 61# CONFIG_INPUT is not set
71CONFIG_SERIO=m 62CONFIG_SERIO=m
@@ -105,23 +96,18 @@ CONFIG_PROC_KCORE=y
105CONFIG_TMPFS=y 96CONFIG_TMPFS=y
106CONFIG_JFFS2_FS=y 97CONFIG_JFFS2_FS=y
107CONFIG_UBIFS_FS=m 98CONFIG_UBIFS_FS=m
108CONFIG_UBIFS_FS_XATTR=y
109CONFIG_LOGFS=m 99CONFIG_LOGFS=m
110CONFIG_CRAMFS=y 100CONFIG_CRAMFS=y
111CONFIG_SQUASHFS=m 101CONFIG_SQUASHFS=m
112CONFIG_SQUASHFS_XATTR=y 102CONFIG_SQUASHFS_XATTR=y
113CONFIG_SQUASHFS_LZO=y 103CONFIG_SQUASHFS_LZO=y
114CONFIG_NFS_FS=y 104CONFIG_NFS_FS=y
115CONFIG_NFS_V3=y
116CONFIG_ROOT_NFS=y 105CONFIG_ROOT_NFS=y
117CONFIG_NLS_CODEPAGE_437=m 106CONFIG_NLS_CODEPAGE_437=m
118CONFIG_NLS_ISO8859_1=m 107CONFIG_NLS_ISO8859_1=m
119CONFIG_CRC_T10DIF=m 108CONFIG_CRC_T10DIF=m
120CONFIG_MAGIC_SYSRQ=y 109CONFIG_MAGIC_SYSRQ=y
121CONFIG_DEBUG_KERNEL=y
122CONFIG_DETECT_HUNG_TASK=y 110CONFIG_DETECT_HUNG_TASK=y
123# CONFIG_RCU_CPU_STALL_DETECTOR is not set
124CONFIG_SYSCTL_SYSCALL_CHECK=y
125CONFIG_CRYPTO_ECB=y 111CONFIG_CRYPTO_ECB=y
126CONFIG_CRYPTO_PCBC=y 112CONFIG_CRYPTO_PCBC=y
127# CONFIG_CRYPTO_ANSI_CPRNG is not set 113# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 5830d735c5c3..7481e4ff87e4 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,6 +1,4 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_ALTIVEC=y
3CONFIG_VSX=y
4CONFIG_SMP=y 2CONFIG_SMP=y
5CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
6CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
@@ -42,9 +40,6 @@ CONFIG_PPC_CELLEB=y
42CONFIG_PPC_CELL_QPACE=y 40CONFIG_PPC_CELL_QPACE=y
43CONFIG_RTAS_FLASH=m 41CONFIG_RTAS_FLASH=m
44CONFIG_IBMEBUS=y 42CONFIG_IBMEBUS=y
45CONFIG_CPU_FREQ=y
46CONFIG_CPU_FREQ_GOV_POWERSAVE=y
47CONFIG_CPU_FREQ_GOV_USERSPACE=y
48CONFIG_CPU_FREQ_PMAC64=y 43CONFIG_CPU_FREQ_PMAC64=y
49CONFIG_HZ_100=y 44CONFIG_HZ_100=y
50CONFIG_BINFMT_MISC=m 45CONFIG_BINFMT_MISC=m
@@ -82,7 +77,6 @@ CONFIG_BPF_JIT=y
82CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 77CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
83CONFIG_DEVTMPFS=y 78CONFIG_DEVTMPFS=y
84CONFIG_DEVTMPFS_MOUNT=y 79CONFIG_DEVTMPFS_MOUNT=y
85CONFIG_PROC_DEVICETREE=y
86CONFIG_BLK_DEV_FD=y 80CONFIG_BLK_DEV_FD=y
87CONFIG_BLK_DEV_LOOP=y 81CONFIG_BLK_DEV_LOOP=y
88CONFIG_BLK_DEV_NBD=m 82CONFIG_BLK_DEV_NBD=m
@@ -101,7 +95,6 @@ CONFIG_CHR_DEV_ST=y
101CONFIG_BLK_DEV_SR=y 95CONFIG_BLK_DEV_SR=y
102CONFIG_BLK_DEV_SR_VENDOR=y 96CONFIG_BLK_DEV_SR_VENDOR=y
103CONFIG_CHR_DEV_SG=y 97CONFIG_CHR_DEV_SG=y
104CONFIG_SCSI_MULTI_LUN=y
105CONFIG_SCSI_CONSTANTS=y 98CONFIG_SCSI_CONSTANTS=y
106CONFIG_SCSI_FC_ATTRS=y 99CONFIG_SCSI_FC_ATTRS=y
107CONFIG_SCSI_CXGB3_ISCSI=m 100CONFIG_SCSI_CXGB3_ISCSI=m
@@ -145,7 +138,6 @@ CONFIG_DM_MULTIPATH_ST=m
145CONFIG_DM_UEVENT=y 138CONFIG_DM_UEVENT=y
146CONFIG_ADB_PMU=y 139CONFIG_ADB_PMU=y
147CONFIG_PMAC_SMU=y 140CONFIG_PMAC_SMU=y
148CONFIG_THERM_PM72=y
149CONFIG_WINDFARM=y 141CONFIG_WINDFARM=y
150CONFIG_WINDFARM_PM81=y 142CONFIG_WINDFARM_PM81=y
151CONFIG_WINDFARM_PM91=y 143CONFIG_WINDFARM_PM91=y
@@ -209,7 +201,6 @@ CONFIG_RAW_DRIVER=y
209CONFIG_I2C_CHARDEV=y 201CONFIG_I2C_CHARDEV=y
210CONFIG_I2C_AMD8111=y 202CONFIG_I2C_AMD8111=y
211CONFIG_I2C_PASEMI=y 203CONFIG_I2C_PASEMI=y
212CONFIG_VIDEO_OUTPUT_CONTROL=m
213CONFIG_FB=y 204CONFIG_FB=y
214CONFIG_FIRMWARE_EDID=y 205CONFIG_FIRMWARE_EDID=y
215CONFIG_FB_OF=y 206CONFIG_FB_OF=y
@@ -326,7 +317,6 @@ CONFIG_NLS_CODEPAGE_437=y
326CONFIG_NLS_ASCII=y 317CONFIG_NLS_ASCII=y
327CONFIG_NLS_ISO8859_1=y 318CONFIG_NLS_ISO8859_1=y
328CONFIG_NLS_UTF8=y 319CONFIG_NLS_UTF8=y
329CONFIG_CRC_T10DIF=y
330CONFIG_MAGIC_SYSRQ=y 320CONFIG_MAGIC_SYSRQ=y
331CONFIG_DEBUG_KERNEL=y 321CONFIG_DEBUG_KERNEL=y
332CONFIG_DEBUG_STACK_USAGE=y 322CONFIG_DEBUG_STACK_USAGE=y
@@ -362,4 +352,4 @@ CONFIG_CRYPTO_DEV_NX=y
362CONFIG_CRYPTO_DEV_NX_ENCRYPT=m 352CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
363CONFIG_VIRTUALIZATION=y 353CONFIG_VIRTUALIZATION=y
364CONFIG_KVM_BOOK3S_64=m 354CONFIG_KVM_BOOK3S_64=m
365CONFIG_KVM_BOOK3S_64_HV=y 355CONFIG_KVM_BOOK3S_64_HV=m
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig
index 67885b2d70aa..ddf9773458cf 100644
--- a/arch/powerpc/configs/ppc64e_defconfig
+++ b/arch/powerpc/configs/ppc64e_defconfig
@@ -22,7 +22,6 @@ CONFIG_MODVERSIONS=y
22CONFIG_MODULE_SRCVERSION_ALL=y 22CONFIG_MODULE_SRCVERSION_ALL=y
23CONFIG_PARTITION_ADVANCED=y 23CONFIG_PARTITION_ADVANCED=y
24CONFIG_MAC_PARTITION=y 24CONFIG_MAC_PARTITION=y
25CONFIG_EFI_PARTITION=y
26CONFIG_CORENET_GENERIC=y 25CONFIG_CORENET_GENERIC=y
27CONFIG_CPU_FREQ=y 26CONFIG_CPU_FREQ=y
28CONFIG_CPU_FREQ_GOV_POWERSAVE=y 27CONFIG_CPU_FREQ_GOV_POWERSAVE=y
@@ -55,7 +54,6 @@ CONFIG_BRIDGE=m
55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 54CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
56CONFIG_DEVTMPFS=y 55CONFIG_DEVTMPFS=y
57CONFIG_DEVTMPFS_MOUNT=y 56CONFIG_DEVTMPFS_MOUNT=y
58CONFIG_PROC_DEVICETREE=y
59CONFIG_BLK_DEV_FD=y 57CONFIG_BLK_DEV_FD=y
60CONFIG_BLK_DEV_LOOP=y 58CONFIG_BLK_DEV_LOOP=y
61CONFIG_BLK_DEV_NBD=m 59CONFIG_BLK_DEV_NBD=m
@@ -70,7 +68,6 @@ CONFIG_CHR_DEV_ST=y
70CONFIG_BLK_DEV_SR=y 68CONFIG_BLK_DEV_SR=y
71CONFIG_BLK_DEV_SR_VENDOR=y 69CONFIG_BLK_DEV_SR_VENDOR=y
72CONFIG_CHR_DEV_SG=y 70CONFIG_CHR_DEV_SG=y
73CONFIG_SCSI_MULTI_LUN=y
74CONFIG_SCSI_CONSTANTS=y 71CONFIG_SCSI_CONSTANTS=y
75CONFIG_SCSI_FC_ATTRS=y 72CONFIG_SCSI_FC_ATTRS=y
76CONFIG_SCSI_SRP_ATTRS=y 73CONFIG_SCSI_SRP_ATTRS=y
@@ -131,7 +128,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
131CONFIG_RAW_DRIVER=y 128CONFIG_RAW_DRIVER=y
132CONFIG_I2C_CHARDEV=y 129CONFIG_I2C_CHARDEV=y
133CONFIG_I2C_AMD8111=y 130CONFIG_I2C_AMD8111=y
134CONFIG_VIDEO_OUTPUT_CONTROL=m
135CONFIG_FB=y 131CONFIG_FB=y
136CONFIG_FIRMWARE_EDID=y 132CONFIG_FIRMWARE_EDID=y
137CONFIG_FB_OF=y 133CONFIG_FB_OF=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index ad6d6b5af7d7..e5d2c3dc07f1 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1,26 +1,22 @@
1CONFIG_FSL_EMB_PERFMON=y 1CONFIG_FSL_EMB_PERFMON=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
5CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_AUDIT=y
6CONFIG_NO_HZ=y
7CONFIG_HIGH_RES_TIMERS=y
6CONFIG_BSD_PROCESS_ACCT=y 8CONFIG_BSD_PROCESS_ACCT=y
7CONFIG_TASKSTATS=y 9CONFIG_TASKSTATS=y
8CONFIG_TASK_DELAY_ACCT=y 10CONFIG_TASK_DELAY_ACCT=y
9CONFIG_TASK_XACCT=y 11CONFIG_TASK_XACCT=y
10CONFIG_TASK_IO_ACCOUNTING=y 12CONFIG_TASK_IO_ACCOUNTING=y
11CONFIG_AUDIT=y
12CONFIG_CGROUPS=y 13CONFIG_CGROUPS=y
13CONFIG_CGROUP_DEVICE=y 14CONFIG_CGROUP_DEVICE=y
14CONFIG_CGROUP_CPUACCT=y 15CONFIG_CGROUP_CPUACCT=y
15CONFIG_RESOURCE_COUNTERS=y
16CONFIG_CGROUP_SCHED=y 16CONFIG_CGROUP_SCHED=y
17CONFIG_RT_GROUP_SCHED=y 17CONFIG_RT_GROUP_SCHED=y
18CONFIG_UTS_NS=y
19CONFIG_IPC_NS=y
20CONFIG_USER_NS=y 18CONFIG_USER_NS=y
21CONFIG_PID_NS=y
22CONFIG_BLK_DEV_INITRD=y 19CONFIG_BLK_DEV_INITRD=y
23CONFIG_KALLSYMS_EXTRA_PASS=y
24# CONFIG_COMPAT_BRK is not set 20# CONFIG_COMPAT_BRK is not set
25CONFIG_PROFILING=y 21CONFIG_PROFILING=y
26CONFIG_OPROFILE=m 22CONFIG_OPROFILE=m
@@ -29,10 +25,19 @@ CONFIG_MODULES=y
29CONFIG_MODULE_UNLOAD=y 25CONFIG_MODULE_UNLOAD=y
30CONFIG_MODULE_SRCVERSION_ALL=y 26CONFIG_MODULE_SRCVERSION_ALL=y
31CONFIG_BLK_DEV_INTEGRITY=y 27CONFIG_BLK_DEV_INTEGRITY=y
28CONFIG_PARTITION_ADVANCED=y
29CONFIG_OSF_PARTITION=y
30CONFIG_AMIGA_PARTITION=y
31CONFIG_BSD_DISKLABEL=y
32CONFIG_MINIX_SUBPARTITION=y
33CONFIG_SOLARIS_X86_PARTITION=y
34CONFIG_UNIXWARE_DISKLABEL=y
35CONFIG_SGI_PARTITION=y
36CONFIG_SUN_PARTITION=y
37CONFIG_KARMA_PARTITION=y
32CONFIG_PPC_MPC52xx=y 38CONFIG_PPC_MPC52xx=y
33CONFIG_PPC_EFIKA=y 39CONFIG_PPC_EFIKA=y
34CONFIG_PPC_MPC5200_BUGFIX=y 40CONFIG_PPC_MPC5200_BUGFIX=y
35CONFIG_PPC_MPC5200_GPIO=y
36CONFIG_PPC_82xx=y 41CONFIG_PPC_82xx=y
37CONFIG_MPC8272_ADS=y 42CONFIG_MPC8272_ADS=y
38CONFIG_PQ2FADS=y 43CONFIG_PQ2FADS=y
@@ -56,7 +61,6 @@ CONFIG_SBC8641D=y
56CONFIG_MPC8610_HPCD=y 61CONFIG_MPC8610_HPCD=y
57CONFIG_GEF_SBC610=y 62CONFIG_GEF_SBC610=y
58CONFIG_CPU_FREQ=y 63CONFIG_CPU_FREQ=y
59CONFIG_CPU_FREQ_DEBUG=y
60CONFIG_CPU_FREQ_STAT=m 64CONFIG_CPU_FREQ_STAT=m
61CONFIG_CPU_FREQ_STAT_DETAILS=y 65CONFIG_CPU_FREQ_STAT_DETAILS=y
62CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y 66CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
@@ -69,19 +73,13 @@ CONFIG_TAU=y
69CONFIG_TAU_AVERAGE=y 73CONFIG_TAU_AVERAGE=y
70CONFIG_QUICC_ENGINE=y 74CONFIG_QUICC_ENGINE=y
71CONFIG_QE_GPIO=y 75CONFIG_QE_GPIO=y
72CONFIG_PPC_BESTCOMM=y
73CONFIG_GPIO_MPC8XXX=y
74CONFIG_MCU_MPC8349EMITX=y 76CONFIG_MCU_MPC8349EMITX=y
75CONFIG_HIGHMEM=y 77CONFIG_HIGHMEM=y
76CONFIG_NO_HZ=y
77CONFIG_HIGH_RES_TIMERS=y
78CONFIG_HZ_1000=y 78CONFIG_HZ_1000=y
79CONFIG_PREEMPT_VOLUNTARY=y 79CONFIG_PREEMPT_VOLUNTARY=y
80CONFIG_BINFMT_MISC=y 80CONFIG_BINFMT_MISC=y
81# CONFIG_MIGRATION is not set
82CONFIG_PM=y
83CONFIG_PM_DEBUG=y
84CONFIG_HIBERNATION=y 81CONFIG_HIBERNATION=y
82CONFIG_PM_DEBUG=y
85CONFIG_ISA=y 83CONFIG_ISA=y
86CONFIG_PCIEPORTBUS=y 84CONFIG_PCIEPORTBUS=y
87CONFIG_PCI_MSI=y 85CONFIG_PCI_MSI=y
@@ -106,8 +104,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
106CONFIG_IP_ROUTE_MULTIPATH=y 104CONFIG_IP_ROUTE_MULTIPATH=y
107CONFIG_IP_ROUTE_VERBOSE=y 105CONFIG_IP_ROUTE_VERBOSE=y
108CONFIG_NET_IPIP=m 106CONFIG_NET_IPIP=m
109CONFIG_NET_IPGRE=m
110CONFIG_NET_IPGRE_BROADCAST=y
111CONFIG_IP_MROUTE=y 107CONFIG_IP_MROUTE=y
112CONFIG_IP_PIMSM_V1=y 108CONFIG_IP_PIMSM_V1=y
113CONFIG_IP_PIMSM_V2=y 109CONFIG_IP_PIMSM_V2=y
@@ -128,7 +124,6 @@ CONFIG_TCP_CONG_VENO=m
128CONFIG_TCP_CONG_YEAH=m 124CONFIG_TCP_CONG_YEAH=m
129CONFIG_TCP_CONG_ILLINOIS=m 125CONFIG_TCP_CONG_ILLINOIS=m
130CONFIG_TCP_MD5SIG=y 126CONFIG_TCP_MD5SIG=y
131CONFIG_IPV6_PRIVACY=y
132CONFIG_IPV6_ROUTER_PREF=y 127CONFIG_IPV6_ROUTER_PREF=y
133CONFIG_IPV6_ROUTE_INFO=y 128CONFIG_IPV6_ROUTE_INFO=y
134CONFIG_IPV6_OPTIMISTIC_DAD=y 129CONFIG_IPV6_OPTIMISTIC_DAD=y
@@ -144,7 +139,6 @@ CONFIG_IPV6_MROUTE=y
144CONFIG_IPV6_PIMSM_V2=y 139CONFIG_IPV6_PIMSM_V2=y
145CONFIG_NETLABEL=y 140CONFIG_NETLABEL=y
146CONFIG_NETFILTER=y 141CONFIG_NETFILTER=y
147CONFIG_NETFILTER_NETLINK_QUEUE=m
148CONFIG_NF_CONNTRACK=m 142CONFIG_NF_CONNTRACK=m
149CONFIG_NF_CONNTRACK_SECMARK=y 143CONFIG_NF_CONNTRACK_SECMARK=y
150CONFIG_NF_CONNTRACK_EVENTS=y 144CONFIG_NF_CONNTRACK_EVENTS=y
@@ -159,7 +153,6 @@ CONFIG_NF_CONNTRACK_SANE=m
159CONFIG_NF_CONNTRACK_SIP=m 153CONFIG_NF_CONNTRACK_SIP=m
160CONFIG_NF_CONNTRACK_TFTP=m 154CONFIG_NF_CONNTRACK_TFTP=m
161CONFIG_NF_CT_NETLINK=m 155CONFIG_NF_CT_NETLINK=m
162CONFIG_NETFILTER_TPROXY=m
163CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 156CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
164CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 157CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
165CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 158CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
@@ -204,21 +197,12 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m
204CONFIG_NETFILTER_XT_MATCH_U32=m 197CONFIG_NETFILTER_XT_MATCH_U32=m
205CONFIG_NF_CONNTRACK_IPV4=m 198CONFIG_NF_CONNTRACK_IPV4=m
206# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set 199# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
207CONFIG_IP_NF_QUEUE=m
208CONFIG_IP_NF_IPTABLES=m 200CONFIG_IP_NF_IPTABLES=m
209CONFIG_IP_NF_MATCH_ADDRTYPE=m
210CONFIG_IP_NF_MATCH_AH=m 201CONFIG_IP_NF_MATCH_AH=m
211CONFIG_IP_NF_MATCH_ECN=m 202CONFIG_IP_NF_MATCH_ECN=m
212CONFIG_IP_NF_MATCH_TTL=m 203CONFIG_IP_NF_MATCH_TTL=m
213CONFIG_IP_NF_FILTER=m 204CONFIG_IP_NF_FILTER=m
214CONFIG_IP_NF_TARGET_REJECT=m 205CONFIG_IP_NF_TARGET_REJECT=m
215CONFIG_IP_NF_TARGET_LOG=m
216CONFIG_IP_NF_TARGET_ULOG=m
217CONFIG_NF_NAT=m
218CONFIG_IP_NF_TARGET_MASQUERADE=m
219CONFIG_IP_NF_TARGET_NETMAP=m
220CONFIG_IP_NF_TARGET_REDIRECT=m
221CONFIG_NF_NAT_SNMP_BASIC=m
222CONFIG_IP_NF_MANGLE=m 206CONFIG_IP_NF_MANGLE=m
223CONFIG_IP_NF_TARGET_CLUSTERIP=m 207CONFIG_IP_NF_TARGET_CLUSTERIP=m
224CONFIG_IP_NF_TARGET_ECN=m 208CONFIG_IP_NF_TARGET_ECN=m
@@ -229,7 +213,6 @@ CONFIG_IP_NF_ARPTABLES=m
229CONFIG_IP_NF_ARPFILTER=m 213CONFIG_IP_NF_ARPFILTER=m
230CONFIG_IP_NF_ARP_MANGLE=m 214CONFIG_IP_NF_ARP_MANGLE=m
231CONFIG_NF_CONNTRACK_IPV6=m 215CONFIG_NF_CONNTRACK_IPV6=m
232CONFIG_IP6_NF_QUEUE=m
233CONFIG_IP6_NF_IPTABLES=m 216CONFIG_IP6_NF_IPTABLES=m
234CONFIG_IP6_NF_MATCH_AH=m 217CONFIG_IP6_NF_MATCH_AH=m
235CONFIG_IP6_NF_MATCH_EUI64=m 218CONFIG_IP6_NF_MATCH_EUI64=m
@@ -240,7 +223,6 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
240CONFIG_IP6_NF_MATCH_MH=m 223CONFIG_IP6_NF_MATCH_MH=m
241CONFIG_IP6_NF_MATCH_RT=m 224CONFIG_IP6_NF_MATCH_RT=m
242CONFIG_IP6_NF_TARGET_HL=m 225CONFIG_IP6_NF_TARGET_HL=m
243CONFIG_IP6_NF_TARGET_LOG=m
244CONFIG_IP6_NF_FILTER=m 226CONFIG_IP6_NF_FILTER=m
245CONFIG_IP6_NF_TARGET_REJECT=m 227CONFIG_IP6_NF_TARGET_REJECT=m
246CONFIG_IP6_NF_MANGLE=m 228CONFIG_IP6_NF_MANGLE=m
@@ -266,7 +248,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
266CONFIG_BRIDGE_EBT_REDIRECT=m 248CONFIG_BRIDGE_EBT_REDIRECT=m
267CONFIG_BRIDGE_EBT_SNAT=m 249CONFIG_BRIDGE_EBT_SNAT=m
268CONFIG_BRIDGE_EBT_LOG=m 250CONFIG_BRIDGE_EBT_LOG=m
269CONFIG_BRIDGE_EBT_ULOG=m
270CONFIG_BRIDGE_EBT_NFLOG=m 251CONFIG_BRIDGE_EBT_NFLOG=m
271CONFIG_IP_DCCP=m 252CONFIG_IP_DCCP=m
272CONFIG_NET_DCCPPROBE=m 253CONFIG_NET_DCCPPROBE=m
@@ -284,8 +265,6 @@ CONFIG_ATALK=m
284CONFIG_DEV_APPLETALK=m 265CONFIG_DEV_APPLETALK=m
285CONFIG_IPDDP=m 266CONFIG_IPDDP=m
286CONFIG_IPDDP_ENCAP=y 267CONFIG_IPDDP_ENCAP=y
287CONFIG_IPDDP_DECAP=y
288CONFIG_WAN_ROUTER=m
289CONFIG_NET_SCHED=y 268CONFIG_NET_SCHED=y
290CONFIG_NET_SCH_CBQ=m 269CONFIG_NET_SCH_CBQ=m
291CONFIG_NET_SCH_HTB=m 270CONFIG_NET_SCH_HTB=m
@@ -349,8 +328,6 @@ CONFIG_VLSI_FIR=m
349CONFIG_VIA_FIR=m 328CONFIG_VIA_FIR=m
350CONFIG_MCS_FIR=m 329CONFIG_MCS_FIR=m
351CONFIG_BT=m 330CONFIG_BT=m
352CONFIG_BT_L2CAP=y
353CONFIG_BT_SCO=y
354CONFIG_BT_RFCOMM=m 331CONFIG_BT_RFCOMM=m
355CONFIG_BT_RFCOMM_TTY=y 332CONFIG_BT_RFCOMM_TTY=y
356CONFIG_BT_BNEP=m 333CONFIG_BT_BNEP=m
@@ -380,7 +357,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
380# CONFIG_FIRMWARE_IN_KERNEL is not set 357# CONFIG_FIRMWARE_IN_KERNEL is not set
381CONFIG_DEBUG_DEVRES=y 358CONFIG_DEBUG_DEVRES=y
382CONFIG_CONNECTOR=y 359CONFIG_CONNECTOR=y
383CONFIG_PROC_DEVICETREE=y
384CONFIG_PARPORT=m 360CONFIG_PARPORT=m
385CONFIG_PARPORT_PC=m 361CONFIG_PARPORT_PC=m
386CONFIG_PARPORT_SERIAL=m 362CONFIG_PARPORT_SERIAL=m
@@ -396,7 +372,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
396CONFIG_CDROM_PKTCDVD=m 372CONFIG_CDROM_PKTCDVD=m
397CONFIG_VIRTIO_BLK=m 373CONFIG_VIRTIO_BLK=m
398CONFIG_BLK_DEV_HD=y 374CONFIG_BLK_DEV_HD=y
399CONFIG_MISC_DEVICES=y
400CONFIG_ENCLOSURE_SERVICES=m 375CONFIG_ENCLOSURE_SERVICES=m
401CONFIG_SENSORS_TSL2550=m 376CONFIG_SENSORS_TSL2550=m
402CONFIG_EEPROM_AT24=m 377CONFIG_EEPROM_AT24=m
@@ -419,7 +394,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
419CONFIG_CHR_DEV_SG=y 394CONFIG_CHR_DEV_SG=y
420CONFIG_CHR_DEV_SCH=m 395CONFIG_CHR_DEV_SCH=m
421CONFIG_SCSI_ENCLOSURE=m 396CONFIG_SCSI_ENCLOSURE=m
422CONFIG_SCSI_MULTI_LUN=y
423CONFIG_SCSI_CONSTANTS=y 397CONFIG_SCSI_CONSTANTS=y
424CONFIG_SCSI_LOGGING=y 398CONFIG_SCSI_LOGGING=y
425CONFIG_SCSI_SCAN_ASYNC=y 399CONFIG_SCSI_SCAN_ASYNC=y
@@ -436,8 +410,8 @@ CONFIG_ATA=y
436# CONFIG_SATA_PMP is not set 410# CONFIG_SATA_PMP is not set
437CONFIG_SATA_FSL=m 411CONFIG_SATA_FSL=m
438CONFIG_PDC_ADMA=m 412CONFIG_PDC_ADMA=m
439CONFIG_PATA_MPC52xx=m
440CONFIG_ATA_PIIX=m 413CONFIG_ATA_PIIX=m
414CONFIG_PATA_MPC52xx=m
441CONFIG_PATA_OPTIDMA=m 415CONFIG_PATA_OPTIDMA=m
442CONFIG_PATA_SCH=m 416CONFIG_PATA_SCH=m
443CONFIG_PATA_VIA=m 417CONFIG_PATA_VIA=m
@@ -479,37 +453,44 @@ CONFIG_THERM_WINDTUNNEL=m
479CONFIG_THERM_ADT746X=m 453CONFIG_THERM_ADT746X=m
480CONFIG_WINDFARM=y 454CONFIG_WINDFARM=y
481CONFIG_PMAC_RACKMETER=m 455CONFIG_PMAC_RACKMETER=m
456CONFIG_SENSORS_AMS=m
482CONFIG_NETDEVICES=y 457CONFIG_NETDEVICES=y
483CONFIG_IFB=m
484CONFIG_DUMMY=m
485CONFIG_BONDING=m 458CONFIG_BONDING=m
486CONFIG_MACVLAN=m 459CONFIG_DUMMY=m
487CONFIG_EQUALIZER=m 460CONFIG_EQUALIZER=m
461CONFIG_NET_FC=y
462CONFIG_IFB=m
463CONFIG_MACVLAN=m
464CONFIG_NETCONSOLE=m
488CONFIG_TUN=m 465CONFIG_TUN=m
489CONFIG_VETH=m 466CONFIG_VETH=m
490CONFIG_NET_SB1000=m 467CONFIG_VIRTIO_NET=m
491CONFIG_MARVELL_PHY=m 468CONFIG_ATM_TCP=m
492CONFIG_DAVICOM_PHY=m 469CONFIG_ATM_LANAI=m
493CONFIG_QSEMI_PHY=m 470CONFIG_ATM_ENI=m
494CONFIG_LXT_PHY=m 471CONFIG_ATM_NICSTAR=m
495CONFIG_CICADA_PHY=m 472CONFIG_ATM_IDT77252=m
496CONFIG_VITESSE_PHY=m 473CONFIG_ATM_HE=m
497CONFIG_SMSC_PHY=m
498CONFIG_BROADCOM_PHY=m
499CONFIG_ICPLUS_PHY=m
500CONFIG_REALTEK_PHY=m
501CONFIG_NET_ETHERNET=y
502CONFIG_MACE=m
503CONFIG_BMAC=m
504CONFIG_HAPPYMEAL=m
505CONFIG_SUNGEM=m
506CONFIG_CASSINI=m
507CONFIG_NET_VENDOR_3COM=y
508CONFIG_EL3=m 474CONFIG_EL3=m
475CONFIG_PCMCIA_3C574=m
476CONFIG_PCMCIA_3C589=m
509CONFIG_VORTEX=m 477CONFIG_VORTEX=m
510CONFIG_TYPHOON=m 478CONFIG_TYPHOON=m
511CONFIG_NET_VENDOR_SMC=y 479CONFIG_ADAPTEC_STARFIRE=m
512CONFIG_ULTRA=m 480CONFIG_ACENIC=m
481CONFIG_AMD8111_ETH=m
482CONFIG_PCNET32=m
483CONFIG_PCMCIA_NMCLAN=m
484CONFIG_MACE=m
485CONFIG_BMAC=m
486CONFIG_ATL1=m
487CONFIG_B44=m
488CONFIG_BNX2=m
489CONFIG_TIGON3=m
490CONFIG_BNX2X=m
491CONFIG_CHELSIO_T1=m
492CONFIG_CHELSIO_T1_1G=y
493CONFIG_CHELSIO_T3=m
513CONFIG_NET_TULIP=y 494CONFIG_NET_TULIP=y
514CONFIG_DE2104X=m 495CONFIG_DE2104X=m
515CONFIG_TULIP=m 496CONFIG_TULIP=m
@@ -519,69 +500,84 @@ CONFIG_WINBOND_840=m
519CONFIG_DM9102=m 500CONFIG_DM9102=m
520CONFIG_ULI526X=m 501CONFIG_ULI526X=m
521CONFIG_PCMCIA_XIRCOM=m 502CONFIG_PCMCIA_XIRCOM=m
522CONFIG_NET_ISA=y 503CONFIG_DL2K=m
523CONFIG_EWRK3=m 504CONFIG_SUNDANCE=m
524CONFIG_NE2000=m 505CONFIG_S2IO=m
525CONFIG_NET_PCI=y 506CONFIG_FEC_MPC52xx=m
526CONFIG_PCNET32=m 507CONFIG_GIANFAR=m
527CONFIG_AMD8111_ETH=m 508CONFIG_PCMCIA_FMVJ18X=m
528CONFIG_ADAPTEC_STARFIRE=m
529CONFIG_B44=m
530CONFIG_FORCEDETH=m
531CONFIG_E100=m 509CONFIG_E100=m
510CONFIG_E1000=m
511CONFIG_E1000E=m
512CONFIG_IGB=m
513CONFIG_IXGB=m
514CONFIG_IXGBE=m
515CONFIG_IP1000=m
516CONFIG_MV643XX_ETH=m
517CONFIG_SKGE=m
518CONFIG_SKY2=m
519CONFIG_MYRI10GE=m
532CONFIG_FEALNX=m 520CONFIG_FEALNX=m
533CONFIG_NATSEMI=m 521CONFIG_NATSEMI=m
522CONFIG_NS83820=m
523CONFIG_PCMCIA_AXNET=m
524CONFIG_NE2000=m
534CONFIG_NE2K_PCI=m 525CONFIG_NE2K_PCI=m
526CONFIG_PCMCIA_PCNET=m
527CONFIG_ULTRA=m
528CONFIG_FORCEDETH=m
529CONFIG_HAMACHI=m
530CONFIG_YELLOWFIN=m
531CONFIG_QLA3XXX=m
532CONFIG_QLGE=m
533CONFIG_NETXEN_NIC=m
535CONFIG_8139CP=m 534CONFIG_8139CP=m
536CONFIG_8139TOO=m 535CONFIG_8139TOO=m
537# CONFIG_8139TOO_PIO is not set 536# CONFIG_8139TOO_PIO is not set
538CONFIG_8139TOO_8129=y 537CONFIG_8139TOO_8129=y
538CONFIG_R8169=m
539CONFIG_R6040=m 539CONFIG_R6040=m
540CONFIG_SC92031=m
540CONFIG_SIS900=m 541CONFIG_SIS900=m
542CONFIG_SIS190=m
543CONFIG_SFC=m
544CONFIG_PCMCIA_SMC91C92=m
541CONFIG_EPIC100=m 545CONFIG_EPIC100=m
542CONFIG_SUNDANCE=m 546CONFIG_HAPPYMEAL=m
547CONFIG_SUNGEM=m
548CONFIG_CASSINI=m
549CONFIG_NIU=m
550CONFIG_TEHUTI=m
543CONFIG_TLAN=m 551CONFIG_TLAN=m
544CONFIG_VIA_RHINE=m 552CONFIG_VIA_RHINE=m
545CONFIG_VIA_RHINE_MMIO=y 553CONFIG_VIA_RHINE_MMIO=y
546CONFIG_SC92031=m
547CONFIG_NET_POCKET=y
548CONFIG_DE600=m
549CONFIG_DE620=m
550CONFIG_FEC_MPC52xx=m
551CONFIG_ACENIC=m
552CONFIG_DL2K=m
553CONFIG_E1000=m
554CONFIG_E1000E=m
555CONFIG_IP1000=m
556CONFIG_IGB=m
557CONFIG_NS83820=m
558CONFIG_HAMACHI=m
559CONFIG_YELLOWFIN=m
560CONFIG_R8169=m
561CONFIG_R8169_VLAN=y
562CONFIG_SIS190=m
563CONFIG_SKGE=m
564CONFIG_SKY2=m
565CONFIG_VIA_VELOCITY=m 554CONFIG_VIA_VELOCITY=m
566CONFIG_TIGON3=m 555CONFIG_PCMCIA_XIRC2PS=m
567CONFIG_BNX2=m 556CONFIG_FDDI=y
568CONFIG_GIANFAR=m 557CONFIG_SKFP=m
569CONFIG_MV643XX_ETH=m 558CONFIG_NET_SB1000=m
570CONFIG_QLA3XXX=m 559CONFIG_MARVELL_PHY=m
571CONFIG_ATL1=m 560CONFIG_DAVICOM_PHY=m
572CONFIG_CHELSIO_T1=m 561CONFIG_QSEMI_PHY=m
573CONFIG_CHELSIO_T1_1G=y 562CONFIG_LXT_PHY=m
574CONFIG_CHELSIO_T3=m 563CONFIG_CICADA_PHY=m
575CONFIG_IXGBE=m 564CONFIG_VITESSE_PHY=m
576CONFIG_IXGB=m 565CONFIG_SMSC_PHY=m
577CONFIG_S2IO=m 566CONFIG_BROADCOM_PHY=m
578CONFIG_MYRI10GE=m 567CONFIG_ICPLUS_PHY=m
579CONFIG_NETXEN_NIC=m 568CONFIG_REALTEK_PHY=m
580CONFIG_NIU=m 569CONFIG_PLIP=m
581CONFIG_TEHUTI=m 570CONFIG_PPP_DEFLATE=m
582CONFIG_BNX2X=m 571CONFIG_PPP_FILTER=y
583CONFIG_QLGE=m 572CONFIG_PPP_MPPE=m
584CONFIG_SFC=m 573CONFIG_PPP_MULTILINK=y
574CONFIG_PPPOATM=m
575CONFIG_PPPOE=m
576CONFIG_PPP_ASYNC=m
577CONFIG_PPP_SYNC_TTY=m
578CONFIG_SLIP=m
579CONFIG_SLIP_COMPRESSED=y
580CONFIG_SLIP_SMART=y
585CONFIG_USB_CATC=m 581CONFIG_USB_CATC=m
586CONFIG_USB_KAWETH=m 582CONFIG_USB_KAWETH=m
587CONFIG_USB_PEGASUS=m 583CONFIG_USB_PEGASUS=m
@@ -597,39 +593,6 @@ CONFIG_USB_ALI_M5632=y
597CONFIG_USB_AN2720=y 593CONFIG_USB_AN2720=y
598CONFIG_USB_EPSON2888=y 594CONFIG_USB_EPSON2888=y
599CONFIG_USB_KC2190=y 595CONFIG_USB_KC2190=y
600CONFIG_NET_PCMCIA=y
601CONFIG_PCMCIA_3C589=m
602CONFIG_PCMCIA_3C574=m
603CONFIG_PCMCIA_FMVJ18X=m
604CONFIG_PCMCIA_PCNET=m
605CONFIG_PCMCIA_NMCLAN=m
606CONFIG_PCMCIA_SMC91C92=m
607CONFIG_PCMCIA_XIRC2PS=m
608CONFIG_PCMCIA_AXNET=m
609CONFIG_ATM_TCP=m
610CONFIG_ATM_LANAI=m
611CONFIG_ATM_ENI=m
612CONFIG_ATM_NICSTAR=m
613CONFIG_ATM_IDT77252=m
614CONFIG_ATM_HE=m
615CONFIG_FDDI=y
616CONFIG_SKFP=m
617CONFIG_PLIP=m
618CONFIG_PPP_MULTILINK=y
619CONFIG_PPP_FILTER=y
620CONFIG_PPP_ASYNC=m
621CONFIG_PPP_SYNC_TTY=m
622CONFIG_PPP_DEFLATE=m
623CONFIG_PPP_MPPE=m
624CONFIG_PPPOE=m
625CONFIG_PPPOATM=m
626CONFIG_SLIP=m
627CONFIG_SLIP_COMPRESSED=y
628CONFIG_SLIP_SMART=y
629CONFIG_NET_FC=y
630CONFIG_NETCONSOLE=m
631CONFIG_NETCONSOLE_DYNAMIC=y
632CONFIG_VIRTIO_NET=m
633# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 596# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
634CONFIG_INPUT_JOYDEV=m 597CONFIG_INPUT_JOYDEV=m
635CONFIG_INPUT_EVDEV=y 598CONFIG_INPUT_EVDEV=y
@@ -670,10 +633,8 @@ CONFIG_TABLET_USB_ACECAD=m
670CONFIG_TABLET_USB_AIPTEK=m 633CONFIG_TABLET_USB_AIPTEK=m
671CONFIG_TABLET_USB_GTCO=m 634CONFIG_TABLET_USB_GTCO=m
672CONFIG_TABLET_USB_KBTAB=m 635CONFIG_TABLET_USB_KBTAB=m
673CONFIG_TABLET_USB_WACOM=m
674CONFIG_INPUT_MISC=y 636CONFIG_INPUT_MISC=y
675CONFIG_INPUT_PCSPKR=m 637CONFIG_INPUT_PCSPKR=m
676CONFIG_INPUT_ATI_REMOTE=m
677CONFIG_INPUT_ATI_REMOTE2=m 638CONFIG_INPUT_ATI_REMOTE2=m
678CONFIG_INPUT_KEYSPAN_REMOTE=m 639CONFIG_INPUT_KEYSPAN_REMOTE=m
679CONFIG_INPUT_POWERMATE=m 640CONFIG_INPUT_POWERMATE=m
@@ -685,16 +646,16 @@ CONFIG_GAMEPORT_NS558=m
685CONFIG_GAMEPORT_L4=m 646CONFIG_GAMEPORT_L4=m
686CONFIG_GAMEPORT_EMU10K1=m 647CONFIG_GAMEPORT_EMU10K1=m
687CONFIG_GAMEPORT_FM801=m 648CONFIG_GAMEPORT_FM801=m
688CONFIG_VT_HW_CONSOLE_BINDING=y 649# CONFIG_LEGACY_PTYS is not set
689# CONFIG_DEVKMEM is not set
690CONFIG_SERIAL_NONSTANDARD=y 650CONFIG_SERIAL_NONSTANDARD=y
691CONFIG_ROCKETPORT=m 651CONFIG_ROCKETPORT=m
692CONFIG_CYCLADES=m 652CONFIG_CYCLADES=m
693CONFIG_SYNCLINK=m 653CONFIG_SYNCLINK=m
694CONFIG_SYNCLINKMP=m 654CONFIG_SYNCLINKMP=m
695CONFIG_SYNCLINK_GT=m 655CONFIG_SYNCLINK_GT=m
696CONFIG_N_HDLC=m
697CONFIG_NOZOMI=m 656CONFIG_NOZOMI=m
657CONFIG_N_HDLC=m
658# CONFIG_DEVKMEM is not set
698CONFIG_SERIAL_8250=y 659CONFIG_SERIAL_8250=y
699CONFIG_SERIAL_8250_CONSOLE=y 660CONFIG_SERIAL_8250_CONSOLE=y
700CONFIG_SERIAL_8250_CS=m 661CONFIG_SERIAL_8250_CS=m
@@ -711,8 +672,6 @@ CONFIG_SERIAL_MPC52xx_CONSOLE=y
711CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 672CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
712CONFIG_SERIAL_JSM=m 673CONFIG_SERIAL_JSM=m
713CONFIG_SERIAL_OF_PLATFORM=y 674CONFIG_SERIAL_OF_PLATFORM=y
714# CONFIG_LEGACY_PTYS is not set
715CONFIG_BRIQ_PANEL=m
716CONFIG_PRINTER=m 675CONFIG_PRINTER=m
717CONFIG_LP_CONSOLE=y 676CONFIG_LP_CONSOLE=y
718CONFIG_PPDEV=m 677CONFIG_PPDEV=m
@@ -735,6 +694,7 @@ CONFIG_I2C_TINY_USB=m
735CONFIG_I2C_PCA_ISA=m 694CONFIG_I2C_PCA_ISA=m
736CONFIG_I2C_STUB=m 695CONFIG_I2C_STUB=m
737CONFIG_GPIO_SYSFS=y 696CONFIG_GPIO_SYSFS=y
697CONFIG_GPIO_MPC8XXX=y
738CONFIG_W1=m 698CONFIG_W1=m
739CONFIG_W1_MASTER_DS2490=m 699CONFIG_W1_MASTER_DS2490=m
740CONFIG_W1_MASTER_DS2482=m 700CONFIG_W1_MASTER_DS2482=m
@@ -754,15 +714,13 @@ CONFIG_SENSORS_ADM1029=m
754CONFIG_SENSORS_ADM1031=m 714CONFIG_SENSORS_ADM1031=m
755CONFIG_SENSORS_ADM9240=m 715CONFIG_SENSORS_ADM9240=m
756CONFIG_SENSORS_ADT7470=m 716CONFIG_SENSORS_ADT7470=m
757CONFIG_SENSORS_AMS=m
758CONFIG_SENSORS_ATXP1=m 717CONFIG_SENSORS_ATXP1=m
759CONFIG_SENSORS_DS1621=m 718CONFIG_SENSORS_DS1621=m
760CONFIG_SENSORS_F71805F=m
761CONFIG_SENSORS_F71882FG=m
762CONFIG_SENSORS_F75375S=m 719CONFIG_SENSORS_F75375S=m
763CONFIG_SENSORS_GL518SM=m 720CONFIG_SENSORS_GL518SM=m
764CONFIG_SENSORS_GL520SM=m 721CONFIG_SENSORS_GL520SM=m
765CONFIG_SENSORS_IT87=m 722CONFIG_SENSORS_MAX1619=m
723CONFIG_SENSORS_MAX6650=m
766CONFIG_SENSORS_LM63=m 724CONFIG_SENSORS_LM63=m
767CONFIG_SENSORS_LM75=m 725CONFIG_SENSORS_LM75=m
768CONFIG_SENSORS_LM77=m 726CONFIG_SENSORS_LM77=m
@@ -774,20 +732,12 @@ CONFIG_SENSORS_LM87=m
774CONFIG_SENSORS_LM90=m 732CONFIG_SENSORS_LM90=m
775CONFIG_SENSORS_LM92=m 733CONFIG_SENSORS_LM92=m
776CONFIG_SENSORS_LM93=m 734CONFIG_SENSORS_LM93=m
777CONFIG_SENSORS_MAX1619=m
778CONFIG_SENSORS_MAX6650=m
779CONFIG_SENSORS_PC87360=m
780CONFIG_SENSORS_PC87427=m
781CONFIG_SENSORS_PCF8591=m 735CONFIG_SENSORS_PCF8591=m
782CONFIG_SENSORS_SIS5595=m 736CONFIG_SENSORS_SIS5595=m
783CONFIG_SENSORS_DME1737=m
784CONFIG_SENSORS_SMSC47M1=m
785CONFIG_SENSORS_SMSC47M192=m 737CONFIG_SENSORS_SMSC47M192=m
786CONFIG_SENSORS_SMSC47B397=m
787CONFIG_SENSORS_ADS7828=m 738CONFIG_SENSORS_ADS7828=m
788CONFIG_SENSORS_THMC50=m 739CONFIG_SENSORS_THMC50=m
789CONFIG_SENSORS_VIA686A=m 740CONFIG_SENSORS_VIA686A=m
790CONFIG_SENSORS_VT1211=m
791CONFIG_SENSORS_VT8231=m 741CONFIG_SENSORS_VT8231=m
792CONFIG_SENSORS_W83781D=m 742CONFIG_SENSORS_W83781D=m
793CONFIG_SENSORS_W83791D=m 743CONFIG_SENSORS_W83791D=m
@@ -795,8 +745,6 @@ CONFIG_SENSORS_W83792D=m
795CONFIG_SENSORS_W83793=m 745CONFIG_SENSORS_W83793=m
796CONFIG_SENSORS_W83L785TS=m 746CONFIG_SENSORS_W83L785TS=m
797CONFIG_SENSORS_W83L786NG=m 747CONFIG_SENSORS_W83L786NG=m
798CONFIG_SENSORS_W83627HF=m
799CONFIG_SENSORS_W83627EHF=m
800CONFIG_THERMAL=y 748CONFIG_THERMAL=y
801CONFIG_WATCHDOG=y 749CONFIG_WATCHDOG=y
802CONFIG_SOFT_WATCHDOG=m 750CONFIG_SOFT_WATCHDOG=m
@@ -815,7 +763,6 @@ CONFIG_DRM_MGA=m
815CONFIG_DRM_SIS=m 763CONFIG_DRM_SIS=m
816CONFIG_DRM_VIA=m 764CONFIG_DRM_VIA=m
817CONFIG_DRM_SAVAGE=m 765CONFIG_DRM_SAVAGE=m
818CONFIG_VIDEO_OUTPUT_CONTROL=m
819CONFIG_FB=y 766CONFIG_FB=y
820CONFIG_FB_CIRRUS=m 767CONFIG_FB_CIRRUS=m
821CONFIG_FB_OF=y 768CONFIG_FB_OF=y
@@ -850,10 +797,8 @@ CONFIG_FB_TRIDENT=m
850CONFIG_FB_SM501=m 797CONFIG_FB_SM501=m
851CONFIG_FB_IBM_GXT4500=y 798CONFIG_FB_IBM_GXT4500=y
852CONFIG_LCD_PLATFORM=m 799CONFIG_LCD_PLATFORM=m
853CONFIG_DISPLAY_SUPPORT=m
854CONFIG_VGACON_SOFT_SCROLLBACK=y 800CONFIG_VGACON_SOFT_SCROLLBACK=y
855CONFIG_FRAMEBUFFER_CONSOLE=y 801CONFIG_FRAMEBUFFER_CONSOLE=y
856CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
857CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y 802CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
858CONFIG_LOGO=y 803CONFIG_LOGO=y
859# CONFIG_LOGO_LINUX_MONO is not set 804# CONFIG_LOGO_LINUX_MONO is not set
@@ -897,7 +842,6 @@ CONFIG_SND_CMIPCI=m
897CONFIG_SND_OXYGEN=m 842CONFIG_SND_OXYGEN=m
898CONFIG_SND_CS4281=m 843CONFIG_SND_CS4281=m
899CONFIG_SND_CS46XX=m 844CONFIG_SND_CS46XX=m
900CONFIG_SND_CS5530=m
901CONFIG_SND_DARLA20=m 845CONFIG_SND_DARLA20=m
902CONFIG_SND_GINA20=m 846CONFIG_SND_GINA20=m
903CONFIG_SND_LAYLA20=m 847CONFIG_SND_LAYLA20=m
@@ -919,7 +863,6 @@ CONFIG_SND_ES1968=m
919CONFIG_SND_FM801=m 863CONFIG_SND_FM801=m
920CONFIG_SND_HDSP=m 864CONFIG_SND_HDSP=m
921CONFIG_SND_HDSPM=m 865CONFIG_SND_HDSPM=m
922CONFIG_SND_HIFIER=m
923CONFIG_SND_ICE1712=m 866CONFIG_SND_ICE1712=m
924CONFIG_SND_ICE1724=m 867CONFIG_SND_ICE1724=m
925CONFIG_SND_KORG1212=m 868CONFIG_SND_KORG1212=m
@@ -949,8 +892,6 @@ CONFIG_SND_USB_CAIAQ=m
949CONFIG_SND_USB_CAIAQ_INPUT=y 892CONFIG_SND_USB_CAIAQ_INPUT=y
950# CONFIG_SND_PCMCIA is not set 893# CONFIG_SND_PCMCIA is not set
951CONFIG_HIDRAW=y 894CONFIG_HIDRAW=y
952CONFIG_HID_PID=y
953CONFIG_USB_HIDDEV=y
954CONFIG_HID_GYRATION=y 895CONFIG_HID_GYRATION=y
955CONFIG_LOGITECH_FF=y 896CONFIG_LOGITECH_FF=y
956CONFIG_LOGIRUMBLEPAD2_FF=y 897CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -960,12 +901,12 @@ CONFIG_HID_PETALYNX=y
960CONFIG_HID_SAMSUNG=y 901CONFIG_HID_SAMSUNG=y
961CONFIG_HID_SONY=y 902CONFIG_HID_SONY=y
962CONFIG_HID_SUNPLUS=y 903CONFIG_HID_SUNPLUS=y
904CONFIG_HID_PID=y
905CONFIG_USB_HIDDEV=y
963CONFIG_USB=y 906CONFIG_USB=y
964CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 907CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
965# CONFIG_USB_DEVICE_CLASS is not set
966CONFIG_USB_MON=y 908CONFIG_USB_MON=y
967CONFIG_USB_EHCI_HCD=m 909CONFIG_USB_EHCI_HCD=m
968CONFIG_USB_EHCI_TT_NEWSCHED=y
969CONFIG_USB_EHCI_FSL=y 910CONFIG_USB_EHCI_FSL=y
970CONFIG_USB_OHCI_HCD=m 911CONFIG_USB_OHCI_HCD=m
971CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 912CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -1001,7 +942,6 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1001CONFIG_USB_SERIAL_CYPRESS_M8=m 942CONFIG_USB_SERIAL_CYPRESS_M8=m
1002CONFIG_USB_SERIAL_EMPEG=m 943CONFIG_USB_SERIAL_EMPEG=m
1003CONFIG_USB_SERIAL_FTDI_SIO=m 944CONFIG_USB_SERIAL_FTDI_SIO=m
1004CONFIG_USB_SERIAL_FUNSOFT=m
1005CONFIG_USB_SERIAL_VISOR=m 945CONFIG_USB_SERIAL_VISOR=m
1006CONFIG_USB_SERIAL_IPAQ=m 946CONFIG_USB_SERIAL_IPAQ=m
1007CONFIG_USB_SERIAL_IR=m 947CONFIG_USB_SERIAL_IR=m
@@ -1016,12 +956,10 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
1016CONFIG_USB_SERIAL_MCT_U232=m 956CONFIG_USB_SERIAL_MCT_U232=m
1017CONFIG_USB_SERIAL_MOS7720=m 957CONFIG_USB_SERIAL_MOS7720=m
1018CONFIG_USB_SERIAL_MOS7840=m 958CONFIG_USB_SERIAL_MOS7840=m
1019CONFIG_USB_SERIAL_MOTOROLA=m
1020CONFIG_USB_SERIAL_NAVMAN=m 959CONFIG_USB_SERIAL_NAVMAN=m
1021CONFIG_USB_SERIAL_PL2303=m 960CONFIG_USB_SERIAL_PL2303=m
1022CONFIG_USB_SERIAL_OTI6858=m 961CONFIG_USB_SERIAL_OTI6858=m
1023CONFIG_USB_SERIAL_SPCP8X5=m 962CONFIG_USB_SERIAL_SPCP8X5=m
1024CONFIG_USB_SERIAL_HP4X=m
1025CONFIG_USB_SERIAL_SAFE=m 963CONFIG_USB_SERIAL_SAFE=m
1026CONFIG_USB_SERIAL_SAFE_PADDED=y 964CONFIG_USB_SERIAL_SAFE_PADDED=y
1027CONFIG_USB_SERIAL_SIERRAWIRELESS=m 965CONFIG_USB_SERIAL_SIERRAWIRELESS=m
@@ -1083,12 +1021,14 @@ CONFIG_RTC_DRV_M48T35=m
1083CONFIG_RTC_DRV_M48T59=m 1021CONFIG_RTC_DRV_M48T59=m
1084CONFIG_RTC_DRV_V3020=m 1022CONFIG_RTC_DRV_V3020=m
1085CONFIG_DMADEVICES=y 1023CONFIG_DMADEVICES=y
1024CONFIG_PPC_BESTCOMM=y
1086CONFIG_AUXDISPLAY=y 1025CONFIG_AUXDISPLAY=y
1087CONFIG_KS0108=m 1026CONFIG_KS0108=m
1088CONFIG_UIO=m 1027CONFIG_UIO=m
1089CONFIG_UIO_CIF=m 1028CONFIG_UIO_CIF=m
1090CONFIG_UIO_PDRV=m
1091CONFIG_UIO_PDRV_GENIRQ=m 1029CONFIG_UIO_PDRV_GENIRQ=m
1030CONFIG_VIRTIO_PCI=m
1031CONFIG_VIRTIO_BALLOON=m
1092CONFIG_EXT2_FS=m 1032CONFIG_EXT2_FS=m
1093CONFIG_EXT2_FS_XATTR=y 1033CONFIG_EXT2_FS_XATTR=y
1094CONFIG_EXT2_FS_POSIX_ACL=y 1034CONFIG_EXT2_FS_POSIX_ACL=y
@@ -1111,12 +1051,7 @@ CONFIG_XFS_FS=m
1111CONFIG_XFS_QUOTA=y 1051CONFIG_XFS_QUOTA=y
1112CONFIG_XFS_POSIX_ACL=y 1052CONFIG_XFS_POSIX_ACL=y
1113CONFIG_GFS2_FS=m 1053CONFIG_GFS2_FS=m
1114CONFIG_OCFS2_FS=m
1115# CONFIG_OCFS2_DEBUG_MASKLOG is not set
1116CONFIG_QUOTA_NETLINK_INTERFACE=y 1054CONFIG_QUOTA_NETLINK_INTERFACE=y
1117# CONFIG_PRINT_QUOTA_WARNING is not set
1118CONFIG_QFMT_V2=y
1119CONFIG_AUTOFS_FS=m
1120CONFIG_AUTOFS4_FS=m 1055CONFIG_AUTOFS4_FS=m
1121CONFIG_FUSE_FS=m 1056CONFIG_FUSE_FS=m
1122CONFIG_ISO9660_FS=y 1057CONFIG_ISO9660_FS=y
@@ -1145,20 +1080,17 @@ CONFIG_ROMFS_FS=m
1145CONFIG_SYSV_FS=m 1080CONFIG_SYSV_FS=m
1146CONFIG_UFS_FS=m 1081CONFIG_UFS_FS=m
1147CONFIG_NFS_FS=m 1082CONFIG_NFS_FS=m
1148CONFIG_NFS_V3=y
1149CONFIG_NFS_V3_ACL=y 1083CONFIG_NFS_V3_ACL=y
1150CONFIG_NFS_V4=y 1084CONFIG_NFS_V4=m
1151CONFIG_NFSD=m 1085CONFIG_NFSD=m
1152CONFIG_NFSD_V3_ACL=y 1086CONFIG_NFSD_V3_ACL=y
1153CONFIG_NFSD_V4=y 1087CONFIG_NFSD_V4=y
1154CONFIG_RPCSEC_GSS_SPKM3=m
1155CONFIG_CIFS=m 1088CONFIG_CIFS=m
1156CONFIG_CIFS_WEAK_PW_HASH=y 1089CONFIG_CIFS_WEAK_PW_HASH=y
1157CONFIG_CIFS_UPCALL=y 1090CONFIG_CIFS_UPCALL=y
1158CONFIG_CIFS_XATTR=y 1091CONFIG_CIFS_XATTR=y
1159CONFIG_CIFS_POSIX=y 1092CONFIG_CIFS_POSIX=y
1160CONFIG_CIFS_DFS_UPCALL=y 1093CONFIG_CIFS_DFS_UPCALL=y
1161CONFIG_CIFS_EXPERIMENTAL=y
1162CONFIG_NCP_FS=m 1094CONFIG_NCP_FS=m
1163CONFIG_NCPFS_PACKET_SIGNING=y 1095CONFIG_NCPFS_PACKET_SIGNING=y
1164CONFIG_NCPFS_IOCTL_LOCKING=y 1096CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -1170,17 +1102,6 @@ CONFIG_NCPFS_NLS=y
1170CONFIG_NCPFS_EXTRAS=y 1102CONFIG_NCPFS_EXTRAS=y
1171CONFIG_CODA_FS=m 1103CONFIG_CODA_FS=m
1172CONFIG_9P_FS=m 1104CONFIG_9P_FS=m
1173CONFIG_PARTITION_ADVANCED=y
1174CONFIG_OSF_PARTITION=y
1175CONFIG_AMIGA_PARTITION=y
1176CONFIG_BSD_DISKLABEL=y
1177CONFIG_MINIX_SUBPARTITION=y
1178CONFIG_SOLARIS_X86_PARTITION=y
1179CONFIG_UNIXWARE_DISKLABEL=y
1180CONFIG_SGI_PARTITION=y
1181CONFIG_SUN_PARTITION=y
1182CONFIG_KARMA_PARTITION=y
1183CONFIG_EFI_PARTITION=y
1184CONFIG_NLS_DEFAULT="utf8" 1105CONFIG_NLS_DEFAULT="utf8"
1185CONFIG_NLS_CODEPAGE_437=y 1106CONFIG_NLS_CODEPAGE_437=y
1186CONFIG_NLS_CODEPAGE_737=m 1107CONFIG_NLS_CODEPAGE_737=m
@@ -1219,29 +1140,27 @@ CONFIG_NLS_ISO8859_14=m
1219CONFIG_NLS_ISO8859_15=m 1140CONFIG_NLS_ISO8859_15=m
1220CONFIG_NLS_KOI8_R=m 1141CONFIG_NLS_KOI8_R=m
1221CONFIG_NLS_KOI8_U=m 1142CONFIG_NLS_KOI8_U=m
1222CONFIG_DLM=m 1143CONFIG_DEBUG_INFO=y
1223CONFIG_DLM_DEBUG=y
1224# CONFIG_ENABLE_WARN_DEPRECATED is not set 1144# CONFIG_ENABLE_WARN_DEPRECATED is not set
1225CONFIG_MAGIC_SYSRQ=y
1226CONFIG_UNUSED_SYMBOLS=y 1145CONFIG_UNUSED_SYMBOLS=y
1227CONFIG_HEADERS_CHECK=y 1146CONFIG_HEADERS_CHECK=y
1147CONFIG_MAGIC_SYSRQ=y
1228CONFIG_DEBUG_KERNEL=y 1148CONFIG_DEBUG_KERNEL=y
1229CONFIG_DEBUG_SHIRQ=y
1230CONFIG_TIMER_STATS=y
1231CONFIG_DEBUG_OBJECTS=y 1149CONFIG_DEBUG_OBJECTS=y
1232CONFIG_DEBUG_OBJECTS_FREE=y 1150CONFIG_DEBUG_OBJECTS_FREE=y
1233CONFIG_DEBUG_OBJECTS_TIMERS=y 1151CONFIG_DEBUG_OBJECTS_TIMERS=y
1234CONFIG_SLUB_DEBUG_ON=y 1152CONFIG_SLUB_DEBUG_ON=y
1153CONFIG_DEBUG_STACK_USAGE=y
1154CONFIG_DEBUG_VM=y
1155CONFIG_DEBUG_HIGHMEM=y
1156CONFIG_DEBUG_STACKOVERFLOW=y
1157CONFIG_DEBUG_SHIRQ=y
1158CONFIG_TIMER_STATS=y
1235CONFIG_DEBUG_RT_MUTEXES=y 1159CONFIG_DEBUG_RT_MUTEXES=y
1236CONFIG_DEBUG_SPINLOCK=y 1160CONFIG_DEBUG_SPINLOCK=y
1237CONFIG_DEBUG_MUTEXES=y 1161CONFIG_DEBUG_MUTEXES=y
1238CONFIG_DEBUG_SPINLOCK_SLEEP=y
1239CONFIG_DEBUG_HIGHMEM=y
1240CONFIG_DEBUG_INFO=y
1241CONFIG_DEBUG_VM=y
1242CONFIG_DEBUG_LIST=y 1162CONFIG_DEBUG_LIST=y
1243CONFIG_DEBUG_SG=y 1163CONFIG_DEBUG_SG=y
1244# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1245CONFIG_FAULT_INJECTION=y 1164CONFIG_FAULT_INJECTION=y
1246CONFIG_FAILSLAB=y 1165CONFIG_FAILSLAB=y
1247CONFIG_FAIL_PAGE_ALLOC=y 1166CONFIG_FAIL_PAGE_ALLOC=y
@@ -1250,17 +1169,12 @@ CONFIG_FAIL_IO_TIMEOUT=y
1250CONFIG_FAULT_INJECTION_DEBUG_FS=y 1169CONFIG_FAULT_INJECTION_DEBUG_FS=y
1251CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 1170CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
1252CONFIG_LATENCYTOP=y 1171CONFIG_LATENCYTOP=y
1253CONFIG_SYSCTL_SYSCALL_CHECK=y
1254CONFIG_SCHED_TRACER=y 1172CONFIG_SCHED_TRACER=y
1255CONFIG_STACK_TRACER=y 1173CONFIG_STACK_TRACER=y
1256CONFIG_BLK_DEV_IO_TRACE=y 1174CONFIG_BLK_DEV_IO_TRACE=y
1257CONFIG_DEBUG_STACKOVERFLOW=y
1258CONFIG_DEBUG_STACK_USAGE=y
1259CONFIG_XMON=y 1175CONFIG_XMON=y
1260CONFIG_BOOTX_TEXT=y 1176CONFIG_BOOTX_TEXT=y
1261CONFIG_PPC_EARLY_DEBUG=y 1177CONFIG_PPC_EARLY_DEBUG=y
1262CONFIG_PPC_EARLY_DEBUG_BOOTX=y
1263CONFIG_KEYS=y
1264CONFIG_KEYS_DEBUG_PROC_KEYS=y 1178CONFIG_KEYS_DEBUG_PROC_KEYS=y
1265CONFIG_SECURITY=y 1179CONFIG_SECURITY=y
1266CONFIG_SECURITY_NETWORK=y 1180CONFIG_SECURITY_NETWORK=y
@@ -1268,9 +1182,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
1268CONFIG_SECURITY_SELINUX=y 1182CONFIG_SECURITY_SELINUX=y
1269CONFIG_SECURITY_SELINUX_BOOTPARAM=y 1183CONFIG_SECURITY_SELINUX_BOOTPARAM=y
1270CONFIG_SECURITY_SELINUX_DISABLE=y 1184CONFIG_SECURITY_SELINUX_DISABLE=y
1271CONFIG_CRYPTO_NULL=m
1272CONFIG_CRYPTO_TEST=m 1185CONFIG_CRYPTO_TEST=m
1273CONFIG_CRYPTO_CCM=m
1274CONFIG_CRYPTO_GCM=m 1186CONFIG_CRYPTO_GCM=m
1275CONFIG_CRYPTO_CTS=m 1187CONFIG_CRYPTO_CTS=m
1276CONFIG_CRYPTO_LRW=m 1188CONFIG_CRYPTO_LRW=m
@@ -1278,14 +1190,12 @@ CONFIG_CRYPTO_PCBC=m
1278CONFIG_CRYPTO_XTS=m 1190CONFIG_CRYPTO_XTS=m
1279CONFIG_CRYPTO_HMAC=y 1191CONFIG_CRYPTO_HMAC=y
1280CONFIG_CRYPTO_XCBC=m 1192CONFIG_CRYPTO_XCBC=m
1281CONFIG_CRYPTO_MD4=m
1282CONFIG_CRYPTO_MICHAEL_MIC=m 1193CONFIG_CRYPTO_MICHAEL_MIC=m
1283CONFIG_CRYPTO_RMD128=m 1194CONFIG_CRYPTO_RMD128=m
1284CONFIG_CRYPTO_RMD160=m 1195CONFIG_CRYPTO_RMD160=m
1285CONFIG_CRYPTO_RMD256=m 1196CONFIG_CRYPTO_RMD256=m
1286CONFIG_CRYPTO_RMD320=m 1197CONFIG_CRYPTO_RMD320=m
1287CONFIG_CRYPTO_SHA1=y 1198CONFIG_CRYPTO_SHA1=y
1288CONFIG_CRYPTO_SHA256=m
1289CONFIG_CRYPTO_SHA512=m 1199CONFIG_CRYPTO_SHA512=m
1290CONFIG_CRYPTO_TGR192=m 1200CONFIG_CRYPTO_TGR192=m
1291CONFIG_CRYPTO_WP512=m 1201CONFIG_CRYPTO_WP512=m
@@ -1306,5 +1216,3 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
1306CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y 1216CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
1307CONFIG_CRYPTO_DEV_TALITOS=m 1217CONFIG_CRYPTO_DEV_TALITOS=m
1308CONFIG_VIRTUALIZATION=y 1218CONFIG_VIRTUALIZATION=y
1309CONFIG_VIRTIO_PCI=m
1310CONFIG_VIRTIO_BALLOON=m
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index baad8db21b61..3e336ee8bb4a 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -1,20 +1,19 @@
1CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
2CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
3CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
4CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
6CONFIG_EXPERT=y 8CONFIG_EXPERT=y
7CONFIG_KALLSYMS_ALL=y 9CONFIG_KALLSYMS_ALL=y
10CONFIG_PARTITION_ADVANCED=y
8# CONFIG_PPC_CHRP is not set 11# CONFIG_PPC_CHRP is not set
9# CONFIG_PPC_PMAC is not set 12# CONFIG_PPC_PMAC is not set
10CONFIG_PPC_82xx=y 13CONFIG_PPC_82xx=y
11CONFIG_PQ2FADS=y 14CONFIG_PQ2FADS=y
12CONFIG_NO_HZ=y
13CONFIG_HIGH_RES_TIMERS=y
14CONFIG_BINFMT_MISC=y 15CONFIG_BINFMT_MISC=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_PCI=y 16CONFIG_PCI=y
17# CONFIG_8260_PCI9 is not set
18CONFIG_NET=y 17CONFIG_NET=y
19CONFIG_PACKET=y 18CONFIG_PACKET=y
20CONFIG_UNIX=y 19CONFIG_UNIX=y
@@ -29,7 +28,6 @@ CONFIG_NETFILTER=y
29CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 28CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
30# CONFIG_FW_LOADER is not set 29# CONFIG_FW_LOADER is not set
31CONFIG_MTD=y 30CONFIG_MTD=y
32CONFIG_MTD_CHAR=y
33CONFIG_MTD_BLOCK=y 31CONFIG_MTD_BLOCK=y
34CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
35CONFIG_MTD_CFI_ADV_OPTIONS=y 33CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -41,55 +39,43 @@ CONFIG_MTD_CFI_GEOMETRY=y
41CONFIG_MTD_CFI_I4=y 39CONFIG_MTD_CFI_I4=y
42CONFIG_MTD_CFI_INTELEXT=y 40CONFIG_MTD_CFI_INTELEXT=y
43CONFIG_MTD_PHYSMAP_OF=y 41CONFIG_MTD_PHYSMAP_OF=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_BLK_DEV_LOOP=y 42CONFIG_BLK_DEV_LOOP=y
46CONFIG_IDE=y 43CONFIG_IDE=y
47CONFIG_NETDEVICES=y 44CONFIG_NETDEVICES=y
48CONFIG_TUN=y 45CONFIG_TUN=y
49CONFIG_DAVICOM_PHY=y
50CONFIG_NET_ETHERNET=y
51CONFIG_FS_ENET=y 46CONFIG_FS_ENET=y
52# CONFIG_FS_ENET_HAS_SCC is not set 47# CONFIG_FS_ENET_HAS_SCC is not set
53CONFIG_FS_ENET_MDIO_FCC=y 48CONFIG_FS_ENET_MDIO_FCC=y
49CONFIG_DAVICOM_PHY=y
54CONFIG_PPP=y 50CONFIG_PPP=y
51CONFIG_PPP_DEFLATE=y
55CONFIG_PPP_ASYNC=y 52CONFIG_PPP_ASYNC=y
56CONFIG_PPP_SYNC_TTY=y 53CONFIG_PPP_SYNC_TTY=y
57CONFIG_PPP_DEFLATE=y
58CONFIG_INPUT_EVDEV=y 54CONFIG_INPUT_EVDEV=y
59# CONFIG_SERIO_I8042 is not set
60# CONFIG_VT is not set 55# CONFIG_VT is not set
61CONFIG_SERIAL_CPM=y 56CONFIG_SERIAL_CPM=y
62CONFIG_SERIAL_CPM_CONSOLE=y 57CONFIG_SERIAL_CPM_CONSOLE=y
63# CONFIG_HWMON is not set 58# CONFIG_HWMON is not set
64CONFIG_VIDEO_OUTPUT_CONTROL=y
65# CONFIG_HID_SUPPORT is not set
66CONFIG_USB_GADGET=y 59CONFIG_USB_GADGET=y
67CONFIG_USB_GADGET_M66592=y 60CONFIG_USB_ETH=y
68CONFIG_EXT2_FS=y 61CONFIG_EXT2_FS=y
69CONFIG_EXT3_FS=y 62CONFIG_EXT3_FS=y
70# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 63# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
71CONFIG_INOTIFY=y
72CONFIG_AUTOFS4_FS=y 64CONFIG_AUTOFS4_FS=y
73CONFIG_PROC_KCORE=y 65CONFIG_PROC_KCORE=y
74CONFIG_TMPFS=y 66CONFIG_TMPFS=y
75CONFIG_CRAMFS=y 67CONFIG_CRAMFS=y
76CONFIG_NFS_FS=y 68CONFIG_NFS_FS=y
77CONFIG_NFS_V3=y
78CONFIG_NFS_V3_ACL=y 69CONFIG_NFS_V3_ACL=y
79CONFIG_ROOT_NFS=y 70CONFIG_ROOT_NFS=y
80CONFIG_PARTITION_ADVANCED=y
81CONFIG_NLS=y
82CONFIG_NLS_CODEPAGE_437=y 71CONFIG_NLS_CODEPAGE_437=y
83CONFIG_NLS_ASCII=y 72CONFIG_NLS_ASCII=y
84CONFIG_NLS_ISO8859_1=y 73CONFIG_NLS_ISO8859_1=y
85CONFIG_NLS_UTF8=y 74CONFIG_NLS_UTF8=y
75CONFIG_DEBUG_INFO=y
86CONFIG_MAGIC_SYSRQ=y 76CONFIG_MAGIC_SYSRQ=y
87CONFIG_DEBUG_KERNEL=y
88CONFIG_DETECT_HUNG_TASK=y 77CONFIG_DETECT_HUNG_TASK=y
89# CONFIG_SCHED_DEBUG is not set 78# CONFIG_SCHED_DEBUG is not set
90CONFIG_DEBUG_INFO=y
91# CONFIG_RCU_CPU_STALL_DETECTOR is not set
92CONFIG_SYSCTL_SYSCALL_CHECK=y
93CONFIG_BDI_SWITCH=y 79CONFIG_BDI_SWITCH=y
94CONFIG_CRYPTO_CBC=y 80CONFIG_CRYPTO_CBC=y
95CONFIG_CRYPTO_ECB=y 81CONFIG_CRYPTO_ECB=y
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 879de5efb073..1078851aa4dc 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -8,7 +8,6 @@ CONFIG_POSIX_MQUEUE=y
8CONFIG_FHANDLE=y 8CONFIG_FHANDLE=y
9CONFIG_HIGH_RES_TIMERS=y 9CONFIG_HIGH_RES_TIMERS=y
10CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
11CONFIG_RD_LZMA=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y 11CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13CONFIG_EMBEDDED=y 12CONFIG_EMBEDDED=y
14# CONFIG_PERF_EVENTS is not set 13# CONFIG_PERF_EVENTS is not set
@@ -64,11 +63,9 @@ CONFIG_BT_HCIBTUSB=m
64CONFIG_CFG80211=m 63CONFIG_CFG80211=m
65CONFIG_CFG80211_WEXT=y 64CONFIG_CFG80211_WEXT=y
66CONFIG_MAC80211=m 65CONFIG_MAC80211=m
67CONFIG_MAC80211_RC_PID=y
68# CONFIG_MAC80211_RC_MINSTREL is not set 66# CONFIG_MAC80211_RC_MINSTREL is not set
69CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 67CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
70# CONFIG_FIRMWARE_IN_KERNEL is not set 68# CONFIG_FIRMWARE_IN_KERNEL is not set
71CONFIG_PROC_DEVICETREE=y
72CONFIG_BLK_DEV_LOOP=y 69CONFIG_BLK_DEV_LOOP=y
73CONFIG_BLK_DEV_RAM=y 70CONFIG_BLK_DEV_RAM=y
74CONFIG_BLK_DEV_RAM_SIZE=65535 71CONFIG_BLK_DEV_RAM_SIZE=65535
@@ -76,7 +73,6 @@ CONFIG_SCSI=y
76CONFIG_BLK_DEV_SD=y 73CONFIG_BLK_DEV_SD=y
77CONFIG_BLK_DEV_SR=y 74CONFIG_BLK_DEV_SR=y
78CONFIG_CHR_DEV_SG=m 75CONFIG_CHR_DEV_SG=m
79CONFIG_SCSI_MULTI_LUN=y
80# CONFIG_SCSI_LOWLEVEL is not set 76# CONFIG_SCSI_LOWLEVEL is not set
81CONFIG_MD=y 77CONFIG_MD=y
82CONFIG_BLK_DEV_DM=m 78CONFIG_BLK_DEV_DM=m
@@ -107,7 +103,6 @@ CONFIG_INPUT_EVDEV=m
107# CONFIG_LEGACY_PTYS is not set 103# CONFIG_LEGACY_PTYS is not set
108# CONFIG_HW_RANDOM is not set 104# CONFIG_HW_RANDOM is not set
109# CONFIG_HWMON is not set 105# CONFIG_HWMON is not set
110CONFIG_VIDEO_OUTPUT_CONTROL=m
111CONFIG_FB=y 106CONFIG_FB=y
112CONFIG_FB_PS3=y 107CONFIG_FB_PS3=y
113# CONFIG_VGA_CONSOLE is not set 108# CONFIG_VGA_CONSOLE is not set
@@ -130,8 +125,6 @@ CONFIG_HID_TWINHAN=m
130CONFIG_HID_LOGITECH=m 125CONFIG_HID_LOGITECH=m
131CONFIG_HID_LOGITECH_DJ=m 126CONFIG_HID_LOGITECH_DJ=m
132CONFIG_HID_MICROSOFT=m 127CONFIG_HID_MICROSOFT=m
133CONFIG_HID_PS3REMOTE=m
134CONFIG_HID_SONY=m
135CONFIG_HID_SUNPLUS=m 128CONFIG_HID_SUNPLUS=m
136CONFIG_HID_SMARTJOYPLUS=m 129CONFIG_HID_SMARTJOYPLUS=m
137CONFIG_USB_HIDDEV=y 130CONFIG_USB_HIDDEV=y
@@ -169,18 +162,17 @@ CONFIG_NLS_CODEPAGE_437=y
169CONFIG_NLS_ISO8859_1=y 162CONFIG_NLS_ISO8859_1=y
170CONFIG_CRC_CCITT=m 163CONFIG_CRC_CCITT=m
171CONFIG_CRC_T10DIF=y 164CONFIG_CRC_T10DIF=y
172CONFIG_MAGIC_SYSRQ=y 165CONFIG_DEBUG_INFO=y
173CONFIG_DEBUG_FS=y 166CONFIG_DEBUG_FS=y
167CONFIG_MAGIC_SYSRQ=y
168CONFIG_DEBUG_MEMORY_INIT=y
169CONFIG_DEBUG_STACKOVERFLOW=y
174CONFIG_DETECT_HUNG_TASK=y 170CONFIG_DETECT_HUNG_TASK=y
175CONFIG_PROVE_LOCKING=y 171CONFIG_PROVE_LOCKING=y
176CONFIG_DEBUG_LOCKDEP=y 172CONFIG_DEBUG_LOCKDEP=y
177CONFIG_DEBUG_INFO=y
178CONFIG_DEBUG_MEMORY_INIT=y
179CONFIG_DEBUG_LIST=y 173CONFIG_DEBUG_LIST=y
180CONFIG_RCU_CPU_STALL_TIMEOUT=60 174CONFIG_RCU_CPU_STALL_TIMEOUT=60
181# CONFIG_FTRACE is not set 175# CONFIG_FTRACE is not set
182CONFIG_DEBUG_STACKOVERFLOW=y
183CONFIG_CRYPTO_CCM=m
184CONFIG_CRYPTO_GCM=m 176CONFIG_CRYPTO_GCM=m
185CONFIG_CRYPTO_PCBC=m 177CONFIG_CRYPTO_PCBC=m
186CONFIG_CRYPTO_MICHAEL_MIC=m 178CONFIG_CRYPTO_MICHAEL_MIC=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 1f97364017c7..145e5b0f7b24 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,6 +1,4 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_ALTIVEC=y
3CONFIG_VSX=y
4CONFIG_SMP=y 2CONFIG_SMP=y
5CONFIG_NR_CPUS=2048 3CONFIG_NR_CPUS=2048
6CONFIG_SYSVIPC=y 4CONFIG_SYSVIPC=y
@@ -40,6 +38,7 @@ CONFIG_DTL=y
40# CONFIG_PPC_PMAC is not set 38# CONFIG_PPC_PMAC is not set
41CONFIG_RTAS_FLASH=m 39CONFIG_RTAS_FLASH=m
42CONFIG_IBMEBUS=y 40CONFIG_IBMEBUS=y
41CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
43CONFIG_HZ_100=y 42CONFIG_HZ_100=y
44CONFIG_BINFMT_MISC=m 43CONFIG_BINFMT_MISC=m
45CONFIG_PPC_TRANSACTIONAL_MEM=y 44CONFIG_PPC_TRANSACTIONAL_MEM=y
@@ -47,6 +46,7 @@ CONFIG_KEXEC=y
47CONFIG_IRQ_ALL_CPUS=y 46CONFIG_IRQ_ALL_CPUS=y
48CONFIG_MEMORY_HOTPLUG=y 47CONFIG_MEMORY_HOTPLUG=y
49CONFIG_MEMORY_HOTREMOVE=y 48CONFIG_MEMORY_HOTREMOVE=y
49CONFIG_TRANSPARENT_HUGEPAGE=y
50CONFIG_PPC_64K_PAGES=y 50CONFIG_PPC_64K_PAGES=y
51CONFIG_PPC_SUBPAGE_PROT=y 51CONFIG_PPC_SUBPAGE_PROT=y
52CONFIG_SCHED_SMT=y 52CONFIG_SCHED_SMT=y
@@ -72,7 +72,6 @@ CONFIG_BRIDGE=m
72CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 72CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
73CONFIG_DEVTMPFS=y 73CONFIG_DEVTMPFS=y
74CONFIG_DEVTMPFS_MOUNT=y 74CONFIG_DEVTMPFS_MOUNT=y
75CONFIG_PROC_DEVICETREE=y
76CONFIG_PARPORT=m 75CONFIG_PARPORT=m
77CONFIG_PARPORT_PC=m 76CONFIG_PARPORT_PC=m
78CONFIG_BLK_DEV_FD=m 77CONFIG_BLK_DEV_FD=m
@@ -90,7 +89,6 @@ CONFIG_CHR_DEV_ST=y
90CONFIG_BLK_DEV_SR=y 89CONFIG_BLK_DEV_SR=y
91CONFIG_BLK_DEV_SR_VENDOR=y 90CONFIG_BLK_DEV_SR_VENDOR=y
92CONFIG_CHR_DEV_SG=y 91CONFIG_CHR_DEV_SG=y
93CONFIG_SCSI_MULTI_LUN=y
94CONFIG_SCSI_CONSTANTS=y 92CONFIG_SCSI_CONSTANTS=y
95CONFIG_SCSI_FC_ATTRS=y 93CONFIG_SCSI_FC_ATTRS=y
96CONFIG_SCSI_CXGB3_ISCSI=m 94CONFIG_SCSI_CXGB3_ISCSI=m
@@ -270,7 +268,6 @@ CONFIG_NLS_CODEPAGE_437=y
270CONFIG_NLS_ASCII=y 268CONFIG_NLS_ASCII=y
271CONFIG_NLS_ISO8859_1=y 269CONFIG_NLS_ISO8859_1=y
272CONFIG_NLS_UTF8=y 270CONFIG_NLS_UTF8=y
273CONFIG_CRC_T10DIF=y
274CONFIG_MAGIC_SYSRQ=y 271CONFIG_MAGIC_SYSRQ=y
275CONFIG_DEBUG_KERNEL=y 272CONFIG_DEBUG_KERNEL=y
276CONFIG_DEBUG_STACK_USAGE=y 273CONFIG_DEBUG_STACK_USAGE=y
@@ -304,7 +301,4 @@ CONFIG_CRYPTO_DEV_NX=y
304CONFIG_CRYPTO_DEV_NX_ENCRYPT=m 301CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
305CONFIG_VIRTUALIZATION=y 302CONFIG_VIRTUALIZATION=y
306CONFIG_KVM_BOOK3S_64=m 303CONFIG_KVM_BOOK3S_64=m
307CONFIG_KVM_BOOK3S_64_HV=y 304CONFIG_KVM_BOOK3S_64_HV=m
308CONFIG_TRANSPARENT_HUGEPAGE=y
309CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
310CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
diff --git a/arch/powerpc/configs/pseries_le_defconfig b/arch/powerpc/configs/pseries_le_defconfig
index ac7ca5852827..4ff694c5c855 100644
--- a/arch/powerpc/configs/pseries_le_defconfig
+++ b/arch/powerpc/configs/pseries_le_defconfig
@@ -1,6 +1,4 @@
1CONFIG_PPC64=y 1CONFIG_PPC64=y
2CONFIG_ALTIVEC=y
3CONFIG_VSX=y
4CONFIG_SMP=y 2CONFIG_SMP=y
5CONFIG_NR_CPUS=2048 3CONFIG_NR_CPUS=2048
6CONFIG_CPU_LITTLE_ENDIAN=y 4CONFIG_CPU_LITTLE_ENDIAN=y
@@ -41,6 +39,7 @@ CONFIG_DTL=y
41# CONFIG_PPC_PMAC is not set 39# CONFIG_PPC_PMAC is not set
42CONFIG_RTAS_FLASH=m 40CONFIG_RTAS_FLASH=m
43CONFIG_IBMEBUS=y 41CONFIG_IBMEBUS=y
42CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
44CONFIG_HZ_100=y 43CONFIG_HZ_100=y
45CONFIG_BINFMT_MISC=m 44CONFIG_BINFMT_MISC=m
46CONFIG_PPC_TRANSACTIONAL_MEM=y 45CONFIG_PPC_TRANSACTIONAL_MEM=y
@@ -48,6 +47,7 @@ CONFIG_KEXEC=y
48CONFIG_IRQ_ALL_CPUS=y 47CONFIG_IRQ_ALL_CPUS=y
49CONFIG_MEMORY_HOTPLUG=y 48CONFIG_MEMORY_HOTPLUG=y
50CONFIG_MEMORY_HOTREMOVE=y 49CONFIG_MEMORY_HOTREMOVE=y
50CONFIG_TRANSPARENT_HUGEPAGE=y
51CONFIG_PPC_64K_PAGES=y 51CONFIG_PPC_64K_PAGES=y
52CONFIG_PPC_SUBPAGE_PROT=y 52CONFIG_PPC_SUBPAGE_PROT=y
53CONFIG_SCHED_SMT=y 53CONFIG_SCHED_SMT=y
@@ -73,7 +73,6 @@ CONFIG_BRIDGE=m
73CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 73CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
74CONFIG_DEVTMPFS=y 74CONFIG_DEVTMPFS=y
75CONFIG_DEVTMPFS_MOUNT=y 75CONFIG_DEVTMPFS_MOUNT=y
76CONFIG_PROC_DEVICETREE=y
77CONFIG_PARPORT=m 76CONFIG_PARPORT=m
78CONFIG_PARPORT_PC=m 77CONFIG_PARPORT_PC=m
79CONFIG_BLK_DEV_FD=m 78CONFIG_BLK_DEV_FD=m
@@ -91,7 +90,6 @@ CONFIG_CHR_DEV_ST=y
91CONFIG_BLK_DEV_SR=y 90CONFIG_BLK_DEV_SR=y
92CONFIG_BLK_DEV_SR_VENDOR=y 91CONFIG_BLK_DEV_SR_VENDOR=y
93CONFIG_CHR_DEV_SG=y 92CONFIG_CHR_DEV_SG=y
94CONFIG_SCSI_MULTI_LUN=y
95CONFIG_SCSI_CONSTANTS=y 93CONFIG_SCSI_CONSTANTS=y
96CONFIG_SCSI_FC_ATTRS=y 94CONFIG_SCSI_FC_ATTRS=y
97CONFIG_SCSI_CXGB3_ISCSI=m 95CONFIG_SCSI_CXGB3_ISCSI=m
@@ -271,7 +269,6 @@ CONFIG_NLS_CODEPAGE_437=y
271CONFIG_NLS_ASCII=y 269CONFIG_NLS_ASCII=y
272CONFIG_NLS_ISO8859_1=y 270CONFIG_NLS_ISO8859_1=y
273CONFIG_NLS_UTF8=y 271CONFIG_NLS_UTF8=y
274CONFIG_CRC_T10DIF=y
275CONFIG_MAGIC_SYSRQ=y 272CONFIG_MAGIC_SYSRQ=y
276CONFIG_DEBUG_KERNEL=y 273CONFIG_DEBUG_KERNEL=y
277CONFIG_DEBUG_STACK_USAGE=y 274CONFIG_DEBUG_STACK_USAGE=y
@@ -300,11 +297,6 @@ CONFIG_CRYPTO_TEA=m
300CONFIG_CRYPTO_TWOFISH=m 297CONFIG_CRYPTO_TWOFISH=m
301CONFIG_CRYPTO_LZO=m 298CONFIG_CRYPTO_LZO=m
302# CONFIG_CRYPTO_ANSI_CPRNG is not set 299# CONFIG_CRYPTO_ANSI_CPRNG is not set
303CONFIG_CRYPTO_DEV_NX=y
304CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
305CONFIG_VIRTUALIZATION=y 300CONFIG_VIRTUALIZATION=y
306CONFIG_KVM_BOOK3S_64=m 301CONFIG_KVM_BOOK3S_64=m
307CONFIG_KVM_BOOK3S_64_HV=y 302CONFIG_KVM_BOOK3S_64_HV=m
308CONFIG_TRANSPARENT_HUGEPAGE=y
309CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
310CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig
index 60ad2c08caa6..b5db7dffe86d 100644
--- a/arch/powerpc/configs/storcenter_defconfig
+++ b/arch/powerpc/configs/storcenter_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_LOG_BUF_SHIFT=14 2CONFIG_LOG_BUF_SHIFT=14
4CONFIG_EXPERT=y 3CONFIG_EXPERT=y
@@ -6,13 +5,13 @@ CONFIG_EXPERT=y
6CONFIG_MODULES=y 5CONFIG_MODULES=y
7CONFIG_MODULE_UNLOAD=y 6CONFIG_MODULE_UNLOAD=y
8# CONFIG_BLK_DEV_BSG is not set 7# CONFIG_BLK_DEV_BSG is not set
8CONFIG_PARTITION_ADVANCED=y
9# CONFIG_PPC_CHRP is not set 9# CONFIG_PPC_CHRP is not set
10# CONFIG_PPC_PMAC is not set 10# CONFIG_PPC_PMAC is not set
11CONFIG_EMBEDDED6xx=y 11CONFIG_EMBEDDED6xx=y
12CONFIG_STORCENTER=y 12CONFIG_STORCENTER=y
13CONFIG_HZ_100=y 13CONFIG_HZ_100=y
14CONFIG_BINFMT_MISC=y 14CONFIG_BINFMT_MISC=y
15CONFIG_SPARSE_IRQ=y
16CONFIG_CMDLINE_BOOL=y 15CONFIG_CMDLINE_BOOL=y
17CONFIG_CMDLINE="console=ttyS0,115200" 16CONFIG_CMDLINE="console=ttyS0,115200"
18# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
@@ -29,11 +28,8 @@ CONFIG_IP_PNP_DHCP=y
29# CONFIG_INET_LRO is not set 28# CONFIG_INET_LRO is not set
30# CONFIG_IPV6 is not set 29# CONFIG_IPV6 is not set
31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
32# CONFIG_FW_LOADER is not set
33CONFIG_MTD=y 31CONFIG_MTD=y
34CONFIG_MTD_CMDLINE_PARTS=y 32CONFIG_MTD_CMDLINE_PARTS=y
35CONFIG_MTD_OF_PARTS=y
36CONFIG_MTD_CHAR=y
37CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
38CONFIG_FTL=y 34CONFIG_FTL=y
39CONFIG_NFTL=y 35CONFIG_NFTL=y
@@ -41,7 +37,6 @@ CONFIG_NFTL_RW=y
41CONFIG_MTD_CFI=y 37CONFIG_MTD_CFI=y
42CONFIG_MTD_CFI_AMDSTD=y 38CONFIG_MTD_CFI_AMDSTD=y
43CONFIG_MTD_PHYSMAP=y 39CONFIG_MTD_PHYSMAP=y
44CONFIG_PROC_DEVICETREE=y
45CONFIG_IDE=y 40CONFIG_IDE=y
46CONFIG_BLK_DEV_VIA82CXXX=y 41CONFIG_BLK_DEV_VIA82CXXX=y
47CONFIG_SCSI=y 42CONFIG_SCSI=y
@@ -57,7 +52,6 @@ CONFIG_MD_RAID456=y
57CONFIG_NETDEVICES=y 52CONFIG_NETDEVICES=y
58CONFIG_DUMMY=m 53CONFIG_DUMMY=m
59CONFIG_R8169=y 54CONFIG_R8169=y
60# CONFIG_NETDEV_10000 is not set
61# CONFIG_INPUT is not set 55# CONFIG_INPUT is not set
62# CONFIG_SERIO is not set 56# CONFIG_SERIO is not set
63# CONFIG_VT is not set 57# CONFIG_VT is not set
@@ -81,12 +75,10 @@ CONFIG_EXT2_FS=y
81CONFIG_EXT3_FS=y 75CONFIG_EXT3_FS=y
82# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 76# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
83CONFIG_XFS_FS=m 77CONFIG_XFS_FS=m
84CONFIG_INOTIFY=y
85CONFIG_PROC_KCORE=y 78CONFIG_PROC_KCORE=y
86CONFIG_TMPFS=y 79CONFIG_TMPFS=y
87CONFIG_JFFS2_FS=y 80CONFIG_JFFS2_FS=y
88# CONFIG_NETWORK_FILESYSTEMS is not set 81# CONFIG_NETWORK_FILESYSTEMS is not set
89CONFIG_PARTITION_ADVANCED=y
90CONFIG_NLS_DEFAULT="utf8" 82CONFIG_NLS_DEFAULT="utf8"
91CONFIG_NLS_CODEPAGE_437=y 83CONFIG_NLS_CODEPAGE_437=y
92CONFIG_NLS_ISO8859_1=y 84CONFIG_NLS_ISO8859_1=y
@@ -94,5 +86,3 @@ CONFIG_NLS_UTF8=y
94CONFIG_CRC_T10DIF=y 86CONFIG_CRC_T10DIF=y
95# CONFIG_ENABLE_WARN_DEPRECATED is not set 87# CONFIG_ENABLE_WARN_DEPRECATED is not set
96# CONFIG_ENABLE_MUST_CHECK is not set 88# CONFIG_ENABLE_MUST_CHECK is not set
97# CONFIG_RCU_CPU_STALL_DETECTOR is not set
98CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/tqm8xx_defconfig b/arch/powerpc/configs/tqm8xx_defconfig
index 7fe277a7b422..4c973c5321c6 100644
--- a/arch/powerpc/configs/tqm8xx_defconfig
+++ b/arch/powerpc/configs/tqm8xx_defconfig
@@ -1,12 +1,10 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6CONFIG_SYSFS_DEPRECATED_V2=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 7CONFIG_EXPERT=y
9# CONFIG_SYSCTL_SYSCALL is not set
10# CONFIG_ELF_CORE is not set 8# CONFIG_ELF_CORE is not set
11# CONFIG_BASE_FULL is not set 9# CONFIG_BASE_FULL is not set
12# CONFIG_FUTEX is not set 10# CONFIG_FUTEX is not set
@@ -15,15 +13,12 @@ CONFIG_MODULES=y
15CONFIG_MODULE_UNLOAD=y 13CONFIG_MODULE_UNLOAD=y
16CONFIG_MODULE_SRCVERSION_ALL=y 14CONFIG_MODULE_SRCVERSION_ALL=y
17# CONFIG_BLK_DEV_BSG is not set 15# CONFIG_BLK_DEV_BSG is not set
16CONFIG_PARTITION_ADVANCED=y
18# CONFIG_IOSCHED_CFQ is not set 17# CONFIG_IOSCHED_CFQ is not set
19CONFIG_TQM8XX=y 18CONFIG_TQM8XX=y
20CONFIG_8xx_COPYBACK=y 19CONFIG_8xx_COPYBACK=y
21# CONFIG_8xx_CPU15 is not set 20# CONFIG_8xx_CPU15 is not set
22CONFIG_NO_HZ=y
23CONFIG_HIGH_RES_TIMERS=y
24CONFIG_HZ_100=y 21CONFIG_HZ_100=y
25CONFIG_8XX_MINIMAL_FPEMU=y
26CONFIG_SPARSE_IRQ=y
27# CONFIG_SECCOMP is not set 22# CONFIG_SECCOMP is not set
28CONFIG_NET=y 23CONFIG_NET=y
29CONFIG_PACKET=y 24CONFIG_PACKET=y
@@ -40,32 +35,24 @@ CONFIG_SYN_COOKIES=y
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41# CONFIG_FW_LOADER is not set 36# CONFIG_FW_LOADER is not set
42CONFIG_MTD=y 37CONFIG_MTD=y
43CONFIG_MTD_CONCAT=y
44CONFIG_MTD_CMDLINE_PARTS=y 38CONFIG_MTD_CMDLINE_PARTS=y
45CONFIG_MTD_OF_PARTS=y
46CONFIG_MTD_CHAR=y
47CONFIG_MTD_BLOCK=y 39CONFIG_MTD_BLOCK=y
48CONFIG_MTD_CFI=y 40CONFIG_MTD_CFI=y
49CONFIG_MTD_CFI_INTELEXT=y 41CONFIG_MTD_CFI_INTELEXT=y
50CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
51CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
52CONFIG_PROC_DEVICETREE=y
53# CONFIG_BLK_DEV is not set 44# CONFIG_BLK_DEV is not set
54# CONFIG_MISC_DEVICES is not set
55CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
46CONFIG_FS_ENET=y
56CONFIG_DAVICOM_PHY=y 47CONFIG_DAVICOM_PHY=y
57CONFIG_FIXED_PHY=y 48CONFIG_FIXED_PHY=y
58CONFIG_NET_ETHERNET=y
59CONFIG_FS_ENET=y
60# CONFIG_NETDEV_1000 is not set
61# CONFIG_NETDEV_10000 is not set
62# CONFIG_WLAN is not set 49# CONFIG_WLAN is not set
63# CONFIG_INPUT is not set 50# CONFIG_INPUT is not set
64# CONFIG_SERIO is not set 51# CONFIG_SERIO is not set
65# CONFIG_VT is not set 52# CONFIG_VT is not set
53# CONFIG_LEGACY_PTYS is not set
66CONFIG_SERIAL_CPM=y 54CONFIG_SERIAL_CPM=y
67CONFIG_SERIAL_CPM_CONSOLE=y 55CONFIG_SERIAL_CPM_CONSOLE=y
68# CONFIG_LEGACY_PTYS is not set
69CONFIG_HW_RANDOM=y 56CONFIG_HW_RANDOM=y
70CONFIG_GEN_RTC=y 57CONFIG_GEN_RTC=y
71# CONFIG_HWMON is not set 58# CONFIG_HWMON is not set
@@ -74,13 +61,8 @@ CONFIG_GEN_RTC=y
74CONFIG_TMPFS=y 61CONFIG_TMPFS=y
75CONFIG_CRAMFS=y 62CONFIG_CRAMFS=y
76CONFIG_NFS_FS=y 63CONFIG_NFS_FS=y
77CONFIG_NFS_V3=y
78CONFIG_ROOT_NFS=y 64CONFIG_ROOT_NFS=y
79CONFIG_PARTITION_ADVANCED=y 65CONFIG_CRC32_SLICEBY4=y
80# CONFIG_CRC32 is not set 66CONFIG_DEBUG_INFO=y
81CONFIG_MAGIC_SYSRQ=y 67CONFIG_MAGIC_SYSRQ=y
82CONFIG_DEBUG_KERNEL=y
83CONFIG_DETECT_HUNG_TASK=y 68CONFIG_DETECT_HUNG_TASK=y
84CONFIG_DEBUG_INFO=y
85# CONFIG_RCU_CPU_STALL_DETECTOR is not set
86CONFIG_CRC32_SLICEBY4=y
diff --git a/arch/powerpc/configs/wii_defconfig b/arch/powerpc/configs/wii_defconfig
index 1e2b7d062aa4..34eaf528fa87 100644
--- a/arch/powerpc/configs/wii_defconfig
+++ b/arch/powerpc/configs/wii_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_LOCALVERSION="-wii" 1CONFIG_LOCALVERSION="-wii"
3# CONFIG_LOCALVERSION_AUTO is not set 2# CONFIG_LOCALVERSION_AUTO is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
@@ -6,7 +5,6 @@ CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
8CONFIG_BLK_DEV_INITRD=y 7CONFIG_BLK_DEV_INITRD=y
9# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10CONFIG_EXPERT=y 8CONFIG_EXPERT=y
11# CONFIG_ELF_CORE is not set 9# CONFIG_ELF_CORE is not set
12CONFIG_PERF_EVENTS=y 10CONFIG_PERF_EVENTS=y
@@ -22,7 +20,6 @@ CONFIG_WII=y
22CONFIG_PREEMPT=y 20CONFIG_PREEMPT=y
23CONFIG_BINFMT_MISC=m 21CONFIG_BINFMT_MISC=m
24CONFIG_KEXEC=y 22CONFIG_KEXEC=y
25# CONFIG_MIGRATION is not set
26# CONFIG_SECCOMP is not set 23# CONFIG_SECCOMP is not set
27CONFIG_ADVANCED_OPTIONS=y 24CONFIG_ADVANCED_OPTIONS=y
28CONFIG_NET=y 25CONFIG_NET=y
@@ -39,7 +36,6 @@ CONFIG_IP_PNP_RARP=y
39# CONFIG_INET_DIAG is not set 36# CONFIG_INET_DIAG is not set
40# CONFIG_IPV6 is not set 37# CONFIG_IPV6 is not set
41CONFIG_BT=y 38CONFIG_BT=y
42CONFIG_BT_L2CAP=y
43CONFIG_BT_RFCOMM=y 39CONFIG_BT_RFCOMM=y
44CONFIG_BT_BNEP=y 40CONFIG_BT_BNEP=y
45CONFIG_BT_BNEP_MC_FILTER=y 41CONFIG_BT_BNEP_MC_FILTER=y
@@ -49,18 +45,12 @@ CONFIG_MAC80211=y
49CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 45CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
50# CONFIG_STANDALONE is not set 46# CONFIG_STANDALONE is not set
51# CONFIG_FIRMWARE_IN_KERNEL is not set 47# CONFIG_FIRMWARE_IN_KERNEL is not set
52CONFIG_PROC_DEVICETREE=y
53CONFIG_BLK_DEV_LOOP=y 48CONFIG_BLK_DEV_LOOP=y
54CONFIG_BLK_DEV_RAM=y 49CONFIG_BLK_DEV_RAM=y
55CONFIG_BLK_DEV_RAM_COUNT=2 50CONFIG_BLK_DEV_RAM_COUNT=2
56CONFIG_SCSI=y 51CONFIG_SCSI=y
57CONFIG_BLK_DEV_SD=y 52CONFIG_BLK_DEV_SD=y
58CONFIG_SCSI_MULTI_LUN=y
59CONFIG_NETDEVICES=y 53CONFIG_NETDEVICES=y
60CONFIG_NET_ETHERNET=y
61CONFIG_MII=y
62# CONFIG_NETDEV_1000 is not set
63# CONFIG_NETDEV_10000 is not set
64CONFIG_B43=y 54CONFIG_B43=y
65CONFIG_B43_SDIO=y 55CONFIG_B43_SDIO=y
66# CONFIG_B43_PHY_LP is not set 56# CONFIG_B43_PHY_LP is not set
@@ -78,8 +68,8 @@ CONFIG_INPUT_MISC=y
78CONFIG_INPUT_UINPUT=y 68CONFIG_INPUT_UINPUT=y
79# CONFIG_SERIO_I8042 is not set 69# CONFIG_SERIO_I8042 is not set
80# CONFIG_SERIO_SERPORT is not set 70# CONFIG_SERIO_SERPORT is not set
81# CONFIG_DEVKMEM is not set
82CONFIG_LEGACY_PTY_COUNT=64 71CONFIG_LEGACY_PTY_COUNT=64
72# CONFIG_DEVKMEM is not set
83# CONFIG_HW_RANDOM is not set 73# CONFIG_HW_RANDOM is not set
84CONFIG_NVRAM=y 74CONFIG_NVRAM=y
85CONFIG_I2C=y 75CONFIG_I2C=y
@@ -109,7 +99,6 @@ CONFIG_EXT2_FS=y
109CONFIG_EXT3_FS=y 99CONFIG_EXT3_FS=y
110# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 100# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
111# CONFIG_EXT3_FS_XATTR is not set 101# CONFIG_EXT3_FS_XATTR is not set
112CONFIG_INOTIFY=y
113CONFIG_FUSE_FS=m 102CONFIG_FUSE_FS=m
114CONFIG_ISO9660_FS=y 103CONFIG_ISO9660_FS=y
115CONFIG_JOLIET=y 104CONFIG_JOLIET=y
@@ -119,7 +108,6 @@ CONFIG_PROC_KCORE=y
119# CONFIG_PROC_PAGE_MONITOR is not set 108# CONFIG_PROC_PAGE_MONITOR is not set
120CONFIG_TMPFS=y 109CONFIG_TMPFS=y
121CONFIG_NFS_FS=y 110CONFIG_NFS_FS=y
122CONFIG_NFS_V3=y
123CONFIG_ROOT_NFS=y 111CONFIG_ROOT_NFS=y
124CONFIG_CIFS=m 112CONFIG_CIFS=m
125CONFIG_NLS_CODEPAGE_437=y 113CONFIG_NLS_CODEPAGE_437=y
@@ -127,13 +115,9 @@ CONFIG_NLS_ISO8859_1=y
127CONFIG_CRC_CCITT=y 115CONFIG_CRC_CCITT=y
128CONFIG_PRINTK_TIME=y 116CONFIG_PRINTK_TIME=y
129CONFIG_MAGIC_SYSRQ=y 117CONFIG_MAGIC_SYSRQ=y
130CONFIG_DEBUG_KERNEL=y
131CONFIG_DEBUG_SPINLOCK=y 118CONFIG_DEBUG_SPINLOCK=y
132CONFIG_DEBUG_MUTEXES=y 119CONFIG_DEBUG_MUTEXES=y
133CONFIG_DEBUG_SPINLOCK_SLEEP=y
134# CONFIG_RCU_CPU_STALL_DETECTOR is not set
135CONFIG_LATENCYTOP=y 120CONFIG_LATENCYTOP=y
136CONFIG_SYSCTL_SYSCALL_CHECK=y
137CONFIG_SCHED_TRACER=y 121CONFIG_SCHED_TRACER=y
138CONFIG_BLK_DEV_IO_TRACE=y 122CONFIG_BLK_DEV_IO_TRACE=y
139CONFIG_DMA_API_DEBUG=y 123CONFIG_DMA_API_DEBUG=y
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-21 14:36:52 -0500