[PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__
authorKyle McMartin <kyle@athena.road.mcmartin.ca>
Mon, 26 Jun 2006 15:28:09 +0000 (11:28 -0400)
committerKyle McMartin <kyle@hera.kernel.org>
Tue, 27 Jun 2006 23:28:45 +0000 (23:28 +0000)
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>
include/asm-parisc/pdc.h

index 7a21f106ade6bc7326bd62f158c39b1fa87329e9..c9b2e35326eed89eba875cd506262fdd485b21f4 100644 (file)
@@ -284,19 +284,6 @@ typedef struct {
 #define OS_ID_NOVEL            5       /* NOVELL OS            */
 #define OS_ID_LINUX            6       /* Linux                */
 
 #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
 
 /* 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);
 
 
 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 */
 #endif /* __ASSEMBLY__ */
 
 #endif /* _PARISC_PDC_H */