diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /include/asm-parisc/pdc.h | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-parisc/pdc.h')
| -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"; |