Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=04c3ddf965ab46f7e24c2399dc85deca2f08ef5b Commit: 04c3ddf965ab46f7e24c2399dc85deca2f08ef5b Parent: ba89f59ab825d4c9dee652ce0ca53e033a05d5ec Author: David S. Miller <[EMAIL PROTECTED]> AuthorDate: Fri Nov 16 03:15:05 2007 -0800 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Sat Feb 9 04:18:02 2008 -0800
[SPARC]: Merge asm-sparc{,64}/device.h Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- include/asm-sparc/device.h | 2 -- include/asm-sparc64/device.h | 22 +--------------------- 2 files changed, 1 insertions(+), 23 deletions(-) diff --git a/include/asm-sparc/device.h b/include/asm-sparc/device.h index c0a7786..680e51d 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 5111e87..4145c47 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 <asm-sparc/device.h> - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html