Module Name: src
Committed By: nonaka
Date: Thu May 5 08:46:12 UTC 2011
Modified Files:
src/sys/arch/zaurus/zaurus: autoconf.c
Log Message:
Don't check device numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/zaurus/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/zaurus/autoconf.c
diff -u src/sys/arch/zaurus/zaurus/autoconf.c:1.9 src/sys/arch/zaurus/zaurus/autoconf.c:1.10
--- src/sys/arch/zaurus/zaurus/autoconf.c:1.9 Thu Nov 5 18:17:34 2009
+++ src/sys/arch/zaurus/zaurus/autoconf.c Thu May 5 08:46:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.9 2009/11/05 18:17:34 dyoung Exp $ */
+/* $NetBSD: autoconf.c,v 1.10 2011/05/05 08:46:12 nonaka Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2009/11/05 18:17:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2011/05/05 08:46:12 nonaka Exp $");
#include "opt_md.h"
@@ -192,15 +192,8 @@
continue;
if (is_valid_disk(dv)) {
- /*
- * Don't trust BIOS device numbers, try
- * to match the information passed by the
- * boot loader instead.
- */
- if ((bid->biosdev & 0x80) == 0 ||
- match_bootdisk(dv, bid) == 0)
- continue;
- goto bootdisk_found;
+ if (match_bootdisk(dv, bid))
+ goto bootdisk_found;
}
continue;
