From 04c3ddf965ab46f7e24c2399dc85deca2f08ef5b Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 16 Nov 2007 03:15:05 -0800 Subject: [PATCH] [SPARC]: Merge asm-sparc{,64}/device.h Signed-off-by: David S. Miller --- include/asm-sparc/device.h | 2 -- include/asm-sparc64/device.h | 22 +--------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/include/asm-sparc/device.h b/include/asm-sparc/device.h index c0a7786d65f..680e51d8737 100644 --- a/include/asm-sparc/device.h +++ b/include/asm-sparc/device.h @@ -19,5 +19,3 @@ struct dev_archdata { }; #endif /* _ASM_SPARC_DEVICE_H */ - - diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h index 5111e8717be..4145c47097e 100644 --- a/include/asm-sparc64/device.h +++ b/include/asm-sparc64/device.h @@ -1,21 +1 @@ -/* - * 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 -- 2.41.1