diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 11:14:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 11:14:32 -0700 |
| commit | 8d659f5e43c5db2630e85f507b7384365e9e1c1e (patch) | |
| tree | c99b00949268cedbbc4bc1f3e01b058e67033c2e /arch/sparc/include/asm/ebus_32.h | |
| parent | 9da1f7e69aa4545d45d3435865c56f1e67c4b26a (diff) | |
| parent | 433c5f706856689be25928a99636e724fb3ea7cf (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: Fix end-of-stack checking in save_stack_trace().
sparc: don't use asm/of_device.h
sparc64: Use kernel/uid16.c helpers instead of own copy.
of/sparc: remove include of linux/of_platform.h from asm/of_platform.h
sparc: i8042-sparcio.h: fix warning
Diffstat (limited to 'arch/sparc/include/asm/ebus_32.h')
| -rw-r--r-- | arch/sparc/include/asm/ebus_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/ebus_32.h b/arch/sparc/include/asm/ebus_32.h index 29cb7dfc6b7..f91f0b267ce 100644 --- a/arch/sparc/include/asm/ebus_32.h +++ b/arch/sparc/include/asm/ebus_32.h @@ -12,9 +12,9 @@ #ifndef _LINUX_IOPORT_H #include <linux/ioport.h> #endif +#include <linux/of_device.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/of_device.h> struct linux_ebus_child { struct linux_ebus_child *next; |