diff options
| author | Becky Bruce <bgill@freescale.com> | 2005-09-22 15:20:04 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:38:46 -0400 |
| commit | feaf7cf153335fe7100b65ed6f4585c3574fe69a (patch) | |
| tree | c57198f01b5f12ffe8ce90f4e1399505c1f84a02 /include/asm-ppc64/io.h | |
| parent | 2bfadee32f1501faa3184d574f6a769f17236c87 (diff) | |
[PATCH] powerpc: merge atomic.h, memory.h
powerpc: Merge atomic.h and memory.h into powerpc
Merged atomic.h into include/powerpc. Moved asm-style HMT_ defines from
memory.h into ppc_asm.h, where there were already HMT_defines; moved c-style
HMT_ defines to processor.h. Renamed memory.h to synch.h to better reflect
its contents.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Jon Loeliger <linuxppc@jdl.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc64/io.h')
| -rw-r--r-- | include/asm-ppc64/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h index 59c958aea4d..bd7c9532d77 100644 --- a/include/asm-ppc64/io.h +++ b/include/asm-ppc64/io.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #ifdef CONFIG_PPC_ISERIES | 15 | #ifdef CONFIG_PPC_ISERIES |
| 16 | #include <asm/iSeries/iSeries_io.h> | 16 | #include <asm/iSeries/iSeries_io.h> |
| 17 | #endif | 17 | #endif |
| 18 | #include <asm/memory.h> | 18 | #include <asm/synch.h> |
| 19 | #include <asm/delay.h> | 19 | #include <asm/delay.h> |
| 20 | 20 | ||
| 21 | #include <asm-generic/iomap.h> | 21 | #include <asm-generic/iomap.h> |