sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Fixes several compile errors due to the recent hd64461 I/O base changes.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Paul Mundt 17 years ago 62669e61 639138a9

+4 -4

3 changed files

expand all

arch

cchips

hd6446x

hd64461.c

include

asm

hd64461.h

drivers

video

hitfb.c

+1 -1

arch/sh/cchips/hd6446x/hd64461.c

··· 80 80 81 81 printk(KERN_INFO 82 82 "HD64461 configured at 0x%x on irq %d(mapped into %d to %d)\n", 83 - CONFIG_HD64461_IOBASE, CONFIG_HD64461_IRQ, HD64461_IRQBASE, 83 + HD64461_IOBASE, CONFIG_HD64461_IRQ, HD64461_IRQBASE, 84 84 HD64461_IRQBASE + 15); 85 85 86 86 /* Should be at processor specific part.. */

+1 -1

arch/sh/include/asm/hd64461.h

··· 26 26 #define HD64461_PCC1_COMM (HD64461_PCC1_BASE+HD64461_PCC_WINDOW) /* 0xb5000000 */ 27 27 28 28 /* Standby Control Register for HD64461 */ 29 - #define HD64461_STBCR CONFIG_HD64461_IOBASE 29 + #define HD64461_STBCR HD64461_IO_OFFSET(0x00000000) 30 30 #define HD64461_STBCR_CKIO_STBY 0x2000 31 31 #define HD64461_STBCR_SAFECKE_IST 0x1000 32 32 #define HD64461_STBCR_SLCKE_IST 0x0800

+2 -2

drivers/video/hitfb.c

··· 335 335 if (fb_get_options("hitfb", NULL)) 336 336 return -ENODEV; 337 337 338 - hitfb_fix.mmio_start = CONFIG_HD64461_IOBASE+0x1000; 338 + hitfb_fix.mmio_start = HD64461_IO_OFFSET(0x1000); 339 339 hitfb_fix.mmio_len = 0x1000; 340 - hitfb_fix.smem_start = CONFIG_HD64461_IOBASE + 0x02000000; 340 + hitfb_fix.smem_start = HD64461_IO_OFFSET(0x02000000); 341 341 hitfb_fix.smem_len = 512 * 1024; 342 342 343 343 lcdclor = fb_readw(HD64461_LCDCLOR);