Merge branch 'mips-next' of http://dev.phrozen.org/githttp/mips-next into mips-for-linux-next

1 files changed, 0 insertions, 17 deletions

diff --git a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
index b0dd4bb53f7..682bcf3b492 100644
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -15,23 +15,6 @@
 #define BCM963XX_NVRAM_OFFSET           0x580
 
 /*
- * nvram structure
- */
-struct bcm963xx_nvram {
-        u32     version;
-        u8      reserved1[256];
-        u8      name[16];
-        u32     main_tp_number;
-        u32     psi_size;
-        u32     mac_addr_count;
-        u8      mac_addr_base[6];
-        u8      reserved2[2];
-        u32     checksum_old;
-        u8      reserved3[720];
-        u32     checksum_high;
-};
-
-/*
  * board definition
  */
 struct board_info {