Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1a7a755 authored by Kyle McMartin's avatar Kyle McMartin Committed by Kyle McMartin
Browse files

[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: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 61c34016

include/asm-parisc/pdc.h

+12 −13
Original line number Diff line number Diff line
@@ -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 */