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 /drivers/serial/sunhv.c | |
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 'drivers/serial/sunhv.c')
-rw-r--r-- | drivers/serial/sunhv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index aeeec5588af..e41766d0803 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c @@ -17,11 +17,11 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> +#include <linux/of_device.h> #include <asm/hypervisor.h> #include <asm/spitfire.h> #include <asm/prom.h> -#include <asm/of_device.h> #include <asm/irq.h> #if defined(CONFIG_MAGIC_SYSRQ) |