diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-07-20 23:54:29 +0400 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-07-22 18:55:49 +0400 |
| commit | 1525e06e4414dbe053ea10cbd8cc03bb150e8e27 (patch) | |
| tree | eba136290d98b7150ee2bde8293b6619085e0217 /arch/m68k/apollo/config.c | |
| parent | 897f3325a17e17dcdf8f3950a2b83542645902e5 (diff) | |
| download | linux-1525e06e4414dbe053ea10cbd8cc03bb150e8e27.tar.xz | |
m68k/apollo: Rename "timer" to "apollo_timer"
In file included from include/linux/kgdb.h:17,
from include/linux/fb.h:8,
from drivers/video/dnfb.c:15:
include/linux/serial_8250.h:71: error: expected identifier or ‘(’ before numeric constant
include/linux/serial_8250.h:72: error: expected ‘;’ before ‘struct’
make[1]: *** [drivers/video/dnfb.o] Error 1
This is caused by
#define timer (IO_BASE + timer_physaddr)
in <asm/apollohw.h>, which conflicts with the new "timer" struct member in
<linux/serial_8250.h>.
Rename "timer" to "apollo_timer", as it's a way too generic name for a
global #define.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
--
http://kisskb.ellerman.id.au/kisskb/buildresult/6739606/
Diffstat (limited to 'arch/m68k/apollo/config.c')
| -rw-r--r-- | arch/m68k/apollo/config.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 0a30406b9442..f5565d6eeb8e 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -177,8 +177,8 @@ irqreturn_t dn_timer_int(int irq, void *dev_id) timer_handler(irq, dev_id); - x=*(volatile unsigned char *)(timer+3); - x=*(volatile unsigned char *)(timer+5); + x = *(volatile unsigned char *)(apollo_timer + 3); + x = *(volatile unsigned char *)(apollo_timer + 5); return IRQ_HANDLED; } @@ -186,17 +186,17 @@ irqreturn_t dn_timer_int(int irq, void *dev_id) void dn_sched_init(irq_handler_t timer_routine) { /* program timer 1 */ - *(volatile unsigned char *)(timer+3)=0x01; - *(volatile unsigned char *)(timer+1)=0x40; - *(volatile unsigned char *)(timer+5)=0x09; - *(volatile unsigned char *)(timer+7)=0xc4; + *(volatile unsigned char *)(apollo_timer + 3) = 0x01; + *(volatile unsigned char *)(apollo_timer + 1) = 0x40; + *(volatile unsigned char *)(apollo_timer + 5) = 0x09; + *(volatile unsigned char *)(apollo_timer + 7) = 0xc4; /* enable IRQ of PIC B */ *(volatile unsigned char *)(pica+1)&=(~8); #if 0 - printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3)); - printk("*(0x10803) %02x\n",*(volatile unsigned char *)(timer+0x3)); + printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3)); + printk("*(0x10803) %02x\n",*(volatile unsigned char *)(apollo_timer + 0x3)); #endif if (request_irq(IRQ_APOLLO, dn_timer_int, 0, "time", timer_routine)) |