diff options
author | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2006-06-26 11:28:09 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@hera.kernel.org> | 2006-06-27 19:28:45 -0400 |
commit | c1a7a755be26f68d7f21ee769584149a96185ea8 (patch) | |
tree | 886d9fb0e9000f261e8e7a77c274a5c970ba9b54 /include/asm-parisc | |
parent | 61c340166d8c62086b6de00afc7670eea27eb2ab (diff) |
[PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__
Assembly files should be protected from os_id_to_string()... Pass me
a brown paper bag, please.
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc')
-rw-r--r-- | include/asm-parisc/pdc.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h index 7a21f106ade6..c9b2e35326ee 100644 --- a/include/asm-parisc/pdc.h +++ b/include/asm-parisc/pdc.h | |||
@@ -284,19 +284,6 @@ typedef struct { | |||
284 | #define OS_ID_NOVEL 5 /* NOVELL OS */ | 284 | #define OS_ID_NOVEL 5 /* NOVELL OS */ |
285 | #define OS_ID_LINUX 6 /* Linux */ | 285 | #define OS_ID_LINUX 6 /* Linux */ |
286 | 286 | ||
287 | static inline char * os_id_to_string(u16 os_id) { | ||
288 | switch(os_id) { | ||
289 | case OS_ID_NONE: return "No OS"; | ||
290 | case OS_ID_HPUX: return "HP-UX"; | ||
291 | case OS_ID_MPEXL: return "MPE-iX"; | ||
292 | case OS_ID_OSF: return "OSF"; | ||
293 | case OS_ID_HPRT: return "HP-RT"; | ||
294 | case OS_ID_NOVEL: return "Novell Netware"; | ||
295 | case OS_ID_LINUX: return "Linux"; | ||
296 | default: return "Unknown"; | ||
297 | } | ||
298 | } | ||
299 | |||
300 | 287 | ||
301 | /* constants for PDC_CHASSIS */ | 288 | /* constants for PDC_CHASSIS */ |
302 | #define OSTAT_OFF 0 | 289 | #define OSTAT_OFF 0 |
@@ -789,6 +776,18 @@ int pdc_sti_call(unsigned long func, unsigned long flags, | |||
789 | 776 | ||
790 | extern void pdc_init(void); | 777 | extern void pdc_init(void); |
791 | 778 | ||
779 | static inline char * os_id_to_string(u16 os_id) { | ||
780 | switch(os_id) { | ||
781 | case OS_ID_NONE: return "No OS"; | ||
782 | case OS_ID_HPUX: return "HP-UX"; | ||
783 | case OS_ID_MPEXL: return "MPE-iX"; | ||
784 | case OS_ID_OSF: return "OSF"; | ||
785 | case OS_ID_HPRT: return "HP-RT"; | ||
786 | case OS_ID_NOVEL: return "Novell Netware"; | ||
787 | case OS_ID_LINUX: return "Linux"; | ||
788 | default: return "Unknown"; | ||
789 | } | ||
790 | } | ||
792 | #endif /* __ASSEMBLY__ */ | 791 | #endif /* __ASSEMBLY__ */ |
793 | 792 | ||
794 | #endif /* _PARISC_PDC_H */ | 793 | #endif /* _PARISC_PDC_H */ |