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

Commit 04c3ddf9 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller
Browse files

[SPARC]: Merge asm-sparc{,64}/device.h 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba89f59a

include/asm-sparc/device.h

+0 −2
Original line number Diff line number Diff line
@@ -19,5 +19,3 @@ struct dev_archdata { 
};



#endif /* _ASM_SPARC_DEVICE_H */

include/asm-sparc64/device.h

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

 * Arch specific extensions to struct device

 *

 * This file is released under the GPLv2

 */

#ifndef _ASM_SPARC64_DEVICE_H

#define _ASM_SPARC64_DEVICE_H



struct device_node;

struct of_device;



struct dev_archdata {

	void			*iommu;

	void			*stc;

	void			*host_controller;



	struct device_node	*prom_node;

	struct of_device	*op;

};



#endif /* _ASM_SPARC64_DEVICE_H */
 
#include <asm-sparc/device.h>