diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /drivers/parport | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/parport_gsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index e6a7e847ee80..ea31a452b153 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c | |||
| @@ -352,8 +352,8 @@ static int __devinit parport_init_chip(struct parisc_device *dev) | |||
| 352 | unsigned long port; | 352 | unsigned long port; |
| 353 | 353 | ||
| 354 | if (!dev->irq) { | 354 | if (!dev->irq) { |
| 355 | printk(KERN_WARNING "IRQ not found for parallel device at 0x%lx\n", | 355 | printk(KERN_WARNING "IRQ not found for parallel device at 0x%llx\n", |
| 356 | dev->hpa.start); | 356 | (unsigned long long)dev->hpa.start); |
| 357 | return -ENODEV; | 357 | return -ENODEV; |
| 358 | } | 358 | } |
| 359 | 359 | ||