diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:14:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:14:32 -0400 |
| commit | 8d659f5e43c5db2630e85f507b7384365e9e1c1e (patch) | |
| tree | c99b00949268cedbbc4bc1f3e01b058e67033c2e /arch/sparc64/kernel/auxio.c | |
| 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/sparc64/kernel/auxio.c')
| -rw-r--r-- | arch/sparc64/kernel/auxio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c index c55f0293eacd..dd5c7bf87619 100644 --- a/arch/sparc64/kernel/auxio.c +++ b/arch/sparc64/kernel/auxio.c | |||
| @@ -9,9 +9,9 @@ | |||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/ioport.h> | 11 | #include <linux/ioport.h> |
| 12 | #include <linux/of_device.h> | ||
| 12 | 13 | ||
| 13 | #include <asm/prom.h> | 14 | #include <asm/prom.h> |
| 14 | #include <asm/of_device.h> | ||
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/auxio.h> | 16 | #include <asm/auxio.h> |
| 17 | 17 | ||