[src/netbsd-2-0]: src/sys/arch/i386/conf Pullup patch (requested by minoura i...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/30324a6d5596
branches:  netbsd-2-0
changeset: 560708:30324a6d5596
user:      jmc <jmc%NetBSD.org@localhost>
date:      Fri Apr 30 03:41:59 2004 +0000

description:
Pullup patch (requested by minoura in ticket #233)

Comment out ichlpcib.

diffstat:

 sys/arch/i386/conf/GENERIC        |  8 ++++----
 sys/arch/i386/conf/GENERIC_LAPTOP |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r b0f1a0ee4ad1 -r 30324a6d5596 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Thu Apr 29 22:04:47 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Apr 30 03:41:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.595 2004/03/14 08:09:42 minoura Exp $
+# $NetBSD: GENERIC,v 1.595.2.1 2004/04/30 03:41:59 jmc Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.595 $"
+#ident                 "GENERIC-$Revision: 1.595.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -350,7 +350,7 @@
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
 pceb*  at pci? dev ? function ?        # PCI-EISA bridges
 pcib*  at pci? dev ? function ?        # PCI-ISA bridges
-ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-ISA w/ watchdog support
+#ichlpcib* at pci? dev ? function ?    # Intel ICH PCI-ISA w/ watchdog support
 pcmb*  at pci? dev ? function ?        # PCI-MCA bridges
 ppb*   at pci? dev ? function ?        # PCI-PCI bridges
 # XXX 'puc's aren't really bridges, but there's no better place for them here
@@ -367,7 +367,7 @@
 isa0   at mainbus?
 isa0   at pceb?
 isa0   at pcib?
-isa0   at ichlpcib?
+#isa0  at ichlpcib?
 
 # PCMCIA bus support
 pcmcia* at pcic? controller ? socket ?
diff -r b0f1a0ee4ad1 -r 30324a6d5596 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Thu Apr 29 22:04:47 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Fri Apr 30 03:41:59 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.90 2004/03/14 08:09:42 minoura Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.90.2.1 2004/04/30 03:42:04 jmc Exp $
 #      From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #      GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.90 $"
+#ident                 "GENERIC-$Revision: 1.90.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -286,7 +286,7 @@
 # PCI bridges
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
 pcib*  at pci? dev ? function ?        # PCI-ISA bridges
-ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-ISA w/ watchdog support
+#ichlpcib* at pci? dev ? function ?    # Intel ICH PCI-ISA w/ watchdog support
 ppb*   at pci? dev ? function ?        # PCI-PCI bridges
 # XXX 'puc's aren't really bridges, but there's no better place for them here
 puc*   at pci? dev ? function ?        # PCI "universal" comm. cards
@@ -296,7 +296,7 @@
 # ISA bus support
 isa0   at mainbus?
 isa0   at pcib?
-isa0   at ichlpcib?
+#isa0  at ichlpcib?
 
 # PCMCIA bus support
 pcmcia*        at pcic? controller ? socket ?