Skip to content

Commit

Permalink
[PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kyle McMartin authored and Kyle McMartin committed Jun 27, 2006
1 parent 61c3401 commit c1a7a75
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions include/asm-parisc/pdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -284,19 +284,6 @@ typedef struct {
#define OS_ID_NOVEL 5 /* NOVELL OS */
#define OS_ID_LINUX 6 /* Linux */

static inline char * os_id_to_string(u16 os_id) {
switch(os_id) {
case OS_ID_NONE: return "No OS";
case OS_ID_HPUX: return "HP-UX";
case OS_ID_MPEXL: return "MPE-iX";
case OS_ID_OSF: return "OSF";
case OS_ID_HPRT: return "HP-RT";
case OS_ID_NOVEL: return "Novell Netware";
case OS_ID_LINUX: return "Linux";
default: return "Unknown";
}
}


/* constants for PDC_CHASSIS */
#define OSTAT_OFF 0
Expand Down Expand Up @@ -789,6 +776,18 @@ int pdc_sti_call(unsigned long func, unsigned long flags,

extern void pdc_init(void);

static inline char * os_id_to_string(u16 os_id) {
switch(os_id) {
case OS_ID_NONE: return "No OS";
case OS_ID_HPUX: return "HP-UX";
case OS_ID_MPEXL: return "MPE-iX";
case OS_ID_OSF: return "OSF";
case OS_ID_HPRT: return "HP-RT";
case OS_ID_NOVEL: return "Novell Netware";
case OS_ID_LINUX: return "Linux";
default: return "Unknown";
}
}
#endif /* __ASSEMBLY__ */

#endif /* _PARISC_PDC_H */

0 comments on commit c1a7a75

Please sign in to comment.