diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-04 08:55:41 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-19 12:19:10 -0400 |
commit | 79abeed6ee93231d494c191a9251c0845bd71fdd (patch) | |
tree | ca64fa8cdbbf7343bd75422ef32f085d6b3fb381 | |
parent | 1fc74ac61229edfe053fb87e8939ae9ca3794389 (diff) |
m68k/atari: Do not use "/" in interrupt names
It may trigger a warning in fs/proc/generic.c:__xlate_proc_name() when
trying to add an entry for the interrupt handler to sysfs.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | arch/m68k/atari/atakeyb.c | 2 | ||||
-rw-r--r-- | arch/m68k/atari/stdma.c | 2 | ||||
-rw-r--r-- | drivers/net/atarilance.c | 2 | ||||
-rw-r--r-- | drivers/video/atafb.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index b995513d527f..db26f0e926a4 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
@@ -575,7 +575,7 @@ int atari_keyb_init(void) | |||
575 | kb_state.len = 0; | 575 | kb_state.len = 0; |
576 | 576 | ||
577 | error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, | 577 | error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, |
578 | IRQ_TYPE_SLOW, "keyboard/mouse/MIDI", | 578 | IRQ_TYPE_SLOW, "keyboard,mouse,MIDI", |
579 | atari_keyboard_interrupt); | 579 | atari_keyboard_interrupt); |
580 | if (error) | 580 | if (error) |
581 | return error; | 581 | return error; |
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c index 604329fafbb8..ddbf43ca8858 100644 --- a/arch/m68k/atari/stdma.c +++ b/arch/m68k/atari/stdma.c | |||
@@ -180,7 +180,7 @@ void __init stdma_init(void) | |||
180 | { | 180 | { |
181 | stdma_isr = NULL; | 181 | stdma_isr = NULL; |
182 | if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, | 182 | if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, |
183 | "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int)) | 183 | "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int)) |
184 | pr_err("Couldn't register ST-DMA interrupt\n"); | 184 | pr_err("Couldn't register ST-DMA interrupt\n"); |
185 | } | 185 | } |
186 | 186 | ||
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index ce0091eb06f5..1264d781b554 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -554,7 +554,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, | |||
554 | memaddr == (unsigned short *)0xffe00000) { | 554 | memaddr == (unsigned short *)0xffe00000) { |
555 | /* PAMs card and Riebl on ST use level 5 autovector */ | 555 | /* PAMs card and Riebl on ST use level 5 autovector */ |
556 | if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, | 556 | if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO, |
557 | "PAM/Riebl-ST Ethernet", dev)) { | 557 | "PAM,Riebl-ST Ethernet", dev)) { |
558 | printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); | 558 | printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); |
559 | return 0; | 559 | return 0; |
560 | } | 560 | } |
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 5b2b5ef4edba..64e41f5448c4 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
@@ -3117,7 +3117,7 @@ int __init atafb_init(void) | |||
3117 | atafb_ops.fb_setcolreg = &falcon_setcolreg; | 3117 | atafb_ops.fb_setcolreg = &falcon_setcolreg; |
3118 | error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, | 3118 | error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, |
3119 | IRQ_TYPE_PRIO, | 3119 | IRQ_TYPE_PRIO, |
3120 | "framebuffer/modeswitch", | 3120 | "framebuffer:modeswitch", |
3121 | falcon_vbl_switcher); | 3121 | falcon_vbl_switcher); |
3122 | if (error) | 3122 | if (error) |
3123 | return error; | 3123 | return error; |