diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 00:55:52 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 03:58:32 -0800 |
| commit | 75b2a0254da8f51c39593ab5841ba53766316730 (patch) | |
| tree | 1ea8c0183dceb89ce7db518f3db6e92a61f2d111 /include/asm-sparc64 | |
| parent | 97b4872c8db766b37c9b75095e386da7c4eb967d (diff) | |
| download | linux-stable-75b2a0254da8f51c39593ab5841ba53766316730.tar.gz linux-stable-75b2a0254da8f51c39593ab5841ba53766316730.tar.bz2 linux-stable-75b2a0254da8f51c39593ab5841ba53766316730.zip | |
[SPARC]: Merge include/asm-sparc{,64}/of_device.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/of_device.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/include/asm-sparc64/of_device.h b/include/asm-sparc64/of_device.h index 46d69b3223c5..a769fdbe164a 100644 --- a/include/asm-sparc64/of_device.h +++ b/include/asm-sparc64/of_device.h @@ -1,38 +1 @@ -#ifndef _ASM_SPARC64_OF_DEVICE_H -#define _ASM_SPARC64_OF_DEVICE_H -#ifdef __KERNEL__ - -#include <linux/device.h> -#include <linux/of.h> -#include <linux/mod_devicetable.h> -#include <asm/openprom.h> - -/* - * The of_device is a kind of "base class" that is a superset of - * struct device for use by devices attached to an OF node and - * probed using OF properties. - */ -struct of_device -{ - struct device_node *node; - struct device dev; - struct resource resource[PROMREG_MAX]; - unsigned int irqs[PROMINTR_MAX]; - int num_irqs; - - void *sysdata; - - int slot; - int portid; - int clock_freq; -}; - -extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); -extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); - -/* These are just here during the transition */ -#include <linux/of_device.h> -#include <linux/of_platform.h> - -#endif /* __KERNEL__ */ -#endif /* _ASM_SPARC64_OF_DEVICE_H */ +#include <asm-sparc/of_device.h> |