From 8ffa3617548b19c340ee27341cc10b4965989bfa Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 26 Jun 2006 11:28:09 -0400 Subject: [PATCH] --- yaml --- r: 31155 b: refs/heads/master c: c1a7a755be26f68d7f21ee769584149a96185ea8 h: refs/heads/master i: 31153: 8a1f43b5bfeb220b6640fdf7130de4a432b80a70 31151: 4a13c4dbbf07656eb9022fb7c1ee35ca09d5fb98 v: v3 --- [refs] | 2 +- trunk/include/asm-parisc/pdc.h | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index bb0a08a15c90..1feb7c13f03b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61c340166d8c62086b6de00afc7670eea27eb2ab +refs/heads/master: c1a7a755be26f68d7f21ee769584149a96185ea8 diff --git a/trunk/include/asm-parisc/pdc.h b/trunk/include/asm-parisc/pdc.h index 7a21f106ade6..c9b2e35326ee 100644 --- a/trunk/include/asm-parisc/pdc.h +++ b/trunk/include/asm-parisc/pdc.h @@ -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 @@ -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 */