diff options
author | David S. Miller <davem@davemloft.net> | 2014-09-24 13:44:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-24 14:34:20 -0400 |
commit | ff408ba1fc97aef86af5715641760a33f0928423 (patch) | |
tree | 7e51af09bc7614f1074e1b94e5352ba669a50f7b /arch | |
parent | af4de1b56816fdde40801d9f6c4a0e251f5f7047 (diff) |
s390: Update defconfigs which were missing CONFIG_NET.
Commit df568d8e ("scsi: Use 'depends' with LIBFC instead of
'select'.") removed what happened to be the only instance of 'select
NET'. Defconfigs that were relying on the select now lack networking
support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/configs/default_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/configs/gcov_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/configs/performance_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/configs/zfcpdump_defconfig | 1 | ||||
-rw-r--r-- | arch/s390/defconfig | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig index 3ca1894ade09..9d94fdd9f525 100644 --- a/arch/s390/configs/default_defconfig +++ b/arch/s390/configs/default_defconfig | |||
@@ -63,6 +63,7 @@ CONFIG_CRASH_DUMP=y | |||
63 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 63 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
64 | CONFIG_BINFMT_MISC=m | 64 | CONFIG_BINFMT_MISC=m |
65 | CONFIG_HIBERNATION=y | 65 | CONFIG_HIBERNATION=y |
66 | CONFIG_NET=y | ||
66 | CONFIG_PACKET=y | 67 | CONFIG_PACKET=y |
67 | CONFIG_PACKET_DIAG=m | 68 | CONFIG_PACKET_DIAG=m |
68 | CONFIG_UNIX=y | 69 | CONFIG_UNIX=y |
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig index 4830aa6e6f53..90f514baa37d 100644 --- a/arch/s390/configs/gcov_defconfig +++ b/arch/s390/configs/gcov_defconfig | |||
@@ -61,6 +61,7 @@ CONFIG_CRASH_DUMP=y | |||
61 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 61 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
62 | CONFIG_BINFMT_MISC=m | 62 | CONFIG_BINFMT_MISC=m |
63 | CONFIG_HIBERNATION=y | 63 | CONFIG_HIBERNATION=y |
64 | CONFIG_NET=y | ||
64 | CONFIG_PACKET=y | 65 | CONFIG_PACKET=y |
65 | CONFIG_PACKET_DIAG=m | 66 | CONFIG_PACKET_DIAG=m |
66 | CONFIG_UNIX=y | 67 | CONFIG_UNIX=y |
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig index 61db449bf309..13559d32af69 100644 --- a/arch/s390/configs/performance_defconfig +++ b/arch/s390/configs/performance_defconfig | |||
@@ -59,6 +59,7 @@ CONFIG_CRASH_DUMP=y | |||
59 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 59 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
60 | CONFIG_BINFMT_MISC=m | 60 | CONFIG_BINFMT_MISC=m |
61 | CONFIG_HIBERNATION=y | 61 | CONFIG_HIBERNATION=y |
62 | CONFIG_NET=y | ||
62 | CONFIG_PACKET=y | 63 | CONFIG_PACKET=y |
63 | CONFIG_PACKET_DIAG=m | 64 | CONFIG_PACKET_DIAG=m |
64 | CONFIG_UNIX=y | 65 | CONFIG_UNIX=y |
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig index 948e0e057a23..e376789f2d8d 100644 --- a/arch/s390/configs/zfcpdump_defconfig +++ b/arch/s390/configs/zfcpdump_defconfig | |||
@@ -23,6 +23,7 @@ CONFIG_CRASH_DUMP=y | |||
23 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 23 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
24 | # CONFIG_SECCOMP is not set | 24 | # CONFIG_SECCOMP is not set |
25 | # CONFIG_IUCV is not set | 25 | # CONFIG_IUCV is not set |
26 | CONFIG_NET=y | ||
26 | CONFIG_ATM=y | 27 | CONFIG_ATM=y |
27 | CONFIG_ATM_LANE=y | 28 | CONFIG_ATM_LANE=y |
28 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 29 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 2e56498a40df..fab35a8efa4f 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
@@ -50,6 +50,7 @@ CONFIG_CMA=y | |||
50 | CONFIG_CRASH_DUMP=y | 50 | CONFIG_CRASH_DUMP=y |
51 | CONFIG_BINFMT_MISC=m | 51 | CONFIG_BINFMT_MISC=m |
52 | CONFIG_HIBERNATION=y | 52 | CONFIG_HIBERNATION=y |
53 | CONFIG_NET=y | ||
53 | CONFIG_PACKET=y | 54 | CONFIG_PACKET=y |
54 | CONFIG_UNIX=y | 55 | CONFIG_UNIX=y |
55 | CONFIG_NET_KEY=y | 56 | CONFIG_NET_KEY=y |