1 files changed, 13 insertions, 5 deletions

diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index 254e9954ed7..f72f768cd3a 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -8,7 +8,7 @@
 #ifndef __ASM_OCTEON_OCTEON_H
 #define __ASM_OCTEON_OCTEON_H
 
-#include <asm/octeon/cvmx.h>
+#include "cvmx.h"
 
 extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
                                                 uint64_t alignment,
@@ -52,7 +52,6 @@ extern asmlinkage void octeon_cop2_restore(struct octeon_cop2_state *task);
 
 extern void octeon_init_cvmcount(void);
 extern void octeon_setup_delays(void);
-extern void octeon_io_clk_delay(unsigned long);
 
 #define OCTEON_ARGV_MAX_ARGS    64
 #define OCTOEN_SERIAL_LEN       20
@@ -209,6 +208,18 @@ union octeon_cvmemctl {
         } s;
 };
 
+struct octeon_cf_data {
+        unsigned long   base_region_bias;
+        unsigned int    base_region;    /* The chip select region used by CF */
+        int             is16bit;        /* 0 - 8bit, !0 - 16bit */
+        int             dma_engine;     /* -1 for no DMA */
+};
+
+struct octeon_i2c_data {
+        unsigned int    sys_freq;
+        unsigned int    i2c_freq;
+};
+
 extern void octeon_write_lcd(const char *s);
 extern void octeon_check_cpu_bist(void);
 extern int octeon_get_boot_debug_flag(void);
@@ -248,7 +259,4 @@ extern uint64_t octeon_bootloader_entry_addr;
 
 extern void (*octeon_irq_setup_secondary)(void);
 
-typedef void (*octeon_irq_ip4_handler_t)(void);
-void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t);
-
 #endif /* __ASM_OCTEON_OCTEON_H */