aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/linkstation_defconfig
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 /arch/powerpc/configs/linkstation_defconfig
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 (limited to 'arch/powerpc/configs/linkstation_defconfig')
-rw-r--r--arch/powerpc/configs/linkstation_defconfig28
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 @@
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