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 23:28:45 +0000 |
| commit | c1a7a755be26f68d7f21ee769584149a96185ea8 (patch) | |
| tree | 886d9fb0e9000f261e8e7a77c274a5c970ba9b54 | |
| parent | 61c340166d8c62086b6de00afc7670eea27eb2ab (diff) | |
| download | linux-c1a7a755be26f68d7f21ee769584149a96185ea8.tar.bz2 | |
[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>
| -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 { #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 */ |