diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /arch/mips/emma2rh | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'arch/mips/emma2rh')
| -rw-r--r-- | arch/mips/emma2rh/markeins/setup.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c index 822a20e21fa4..b6a23ad539f8 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma2rh/markeins/setup.c | |||
| @@ -25,23 +25,9 @@ | |||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/initrd.h> | 28 | |
| 29 | #include <linux/irq.h> | ||
| 30 | #include <linux/ioport.h> | ||
| 31 | #include <linux/param.h> /* for HZ */ | ||
| 32 | #include <linux/root_dev.h> | ||
| 33 | #include <linux/serial.h> | ||
| 34 | #include <linux/serial_core.h> | ||
| 35 | |||
| 36 | #include <asm/cpu.h> | ||
| 37 | #include <asm/bootinfo.h> | ||
| 38 | #include <asm/addrspace.h> | ||
| 39 | #include <asm/time.h> | 29 | #include <asm/time.h> |
| 40 | #include <asm/bcache.h> | ||
| 41 | #include <asm/irq.h> | ||
| 42 | #include <asm/reboot.h> | 30 | #include <asm/reboot.h> |
| 43 | #include <asm/traps.h> | ||
| 44 | #include <asm/debug.h> | ||
| 45 | 31 | ||
| 46 | #include <asm/emma2rh/emma2rh.h> | 32 | #include <asm/emma2rh/emma2rh.h> |
| 47 | 33 | ||