diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /arch/parisc/include/asm/pdc.h | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/parisc/include/asm/pdc.h')
| -rw-r--r-- | arch/parisc/include/asm/pdc.h | 3 |
1 files changed, 2 insertions, 1 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 @@ | |||
| 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 */ |