diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:43:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:43:21 -0400 |
| commit | acbaa41a780490c791492c41144c774c04875af1 (patch) | |
| tree | 31f1f046875eb071e2aed031e5d9d1584742314f /arch/mips/rb532/setup.c | |
| parent | 8d89adf44cf750e49691ba5b744b2ad77a05e997 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/quirks
Conflicts:
arch/x86/kernel/early-quirks.c
Diffstat (limited to 'arch/mips/rb532/setup.c')
| -rw-r--r-- | arch/mips/rb532/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/rb532/setup.c b/arch/mips/rb532/setup.c index 7aafa95ac20b..50f530f5b602 100644 --- a/arch/mips/rb532/setup.c +++ b/arch/mips/rb532/setup.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include <asm/time.h> | 9 | #include <asm/time.h> |
| 10 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
| 11 | 11 | ||
| 12 | #include <asm/mach-rc32434/rc32434.h> | 12 | #include <asm/mach-rc32434/rb.h> |
| 13 | #include <asm/mach-rc32434/pci.h> | 13 | #include <asm/mach-rc32434/pci.h> |
| 14 | 14 | ||
| 15 | struct pci_reg __iomem *pci_reg; | 15 | struct pci_reg __iomem *pci_reg; |
| @@ -27,7 +27,7 @@ static struct resource pci0_res[] = { | |||
| 27 | static void rb_machine_restart(char *command) | 27 | static void rb_machine_restart(char *command) |
| 28 | { | 28 | { |
| 29 | /* just jump to the reset vector */ | 29 | /* just jump to the reset vector */ |
| 30 | writel(0x80000001, (void *)KSEG1ADDR(RC32434_REG_BASE + RC32434_RST)); | 30 | writel(0x80000001, IDT434_REG_BASE + RST); |
| 31 | ((void (*)(void)) KSEG1ADDR(0x1FC00000u))(); | 31 | ((void (*)(void)) KSEG1ADDR(0x1FC00000u))(); |
| 32 | } | 32 | } |
| 33 | 33 | ||