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

Commit 5e3609f6 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: merge header files with trivial differences 



A manual inspection revealed that the following headerfiles
contained only trivial differences:
hw_irq.h idprom.h kmap_types.h kvm.h spinlock_types.h sunbpp.h unaligned.h

The only noteworthy change are that sparc64 had a volatile
qualifer that sparc missed in spinlock_types.h.

In addition a few comments were updated.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 075ae525

include/asm-sparc/idprom.h

+1 −1
Original line number Diff line number Diff line 
/*

 * idprom.h: Macros and defines for idprom routines

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu)

 */



#ifndef _SPARC_IDPROM_H

include/asm-sparc/kmap_types.h

+4 −0
Original line number Diff line number Diff line 
#ifndef _ASM_KMAP_TYPES_H

#define _ASM_KMAP_TYPES_H



/* Dummy header just to define km_type.  None of this

 * is actually used on sparc.  -DaveM

 */



enum km_type {

	KM_BOUNCE_READ,

	KM_SKB_SUNRPC_DATA,

include/asm-sparc/spinlock_types.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



typedef struct {

	unsigned char lock;

	volatile unsigned char lock;

} raw_spinlock_t;



#define __RAW_SPIN_LOCK_UNLOCKED	{ 0 }

include/asm-sparc64/hw_irq.h

+1 −4
Original line number Diff line number Diff line 
#ifndef __ASM_SPARC64_HW_IRQ_H

#define __ASM_SPARC64_HW_IRQ_H



#endif
 
#include <asm-sparc/hw_irq.h>

include/asm-sparc64/idprom.h

+1 −25
Original line number Diff line number Diff line 
/*

 * idprom.h: Macros and defines for idprom routines

 *

 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)

 */



#ifndef _SPARC64_IDPROM_H

#define _SPARC64_IDPROM_H



#include <linux/types.h>



struct idprom {

	u8		id_format;	/* Format identifier (always 0x01) */

	u8		id_machtype;	/* Machine type */

	u8		id_ethaddr[6];	/* Hardware ethernet address */

	s32		id_date;	/* Date of manufacture */

	u32		id_sernum:24;	/* Unique serial number */

	u8		id_cksum;	/* Checksum - xor of the data bytes */

	u8		reserved[16];

};



extern struct idprom *idprom;

extern void idprom_init(void);



#endif /* !(_SPARC_IDPROM_H) */
 
#include <asm-sparc/idprom.h>