diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
tree | 63429c2222a55509dc81269233bbe7a321bb86ed /arch/mips/cobalt/reset.c | |
parent | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (diff) | |
parent | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/mips/cobalt/reset.c')
-rw-r--r-- | arch/mips/cobalt/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c index 805a0e88507..753dfccae6f 100644 --- a/arch/mips/cobalt/reset.c +++ b/arch/mips/cobalt/reset.c @@ -16,7 +16,7 @@ #include <asm/reboot.h> #include <asm/system.h> #include <asm/mipsregs.h> -#include <asm/cobalt/cobalt.h> +#include <asm/mach-cobalt/cobalt.h> void cobalt_machine_halt(void) { |