aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2007-04-30 11:28:03 -0400
committerJeff Garzik <jeff@garzik.org>2007-05-08 01:23:09 -0400
commit8cb5f30a413e9b883b5e47637d9aee5e812dce24 (patch)
tree45b14a79e87efa48da7f7dd1950f374703e88233 /arch
parent57e386ce9d136261bc60a5223f39b179a3c11046 (diff)
MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX
Those boards do not need CONFIG_ISA if the ne driver could be selectable without it. Disable it and update a defconfig. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mips/configs/rbhma4500_defconfig31
2 files changed, 0 insertions, 33 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7441a2cf523e..b7cb048bc771 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -784,7 +784,6 @@ config TOSHIBA_RBTX4927
784 select HAS_TXX9_SERIAL 784 select HAS_TXX9_SERIAL
785 select HW_HAS_PCI 785 select HW_HAS_PCI
786 select I8259 786 select I8259
787 select ISA
788 select SWAP_IO_SPACE 787 select SWAP_IO_SPACE
789 select SYS_HAS_CPU_TX49XX 788 select SYS_HAS_CPU_TX49XX
790 select SYS_SUPPORTS_32BIT_KERNEL 789 select SYS_SUPPORTS_32BIT_KERNEL
@@ -806,7 +805,6 @@ config TOSHIBA_RBTX4938
806 select HAS_TXX9_SERIAL 805 select HAS_TXX9_SERIAL
807 select HW_HAS_PCI 806 select HW_HAS_PCI
808 select I8259 807 select I8259
809 select ISA
810 select SWAP_IO_SPACE 808 select SWAP_IO_SPACE
811 select SYS_HAS_CPU_TX49XX 809 select SYS_HAS_CPU_TX49XX
812 select SYS_SUPPORTS_32BIT_KERNEL 810 select SYS_SUPPORTS_32BIT_KERNEL
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 29e0df9f4be0..7d0f2174614e 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -245,7 +245,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
245# 245#
246CONFIG_HW_HAS_PCI=y 246CONFIG_HW_HAS_PCI=y
247CONFIG_PCI=y 247CONFIG_PCI=y
248CONFIG_ISA=y
249CONFIG_MMU=y 248CONFIG_MMU=y
250 249
251# 250#
@@ -573,7 +572,6 @@ CONFIG_MTD_CFI_UTIL=y
573# 572#
574# Plug and Play support 573# Plug and Play support
575# 574#
576# CONFIG_PNP is not set
577# CONFIG_PNPACPI is not set 575# CONFIG_PNPACPI is not set
578 576
579# 577#
@@ -658,7 +656,6 @@ CONFIG_BLK_DEV_IT8213=m
658# CONFIG_BLK_DEV_VIA82CXXX is not set 656# CONFIG_BLK_DEV_VIA82CXXX is not set
659CONFIG_BLK_DEV_TC86C001=m 657CONFIG_BLK_DEV_TC86C001=m
660# CONFIG_IDE_ARM is not set 658# CONFIG_IDE_ARM is not set
661# CONFIG_IDE_CHIPSETS is not set
662CONFIG_BLK_DEV_IDEDMA=y 659CONFIG_BLK_DEV_IDEDMA=y
663# CONFIG_IDEDMA_IVB is not set 660# CONFIG_IDEDMA_IVB is not set
664# CONFIG_IDEDMA_AUTO is not set 661# CONFIG_IDEDMA_AUTO is not set
@@ -677,11 +674,6 @@ CONFIG_RAID_ATTRS=m
677# CONFIG_ATA is not set 674# CONFIG_ATA is not set
678 675
679# 676#
680# Old CD-ROM drivers (not SCSI, not IDE)
681#
682# CONFIG_CD_NO_IDESCSI is not set
683
684#
685# Multi-device support (RAID and LVM) 677# Multi-device support (RAID and LVM)
686# 678#
687# CONFIG_MD is not set 679# CONFIG_MD is not set
@@ -742,37 +734,20 @@ CONFIG_NET_ETHERNET=y
742# CONFIG_SUNGEM is not set 734# CONFIG_SUNGEM is not set
743# CONFIG_CASSINI is not set 735# CONFIG_CASSINI is not set
744# CONFIG_NET_VENDOR_3COM is not set 736# CONFIG_NET_VENDOR_3COM is not set
745# CONFIG_NET_VENDOR_SMC is not set
746# CONFIG_DM9000 is not set 737# CONFIG_DM9000 is not set
747# CONFIG_NET_VENDOR_RACAL is not set
748 738
749# 739#
750# Tulip family network device support 740# Tulip family network device support
751# 741#
752# CONFIG_NET_TULIP is not set 742# CONFIG_NET_TULIP is not set
753# CONFIG_AT1700 is not set
754# CONFIG_DEPCA is not set
755# CONFIG_HP100 is not set 743# CONFIG_HP100 is not set
756CONFIG_NET_ISA=y
757# CONFIG_E2100 is not set
758# CONFIG_EWRK3 is not set
759# CONFIG_EEXPRESS is not set
760# CONFIG_EEXPRESS_PRO is not set
761# CONFIG_HPLAN_PLUS is not set
762# CONFIG_HPLAN is not set
763# CONFIG_LP486E is not set
764# CONFIG_ETH16I is not set
765CONFIG_NE2000=y 744CONFIG_NE2000=y
766# CONFIG_SEEQ8005 is not set
767CONFIG_NET_PCI=y 745CONFIG_NET_PCI=y
768# CONFIG_PCNET32 is not set 746# CONFIG_PCNET32 is not set
769# CONFIG_AMD8111_ETH is not set 747# CONFIG_AMD8111_ETH is not set
770# CONFIG_ADAPTEC_STARFIRE is not set 748# CONFIG_ADAPTEC_STARFIRE is not set
771# CONFIG_AC3200 is not set
772# CONFIG_APRICOT is not set
773# CONFIG_B44 is not set 749# CONFIG_B44 is not set
774# CONFIG_FORCEDETH is not set 750# CONFIG_FORCEDETH is not set
775# CONFIG_CS89x0 is not set
776# CONFIG_DGRS is not set 751# CONFIG_DGRS is not set
777# CONFIG_EEPRO100 is not set 752# CONFIG_EEPRO100 is not set
778# CONFIG_E100 is not set 753# CONFIG_E100 is not set
@@ -833,8 +808,6 @@ CONFIG_NET_RADIO=y
833# Obsolete Wireless cards support (pre-802.11) 808# Obsolete Wireless cards support (pre-802.11)
834# 809#
835# CONFIG_STRIP is not set 810# CONFIG_STRIP is not set
836# CONFIG_ARLAN is not set
837# CONFIG_WAVELAN is not set
838 811
839# 812#
840# Wireless 802.11b ISA/PCI cards support 813# Wireless 802.11b ISA/PCI cards support
@@ -920,9 +893,6 @@ CONFIG_KEYBOARD_ATKBD=y
920CONFIG_INPUT_MOUSE=y 893CONFIG_INPUT_MOUSE=y
921CONFIG_MOUSE_PS2=y 894CONFIG_MOUSE_PS2=y
922# CONFIG_MOUSE_SERIAL is not set 895# CONFIG_MOUSE_SERIAL is not set
923# CONFIG_MOUSE_INPORT is not set
924# CONFIG_MOUSE_LOGIBM is not set
925# CONFIG_MOUSE_PC110PAD is not set
926# CONFIG_MOUSE_VSXXXAA is not set 896# CONFIG_MOUSE_VSXXXAA is not set
927# CONFIG_INPUT_JOYSTICK is not set 897# CONFIG_INPUT_JOYSTICK is not set
928# CONFIG_INPUT_TOUCHSCREEN is not set 898# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -1072,7 +1042,6 @@ CONFIG_FB_ATY_CT=y
1072# 1042#
1073CONFIG_VGA_CONSOLE=y 1043CONFIG_VGA_CONSOLE=y
1074# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1044# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1075# CONFIG_MDA_CONSOLE is not set
1076CONFIG_DUMMY_CONSOLE=y 1045CONFIG_DUMMY_CONSOLE=y
1077# CONFIG_FRAMEBUFFER_CONSOLE is not set 1046# CONFIG_FRAMEBUFFER_CONSOLE is not set
1078 1047