diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-26 10:20:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-26 10:20:40 -0700 |
| commit | 4934ed888e6fe78d9d339471fb870819da911e8b (patch) | |
| tree | 12de8b464d6bdab2edb9fb2ad33192a76b2b5d11 /arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |
| parent | 0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa (diff) | |
| parent | 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb (diff) | |
| download | op-kernel-dev-4934ed888e6fe78d9d339471fb870819da911e8b.zip op-kernel-dev-4934ed888e6fe78d9d339471fb870819da911e8b.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
sh: Drop broken URAM support on SH7723.
sh: update Migo-R defconfig
sh: use sm501 8250 mfd support on r2d boards
sh: add probe support for new sh7723 cut
sh: fix VPU interrupt vector for sh7723
sh: fix USBF resource for sh7722
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7723.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index 16925cf..566ce79 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c @@ -153,7 +153,7 @@ static struct intc_vect vectors[] __initdata = { INTC_VECT(VIO_VOUI,0x8E0), INTC_VECT(SCIFA_SCIFA0,0x900), - INTC_VECT(VPU_VPUI,0x920), + INTC_VECT(VPU_VPUI,0x980), INTC_VECT(TPU_TPUI,0x9A0), INTC_VECT(ADC_ADI,0x9E0), INTC_VECT(USB_USI0,0xA20), @@ -292,9 +292,3 @@ void __init plat_irq_setup(void) { register_intc_controller(&intc_desc); } - -void __init plat_mem_setup(void) -{ - /* Register the URAM space as Node 1 */ - setup_bootmem_node(1, 0x055f0000, 0x05610000); -} |
