diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /drivers/char/esp.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/esp.c')
| -rw-r--r-- | drivers/char/esp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/esp.c b/drivers/char/esp.c index 9827d170ca17..afcd83d9984b 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c | |||
| @@ -883,7 +883,7 @@ static int startup(struct esp_struct * info) | |||
| 883 | * Allocate the IRQ | 883 | * Allocate the IRQ |
| 884 | */ | 884 | */ |
| 885 | 885 | ||
| 886 | retval = request_irq(info->irq, rs_interrupt_single, SA_SHIRQ, | 886 | retval = request_irq(info->irq, rs_interrupt_single, IRQF_SHARED, |
| 887 | "esp serial", info); | 887 | "esp serial", info); |
| 888 | 888 | ||
| 889 | if (retval) { | 889 | if (retval) { |