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

Signed-off-by: David S. Miller <davem@davemloft.net>

authored by David S. Miller and committed by David S. Miller 04c3ddf9 ba89f59a

+1 -23
-2
include/asm-sparc/device.h
··· 19 19 }; 20 20 21 21 #endif /* _ASM_SPARC_DEVICE_H */ 22 - 23 -
+1 -21
include/asm-sparc64/device.h
··· 1 - /* 2 - * Arch specific extensions to struct device 3 - * 4 - * This file is released under the GPLv2 5 - */ 6 - #ifndef _ASM_SPARC64_DEVICE_H 7 - #define _ASM_SPARC64_DEVICE_H 8 - 9 - struct device_node; 10 - struct of_device; 11 - 12 - struct dev_archdata { 13 - void *iommu; 14 - void *stc; 15 - void *host_controller; 16 - 17 - struct device_node *prom_node; 18 - struct of_device *op; 19 - }; 20 - 21 - #endif /* _ASM_SPARC64_DEVICE_H */ 1 + #include <asm-sparc/device.h>