aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/include/asm')
-rw-r--r--arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h2
-rw-r--r--arch/mips/include/asm/mach-pnx833x/gpio.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-asm.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-cmd-queue.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-fpa.h4
-rw-r--r--arch/mips/include/asm/octeon/cvmx-helper-board.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-helper.h20
-rw-r--r--arch/mips/include/asm/octeon/cvmx-mdio.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-pip.h6
-rw-r--r--arch/mips/include/asm/octeon/cvmx-pko.h8
-rw-r--r--arch/mips/include/asm/octeon/cvmx-pow.h4
-rw-r--r--arch/mips/include/asm/octeon/cvmx-spi.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-spinlock.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx-wqe.h2
-rw-r--r--arch/mips/include/asm/octeon/cvmx.h36
-rw-r--r--arch/mips/include/asm/octeon/octeon-model.h2
-rw-r--r--arch/mips/include/asm/octeon/octeon.h2
-rw-r--r--arch/mips/include/asm/sibyte/bcm1480_int.h2
-rw-r--r--arch/mips/include/asm/sibyte/bcm1480_l2c.h2
-rw-r--r--arch/mips/include/asm/sibyte/bcm1480_mc.h2
-rw-r--r--arch/mips/include/asm/sibyte/bcm1480_regs.h4
-rw-r--r--arch/mips/include/asm/sibyte/bcm1480_scd.h4
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_dma.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_genbus.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_int.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_l2c.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_ldt.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_mac.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_mc.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_regs.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_scd.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_smbus.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_syncser.h2
-rw-r--r--arch/mips/include/asm/sibyte/sb1250_uart.h2
34 files changed, 69 insertions, 69 deletions
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
index 9203d90e610c..03a54df5fb86 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
@@ -1,7 +1,7 @@
1#ifndef BCM63XX_IO_H_ 1#ifndef BCM63XX_IO_H_
2#define BCM63XX_IO_H_ 2#define BCM63XX_IO_H_
3 3
4#include "bcm63xx_cpu.h" 4#include <asm/mach-bcm63xx/bcm63xx_cpu.h>
5 5
6/* 6/*
7 * Physical memory map, RAM is mapped at 0x0. 7 * Physical memory map, RAM is mapped at 0x0.
diff --git a/arch/mips/include/asm/mach-pnx833x/gpio.h b/arch/mips/include/asm/mach-pnx833x/gpio.h
index ed3a88da70f6..f192acf4a8af 100644
--- a/arch/mips/include/asm/mach-pnx833x/gpio.h
+++ b/arch/mips/include/asm/mach-pnx833x/gpio.h
@@ -30,7 +30,7 @@
30 - including locking between different uses 30 - including locking between different uses
31*/ 31*/
32 32
33#include "pnx833x.h" 33#include <asm/mach-pnx833x/pnx833x.h>
34 34
35#define SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0) 35#define SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0)
36#define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0) 36#define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0)
diff --git a/arch/mips/include/asm/octeon/cvmx-asm.h b/arch/mips/include/asm/octeon/cvmx-asm.h
index 5de5de95311b..31eacc24b775 100644
--- a/arch/mips/include/asm/octeon/cvmx-asm.h
+++ b/arch/mips/include/asm/octeon/cvmx-asm.h
@@ -32,7 +32,7 @@
32#ifndef __CVMX_ASM_H__ 32#ifndef __CVMX_ASM_H__
33#define __CVMX_ASM_H__ 33#define __CVMX_ASM_H__
34 34
35#include "octeon-model.h" 35#include <asm/octeon/octeon-model.h>
36 36
37/* other useful stuff */ 37/* other useful stuff */
38#define CVMX_SYNC asm volatile ("sync" : : : "memory") 38#define CVMX_SYNC asm volatile ("sync" : : : "memory")
diff --git a/arch/mips/include/asm/octeon/cvmx-cmd-queue.h b/arch/mips/include/asm/octeon/cvmx-cmd-queue.h
index 614653b686a0..fed91125317f 100644
--- a/arch/mips/include/asm/octeon/cvmx-cmd-queue.h
+++ b/arch/mips/include/asm/octeon/cvmx-cmd-queue.h
@@ -76,7 +76,7 @@
76 76
77#include <linux/prefetch.h> 77#include <linux/prefetch.h>
78 78
79#include "cvmx-fpa.h" 79#include <asm/octeon/cvmx-fpa.h>
80/** 80/**
81 * By default we disable the max depth support. Most programs 81 * By default we disable the max depth support. Most programs
82 * don't use it and it slows down the command queue processing 82 * don't use it and it slows down the command queue processing
diff --git a/arch/mips/include/asm/octeon/cvmx-fpa.h b/arch/mips/include/asm/octeon/cvmx-fpa.h
index 1f04f9658736..541a1ae02b6f 100644
--- a/arch/mips/include/asm/octeon/cvmx-fpa.h
+++ b/arch/mips/include/asm/octeon/cvmx-fpa.h
@@ -36,8 +36,8 @@
36#ifndef __CVMX_FPA_H__ 36#ifndef __CVMX_FPA_H__
37#define __CVMX_FPA_H__ 37#define __CVMX_FPA_H__
38 38
39#include "cvmx-address.h" 39#include <asm/octeon/cvmx-address.h>
40#include "cvmx-fpa-defs.h" 40#include <asm/octeon/cvmx-fpa-defs.h>
41 41
42#define CVMX_FPA_NUM_POOLS 8 42#define CVMX_FPA_NUM_POOLS 8
43#define CVMX_FPA_MIN_BLOCK_SIZE 128 43#define CVMX_FPA_MIN_BLOCK_SIZE 128
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-board.h b/arch/mips/include/asm/octeon/cvmx-helper-board.h
index 88527fa835c9..442f508eaac9 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-board.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-board.h
@@ -34,7 +34,7 @@
34#ifndef __CVMX_HELPER_BOARD_H__ 34#ifndef __CVMX_HELPER_BOARD_H__
35#define __CVMX_HELPER_BOARD_H__ 35#define __CVMX_HELPER_BOARD_H__
36 36
37#include "cvmx-helper.h" 37#include <asm/octeon/cvmx-helper.h>
38 38
39typedef enum { 39typedef enum {
40 set_phy_link_flags_autoneg = 0x1, 40 set_phy_link_flags_autoneg = 0x1,
diff --git a/arch/mips/include/asm/octeon/cvmx-helper.h b/arch/mips/include/asm/octeon/cvmx-helper.h
index 0ac6b9f412be..691c8142cd4f 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper.h
@@ -34,9 +34,9 @@
34#ifndef __CVMX_HELPER_H__ 34#ifndef __CVMX_HELPER_H__
35#define __CVMX_HELPER_H__ 35#define __CVMX_HELPER_H__
36 36
37#include "cvmx-config.h" 37#include <asm/octeon/cvmx-config.h>
38#include "cvmx-fpa.h" 38#include <asm/octeon/cvmx-fpa.h>
39#include "cvmx-wqe.h" 39#include <asm/octeon/cvmx-wqe.h>
40 40
41typedef enum { 41typedef enum {
42 CVMX_HELPER_INTERFACE_MODE_DISABLED, 42 CVMX_HELPER_INTERFACE_MODE_DISABLED,
@@ -62,13 +62,13 @@ typedef union {
62} cvmx_helper_link_info_t; 62} cvmx_helper_link_info_t;
63 63
64#include <asm/octeon/cvmx-helper-errata.h> 64#include <asm/octeon/cvmx-helper-errata.h>
65#include "cvmx-helper-loop.h" 65#include <asm/octeon/cvmx-helper-loop.h>
66#include "cvmx-helper-npi.h" 66#include <asm/octeon/cvmx-helper-npi.h>
67#include "cvmx-helper-rgmii.h" 67#include <asm/octeon/cvmx-helper-rgmii.h>
68#include "cvmx-helper-sgmii.h" 68#include <asm/octeon/cvmx-helper-sgmii.h>
69#include "cvmx-helper-spi.h" 69#include <asm/octeon/cvmx-helper-spi.h>
70#include "cvmx-helper-util.h" 70#include <asm/octeon/cvmx-helper-util.h>
71#include "cvmx-helper-xaui.h" 71#include <asm/octeon/cvmx-helper-xaui.h>
72 72
73/** 73/**
74 * cvmx_override_pko_queue_priority(int ipd_port, uint64_t 74 * cvmx_override_pko_queue_priority(int ipd_port, uint64_t
diff --git a/arch/mips/include/asm/octeon/cvmx-mdio.h b/arch/mips/include/asm/octeon/cvmx-mdio.h
index d88ab8d8e37d..6f0cd182cec8 100644
--- a/arch/mips/include/asm/octeon/cvmx-mdio.h
+++ b/arch/mips/include/asm/octeon/cvmx-mdio.h
@@ -35,7 +35,7 @@
35#ifndef __CVMX_MIO_H__ 35#ifndef __CVMX_MIO_H__
36#define __CVMX_MIO_H__ 36#define __CVMX_MIO_H__
37 37
38#include "cvmx-smix-defs.h" 38#include <asm/octeon/cvmx-smix-defs.h>
39 39
40/** 40/**
41 * PHY register 0 from the 802.3 spec 41 * PHY register 0 from the 802.3 spec
diff --git a/arch/mips/include/asm/octeon/cvmx-pip.h b/arch/mips/include/asm/octeon/cvmx-pip.h
index 78dbce8f2c5e..9e739a640855 100644
--- a/arch/mips/include/asm/octeon/cvmx-pip.h
+++ b/arch/mips/include/asm/octeon/cvmx-pip.h
@@ -33,9 +33,9 @@
33#ifndef __CVMX_PIP_H__ 33#ifndef __CVMX_PIP_H__
34#define __CVMX_PIP_H__ 34#define __CVMX_PIP_H__
35 35
36#include "cvmx-wqe.h" 36#include <asm/octeon/cvmx-wqe.h>
37#include "cvmx-fpa.h" 37#include <asm/octeon/cvmx-fpa.h>
38#include "cvmx-pip-defs.h" 38#include <asm/octeon/cvmx-pip-defs.h>
39 39
40#define CVMX_PIP_NUM_INPUT_PORTS 40 40#define CVMX_PIP_NUM_INPUT_PORTS 40
41#define CVMX_PIP_NUM_WATCHERS 4 41#define CVMX_PIP_NUM_WATCHERS 4
diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index de3412aada5d..c6daeedf1f81 100644
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -58,10 +58,10 @@
58#ifndef __CVMX_PKO_H__ 58#ifndef __CVMX_PKO_H__
59#define __CVMX_PKO_H__ 59#define __CVMX_PKO_H__
60 60
61#include "cvmx-fpa.h" 61#include <asm/octeon/cvmx-fpa.h>
62#include "cvmx-pow.h" 62#include <asm/octeon/cvmx-pow.h>
63#include "cvmx-cmd-queue.h" 63#include <asm/octeon/cvmx-cmd-queue.h>
64#include "cvmx-pko-defs.h" 64#include <asm/octeon/cvmx-pko-defs.h>
65 65
66/* Adjust the command buffer size by 1 word so that in the case of using only 66/* Adjust the command buffer size by 1 word so that in the case of using only
67 * two word PKO commands no command words stradle buffers. The useful values 67 * two word PKO commands no command words stradle buffers. The useful values
diff --git a/arch/mips/include/asm/octeon/cvmx-pow.h b/arch/mips/include/asm/octeon/cvmx-pow.h
index 999aefe3274c..92742b241a51 100644
--- a/arch/mips/include/asm/octeon/cvmx-pow.h
+++ b/arch/mips/include/asm/octeon/cvmx-pow.h
@@ -53,8 +53,8 @@
53 53
54#include <asm/octeon/cvmx-pow-defs.h> 54#include <asm/octeon/cvmx-pow-defs.h>
55 55
56#include "cvmx-scratch.h" 56#include <asm/octeon/cvmx-scratch.h>
57#include "cvmx-wqe.h" 57#include <asm/octeon/cvmx-wqe.h>
58 58
59/* Default to having all POW constancy checks turned on */ 59/* Default to having all POW constancy checks turned on */
60#ifndef CVMX_ENABLE_POW_CHECKS 60#ifndef CVMX_ENABLE_POW_CHECKS
diff --git a/arch/mips/include/asm/octeon/cvmx-spi.h b/arch/mips/include/asm/octeon/cvmx-spi.h
index e814648953a5..3bf53b537bcf 100644
--- a/arch/mips/include/asm/octeon/cvmx-spi.h
+++ b/arch/mips/include/asm/octeon/cvmx-spi.h
@@ -32,7 +32,7 @@
32#ifndef __CVMX_SPI_H__ 32#ifndef __CVMX_SPI_H__
33#define __CVMX_SPI_H__ 33#define __CVMX_SPI_H__
34 34
35#include "cvmx-gmxx-defs.h" 35#include <asm/octeon/cvmx-gmxx-defs.h>
36 36
37/* CSR typedefs have been moved to cvmx-csr-*.h */ 37/* CSR typedefs have been moved to cvmx-csr-*.h */
38 38
diff --git a/arch/mips/include/asm/octeon/cvmx-spinlock.h b/arch/mips/include/asm/octeon/cvmx-spinlock.h
index 2fbf0871df11..a672abb1bc4f 100644
--- a/arch/mips/include/asm/octeon/cvmx-spinlock.h
+++ b/arch/mips/include/asm/octeon/cvmx-spinlock.h
@@ -35,7 +35,7 @@
35#ifndef __CVMX_SPINLOCK_H__ 35#ifndef __CVMX_SPINLOCK_H__
36#define __CVMX_SPINLOCK_H__ 36#define __CVMX_SPINLOCK_H__
37 37
38#include "cvmx-asm.h" 38#include <asm/octeon/cvmx-asm.h>
39 39
40/* Spinlocks for Octeon */ 40/* Spinlocks for Octeon */
41 41
diff --git a/arch/mips/include/asm/octeon/cvmx-wqe.h b/arch/mips/include/asm/octeon/cvmx-wqe.h
index 653610953d28..df762389e271 100644
--- a/arch/mips/include/asm/octeon/cvmx-wqe.h
+++ b/arch/mips/include/asm/octeon/cvmx-wqe.h
@@ -40,7 +40,7 @@
40#ifndef __CVMX_WQE_H__ 40#ifndef __CVMX_WQE_H__
41#define __CVMX_WQE_H__ 41#define __CVMX_WQE_H__
42 42
43#include "cvmx-packet.h" 43#include <asm/octeon/cvmx-packet.h>
44 44
45 45
46#define OCT_TAG_TYPE_STRING(x) \ 46#define OCT_TAG_TYPE_STRING(x) \
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
index 740be97a3251..db58beab6cb2 100644
--- a/arch/mips/include/asm/octeon/cvmx.h
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -52,24 +52,24 @@ enum cvmx_mips_space {
52#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add)) 52#define CVMX_ADD_IO_SEG(add) CVMX_ADD_SEG(CVMX_IO_SEG, (add))
53#endif 53#endif
54 54
55#include "cvmx-asm.h" 55#include <asm/octeon/cvmx-asm.h>
56#include "cvmx-packet.h" 56#include <asm/octeon/cvmx-packet.h>
57#include "cvmx-sysinfo.h" 57#include <asm/octeon/cvmx-sysinfo.h>
58 58
59#include "cvmx-ciu-defs.h" 59#include <asm/octeon/cvmx-ciu-defs.h>
60#include "cvmx-gpio-defs.h" 60#include <asm/octeon/cvmx-gpio-defs.h>
61#include "cvmx-iob-defs.h" 61#include <asm/octeon/cvmx-iob-defs.h>
62#include "cvmx-ipd-defs.h" 62#include <asm/octeon/cvmx-ipd-defs.h>
63#include "cvmx-l2c-defs.h" 63#include <asm/octeon/cvmx-l2c-defs.h>
64#include "cvmx-l2d-defs.h" 64#include <asm/octeon/cvmx-l2d-defs.h>
65#include "cvmx-l2t-defs.h" 65#include <asm/octeon/cvmx-l2t-defs.h>
66#include "cvmx-led-defs.h" 66#include <asm/octeon/cvmx-led-defs.h>
67#include "cvmx-mio-defs.h" 67#include <asm/octeon/cvmx-mio-defs.h>
68#include "cvmx-pow-defs.h" 68#include <asm/octeon/cvmx-pow-defs.h>
69 69
70#include "cvmx-bootinfo.h" 70#include <asm/octeon/cvmx-bootinfo.h>
71#include "cvmx-bootmem.h" 71#include <asm/octeon/cvmx-bootmem.h>
72#include "cvmx-l2c.h" 72#include <asm/octeon/cvmx-l2c.h>
73 73
74#ifndef CVMX_ENABLE_DEBUG_PRINTS 74#ifndef CVMX_ENABLE_DEBUG_PRINTS
75#define CVMX_ENABLE_DEBUG_PRINTS 1 75#define CVMX_ENABLE_DEBUG_PRINTS 1
diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h
index 4e338a4d9424..23b895cb260b 100644
--- a/arch/mips/include/asm/octeon/octeon-model.h
+++ b/arch/mips/include/asm/octeon/octeon-model.h
@@ -313,6 +313,6 @@ static inline int __octeon_is_model_runtime__(uint32_t model)
313const char *octeon_model_get_string(uint32_t chip_id); 313const char *octeon_model_get_string(uint32_t chip_id);
314const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer); 314const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
315 315
316#include "octeon-feature.h" 316#include <asm/octeon/octeon-feature.h>
317 317
318#endif /* __OCTEON_MODEL_H__ */ 318#endif /* __OCTEON_MODEL_H__ */
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index 1e2486e23573..c4a1b31966bb 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -8,7 +8,7 @@
8#ifndef __ASM_OCTEON_OCTEON_H 8#ifndef __ASM_OCTEON_OCTEON_H
9#define __ASM_OCTEON_OCTEON_H 9#define __ASM_OCTEON_OCTEON_H
10 10
11#include "cvmx.h" 11#include <asm/octeon/cvmx.h>
12 12
13extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size, 13extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
14 uint64_t alignment, 14 uint64_t alignment,
diff --git a/arch/mips/include/asm/sibyte/bcm1480_int.h b/arch/mips/include/asm/sibyte/bcm1480_int.h
index 6109557c14e9..fffb224d2297 100644
--- a/arch/mips/include/asm/sibyte/bcm1480_int.h
+++ b/arch/mips/include/asm/sibyte/bcm1480_int.h
@@ -34,7 +34,7 @@
34#ifndef _BCM1480_INT_H 34#ifndef _BCM1480_INT_H
35#define _BCM1480_INT_H 35#define _BCM1480_INT_H
36 36
37#include "sb1250_defs.h" 37#include <asm/sibyte/sb1250_defs.h>
38 38
39/* ********************************************************************* 39/* *********************************************************************
40 * Interrupt Mapper Constants 40 * Interrupt Mapper Constants
diff --git a/arch/mips/include/asm/sibyte/bcm1480_l2c.h b/arch/mips/include/asm/sibyte/bcm1480_l2c.h
index fd75817f7ac4..725d38cb9d1c 100644
--- a/arch/mips/include/asm/sibyte/bcm1480_l2c.h
+++ b/arch/mips/include/asm/sibyte/bcm1480_l2c.h
@@ -33,7 +33,7 @@
33#ifndef _BCM1480_L2C_H 33#ifndef _BCM1480_L2C_H
34#define _BCM1480_L2C_H 34#define _BCM1480_L2C_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* 38/*
39 * Format of level 2 cache management address (Table 55) 39 * Format of level 2 cache management address (Table 55)
diff --git a/arch/mips/include/asm/sibyte/bcm1480_mc.h b/arch/mips/include/asm/sibyte/bcm1480_mc.h
index f26a41a82b59..4307a758e3bf 100644
--- a/arch/mips/include/asm/sibyte/bcm1480_mc.h
+++ b/arch/mips/include/asm/sibyte/bcm1480_mc.h
@@ -33,7 +33,7 @@
33#ifndef _BCM1480_MC_H 33#ifndef _BCM1480_MC_H
34#define _BCM1480_MC_H 34#define _BCM1480_MC_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* 38/*
39 * Memory Channel Configuration Register (Table 81) 39 * Memory Channel Configuration Register (Table 81)
diff --git a/arch/mips/include/asm/sibyte/bcm1480_regs.h b/arch/mips/include/asm/sibyte/bcm1480_regs.h
index b4077bb72611..84d168ddfebb 100644
--- a/arch/mips/include/asm/sibyte/bcm1480_regs.h
+++ b/arch/mips/include/asm/sibyte/bcm1480_regs.h
@@ -32,14 +32,14 @@
32#ifndef _BCM1480_REGS_H 32#ifndef _BCM1480_REGS_H
33#define _BCM1480_REGS_H 33#define _BCM1480_REGS_H
34 34
35#include "sb1250_defs.h" 35#include <asm/sibyte/sb1250_defs.h>
36 36
37/* ********************************************************************* 37/* *********************************************************************
38 * Pull in the BCM1250's registers since a great deal of the 1480's 38 * Pull in the BCM1250's registers since a great deal of the 1480's
39 * functions are the same as the BCM1250. 39 * functions are the same as the BCM1250.
40 ********************************************************************* */ 40 ********************************************************************* */
41 41
42#include "sb1250_regs.h" 42#include <asm/sibyte/sb1250_regs.h>
43 43
44 44
45/* ********************************************************************* 45/* *********************************************************************
diff --git a/arch/mips/include/asm/sibyte/bcm1480_scd.h b/arch/mips/include/asm/sibyte/bcm1480_scd.h
index 25ef24cbb92a..2af3706b9648 100644
--- a/arch/mips/include/asm/sibyte/bcm1480_scd.h
+++ b/arch/mips/include/asm/sibyte/bcm1480_scd.h
@@ -32,13 +32,13 @@
32#ifndef _BCM1480_SCD_H 32#ifndef _BCM1480_SCD_H
33#define _BCM1480_SCD_H 33#define _BCM1480_SCD_H
34 34
35#include "sb1250_defs.h" 35#include <asm/sibyte/sb1250_defs.h>
36 36
37/* ********************************************************************* 37/* *********************************************************************
38 * Pull in the BCM1250's SCD since lots of stuff is the same. 38 * Pull in the BCM1250's SCD since lots of stuff is the same.
39 ********************************************************************* */ 39 ********************************************************************* */
40 40
41#include "sb1250_scd.h" 41#include <asm/sibyte/sb1250_scd.h>
42 42
43/* ********************************************************************* 43/* *********************************************************************
44 * Some general notes: 44 * Some general notes:
diff --git a/arch/mips/include/asm/sibyte/sb1250_dma.h b/arch/mips/include/asm/sibyte/sb1250_dma.h
index bad56171d747..6c44dfb52878 100644
--- a/arch/mips/include/asm/sibyte/sb1250_dma.h
+++ b/arch/mips/include/asm/sibyte/sb1250_dma.h
@@ -36,7 +36,7 @@
36#define _SB1250_DMA_H 36#define _SB1250_DMA_H
37 37
38 38
39#include "sb1250_defs.h" 39#include <asm/sibyte/sb1250_defs.h>
40 40
41/* ********************************************************************* 41/* *********************************************************************
42 * DMA Registers 42 * DMA Registers
diff --git a/arch/mips/include/asm/sibyte/sb1250_genbus.h b/arch/mips/include/asm/sibyte/sb1250_genbus.h
index 94e9c7c8e783..a96ded17bdc9 100644
--- a/arch/mips/include/asm/sibyte/sb1250_genbus.h
+++ b/arch/mips/include/asm/sibyte/sb1250_genbus.h
@@ -34,7 +34,7 @@
34#ifndef _SB1250_GENBUS_H 34#ifndef _SB1250_GENBUS_H
35#define _SB1250_GENBUS_H 35#define _SB1250_GENBUS_H
36 36
37#include "sb1250_defs.h" 37#include <asm/sibyte/sb1250_defs.h>
38 38
39/* 39/*
40 * Generic Bus Region Configuration Registers (Table 11-4) 40 * Generic Bus Region Configuration Registers (Table 11-4)
diff --git a/arch/mips/include/asm/sibyte/sb1250_int.h b/arch/mips/include/asm/sibyte/sb1250_int.h
index f2850b4bcfd4..dbea73ddd2fe 100644
--- a/arch/mips/include/asm/sibyte/sb1250_int.h
+++ b/arch/mips/include/asm/sibyte/sb1250_int.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_INT_H 33#ifndef _SB1250_INT_H
34#define _SB1250_INT_H 34#define _SB1250_INT_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* ********************************************************************* 38/* *********************************************************************
39 * Interrupt Mapper Constants 39 * Interrupt Mapper Constants
diff --git a/arch/mips/include/asm/sibyte/sb1250_l2c.h b/arch/mips/include/asm/sibyte/sb1250_l2c.h
index 6554dcf05cfe..b61a7491607d 100644
--- a/arch/mips/include/asm/sibyte/sb1250_l2c.h
+++ b/arch/mips/include/asm/sibyte/sb1250_l2c.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_L2C_H 33#ifndef _SB1250_L2C_H
34#define _SB1250_L2C_H 34#define _SB1250_L2C_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* 38/*
39 * Level 2 Cache Tag register (Table 5-3) 39 * Level 2 Cache Tag register (Table 5-3)
diff --git a/arch/mips/include/asm/sibyte/sb1250_ldt.h b/arch/mips/include/asm/sibyte/sb1250_ldt.h
index 1e76cf137995..bf7f320d1a87 100644
--- a/arch/mips/include/asm/sibyte/sb1250_ldt.h
+++ b/arch/mips/include/asm/sibyte/sb1250_ldt.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_LDT_H 33#ifndef _SB1250_LDT_H
34#define _SB1250_LDT_H 34#define _SB1250_LDT_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38#define K_LDT_VENDOR_SIBYTE 0x166D 38#define K_LDT_VENDOR_SIBYTE 0x166D
39#define K_LDT_DEVICE_SB1250 0x0002 39#define K_LDT_DEVICE_SB1250 0x0002
diff --git a/arch/mips/include/asm/sibyte/sb1250_mac.h b/arch/mips/include/asm/sibyte/sb1250_mac.h
index 77f787284235..cfc4d7870882 100644
--- a/arch/mips/include/asm/sibyte/sb1250_mac.h
+++ b/arch/mips/include/asm/sibyte/sb1250_mac.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_MAC_H 33#ifndef _SB1250_MAC_H
34#define _SB1250_MAC_H 34#define _SB1250_MAC_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* ********************************************************************* 38/* *********************************************************************
39 * Ethernet MAC Registers 39 * Ethernet MAC Registers
diff --git a/arch/mips/include/asm/sibyte/sb1250_mc.h b/arch/mips/include/asm/sibyte/sb1250_mc.h
index 1eb1b5a88736..15048dcaf22f 100644
--- a/arch/mips/include/asm/sibyte/sb1250_mc.h
+++ b/arch/mips/include/asm/sibyte/sb1250_mc.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_MC_H 33#ifndef _SB1250_MC_H
34#define _SB1250_MC_H 34#define _SB1250_MC_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* 38/*
39 * Memory Channel Config Register (table 6-14) 39 * Memory Channel Config Register (table 6-14)
diff --git a/arch/mips/include/asm/sibyte/sb1250_regs.h b/arch/mips/include/asm/sibyte/sb1250_regs.h
index 8f53ec817a5e..29b9f0b26b3a 100644
--- a/arch/mips/include/asm/sibyte/sb1250_regs.h
+++ b/arch/mips/include/asm/sibyte/sb1250_regs.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_REGS_H 33#ifndef _SB1250_REGS_H
34#define _SB1250_REGS_H 34#define _SB1250_REGS_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38 38
39/* ********************************************************************* 39/* *********************************************************************
diff --git a/arch/mips/include/asm/sibyte/sb1250_scd.h b/arch/mips/include/asm/sibyte/sb1250_scd.h
index e49c3e89b5ee..615e165dbd21 100644
--- a/arch/mips/include/asm/sibyte/sb1250_scd.h
+++ b/arch/mips/include/asm/sibyte/sb1250_scd.h
@@ -32,7 +32,7 @@
32#ifndef _SB1250_SCD_H 32#ifndef _SB1250_SCD_H
33#define _SB1250_SCD_H 33#define _SB1250_SCD_H
34 34
35#include "sb1250_defs.h" 35#include <asm/sibyte/sb1250_defs.h>
36 36
37/* ********************************************************************* 37/* *********************************************************************
38 * System control/debug registers 38 * System control/debug registers
diff --git a/arch/mips/include/asm/sibyte/sb1250_smbus.h b/arch/mips/include/asm/sibyte/sb1250_smbus.h
index 04769923cf1e..128d6b75b819 100644
--- a/arch/mips/include/asm/sibyte/sb1250_smbus.h
+++ b/arch/mips/include/asm/sibyte/sb1250_smbus.h
@@ -34,7 +34,7 @@
34#ifndef _SB1250_SMBUS_H 34#ifndef _SB1250_SMBUS_H
35#define _SB1250_SMBUS_H 35#define _SB1250_SMBUS_H
36 36
37#include "sb1250_defs.h" 37#include <asm/sibyte/sb1250_defs.h>
38 38
39/* 39/*
40 * SMBus Clock Frequency Register (Table 14-2) 40 * SMBus Clock Frequency Register (Table 14-2)
diff --git a/arch/mips/include/asm/sibyte/sb1250_syncser.h b/arch/mips/include/asm/sibyte/sb1250_syncser.h
index d4b8558e0bf1..274e9179d326 100644
--- a/arch/mips/include/asm/sibyte/sb1250_syncser.h
+++ b/arch/mips/include/asm/sibyte/sb1250_syncser.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_SYNCSER_H 33#ifndef _SB1250_SYNCSER_H
34#define _SB1250_SYNCSER_H 34#define _SB1250_SYNCSER_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* 38/*
39 * Serial Mode Configuration Register 39 * Serial Mode Configuration Register
diff --git a/arch/mips/include/asm/sibyte/sb1250_uart.h b/arch/mips/include/asm/sibyte/sb1250_uart.h
index d835bf280140..bb99ecac5817 100644
--- a/arch/mips/include/asm/sibyte/sb1250_uart.h
+++ b/arch/mips/include/asm/sibyte/sb1250_uart.h
@@ -33,7 +33,7 @@
33#ifndef _SB1250_UART_H 33#ifndef _SB1250_UART_H
34#define _SB1250_UART_H 34#define _SB1250_UART_H
35 35
36#include "sb1250_defs.h" 36#include <asm/sibyte/sb1250_defs.h>
37 37
38/* ********************************************************************** 38/* **********************************************************************
39 * DUART Registers 39 * DUART Registers