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

Commit 2bbc5bdf authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] IP27: Move definition of nic_t to its sole user. 



This also fixes the duplicate definition of nic_t in the s2io driver.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2f3643ae

include/asm-mips/sn/arch.h

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



typedef u64	hubreg_t;

typedef u64	nic_t;



#define cputonasid(cpu)			(cpu_data[(cpu)].p_nasid)

#define cputoslice(cpu)			(cpu_data[(cpu)].p_slice)

include/asm-mips/sn/klconfig.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ 
#endif /* CONFIG_SGI_IP35 */

#endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */



typedef u64  nic_t;



#define KLCFGINFO_MAGIC	0xbeedbabe



typedef s32 klconf_off_t;