tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] Move the identical files from include/asm-ppc{,64}

Move the identical files from include/asm-ppc{,64}/ to
include/asm-powerpc/. Remove hdreg.h completely as it is unused in
the tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Stephen Rothwell and committed by
Paul Mackerras 88999ceb 45e2a6e4

+3 -63
unified split
+1
include/asm-powerpc/cputime.h
··· 1 + #include <asm-generic/cputime.h>
+1
include/asm-powerpc/emergency-restart.h
··· 1 + #include <asm-generic/emergency-restart.h>
+1 -1
include/asm-ppc/8253pit.h include/asm-powerpc/8253pit.h
··· 5 5 #ifndef _8253PIT_H 6 6 #define _8253PIT_H 7 7 8 - #define PIT_TICK_RATE 1193182UL 8 + #define PIT_TICK_RATE 1193182UL 9 9 10 10 #endif
include/asm-ppc/agp.h include/asm-powerpc/agp.h
-6
include/asm-ppc/cputime.h
··· 1 - #ifndef __PPC_CPUTIME_H 2 - #define __PPC_CPUTIME_H 3 - 4 - #include <asm-generic/cputime.h> 5 - 6 - #endif /* __PPC_CPUTIME_H */
include/asm-ppc/div64.h include/asm-powerpc/div64.h
-6
include/asm-ppc/emergency-restart.h
··· 1 - #ifndef _ASM_EMERGENCY_RESTART_H 2 - #define _ASM_EMERGENCY_RESTART_H 3 - 4 - #include <asm-generic/emergency-restart.h> 5 - 6 - #endif /* _ASM_EMERGENCY_RESTART_H */
-1
include/asm-ppc/hdreg.h
··· 1 - #include <asm-generic/hdreg.h>
include/asm-ppc/ipc.h include/asm-powerpc/ipc.h
include/asm-ppc/xor.h include/asm-powerpc/xor.h
-10
include/asm-ppc64/8253pit.h
··· 1 - /* 2 - * 8253/8254 Programmable Interval Timer 3 - */ 4 - 5 - #ifndef _8253PIT_H 6 - #define _8253PIT_H 7 - 8 - #define PIT_TICK_RATE 1193182UL 9 - 10 - #endif
-23
include/asm-ppc64/agp.h
··· 1 - #ifndef AGP_H 2 - #define AGP_H 1 3 - 4 - #include <asm/io.h> 5 - 6 - /* nothing much needed here */ 7 - 8 - #define map_page_into_agp(page) 9 - #define unmap_page_from_agp(page) 10 - #define flush_agp_mappings() 11 - #define flush_agp_cache() mb() 12 - 13 - /* Convert a physical address to an address suitable for the GART. */ 14 - #define phys_to_gart(x) (x) 15 - #define gart_to_phys(x) (x) 16 - 17 - /* GATT allocation. Returns/accepts GATT kernel virtual address. */ 18 - #define alloc_gatt_pages(order) \ 19 - ((char *)__get_free_pages(GFP_KERNEL, (order))) 20 - #define free_gatt_pages(table, order) \ 21 - free_pages((unsigned long)(table), (order)) 22 - 23 - #endif
-6
include/asm-ppc64/cputime.h
··· 1 - #ifndef __PPC_CPUTIME_H 2 - #define __PPC_CPUTIME_H 3 - 4 - #include <asm-generic/cputime.h> 5 - 6 - #endif /* __PPC_CPUTIME_H */
-1
include/asm-ppc64/div64.h
··· 1 - #include <asm-generic/div64.h>
-6
include/asm-ppc64/emergency-restart.h
··· 1 - #ifndef _ASM_EMERGENCY_RESTART_H 2 - #define _ASM_EMERGENCY_RESTART_H 3 - 4 - #include <asm-generic/emergency-restart.h> 5 - 6 - #endif /* _ASM_EMERGENCY_RESTART_H */
-1
include/asm-ppc64/hdreg.h
··· 1 - #include <asm-generic/hdreg.h>
-1
include/asm-ppc64/ipc.h
··· 1 - #include <asm-generic/ipc.h>
-1
include/asm-ppc64/xor.h
··· 1 - #include <asm-generic/xor.h>