From 15a8b83309ce3bf83b59c1226b4e426017abf561 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sun, 1 Apr 2001 01:01:46 +0000 Subject: Some more configuration file cleanup. --- arch/mips/config.in | 15 +++------------ arch/mips/defconfig | 15 ++++++++++----- arch/mips/defconfig-atlas | 9 ++++----- arch/mips/defconfig-ddb5476 | 11 +++++------ arch/mips/defconfig-decstation | 17 +++++++++++------ arch/mips/defconfig-ev64120 | 9 ++++----- arch/mips/defconfig-ev96100 | 9 ++++----- arch/mips/defconfig-ip22 | 15 ++++++++++----- arch/mips/defconfig-it8172 | 11 +++++------ arch/mips/defconfig-malta | 9 ++++----- arch/mips/defconfig-ocelot | 9 ++++----- arch/mips/defconfig-rm200 | 11 +++++------ 12 files changed, 69 insertions(+), 71 deletions(-) diff --git a/arch/mips/config.in b/arch/mips/config.in index 01dcc61b2..bffbad944 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -275,8 +275,6 @@ bool 'System V IPC' CONFIG_SYSVIPC bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL -source drivers/parport/Config.in - if [ "$CONFIG_DECSTATION" = "y" ]; then bool 'TURBOchannel support' CONFIG_TC # if [ "$CONFIG_TC" = "y" ]; then @@ -289,14 +287,10 @@ if [ "$CONFIG_ISA" = "y" ]; then source drivers/pnp/Config.in fi -if [ "$CONFIG_HOTPLUG" = "y" ] ; then - source drivers/pcmcia/Config.in -else - define_bool CONFIG_PCMCIA n -fi - source drivers/mtd/Config.in +source drivers/parport/Config.in + source drivers/block/Config.in source drivers/md/Config.in @@ -305,10 +299,7 @@ if [ "$CONFIG_NET" = "y" ]; then source net/Config.in fi -if [ "$CONFIG_DECSTATION" != "y" -a \ - "$CONFIG_SGI_IP22" != "y" ]; then - source drivers/telephony/Config.in -fi +source drivers/telephony/Config.in if [ "$CONFIG_SGI_IP22" != "y" -a \ "$CONFIG_DECSTATION" != "y" ]; then diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 809f0aefd..161d9a0b3 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -88,15 +88,14 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices @@ -167,6 +166,12 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_NET_SCHED is not set +# +# Telephony Support +# +# CONFIG_PHONE is not set +# CONFIG_PHONE_IXJ is not set + # # SCSI support # diff --git a/arch/mips/defconfig-atlas b/arch/mips/defconfig-atlas index 1ec0f8c2f..60615a416 100644 --- a/arch/mips/defconfig-atlas +++ b/arch/mips/defconfig-atlas @@ -83,15 +83,14 @@ CONFIG_SYSVIPC=y # CONFIG_SYSCTL is not set # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices diff --git a/arch/mips/defconfig-ddb5476 b/arch/mips/defconfig-ddb5476 index 3dc5df3a4..8be2e01a3 100644 --- a/arch/mips/defconfig-ddb5476 +++ b/arch/mips/defconfig-ddb5476 @@ -82,23 +82,22 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -# -# Parallel port support -# -# CONFIG_PARPORT is not set - # # Plug and Play configuration # # CONFIG_PNP is not set # CONFIG_ISAPNP is not set -# CONFIG_PCMCIA is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set +# +# Parallel port support +# +# CONFIG_PARPORT is not set + # # Block devices # diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index 719880a9e..e1dc88291 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -79,19 +79,18 @@ CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y - -# -# Parallel port support -# -# CONFIG_PARPORT is not set CONFIG_TC=y -# CONFIG_PCMCIA is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set +# +# Parallel port support +# +# CONFIG_PARPORT is not set + # # Block devices # @@ -161,6 +160,12 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_NET_SCHED is not set +# +# Telephony Support +# +# CONFIG_PHONE is not set +# CONFIG_PHONE_IXJ is not set + # # SCSI support # diff --git a/arch/mips/defconfig-ev64120 b/arch/mips/defconfig-ev64120 index 195c2e464..7168b6b28 100644 --- a/arch/mips/defconfig-ev64120 +++ b/arch/mips/defconfig-ev64120 @@ -90,15 +90,14 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices diff --git a/arch/mips/defconfig-ev96100 b/arch/mips/defconfig-ev96100 index e5eb25deb..46677f4a4 100644 --- a/arch/mips/defconfig-ev96100 +++ b/arch/mips/defconfig-ev96100 @@ -86,15 +86,14 @@ CONFIG_NET=y # CONFIG_SYSCTL is not set # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index 809f0aefd..161d9a0b3 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -88,15 +88,14 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices @@ -167,6 +166,12 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_NET_SCHED is not set +# +# Telephony Support +# +# CONFIG_PHONE is not set +# CONFIG_PHONE_IXJ is not set + # # SCSI support # diff --git a/arch/mips/defconfig-it8172 b/arch/mips/defconfig-it8172 index 8f0cfe2be..e65529358 100644 --- a/arch/mips/defconfig-it8172 +++ b/arch/mips/defconfig-it8172 @@ -88,12 +88,6 @@ CONFIG_SYSVIPC=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSCTL=y -# -# Parallel port support -# -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set - # # Memory Technology Devices (MTD) # @@ -147,6 +141,11 @@ CONFIG_MTD_CHAR=y # CONFIG_FTL is not set # CONFIG_NFTL is not set +# +# Parallel port support +# +# CONFIG_PARPORT is not set + # # Block devices # diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta index 708a07f88..04dcae7d8 100644 --- a/arch/mips/defconfig-malta +++ b/arch/mips/defconfig-malta @@ -82,15 +82,14 @@ CONFIG_SYSVIPC=y # CONFIG_SYSCTL is not set # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices diff --git a/arch/mips/defconfig-ocelot b/arch/mips/defconfig-ocelot index f37366e4c..e04cce8cc 100644 --- a/arch/mips/defconfig-ocelot +++ b/arch/mips/defconfig-ocelot @@ -84,15 +84,14 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y # -# Parallel port support +# Memory Technology Devices (MTD) # -# CONFIG_PARPORT is not set -# CONFIG_PCMCIA is not set +# CONFIG_MTD is not set # -# Memory Technology Devices (MTD) +# Parallel port support # -# CONFIG_MTD is not set +# CONFIG_PARPORT is not set # # Block devices diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200 index a4eb315d9..6d77c4a3c 100644 --- a/arch/mips/defconfig-rm200 +++ b/arch/mips/defconfig-rm200 @@ -85,23 +85,22 @@ CONFIG_NET=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y -# -# Parallel port support -# -# CONFIG_PARPORT is not set - # # Plug and Play configuration # # CONFIG_PNP is not set # CONFIG_ISAPNP is not set -# CONFIG_PCMCIA is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set +# +# Parallel port support +# +# CONFIG_PARPORT is not set + # # Block devices # -- cgit v1.2.3