diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 15:05:03 -0500 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/parisc | |
| parent | bf33a70a73876b163d62612e9567cbac6604ba7e (diff) | |
| parent | 0fb807c3e573ff9de2965ca38c907605d4735d16 (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.h | 3 | ||||
| -rw-r--r-- | arch/parisc/include/asm/swab.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h index c584b00c6074..430f1aeea0b8 100644 --- a/arch/parisc/include/asm/pdc.h +++ b/arch/parisc/include/asm/pdc.h | |||
| @@ -336,10 +336,11 @@ | |||
| 336 | #define NUM_PDC_RESULT 32 | 336 | #define NUM_PDC_RESULT 32 |
| 337 | 337 | ||
| 338 | #if !defined(__ASSEMBLY__) | 338 | #if !defined(__ASSEMBLY__) |
| 339 | #ifdef __KERNEL__ | ||
| 340 | 339 | ||
| 341 | #include <linux/types.h> | 340 | #include <linux/types.h> |
| 342 | 341 | ||
| 342 | #ifdef __KERNEL__ | ||
| 343 | |||
| 343 | extern int pdc_type; | 344 | extern int pdc_type; |
| 344 | 345 | ||
| 345 | /* Values for pdc_type */ | 346 | /* Values for pdc_type */ |
diff --git a/arch/parisc/include/asm/swab.h b/arch/parisc/include/asm/swab.h index 3ff16c5a3358..e78403b129ef 100644 --- a/arch/parisc/include/asm/swab.h +++ b/arch/parisc/include/asm/swab.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _PARISC_SWAB_H | 1 | #ifndef _PARISC_SWAB_H |
| 2 | #define _PARISC_SWAB_H | 2 | #define _PARISC_SWAB_H |
| 3 | 3 | ||
| 4 | #include <asm/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
| 6 | 6 | ||
| 7 | #define __SWAB_64_THRU_32__ | 7 | #define __SWAB_64_THRU_32__ |