Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=75b2a0254da8f51c39593ab5841ba53766316730
Commit: 75b2a0254da8f51c39593ab5841ba53766316730
Parent: 97b4872c8db766b37c9b75095e386da7c4eb967d
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 16 00:55:52 2007 -0800
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Feb 9 03:58:32 2008 -0800
[SPARC]: Merge include/asm-sparc{,64}/of_device.h
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
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
dissimilarity index 100%
index 46d69b3..a769fdb 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>
-
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
