[src/trunk]: src/sys/arch/arm/include G/c the unused (and #if 0'd) bits of cp...

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

details:   https://anonhg.NetBSD.org/src/rev/4542d653e468
branches:  trunk
changeset: 518159:4542d653e468
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Nov 25 19:02:03 2001 +0000

description:
G/c the unused (and #if 0'd) bits of cpu_disklabel.  Fetch disklabel_acorn.h
from the correct place.

diffstat:

 sys/arch/arm/include/disklabel.h |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (45 lines):

diff -r 35125f2dab41 -r 4542d653e468 sys/arch/arm/include/disklabel.h
--- a/sys/arch/arm/include/disklabel.h  Sun Nov 25 18:49:02 2001 +0000
+++ b/sys/arch/arm/include/disklabel.h  Sun Nov 25 19:02:03 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.1 2001/01/10 19:02:05 bjh21 Exp $      */
+/*     $NetBSD: disklabel.h,v 1.2 2001/11/25 19:02:03 thorpej Exp $    */
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -43,8 +43,8 @@
  * Created      : 04/10/94
  */
 
-#ifndef _MACHINE_DISKLABEL_H_
-#define _MACHINE_DISKLABEL_H_
+#ifndef _ARM_DISKLABEL_H_
+#define _ARM_DISKLABEL_H_
 
 #define LABELSECTOR    1               /* sector containing label */
 #define LABELOFFSET    0               /* offset of label in sector */
@@ -52,15 +52,10 @@
 #define RAW_PART       2               /* raw partition: XX?c */
 
 #include <sys/dkbad.h>
-#include <machine/disklabel_acorn.h>
+#include <sys/disklabel_acorn.h>
 #include <sys/disklabel_mbr.h>
 
 struct cpu_disklabel {
-#if 0 /* XXX not actually used by anything */
-       u_int pad0;
-       u_int pad1;
-       struct riscbsd_partition partitions[NRISCBSD_PARTITIONS];
-#endif
        struct mbr_partition mbrparts[NMBRPART];
        struct dkbad bad;
 };
@@ -79,6 +74,4 @@
            struct disklabel *, struct cpu_disklabel *, int *, int *));
 #endif /* _KERNEL */
 
-#endif /* _MACHINE_DISKLABEL_H_ */
-
-/* End of disklabel.h */
+#endif /* _ARM_DISKLABEL_H_ */