[src/netbsd-1-5]: src/sys/dev/vme Pull up revision 1.33 (requested by windsor):

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

details:   https://anonhg.NetBSD.org/src/rev/247fd731b9e3
branches:  netbsd-1-5
changeset: 491749:247fd731b9e3
user:      he <he%NetBSD.org@localhost>
date:      Tue May 15 21:08:14 2001 +0000

description:
Pull up revision 1.33 (requested by windsor):
  Fix build problem related to __HAVE_OLD_DISKLABEL.

diffstat:

 sys/dev/vme/xy.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r e7248d43931c -r 247fd731b9e3 sys/dev/vme/xy.c
--- a/sys/dev/vme/xy.c  Tue May 15 21:04:11 2001 +0000
+++ b/sys/dev/vme/xy.c  Tue May 15 21:08:14 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xy.c,v 1.25.2.3 2001/05/01 12:27:49 he Exp $   */
+/*     $NetBSD: xy.c,v 1.25.2.4 2001/05/15 21:08:14 he Exp $   */
 
 /*
  *
@@ -912,8 +912,10 @@
        struct xd_iocmd *xio;
        int     error, s, unit;
 #ifdef __HAVE_OLD_DISKLABEL
-       struct disklabel newlabel, *lp;
+       struct disklabel newlabel;
 #endif
+       struct disklabel *lp;
+
        unit = DISKUNIT(dev);
 
        if (unit >= xy_cd.cd_ndevs || (xy = xy_cd.cd_devs[unit]) == NULL)