diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-20 01:36:53 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-20 02:06:58 -0500 |
commit | a85cade6762bf566698e625ec1a4461245e40768 (patch) | |
tree | e6dc30c400417d313c2546aa0bc93ca1905608b5 /arch/powerpc/configs/linkstation_defconfig | |
parent | 9a4fc4eaf111ca960c9f524b850598e9dbc9697f (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 (limited to 'arch/powerpc/configs/linkstation_defconfig')
-rw-r--r-- | arch/powerpc/configs/linkstation_defconfig | 28 |
1 files changed, 3 insertions, 25 deletions
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 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
3 | CONFIG_POSIX_MQUEUE=y | 2 | CONFIG_POSIX_MQUEUE=y |
3 | CONFIG_NO_HZ=y | ||
4 | CONFIG_HIGH_RES_TIMERS=y | ||
4 | CONFIG_IKCONFIG=y | 5 | CONFIG_IKCONFIG=y |
5 | CONFIG_IKCONFIG_PROC=y | 6 | CONFIG_IKCONFIG_PROC=y |
6 | CONFIG_LOG_BUF_SHIFT=14 | 7 | CONFIG_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 |
14 | CONFIG_EMBEDDED6xx=y | 15 | CONFIG_EMBEDDED6xx=y |
15 | CONFIG_LINKSTATION=y | 16 | CONFIG_LINKSTATION=y |
16 | CONFIG_NO_HZ=y | ||
17 | CONFIG_HIGH_RES_TIMERS=y | ||
18 | CONFIG_HZ_100=y | 17 | CONFIG_HZ_100=y |
19 | CONFIG_SPARSE_IRQ=y | ||
20 | CONFIG_NET=y | 18 | CONFIG_NET=y |
21 | CONFIG_PACKET=y | 19 | CONFIG_PACKET=y |
22 | CONFIG_UNIX=y | 20 | CONFIG_UNIX=y |
@@ -43,12 +41,8 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | |||
43 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 41 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
44 | CONFIG_NF_CONNTRACK_IPV4=m | 42 | CONFIG_NF_CONNTRACK_IPV4=m |
45 | CONFIG_IP_NF_IPTABLES=m | 43 | CONFIG_IP_NF_IPTABLES=m |
46 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
47 | CONFIG_IP_NF_FILTER=m | 44 | CONFIG_IP_NF_FILTER=m |
48 | CONFIG_IP_NF_TARGET_REJECT=m | 45 | CONFIG_IP_NF_TARGET_REJECT=m |
49 | CONFIG_NF_NAT=m | ||
50 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
51 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
52 | CONFIG_IP_NF_MANGLE=m | 46 | CONFIG_IP_NF_MANGLE=m |
53 | CONFIG_IP_NF_TARGET_ECN=m | 47 | CONFIG_IP_NF_TARGET_ECN=m |
54 | CONFIG_IP_NF_TARGET_TTL=m | 48 | CONFIG_IP_NF_TARGET_TTL=m |
@@ -58,10 +52,7 @@ CONFIG_IP_NF_ARPFILTER=m | |||
58 | CONFIG_IP_NF_ARP_MANGLE=m | 52 | CONFIG_IP_NF_ARP_MANGLE=m |
59 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 53 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
60 | CONFIG_MTD=y | 54 | CONFIG_MTD=y |
61 | CONFIG_MTD_CONCAT=y | ||
62 | CONFIG_MTD_CMDLINE_PARTS=y | 55 | CONFIG_MTD_CMDLINE_PARTS=y |
63 | CONFIG_MTD_OF_PARTS=y | ||
64 | CONFIG_MTD_CHAR=y | ||
65 | CONFIG_MTD_BLOCK=y | 56 | CONFIG_MTD_BLOCK=y |
66 | CONFIG_MTD_CFI=y | 57 | CONFIG_MTD_CFI=y |
67 | CONFIG_MTD_JEDECPROBE=y | 58 | CONFIG_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 |
73 | CONFIG_MTD_CFI_AMDSTD=y | 64 | CONFIG_MTD_CFI_AMDSTD=y |
74 | CONFIG_MTD_PHYSMAP=y | 65 | CONFIG_MTD_PHYSMAP=y |
75 | CONFIG_PROC_DEVICETREE=y | ||
76 | CONFIG_BLK_DEV_LOOP=y | 66 | CONFIG_BLK_DEV_LOOP=y |
77 | CONFIG_BLK_DEV_RAM=y | 67 | CONFIG_BLK_DEV_RAM=y |
78 | CONFIG_BLK_DEV_RAM_COUNT=2 | 68 | CONFIG_BLK_DEV_RAM_COUNT=2 |
79 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 69 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
80 | CONFIG_MISC_DEVICES=y | ||
81 | CONFIG_EEPROM_LEGACY=m | 70 | CONFIG_EEPROM_LEGACY=m |
82 | CONFIG_BLK_DEV_SD=y | 71 | CONFIG_BLK_DEV_SD=y |
83 | CONFIG_CHR_DEV_SG=y | 72 | CONFIG_CHR_DEV_SG=y |
84 | CONFIG_SCSI_MULTI_LUN=y | ||
85 | CONFIG_ATA=y | 73 | CONFIG_ATA=y |
86 | CONFIG_PATA_IT821X=y | 74 | CONFIG_PATA_IT821X=y |
87 | CONFIG_PATA_SIL680=y | 75 | CONFIG_PATA_SIL680=y |
88 | CONFIG_NETDEVICES=y | 76 | CONFIG_NETDEVICES=y |
77 | CONFIG_NETCONSOLE=y | ||
89 | CONFIG_TUN=m | 78 | CONFIG_TUN=m |
90 | CONFIG_NET_ETHERNET=y | ||
91 | CONFIG_NET_TULIP=y | 79 | CONFIG_NET_TULIP=y |
92 | CONFIG_TULIP=y | 80 | CONFIG_TULIP=y |
93 | CONFIG_TULIP_MMIO=y | 81 | CONFIG_TULIP_MMIO=y |
94 | CONFIG_R8169=y | 82 | CONFIG_R8169=y |
95 | CONFIG_NETCONSOLE=y | ||
96 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 83 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
97 | CONFIG_INPUT_EVDEV=m | 84 | CONFIG_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 | |||
106 | CONFIG_I2C=y | 93 | CONFIG_I2C=y |
107 | CONFIG_I2C_CHARDEV=y | 94 | CONFIG_I2C_CHARDEV=y |
108 | CONFIG_I2C_MPC=y | 95 | CONFIG_I2C_MPC=y |
109 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
110 | # CONFIG_VGA_CONSOLE is not set | 96 | # CONFIG_VGA_CONSOLE is not set |
111 | CONFIG_HID=m | 97 | CONFIG_HID=m |
112 | # CONFIG_USB_HID is not set | 98 | # CONFIG_USB_HID is not set |
@@ -126,7 +112,6 @@ CONFIG_EXT2_FS=y | |||
126 | CONFIG_EXT3_FS=y | 112 | CONFIG_EXT3_FS=y |
127 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 113 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
128 | CONFIG_XFS_FS=m | 114 | CONFIG_XFS_FS=m |
129 | CONFIG_INOTIFY=y | ||
130 | CONFIG_ISO9660_FS=m | 115 | CONFIG_ISO9660_FS=m |
131 | CONFIG_JOLIET=y | 116 | CONFIG_JOLIET=y |
132 | CONFIG_ZISOFS=y | 117 | CONFIG_ZISOFS=y |
@@ -137,7 +122,6 @@ CONFIG_NTFS_FS=m | |||
137 | CONFIG_PROC_KCORE=y | 122 | CONFIG_PROC_KCORE=y |
138 | CONFIG_TMPFS=y | 123 | CONFIG_TMPFS=y |
139 | CONFIG_NFS_FS=y | 124 | CONFIG_NFS_FS=y |
140 | CONFIG_NFS_V3=y | ||
141 | CONFIG_NFS_V3_ACL=y | 125 | CONFIG_NFS_V3_ACL=y |
142 | CONFIG_NFS_V4=y | 126 | CONFIG_NFS_V4=y |
143 | CONFIG_ROOT_NFS=y | 127 | CONFIG_ROOT_NFS=y |
@@ -153,15 +137,9 @@ CONFIG_CRC_T10DIF=y | |||
153 | CONFIG_MAGIC_SYSRQ=y | 137 | CONFIG_MAGIC_SYSRQ=y |
154 | CONFIG_DEBUG_KERNEL=y | 138 | CONFIG_DEBUG_KERNEL=y |
155 | CONFIG_DETECT_HUNG_TASK=y | 139 | CONFIG_DETECT_HUNG_TASK=y |
156 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
157 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
158 | CONFIG_CRYPTO_ECB=m | ||
159 | CONFIG_CRYPTO_PCBC=m | 140 | CONFIG_CRYPTO_PCBC=m |
160 | CONFIG_CRYPTO_MD4=m | ||
161 | CONFIG_CRYPTO_MICHAEL_MIC=m | 141 | CONFIG_CRYPTO_MICHAEL_MIC=m |
162 | CONFIG_CRYPTO_SHA1=m | 142 | CONFIG_CRYPTO_SHA1=m |
163 | CONFIG_CRYPTO_AES=m | ||
164 | CONFIG_CRYPTO_ARC4=m | ||
165 | CONFIG_CRYPTO_BLOWFISH=m | 143 | CONFIG_CRYPTO_BLOWFISH=m |
166 | CONFIG_CRYPTO_SERPENT=m | 144 | CONFIG_CRYPTO_SERPENT=m |
167 | CONFIG_CRYPTO_TWOFISH=m | 145 | CONFIG_CRYPTO_TWOFISH=m |