summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/isa.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-04-16 23:39:15 +0000
committerpeter <peter@FreeBSD.org>1999-04-16 23:39:15 +0000
commit3ecea8861d683edff8b0c13aad47e44218d8285d (patch)
tree46b1818201ff3d4654a6df00a0a0a1bd76f4ed8b /sys/i386/isa/isa.c
parent245187b52e39f3a1ae09419cc38aeec38b683465 (diff)
downloadFreeBSD-src-3ecea8861d683edff8b0c13aad47e44218d8285d.zip
FreeBSD-src-3ecea8861d683edff8b0c13aad47e44218d8285d.tar.gz
As a temporary anti-foot-shooting measure, don't let the user attach
the atkbd device to isa, as was in the old (and 3.x) GENERIC config.
Diffstat (limited to 'sys/i386/isa/isa.c')
-rw-r--r--sys/i386/isa/isa.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 4b48e36..5ec5f03 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: isa.c,v 1.4 1998/09/16 08:23:51 dfr Exp $
+ * $Id: isa.c,v 1.119 1999/04/16 21:22:23 peter Exp $
*/
/*
@@ -183,6 +183,8 @@ isa_probe(device_t dev)
for (i = resource_query_string(-1, "at", buf);
i != -1;
i = resource_query_string(i, "at", buf)) {
+ if (strcmp(resource_query_name(i), "atkbd") == 0)
+ continue; /* old GENERIC kludge */
isa_add_device(dev, resource_query_name(i),
resource_query_unit(i));
}
@@ -193,6 +195,8 @@ isa_probe(device_t dev)
for (i = resource_query_string(-1, "at", "isa");
i != -1;
i = resource_query_string(i, "at", "isa")) {
+ if (strcmp(resource_query_name(i), "atkbd") == 0)
+ continue; /* old GENERIC kludge */
isa_add_device(dev, resource_query_name(i),
resource_query_unit(i));
}
OpenPOWER on IntegriCloud