diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/bluetooth/btuart_cs.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
| -rw-r--r-- | drivers/bluetooth/btuart_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 746ccca97f6f..3b29086b7c3f 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
| @@ -288,7 +288,7 @@ static void btuart_receive(btuart_info_t *info) | |||
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | 290 | ||
| 291 | static irqreturn_t btuart_interrupt(int irq, void *dev_inst, struct pt_regs *regs) | 291 | static irqreturn_t btuart_interrupt(int irq, void *dev_inst) |
| 292 | { | 292 | { |
| 293 | btuart_info_t *info = dev_inst; | 293 | btuart_info_t *info = dev_inst; |
| 294 | unsigned int iobase; | 294 | unsigned int iobase; |