aboutsummaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 21:05:03 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-13 21:05:03 +0100
commit22796b15725488002437ebbf98a22fdbe596cf89 (patch)
treee6745c9e367e782c0b184eb941e2b86805975f88 /arch/parisc
parentbf33a70a73876b163d62612e9567cbac6604ba7e (diff)
parent0fb807c3e573ff9de2965ca38c907605d4735d16 (diff)
Merge branch 'core/header-fixes' into x86/headers
Conflicts: arch/x86/include/asm/setup.h
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/include/asm/pdc.h3
-rw-r--r--arch/parisc/include/asm/swab.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h
index c584b00c607..430f1aeea0b 100644
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
@@ -336,10 +336,11 @@
#define NUM_PDC_RESULT 32
#if !defined(__ASSEMBLY__)
-#ifdef __KERNEL__
#include <linux/types.h>
+#ifdef __KERNEL__
+
extern int pdc_type;
/* Values for pdc_type */
diff --git a/arch/parisc/include/asm/swab.h b/arch/parisc/include/asm/swab.h
index 3ff16c5a335..e78403b129e 100644
--- a/arch/parisc/include/asm/swab.h
+++ b/arch/parisc/include/asm/swab.h
@@ -1,7 +1,7 @@
#ifndef _PARISC_SWAB_H
#define _PARISC_SWAB_H
-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/compiler.h>
#define __SWAB_64_THRU_32__