Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 959f4f13a3fe661ee2761c4dc9a70196fb8b1c12

Authored by Kyle McMartin
Committed by Kyle McMartin
1 parent af5917f0cd
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PARISC] "Fix" circular includes 

Use a really big hammer for the mean time to get things building again.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

Showing 3 changed files with 1 additions and 9 deletions Side-by-side Diff

include/asm-parisc/pgtable.h
Diff comments   View file @ 959f4f1
... ... @@ -10,7 +10,6 @@
10 10 * we simulate an x86-style page table for the linux mm code
11 11 */
12 12  
13   -#include <linux/spinlock.h>
14 13 #include <linux/mm.h> /* for vm_area_struct */
15 14 #include <asm/processor.h>
16 15 #include <asm/cache.h>
include/asm-parisc/processor.h
Diff comments   View file @ 959f4f1
... ... @@ -9,13 +9,10 @@
9 9 #define __ASM_PARISC_PROCESSOR_H
10 10  
11 11 #ifndef __ASSEMBLY__
12   -#include <asm/prefetch.h> /* lockdep.h needs <linux/prefetch.h> */
13   -
14 12 #include <linux/threads.h>
15   -#include <linux/spinlock_types.h>
16 13  
  14 +#include <asm/prefetch.h>
17 15 #include <asm/hardware.h>
18   -#include <asm/page.h>
19 16 #include <asm/pdc.h>
20 17 #include <asm/ptrace.h>
21 18 #include <asm/types.h>
include/asm-parisc/spinlock_types.h
Diff comments   View file @ 959f4f1
1 1 #ifndef __ASM_SPINLOCK_TYPES_H
2 2 #define __ASM_SPINLOCK_TYPES_H
3 3  
4   -#ifndef __LINUX_SPINLOCK_TYPES_H
5   -# error "please don't include this file directly"
6   -#endif
7   -
8 4 typedef struct {
9 5 #ifdef CONFIG_PA20
10 6 volatile unsigned int slock;