diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /arch/sparc/kernel | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 487960919f1..2a8a847764d 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> diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index ab3dd0b257d..0762f5db192 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c @@ -28,6 +28,7 @@ #include <linux/pci.h> #include <linux/ioport.h> #include <linux/profile.h> +#include <linux/of_device.h> #include <asm/oplib.h> #include <asm/timer.h> @@ -40,7 +41,6 @@ #include <asm/sun4paddr.h> #include <asm/page.h> #include <asm/pcic.h> -#include <asm/of_device.h> #include <asm/irq_regs.h> #include "irq.h" |