diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 20:48:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 20:48:25 -0700 |
commit | 0ff8285075a1242dbc969b6b4b1719d692931a02 (patch) | |
tree | 75498fec971960aa9a038846cf7d2561a49bce73 /arch/sparc/include/asm/of_device.h | |
parent | 8d0968abd03ec6b407df117adc773562386702fa (diff) | |
parent | 6f63e781eaf6a741fc65f773017154b20ed4ce3b (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Handle stack trace attempts before irqstacks are setup.
sparc64: Implement IRQ stacks.
sparc: remove include of linux/of_device.h from asm/of_device.h
sparc64: Fix recursion in stack overflow detection handling.
sparc/drivers: use linux/of_device.h instead of asm/of_device.h
sparc64: Don't MAGIC_SYSRQ ifdef smp_fetch_global_regs and support code.
Diffstat (limited to 'arch/sparc/include/asm/of_device.h')
-rw-r--r-- | arch/sparc/include/asm/of_device.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h index e5f5aedc229..bba777a416d 100644 --- a/arch/sparc/include/asm/of_device.h +++ b/arch/sparc/include/asm/of_device.h @@ -30,8 +30,7 @@ struct of_device 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> +/* This is just here during the transition */ #include <linux/of_platform.h> #endif /* __KERNEL__ */ |