diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
| commit | 6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch) | |
| tree | 7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /arch/parisc/include/asm/pdc.h | |
| parent | 1e4078f0bba46ad61b69548abe6a6faf63b89380 (diff) | |
| parent | 3dd40cb320fee7c23b574ab821ce140ccd1281c9 (diff) | |
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/include/asm/pdc.h')
| -rw-r--r-- | arch/parisc/include/asm/pdc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h index 26b4455baa83..510341f62d97 100644 --- a/arch/parisc/include/asm/pdc.h +++ b/arch/parisc/include/asm/pdc.h @@ -280,6 +280,7 @@ void setup_pdc(void); /* in inventory.c */ /* wrapper-functions from pdc.c */ int pdc_add_valid(unsigned long address); +int pdc_instr(unsigned int *instr); int pdc_chassis_info(struct pdc_chassis_info *chassis_info, void *led_info, unsigned long len); int pdc_chassis_disp(unsigned long disp); int pdc_chassis_warn(unsigned long *warn); |