diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/sparc/include/asm/pgtable_32.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/sparc/include/asm/pgtable_32.h')
| -rw-r--r-- | arch/sparc/include/asm/pgtable_32.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 08237fda8874..e0cabe790ec1 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h | |||
| @@ -14,11 +14,7 @@ | |||
| 14 | #include <linux/spinlock.h> | 14 | #include <linux/spinlock.h> |
| 15 | #include <linux/swap.h> | 15 | #include <linux/swap.h> |
| 16 | #include <asm/types.h> | 16 | #include <asm/types.h> |
| 17 | #ifdef CONFIG_SUN4 | ||
| 18 | #include <asm/pgtsun4.h> | ||
| 19 | #else | ||
| 20 | #include <asm/pgtsun4c.h> | 17 | #include <asm/pgtsun4c.h> |
| 21 | #endif | ||
| 22 | #include <asm/pgtsrmmu.h> | 18 | #include <asm/pgtsrmmu.h> |
| 23 | #include <asm/vac-ops.h> | 19 | #include <asm/vac-ops.h> |
| 24 | #include <asm/oplib.h> | 20 | #include <asm/oplib.h> |