diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
| commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
| tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /arch/sparc/kernel/ioport.c | |
| parent | 7b27718bdb1b70166383dec91391df5534d449ee (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
| download | op-kernel-dev-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip op-kernel-dev-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.gz | |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 4879609..2a8a847 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -36,12 +36,12 @@ #include <linux/pci.h> /* struct pci_dev */ #include <linux/proc_fs.h> #include <linux/scatterlist.h> +#include <linux/of_device.h> #include <asm/io.h> #include <asm/vaddrs.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/of_device.h> #include <asm/sbus.h> #include <asm/page.h> #include <asm/pgalloc.h> |
