diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/sbus/char/cpwatchdog.c | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/sbus/char/cpwatchdog.c')
| -rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index fd2cc7782f7..5bf3dd901b6 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c | |||
| @@ -304,8 +304,8 @@ static int wd_open(struct inode *inode, struct file *f) | |||
| 304 | SA_SHIRQ, | 304 | SA_SHIRQ, |
| 305 | WD_OBPNAME, | 305 | WD_OBPNAME, |
| 306 | (void *)wd_dev.regs)) { | 306 | (void *)wd_dev.regs)) { |
| 307 | printk("%s: Cannot register IRQ %s\n", | 307 | printk("%s: Cannot register IRQ %d\n", |
| 308 | WD_OBPNAME, __irq_itoa(wd_dev.irq)); | 308 | WD_OBPNAME, wd_dev.irq); |
| 309 | return(-EBUSY); | 309 | return(-EBUSY); |
| 310 | } | 310 | } |
| 311 | wd_dev.initialized = 1; | 311 | wd_dev.initialized = 1; |