diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 03:15:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 04:18:02 -0800 |
| commit | 04c3ddf965ab46f7e24c2399dc85deca2f08ef5b (patch) | |
| tree | b8fcefbf9a5d3bebbf7da3b4a1b6581e7261aa97 | |
| parent | ba89f59ab825d4c9dee652ce0ca53e033a05d5ec (diff) | |
[SPARC]: Merge asm-sparc{,64}/device.h
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/asm-sparc/device.h | 2 | ||||
| -rw-r--r-- | 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 c0a7786d65f7..680e51d87374 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 5111e8717be3..4145c47097e2 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> |