diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-27 00:12:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-27 00:12:58 +0000 |
| commit | 58913b6073d4cf2138b201fc8034c834a5123302 (patch) | |
| tree | 7bf6a24494b1a0dd309f95346a61c0ecb2037b15 | |
| parent | 5ba8d2c6b76ceb5b7cf229c4e30f0b880aeefc5d (diff) | |
Cleanup CONFIG_SGI_IP35.
| -rw-r--r-- | arch/mips/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/config.in | 1 | ||||
| -rw-r--r-- | arch/mips64/config.in | 2 | ||||
| -rw-r--r-- | arch/mips64/defconfig | 1 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip22 | 1 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip27 | 1 | ||||
| -rw-r--r-- | drivers/Makefile | 8 |
7 files changed, 7 insertions, 8 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 80beb11dc..c433f10d7 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -1,4 +1,3 @@ -# $Id: Makefile,v 1.22 2000/01/26 00:07:44 ralf Exp $ # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive diff --git a/arch/mips/config.in b/arch/mips/config.in index 9327d2424..314e06976 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -67,6 +67,7 @@ fi if [ "$CONFIG_SGI_IP22" = "y" ]; then define_bool CONFIG_ARC32 y define_bool CONFIG_PC_KEYB y + define_bool CONFIG_SGI fi if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then define_bool CONFIG_ARC32 y diff --git a/arch/mips64/config.in b/arch/mips64/config.in index 907bedbce..5ffba3f51 100644 --- a/arch/mips64/config.in +++ b/arch/mips64/config.in @@ -43,6 +43,7 @@ if [ "$CONFIG_SGI_IP22" = "y" ]; then define_bool CONFIG_ARC32 y define_bool CONFIG_BOARD_SCACHE y define_bool CONFIG_ARC_MEMORY y + define_bool CONFIG_SGI y fi if [ "$CONFIG_SGI_IP27" = "y" ]; then @@ -51,6 +52,7 @@ if [ "$CONFIG_SGI_IP27" = "y" ]; then define_bool CONFIG_COHERENT_IO y define_bool CONFIG_PCI y define_bool CONFIG_QL_ISP_A64 y + define_bool CONFIG_SGI y fi if [ "$CONFIG_ISA" != "y" ]; then diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index 72aa28cbc..6f4cc267d 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -23,6 +23,7 @@ CONFIG_ARC64=y CONFIG_COHERENT_IO=y CONFIG_PCI=y CONFIG_QL_ISP_A64=y +CONFIG_SGI=y # CONFIG_ISA is not set # CONFIG_SBUS is not set diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22 index 50e0132a2..daa8accb0 100644 --- a/arch/mips64/defconfig-ip22 +++ b/arch/mips64/defconfig-ip22 @@ -16,6 +16,7 @@ CONFIG_BOOT_ELF32=y CONFIG_ARC32=y CONFIG_BOARD_SCACHE=y CONFIG_ARC_MEMORY=y +CONFIG_SGI=y # CONFIG_ISA is not set # CONFIG_PCI is not set # CONFIG_SBUS is not set diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index 72aa28cbc..6f4cc267d 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -23,6 +23,7 @@ CONFIG_ARC64=y CONFIG_COHERENT_IO=y CONFIG_PCI=y CONFIG_QL_ISP_A64=y +CONFIG_SGI=y # CONFIG_ISA is not set # CONFIG_SBUS is not set diff --git a/drivers/Makefile b/drivers/Makefile index 4c245234e..9d42ab23d 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -80,17 +80,11 @@ else endif endif -ifdef CONFIG_SGI_IP22 +ifdef CONFIG_SGI SUB_DIRS += sgi MOD_SUB_DIRS += sgi endif -ifdef CONFIG_SGI_IP35 -SUB_DIRS += sgi -MOD_SUB_DIRS += sgi -endif - - ifeq ($(CONFIG_I2O),y) SUB_DIRS += i2o MOD_SUB_DIRS += i2o |