diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
| commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
| tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /arch/parisc/include/asm/pdc.h | |
| parent | tracing: trace_bprintk() cleanups (diff) | |
| parent | x86: implement atomic text_poke() via fixmap (diff) | |
| download | linux-dev-dba58e39ced7af63f2748d12bbb2b4ac83c72391.tar.xz linux-dev-dba58e39ced7af63f2748d12bbb2b4ac83c72391.zip | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
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 c584b00c6074..430f1aeea0b8 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 */ |