Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / mips / include / asm / octeon / cvmx-rnm-defs.h

diff --git a/arch/mips/include/asm/octeon/cvmx-rnm-defs.h b/arch/mips/include/asm/octeon/cvmx-rnm-defs.h
index 87d6f92a548aa94cf98de7bed29d0b59ae43f73c..94295d2fe22e45db8631a13c836c14c9fdb9408a 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-rnm-defs.h
+++ b/arch/mips/include/asm/octeon/cvmx-rnm-defs.h
@@ -47,24 +47,6 @@ union cvmx_rnm_bist_status {
                uint64_t reserved_2_63:62;
 #endif
        } s;
-       struct cvmx_rnm_bist_status_s cn30xx;
-       struct cvmx_rnm_bist_status_s cn31xx;
-       struct cvmx_rnm_bist_status_s cn38xx;
-       struct cvmx_rnm_bist_status_s cn38xxp2;
-       struct cvmx_rnm_bist_status_s cn50xx;
-       struct cvmx_rnm_bist_status_s cn52xx;
-       struct cvmx_rnm_bist_status_s cn52xxp1;
-       struct cvmx_rnm_bist_status_s cn56xx;
-       struct cvmx_rnm_bist_status_s cn56xxp1;
-       struct cvmx_rnm_bist_status_s cn58xx;
-       struct cvmx_rnm_bist_status_s cn58xxp1;
-       struct cvmx_rnm_bist_status_s cn61xx;
-       struct cvmx_rnm_bist_status_s cn63xx;
-       struct cvmx_rnm_bist_status_s cn63xxp1;
-       struct cvmx_rnm_bist_status_s cn66xx;
-       struct cvmx_rnm_bist_status_s cn68xx;
-       struct cvmx_rnm_bist_status_s cn68xxp1;
-       struct cvmx_rnm_bist_status_s cnf71xx;
 };
 
 union cvmx_rnm_ctl_status {
@@ -109,9 +91,6 @@ union cvmx_rnm_ctl_status {
                uint64_t reserved_4_63:60;
 #endif
        } cn30xx;
-       struct cvmx_rnm_ctl_status_cn30xx cn31xx;
-       struct cvmx_rnm_ctl_status_cn30xx cn38xx;
-       struct cvmx_rnm_ctl_status_cn30xx cn38xxp2;
        struct cvmx_rnm_ctl_status_cn50xx {
 #ifdef __BIG_ENDIAN_BITFIELD
                uint64_t reserved_9_63:55;
@@ -131,13 +110,6 @@ union cvmx_rnm_ctl_status {
                uint64_t reserved_9_63:55;
 #endif
        } cn50xx;
-       struct cvmx_rnm_ctl_status_cn50xx cn52xx;
-       struct cvmx_rnm_ctl_status_cn50xx cn52xxp1;
-       struct cvmx_rnm_ctl_status_cn50xx cn56xx;
-       struct cvmx_rnm_ctl_status_cn50xx cn56xxp1;
-       struct cvmx_rnm_ctl_status_cn50xx cn58xx;
-       struct cvmx_rnm_ctl_status_cn50xx cn58xxp1;
-       struct cvmx_rnm_ctl_status_s cn61xx;
        struct cvmx_rnm_ctl_status_cn63xx {
 #ifdef __BIG_ENDIAN_BITFIELD
                uint64_t reserved_11_63:53;
@@ -161,11 +133,6 @@ union cvmx_rnm_ctl_status {
                uint64_t reserved_11_63:53;
 #endif
        } cn63xx;
-       struct cvmx_rnm_ctl_status_cn63xx cn63xxp1;
-       struct cvmx_rnm_ctl_status_s cn66xx;
-       struct cvmx_rnm_ctl_status_cn63xx cn68xx;
-       struct cvmx_rnm_ctl_status_cn63xx cn68xxp1;
-       struct cvmx_rnm_ctl_status_s cnf71xx;
 };
 
 union cvmx_rnm_eer_dbg {
@@ -177,13 +144,6 @@ union cvmx_rnm_eer_dbg {
                uint64_t dat:64;
 #endif
        } s;
-       struct cvmx_rnm_eer_dbg_s cn61xx;
-       struct cvmx_rnm_eer_dbg_s cn63xx;
-       struct cvmx_rnm_eer_dbg_s cn63xxp1;
-       struct cvmx_rnm_eer_dbg_s cn66xx;
-       struct cvmx_rnm_eer_dbg_s cn68xx;
-       struct cvmx_rnm_eer_dbg_s cn68xxp1;
-       struct cvmx_rnm_eer_dbg_s cnf71xx;
 };
 
 union cvmx_rnm_eer_key {
@@ -195,13 +155,6 @@ union cvmx_rnm_eer_key {
                uint64_t key:64;
 #endif
        } s;
-       struct cvmx_rnm_eer_key_s cn61xx;
-       struct cvmx_rnm_eer_key_s cn63xx;
-       struct cvmx_rnm_eer_key_s cn63xxp1;
-       struct cvmx_rnm_eer_key_s cn66xx;
-       struct cvmx_rnm_eer_key_s cn68xx;
-       struct cvmx_rnm_eer_key_s cn68xxp1;
-       struct cvmx_rnm_eer_key_s cnf71xx;
 };
 
 union cvmx_rnm_serial_num {
@@ -213,12 +166,6 @@ union cvmx_rnm_serial_num {
                uint64_t dat:64;
 #endif
        } s;
-       struct cvmx_rnm_serial_num_s cn61xx;
-       struct cvmx_rnm_serial_num_s cn63xx;
-       struct cvmx_rnm_serial_num_s cn66xx;
-       struct cvmx_rnm_serial_num_s cn68xx;
-       struct cvmx_rnm_serial_num_s cn68xxp1;
-       struct cvmx_rnm_serial_num_s cnf71xx;
 };
 
 #endif