[src/netbsd-1-5]: src/sys/dev/ic Apply patch (requested by he):

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

details:   https://anonhg.NetBSD.org/src/rev/50a98f3b863f
branches:  netbsd-1-5
changeset: 491735:50a98f3b863f
user:      he <he%NetBSD.org@localhost>
date:      Thu May 10 08:42:44 2001 +0000

description:
Apply patch (requested by he):
  Allow this to build on systems which do not define __HAVE_OLD_DISKLABEL.

diffstat:

 sys/dev/ic/ca.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 34ad9bbb6e40 -r 50a98f3b863f sys/dev/ic/ca.c
--- a/sys/dev/ic/ca.c   Wed May 09 23:04:16 2001 +0000
+++ b/sys/dev/ic/ca.c   Thu May 10 08:42:44 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ca.c,v 1.7.2.2 2001/05/01 17:05:50 he Exp $    */
+/*     $NetBSD: ca.c,v 1.7.2.3 2001/05/10 08:42:44 he Exp $    */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ca.c,v 1.7.2.2 2001/05/01 17:05:50 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ca.c,v 1.7.2.3 2001/05/10 08:42:44 he Exp $");
 
 #include "rnd.h"
 
@@ -380,9 +380,9 @@
                    /*sc->sc_dk.dk_openmask : */0, sc->sc_dk.dk_cpulabel);
                if (error == 0 && (cmd == DIOCWDINFO
 #ifdef __HAVE_OLD_DISKLABEL
-                   || cmd == ODIOCWDINFO)
+                   || cmd == ODIOCWDINFO
 #endif
-                   )
+                   ))
                        error = writedisklabel(CALABELDEV(dev), castrategy, 
                            sc->sc_dk.dk_label, sc->sc_dk.dk_cpulabel);