diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:26:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:26:00 -0400 |
| commit | ff3df54efacff4ecdcab32826e45798453eecf90 (patch) | |
| tree | 9eef08a9092f88d6bf11fb039cb95546642eab39 /include | |
| parent | c7111c1318ee8890f385813f232fdb32643e2653 (diff) | |
| parent | c7753f18711782738936f224aaa421468e87f6ed (diff) | |
Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6
* 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6:
[PARISC] More pt_regs removal
[PARISC] pdc_init no longer exists
[PARISC] Make firmware calls irqsafe-ish...
[PA-RISC] Fix boot breakage
[PARISC] Use set_irq_regs
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-parisc/pdc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h index c9b2e35326ee..423c2b84b4a0 100644 --- a/include/asm-parisc/pdc.h +++ b/include/asm-parisc/pdc.h | |||
| @@ -774,8 +774,6 @@ int pdc_sti_call(unsigned long func, unsigned long flags, | |||
| 774 | unsigned long inptr, unsigned long outputr, | 774 | unsigned long inptr, unsigned long outputr, |
| 775 | unsigned long glob_cfg); | 775 | unsigned long glob_cfg); |
| 776 | 776 | ||
| 777 | extern void pdc_init(void); | ||
| 778 | |||
| 779 | static inline char * os_id_to_string(u16 os_id) { | 777 | static inline char * os_id_to_string(u16 os_id) { |
| 780 | switch(os_id) { | 778 | switch(os_id) { |
| 781 | case OS_ID_NONE: return "No OS"; | 779 | case OS_ID_NONE: return "No OS"; |