diff options
author | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:25 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:25 -0400 |
commit | a1ce39288e6fbefdd8d607021d02384eb4a20b99 (patch) | |
tree | c72e67f0c9d828420788f9086a19df1b9a7e39ae /arch/unicore32 | |
parent | 760285e7e7ab282c25b5e90816f7c47000557f4f (diff) |
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
Convert #include "..." to #include <path/...> in kernel system headers.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/include/mach/PKUnity.h | 36 | ||||
-rw-r--r-- | arch/unicore32/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/unicore32/include/mach/uncompress.h | 4 |
3 files changed, 21 insertions, 21 deletions
diff --git a/arch/unicore32/include/mach/PKUnity.h b/arch/unicore32/include/mach/PKUnity.h index 8040d575ddd..46705afcbf5 100644 --- a/arch/unicore32/include/mach/PKUnity.h +++ b/arch/unicore32/include/mach/PKUnity.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #error You must include hardware.h not PKUnity.h | 15 | #error You must include hardware.h not PKUnity.h |
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #include "bitfield.h" | 18 | #include <mach/bitfield.h> |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * Memory Definitions | 21 | * Memory Definitions |
@@ -32,7 +32,7 @@ | |||
32 | * 0x98000000 - 0x9FFFFFFF 128MB PCI PCI-AHB MEM-mapping | 32 | * 0x98000000 - 0x9FFFFFFF 128MB PCI PCI-AHB MEM-mapping |
33 | */ | 33 | */ |
34 | #define PKUNITY_PCI_BASE io_p2v(0x80000000) /* 0x80000000 - 0xBFFFFFFF 1GB */ | 34 | #define PKUNITY_PCI_BASE io_p2v(0x80000000) /* 0x80000000 - 0xBFFFFFFF 1GB */ |
35 | #include "regs-pci.h" | 35 | #include <mach/regs-pci.h> |
36 | 36 | ||
37 | #define PKUNITY_PCICFG_BASE (PKUNITY_PCI_BASE + 0x0) | 37 | #define PKUNITY_PCICFG_BASE (PKUNITY_PCI_BASE + 0x0) |
38 | #define PKUNITY_PCIBRI_BASE (PKUNITY_PCI_BASE + 0x00010000) | 38 | #define PKUNITY_PCIBRI_BASE (PKUNITY_PCI_BASE + 0x00010000) |
@@ -50,18 +50,18 @@ | |||
50 | #define PKUNITY_ARBITER_BASE (PKUNITY_AHB_BASE + 0x000000) /* AHB-2 */ | 50 | #define PKUNITY_ARBITER_BASE (PKUNITY_AHB_BASE + 0x000000) /* AHB-2 */ |
51 | #define PKUNITY_DDR2CTRL_BASE (PKUNITY_AHB_BASE + 0x100000) /* AHB-3 */ | 51 | #define PKUNITY_DDR2CTRL_BASE (PKUNITY_AHB_BASE + 0x100000) /* AHB-3 */ |
52 | #define PKUNITY_DMAC_BASE (PKUNITY_AHB_BASE + 0x200000) /* AHB-4 */ | 52 | #define PKUNITY_DMAC_BASE (PKUNITY_AHB_BASE + 0x200000) /* AHB-4 */ |
53 | #include "regs-dmac.h" | 53 | #include <mach/regs-dmac.h> |
54 | #define PKUNITY_UMAL_BASE (PKUNITY_AHB_BASE + 0x300000) /* AHB-5 */ | 54 | #define PKUNITY_UMAL_BASE (PKUNITY_AHB_BASE + 0x300000) /* AHB-5 */ |
55 | #include "regs-umal.h" | 55 | #include <mach/regs-umal.h> |
56 | #define PKUNITY_USB_BASE (PKUNITY_AHB_BASE + 0x400000) /* AHB-6 */ | 56 | #define PKUNITY_USB_BASE (PKUNITY_AHB_BASE + 0x400000) /* AHB-6 */ |
57 | #define PKUNITY_SATA_BASE (PKUNITY_AHB_BASE + 0x500000) /* AHB-7 */ | 57 | #define PKUNITY_SATA_BASE (PKUNITY_AHB_BASE + 0x500000) /* AHB-7 */ |
58 | #define PKUNITY_SMC_BASE (PKUNITY_AHB_BASE + 0x600000) /* AHB-8 */ | 58 | #define PKUNITY_SMC_BASE (PKUNITY_AHB_BASE + 0x600000) /* AHB-8 */ |
59 | /* AHB-9 is for APB bridge */ | 59 | /* AHB-9 is for APB bridge */ |
60 | #define PKUNITY_MME_BASE (PKUNITY_AHB_BASE + 0x700000) /* AHB-10 */ | 60 | #define PKUNITY_MME_BASE (PKUNITY_AHB_BASE + 0x700000) /* AHB-10 */ |
61 | #define PKUNITY_UNIGFX_BASE (PKUNITY_AHB_BASE + 0x800000) /* AHB-11 */ | 61 | #define PKUNITY_UNIGFX_BASE (PKUNITY_AHB_BASE + 0x800000) /* AHB-11 */ |
62 | #include "regs-unigfx.h" | 62 | #include <mach/regs-unigfx.h> |
63 | #define PKUNITY_NAND_BASE (PKUNITY_AHB_BASE + 0x900000) /* AHB-12 */ | 63 | #define PKUNITY_NAND_BASE (PKUNITY_AHB_BASE + 0x900000) /* AHB-12 */ |
64 | #include "regs-nand.h" | 64 | #include <mach/regs-nand.h> |
65 | #define PKUNITY_H264D_BASE (PKUNITY_AHB_BASE + 0xA00000) /* AHB-13 */ | 65 | #define PKUNITY_H264D_BASE (PKUNITY_AHB_BASE + 0xA00000) /* AHB-13 */ |
66 | #define PKUNITY_H264E_BASE (PKUNITY_AHB_BASE + 0xB00000) /* AHB-14 */ | 66 | #define PKUNITY_H264E_BASE (PKUNITY_AHB_BASE + 0xB00000) /* AHB-14 */ |
67 | 67 | ||
@@ -72,27 +72,27 @@ | |||
72 | 72 | ||
73 | #define PKUNITY_UART0_BASE (PKUNITY_APB_BASE + 0x000000) /* APB-0 */ | 73 | #define PKUNITY_UART0_BASE (PKUNITY_APB_BASE + 0x000000) /* APB-0 */ |
74 | #define PKUNITY_UART1_BASE (PKUNITY_APB_BASE + 0x100000) /* APB-1 */ | 74 | #define PKUNITY_UART1_BASE (PKUNITY_APB_BASE + 0x100000) /* APB-1 */ |
75 | #include "regs-uart.h" | 75 | #include <mach/regs-uart.h> |
76 | #define PKUNITY_I2C_BASE (PKUNITY_APB_BASE + 0x200000) /* APB-2 */ | 76 | #define PKUNITY_I2C_BASE (PKUNITY_APB_BASE + 0x200000) /* APB-2 */ |
77 | #include "regs-i2c.h" | 77 | #include <mach/regs-i2c.h> |
78 | #define PKUNITY_SPI_BASE (PKUNITY_APB_BASE + 0x300000) /* APB-3 */ | 78 | #define PKUNITY_SPI_BASE (PKUNITY_APB_BASE + 0x300000) /* APB-3 */ |
79 | #include "regs-spi.h" | 79 | #include <mach/regs-spi.h> |
80 | #define PKUNITY_AC97_BASE (PKUNITY_APB_BASE + 0x400000) /* APB-4 */ | 80 | #define PKUNITY_AC97_BASE (PKUNITY_APB_BASE + 0x400000) /* APB-4 */ |
81 | #include "regs-ac97.h" | 81 | #include <mach/regs-ac97.h> |
82 | #define PKUNITY_GPIO_BASE (PKUNITY_APB_BASE + 0x500000) /* APB-5 */ | 82 | #define PKUNITY_GPIO_BASE (PKUNITY_APB_BASE + 0x500000) /* APB-5 */ |
83 | #include "regs-gpio.h" | 83 | #include <mach/regs-gpio.h> |
84 | #define PKUNITY_INTC_BASE (PKUNITY_APB_BASE + 0x600000) /* APB-6 */ | 84 | #define PKUNITY_INTC_BASE (PKUNITY_APB_BASE + 0x600000) /* APB-6 */ |
85 | #include "regs-intc.h" | 85 | #include <mach/regs-intc.h> |
86 | #define PKUNITY_RTC_BASE (PKUNITY_APB_BASE + 0x700000) /* APB-7 */ | 86 | #define PKUNITY_RTC_BASE (PKUNITY_APB_BASE + 0x700000) /* APB-7 */ |
87 | #include "regs-rtc.h" | 87 | #include <mach/regs-rtc.h> |
88 | #define PKUNITY_OST_BASE (PKUNITY_APB_BASE + 0x800000) /* APB-8 */ | 88 | #define PKUNITY_OST_BASE (PKUNITY_APB_BASE + 0x800000) /* APB-8 */ |
89 | #include "regs-ost.h" | 89 | #include <mach/regs-ost.h> |
90 | #define PKUNITY_RESETC_BASE (PKUNITY_APB_BASE + 0x900000) /* APB-9 */ | 90 | #define PKUNITY_RESETC_BASE (PKUNITY_APB_BASE + 0x900000) /* APB-9 */ |
91 | #include "regs-resetc.h" | 91 | #include <mach/regs-resetc.h> |
92 | #define PKUNITY_PM_BASE (PKUNITY_APB_BASE + 0xA00000) /* APB-10 */ | 92 | #define PKUNITY_PM_BASE (PKUNITY_APB_BASE + 0xA00000) /* APB-10 */ |
93 | #include "regs-pm.h" | 93 | #include <mach/regs-pm.h> |
94 | #define PKUNITY_PS2_BASE (PKUNITY_APB_BASE + 0xB00000) /* APB-11 */ | 94 | #define PKUNITY_PS2_BASE (PKUNITY_APB_BASE + 0xB00000) /* APB-11 */ |
95 | #include "regs-ps2.h" | 95 | #include <mach/regs-ps2.h> |
96 | #define PKUNITY_SDC_BASE (PKUNITY_APB_BASE + 0xC00000) /* APB-12 */ | 96 | #define PKUNITY_SDC_BASE (PKUNITY_APB_BASE + 0xC00000) /* APB-12 */ |
97 | #include "regs-sdc.h" | 97 | #include <mach/regs-sdc.h> |
98 | 98 | ||
diff --git a/arch/unicore32/include/mach/hardware.h b/arch/unicore32/include/mach/hardware.h index 930bea6e129..9e20b5d9ed5 100644 --- a/arch/unicore32/include/mach/hardware.h +++ b/arch/unicore32/include/mach/hardware.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #ifndef __MACH_PUV3_HARDWARE_H__ | 15 | #ifndef __MACH_PUV3_HARDWARE_H__ |
16 | #define __MACH_PUV3_HARDWARE_H__ | 16 | #define __MACH_PUV3_HARDWARE_H__ |
17 | 17 | ||
18 | #include "PKUnity.h" | 18 | #include <mach/PKUnity.h> |
19 | 19 | ||
20 | #ifndef __ASSEMBLY__ | 20 | #ifndef __ASSEMBLY__ |
21 | #define io_p2v(x) (void __iomem *)((x) - PKUNITY_MMIO_BASE) | 21 | #define io_p2v(x) (void __iomem *)((x) - PKUNITY_MMIO_BASE) |
diff --git a/arch/unicore32/include/mach/uncompress.h b/arch/unicore32/include/mach/uncompress.h index 142d3e7958a..9be67c9d3b5 100644 --- a/arch/unicore32/include/mach/uncompress.h +++ b/arch/unicore32/include/mach/uncompress.h | |||
@@ -13,8 +13,8 @@ | |||
13 | #ifndef __MACH_PUV3_UNCOMPRESS_H__ | 13 | #ifndef __MACH_PUV3_UNCOMPRESS_H__ |
14 | #define __MACH_PUV3_UNCOMPRESS_H__ | 14 | #define __MACH_PUV3_UNCOMPRESS_H__ |
15 | 15 | ||
16 | #include "hardware.h" | 16 | #include <mach/hardware.h> |
17 | #include "ocd.h" | 17 | #include <mach/ocd.h> |
18 | 18 | ||
19 | extern char input_data[]; | 19 | extern char input_data[]; |
20 | extern char input_data_end[]; | 20 | extern char input_data_end[]; |